From f5ea561bea76a95e3c5657849197c11ed7e9fb1d Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Thu, 18 Jul 2024 02:41:15 +0200
Subject: [PATCH 001/366] minor SharedInteractionSystem cleanup (#30139)

cleanup SharedInteractionSystem
---
 Content.Shared/Interaction/SharedInteractionSystem.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index cc548fd4b16..b54d2a41fe1 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -42,8 +42,6 @@
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
-#pragma warning disable 618
-
 namespace Content.Shared.Interaction
 {
     /// <summary>
@@ -556,11 +554,11 @@ public void InteractUsingRanged(EntityUid user, EntityUid used, EntityUid? targe
         protected bool ValidateInteractAndFace(EntityUid user, EntityCoordinates coordinates)
         {
             // Verify user is on the same map as the entity they clicked on
-            if (coordinates.GetMapId(EntityManager) != Transform(user).MapID)
+            if (_transform.GetMapId(coordinates) != Transform(user).MapID)
                 return false;
 
             if (!HasComp<NoRotateOnInteractComponent>(user))
-                _rotateToFaceSystem.TryFaceCoordinates(user, coordinates.ToMapPos(EntityManager, _transform));
+                _rotateToFaceSystem.TryFaceCoordinates(user, _transform.ToMapCoordinates(coordinates).Position);
 
             return true;
         }
@@ -893,7 +891,7 @@ public bool InRangeUnobstructed(
             Ignored? predicate = null,
             bool popup = false)
         {
-            return InRangeUnobstructed(origin, other.ToMap(EntityManager, _transform), range, collisionMask, predicate, popup);
+            return InRangeUnobstructed(origin, _transform.ToMapCoordinates(other), range, collisionMask, predicate, popup);
         }
 
         /// <summary>
@@ -1009,7 +1007,7 @@ public void InteractDoAfter(
             bool checkDeletion = false
         )
         {
-            if (target is {Valid: false})
+            if (target is { Valid: false })
                 target = null;
 
             if (checkDeletion && (IsDeleted(user) || IsDeleted(used) || IsDeleted(target)))

From 803671acdabf3f3617a1563bf30faae0a2138190 Mon Sep 17 00:00:00 2001
From: themias <89101928+themias@users.noreply.github.com>
Date: Tue, 30 Jul 2024 04:35:30 -0400
Subject: [PATCH 002/366] Fix fingerprint transfer on weapon attack (#30257)

* Fix fingerprint transfer on weapon attack

* Switch to just not raising the event

* one more
---
 Content.Shared/Interaction/SharedInteractionSystem.cs   | 6 +++++-
 Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index b54d2a41fe1..ab4e6c5b8cf 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -988,7 +988,7 @@ public void InteractUsing(
             RaiseLocalEvent(target, interactUsingEvent, true);
             DoContactInteraction(user, used, interactUsingEvent);
             DoContactInteraction(user, target, interactUsingEvent);
-
+            // Contact interactions are currently only used for forensics, so we don't raise used -> target
             if (interactUsingEvent.Handled)
                 return;
 
@@ -1018,6 +1018,8 @@ public void InteractDoAfter(
             DoContactInteraction(user, used, afterInteractEvent);
             if (canReach)
                 DoContactInteraction(user, target, afterInteractEvent);
+                // Contact interactions are currently only used for forensics, so we don't raise used -> target
+            }
 
             if (afterInteractEvent.Handled)
                 return;
@@ -1031,6 +1033,8 @@ public void InteractDoAfter(
             DoContactInteraction(user, used, afterInteractUsingEvent);
             if (canReach)
                 DoContactInteraction(user, target, afterInteractUsingEvent);
+                // Contact interactions are currently only used for forensics, so we don't raise used -> target
+            }
         }
 
         #region ActivateItemInWorld
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index aa15ecfb286..eefd6bb0535 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -468,7 +468,7 @@ protected virtual void DoLightAttack(EntityUid user, LightAttackEvent ev, Entity
 
         var weapon = GetEntity(ev.Weapon);
 
-        Interaction.DoContactInteraction(weapon, target);
+        // We skip weapon -> target interaction, as forensics system applies DNA on hit
         Interaction.DoContactInteraction(user, weapon);
 
         // If the user is using a long-range weapon, this probably shouldn't be happening? But I'll interpret melee as a
@@ -608,7 +608,7 @@ private bool DoHeavyAttack(EntityUid user, HeavyAttackEvent ev, EntityUid meleeU
         // For stuff that cares about it being attacked.
         foreach (var target in targets)
         {
-            Interaction.DoContactInteraction(weapon, target);
+            // We skip weapon -> target interaction, as forensics system applies DNA on hit
 
             // If the user is using a long-range weapon, this probably shouldn't be happening? But I'll interpret melee as a
             // somewhat messy scuffle. See also, light attacks.

From 56aee075b3363dca08bcb5369b9d76f920fcde93 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Fri, 2 Aug 2024 07:44:59 +0200
Subject: [PATCH 003/366] Fix borgs being unable to state laws or open other
 UIs without modules (#30299)

borg law 2 state laws all day
---
 Content.Shared/Interaction/SharedInteractionSystem.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index ab4e6c5b8cf..32d69dc8e73 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -189,10 +189,7 @@ private void OnBoundInterfaceInteractAttempt(BoundUserInterfaceMessageAttempt ev
                 return;
             }
 
-            if (!uiComp.RequireHands)
-                return;
-
-            if (!_handsQuery.TryComp(ev.Actor, out var hands) || hands.Hands.Count == 0)
+            if (uiComp.RequireHands && !_handsQuery.HasComp(ev.Actor))
                 ev.Cancel();
         }
 

From 8e4df8777323d3809c891a91b74fcb84273d36d8 Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Sat, 25 May 2024 20:14:48 +0000
Subject: [PATCH 004/366] antag objective issuing refactor (#28216)

---
 Content.Server/Antag/AntagObjectivesSystem.cs | 35 +++++++++++++
 .../Antag/AntagRandomObjectivesSystem.cs      | 52 +++++++++++++++++++
 .../Antag/AntagSelectionSystem.API.cs         |  2 +-
 Content.Server/Antag/AntagSelectionSystem.cs  | 12 +++++
 .../Components/AntagObjectivesComponent.cs    | 18 +++++++
 .../AntagRandomObjectivesComponent.cs         | 52 +++++++++++++++++++
 .../Components/AntagSelectionComponent.cs     |  7 +++
 .../Rules/Components/ThiefRuleComponent.cs    | 21 +-------
 .../Rules/Components/TraitorRuleComponent.cs  |  6 ---
 .../Rules/GenericAntagRuleSystem.cs           |  5 +-
 .../GameTicking/Rules/ThiefRuleSystem.cs      | 39 --------------
 .../GameTicking/Rules/TraitorRuleSystem.cs    | 30 ++---------
 Content.Server/Objectives/ObjectivesSystem.cs | 51 ++++++------------
 .../Locale/en-US/objectives/round-end.ftl     |  1 -
 Resources/Prototypes/GameRules/events.yml     |  5 +-
 Resources/Prototypes/GameRules/midround.yml   | 12 +++++
 Resources/Prototypes/GameRules/roundstart.yml | 18 ++++++-
 .../Prototypes/Objectives/objectiveGroups.yml |  5 --
 18 files changed, 231 insertions(+), 140 deletions(-)
 create mode 100644 Content.Server/Antag/AntagObjectivesSystem.cs
 create mode 100644 Content.Server/Antag/AntagRandomObjectivesSystem.cs
 create mode 100644 Content.Server/Antag/Components/AntagObjectivesComponent.cs
 create mode 100644 Content.Server/Antag/Components/AntagRandomObjectivesComponent.cs

diff --git a/Content.Server/Antag/AntagObjectivesSystem.cs b/Content.Server/Antag/AntagObjectivesSystem.cs
new file mode 100644
index 00000000000..5aa31f66f67
--- /dev/null
+++ b/Content.Server/Antag/AntagObjectivesSystem.cs
@@ -0,0 +1,35 @@
+using Content.Server.Antag.Components;
+using Content.Server.Objectives;
+using Content.Shared.Mind;
+using Content.Shared.Objectives.Systems;
+
+namespace Content.Server.Antag;
+
+/// <summary>
+/// Adds fixed objectives to an antag made with <c>AntagObjectivesComponent</c>.
+/// </summary>
+public sealed class AntagObjectivesSystem : EntitySystem
+{
+    [Dependency] private readonly SharedMindSystem _mind = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<AntagObjectivesComponent, AfterAntagEntitySelectedEvent>(OnAntagSelected);
+    }
+
+    private void OnAntagSelected(Entity<AntagObjectivesComponent> ent, ref AfterAntagEntitySelectedEvent args)
+    {
+        if (!_mind.TryGetMind(args.Session, out var mindId, out var mind))
+        {
+            Log.Error($"Antag {ToPrettyString(args.EntityUid):player} was selected by {ToPrettyString(ent):rule} but had no mind attached!");
+            return;
+        }
+
+        foreach (var id in ent.Comp.Objectives)
+        {
+            _mind.TryAddObjective(mindId, mind, id);
+        }
+    }
+}
diff --git a/Content.Server/Antag/AntagRandomObjectivesSystem.cs b/Content.Server/Antag/AntagRandomObjectivesSystem.cs
new file mode 100644
index 00000000000..c935b8c0648
--- /dev/null
+++ b/Content.Server/Antag/AntagRandomObjectivesSystem.cs
@@ -0,0 +1,52 @@
+using Content.Server.Antag.Components;
+using Content.Server.Objectives;
+using Content.Shared.Mind;
+using Content.Shared.Objectives.Components;
+using Content.Shared.Objectives.Systems;
+using Robust.Shared.Random;
+
+namespace Content.Server.Antag;
+
+/// <summary>
+/// Adds fixed objectives to an antag made with <c>AntagRandomObjectivesComponent</c>.
+/// </summary>
+public sealed class AntagRandomObjectivesSystem : EntitySystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedMindSystem _mind = default!;
+    [Dependency] private readonly ObjectivesSystem _objectives = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<AntagRandomObjectivesComponent, AfterAntagEntitySelectedEvent>(OnAntagSelected);
+    }
+
+    private void OnAntagSelected(Entity<AntagRandomObjectivesComponent> ent, ref AfterAntagEntitySelectedEvent args)
+    {
+        if (!_mind.TryGetMind(args.Session, out var mindId, out var mind))
+        {
+            Log.Error($"Antag {ToPrettyString(args.EntityUid):player} was selected by {ToPrettyString(ent):rule} but had no mind attached!");
+            return;
+        }
+
+        var difficulty = 0f;
+        foreach (var set in ent.Comp.Sets)
+        {
+            if (!_random.Prob(set.Prob))
+                continue;
+
+            for (var pick = 0; pick < set.MaxPicks && ent.Comp.MaxDifficulty > difficulty; pick++)
+            {
+                if (_objectives.GetRandomObjective(mindId, mind, set.Groups) is not {} objective)
+                    continue;
+
+                _mind.AddObjective(mindId, mind, objective);
+                var adding = Comp<ObjectiveComponent>(objective).Difficulty;
+                difficulty += adding;
+                Log.Debug($"Added objective {ToPrettyString(objective):objective} to {ToPrettyString(args.EntityUid):player} with {adding} difficulty");
+            }
+        }
+    }
+}
diff --git a/Content.Server/Antag/AntagSelectionSystem.API.cs b/Content.Server/Antag/AntagSelectionSystem.API.cs
index 77f543cdcf1..8893d9a476d 100644
--- a/Content.Server/Antag/AntagSelectionSystem.API.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.API.cs
@@ -147,7 +147,7 @@ public List<Entity<MindComponent>> GetAntagMinds(Entity<AntagSelectionComponent?
     }
 
     /// <remarks>
-    /// Helper specifically for <see cref="ObjectivesTextGetInfoEvent"/>
+    /// Helper to get just the mind entities and not names.
     /// </remarks>
     public List<EntityUid> GetAntagMindEntityUids(Entity<AntagSelectionComponent?> ent)
     {
diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs
index 8efdc2738b9..b23afe23103 100644
--- a/Content.Server/Antag/AntagSelectionSystem.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.cs
@@ -6,6 +6,7 @@
 using Content.Server.Ghost.Roles;
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.Mind;
+using Content.Server.Objectives;
 using Content.Server.Preferences.Managers;
 using Content.Server.Roles;
 using Content.Server.Roles.Jobs;
@@ -51,6 +52,8 @@ public override void Initialize()
 
         SubscribeLocalEvent<GhostRoleAntagSpawnerComponent, TakeGhostRoleEvent>(OnTakeGhostRole);
 
+        SubscribeLocalEvent<AntagSelectionComponent, ObjectivesTextGetInfoEvent>(OnObjectivesTextGetInfo);
+
         SubscribeLocalEvent<RulePlayerSpawningEvent>(OnPlayerSpawning);
         SubscribeLocalEvent<RulePlayerJobsAssignedEvent>(OnJobsAssigned);
         SubscribeLocalEvent<PlayerSpawnCompleteEvent>(OnSpawnComplete);
@@ -416,6 +419,15 @@ public bool IsEntityValid(EntityUid? entity, AntagSelectionDefinition def)
 
         return true;
     }
+
+    private void OnObjectivesTextGetInfo(Entity<AntagSelectionComponent> ent, ref ObjectivesTextGetInfoEvent args)
+    {
+        if (ent.Comp.AgentName is not {} name)
+            return;
+
+        args.Minds = ent.Comp.SelectedMinds;
+        args.AgentName = Loc.GetString(name);
+    }
 }
 
 /// <summary>
diff --git a/Content.Server/Antag/Components/AntagObjectivesComponent.cs b/Content.Server/Antag/Components/AntagObjectivesComponent.cs
new file mode 100644
index 00000000000..357c138f46b
--- /dev/null
+++ b/Content.Server/Antag/Components/AntagObjectivesComponent.cs
@@ -0,0 +1,18 @@
+using Content.Server.Antag;
+using Content.Shared.Objectives.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Antag.Components;
+
+/// <summary>
+/// Gives antags selected by this rule a fixed list of objectives.
+/// </summary>
+[RegisterComponent, Access(typeof(AntagObjectivesSystem))]
+public sealed partial class AntagObjectivesComponent : Component
+{
+    /// <summary>
+    /// List of static objectives to give.
+    /// </summary>
+    [DataField(required: true)]
+    public List<EntProtoId<ObjectiveComponent>> Objectives = new();
+}
diff --git a/Content.Server/Antag/Components/AntagRandomObjectivesComponent.cs b/Content.Server/Antag/Components/AntagRandomObjectivesComponent.cs
new file mode 100644
index 00000000000..9a551acc499
--- /dev/null
+++ b/Content.Server/Antag/Components/AntagRandomObjectivesComponent.cs
@@ -0,0 +1,52 @@
+using Content.Server.Antag;
+using Content.Shared.Random;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Antag.Components;
+
+/// <summary>
+/// Gives antags selected by this rule a random list of objectives.
+/// </summary>
+[RegisterComponent, Access(typeof(AntagRandomObjectivesSystem))]
+public sealed partial class AntagRandomObjectivesComponent : Component
+{
+    /// <summary>
+    /// Each set of objectives to add.
+    /// </summary>
+    [DataField(required: true)]
+    public List<AntagObjectiveSet> Sets = new();
+
+    /// <summary>
+    /// If the total difficulty of the currently given objectives exceeds, no more will be given.
+    /// </summary>
+    [DataField(required: true)]
+    public float MaxDifficulty;
+}
+
+/// <summary>
+/// A set of objectives to try picking.
+/// Difficulty is checked over all sets, but each set has its own probability and pick count.
+/// </summary>
+[DataRecord]
+public record struct AntagObjectiveSet()
+{
+    /// <summary>
+    /// The grouping used by the objective system to pick random objectives.
+    /// First a group is picked from these, then an objective from that group.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<WeightedRandomPrototype> Groups = string.Empty;
+
+    /// <summary>
+    /// Probability of this set being used.
+    /// </summary>
+    [DataField]
+    public float Prob = 1f;
+
+    /// <summary>
+    /// Number of times to try picking objectives from this set.
+    /// Even if there is enough difficulty remaining, no more will be given after this.
+    /// </summary>
+    [DataField]
+    public int MaxPicks = 20;
+}
diff --git a/Content.Server/Antag/Components/AntagSelectionComponent.cs b/Content.Server/Antag/Components/AntagSelectionComponent.cs
index 5b6699dab76..cae56c1a7bb 100644
--- a/Content.Server/Antag/Components/AntagSelectionComponent.cs
+++ b/Content.Server/Antag/Components/AntagSelectionComponent.cs
@@ -42,6 +42,13 @@ public sealed partial class AntagSelectionComponent : Component
     /// Is not serialized.
     /// </summary>
     public HashSet<ICommonSession> SelectedSessions = new();
+
+    /// <summary>
+    /// Locale id for the name of the antag.
+    /// If this is set then the antag is listed in the round-end summary.
+    /// </summary>
+    [DataField]
+    public LocId? AgentName;
 }
 
 [DataDefinition]
diff --git a/Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs
index 01a078625ae..6ad1e177755 100644
--- a/Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs
@@ -8,23 +8,4 @@ namespace Content.Server.GameTicking.Rules.Components;
 /// Stores data for <see cref="ThiefRuleSystem"/>.
 /// </summary>
 [RegisterComponent, Access(typeof(ThiefRuleSystem))]
-public sealed partial class ThiefRuleComponent : Component
-{
-    [DataField]
-    public ProtoId<WeightedRandomPrototype> BigObjectiveGroup = "ThiefBigObjectiveGroups";
-
-    [DataField]
-    public ProtoId<WeightedRandomPrototype> SmallObjectiveGroup = "ThiefObjectiveGroups";
-
-    [DataField]
-    public ProtoId<WeightedRandomPrototype> EscapeObjectiveGroup = "ThiefEscapeObjectiveGroups";
-
-    [DataField]
-    public float BigObjectiveChance = 0.7f;
-
-    [DataField]
-    public float MaxObjectiveDifficulty = 2.5f;
-
-    [DataField]
-    public int MaxStealObjectives = 10;
-}
+public sealed partial class ThiefRuleComponent : Component;
diff --git a/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs
index 47a4adeaf34..cec635b4caa 100644
--- a/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs
@@ -22,9 +22,6 @@ public sealed partial class TraitorRuleComponent : Component
     [DataField]
     public ProtoId<NpcFactionPrototype> SyndicateFaction = "Syndicate";
 
-    [DataField]
-    public ProtoId<WeightedRandomPrototype> ObjectiveGroup = "TraitorObjectiveGroups";
-
     [DataField]
     public ProtoId<DatasetPrototype> CodewordAdjectives = "adjectives";
 
@@ -72,7 +69,4 @@ public enum SelectionState
     /// </summary>
     [DataField]
     public int StartingBalance = 20;
-
-    [DataField]
-    public int MaxDifficulty = 5;
 }
diff --git a/Content.Server/GameTicking/Rules/GenericAntagRuleSystem.cs b/Content.Server/GameTicking/Rules/GenericAntagRuleSystem.cs
index 81bdda706bd..0367aa1460c 100644
--- a/Content.Server/GameTicking/Rules/GenericAntagRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/GenericAntagRuleSystem.cs
@@ -1,6 +1,8 @@
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Objectives;
+using Content.Shared.Mind;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 
 namespace Content.Server.GameTicking.Rules;
 
@@ -47,7 +49,8 @@ public bool StartRule(string rule, EntityUid mindId, [NotNullWhen(true)] out Ent
 
     private void OnObjectivesTextGetInfo(EntityUid uid, GenericAntagRuleComponent comp, ref ObjectivesTextGetInfoEvent args)
     {
-        args.Minds = comp.Minds;
+        // just temporary until this is deleted
+        args.Minds = comp.Minds.Select(mindId => (mindId, Comp<MindComponent>(mindId).CharacterName ?? "?")).ToList();
         args.AgentName = Loc.GetString(comp.AgentName);
     }
 }
diff --git a/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs b/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs
index 083085fa0d8..faec4a9e9ca 100644
--- a/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs
@@ -24,7 +24,6 @@ public override void Initialize()
         SubscribeLocalEvent<ThiefRuleComponent, AfterAntagEntitySelectedEvent>(AfterAntagSelected);
 
         SubscribeLocalEvent<ThiefRoleComponent, GetBriefingEvent>(OnGetBriefing);
-        SubscribeLocalEvent<ThiefRuleComponent, ObjectivesTextGetInfoEvent>(OnObjectivesTextGetInfo);
     }
 
     private void AfterAntagSelected(Entity<ThiefRuleComponent> ent, ref AfterAntagEntitySelectedEvent args)
@@ -33,41 +32,9 @@ private void AfterAntagSelected(Entity<ThiefRuleComponent> ent, ref AfterAntagEn
             return;
 
         //Generate objectives
-        GenerateObjectives(mindId, mind, ent);
         _antag.SendBriefing(args.EntityUid, MakeBriefing(args.EntityUid), null, null);
     }
 
-    private void GenerateObjectives(EntityUid mindId, MindComponent mind, ThiefRuleComponent thiefRule)
-    {
-        // Give thieves their objectives
-        var difficulty = 0f;
-
-        if (_random.Prob(thiefRule.BigObjectiveChance)) // 70% chance to 1 big objective (structure or animal)
-        {
-            var objective = _objectives.GetRandomObjective(mindId, mind, thiefRule.BigObjectiveGroup);
-            if (objective != null)
-            {
-                _mindSystem.AddObjective(mindId, mind, objective.Value);
-                difficulty += Comp<ObjectiveComponent>(objective.Value).Difficulty;
-            }
-        }
-
-        for (var i = 0; i < thiefRule.MaxStealObjectives && thiefRule.MaxObjectiveDifficulty > difficulty; i++)  // Many small objectives
-        {
-            var objective = _objectives.GetRandomObjective(mindId, mind, thiefRule.SmallObjectiveGroup);
-            if (objective == null)
-                continue;
-
-            _mindSystem.AddObjective(mindId, mind, objective.Value);
-            difficulty += Comp<ObjectiveComponent>(objective.Value).Difficulty;
-        }
-
-        //Escape target
-        var escapeObjective = _objectives.GetRandomObjective(mindId, mind, thiefRule.EscapeObjectiveGroup);
-        if (escapeObjective != null)
-            _mindSystem.AddObjective(mindId, mind, escapeObjective.Value);
-    }
-
     //Add mind briefing
     private void OnGetBriefing(Entity<ThiefRoleComponent> thief, ref GetBriefingEvent args)
     {
@@ -87,10 +54,4 @@ private string MakeBriefing(EntityUid thief)
         briefing += "\n \n" + Loc.GetString("thief-role-greeting-equipment") + "\n";
         return briefing;
     }
-
-    private void OnObjectivesTextGetInfo(Entity<ThiefRuleComponent> ent, ref ObjectivesTextGetInfoEvent args)
-    {
-        args.Minds = _antag.GetAntagMindEntityUids(ent.Owner);
-        args.AgentName = Loc.GetString("thief-round-end-agent-name");
-    }
 }
diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
index 3d0a02d6aa9..abf46b7b967 100644
--- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
@@ -33,15 +33,12 @@ public sealed class TraitorRuleSystem : GameRuleSystem<TraitorRuleComponent>
     [Dependency] private readonly SharedJobSystem _jobs = default!;
     [Dependency] private readonly ObjectivesSystem _objectives = default!;
 
-    public const int MaxPicks = 20;
-
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<TraitorRuleComponent, AfterAntagEntitySelectedEvent>(AfterEntitySelected);
 
-        SubscribeLocalEvent<TraitorRuleComponent, ObjectivesTextGetInfoEvent>(OnObjectivesTextGetInfo);
         SubscribeLocalEvent<TraitorRuleComponent, ObjectivesTextPrependEvent>(OnObjectivesTextPrepend);
     }
 
@@ -69,7 +66,7 @@ private void MakeCodewords(TraitorRuleComponent component)
         }
     }
 
-    public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component, bool giveUplink = true, bool giveObjectives = true)
+    public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component, bool giveUplink = true)
     {
         //Grab the mind if it wasnt provided
         if (!_mindSystem.TryGetMind(traitor, out var mindId, out var mind))
@@ -122,37 +119,16 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component, bool
 
         RaiseLocalEvent(traitor, new MoodEffectEvent("TraitorFocused"));
 
-        // Give traitors their objectives
-        if (giveObjectives)
-        {
-            var difficulty = 0f;
-            for (var pick = 0; pick < MaxPicks && component.MaxDifficulty > difficulty; pick++)
-            {
-                var objective = _objectives.GetRandomObjective(mindId, mind, component.ObjectiveGroup);
-                if (objective == null)
-                    continue;
-
-                _mindSystem.AddObjective(mindId, mind, objective.Value);
-                var adding = Comp<ObjectiveComponent>(objective.Value).Difficulty;
-                difficulty += adding;
-                Log.Debug($"Added objective {ToPrettyString(objective):objective} with {adding} difficulty");
-            }
-        }
-
         return true;
     }
 
-    private void OnObjectivesTextGetInfo(EntityUid uid, TraitorRuleComponent comp, ref ObjectivesTextGetInfoEvent args)
-    {
-        args.Minds = _antag.GetAntagMindEntityUids(uid);
-        args.AgentName = Loc.GetString("traitor-round-end-agent-name");
-    }
-
+    // TODO: AntagCodewordsComponent
     private void OnObjectivesTextPrepend(EntityUid uid, TraitorRuleComponent comp, ref ObjectivesTextPrependEvent args)
     {
         args.Text += "\n" + Loc.GetString("traitor-round-end-codewords", ("codewords", string.Join(", ", comp.Codewords)));
     }
 
+    // TODO: figure out how to handle this? add priority to briefing event?
     private string GenerateBriefing(string[] codewords, Note[]? uplinkCode, string? objectiveIssuer = null)
     {
         var sb = new StringBuilder();
diff --git a/Content.Server/Objectives/ObjectivesSystem.cs b/Content.Server/Objectives/ObjectivesSystem.cs
index bf013bc0402..18077b413ad 100644
--- a/Content.Server/Objectives/ObjectivesSystem.cs
+++ b/Content.Server/Objectives/ObjectivesSystem.cs
@@ -36,14 +36,14 @@ public override void Initialize()
     private void OnRoundEndText(RoundEndTextAppendEvent ev)
     {
         // go through each gamerule getting data for the roundend summary.
-        var summaries = new Dictionary<string, Dictionary<string, List<EntityUid>>>();
+        var summaries = new Dictionary<string, Dictionary<string, List<(EntityUid, string)>>>();
         var query = EntityQueryEnumerator<GameRuleComponent>();
         while (query.MoveNext(out var uid, out var gameRule))
         {
             if (!_gameTicker.IsGameRuleAdded(uid, gameRule))
                 continue;
 
-            var info = new ObjectivesTextGetInfoEvent(new List<EntityUid>(), string.Empty);
+            var info = new ObjectivesTextGetInfoEvent(new List<(EntityUid, string)>(), string.Empty);
             RaiseLocalEvent(uid, ref info);
             if (info.Minds.Count == 0)
                 continue;
@@ -51,7 +51,7 @@ private void OnRoundEndText(RoundEndTextAppendEvent ev)
             // first group the gamerules by their agents, for example 2 different dragons
             var agent = info.AgentName;
             if (!summaries.ContainsKey(agent))
-                summaries[agent] = new Dictionary<string, List<EntityUid>>();
+                summaries[agent] = new Dictionary<string, List<(EntityUid, string)>>();
 
             var prepend = new ObjectivesTextPrependEvent("");
             RaiseLocalEvent(uid, ref prepend);
@@ -79,7 +79,7 @@ private void OnRoundEndText(RoundEndTextAppendEvent ev)
             foreach (var (_, minds) in summary)
             {
                 total += minds.Count;
-                totalInCustody += minds.Where(m => IsInCustody(m)).Count();
+                totalInCustody += minds.Where(pair => IsInCustody(pair.Item1)).Count();
             }
 
             var result = new StringBuilder();
@@ -104,19 +104,16 @@ private void OnRoundEndText(RoundEndTextAppendEvent ev)
         }
     }
 
-    private void AddSummary(StringBuilder result, string agent, List<EntityUid> minds)
+    private void AddSummary(StringBuilder result, string agent, List<(EntityUid, string)> minds)
     {
         var agentSummaries = new List<(string summary, float successRate, int completedObjectives)>();
 
-        foreach (var mindId in minds)
+        foreach (var (mindId, name) in minds)
         {
-            if (!TryComp(mindId, out MindComponent? mind))
-                continue;
-
-            var title = GetTitle(mindId, mind);
-            if (title == null)
+            if (!TryComp<MindComponent>(mindId, out var mind))
                 continue;
 
+            var title = GetTitle((mindId, mind), name);
             var custody = IsInCustody(mindId, mind) ? Loc.GetString("objectives-in-custody") : string.Empty;
 
             var objectives = mind.Objectives;
@@ -238,34 +235,18 @@ private bool IsInCustody(EntityUid mindId, MindComponent? mind = null)
 
     /// <summary>
     /// Get the title for a player's mind used in round end.
+    /// Pass in the original entity name which is shown alongside username.
     /// </summary>
-    public string? GetTitle(EntityUid mindId, MindComponent? mind = null)
+    public string GetTitle(Entity<MindComponent?> mind, string name)
     {
-        if (!Resolve(mindId, ref mind))
-            return null;
-
-        var name = mind.CharacterName;
-        var username = (string?) null;
-
-        if (mind.OriginalOwnerUserId != null &&
-            _player.TryGetPlayerData(mind.OriginalOwnerUserId.Value, out var sessionData))
+        if (Resolve(mind, ref mind.Comp) &&
+            mind.Comp.OriginalOwnerUserId != null &&
+            _player.TryGetPlayerData(mind.Comp.OriginalOwnerUserId.Value, out var sessionData))
         {
-            username = sessionData.UserName;
+            var username = sessionData.UserName;
+            return Loc.GetString("objectives-player-user-named", ("user", username), ("name", name));
         }
 
-
-        if (username != null)
-        {
-            if (name != null)
-                return Loc.GetString("objectives-player-user-named", ("user", username), ("name", name));
-
-            return Loc.GetString("objectives-player-user", ("user", username));
-        }
-
-        // nothing to identify the player by, just give up
-        if (name == null)
-            return null;
-
         return Loc.GetString("objectives-player-named", ("name", name));
     }
 }
@@ -279,7 +260,7 @@ private bool IsInCustody(EntityUid mindId, MindComponent? mind = null)
 /// The objectives system already checks if the game rule is added so you don't need to check that in this event's handler.
 /// </remarks>
 [ByRefEvent]
-public record struct ObjectivesTextGetInfoEvent(List<EntityUid> Minds, string AgentName);
+public record struct ObjectivesTextGetInfoEvent(List<(EntityUid, string)> Minds, string AgentName);
 
 /// <summary>
 /// Raised on the game rule before text for each agent's objectives is added, letting you prepend something.
diff --git a/Resources/Locale/en-US/objectives/round-end.ftl b/Resources/Locale/en-US/objectives/round-end.ftl
index b4314b2caff..3da81fc9640 100644
--- a/Resources/Locale/en-US/objectives/round-end.ftl
+++ b/Resources/Locale/en-US/objectives/round-end.ftl
@@ -6,7 +6,6 @@ objectives-round-end-result = {$count ->
 objectives-round-end-result-in-custody = {$custody} out of {$count} {MAKEPLURAL($agent)} were in custody.
 
 objectives-player-user-named = [color=White]{$name}[/color] ([color=gray]{$user}[/color])
-objectives-player-user = [color=gray]{$user}[/color]
 objectives-player-named = [color=White]{$name}[/color]
 
 objectives-no-objectives = {$custody}{$title} was a {$agent}.
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 801dcc4b859..d4a58f961aa 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -402,9 +402,9 @@
         prototype: Nukeops
 
 - type: entity
+  noSpawn: true
+  parent: BaseTraitorRule
   id: SleeperAgentsRule
-  parent: BaseGameRule
-  categories: [ HideSpawnMenu ]
   components:
   - type: StationEvent
     earliestStart: 25
@@ -413,7 +413,6 @@
     reoccurrenceDelay: 30
     startAnnouncement: false
   - type: AlertLevelInterceptionRule
-  - type: TraitorRule
   - type: AntagSelection
     definitions:
     - prefRoles: [ Traitor ]
diff --git a/Resources/Prototypes/GameRules/midround.yml b/Resources/Prototypes/GameRules/midround.yml
index fca0073b4e5..ba2cd530480 100644
--- a/Resources/Prototypes/GameRules/midround.yml
+++ b/Resources/Prototypes/GameRules/midround.yml
@@ -35,7 +35,19 @@
   id: Thief
   components:
   - type: ThiefRule
+  - type: AntagObjectives
+    objectives:
+    - EscapeThiefShuttleObjective
+  - type: AntagRandomObjectives
+    sets:
+    - groups: ThiefBigObjectiveGroups
+      prob: 0.7
+      maxPicks: 1
+    - groups: ThiefObjectiveGroups
+      maxPicks: 10
+    maxDifficulty: 2.5
   - type: AntagSelection
+    agentName: thief-round-end-agent-name
     definitions:
     - prefRoles: [ Thief ]
       maxRange:
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index 4ae53c9b37a..a433f10d062 100644
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -134,16 +134,30 @@
         prototype: Nukeops
 
 - type: entity
-  id: Traitor
+  abstract: true
   parent: BaseGameRule
+  id: BaseTraitorRule
+  components:
+  - type: TraitorRule
+  # TODO: codewords in yml
+  # TODO: uplink in yml
+  - type: AntagRandomObjectives
+    sets:
+    - groups: TraitorObjectiveGroups
+    maxDifficulty: 5
+  - type: AntagSelection
+    agentName: traitor-round-end-agent-name
+
+- type: entity
   categories: [ HideSpawnMenu ]
+  parent: BaseTraitorRule
+  id: Traitor
   components:
   - type: GameRule
     minPlayers: 5
     delay:
       min: 240
       max: 420
-  - type: TraitorRule
   - type: AntagSelection
     definitions:
     - prefRoles: [ Traitor ]
diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml
index fb4ce6f4a16..d7e08841307 100644
--- a/Resources/Prototypes/Objectives/objectiveGroups.yml
+++ b/Resources/Prototypes/Objectives/objectiveGroups.yml
@@ -61,11 +61,6 @@
     ThiefObjectiveGroupStructure: 0 #Temporarily disabled until obvious ways to steal structures are added
     ThiefObjectiveGroupAnimal: 2
 
-- type: weightedRandom
-  id: ThiefEscapeObjectiveGroups
-  weights:
-    ThiefObjectiveGroupEscape: 1
-
 - type: weightedRandom
   id: ThiefObjectiveGroupCollection
   weights:

From ef2ea95edefbd814a485a43e255122b837fa2045 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 01:48:14 -0400
Subject: [PATCH 005/366] keep up

---
 Resources/Prototypes/GameRules/events.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index d4a58f961aa..d2780011c96 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -402,7 +402,7 @@
         prototype: Nukeops
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: BaseTraitorRule
   id: SleeperAgentsRule
   components:

From 1fd02db8912480b2988aa7fd45929599e2119ebc Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Sat, 25 May 2024 20:15:56 +0000
Subject: [PATCH 006/366] move nukie profile loading into its own rule (#28208)

* move profile loading out of nukeops rule

* make BaseNukeopsRule and use AntagLoadProfileRule

* untroll

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 .../Rules/AntagLoadProfileRuleSystem.cs       | 39 +++++++++++++++++++
 .../AntagLoadProfileRuleCOmponent.cs          |  7 ++++
 .../GameTicking/Rules/NukeopsRuleSystem.cs    | 29 --------------
 Resources/Prototypes/GameRules/events.yml     |  4 +-
 Resources/Prototypes/GameRules/roundstart.yml | 16 ++++++--
 5 files changed, 60 insertions(+), 35 deletions(-)
 create mode 100644 Content.Server/GameTicking/Rules/AntagLoadProfileRuleSystem.cs
 create mode 100644 Content.Server/GameTicking/Rules/Components/AntagLoadProfileRuleCOmponent.cs

diff --git a/Content.Server/GameTicking/Rules/AntagLoadProfileRuleSystem.cs b/Content.Server/GameTicking/Rules/AntagLoadProfileRuleSystem.cs
new file mode 100644
index 00000000000..fd3fb6cd655
--- /dev/null
+++ b/Content.Server/GameTicking/Rules/AntagLoadProfileRuleSystem.cs
@@ -0,0 +1,39 @@
+using Content.Server.Antag;
+using Content.Server.GameTicking.Rules.Components;
+using Content.Server.Humanoid;
+using Content.Server.Preferences.Managers;
+using Content.Shared.Humanoid;
+using Content.Shared.Humanoid.Prototypes;
+using Content.Shared.Preferences;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.GameTicking.Rules;
+
+public sealed class AntagLoadProfileRuleSystem : GameRuleSystem<AntagLoadProfileRuleComponent>
+{
+    [Dependency] private readonly HumanoidAppearanceSystem _humanoid = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly IServerPreferencesManager _prefs = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<AntagLoadProfileRuleComponent, AntagSelectEntityEvent>(OnSelectEntity);
+    }
+
+    private void OnSelectEntity(Entity<AntagLoadProfileRuleComponent> ent, ref AntagSelectEntityEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        var profile = args.Session != null
+            ? _prefs.GetPreferences(args.Session.UserId).SelectedCharacter as HumanoidCharacterProfile
+            : HumanoidCharacterProfile.RandomWithSpecies();
+        if (profile?.Species is not {} speciesId || !_proto.TryIndex<SpeciesPrototype>(speciesId, out var species))
+            species = _proto.Index<SpeciesPrototype>(SharedHumanoidAppearanceSystem.DefaultSpecies);
+
+        args.Entity = Spawn(species.Prototype);
+        _humanoid.LoadProfile(args.Entity.Value, profile);
+    }
+}
diff --git a/Content.Server/GameTicking/Rules/Components/AntagLoadProfileRuleCOmponent.cs b/Content.Server/GameTicking/Rules/Components/AntagLoadProfileRuleCOmponent.cs
new file mode 100644
index 00000000000..5e58fd14fc0
--- /dev/null
+++ b/Content.Server/GameTicking/Rules/Components/AntagLoadProfileRuleCOmponent.cs
@@ -0,0 +1,7 @@
+namespace Content.Server.GameTicking.Rules.Components;
+
+/// <summary>
+/// Makes this rules antags spawn a humanoid, either from the player's profile or a random one.
+/// </summary>
+[RegisterComponent]
+public sealed partial class AntagLoadProfileRuleComponent : Component;
diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
index 7cc51db5766..c3e8e90f843 100644
--- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -1,13 +1,9 @@
 using Content.Server.Antag;
 using Content.Server.Communications;
 using Content.Server.GameTicking.Rules.Components;
-using Content.Server.Humanoid;
-using Content.Server.NPC.Components;
-using Content.Server.NPC.Systems;
 using Content.Server.Nuke;
 using Content.Server.NukeOps;
 using Content.Server.Popups;
-using Content.Server.Preferences.Managers;
 using Content.Server.Roles;
 using Content.Server.RoundEnd;
 using Content.Server.Shuttles.Events;
@@ -15,19 +11,14 @@
 using Content.Server.Station.Components;
 using Content.Server.Store.Components;
 using Content.Server.Store.Systems;
-using Content.Shared.GameTicking.Components;
-using Content.Shared.Humanoid;
-using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Nuke;
 using Content.Shared.NukeOps;
-using Content.Shared.Preferences;
 using Content.Shared.Store;
 using Content.Shared.Tag;
 using Content.Shared.Zombies;
 using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 using System.Linq;
@@ -36,10 +27,7 @@ namespace Content.Server.GameTicking.Rules;
 
 public sealed class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
 {
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly IServerPreferencesManager _prefs = default!;
     [Dependency] private readonly EmergencyShuttleSystem _emergency = default!;
-    [Dependency] private readonly HumanoidAppearanceSystem _humanoid = default!;
     [Dependency] private readonly NpcFactionSystem _npcFaction = default!;
     [Dependency] private readonly AntagSelectionSystem _antag = default!;
     [Dependency] private readonly PopupSystem _popupSystem = default!;
@@ -71,7 +59,6 @@ public override void Initialize()
         SubscribeLocalEvent<WarDeclaredEvent>(OnWarDeclared);
         SubscribeLocalEvent<CommunicationConsoleCallShuttleAttemptEvent>(OnShuttleCallAttempt);
 
-        SubscribeLocalEvent<NukeopsRuleComponent, AntagSelectEntityEvent>(OnAntagSelectEntity);
         SubscribeLocalEvent<NukeopsRuleComponent, AfterAntagEntitySelectedEvent>(OnAfterAntagEntSelected);
     }
 
@@ -471,22 +458,6 @@ private void CheckRoundShouldEnd(Entity<NukeopsRuleComponent> ent)
         nukeops.RoundEndBehavior = RoundEndBehavior.Nothing;
     }
 
-    // this should really go anywhere else but im tired.
-    private void OnAntagSelectEntity(Entity<NukeopsRuleComponent> ent, ref AntagSelectEntityEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        var profile = args.Session != null
-            ? _prefs.GetPreferences(args.Session.UserId).SelectedCharacter as HumanoidCharacterProfile
-            : HumanoidCharacterProfile.RandomWithSpecies();
-        if (!_prototypeManager.TryIndex(profile?.Species ?? SharedHumanoidAppearanceSystem.DefaultSpecies, out SpeciesPrototype? species))
-            species = _prototypeManager.Index<SpeciesPrototype>(SharedHumanoidAppearanceSystem.DefaultSpecies);
-
-        args.Entity = Spawn(species.Prototype);
-        _humanoid.LoadProfile(args.Entity.Value, profile!);
-    }
-
     private void OnAfterAntagEntSelected(Entity<NukeopsRuleComponent> ent, ref AfterAntagEntitySelectedEvent args)
     {
         if (ent.Comp.TargetStation is not { } station)
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index d2780011c96..a0649eb2d6b 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -368,9 +368,9 @@
         prototype: InitialInfected
 
 - type: entity
-  id: LoneOpsSpawn
-  parent: BaseGameRule
   categories: [ HideSpawnMenu ]
+  parent: BaseNukeopsRule
+  id: LoneOpsSpawn
   components:
   - type: StationEvent
     earliestStart: 35
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index a433f10d062..80354861ade 100644
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -64,17 +64,25 @@
     roundEndDelay: 10
 
 - type: entity
-  id: Nukeops
+  abstract: true
   parent: BaseGameRule
-  categories: [ HideSpawnMenu ]
+  id: BaseNukeopsRule
   components:
-  - type: GameRule
-    minPlayers: 35
   - type: RandomMetadata #this generates the random operation name cuz it's cool.
     nameSegments:
     - operationPrefix
     - operationSuffix
   - type: NukeopsRule
+  - type: AntagSelection
+  - type: AntagLoadProfileRule
+
+- type: entity
+  categories: [ HideSpawnMenu ]
+  parent: BaseNukeopsRule
+  id: Nukeops
+  components:
+  - type: GameRule
+    minPlayers: 20
   - type: LoadMapRule
     gameMap: NukieOutpost
   - type: AntagSelection

From 4939a31b158ca33295512acf314f6d0512e9ef5f Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Thu, 11 Jul 2024 05:55:56 +0000
Subject: [PATCH 007/366] item toggling giga rework + full ninja refactor
 (#28039)

* item toggle refactoring and some new systems

* add ToggleClothing component/system

* unhardcode magboots gravity logic

* make magboots and speedboots use ItemToggle and stuff

* remove now useless clothing components

* update client/server magboots systems

* add note to use ItemToggledEvent in ToggleActionEvent doc

* refactor PowerCellDraw to use ItemToggle for ui open/close control

* add TryUseCharges, refactor charges system

* update magboot trigger code

* make borg use ItemToggle, network SelectedModule instead of now removed Activated

* add AccessToggle for borg

* the giga ninja refactor

* update ninja yml

* update ItemToggle usage for some stuff

* fix activatableui requires power

* random fixing

* yaml fixing

* nuke ItemToggleDisarmMalus

* make defib use ItemToggle

* make things that use power not turn on if missing use charge

* pro

* fix sound prediction

* bruh

* proximity detector use ItemToggle

* oop

* big idiot syndrome

* fix ninja spawn rule and make it generic

* fix ninja spawn rule yml

* move loading profiles into AntagLoadProfileRule

* more ninja refactor

* ninja yml fixes

* the dreaded copy paste ops

* remove useless NinjaRuleComponent and ue AntagSelection for greeting

* fix invisibility

* move IsCompleted to SharedObjectivesSystem

* ability fixes

* oop fix powercell instantly draining itself

* sentient speedboots gaming

* make reflect use ItemToggle

* fix other test

* loadprofilerule moved into its own pr

* remove conflict with dragon refactor

* remove all GenericAntag code from ninja

* )

* probably

* remove old enabled

* great language bravo vince

* GREAT LANGUAGE

* who made this language

* because it stinks

* reparent blood-red magboots to magboots probbbly works

* most of the review stuff

* hasGrav doesnt mean what i thought it did

* make health analyzer use itemtoggle, not fail test

* fix mag/speed boots being wacky

* UNTROLL

* add ItemToggle to the random health analyzers

* a

* remove unused obsolete borg func

* untrolling

* :trollface:

* fix test

* fix

* g

* untroll

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 .../Items/Systems/ItemToggleSystem.cs         |   9 -
 .../Ninja/Systems/ItemCreatorSystem.cs        |   5 +
 .../Ninja/Systems/NinjaGlovesSystem.cs        |   7 +-
 .../Ninja/Systems/NinjaSuitSystem.cs          |  21 +-
 Content.Client/Ninja/Systems/NinjaSystem.cs   |   9 +-
 .../Ninja/Systems/SpiderChargeSystem.cs       |   5 +
 .../Interaction/InteractionTest.Helpers.cs    |   2 +-
 .../Tests/Interaction/InteractionTest.cs      |   4 +-
 .../Components/AutoRechargeComponent.cs       |   1 +
 .../Charges/Systems/ChargesSystem.cs          |  12 +-
 .../Rules/Components/NinjaRuleComponent.cs    |  27 ---
 .../ItemToggleDisarmMalusComponent.cs         |  22 ---
 .../Components/ItemToggleSharpComponent.cs    |   9 -
 .../Item/ItemToggle/ItemToggleSystem.cs       |  44 -----
 .../Components/HealthAnalyzerComponent.cs     |   3 +
 Content.Server/Medical/DefibrillatorSystem.cs |  72 +------
 .../Medical/HealthAnalyzerSystem.cs           |  21 +-
 .../Ninja/Events/BatteryChangedEvent.cs       |   2 +-
 .../Ninja/Systems/BatteryDrainerSystem.cs     |  21 +-
 .../Ninja/Systems/ItemCreatorSystem.cs        |  57 ++++++
 .../Ninja/Systems/NinjaGlovesSystem.cs        | 102 +++-------
 .../Ninja/Systems/NinjaSuitSystem.cs          |  79 ++------
 .../Ninja/Systems/SpaceNinjaSystem.cs         |  80 +-------
 .../Ninja/Systems/SpiderChargeSystem.cs       |   3 +-
 .../Ninja/Systems/StunProviderSystem.cs       |  22 ++-
 .../Objectives/Systems/CodeConditionSystem.cs |  14 --
 .../PowerCell/PowerCellSystem.Draw.cs         |  38 ++--
 Content.Server/PowerCell/PowerCellSystem.cs   |   2 +-
 .../Silicons/Borgs/BorgSystem.Modules.cs      |   4 +-
 Content.Server/Silicons/Borgs/BorgSystem.cs   |  79 +++-----
 .../Components/NinjaSpawnRuleComponent.cs     |  16 --
 .../Components/SpaceSpawnRuleComponent.cs     |  25 +++
 .../{NinjaSpawnRule.cs => SpaceSpawnRule.cs}  |  38 ++--
 .../Stunnable/Systems/StunbatonSystem.cs      |   2 +-
 .../Weapons/Misc/TetherGunSystem.cs           |   6 +-
 .../Systems/ArtifactMagnetTriggerSystem.cs    |   9 +-
 .../Components/AccessToggleComponent.cs       |  11 ++
 .../Access/Systems/AccessToggleSystem.cs      |  21 ++
 .../Beeper/Components/BeeperComponent.cs      |  11 +-
 Content.Shared/Beeper/Systems/BeeperSystem.cs |  37 ++--
 .../Beeper/Systems/ProximityBeeperSystem.cs   |  84 +-------
 .../Charges/Systems/SharedChargesSystem.cs    |  33 +++-
 .../ClothingSpeedModifierComponent.cs         |  19 +-
 .../Clothing/ClothingSpeedModifierSystem.cs   | 107 ++---------
 .../Components/StealthClothingComponent.cs    |  43 -----
 .../Components/ToggleClothingComponent.cs     |  40 ++++
 .../ToggleClothingSpeedComponent.cs           |  35 ----
 .../EntitySystems/StealthClothingSystem.cs    | 144 --------------
 .../EntitySystems/ToggleClothingSystem.cs     |  58 ++++++
 Content.Shared/Clothing/MagbootsComponent.cs  |  20 +-
 Content.Shared/Clothing/MagbootsSystem.cs     |  90 +++++++++
 .../Clothing/SharedMagbootsSystem.cs          | 101 ----------
 .../Item/ItemToggle/ComponentTogglerSystem.cs |  26 +++
 .../Components/ComponentTogglerComponent.cs   |  32 ++++
 .../ItemToggleActiveSoundComponent.cs         |   4 +-
 .../Components/ItemToggleComponent.cs         |   9 +-
 .../Components/ToggleVerbComponent.cs         |  18 ++
 ...temToggleSystem.cs => ItemToggleSystem.cs} | 180 +++++++++---------
 .../Item/ItemToggle/ToggleVerbSystem.cs       |  34 ++++
 .../Medical/DefibrillatorComponent.cs         |  16 +-
 .../Components/BatteryDrainerComponent.cs     |  12 +-
 .../Components/BombingTargetComponent.cs      |   4 +-
 .../Ninja/Components/DashAbilityComponent.cs  |  14 +-
 .../Ninja/Components/EmagProviderComponent.cs |  13 +-
 .../Ninja/Components/EnergyKatanaComponent.cs |   4 +-
 .../Ninja/Components/ItemCreatorComponent.cs  |  52 +++++
 .../Ninja/Components/NinjaGlovesComponent.cs  |  44 +++--
 .../Ninja/Components/NinjaSuitComponent.cs    |  87 ++-------
 .../Ninja/Components/SpaceNinjaComponent.cs   |  19 +-
 .../Ninja/Components/SpiderChargeComponent.cs |   9 +-
 .../Ninja/Components/StunProviderComponent.cs |  38 ++--
 .../Ninja/Systems/DashAbilitySystem.cs        |  80 +++-----
 .../Ninja/Systems/EmagProviderSystem.cs       |  27 +--
 .../Ninja/Systems/EnergyKatanaSystem.cs       |  25 +--
 .../Ninja/Systems/ItemCreatorSystem.cs        |  56 ++++++
 .../Systems/SharedBatteryDrainerSystem.cs     |  25 ++-
 .../Ninja/Systems/SharedNinjaGlovesSystem.cs  | 108 ++++++-----
 .../Ninja/Systems/SharedNinjaSuitSystem.cs    | 154 ++++++++-------
 .../Ninja/Systems/SharedSpaceNinjaSystem.cs   |  59 +++---
 .../Ninja/Systems/SharedSpiderChargeSystem.cs |   6 +
 .../Ninja/Systems/SharedStunProviderSystem.cs |  18 +-
 .../Systems/SharedObjectivesSystem.cs         |  35 +++-
 .../Pinpointer/SharedProximityBeeper.cs       |   9 -
 .../PowerCell/PowerCellDrawComponent.cs       |  18 +-
 .../PowerCell/SharedPowerCellSystem.cs        |  27 ++-
 .../Components/ProximityDetectorComponent.cs  |   8 +-
 .../Systems/ProximityDetectionSystem.cs       |  86 ++++-----
 .../Borgs/Components/BorgChassisComponent.cs  |   8 +-
 .../Silicons/Borgs/SharedBorgSystem.cs        |   4 +-
 .../Toggleable/ToggleActionEvent.cs           |   7 +-
 .../Tools/Systems/SharedToolSystem.cs         |   2 +-
 .../ActivatableUISystem.Power.cs              |  24 ++-
 .../Weapons/Reflect/ReflectComponent.cs       |   7 +-
 .../Weapons/Reflect/ReflectSystem.cs          |  32 ++--
 Resources/Prototypes/Actions/ninja.yml        |  10 +-
 .../Entities/Clothing/Hands/gloves.yml        |  27 ++-
 .../Entities/Clothing/Head/misc.yml           |  30 +++
 .../Entities/Clothing/OuterClothing/suits.yml |  26 ++-
 .../Entities/Clothing/Shoes/magboots.yml      | 155 ++++-----------
 .../Entities/Clothing/Shoes/misc.yml          |  31 ++-
 .../Entities/Clothing/base_clothing.yml       |   9 +
 .../Entities/Markers/Spawners/ghost_roles.yml |   7 +-
 .../Mobs/Cyborgs/base_borg_chassis.yml        |   5 +
 .../Prototypes/Entities/Mobs/Player/human.yml |  25 ---
 .../Objects/Devices/base_handheld.yml         |  11 ++
 .../Entities/Objects/Devices/pda.yml          |   3 +
 .../Entities/Objects/Devices/station_map.yml  |  11 +-
 .../Entities/Objects/Shields/shields.yml      |  13 +-
 .../Objects/Specific/Medical/defib.yml        |   5 +
 .../Medical/handheld_crew_monitor.yml         |   9 +-
 .../Specific/Medical/healthanalyzer.yml       |   2 +
 .../Objects/Specific/Research/anomaly.yml     |   9 +-
 .../Objects/Tools/handheld_mass_scanner.yml   |   3 +-
 .../Entities/Objects/Tools/welders.yml        |   6 +-
 .../Weapons/Guns/Launchers/launchers.yml      |   4 +
 .../Objects/Weapons/Melee/e_sword.yml         |  43 ++---
 .../Entities/Objects/Weapons/Melee/sword.yml  |  14 +-
 .../Structures/Machines/Medical/cryo_pod.yml  |   1 +
 Resources/Prototypes/GameRules/events.yml     |  38 +++-
 Resources/Prototypes/GameRules/midround.yml   |  31 ---
 120 files changed, 1653 insertions(+), 2041 deletions(-)
 delete mode 100644 Content.Client/Items/Systems/ItemToggleSystem.cs
 create mode 100644 Content.Client/Ninja/Systems/ItemCreatorSystem.cs
 create mode 100644 Content.Client/Ninja/Systems/SpiderChargeSystem.cs
 delete mode 100644 Content.Server/GameTicking/Rules/Components/NinjaRuleComponent.cs
 delete mode 100644 Content.Server/Item/ItemToggle/Components/ItemToggleDisarmMalusComponent.cs
 delete mode 100644 Content.Server/Item/ItemToggle/Components/ItemToggleSharpComponent.cs
 delete mode 100644 Content.Server/Item/ItemToggle/ItemToggleSystem.cs
 create mode 100644 Content.Server/Ninja/Systems/ItemCreatorSystem.cs
 delete mode 100644 Content.Server/StationEvents/Components/NinjaSpawnRuleComponent.cs
 create mode 100644 Content.Server/StationEvents/Components/SpaceSpawnRuleComponent.cs
 rename Content.Server/StationEvents/Events/{NinjaSpawnRule.cs => SpaceSpawnRule.cs} (53%)
 create mode 100644 Content.Shared/Access/Components/AccessToggleComponent.cs
 create mode 100644 Content.Shared/Access/Systems/AccessToggleSystem.cs
 delete mode 100644 Content.Shared/Clothing/Components/StealthClothingComponent.cs
 create mode 100644 Content.Shared/Clothing/Components/ToggleClothingComponent.cs
 delete mode 100644 Content.Shared/Clothing/Components/ToggleClothingSpeedComponent.cs
 delete mode 100644 Content.Shared/Clothing/EntitySystems/StealthClothingSystem.cs
 create mode 100644 Content.Shared/Clothing/EntitySystems/ToggleClothingSystem.cs
 create mode 100644 Content.Shared/Clothing/MagbootsSystem.cs
 delete mode 100644 Content.Shared/Clothing/SharedMagbootsSystem.cs
 create mode 100644 Content.Shared/Item/ItemToggle/ComponentTogglerSystem.cs
 create mode 100644 Content.Shared/Item/ItemToggle/Components/ComponentTogglerComponent.cs
 create mode 100644 Content.Shared/Item/ItemToggle/Components/ToggleVerbComponent.cs
 rename Content.Shared/Item/ItemToggle/{SharedItemToggleSystem.cs => ItemToggleSystem.cs} (67%)
 create mode 100644 Content.Shared/Item/ItemToggle/ToggleVerbSystem.cs
 create mode 100644 Content.Shared/Ninja/Components/ItemCreatorComponent.cs
 create mode 100644 Content.Shared/Ninja/Systems/ItemCreatorSystem.cs
 create mode 100644 Content.Shared/Ninja/Systems/SharedSpiderChargeSystem.cs
 delete mode 100644 Content.Shared/Pinpointer/SharedProximityBeeper.cs
 create mode 100644 Resources/Prototypes/Entities/Objects/Devices/base_handheld.yml

diff --git a/Content.Client/Items/Systems/ItemToggleSystem.cs b/Content.Client/Items/Systems/ItemToggleSystem.cs
deleted file mode 100644
index 46d6f1b464d..00000000000
--- a/Content.Client/Items/Systems/ItemToggleSystem.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Content.Shared.Item.ItemToggle;
-
-namespace Content.Shared.Item;
-
-/// <inheritdoc/>
-public sealed class ItemToggleSystem : SharedItemToggleSystem
-{
-
-}
diff --git a/Content.Client/Ninja/Systems/ItemCreatorSystem.cs b/Content.Client/Ninja/Systems/ItemCreatorSystem.cs
new file mode 100644
index 00000000000..9ab62cc12db
--- /dev/null
+++ b/Content.Client/Ninja/Systems/ItemCreatorSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Ninja.Systems;
+
+namespace Content.Client.Ninja.Systems;
+
+public sealed class ItemCreatorSystem : SharedItemCreatorSystem;
diff --git a/Content.Client/Ninja/Systems/NinjaGlovesSystem.cs b/Content.Client/Ninja/Systems/NinjaGlovesSystem.cs
index 7758c3d7e2b..5b07b1588fd 100644
--- a/Content.Client/Ninja/Systems/NinjaGlovesSystem.cs
+++ b/Content.Client/Ninja/Systems/NinjaGlovesSystem.cs
@@ -2,9 +2,4 @@
 
 namespace Content.Client.Ninja.Systems;
 
-/// <summary>
-/// Does nothing special, only exists to provide a client implementation.
-/// </summary>
-public sealed class NinjaGlovesSystem : SharedNinjaGlovesSystem
-{
-}
+public sealed class NinjaGlovesSystem : SharedNinjaGlovesSystem;
diff --git a/Content.Client/Ninja/Systems/NinjaSuitSystem.cs b/Content.Client/Ninja/Systems/NinjaSuitSystem.cs
index fde1801b37d..852ea8af46e 100644
--- a/Content.Client/Ninja/Systems/NinjaSuitSystem.cs
+++ b/Content.Client/Ninja/Systems/NinjaSuitSystem.cs
@@ -1,24 +1,5 @@
-using Content.Shared.Clothing.EntitySystems;
-using Content.Shared.Ninja.Components;
 using Content.Shared.Ninja.Systems;
 
 namespace Content.Client.Ninja.Systems;
 
-/// <summary>
-/// Disables cloak prediction since client has no knowledge of battery power.
-/// Cloak will still be enabled after server tells it.
-/// </summary>
-public sealed class NinjaSuitSystem : SharedNinjaSuitSystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<NinjaSuitComponent, AttemptStealthEvent>(OnAttemptStealth);
-    }
-
-    private void OnAttemptStealth(EntityUid uid, NinjaSuitComponent comp, AttemptStealthEvent args)
-    {
-        args.Cancel();
-    }
-}
+public sealed class NinjaSuitSystem : SharedNinjaSuitSystem;
diff --git a/Content.Client/Ninja/Systems/NinjaSystem.cs b/Content.Client/Ninja/Systems/NinjaSystem.cs
index aa2fa2047f1..958dc6a5d9a 100644
--- a/Content.Client/Ninja/Systems/NinjaSystem.cs
+++ b/Content.Client/Ninja/Systems/NinjaSystem.cs
@@ -2,11 +2,4 @@
 
 namespace Content.Client.Ninja.Systems;
 
-/// <summary>
-/// Currently does nothing special clientside.
-/// All functionality is in shared and server.
-/// Only exists to prevent crashing.
-/// </summary>
-public sealed class SpaceNinjaSystem : SharedSpaceNinjaSystem
-{
-}
+public sealed class SpaceNinjaSystem : SharedSpaceNinjaSystem;
diff --git a/Content.Client/Ninja/Systems/SpiderChargeSystem.cs b/Content.Client/Ninja/Systems/SpiderChargeSystem.cs
new file mode 100644
index 00000000000..b107fd3867d
--- /dev/null
+++ b/Content.Client/Ninja/Systems/SpiderChargeSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Ninja.Systems;
+
+namespace Content.Client.Ninja.Systems;
+
+public sealed class SpiderChargeSystem : SharedSpiderChargeSystem;
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
index a19b62cd70a..0f2c314ed01 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
@@ -171,7 +171,7 @@ await Server.WaitPost(() =>
             // turn on welders
             if (enableToggleable && SEntMan.TryGetComponent(item, out itemToggle) && !itemToggle.Activated)
             {
-                Assert.That(ItemToggleSys.TryActivate(item, playerEnt, itemToggle: itemToggle));
+                Assert.That(ItemToggleSys.TryActivate((item, itemToggle), user: playerEnt));
             }
         });
 
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
index 457d3e31920..b3d684e01a0 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
@@ -104,7 +104,7 @@ public abstract partial class InteractionTest
     protected Content.Server.Construction.ConstructionSystem SConstruction = default!;
     protected SharedDoAfterSystem DoAfterSys = default!;
     protected ToolSystem ToolSys = default!;
-    protected SharedItemToggleSystem ItemToggleSys = default!;
+    protected ItemToggleSystem ItemToggleSys = default!;
     protected InteractionTestSystem STestSystem = default!;
     protected SharedTransformSystem Transform = default!;
     protected SharedMapSystem MapSystem = default!;
@@ -165,7 +165,7 @@ public virtual async Task Setup()
         HandSys = SEntMan.System<HandsSystem>();
         InteractSys = SEntMan.System<SharedInteractionSystem>();
         ToolSys = SEntMan.System<ToolSystem>();
-        ItemToggleSys = SEntMan.System<SharedItemToggleSystem>();
+        ItemToggleSys = SEntMan.System<ItemToggleSystem>();
         DoAfterSys = SEntMan.System<SharedDoAfterSystem>();
         Transform = SEntMan.System<SharedTransformSystem>();
         MapSystem = SEntMan.System<SharedMapSystem>();
diff --git a/Content.Server/Charges/Components/AutoRechargeComponent.cs b/Content.Server/Charges/Components/AutoRechargeComponent.cs
index 9dcf555ea93..165b181dcbc 100644
--- a/Content.Server/Charges/Components/AutoRechargeComponent.cs
+++ b/Content.Server/Charges/Components/AutoRechargeComponent.cs
@@ -7,6 +7,7 @@ namespace Content.Server.Charges.Components;
 /// Something with limited charges that can be recharged automatically.
 /// Requires LimitedChargesComponent to function.
 /// </summary>
+// TODO: no reason this cant be predicted and server system deleted
 [RegisterComponent, AutoGenerateComponentPause]
 [Access(typeof(ChargesSystem))]
 public sealed partial class AutoRechargeComponent : Component
diff --git a/Content.Server/Charges/Systems/ChargesSystem.cs b/Content.Server/Charges/Systems/ChargesSystem.cs
index 03e192e680e..974928ee4bb 100644
--- a/Content.Server/Charges/Systems/ChargesSystem.cs
+++ b/Content.Server/Charges/Systems/ChargesSystem.cs
@@ -37,15 +37,17 @@ protected override void OnExamine(EntityUid uid, LimitedChargesComponent comp, E
         args.PushMarkup(Loc.GetString("limited-charges-recharging", ("seconds", timeRemaining)));
     }
 
-    public override void UseCharge(EntityUid uid, LimitedChargesComponent? comp = null)
+    public override void AddCharges(EntityUid uid, int change, LimitedChargesComponent? comp = null)
     {
-        if (!Resolve(uid, ref comp, false))
+        if (!Query.Resolve(uid, ref comp, false))
             return;
 
         var startRecharge = comp.Charges == comp.MaxCharges;
-        base.UseCharge(uid, comp);
-        // start the recharge time after first use at full charge
-        if (startRecharge && TryComp<AutoRechargeComponent>(uid, out var recharge))
+        base.AddCharges(uid, change, comp);
+
+        // if a charge was just used from full, start the recharge timer
+        // TODO: probably make this an event instead of having le server system that just does this
+        if (change < 0 && startRecharge && TryComp<AutoRechargeComponent>(uid, out var recharge))
             recharge.NextChargeTime = _timing.CurTime + recharge.RechargeDuration;
     }
 }
diff --git a/Content.Server/GameTicking/Rules/Components/NinjaRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/NinjaRuleComponent.cs
deleted file mode 100644
index fa352eb320b..00000000000
--- a/Content.Server/GameTicking/Rules/Components/NinjaRuleComponent.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Content.Server.Ninja.Systems;
-using Content.Shared.Communications;
-using Content.Shared.Random;
-using Robust.Shared.Audio;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.GameTicking.Rules.Components;
-
-/// <summary>
-/// Stores some configuration used by the ninja system.
-/// Objectives and roundend summary are handled by <see cref="GenericAntagRuleComponent"/>.
-/// </summary>
-[RegisterComponent, Access(typeof(SpaceNinjaSystem))]
-public sealed partial class NinjaRuleComponent : Component
-{
-    /// <summary>
-    /// List of threats that can be called in. Copied onto <see cref="CommsHackerComponent"/> when gloves are enabled.
-    /// </summary>
-    [DataField(required: true)]
-    public ProtoId<WeightedRandomPrototype> Threats = string.Empty;
-
-    /// <summary>
-    /// Sound played when making the player a ninja via antag control or ghost role
-    /// </summary>
-    [DataField]
-    public SoundSpecifier? GreetingSound = new SoundPathSpecifier("/Audio/Misc/ninja_greeting.ogg");
-}
diff --git a/Content.Server/Item/ItemToggle/Components/ItemToggleDisarmMalusComponent.cs b/Content.Server/Item/ItemToggle/Components/ItemToggleDisarmMalusComponent.cs
deleted file mode 100644
index 30fa84ed90b..00000000000
--- a/Content.Server/Item/ItemToggle/Components/ItemToggleDisarmMalusComponent.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace Content.Server.Item;
-
-/// <summary>
-/// Handles whether this item applies a disarm malus when active.
-/// </summary>
-[RegisterComponent]
-public sealed partial class ItemToggleDisarmMalusComponent : Component
-{
-    /// <summary>
-    ///     Item has this modifier to the chance to disarm when activated.
-    ///     If null, the value will be inferred from the current malus just before the malus is first deactivated.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadOnly), DataField]
-    public float? ActivatedDisarmMalus = null;
-
-    /// <summary>
-    ///     Item has this modifier to the chance to disarm when deactivated. If none is mentioned, it uses the item's default disarm modifier.
-    ///     If null, the value will be inferred from the current malus just before the malus is first activated.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadOnly), DataField]
-    public float? DeactivatedDisarmMalus = null;
-}
diff --git a/Content.Server/Item/ItemToggle/Components/ItemToggleSharpComponent.cs b/Content.Server/Item/ItemToggle/Components/ItemToggleSharpComponent.cs
deleted file mode 100644
index 227491b16c2..00000000000
--- a/Content.Server/Item/ItemToggle/Components/ItemToggleSharpComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Content.Server.Item;
-
-/// <summary>
-/// Handles whether this item is sharp when toggled on.
-/// </summary>
-[RegisterComponent]
-public sealed partial class ItemToggleSharpComponent : Component
-{
-}
diff --git a/Content.Server/Item/ItemToggle/ItemToggleSystem.cs b/Content.Server/Item/ItemToggle/ItemToggleSystem.cs
deleted file mode 100644
index f98415eb08f..00000000000
--- a/Content.Server/Item/ItemToggle/ItemToggleSystem.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using Content.Server.CombatMode.Disarm;
-using Content.Server.Kitchen.Components;
-using Content.Shared.Item.ItemToggle;
-using Content.Shared.Item.ItemToggle.Components;
-
-namespace Content.Server.Item;
-
-public sealed class ItemToggleSystem : SharedItemToggleSystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<ItemToggleSharpComponent, ItemToggledEvent>(ToggleSharp);
-        SubscribeLocalEvent<ItemToggleDisarmMalusComponent, ItemToggledEvent>(ToggleMalus);
-    }
-
-    private void ToggleSharp(Entity<ItemToggleSharpComponent> ent, ref ItemToggledEvent args)
-    {
-        // TODO generalize this into a  "ToggleComponentComponent", though probably with a better name
-        if (args.Activated)
-            EnsureComp<SharpComponent>(ent);
-        else
-            RemCompDeferred<SharpComponent>(ent);
-    }
-
-    private void ToggleMalus(Entity<ItemToggleDisarmMalusComponent> ent, ref ItemToggledEvent args)
-    {
-        if (!TryComp<DisarmMalusComponent>(ent, out var malus))
-            return;
-
-        if (args.Activated)
-        {
-            ent.Comp.DeactivatedDisarmMalus ??= malus.Malus;
-            if (ent.Comp.ActivatedDisarmMalus is {} activatedMalus)
-                malus.Malus = activatedMalus;
-            return;
-        }
-
-        ent.Comp.ActivatedDisarmMalus ??= malus.Malus;
-        if (ent.Comp.DeactivatedDisarmMalus is {} deactivatedMalus)
-            malus.Malus = deactivatedMalus;
-    }
-}
diff --git a/Content.Server/Medical/Components/HealthAnalyzerComponent.cs b/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
index f0b56cbd195..9d25db680ec 100644
--- a/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
+++ b/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
@@ -6,6 +6,9 @@ namespace Content.Server.Medical.Components;
 /// <summary>
 /// After scanning, retrieves the target Uid to use with its related UI.
 /// </summary>
+/// <remarks>
+/// Requires <c>ItemToggleComponent</c>.
+/// </remarks>
 [RegisterComponent, AutoGenerateComponentPause]
 [Access(typeof(HealthAnalyzerSystem), typeof(CryoPodSystem))]
 public sealed partial class HealthAnalyzerComponent : Component
diff --git a/Content.Server/Medical/DefibrillatorSystem.cs b/Content.Server/Medical/DefibrillatorSystem.cs
index 7b0b4110201..d0c650c4e84 100644
--- a/Content.Server/Medical/DefibrillatorSystem.cs
+++ b/Content.Server/Medical/DefibrillatorSystem.cs
@@ -12,6 +12,7 @@
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Components;
 using Content.Shared.Interaction.Events;
+using Content.Shared.Item.ItemToggle;
 using Content.Shared.Medical;
 using Content.Shared.Mind;
 using Content.Shared.Mobs;
@@ -37,6 +38,7 @@ public sealed class DefibrillatorSystem : EntitySystem
     [Dependency] private readonly DoAfterSystem _doAfter = default!;
     [Dependency] private readonly ElectrocutionSystem _electrocution = default!;
     [Dependency] private readonly EuiManager _euiManager = default!;
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
     [Dependency] private readonly RottingSystem _rotting = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly MobThresholdSystem _mobThreshold = default!;
@@ -50,30 +52,10 @@ public sealed class DefibrillatorSystem : EntitySystem
     /// <inheritdoc/>
     public override void Initialize()
     {
-        SubscribeLocalEvent<DefibrillatorComponent, UseInHandEvent>(OnUseInHand);
-        SubscribeLocalEvent<DefibrillatorComponent, PowerCellSlotEmptyEvent>(OnPowerCellSlotEmpty);
         SubscribeLocalEvent<DefibrillatorComponent, AfterInteractEvent>(OnAfterInteract);
         SubscribeLocalEvent<DefibrillatorComponent, DefibrillatorZapDoAfterEvent>(OnDoAfter);
     }
 
-    private void OnUseInHand(EntityUid uid, DefibrillatorComponent component, UseInHandEvent args)
-    {
-        if (args.Handled || !TryComp(uid, out UseDelayComponent? useDelay) || _useDelay.IsDelayed((uid, useDelay)))
-            return;
-
-        if (!TryToggle(uid, component, args.User))
-            return;
-
-        args.Handled = true;
-        _useDelay.TryResetDelay((uid, useDelay));
-    }
-
-    private void OnPowerCellSlotEmpty(EntityUid uid, DefibrillatorComponent component, ref PowerCellSlotEmptyEvent args)
-    {
-        if (!TerminatingOrDeleted(uid))
-            TryDisable(uid, component);
-    }
-
     private void OnAfterInteract(EntityUid uid, DefibrillatorComponent component, AfterInteractEvent args)
     {
         if (args.Handled || args.Target is not { } target)
@@ -96,54 +78,12 @@ private void OnDoAfter(EntityUid uid, DefibrillatorComponent component, Defibril
         Zap(uid, target, args.User, component);
     }
 
-    public bool TryToggle(EntityUid uid, DefibrillatorComponent? component = null, EntityUid? user = null)
-    {
-        if (!Resolve(uid, ref component))
-            return false;
-
-        return component.Enabled
-            ? TryDisable(uid, component)
-            : TryEnable(uid, component, user);
-    }
-
-    public bool TryEnable(EntityUid uid, DefibrillatorComponent? component = null, EntityUid? user = null)
-    {
-        if (!Resolve(uid, ref component))
-            return false;
-
-        if (component.Enabled)
-            return false;
-
-        if (!_powerCell.HasActivatableCharge(uid))
-            return false;
-
-        component.Enabled = true;
-        _appearance.SetData(uid, ToggleVisuals.Toggled, true);
-        _audio.PlayPvs(component.PowerOnSound, uid);
-        return true;
-    }
-
-    public bool TryDisable(EntityUid uid, DefibrillatorComponent? component = null)
-    {
-        if (!Resolve(uid, ref component))
-            return false;
-
-        if (!component.Enabled)
-            return false;
-
-        component.Enabled = false;
-        _appearance.SetData(uid, ToggleVisuals.Toggled, false);
-
-        _audio.PlayPvs(component.PowerOffSound, uid);
-        return true;
-    }
-
     public bool CanZap(EntityUid uid, EntityUid target, EntityUid? user = null, DefibrillatorComponent? component = null)
     {
         if (!Resolve(uid, ref component))
             return false;
 
-        if (!component.Enabled)
+        if (!_toggle.IsActivated(uid))
         {
             if (user != null)
                 _popup.PopupEntity(Loc.GetString("defibrillator-not-on"), uid, user.Value);
@@ -250,7 +190,11 @@ public void Zap(EntityUid uid, EntityUid target, EntityUid user, DefibrillatorCo
 
         // if we don't have enough power left for another shot, turn it off
         if (!_powerCell.HasActivatableCharge(uid))
-            TryDisable(uid, component);
+            _toggle.TryDeactivate(uid);
+
+        // TODO clean up this clown show above
+        var ev = new TargetDefibrillatedEvent(user, (uid, component));
+        RaiseLocalEvent(target, ref ev);
     }
 
     public override void Update(float frameTime)
diff --git a/Content.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs
index 11d2758cdd8..f284a214e65 100644
--- a/Content.Server/Medical/HealthAnalyzerSystem.cs
+++ b/Content.Server/Medical/HealthAnalyzerSystem.cs
@@ -14,6 +14,8 @@
 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.MedicalScanner;
 using Content.Shared.Mobs.Components;
 using Content.Shared.PowerCell;
@@ -32,6 +34,7 @@ public sealed class HealthAnalyzerSystem : EntitySystem
     [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 SharedBodySystem _bodySystem = default!;
     [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
     [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
@@ -42,7 +45,7 @@ public override void Initialize()
         SubscribeLocalEvent<HealthAnalyzerComponent, AfterInteractEvent>(OnAfterInteract);
         SubscribeLocalEvent<HealthAnalyzerComponent, HealthAnalyzerDoAfterEvent>(OnDoAfter);
         SubscribeLocalEvent<HealthAnalyzerComponent, EntGotInsertedIntoContainerMessage>(OnInsertedIntoContainer);
-        SubscribeLocalEvent<HealthAnalyzerComponent, PowerCellSlotEmptyEvent>(OnPowerCellSlotEmpty);
+        SubscribeLocalEvent<HealthAnalyzerComponent, ItemToggledEvent>(OnToggled);
         SubscribeLocalEvent<HealthAnalyzerComponent, DroppedEvent>(OnDropped);
         // Start-Shitmed
         Subs.BuiEvents<HealthAnalyzerComponent>(HealthAnalyzerUiKey.Key, subs =>
@@ -132,16 +135,16 @@ private void OnDoAfter(Entity<HealthAnalyzerComponent> uid, ref HealthAnalyzerDo
     private void OnInsertedIntoContainer(Entity<HealthAnalyzerComponent> uid, ref EntGotInsertedIntoContainerMessage args)
     {
         if (uid.Comp.ScannedEntity is { } patient)
-            StopAnalyzingEntity(uid, patient);
+            _toggle.TryDeactivate(uid.Owner);
     }
 
     /// <summary>
-    /// Disable continuous updates once battery is dead
+    /// Disable continuous updates once turned off
     /// </summary>
-    private void OnPowerCellSlotEmpty(Entity<HealthAnalyzerComponent> uid, ref PowerCellSlotEmptyEvent args)
+    private void OnToggled(Entity<HealthAnalyzerComponent> ent, ref ItemToggledEvent args)
     {
-        if (uid.Comp.ScannedEntity is { } patient)
-            StopAnalyzingEntity(uid, patient);
+        if (!args.Activated && ent.Comp.ScannedEntity is { } patient)
+            StopAnalyzingEntity(ent, patient);
     }
 
     /// <summary>
@@ -150,7 +153,7 @@ private void OnPowerCellSlotEmpty(Entity<HealthAnalyzerComponent> uid, ref Power
     private void OnDropped(Entity<HealthAnalyzerComponent> uid, ref DroppedEvent args)
     {
         if (uid.Comp.ScannedEntity is { } patient)
-            StopAnalyzingEntity(uid, patient);
+            _toggle.TryDeactivate(uid.Owner);
     }
 
     private void OpenUserInterface(EntityUid user, EntityUid analyzer)
@@ -171,7 +174,7 @@ private void BeginAnalyzingEntity(Entity<HealthAnalyzerComponent> healthAnalyzer
         //Link the health analyzer to the scanned entity
         healthAnalyzer.Comp.ScannedEntity = target;
         healthAnalyzer.Comp.CurrentBodyPart = part;
-        _cell.SetPowerCellDrawEnabled(healthAnalyzer, true);
+        _toggle.TryActivate(healthAnalyzer.Owner);
 
         UpdateScannedUser(healthAnalyzer, target, true, part);
     }
@@ -187,7 +190,7 @@ private void StopAnalyzingEntity(Entity<HealthAnalyzerComponent> healthAnalyzer,
         healthAnalyzer.Comp.ScannedEntity = null;
         healthAnalyzer.Comp.CurrentBodyPart = null;
 
-        _cell.SetPowerCellDrawEnabled(target, false);
+        _toggle.TryDeactivate(healthAnalyzer.Owner);
 
         UpdateScannedUser(healthAnalyzer, target, false);
     }
diff --git a/Content.Server/Ninja/Events/BatteryChangedEvent.cs b/Content.Server/Ninja/Events/BatteryChangedEvent.cs
index 45bfedfee76..1848e881868 100644
--- a/Content.Server/Ninja/Events/BatteryChangedEvent.cs
+++ b/Content.Server/Ninja/Events/BatteryChangedEvent.cs
@@ -1,7 +1,7 @@
 namespace Content.Server.Ninja.Events;
 
 /// <summary>
-/// Raised on the ninja when the suit has its powercell changed.
+/// Raised on the ninja and suit when the suit has its powercell changed.
 /// </summary>
 [ByRefEvent]
 public record struct NinjaBatteryChangedEvent(EntityUid Battery, EntityUid BatteryHolder);
diff --git a/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs b/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs
index 552ee0397fb..c4b5c6dc2bf 100644
--- a/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs
+++ b/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs
@@ -33,16 +33,17 @@ public override void Initialize()
     /// Start do after for draining a power source.
     /// Can't predict PNBC existing so only done on server.
     /// </summary>
-    private void OnBeforeInteractHand(EntityUid uid, BatteryDrainerComponent comp, BeforeInteractHandEvent args)
+    private void OnBeforeInteractHand(Entity<BatteryDrainerComponent> ent, ref BeforeInteractHandEvent args)
     {
+        var (uid, comp) = ent;
         var target = args.Target;
-        if (args.Handled || comp.BatteryUid == null || !HasComp<PowerNetworkBatteryComponent>(target))
+        if (args.Handled || comp.BatteryUid is not {} battery || !HasComp<PowerNetworkBatteryComponent>(target))
             return;
 
         // handles even if battery is full so you can actually see the poup
         args.Handled = true;
 
-        if (_battery.IsFull(comp.BatteryUid.Value))
+        if (_battery.IsFull(battery))
         {
             _popup.PopupEntity(Loc.GetString("battery-drainer-full"), uid, uid, PopupType.Medium);
             return;
@@ -60,23 +61,24 @@ private void OnBeforeInteractHand(EntityUid uid, BatteryDrainerComponent comp, B
         _doAfter.TryStartDoAfter(doAfterArgs);
     }
 
-    private void OnBatteryChanged(EntityUid uid, BatteryDrainerComponent comp, ref NinjaBatteryChangedEvent args)
+    private void OnBatteryChanged(Entity<BatteryDrainerComponent> ent, ref NinjaBatteryChangedEvent args)
     {
-        SetBattery(uid, args.Battery, comp);
+        SetBattery((ent, ent.Comp), args.Battery);
     }
 
     /// <inheritdoc/>
-    protected override void OnDoAfterAttempt(EntityUid uid, BatteryDrainerComponent comp, DoAfterAttemptEvent<DrainDoAfterEvent> args)
+    protected override void OnDoAfterAttempt(Entity<BatteryDrainerComponent> ent, ref DoAfterAttemptEvent<DrainDoAfterEvent> args)
     {
-        base.OnDoAfterAttempt(uid, comp, args);
+        base.OnDoAfterAttempt(ent, ref args);
 
-        if (comp.BatteryUid == null || _battery.IsFull(comp.BatteryUid.Value))
+        if (ent.Comp.BatteryUid is not {} battery || _battery.IsFull(battery))
             args.Cancel();
     }
 
     /// <inheritdoc/>
-    protected override bool TryDrainPower(EntityUid uid, BatteryDrainerComponent comp, EntityUid target)
+    protected override bool TryDrainPower(Entity<BatteryDrainerComponent> ent, EntityUid target)
     {
+        var (uid, comp) = ent;
         if (comp.BatteryUid == null || !TryComp<BatteryComponent>(comp.BatteryUid.Value, out var battery))
             return false;
 
@@ -99,6 +101,7 @@ protected override bool TryDrainPower(EntityUid uid, BatteryDrainerComponent com
 
         var output = input * comp.DrainEfficiency;
         _battery.SetCharge(comp.BatteryUid.Value, battery.CurrentCharge + output, battery);
+        // TODO: create effect message or something
         Spawn("EffectSparks", Transform(target).Coordinates);
         _audio.PlayPvs(comp.SparkSound, target);
         _popup.PopupEntity(Loc.GetString("battery-drainer-success", ("battery", target)), uid, uid);
diff --git a/Content.Server/Ninja/Systems/ItemCreatorSystem.cs b/Content.Server/Ninja/Systems/ItemCreatorSystem.cs
new file mode 100644
index 00000000000..d7a7be995db
--- /dev/null
+++ b/Content.Server/Ninja/Systems/ItemCreatorSystem.cs
@@ -0,0 +1,57 @@
+using Content.Server.Ninja.Events;
+using Content.Server.Power.EntitySystems;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Ninja.Components;
+using Content.Shared.Ninja.Systems;
+using Content.Shared.Popups;
+
+namespace Content.Server.Ninja.Systems;
+
+public sealed class ItemCreatorSystem : SharedItemCreatorSystem
+{
+    [Dependency] private readonly BatterySystem _battery = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ItemCreatorComponent, CreateItemEvent>(OnCreateItem);
+        SubscribeLocalEvent<ItemCreatorComponent, NinjaBatteryChangedEvent>(OnBatteryChanged);
+    }
+
+    private void OnCreateItem(Entity<ItemCreatorComponent> ent, ref CreateItemEvent args)
+    {
+        var (uid, comp) = ent;
+        if (comp.Battery is not {} battery)
+            return;
+
+        args.Handled = true;
+
+        var user = args.Performer;
+        if (!_battery.TryUseCharge(battery, comp.Charge))
+        {
+            _popup.PopupEntity(Loc.GetString(comp.NoPowerPopup), user, user);
+            return;
+        }
+
+        var ev = new CreateItemAttemptEvent(user);
+        RaiseLocalEvent(uid, ref ev);
+        if (ev.Cancelled)
+            return;
+
+        // try to put throwing star in hand, otherwise it goes on the ground
+        var star = Spawn(comp.SpawnedPrototype, Transform(user).Coordinates);
+        _hands.TryPickupAnyHand(user, star);
+    }
+
+    private void OnBatteryChanged(Entity<ItemCreatorComponent> ent, ref NinjaBatteryChangedEvent args)
+    {
+        if (ent.Comp.Battery == args.Battery)
+            return;
+
+        ent.Comp.Battery = args.Battery;
+        Dirty(ent, ent.Comp);
+    }
+}
diff --git a/Content.Server/Ninja/Systems/NinjaGlovesSystem.cs b/Content.Server/Ninja/Systems/NinjaGlovesSystem.cs
index ac76ae6b771..3aaf7c5d58e 100644
--- a/Content.Server/Ninja/Systems/NinjaGlovesSystem.cs
+++ b/Content.Server/Ninja/Systems/NinjaGlovesSystem.cs
@@ -1,13 +1,8 @@
-using Content.Server.Communications;
-using Content.Server.Mind;
 using Content.Server.Ninja.Events;
-using Content.Server.Objectives.Systems;
-using Content.Shared.Communications;
-using Content.Shared.CriminalRecords.Components;
+using Content.Shared.Mind;
+using Content.Shared.Objectives.Systems;
 using Content.Shared.Ninja.Components;
 using Content.Shared.Ninja.Systems;
-using Content.Shared.Research.Components;
-using Content.Shared.Toggleable;
 
 namespace Content.Server.Ninja.Systems;
 
@@ -16,89 +11,44 @@ namespace Content.Server.Ninja.Systems;
 /// </summary>
 public sealed class NinjaGlovesSystem : SharedNinjaGlovesSystem
 {
-    [Dependency] private readonly EmagProviderSystem _emagProvider = default!;
-    [Dependency] private readonly CodeConditionSystem _codeCondition = default!;
-    [Dependency] private readonly CommsHackerSystem _commsHacker = default!;
-    [Dependency] private readonly SharedStunProviderSystem _stunProvider = default!;
+    [Dependency] private readonly SharedMindSystem _mind = default!;
+    [Dependency] private readonly SharedObjectivesSystem _objectives = default!;
     [Dependency] private readonly SpaceNinjaSystem _ninja = default!;
 
-    public override void Initialize()
+    protected override void EnableGloves(Entity<NinjaGlovesComponent> ent, Entity<SpaceNinjaComponent> user)
     {
-        base.Initialize();
+        base.EnableGloves(ent, user);
 
-        SubscribeLocalEvent<NinjaGlovesComponent, ToggleActionEvent>(OnToggleAction);
-    }
-
-    /// <summary>
-    /// Toggle gloves, if the user is a ninja wearing a ninja suit.
-    /// </summary>
-    private void OnToggleAction(EntityUid uid, NinjaGlovesComponent comp, ToggleActionEvent args)
-    {
-        if (args.Handled)
+        // can't use abilities if suit is not equipped, this is checked elsewhere but just making sure to satisfy nullability
+        if (user.Comp.Suit is not {} suit)
             return;
 
-        args.Handled = true;
-
-        var user = args.Performer;
-        // need to wear suit to enable gloves
-        if (!TryComp<SpaceNinjaComponent>(user, out var ninja)
-            || ninja.Suit == null
-            || !HasComp<NinjaSuitComponent>(ninja.Suit.Value))
-        {
-            Popup.PopupEntity(Loc.GetString("ninja-gloves-not-wearing-suit"), user, user);
+        if (!_mind.TryGetMind(user, out var mindId, out var mind))
             return;
-        }
-
-        // show its state to the user
-        var enabling = comp.User == null;
-        Appearance.SetData(uid, ToggleVisuals.Toggled, enabling);
-        var message = Loc.GetString(enabling ? "ninja-gloves-on" : "ninja-gloves-off");
-        Popup.PopupEntity(message, user, user);
 
-        if (enabling)
+        foreach (var ability in ent.Comp.Abilities)
         {
-            EnableGloves(uid, comp, user, ninja);
+            // non-objective abilities are added in shared already
+            if (ability.Objective is not {} objId)
+                continue;
+
+            // prevent doing an objective multiple times by toggling gloves after doing them
+            // if it's not tied to an objective always add them anyway
+            if (!_mind.TryFindObjective((mindId, mind), objId, out var obj))
+            {
+                Log.Error($"Ninja glove ability of {ent} referenced missing objective {ability.Objective} of {_mind.MindOwnerLoggingString(mind)}");
+                continue;
+            }
+
+            if (!_objectives.IsCompleted(obj.Value, (mindId, mind)))
+                EntityManager.AddComponents(user, ability.Components);
         }
-        else
-        {
-            DisableGloves(uid, comp);
-        }
-    }
 
-    private void EnableGloves(EntityUid uid, NinjaGlovesComponent comp, EntityUid user, SpaceNinjaComponent ninja)
-    {
-        // can't use abilities if suit is not equipped, this is checked elsewhere but just making sure to satisfy nullability
-        if (ninja.Suit == null)
-            return;
-
-        comp.User = user;
-        Dirty(uid, comp);
-        _ninja.AssignGloves(user, uid, ninja);
-
-        var drainer = EnsureComp<BatteryDrainerComponent>(user);
-        var stun = EnsureComp<StunProviderComponent>(user);
-        _stunProvider.SetNoPowerPopup(user, "ninja-no-power", stun);
+        // let abilities that use battery power work
         if (_ninja.GetNinjaBattery(user, out var battery, out var _))
         {
-            var ev = new NinjaBatteryChangedEvent(battery.Value, ninja.Suit.Value);
+            var ev = new NinjaBatteryChangedEvent(battery.Value, suit);
             RaiseLocalEvent(user, ref ev);
         }
-
-        var emag = EnsureComp<EmagProviderComponent>(user);
-        _emagProvider.SetWhitelist(user, comp.DoorjackWhitelist, emag);
-
-        EnsureComp<ResearchStealerComponent>(user);
-        // prevent calling in multiple threats by toggling gloves after
-        if (!_codeCondition.IsCompleted(user, ninja.TerrorObjective))
-        {
-            var hacker = EnsureComp<CommsHackerComponent>(user);
-            var rule = _ninja.NinjaRule(user);
-            if (rule != null)
-                _commsHacker.SetThreats(user, rule.Threats, hacker);
-        }
-        if (!_codeCondition.IsCompleted(user, ninja.MassArrestObjective))
-        {
-            EnsureComp<CriminalRecordsHackerComponent>(user);
-        }
     }
 }
diff --git a/Content.Server/Ninja/Systems/NinjaSuitSystem.cs b/Content.Server/Ninja/Systems/NinjaSuitSystem.cs
index 04095b549c6..63054eaad50 100644
--- a/Content.Server/Ninja/Systems/NinjaSuitSystem.cs
+++ b/Content.Server/Ninja/Systems/NinjaSuitSystem.cs
@@ -2,7 +2,6 @@
 using Content.Server.Ninja.Events;
 using Content.Server.Power.Components;
 using Content.Server.PowerCell;
-using Content.Shared.Clothing.EntitySystems;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Ninja.Components;
 using Content.Shared.Ninja.Systems;
@@ -29,15 +28,13 @@ public override void Initialize()
 
         SubscribeLocalEvent<NinjaSuitComponent, ContainerIsInsertingAttemptEvent>(OnSuitInsertAttempt);
         SubscribeLocalEvent<NinjaSuitComponent, EmpAttemptEvent>(OnEmpAttempt);
-        SubscribeLocalEvent<NinjaSuitComponent, AttemptStealthEvent>(OnAttemptStealth);
-        SubscribeLocalEvent<NinjaSuitComponent, CreateThrowingStarEvent>(OnCreateThrowingStar);
         SubscribeLocalEvent<NinjaSuitComponent, RecallKatanaEvent>(OnRecallKatana);
         SubscribeLocalEvent<NinjaSuitComponent, NinjaEmpEvent>(OnEmp);
     }
 
-    protected override void NinjaEquippedSuit(EntityUid uid, NinjaSuitComponent comp, EntityUid user, SpaceNinjaComponent ninja)
+    protected override void NinjaEquipped(Entity<NinjaSuitComponent> ent, Entity<SpaceNinjaComponent> user)
     {
-        base.NinjaEquippedSuit(uid, comp, user, ninja);
+        base.NinjaEquipped(ent, user);
 
         _ninja.SetSuitPowerAlert(user);
     }
@@ -57,16 +54,15 @@ private void OnSuitInsertAttempt(EntityUid uid, NinjaSuitComponent comp, Contain
 
         // can only upgrade power cell, not swap to recharge instantly otherwise ninja could just swap batteries with flashlights in maints for easy power
         if (!TryComp<BatteryComponent>(args.EntityUid, out var inserting) || inserting.MaxCharge <= battery.MaxCharge)
-        {
             args.Cancel();
-        }
 
         // tell ninja abilities that use battery to update it so they don't use charge from the old one
         var user = Transform(uid).ParentUid;
-        if (!HasComp<SpaceNinjaComponent>(user))
+        if (!_ninja.IsNinja(user))
             return;
 
         var ev = new NinjaBatteryChangedEvent(args.EntityUid, uid);
+        RaiseLocalEvent(uid, ref ev);
         RaiseLocalEvent(user, ref ev);
     }
 
@@ -77,64 +73,22 @@ private void OnEmpAttempt(EntityUid uid, NinjaSuitComponent comp, EmpAttemptEven
         args.Cancel();
     }
 
-    protected override void UserUnequippedSuit(EntityUid uid, NinjaSuitComponent comp, EntityUid user)
+    protected override void UserUnequippedSuit(Entity<NinjaSuitComponent> ent, Entity<SpaceNinjaComponent> user)
     {
-        base.UserUnequippedSuit(uid, comp, user);
+        base.UserUnequippedSuit(ent, user);
 
         // remove power indicator
         _ninja.SetSuitPowerAlert(user);
     }
 
-    private void OnAttemptStealth(EntityUid uid, NinjaSuitComponent comp, AttemptStealthEvent args)
+    private void OnRecallKatana(Entity<NinjaSuitComponent> ent, ref RecallKatanaEvent args)
     {
-        var user = args.User;
-        // need 1 second of charge to turn on stealth
-        var chargeNeeded = SuitWattage(uid, comp);
-        // being attacked while cloaked gives no power message since it overloads the power supply or something
-        if (!_ninja.GetNinjaBattery(user, out _, out var battery) || battery.CurrentCharge < chargeNeeded)
-        {
-            Popup.PopupEntity(Loc.GetString("ninja-no-power"), user, user);
-            args.Cancel();
-            return;
-        }
-
-        if (comp.DisableCooldown > GameTiming.CurTime)
-        {
-            Popup.PopupEntity(Loc.GetString("ninja-suit-cooldown"), user, user, PopupType.Medium);
-            args.Cancel();
-            return;
-        }
-
-        StealthClothing.SetEnabled(uid, user, true);
-    }
-
-    private void OnCreateThrowingStar(EntityUid uid, NinjaSuitComponent comp, CreateThrowingStarEvent args)
-    {
-        args.Handled = true;
+        var (uid, comp) = ent;
         var user = args.Performer;
-        if (!_ninja.TryUseCharge(user, comp.ThrowingStarCharge))
-        {
-            Popup.PopupEntity(Loc.GetString("ninja-no-power"), user, user);
+        if (!_ninja.NinjaQuery.TryComp(user, out var ninja) || ninja.Katana == null)
             return;
-        }
-
-        if (comp.DisableCooldown > GameTiming.CurTime)
-        {
-            Popup.PopupEntity(Loc.GetString("ninja-suit-cooldown"), user, user, PopupType.Medium);
-            return;
-        }
-
-        // try to put throwing star in hand, otherwise it goes on the ground
-        var star = Spawn(comp.ThrowingStarPrototype, Transform(user).Coordinates);
-        _hands.TryPickupAnyHand(user, star);
-    }
 
-    private void OnRecallKatana(EntityUid uid, NinjaSuitComponent comp, RecallKatanaEvent args)
-    {
         args.Handled = true;
-        var user = args.Performer;
-        if (!TryComp<SpaceNinjaComponent>(user, out var ninja) || ninja.Katana == null)
-            return;
 
         var katana = ninja.Katana.Value;
         var coords = _transform.GetWorldPosition(katana);
@@ -146,11 +100,8 @@ private void OnRecallKatana(EntityUid uid, NinjaSuitComponent comp, RecallKatana
             return;
         }
 
-        if (comp.DisableCooldown > GameTiming.CurTime)
-        {
-            Popup.PopupEntity(Loc.GetString("ninja-suit-cooldown"), user, user, PopupType.Medium);
+        if (CheckDisabled(ent, user))
             return;
-        }
 
         // TODO: teleporting into belt slot
         var message = _hands.TryPickupAnyHand(user, katana)
@@ -159,9 +110,11 @@ private void OnRecallKatana(EntityUid uid, NinjaSuitComponent comp, RecallKatana
         Popup.PopupEntity(Loc.GetString(message), user, user);
     }
 
-    private void OnEmp(EntityUid uid, NinjaSuitComponent comp, NinjaEmpEvent args)
+    private void OnEmp(Entity<NinjaSuitComponent> ent, ref NinjaEmpEvent args)
     {
+        var (uid, comp) = ent;
         args.Handled = true;
+
         var user = args.Performer;
         if (!_ninja.TryUseCharge(user, comp.EmpCharge))
         {
@@ -169,13 +122,9 @@ private void OnEmp(EntityUid uid, NinjaSuitComponent comp, NinjaEmpEvent args)
             return;
         }
 
-        if (comp.DisableCooldown > GameTiming.CurTime)
-        {
-            Popup.PopupEntity(Loc.GetString("ninja-suit-cooldown"), user, user, PopupType.Medium);
+        if (CheckDisabled(ent, user))
             return;
-        }
 
-        // I don't think this affects the suit battery, but if it ever does in the future add a blacklist for it
         var coords = _transform.GetMapCoordinates(user);
         _emp.EmpPulse(coords, comp.EmpRange, comp.EmpConsumption, comp.EmpDuration);
     }
diff --git a/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs b/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs
index 0c1e88653fa..28ab6332276 100644
--- a/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs
+++ b/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs
@@ -2,7 +2,6 @@
 using Content.Server.Chat.Managers;
 using Content.Server.CriminalRecords.Systems;
 using Content.Server.GameTicking.Rules.Components;
-using Content.Server.GenericAntag;
 using Content.Server.Objectives.Components;
 using Content.Server.Objectives.Systems;
 using Content.Server.Power.Components;
@@ -11,7 +10,6 @@
 using Content.Server.Research.Systems;
 using Content.Server.Roles;
 using Content.Shared.Alert;
-using Content.Shared.Clothing.EntitySystems;
 using Content.Shared.Doors.Components;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Mind;
@@ -26,11 +24,6 @@
 
 namespace Content.Server.Ninja.Systems;
 
-// TODO: when syndiborgs are a thing have a borg converter with 6 second doafter
-// engi -> saboteur
-// medi -> idk reskin it
-// other -> assault
-
 /// <summary>
 /// Main ninja system that handles ninja setup, provides helper methods for the rest of the code to use.
 /// </summary>
@@ -44,13 +37,11 @@ public sealed class SpaceNinjaSystem : SharedSpaceNinjaSystem
     [Dependency] private readonly RoleSystem _role = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedMindSystem _mind = default!;
-    [Dependency] private readonly StealthClothingSystem _stealthClothing = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<SpaceNinjaComponent, GenericAntagCreatedEvent>(OnNinjaCreated);
         SubscribeLocalEvent<SpaceNinjaComponent, EmaggedSomethingEvent>(OnDoorjack);
         SubscribeLocalEvent<SpaceNinjaComponent, ResearchStolenEvent>(OnResearchStolen);
         SubscribeLocalEvent<SpaceNinjaComponent, ThreatCalledInEvent>(OnThreatCalledIn);
@@ -62,7 +53,7 @@ public override void Update(float frameTime)
         var query = EntityQueryEnumerator<SpaceNinjaComponent>();
         while (query.MoveNext(out var uid, out var ninja))
         {
-            UpdateNinja(uid, ninja, frameTime);
+            SetSuitPowerAlert((uid, ninja));
         }
     }
 
@@ -80,31 +71,13 @@ private int Download(EntityUid uid, List<string> ids)
         return newCount - oldCount;
     }
 
-    /// <summary>
-    /// Returns a ninja's gamerule config data.
-    /// If the gamerule was not started then it will be started automatically.
-    /// </summary>
-    public NinjaRuleComponent? NinjaRule(EntityUid uid, GenericAntagComponent? comp = null)
-    {
-        if (!Resolve(uid, ref comp))
-            return null;
-
-        // mind not added yet so no rule
-        if (comp.RuleEntity == null)
-            return null;
-
-        return CompOrNull<NinjaRuleComponent>(comp.RuleEntity);
-    }
-
     // TODO: can probably copy paste borg code here
     /// <summary>
     /// Update the alert for the ninja's suit power indicator.
     /// </summary>
-    public void SetSuitPowerAlert(EntityUid uid, SpaceNinjaComponent? comp = null)
+    public void SetSuitPowerAlert(Entity<SpaceNinjaComponent> ent)
     {
-        if (!Resolve(uid, ref comp, false))
-            return;
-
+        var (uid, comp) = ent;
         if (comp.Deleted || comp.Suit == null)
         {
             _alerts.ClearAlert(uid, comp.SuitPowerAlert);
@@ -145,53 +118,6 @@ public override bool TryUseCharge(EntityUid user, float charge)
         return GetNinjaBattery(user, out var uid, out var battery) && _battery.TryUseCharge(uid.Value, charge, battery);
     }
 
-    /// <summary>
-    /// Set up everything for ninja to work and send the greeting message/sound.
-    /// Objectives are added by <see cref="GenericAntagSystem"/>.
-    /// </summary>
-    private void OnNinjaCreated(EntityUid uid, SpaceNinjaComponent comp, ref GenericAntagCreatedEvent args)
-    {
-        var mindId = args.MindId;
-        var mind = args.Mind;
-
-        if (mind.Session == null)
-            return;
-
-        var config = NinjaRule(uid);
-        if (config == null)
-            return;
-
-        var role = new NinjaRoleComponent
-        {
-            PrototypeId = "SpaceNinja"
-        };
-        _role.MindAddRole(mindId, role, mind);
-        _role.MindPlaySound(mindId, config.GreetingSound, mind);
-
-        var session = mind.Session;
-        _audio.PlayGlobal(config.GreetingSound, Filter.Empty().AddPlayer(session), false, AudioParams.Default);
-        _chatMan.DispatchServerMessage(session, Loc.GetString("ninja-role-greeting"));
-    }
-
-    // TODO: PowerCellDraw, modify when cloak enabled
-    /// <summary>
-    /// Handle constant power drains from passive usage and cloak.
-    /// </summary>
-    private void UpdateNinja(EntityUid uid, SpaceNinjaComponent ninja, float frameTime)
-    {
-        if (ninja.Suit == null)
-            return;
-
-        float wattage = Suit.SuitWattage(ninja.Suit.Value);
-
-        SetSuitPowerAlert(uid, ninja);
-        if (!TryUseCharge(uid, wattage * frameTime))
-        {
-            // ran out of power, uncloak ninja
-            _stealthClothing.SetEnabled(ninja.Suit.Value, uid, false);
-        }
-    }
-
     /// <summary>
     /// Increment greentext when emagging a door.
     /// </summary>
diff --git a/Content.Server/Ninja/Systems/SpiderChargeSystem.cs b/Content.Server/Ninja/Systems/SpiderChargeSystem.cs
index 64c958d6f1a..c262651f27a 100644
--- a/Content.Server/Ninja/Systems/SpiderChargeSystem.cs
+++ b/Content.Server/Ninja/Systems/SpiderChargeSystem.cs
@@ -7,6 +7,7 @@
 using Content.Server.Sticky.Events;
 using Content.Shared.Interaction;
 using Content.Shared.Ninja.Components;
+using Content.Shared.Ninja.Systems;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.Ninja.Systems;
@@ -14,7 +15,7 @@ namespace Content.Server.Ninja.Systems;
 /// <summary>
 /// Prevents planting a spider charge outside of its location and handles greentext.
 /// </summary>
-public sealed class SpiderChargeSystem : EntitySystem
+public sealed class SpiderChargeSystem : SharedSpiderChargeSystem
 {
     [Dependency] private readonly MindSystem _mind = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
diff --git a/Content.Server/Ninja/Systems/StunProviderSystem.cs b/Content.Server/Ninja/Systems/StunProviderSystem.cs
index 970ca78e2cc..822486cff52 100644
--- a/Content.Server/Ninja/Systems/StunProviderSystem.cs
+++ b/Content.Server/Ninja/Systems/StunProviderSystem.cs
@@ -6,9 +6,11 @@
 using Content.Shared.Ninja.Systems;
 using Content.Shared.Popups;
 using Content.Shared.Stunnable;
-using Robust.Shared.Prototypes;
+using Content.Shared.Timing;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Timing;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Ninja.Systems;
 
@@ -19,11 +21,12 @@ public sealed class StunProviderSystem : SharedStunProviderSystem
 {
     [Dependency] private readonly BatterySystem _battery = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedNinjaGlovesSystem _gloves = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedStunSystem _stun = default!;
+    [Dependency] private readonly UseDelaySystem _useDelay = default!;
 
     public override void Initialize()
     {
@@ -36,16 +39,18 @@ public override void Initialize()
     /// <summary>
     /// Stun clicked mobs on the whitelist, if there is enough power.
     /// </summary>
-    private void OnBeforeInteractHand(EntityUid uid, StunProviderComponent comp, BeforeInteractHandEvent args)
+    private void OnBeforeInteractHand(Entity<StunProviderComponent> ent, ref BeforeInteractHandEvent args)
     {
         // TODO: generic check
+        var (uid, comp) = ent;
         if (args.Handled || comp.BatteryUid == null || !_gloves.AbilityCheck(uid, args, out var target))
             return;
 
-        if (target == uid || !comp.Whitelist.IsValid(target, EntityManager))
+        if (target == uid || _whitelist.IsWhitelistFail(comp.Whitelist, target))
             return;
 
-        if (_timing.CurTime < comp.NextStun)
+        var useDelay = EnsureComp<UseDelayComponent>(uid);
+        if (_useDelay.IsDelayed((uid, useDelay), id: comp.DelayId))
             return;
 
         // take charge from battery
@@ -61,13 +66,14 @@ private void OnBeforeInteractHand(EntityUid uid, StunProviderComponent comp, Bef
         _stun.TryParalyze(target, comp.StunTime, refresh: false);
 
         // short cooldown to prevent instant stunlocking
-        comp.NextStun = _timing.CurTime + comp.Cooldown;
+        _useDelay.SetLength((uid, useDelay), comp.Cooldown, id: comp.DelayId);
+        _useDelay.TryResetDelay((uid, useDelay), id: comp.DelayId);
 
         args.Handled = true;
     }
 
-    private void OnBatteryChanged(EntityUid uid, StunProviderComponent comp, ref NinjaBatteryChangedEvent args)
+    private void OnBatteryChanged(Entity<StunProviderComponent> ent, ref NinjaBatteryChangedEvent args)
     {
-        SetBattery(uid, args.Battery, comp);
+        SetBattery((ent, ent.Comp), args.Battery);
     }
 }
diff --git a/Content.Server/Objectives/Systems/CodeConditionSystem.cs b/Content.Server/Objectives/Systems/CodeConditionSystem.cs
index 7ba312f4bb9..fbc58dafe82 100644
--- a/Content.Server/Objectives/Systems/CodeConditionSystem.cs
+++ b/Content.Server/Objectives/Systems/CodeConditionSystem.cs
@@ -35,20 +35,6 @@ public bool IsCompleted(Entity<CodeConditionComponent?> ent)
         return ent.Comp.Completed;
     }
 
-    /// <summary>
-    /// Returns true if a mob's objective with a certain prototype is completed.
-    /// </summary>
-    public bool IsCompleted(Entity<MindContainerComponent?> mob, string prototype)
-    {
-        if (_mind.GetMind(mob, mob.Comp) is not {} mindId)
-            return false;
-
-        if (!_mind.TryFindObjective(mindId, prototype, out var obj))
-            return false;
-
-        return IsCompleted(obj.Value);
-    }
-
     /// <summary>
     /// Sets an objective's completed field.
     /// </summary>
diff --git a/Content.Server/PowerCell/PowerCellSystem.Draw.cs b/Content.Server/PowerCell/PowerCellSystem.Draw.cs
index 4155a4f6bec..9ebd677f473 100644
--- a/Content.Server/PowerCell/PowerCellSystem.Draw.cs
+++ b/Content.Server/PowerCell/PowerCellSystem.Draw.cs
@@ -1,4 +1,5 @@
 using Content.Server.Power.Components;
+using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.PowerCell;
 using Content.Shared.PowerCell.Components;
 
@@ -10,22 +11,20 @@ public sealed partial class PowerCellSystem
      * Handles PowerCellDraw
      */
 
-    private static readonly TimeSpan Delay = TimeSpan.FromSeconds(1);
-
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
-        var query = EntityQueryEnumerator<PowerCellDrawComponent, PowerCellSlotComponent>();
+        var query = EntityQueryEnumerator<PowerCellDrawComponent, PowerCellSlotComponent, ItemToggleComponent>();
 
-        while (query.MoveNext(out var uid, out var comp, out var slot))
+        while (query.MoveNext(out var uid, out var comp, out var slot, out var toggle))
         {
-            if (!comp.Drawing)
+            if (!comp.Enabled || !toggle.Activated)
                 continue;
 
             if (Timing.CurTime < comp.NextUpdateTime)
                 continue;
 
-            comp.NextUpdateTime += Delay;
+            comp.NextUpdateTime += comp.Delay;
 
             if (!TryGetBatteryFromSlot(uid, out var batteryEnt, out var battery, slot))
                 continue;
@@ -33,7 +32,8 @@ public override void Update(float frameTime)
             if (_battery.TryUseCharge(batteryEnt.Value, comp.DrawRate, battery))
                 continue;
 
-            comp.Drawing = false;
+            Toggle.TryDeactivate((uid, toggle));
+
             var ev = new PowerCellSlotEmptyEvent();
             RaiseLocalEvent(uid, ref ev);
         }
@@ -42,26 +42,9 @@ public override void Update(float frameTime)
     private void OnDrawChargeChanged(EntityUid uid, PowerCellDrawComponent component, ref ChargeChangedEvent args)
     {
         // Update the bools for client prediction.
-        bool canDraw;
-        bool canUse;
-
-        if (component.UseRate > 0f)
-        {
-            canUse = args.Charge > component.UseRate;
-        }
-        else
-        {
-            canUse = true;
-        }
+        var canUse = component.UseRate <= 0f || args.Charge > component.UseRate;
 
-        if (component.DrawRate > 0f)
-        {
-            canDraw = args.Charge > 0f;
-        }
-        else
-        {
-            canDraw = true;
-        }
+        var canDraw = component.DrawRate <= 0f || args.Charge > 0f;
 
         if (canUse != component.CanUse || canDraw != component.CanDraw)
         {
@@ -76,6 +59,9 @@ private void OnDrawCellChanged(EntityUid uid, PowerCellDrawComponent component,
         var canDraw = !args.Ejected && HasCharge(uid, float.MinValue);
         var canUse = !args.Ejected && HasActivatableCharge(uid, component);
 
+        if (!canDraw)
+            Toggle.TryDeactivate(uid);
+
         if (canUse != component.CanUse || canDraw != component.CanDraw)
         {
             component.CanDraw = canDraw;
diff --git a/Content.Server/PowerCell/PowerCellSystem.cs b/Content.Server/PowerCell/PowerCellSystem.cs
index f45a01b2e1b..0d2d9012bc7 100644
--- a/Content.Server/PowerCell/PowerCellSystem.cs
+++ b/Content.Server/PowerCell/PowerCellSystem.cs
@@ -39,8 +39,8 @@ public override void Initialize()
         SubscribeLocalEvent<PowerCellDrawComponent, ChargeChangedEvent>(OnDrawChargeChanged);
         SubscribeLocalEvent<PowerCellDrawComponent, PowerCellChangedEvent>(OnDrawCellChanged);
 
-        // funny
         SubscribeLocalEvent<PowerCellSlotComponent, ExaminedEvent>(OnCellSlotExamined);
+        // funny
         SubscribeLocalEvent<PowerCellSlotComponent, BeingMicrowavedEvent>(OnSlotMicrowaved);
     }
 
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
index 623b6ba9787..0feecad4d08 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
@@ -30,7 +30,7 @@ private void OnModuleGotInserted(EntityUid uid, BorgModuleComponent component, E
 
         if (!TryComp<BorgChassisComponent>(chassis, out var chassisComp) ||
             args.Container != chassisComp.ModuleContainer ||
-            !chassisComp.Activated)
+            !Toggle.IsActivated(chassis))
             return;
 
         if (!_powerCell.HasDrawCharge(uid))
@@ -144,6 +144,7 @@ public void SelectModule(EntityUid chassis,
         var ev = new BorgModuleSelectedEvent(chassis);
         RaiseLocalEvent(moduleUid, ref ev);
         chassisComp.SelectedModule = moduleUid;
+        Dirty(chassis, chassisComp);
     }
 
     /// <summary>
@@ -163,6 +164,7 @@ public void UnselectModule(EntityUid chassis, BorgChassisComponent? chassisComp
         var ev = new BorgModuleUnselectedEvent(chassis);
         RaiseLocalEvent(chassisComp.SelectedModule.Value, ref ev);
         chassisComp.SelectedModule = null;
+        Dirty(chassis, chassisComp);
     }
 
     private void OnItemModuleSelected(EntityUid uid, ItemBorgModuleComponent component, ref BorgModuleSelectedEvent args)
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.cs b/Content.Server/Silicons/Borgs/BorgSystem.cs
index b6e5adbe2d4..b8546f30e7d 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.cs
@@ -11,6 +11,7 @@
 using Content.Shared.Database;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
+using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Mobs;
@@ -75,6 +76,7 @@ public override void Initialize()
         SubscribeLocalEvent<BorgChassisComponent, PowerCellSlotEmptyEvent>(OnPowerCellSlotEmpty);
         SubscribeLocalEvent<BorgChassisComponent, ActivatableUIOpenAttemptEvent>(OnUIOpenAttempt);
         SubscribeLocalEvent<BorgChassisComponent, GetCharactedDeadIcEvent>(OnGetDeadIC);
+        SubscribeLocalEvent<BorgChassisComponent, ItemToggledEvent>(OnToggled);
 
         SubscribeLocalEvent<BorgBrainComponent, MindAddedMessage>(OnBrainMindAdded);
         SubscribeLocalEvent<BorgBrainComponent, PointAttemptEvent>(OnBrainPointAttempt);
@@ -175,11 +177,11 @@ private void OnMobStateChanged(EntityUid uid, BorgChassisComponent component, Mo
         if (args.NewMobState == MobState.Alive)
         {
             if (_mind.TryGetMind(uid, out _, out _))
-                _powerCell.SetPowerCellDrawEnabled(uid, true);
+                _powerCell.SetDrawEnabled(uid, true);
         }
         else
         {
-            _powerCell.SetPowerCellDrawEnabled(uid, false);
+            _powerCell.SetDrawEnabled(uid, false);
         }
     }
 
@@ -187,24 +189,10 @@ private void OnPowerCellChanged(EntityUid uid, BorgChassisComponent component, P
     {
         UpdateBatteryAlert((uid, component));
 
-        if (!TryComp<PowerCellDrawComponent>(uid, out var draw))
-            return;
-
-        // if we eject the battery or run out of charge, then disable
-        if (args.Ejected || !_powerCell.HasDrawCharge(uid))
-        {
-            DisableBorgAbilities(uid, component);
-            return;
-        }
-
         // if we aren't drawing and suddenly get enough power to draw again, reeanble.
-        if (_powerCell.HasDrawCharge(uid, draw))
+        if (_powerCell.HasDrawCharge(uid))
         {
-            // only reenable the powerdraw if a player has the role.
-            if (!draw.Drawing && _mind.TryGetMind(uid, out _, out _) && _mobState.IsAlive(uid))
-                _powerCell.SetPowerCellDrawEnabled(uid, true);
-
-            EnableBorgAbilities(uid, component);
+            Toggle.TryActivate(uid);
         }
 
         UpdateUI(uid, component);
@@ -212,7 +200,7 @@ private void OnPowerCellChanged(EntityUid uid, BorgChassisComponent component, P
 
     private void OnPowerCellSlotEmpty(EntityUid uid, BorgChassisComponent component, ref PowerCellSlotEmptyEvent args)
     {
-        DisableBorgAbilities(uid, component);
+        Toggle.TryDeactivate(uid);
         UpdateUI(uid, component);
     }
 
@@ -228,6 +216,23 @@ private void OnGetDeadIC(EntityUid uid, BorgChassisComponent component, ref GetC
         args.Dead = true;
     }
 
+    private void OnToggled(Entity<BorgChassisComponent> ent, ref ItemToggledEvent args)
+    {
+        var (uid, comp) = ent;
+        if (args.Activated)
+            InstallAllModules(uid, comp);
+        else
+            DisableAllModules(uid, comp);
+
+        // only enable the powerdraw if there is a player in the chassis
+        var drawing = _mind.TryGetMind(uid, out _, out _) && _mobState.IsAlive(ent);
+        _powerCell.SetDrawEnabled(uid, drawing);
+
+        UpdateUI(uid, comp);
+
+        _movementSpeedModifier.RefreshMovementSpeedModifiers(uid);
+    }
+
     private void OnBrainMindAdded(EntityUid uid, BorgBrainComponent component, MindAddedMessage args)
     {
         if (!Container.TryGetOuterContainer(uid, Transform(uid), out var container))
@@ -280,44 +285,14 @@ private void UpdateBatteryAlert(Entity<BorgChassisComponent> ent, PowerCellSlotC
         _alerts.ShowAlert(ent, ent.Comp.BatteryAlert, chargePercent);
     }
 
-    /// <summary>
-    /// Activates the borg, enabling all of its modules.
-    /// </summary>
-    public void EnableBorgAbilities(EntityUid uid, BorgChassisComponent component, PowerCellDrawComponent? powerCell = null)
-    {
-        if (component.Activated)
-            return;
-
-        component.Activated = true;
-        InstallAllModules(uid, component);
-        Dirty(uid, component);
-        _movementSpeedModifier.RefreshMovementSpeedModifiers(uid);
-    }
-
-    /// <summary>
-    /// Deactivates the borg, disabling all of its modules and decreasing its speed.
-    /// </summary>
-    public void DisableBorgAbilities(EntityUid uid, BorgChassisComponent component)
-    {
-        if (!component.Activated)
-            return;
-
-        component.Activated = false;
-        DisableAllModules(uid, component);
-        Dirty(uid, component);
-        _movementSpeedModifier.RefreshMovementSpeedModifiers(uid);
-    }
-
     /// <summary>
     /// Activates a borg when a player occupies it
     /// </summary>
     public void BorgActivate(EntityUid uid, BorgChassisComponent component)
     {
         Popup.PopupEntity(Loc.GetString("borg-mind-added", ("name", Identity.Name(uid, EntityManager))), uid);
-        _powerCell.SetPowerCellDrawEnabled(uid, true);
-        _access.SetAccessEnabled(uid, true);
+        Toggle.TryActivate(uid);
         _appearance.SetData(uid, BorgVisuals.HasPlayer, true);
-        Dirty(uid, component);
     }
 
     /// <summary>
@@ -326,10 +301,8 @@ public void BorgActivate(EntityUid uid, BorgChassisComponent component)
     public void BorgDeactivate(EntityUid uid, BorgChassisComponent component)
     {
         Popup.PopupEntity(Loc.GetString("borg-mind-removed", ("name", Identity.Name(uid, EntityManager))), uid);
-        _powerCell.SetPowerCellDrawEnabled(uid, false);
-        _access.SetAccessEnabled(uid, false);
+        Toggle.TryDeactivate(uid);
         _appearance.SetData(uid, BorgVisuals.HasPlayer, false);
-        Dirty(uid, component);
     }
 
     /// <summary>
diff --git a/Content.Server/StationEvents/Components/NinjaSpawnRuleComponent.cs b/Content.Server/StationEvents/Components/NinjaSpawnRuleComponent.cs
deleted file mode 100644
index d758247eca2..00000000000
--- a/Content.Server/StationEvents/Components/NinjaSpawnRuleComponent.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Server.StationEvents.Events;
-
-namespace Content.Server.StationEvents.Components;
-
-/// <summary>
-/// Configuration component for the Space Ninja antag.
-/// </summary>
-[RegisterComponent, Access(typeof(NinjaSpawnRule))]
-public sealed partial class NinjaSpawnRuleComponent : Component
-{
-    /// <summary>
-    /// Distance that the ninja spawns from the station's half AABB radius
-    /// </summary>
-    [DataField("spawnDistance")]
-    public float SpawnDistance = 20f;
-}
diff --git a/Content.Server/StationEvents/Components/SpaceSpawnRuleComponent.cs b/Content.Server/StationEvents/Components/SpaceSpawnRuleComponent.cs
new file mode 100644
index 00000000000..a0168077fd6
--- /dev/null
+++ b/Content.Server/StationEvents/Components/SpaceSpawnRuleComponent.cs
@@ -0,0 +1,25 @@
+using Content.Server.StationEvents.Events;
+using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.StationEvents.Components;
+
+/// <summary>
+/// Component for spawning antags in space around a station.
+/// Requires <c>AntagSelectionComponent</c>.
+/// </summary>
+[RegisterComponent, Access(typeof(SpaceSpawnRule))]
+public sealed partial class SpaceSpawnRuleComponent : Component
+{
+    /// <summary>
+    /// Distance that the entity spawns from the station's half AABB radius
+    /// </summary>
+    [DataField]
+    public float SpawnDistance = 20f;
+
+    /// <summary>
+    /// Location that was picked.
+    /// </summary>
+    [DataField]
+    public MapCoordinates? Coords;
+}
diff --git a/Content.Server/StationEvents/Events/NinjaSpawnRule.cs b/Content.Server/StationEvents/Events/SpaceSpawnRule.cs
similarity index 53%
rename from Content.Server/StationEvents/Events/NinjaSpawnRule.cs
rename to Content.Server/StationEvents/Events/SpaceSpawnRule.cs
index 9cbc193ce61..6fccaaa5cfc 100644
--- a/Content.Server/StationEvents/Events/NinjaSpawnRule.cs
+++ b/Content.Server/StationEvents/Events/SpaceSpawnRule.cs
@@ -1,5 +1,5 @@
+using Content.Server.Antag;
 using Content.Server.GameTicking.Rules.Components;
-using Content.Server.Ninja.Systems;
 using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
 using Content.Shared.GameTicking.Components;
@@ -9,18 +9,28 @@
 namespace Content.Server.StationEvents.Events;
 
 /// <summary>
-/// Event for spawning a Space Ninja mid-game.
+/// Station event component for spawning this rules antags in space around a station.
 /// </summary>
-public sealed class NinjaSpawnRule : StationEventSystem<NinjaSpawnRuleComponent>
+public sealed class SpaceSpawnRule : StationEventSystem<SpaceSpawnRuleComponent>
 {
     [Dependency] private readonly SharedTransformSystem _transform = default!;
 
-    protected override void Started(EntityUid uid, NinjaSpawnRuleComponent comp, GameRuleComponent gameRule, GameRuleStartedEvent args)
+    public override void Initialize()
     {
-        base.Started(uid, comp, gameRule, args);
+        base.Initialize();
+
+        SubscribeLocalEvent<SpaceSpawnRuleComponent, AntagSelectLocationEvent>(OnSelectLocation);
+    }
+
+    protected override void Added(EntityUid uid, SpaceSpawnRuleComponent comp, GameRuleComponent gameRule, GameRuleAddedEvent args)
+    {
+        base.Added(uid, comp, gameRule, args);
 
         if (!TryGetRandomStation(out var station))
+        {
+            ForceEndSelf(uid, gameRule);
             return;
+        }
 
         var stationData = Comp<StationDataComponent>(station.Value);
 
@@ -28,22 +38,28 @@ protected override void Started(EntityUid uid, NinjaSpawnRuleComponent comp, Gam
         var gridUid = StationSystem.GetLargestGrid(stationData);
         if (gridUid == null || !TryComp<MapGridComponent>(gridUid, out var grid))
         {
-            Sawmill.Warning("Chosen station has no grids, cannot spawn space ninja!");
+            Sawmill.Warning("Chosen station has no grids, cannot pick location for {ToPrettyString(uid):rule}");
+            ForceEndSelf(uid, gameRule);
             return;
         }
 
-        // figure out its AABB size and use that as a guide to how far ninja should be
+        // figure out its AABB size and use that as a guide to how far the spawner should be
         var size = grid.LocalAABB.Size.Length() / 2;
         var distance = size + comp.SpawnDistance;
         var angle = RobustRandom.NextAngle();
         // position relative to station center
         var location = angle.ToVec() * distance;
 
-        // create the spawner, the ninja will appear when a ghost has picked the role
+        // create the spawner!
         var xform = Transform(gridUid.Value);
         var position = _transform.GetWorldPosition(xform) + location;
-        var coords = new MapCoordinates(position, xform.MapID);
-        Sawmill.Info($"Creating ninja spawnpoint at {coords}");
-        Spawn("SpawnPointGhostSpaceNinja", coords);
+        comp.Coords = new MapCoordinates(position, xform.MapID);
+        Sawmill.Info($"Picked location {comp.Coords} for {ToPrettyString(uid):rule}");
+    }
+
+    private void OnSelectLocation(Entity<SpaceSpawnRuleComponent> ent, ref AntagSelectLocationEvent args)
+    {
+        if (ent.Comp.Coords is {} coords)
+            args.Coordinates.Add(coords);
     }
 }
diff --git a/Content.Server/Stunnable/Systems/StunbatonSystem.cs b/Content.Server/Stunnable/Systems/StunbatonSystem.cs
index c1782efabaf..97dd2c7e735 100644
--- a/Content.Server/Stunnable/Systems/StunbatonSystem.cs
+++ b/Content.Server/Stunnable/Systems/StunbatonSystem.cs
@@ -19,7 +19,7 @@ public sealed class StunbatonSystem : SharedStunbatonSystem
         [Dependency] private readonly RiggableSystem _riggableSystem = default!;
         [Dependency] private readonly SharedPopupSystem _popup = default!;
         [Dependency] private readonly BatterySystem _battery = default!;
-        [Dependency] private readonly SharedItemToggleSystem _itemToggle = default!;
+        [Dependency] private readonly ItemToggleSystem _itemToggle = default!;
 
         public override void Initialize()
         {
diff --git a/Content.Server/Weapons/Misc/TetherGunSystem.cs b/Content.Server/Weapons/Misc/TetherGunSystem.cs
index f6aafe376d6..2bf53d46f4b 100644
--- a/Content.Server/Weapons/Misc/TetherGunSystem.cs
+++ b/Content.Server/Weapons/Misc/TetherGunSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.PowerCell;
+using Content.Shared.Item.ItemToggle;
 using Content.Shared.PowerCell;
 using Content.Shared.Weapons.Misc;
 using Robust.Shared.Physics.Components;
@@ -8,6 +9,7 @@ namespace Content.Server.Weapons.Misc;
 public sealed class TetherGunSystem : SharedTetherGunSystem
 {
     [Dependency] private readonly PowerCellSystem _cell = default!;
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
 
     public override void Initialize()
     {
@@ -36,12 +38,12 @@ protected override void StartTether(EntityUid gunUid, BaseForceGunComponent comp
         PhysicsComponent? targetPhysics = null, TransformComponent? targetXform = null)
     {
         base.StartTether(gunUid, component, target, user, targetPhysics, targetXform);
-        _cell.SetPowerCellDrawEnabled(gunUid, true);
+        _toggle.TryActivate(gunUid);
     }
 
     protected override void StopTether(EntityUid gunUid, BaseForceGunComponent component, bool land = true, bool transfer = false)
     {
         base.StopTether(gunUid, component, land, transfer);
-        _cell.SetPowerCellDrawEnabled(gunUid, false);
+        _toggle.TryDeactivate(gunUid);
     }
 }
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactMagnetTriggerSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactMagnetTriggerSystem.cs
index c6f56a27508..a585a9ef452 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactMagnetTriggerSystem.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactMagnetTriggerSystem.cs
@@ -2,6 +2,7 @@
 using Content.Server.Salvage;
 using Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Components;
 using Content.Shared.Clothing;
+using Content.Shared.Item.ItemToggle.Components;
 
 namespace Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Systems;
 
@@ -29,11 +30,11 @@ public override void Update(float frameTime)
 
         _toActivate.Clear();
 
-        //assume that there's more instruments than artifacts
-        var query = EntityQueryEnumerator<MagbootsComponent, TransformComponent>();
-        while (query.MoveNext(out _, out var magboot, out var magXform))
+        //assume that there's more magboots than artifacts
+        var query = EntityQueryEnumerator<MagbootsComponent, TransformComponent, ItemToggleComponent>();
+        while (query.MoveNext(out _, out var magboot, out var magXform, out var toggle))
         {
-            if (!magboot.On)
+            if (!toggle.Activated)
                 continue;
 
             var artiQuery = EntityQueryEnumerator<ArtifactMagnetTriggerComponent, TransformComponent>();
diff --git a/Content.Shared/Access/Components/AccessToggleComponent.cs b/Content.Shared/Access/Components/AccessToggleComponent.cs
new file mode 100644
index 00000000000..60a606ac7ea
--- /dev/null
+++ b/Content.Shared/Access/Components/AccessToggleComponent.cs
@@ -0,0 +1,11 @@
+using Content.Shared.Access.Systems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Access.Components;
+
+/// <summary>
+/// Toggles an access provider with <c>ItemToggle</c>.
+/// Requires <see cref="AccessComponent"/>.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(AccessToggleSystem))]
+public sealed partial class AccessToggleComponent : Component;
diff --git a/Content.Shared/Access/Systems/AccessToggleSystem.cs b/Content.Shared/Access/Systems/AccessToggleSystem.cs
new file mode 100644
index 00000000000..564aca06812
--- /dev/null
+++ b/Content.Shared/Access/Systems/AccessToggleSystem.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Access.Components;
+using Content.Shared.Item.ItemToggle.Components;
+
+namespace Content.Shared.Access.Systems;
+
+public sealed class AccessToggleSystem : EntitySystem
+{
+    [Dependency] private readonly SharedAccessSystem _access = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<AccessToggleComponent, ItemToggledEvent>(OnToggled);
+    }
+
+    private void OnToggled(Entity<AccessToggleComponent> ent, ref ItemToggledEvent args)
+    {
+        _access.SetAccessEnabled(ent, args.Activated);
+    }
+}
diff --git a/Content.Shared/Beeper/Components/BeeperComponent.cs b/Content.Shared/Beeper/Components/BeeperComponent.cs
index 54d242709c4..f6efbb10f3e 100644
--- a/Content.Shared/Beeper/Components/BeeperComponent.cs
+++ b/Content.Shared/Beeper/Components/BeeperComponent.cs
@@ -10,15 +10,12 @@ namespace Content.Shared.Beeper.Components;
 /// This is used for an item that beeps based on
 /// proximity to a specified component.
 /// </summary>
+/// <remarks>
+/// Requires <c>ItemToggleComponent</c> to control it.
+/// </remarks>
 [RegisterComponent, NetworkedComponent, Access(typeof(BeeperSystem)), AutoGenerateComponentState]
 public sealed partial class BeeperComponent : Component
 {
-    /// <summary>
-    /// Whether or not it's on.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool Enabled = true;
-
     /// <summary>
     /// How much to scale the interval by (< 0 = min, > 1 = max)
     /// </summary>
@@ -56,7 +53,7 @@ public sealed partial class BeeperComponent : Component
     /// Is the beep muted
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
-    public bool IsMuted = false;
+    public bool IsMuted;
 
     /// <summary>
     /// The sound played when the locator beeps.
diff --git a/Content.Shared/Beeper/Systems/BeeperSystem.cs b/Content.Shared/Beeper/Systems/BeeperSystem.cs
index c51eef4da9d..a52e19f7552 100644
--- a/Content.Shared/Beeper/Systems/BeeperSystem.cs
+++ b/Content.Shared/Beeper/Systems/BeeperSystem.cs
@@ -1,5 +1,7 @@
 using Content.Shared.Beeper.Components;
 using Content.Shared.FixedPoint;
+using Content.Shared.Item.ItemToggle;
+using Content.Shared.Item.ItemToggle.Components;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Network;
 using Robust.Shared.Timing;
@@ -11,34 +13,20 @@ namespace Content.Shared.Beeper.Systems;
 public sealed class BeeperSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly INetManager _net = default!;
-
-    public override void Initialize()
-    {
-    }
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
 
     public override void Update(float frameTime)
     {
-        var query = EntityQueryEnumerator<BeeperComponent>();
-        while (query.MoveNext(out var uid, out var beeper))
+        var query = EntityQueryEnumerator<BeeperComponent, ItemToggleComponent>();
+        while (query.MoveNext(out var uid, out var beeper, out var toggle))
         {
-            if (!beeper.Enabled)
-                continue;
-            RunUpdate_Internal(uid, beeper);
+            if (toggle.Activated)
+                RunUpdate_Internal(uid, beeper);
         }
     }
 
-    public void SetEnable(EntityUid owner, bool isEnabled, BeeperComponent? beeper = null)
-    {
-        if (!Resolve(owner, ref beeper) || beeper.Enabled == isEnabled)
-            return;
-        beeper.Enabled = isEnabled;
-
-        RunUpdate_Internal(owner, beeper);
-        Dirty(owner, beeper);
-    }
-
     public void SetIntervalScaling(EntityUid owner, BeeperComponent beeper, FixedPoint2 newScaling)
     {
         newScaling = FixedPoint2.Clamp(newScaling, 0, 1);
@@ -70,6 +58,7 @@ public void SetMute(EntityUid owner, bool isMuted, BeeperComponent? comp = null)
         if (!Resolve(owner, ref comp))
             return;
         comp.IsMuted = isMuted;
+        Dirty(owner, comp);
     }
 
     private void UpdateBeepInterval(EntityUid owner, BeeperComponent beeper)
@@ -91,19 +80,17 @@ public void ForceUpdate(EntityUid owner, BeeperComponent? beeper = null)
 
     private void RunUpdate_Internal(EntityUid owner, BeeperComponent beeper)
     {
-        if (!beeper.Enabled)
-        {
+        if (!_toggle.IsActivated(owner))
             return;
-        }
+
         UpdateBeepInterval(owner, beeper);
         if (beeper.NextBeep >= _timing.CurTime)
             return;
+
         var beepEvent = new BeepPlayedEvent(beeper.IsMuted);
         RaiseLocalEvent(owner, ref beepEvent);
         if (!beeper.IsMuted && _net.IsServer)
-        {
             _audio.PlayPvs(beeper.BeepSound, owner);
-        }
         beeper.LastBeepTime = _timing.CurTime;
     }
 }
diff --git a/Content.Shared/Beeper/Systems/ProximityBeeperSystem.cs b/Content.Shared/Beeper/Systems/ProximityBeeperSystem.cs
index bd857d4c29b..ed3c6366c13 100644
--- a/Content.Shared/Beeper/Systems/ProximityBeeperSystem.cs
+++ b/Content.Shared/Beeper/Systems/ProximityBeeperSystem.cs
@@ -1,7 +1,6 @@
 using Content.Shared.Beeper.Components;
-using Content.Shared.Interaction.Events;
+using Content.Shared.Item.ItemToggle;
 using Content.Shared.Pinpointer;
-using Content.Shared.PowerCell;
 using Content.Shared.ProximityDetection;
 using Content.Shared.ProximityDetection.Components;
 using Content.Shared.ProximityDetection.Systems;
@@ -9,20 +8,17 @@
 namespace Content.Shared.Beeper.Systems;
 
 /// <summary>
-/// This handles logic for implementing proximity beeper as a handheld tool />
+/// This handles controlling a beeper from proximity detector events.
 /// </summary>
 public sealed class ProximityBeeperSystem : EntitySystem
 {
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly SharedPowerCellSystem _powerCell = default!;
     [Dependency] private readonly ProximityDetectionSystem _proximity = default!;
     [Dependency] private readonly BeeperSystem _beeper = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
     {
-        SubscribeLocalEvent<ProximityBeeperComponent, UseInHandEvent>(OnUseInHand);
-        SubscribeLocalEvent<ProximityBeeperComponent, PowerCellSlotEmptyEvent>(OnPowerCellSlotEmpty);
         SubscribeLocalEvent<ProximityBeeperComponent, NewProximityTargetEvent>(OnNewProximityTarget);
         SubscribeLocalEvent<ProximityBeeperComponent, ProximityTargetUpdatedEvent>(OnProximityTargetUpdate);
     }
@@ -33,82 +29,16 @@ private void OnProximityTargetUpdate(EntityUid owner, ProximityBeeperComponent p
             return;
         if (args.Target == null)
         {
-            _beeper.SetEnable(owner, false, beeper);
+            _beeper.SetMute(owner, true, beeper);
             return;
         }
-        _beeper.SetIntervalScaling(owner,args.Distance/args.Detector.Range, beeper);
-        _beeper.SetEnable(owner, true, beeper);
-    }
-
-    private void OnNewProximityTarget(EntityUid owner, ProximityBeeperComponent proxBeeper, ref NewProximityTargetEvent args)
-    {
-        _beeper.SetEnable(owner, args.Target != null);
-    }
 
-    private void OnUseInHand(EntityUid uid, ProximityBeeperComponent proxBeeper, UseInHandEvent args)
-    {
-        if (args.Handled)
-            return;
-        args.Handled = TryToggle(uid, proxBeeper, user: args.User);
+        _beeper.SetIntervalScaling(owner, args.Distance / args.Detector.Range, beeper);
+        _beeper.SetMute(owner, false, beeper);
     }
 
-    private void OnPowerCellSlotEmpty(EntityUid uid, ProximityBeeperComponent beeper, ref PowerCellSlotEmptyEvent args)
-    {
-        if (_proximity.GetEnable(uid))
-            TryDisable(uid);
-    }
-    public bool TryEnable(EntityUid owner, BeeperComponent? beeper = null, ProximityDetectorComponent? detector = null,
-        PowerCellDrawComponent? draw = null,EntityUid? user = null)
-    {
-        if (!Resolve(owner, ref beeper, ref detector))
-            return false;
-        if (Resolve(owner, ref draw, false) && !_powerCell.HasActivatableCharge(owner, battery: draw, user: user))
-                return false;
-        Enable(owner, beeper, detector, draw);
-        return true;
-    }
-    private void Enable(EntityUid owner, BeeperComponent beeper,
-        ProximityDetectorComponent detector, PowerCellDrawComponent? draw)
-    {
-        _proximity.SetEnable(owner, true, detector);
-        _appearance.SetData(owner, ProximityBeeperVisuals.Enabled, true);
-        _powerCell.SetPowerCellDrawEnabled(owner, true, draw);
-    }
-
-
-    /// <summary>
-    /// Disables the proximity beeper
-    /// </summary>
-    public bool TryDisable(EntityUid owner,BeeperComponent? beeper = null, ProximityDetectorComponent? detector = null, PowerCellDrawComponent? draw = null)
-    {
-        if (!Resolve(owner, ref beeper, ref detector))
-            return false;
-
-        if (!detector.Enabled)
-            return false;
-        Disable(owner, beeper, detector, draw);
-        return true;
-    }
-    private void Disable(EntityUid owner, BeeperComponent beeper,
-        ProximityDetectorComponent detector, PowerCellDrawComponent? draw)
-    {
-        _proximity.SetEnable(owner, false, detector);
-        _appearance.SetData(owner, ProximityBeeperVisuals.Enabled, false);
-        _beeper.SetEnable(owner, false, beeper);
-        _powerCell.SetPowerCellDrawEnabled(owner, false, draw);
-    }
-
-    /// <summary>
-    /// toggles the proximity beeper
-    /// </summary>
-    public bool TryToggle(EntityUid owner, ProximityBeeperComponent? proxBeeper = null, BeeperComponent? beeper = null, ProximityDetectorComponent? detector = null,
-        PowerCellDrawComponent? draw = null, EntityUid? user = null)
+    private void OnNewProximityTarget(EntityUid owner, ProximityBeeperComponent proxBeeper, ref NewProximityTargetEvent args)
     {
-        if (!Resolve(owner,  ref proxBeeper, ref beeper, ref detector))
-            return false;
-
-        return detector.Enabled
-            ? TryDisable(owner, beeper, detector, draw)
-            : TryEnable(owner, beeper, detector, draw,user);
+        _beeper.SetMute(owner, args.Target != null);
     }
 }
diff --git a/Content.Shared/Charges/Systems/SharedChargesSystem.cs b/Content.Shared/Charges/Systems/SharedChargesSystem.cs
index 5de1383cde0..7f95ef184e4 100644
--- a/Content.Shared/Charges/Systems/SharedChargesSystem.cs
+++ b/Content.Shared/Charges/Systems/SharedChargesSystem.cs
@@ -5,10 +5,14 @@ namespace Content.Shared.Charges.Systems;
 
 public abstract class SharedChargesSystem : EntitySystem
 {
+    protected EntityQuery<LimitedChargesComponent> Query;
+
     public override void Initialize()
     {
         base.Initialize();
 
+        Query = GetEntityQuery<LimitedChargesComponent>();
+
         SubscribeLocalEvent<LimitedChargesComponent, ExaminedEvent>(OnExamine);
     }
 
@@ -30,9 +34,9 @@ protected virtual void OnExamine(EntityUid uid, LimitedChargesComponent comp, Ex
     /// <summary>
     /// Tries to add a number of charges. If it over or underflows it will be clamped, wasting the extra charges.
     /// </summary>
-    public void AddCharges(EntityUid uid, int change, LimitedChargesComponent? comp = null)
+    public virtual void AddCharges(EntityUid uid, int change, LimitedChargesComponent? comp = null)
     {
-        if (!Resolve(uid, ref comp, false))
+        if (!Query.Resolve(uid, ref comp, false))
             return;
 
         var old = comp.Charges;
@@ -47,7 +51,7 @@ public void AddCharges(EntityUid uid, int change, LimitedChargesComponent? comp
     public bool IsEmpty(EntityUid uid, LimitedChargesComponent? comp = null)
     {
         // can't be empty if there are no limited charges
-        if (!Resolve(uid, ref comp, false))
+        if (!Query.Resolve(uid, ref comp, false))
             return false;
 
         return comp.Charges <= 0;
@@ -56,10 +60,24 @@ public bool IsEmpty(EntityUid uid, LimitedChargesComponent? comp = null)
     /// <summary>
     /// Uses a single charge. Must check IsEmpty beforehand to prevent using with 0 charge.
     /// </summary>
-    public virtual void UseCharge(EntityUid uid, LimitedChargesComponent? comp = null)
+    public void UseCharge(EntityUid uid, LimitedChargesComponent? comp = null)
+    {
+        AddCharges(uid, -1, comp);
+    }
+
+    /// <summary>
+    /// Checks IsEmpty and uses a charge if it isn't empty.
+    /// </summary>
+    public bool TryUseCharge(Entity<LimitedChargesComponent?> ent)
     {
-        if (Resolve(uid, ref comp, false))
-            AddCharges(uid, -1, comp);
+        if (!Query.Resolve(ent, ref ent.Comp, false))
+            return true;
+
+        if (IsEmpty(ent, ent.Comp))
+            return false;
+
+        UseCharge(ent, ent.Comp);
+        return true;
     }
 
     /// <summary>
@@ -80,7 +98,6 @@ public bool HasInsufficientCharges(EntityUid uid, int requiredCharges, LimitedCh
     /// </summary>
     public virtual void UseCharges(EntityUid uid, int chargesUsed, LimitedChargesComponent? comp = null)
     {
-        if (Resolve(uid, ref comp, false))
-            AddCharges(uid, -chargesUsed, comp);
+        AddCharges(uid, -chargesUsed, comp);
     }
 }
diff --git a/Content.Shared/Clothing/ClothingSpeedModifierComponent.cs b/Content.Shared/Clothing/ClothingSpeedModifierComponent.cs
index c3c4baf19d0..866ce38a572 100644
--- a/Content.Shared/Clothing/ClothingSpeedModifierComponent.cs
+++ b/Content.Shared/Clothing/ClothingSpeedModifierComponent.cs
@@ -3,20 +3,18 @@
 
 namespace Content.Shared.Clothing;
 
+/// <summary>
+/// Modifies speed when worn and activated.
+/// Supports <c>ItemToggleComponent</c>.
+/// </summary>
 [RegisterComponent, NetworkedComponent, Access(typeof(ClothingSpeedModifierSystem))]
 public sealed partial class ClothingSpeedModifierComponent : Component
 {
-    [DataField("walkModifier", required: true)] [ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float WalkModifier = 1.0f;
 
-    [DataField("sprintModifier", required: true)] [ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float SprintModifier = 1.0f;
-
-    /// <summary>
-    ///     Is this clothing item currently 'actively' slowing you down?
-    ///     e.g. magboots can be turned on and off.
-    /// </summary>
-    [DataField("enabled")] public bool Enabled = true;
 }
 
 [Serializable, NetSerializable]
@@ -25,12 +23,9 @@ public sealed class ClothingSpeedModifierComponentState : ComponentState
     public float WalkModifier;
     public float SprintModifier;
 
-    public bool Enabled;
-
-    public ClothingSpeedModifierComponentState(float walkModifier, float sprintModifier, bool enabled)
+    public ClothingSpeedModifierComponentState(float walkModifier, float sprintModifier)
     {
         WalkModifier = walkModifier;
         SprintModifier = sprintModifier;
-        Enabled = enabled;
     }
 }
diff --git a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs
index 66ff5c624a4..c89ab827e67 100644
--- a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs
+++ b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs
@@ -1,11 +1,10 @@
-using Content.Shared.Actions;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Examine;
-using Content.Shared.IdentityManagement;
 using Content.Shared.Inventory;
+using Content.Shared.Item.ItemToggle;
+using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.Movement.Systems;
 using Content.Shared.PowerCell;
-using Content.Shared.Toggleable;
 using Content.Shared.Verbs;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
@@ -15,12 +14,12 @@ namespace Content.Shared.Clothing;
 
 public sealed class ClothingSpeedModifierSystem : EntitySystem
 {
-    [Dependency] private readonly SharedActionsSystem _actions = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly ClothingSpeedModifierSystem _clothingSpeedModifier = default!;
     [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly ExamineSystemShared _examine = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _movementSpeed = default!;
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
     [Dependency] private readonly SharedPowerCellSystem _powerCell = default!;
 
     public override void Initialize()
@@ -31,39 +30,12 @@ public override void Initialize()
         SubscribeLocalEvent<ClothingSpeedModifierComponent, ComponentHandleState>(OnHandleState);
         SubscribeLocalEvent<ClothingSpeedModifierComponent, InventoryRelayedEvent<RefreshMovementSpeedModifiersEvent>>(OnRefreshMoveSpeed);
         SubscribeLocalEvent<ClothingSpeedModifierComponent, GetVerbsEvent<ExamineVerb>>(OnClothingVerbExamine);
-
-        SubscribeLocalEvent<ToggleClothingSpeedComponent, GetVerbsEvent<ActivationVerb>>(AddToggleVerb);
-        SubscribeLocalEvent<ToggleClothingSpeedComponent, GetItemActionsEvent>(OnGetActions);
-        SubscribeLocalEvent<ToggleClothingSpeedComponent, ToggleClothingSpeedEvent>(OnToggleSpeed);
-        SubscribeLocalEvent<ToggleClothingSpeedComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<ToggleClothingSpeedComponent, PowerCellSlotEmptyEvent>(OnPowerCellSlotEmpty);
+        SubscribeLocalEvent<ClothingSpeedModifierComponent, ItemToggledEvent>(OnToggled);
     }
 
-    // Public API
-
-    public void SetClothingSpeedModifierEnabled(EntityUid uid, bool enabled, ClothingSpeedModifierComponent? component = null)
-    {
-        if (!Resolve(uid, ref component, false))
-            return;
-
-        if (component.Enabled != enabled)
-        {
-            component.Enabled = enabled;
-            Dirty(uid, component);
-
-            // inventory system will automatically hook into the event raised by this and update accordingly
-            if (_container.TryGetContainingContainer(uid, out var container))
-            {
-                _movementSpeed.RefreshMovementSpeedModifiers(container.Owner);
-            }
-        }
-    }
-
-    // Event handlers
-
     private void OnGetState(EntityUid uid, ClothingSpeedModifierComponent component, ref ComponentGetState args)
     {
-        args.State = new ClothingSpeedModifierComponentState(component.WalkModifier, component.SprintModifier, component.Enabled);
+        args.State = new ClothingSpeedModifierComponentState(component.WalkModifier, component.SprintModifier);
     }
 
     private void OnHandleState(EntityUid uid, ClothingSpeedModifierComponent component, ref ComponentHandleState args)
@@ -71,13 +43,11 @@ private void OnHandleState(EntityUid uid, ClothingSpeedModifierComponent compone
         if (args.Current is not ClothingSpeedModifierComponentState state)
             return;
 
-        var diff = component.Enabled != state.Enabled ||
-                   !MathHelper.CloseTo(component.SprintModifier, state.SprintModifier) ||
+        var diff = !MathHelper.CloseTo(component.SprintModifier, state.SprintModifier) ||
                    !MathHelper.CloseTo(component.WalkModifier, state.WalkModifier);
 
         component.WalkModifier = state.WalkModifier;
         component.SprintModifier = state.SprintModifier;
-        component.Enabled = state.Enabled;
 
         // Avoid raising the event for the container if nothing changed.
         // We'll still set the values in case they're slightly different but within tolerance.
@@ -89,10 +59,8 @@ private void OnHandleState(EntityUid uid, ClothingSpeedModifierComponent compone
 
     private void OnRefreshMoveSpeed(EntityUid uid, ClothingSpeedModifierComponent component, InventoryRelayedEvent<RefreshMovementSpeedModifiersEvent> args)
     {
-        if (!component.Enabled)
-            return;
-
-        args.Args.ModifySpeed(component.WalkModifier, component.SprintModifier);
+        if (_toggle.IsActivated(uid))
+            args.Args.ModifySpeed(component.WalkModifier, component.SprintModifier);
     }
 
     private void OnClothingVerbExamine(EntityUid uid, ClothingSpeedModifierComponent component, GetVerbsEvent<ExamineVerb> args)
@@ -142,60 +110,15 @@ private void OnClothingVerbExamine(EntityUid uid, ClothingSpeedModifierComponent
         _examine.AddDetailedExamineVerb(args, component, msg, Loc.GetString("clothing-speed-examinable-verb-text"), "/Textures/Interface/VerbIcons/outfit.svg.192dpi.png", Loc.GetString("clothing-speed-examinable-verb-message"));
     }
 
-    private void OnMapInit(Entity<ToggleClothingSpeedComponent> uid, ref MapInitEvent args)
-    {
-        _actions.AddAction(uid, ref uid.Comp.ToggleActionEntity, uid.Comp.ToggleAction);
-    }
-
-    private void OnToggleSpeed(Entity<ToggleClothingSpeedComponent> uid, ref ToggleClothingSpeedEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        args.Handled = true;
-        SetSpeedToggleEnabled(uid, !uid.Comp.Enabled, args.Performer);
-    }
-
-    private void SetSpeedToggleEnabled(Entity<ToggleClothingSpeedComponent> uid, bool value, EntityUid? user)
+    private void OnToggled(Entity<ClothingSpeedModifierComponent> ent, ref ItemToggledEvent args)
     {
-        if (uid.Comp.Enabled == value)
-            return;
-
-        TryComp<PowerCellDrawComponent>(uid, out var draw);
-        if (value && !_powerCell.HasDrawCharge(uid, draw, user: user))
-            return;
+        // make sentient boots slow or fast too
+        _movementSpeed.RefreshMovementSpeedModifiers(ent);
 
-        uid.Comp.Enabled = value;
-
-        _appearance.SetData(uid, ToggleVisuals.Toggled, uid.Comp.Enabled);
-        _actions.SetToggled(uid.Comp.ToggleActionEntity, uid.Comp.Enabled);
-        _clothingSpeedModifier.SetClothingSpeedModifierEnabled(uid.Owner, uid.Comp.Enabled);
-        _powerCell.SetPowerCellDrawEnabled(uid, uid.Comp.Enabled, draw);
-        Dirty(uid, uid.Comp);
-    }
-
-    private void AddToggleVerb(Entity<ToggleClothingSpeedComponent> uid, ref GetVerbsEvent<ActivationVerb> args)
-    {
-        if (!args.CanAccess || !args.CanInteract)
-            return;
-
-        var user = args.User;
-        ActivationVerb verb = new()
+        if (_container.TryGetContainingContainer(ent.Owner, out var container))
         {
-            Text = Loc.GetString("toggle-clothing-verb-text",
-                ("entity", Identity.Entity(uid, EntityManager))),
-            Act = () => SetSpeedToggleEnabled(uid, !uid.Comp.Enabled, user)
-        };
-        args.Verbs.Add(verb);
-    }
-
-    private void OnGetActions(Entity<ToggleClothingSpeedComponent> uid, ref GetItemActionsEvent args)
-    {
-        args.AddAction(ref uid.Comp.ToggleActionEntity, uid.Comp.ToggleAction);
-    }
-
-    private void OnPowerCellSlotEmpty(Entity<ToggleClothingSpeedComponent> uid, ref PowerCellSlotEmptyEvent args)
-    {
-        SetSpeedToggleEnabled(uid, false, null);
+            // inventory system will automatically hook into the event raised by this and update accordingly
+            _movementSpeed.RefreshMovementSpeedModifiers(container.Owner);
+        }
     }
 }
diff --git a/Content.Shared/Clothing/Components/StealthClothingComponent.cs b/Content.Shared/Clothing/Components/StealthClothingComponent.cs
deleted file mode 100644
index fedf48b36ed..00000000000
--- a/Content.Shared/Clothing/Components/StealthClothingComponent.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using Content.Shared.Actions;
-using Content.Shared.Clothing.EntitySystems;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.Clothing.Components;
-
-/// <summary>
-/// Adds StealthComponent to the user when enabled, either by an action or the system's SetEnabled method.
-/// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true), Access(typeof(StealthClothingSystem))]
-public sealed partial class StealthClothingComponent : Component
-{
-    /// <summary>
-    /// Whether stealth effect is enabled.
-    /// </summary>
-    [DataField("enabled"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
-    public bool Enabled;
-
-    /// <summary>
-    /// Number added to MinVisibility when stealthed, to make the user not fully invisible.
-    /// </summary>
-    [DataField("visibility"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
-    public float Visibility;
-
-    [DataField("toggleAction", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string ToggleAction = "ActionTogglePhaseCloak";
-
-    /// <summary>
-    /// The action for enabling and disabling stealth.
-    /// </summary>
-    [DataField, AutoNetworkedField] public EntityUid? ToggleActionEntity;
-}
-
-/// <summary>
-/// When stealth is enabled, disables it.
-/// When it is disabled, raises <see cref="AttemptStealthEvent"/> before enabling.
-/// Put any checks in a handler for that event to cancel it.
-/// </summary>
-public sealed partial class ToggleStealthEvent : InstantActionEvent
-{
-}
diff --git a/Content.Shared/Clothing/Components/ToggleClothingComponent.cs b/Content.Shared/Clothing/Components/ToggleClothingComponent.cs
new file mode 100644
index 00000000000..c77aa03475f
--- /dev/null
+++ b/Content.Shared/Clothing/Components/ToggleClothingComponent.cs
@@ -0,0 +1,40 @@
+using Content.Shared.Actions;
+using Content.Shared.Clothing.EntitySystems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Clothing.Components;
+
+/// <summary>
+/// Clothing that can be enabled and disabled with an action.
+/// Requires <see cref="ItemToggleComponent"/>.
+/// </summary>
+/// <remarks>
+/// Not to be confused with <see cref="ToggleableClothingComponent"/> for hardsuit helmets and such.
+/// </remarks>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(ToggleClothingSystem))]
+public sealed partial class ToggleClothingComponent : Component
+{
+    /// <summary>
+    /// The action to add when equipped, even if not worn.
+    /// This must raise <see cref="ToggleActionEvent"/> to then get handled.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId<InstantActionComponent> Action = string.Empty;
+
+    [DataField, AutoNetworkedField]
+    public EntityUid? ActionEntity;
+
+    /// <summary>
+    /// If true, automatically disable the clothing after unequipping it.
+    /// </summary>
+    [DataField]
+    public bool DisableOnUnequip;
+}
+
+/// <summary>
+/// Raised on the clothing when being equipped to see if it should add the action.
+/// </summary>
+[ByRefEvent]
+public record struct ToggleClothingCheckEvent(EntityUid User, bool Cancelled = false);
diff --git a/Content.Shared/Clothing/Components/ToggleClothingSpeedComponent.cs b/Content.Shared/Clothing/Components/ToggleClothingSpeedComponent.cs
deleted file mode 100644
index 90b2d7322e0..00000000000
--- a/Content.Shared/Clothing/Components/ToggleClothingSpeedComponent.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Content.Shared.Actions;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Clothing.Components;
-
-/// <summary>
-/// This is used for a clothing item that gives a speed modification that is toggleable.
-/// </summary>
-[RegisterComponent, NetworkedComponent, Access(typeof(ClothingSpeedModifierSystem)), AutoGenerateComponentState]
-public sealed partial class ToggleClothingSpeedComponent : Component
-{
-    /// <summary>
-    /// The action for toggling the clothing.
-    /// </summary>
-    [DataField]
-    public EntProtoId ToggleAction = "ActionToggleSpeedBoots";
-
-    /// <summary>
-    /// The action entity
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public EntityUid? ToggleActionEntity;
-
-    /// <summary>
-    /// The state of the toggle.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool Enabled;
-}
-
-public sealed partial class ToggleClothingSpeedEvent : InstantActionEvent
-{
-
-}
diff --git a/Content.Shared/Clothing/EntitySystems/StealthClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/StealthClothingSystem.cs
deleted file mode 100644
index e96d9f866aa..00000000000
--- a/Content.Shared/Clothing/EntitySystems/StealthClothingSystem.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-using Content.Shared.Actions;
-using Content.Shared.Clothing.Components;
-using Content.Shared.Inventory.Events;
-using Content.Shared.Stealth;
-using Content.Shared.Stealth.Components;
-
-namespace Content.Shared.Clothing.EntitySystems;
-
-/// <summary>
-/// Handles the toggle action and disables stealth when clothing is unequipped.
-/// </summary>
-public sealed class StealthClothingSystem : EntitySystem
-{
-    [Dependency] private readonly SharedStealthSystem _stealth = default!;
-    [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<StealthClothingComponent, GetItemActionsEvent>(OnGetItemActions);
-        SubscribeLocalEvent<StealthClothingComponent, ToggleStealthEvent>(OnToggleStealth);
-        SubscribeLocalEvent<StealthClothingComponent, AfterAutoHandleStateEvent>(OnHandleState);
-        SubscribeLocalEvent<StealthClothingComponent, GotUnequippedEvent>(OnUnequipped);
-        SubscribeLocalEvent<StealthClothingComponent, MapInitEvent>(OnMapInit);
-    }
-
-    private void OnMapInit(EntityUid uid, StealthClothingComponent component, MapInitEvent args)
-    {
-        _actionContainer.EnsureAction(uid, ref component.ToggleActionEntity, component.ToggleAction);
-        Dirty(uid, component);
-    }
-
-    /// <summary>
-    /// Sets the clothing's stealth effect for the user.
-    /// </summary>
-    /// <returns>True if it was changed, false otherwise</returns>
-    public bool SetEnabled(EntityUid uid, EntityUid user, bool enabled, StealthClothingComponent? comp = null)
-    {
-        if (!Resolve(uid, ref comp) || comp.Enabled == enabled)
-            return false;
-
-        // TODO remove this when clothing unequip on delete is less sus
-        // prevent debug assert when ending round and its disabled
-        if (MetaData(user).EntityLifeStage >= EntityLifeStage.Terminating)
-            return false;
-
-        comp.Enabled = enabled;
-        Dirty(uid, comp);
-
-        var stealth = EnsureComp<StealthComponent>(user);
-        // slightly visible, but doesn't change when moving so it's ok
-        var visibility = enabled ? stealth.MinVisibility + comp.Visibility : stealth.MaxVisibility;
-        _stealth.SetVisibility(user, visibility, stealth);
-        _stealth.SetEnabled(user, enabled, stealth);
-        return true;
-    }
-
-    /// <summary>
-    /// Raise <see cref="AddStealthActionEvent"/> then add the toggle action if it was not cancelled.
-    /// </summary>
-    private void OnGetItemActions(EntityUid uid, StealthClothingComponent comp, GetItemActionsEvent args)
-    {
-        var ev = new AddStealthActionEvent(args.User);
-        RaiseLocalEvent(uid, ev);
-        if (ev.Cancelled)
-            return;
-
-        args.AddAction(ref comp.ToggleActionEntity, comp.ToggleAction);
-    }
-
-    /// <summary>
-    /// Raises <see cref="AttemptStealthEvent"/> if enabling.
-    /// </summary>
-    private void OnToggleStealth(EntityUid uid, StealthClothingComponent comp, ToggleStealthEvent args)
-    {
-        args.Handled = true;
-        var user = args.Performer;
-        if (comp.Enabled)
-        {
-            SetEnabled(uid, user, false, comp);
-            return;
-        }
-
-        var ev = new AttemptStealthEvent(user);
-        RaiseLocalEvent(uid, ev);
-        if (ev.Cancelled)
-            return;
-
-        SetEnabled(uid, user, true, comp);
-    }
-
-    /// <summary>
-    /// Calls <see cref="SetEnabled"/> when server sends new state.
-    /// </summary>
-    private void OnHandleState(EntityUid uid, StealthClothingComponent comp, ref AfterAutoHandleStateEvent args)
-    {
-        // SetEnabled checks if it is the same, so change it to before state was received from the server
-        var enabled = comp.Enabled;
-        comp.Enabled = !enabled;
-        var user = Transform(uid).ParentUid;
-        SetEnabled(uid, user, enabled, comp);
-    }
-
-    /// <summary>
-    /// Force unstealths the user, doesnt remove StealthComponent since other things might use it
-    /// </summary>
-    private void OnUnequipped(EntityUid uid, StealthClothingComponent comp, GotUnequippedEvent args)
-    {
-        SetEnabled(uid, args.Equipee, false, comp);
-    }
-}
-
-/// <summary>
-/// Raised on the stealth clothing when attempting to add an action.
-/// </summary>
-public sealed class AddStealthActionEvent : CancellableEntityEventArgs
-{
-    /// <summary>
-    /// User that equipped the stealth clothing.
-    /// </summary>
-    public EntityUid User;
-
-    public AddStealthActionEvent(EntityUid user)
-    {
-        User = user;
-    }
-}
-
-/// <summary>
-/// Raised on the stealth clothing when the user is attemping to enable it.
-/// </summary>
-public sealed class AttemptStealthEvent : CancellableEntityEventArgs
-{
-    /// <summary>
-    /// User that is attempting to enable the stealth clothing.
-    /// </summary>
-    public EntityUid User;
-
-    public AttemptStealthEvent(EntityUid user)
-    {
-        User = user;
-    }
-}
diff --git a/Content.Shared/Clothing/EntitySystems/ToggleClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ToggleClothingSystem.cs
new file mode 100644
index 00000000000..9889376c9d4
--- /dev/null
+++ b/Content.Shared/Clothing/EntitySystems/ToggleClothingSystem.cs
@@ -0,0 +1,58 @@
+using Content.Shared.Actions;
+using Content.Shared.Clothing;
+using Content.Shared.Clothing.Components;
+using Content.Shared.Inventory;
+using Content.Shared.Item.ItemToggle;
+using Content.Shared.Toggleable;
+
+namespace Content.Shared.Clothing.EntitySystems;
+
+/// <summary>
+/// Handles adding and using a toggle action for <see cref="ToggleClothingComponent"/>.
+/// </summary>
+public sealed class ToggleClothingSystem : EntitySystem
+{
+    [Dependency] private readonly SharedActionsSystem _actions = default!;
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ToggleClothingComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ToggleClothingComponent, GetItemActionsEvent>(OnGetActions);
+        SubscribeLocalEvent<ToggleClothingComponent, ToggleActionEvent>(OnToggleAction);
+        SubscribeLocalEvent<ToggleClothingComponent, ClothingGotUnequippedEvent>(OnUnequipped);
+    }
+
+    private void OnMapInit(Entity<ToggleClothingComponent> ent, ref MapInitEvent args)
+    {
+        var (uid, comp) = ent;
+        // test funny
+        if (string.IsNullOrEmpty(comp.Action))
+            return;
+
+        _actions.AddAction(uid, ref comp.ActionEntity, comp.Action);
+        _actions.SetToggled(comp.ActionEntity, _toggle.IsActivated(ent.Owner));
+        Dirty(uid, comp);
+    }
+
+    private void OnGetActions(Entity<ToggleClothingComponent> ent, ref GetItemActionsEvent args)
+    {
+        var ev = new ToggleClothingCheckEvent(args.User);
+        RaiseLocalEvent(ent, ref ev);
+        if (!ev.Cancelled)
+            args.AddAction(ent.Comp.ActionEntity);
+    }
+
+    private void OnToggleAction(Entity<ToggleClothingComponent> ent, ref ToggleActionEvent args)
+    {
+        args.Handled = _toggle.Toggle(ent.Owner, args.Performer);
+    }
+
+    private void OnUnequipped(Entity<ToggleClothingComponent> ent, ref ClothingGotUnequippedEvent args)
+    {
+        if (ent.Comp.DisableOnUnequip)
+            _toggle.TryDeactivate(ent.Owner, args.Wearer);
+    }
+}
diff --git a/Content.Shared/Clothing/MagbootsComponent.cs b/Content.Shared/Clothing/MagbootsComponent.cs
index 0d074ff38b6..4bef74fd335 100644
--- a/Content.Shared/Clothing/MagbootsComponent.cs
+++ b/Content.Shared/Clothing/MagbootsComponent.cs
@@ -1,23 +1,25 @@
 using Content.Shared.Alert;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.Clothing;
 
-[RegisterComponent, NetworkedComponent(), AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent]
 [Access(typeof(SharedMagbootsSystem))]
 public sealed partial class MagbootsComponent : Component
 {
     [DataField]
-    public EntProtoId ToggleAction = "ActionToggleMagboots";
-
-    [DataField, AutoNetworkedField]
-    public EntityUid? ToggleActionEntity;
+    public ProtoId<AlertPrototype> MagbootsAlert = "Magboots";
 
-    [DataField("on"), AutoNetworkedField]
-    public bool On;
+    /// <summary>
+    /// If true, the user must be standing on a grid or planet map to experience the weightlessness-canceling effect
+    /// </summary>
+    [DataField]
+    public bool RequiresGrid = true;
 
+    /// <summary>
+    /// Slot the clothing has to be worn in to work.
+    /// </summary>
     [DataField]
-    public ProtoId<AlertPrototype> MagbootsAlert = "Magboots";
+    public string Slot = "shoes";
 }
diff --git a/Content.Shared/Clothing/MagbootsSystem.cs b/Content.Shared/Clothing/MagbootsSystem.cs
new file mode 100644
index 00000000000..88d987aae18
--- /dev/null
+++ b/Content.Shared/Clothing/MagbootsSystem.cs
@@ -0,0 +1,90 @@
+using Content.Shared.Actions;
+using Content.Shared.Alert;
+using Content.Shared.Atmos.Components;
+using Content.Shared.Clothing.EntitySystems;
+using Content.Shared.Gravity;
+using Content.Shared.Inventory;
+using Content.Shared.Item;
+using Content.Shared.Item.ItemToggle;
+using Content.Shared.Item.ItemToggle.Components;
+using Robust.Shared.Containers;
+
+namespace Content.Shared.Clothing;
+
+public sealed class SharedMagbootsSystem : EntitySystem
+{
+    [Dependency] private readonly AlertsSystem _alerts = default!;
+    [Dependency] private readonly ClothingSystem _clothing = default!;
+    [Dependency] private readonly InventorySystem _inventory = default!;
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+    [Dependency] private readonly SharedGravitySystem _gravity = default!;
+    [Dependency] private readonly SharedItemSystem _item = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<MagbootsComponent, ItemToggledEvent>(OnToggled);
+        SubscribeLocalEvent<MagbootsComponent, ClothingGotEquippedEvent>(OnGotEquipped);
+        SubscribeLocalEvent<MagbootsComponent, ClothingGotUnequippedEvent>(OnGotUnequipped);
+        SubscribeLocalEvent<MagbootsComponent, IsWeightlessEvent>(OnIsWeightless);
+        SubscribeLocalEvent<MagbootsComponent, InventoryRelayedEvent<IsWeightlessEvent>>(OnIsWeightless);
+    }
+
+    private void OnToggled(Entity<MagbootsComponent> ent, ref ItemToggledEvent args)
+    {
+        var (uid, comp) = ent;
+        // only stick to the floor if being worn in the correct slot
+        if (_container.TryGetContainingContainer(uid, out var container) &&
+            _inventory.TryGetSlotEntity(container.Owner, comp.Slot, out var worn)
+            && uid == worn)
+        {
+            UpdateMagbootEffects(container.Owner, ent, args.Activated);
+        }
+
+        var prefix = args.Activated ? "on" : null;
+        _item.SetHeldPrefix(ent, prefix);
+        _clothing.SetEquippedPrefix(ent, prefix);
+    }
+
+    private void OnGotUnequipped(Entity<MagbootsComponent> ent, ref ClothingGotUnequippedEvent args)
+    {
+        UpdateMagbootEffects(args.Wearer, ent, false);
+    }
+
+    private void OnGotEquipped(Entity<MagbootsComponent> ent, ref ClothingGotEquippedEvent args)
+    {
+        UpdateMagbootEffects(args.Wearer, ent, _toggle.IsActivated(ent.Owner));
+    }
+
+    public void UpdateMagbootEffects(EntityUid user, Entity<MagbootsComponent> ent, bool state)
+    {
+        // TODO: public api for this and add access
+        if (TryComp<MovedByPressureComponent>(user, out var moved))
+            moved.Enabled = !state;
+
+        if (state)
+            _alerts.ShowAlert(user, ent.Comp.MagbootsAlert);
+        else
+            _alerts.ClearAlert(user, ent.Comp.MagbootsAlert);
+    }
+
+    private void OnIsWeightless(Entity<MagbootsComponent> ent, ref IsWeightlessEvent args)
+    {
+        if (args.Handled || !_toggle.IsActivated(ent.Owner))
+            return;
+
+        // do not cancel weightlessness if the person is in off-grid.
+        if (ent.Comp.RequiresGrid && !_gravity.EntityOnGravitySupportingGridOrMap(ent.Owner))
+            return;
+
+        args.IsWeightless = false;
+        args.Handled = true;
+    }
+
+    private void OnIsWeightless(Entity<MagbootsComponent> ent, ref InventoryRelayedEvent<IsWeightlessEvent> args)
+    {
+        OnIsWeightless(ent, ref args.Args);
+    }
+}
diff --git a/Content.Shared/Clothing/SharedMagbootsSystem.cs b/Content.Shared/Clothing/SharedMagbootsSystem.cs
deleted file mode 100644
index 27fb0c1a502..00000000000
--- a/Content.Shared/Clothing/SharedMagbootsSystem.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using Content.Shared.Actions;
-using Content.Shared.Clothing.EntitySystems;
-using Content.Shared.Inventory;
-using Content.Shared.Item;
-using Content.Shared.Slippery;
-using Content.Shared.Toggleable;
-using Content.Shared.Verbs;
-using Robust.Shared.Containers;
-
-namespace Content.Shared.Clothing;
-
-public abstract class SharedMagbootsSystem : EntitySystem
-{
-    [Dependency] private readonly ClothingSpeedModifierSystem _clothingSpeedModifier = default!;
-    [Dependency] private readonly ClothingSystem _clothing = default!;
-    [Dependency] private readonly InventorySystem _inventory = default!;
-    [Dependency] private readonly SharedActionsSystem _sharedActions = default!;
-    [Dependency] private readonly SharedActionsSystem _actionContainer = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly SharedContainerSystem _sharedContainer = default!;
-    [Dependency] private readonly SharedItemSystem _item = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<MagbootsComponent, GetVerbsEvent<ActivationVerb>>(AddToggleVerb);
-        SubscribeLocalEvent<MagbootsComponent, InventoryRelayedEvent<SlipAttemptEvent>>(OnSlipAttempt);
-        SubscribeLocalEvent<MagbootsComponent, GetItemActionsEvent>(OnGetActions);
-        SubscribeLocalEvent<MagbootsComponent, ToggleMagbootsEvent>(OnToggleMagboots);
-        SubscribeLocalEvent<MagbootsComponent, MapInitEvent>(OnMapInit);
-    }
-
-    private void OnMapInit(EntityUid uid, MagbootsComponent component, MapInitEvent args)
-    {
-        _actionContainer.AddAction(uid, ref component.ToggleActionEntity, component.ToggleAction);
-        Dirty(uid, component);
-    }
-
-    private void OnToggleMagboots(EntityUid uid, MagbootsComponent component, ToggleMagbootsEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        args.Handled = true;
-
-        ToggleMagboots(uid, component);
-    }
-
-    private void ToggleMagboots(EntityUid uid, MagbootsComponent magboots)
-    {
-        magboots.On = !magboots.On;
-
-        if (_sharedContainer.TryGetContainingContainer(uid, out var container) &&
-            _inventory.TryGetSlotEntity(container.Owner, "shoes", out var entityUid) && entityUid == uid)
-            UpdateMagbootEffects(container.Owner, uid, true, magboots);
-
-        if (TryComp<ItemComponent>(uid, out var item))
-        {
-            _item.SetHeldPrefix(uid, magboots.On ? "on" : null, component: item);
-            _clothing.SetEquippedPrefix(uid, magboots.On ? "on" : null);
-        }
-
-        _appearance.SetData(uid, ToggleVisuals.Toggled, magboots.On);
-        OnChanged(uid, magboots);
-        Dirty(uid, magboots);
-    }
-
-    protected virtual void UpdateMagbootEffects(EntityUid parent, EntityUid uid, bool state, MagbootsComponent? component) { }
-
-    protected void OnChanged(EntityUid uid, MagbootsComponent component)
-    {
-        _sharedActions.SetToggled(component.ToggleActionEntity, component.On);
-        _clothingSpeedModifier.SetClothingSpeedModifierEnabled(uid, component.On);
-    }
-
-    private void AddToggleVerb(EntityUid uid, MagbootsComponent component, GetVerbsEvent<ActivationVerb> args)
-    {
-        if (!args.CanAccess || !args.CanInteract)
-            return;
-
-        ActivationVerb verb = new();
-        verb.Text = Loc.GetString("toggle-magboots-verb-get-data-text");
-        verb.Act = () => ToggleMagboots(uid, component);
-        // TODO VERB ICON add toggle icon? maybe a computer on/off symbol?
-        args.Verbs.Add(verb);
-    }
-
-    private void OnSlipAttempt(EntityUid uid, MagbootsComponent component, InventoryRelayedEvent<SlipAttemptEvent> args)
-    {
-        if (component.On)
-            args.Args.Cancel();
-    }
-
-    private void OnGetActions(EntityUid uid, MagbootsComponent component, GetItemActionsEvent args)
-    {
-        args.AddAction(ref component.ToggleActionEntity, component.ToggleAction);
-    }
-}
-
-public sealed partial class ToggleMagbootsEvent : InstantActionEvent {}
diff --git a/Content.Shared/Item/ItemToggle/ComponentTogglerSystem.cs b/Content.Shared/Item/ItemToggle/ComponentTogglerSystem.cs
new file mode 100644
index 00000000000..760cefe27d4
--- /dev/null
+++ b/Content.Shared/Item/ItemToggle/ComponentTogglerSystem.cs
@@ -0,0 +1,26 @@
+using Content.Shared.Item.ItemToggle.Components;
+
+namespace Content.Shared.Item.ItemToggle;
+
+/// <summary>
+/// Handles <see cref="ComponentTogglerComponent"/> component manipulation.
+/// </summary>
+public sealed class ComponentTogglerSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ComponentTogglerComponent, ItemToggledEvent>(OnToggled);
+    }
+
+    private void OnToggled(Entity<ComponentTogglerComponent> ent, ref ItemToggledEvent args)
+    {
+        var target = ent.Comp.Parent ? Transform(ent).ParentUid : ent.Owner;
+
+        if (args.Activated)
+            EntityManager.AddComponents(target, ent.Comp.Components);
+        else
+            EntityManager.RemoveComponents(target, ent.Comp.RemoveComponents ?? ent.Comp.Components);
+    }
+}
diff --git a/Content.Shared/Item/ItemToggle/Components/ComponentTogglerComponent.cs b/Content.Shared/Item/ItemToggle/Components/ComponentTogglerComponent.cs
new file mode 100644
index 00000000000..20ef0a02315
--- /dev/null
+++ b/Content.Shared/Item/ItemToggle/Components/ComponentTogglerComponent.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Item.ItemToggle;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Item.ItemToggle.Components;
+
+/// <summary>
+/// Adds or removes components when toggled.
+/// Requires <see cref="ItemToggleComponent"/>.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(ComponentTogglerSystem))]
+public sealed partial class ComponentTogglerComponent : Component
+{
+    /// <summary>
+    /// The components to add when activated.
+    /// </summary>
+    [DataField(required: true)]
+    public ComponentRegistry Components = new();
+
+    /// <summary>
+    /// The components to remove when deactivated.
+    /// If this is null <see cref="Components"/> is reused.
+    /// </summary>
+    [DataField]
+    public ComponentRegistry? RemoveComponents;
+
+    /// <summary>
+    /// If true, adds components on the entity's parent instead of the entity itself.
+    /// </summary>
+    [DataField]
+    public bool Parent;
+}
diff --git a/Content.Shared/Item/ItemToggle/Components/ItemToggleActiveSoundComponent.cs b/Content.Shared/Item/ItemToggle/Components/ItemToggleActiveSoundComponent.cs
index 6d534713578..cdac49ae6d6 100644
--- a/Content.Shared/Item/ItemToggle/Components/ItemToggleActiveSoundComponent.cs
+++ b/Content.Shared/Item/ItemToggle/Components/ItemToggleActiveSoundComponent.cs
@@ -12,12 +12,12 @@ public sealed partial class ItemToggleActiveSoundComponent : Component
     /// <summary>
     ///     The continuous noise this item makes when it's activated (like an e-sword's hum).
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    [DataField(required: true), AutoNetworkedField]
     public SoundSpecifier? ActiveSound;
 
     /// <summary>
     ///     Used when the item emits sound while active.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField]
+    [DataField]
     public EntityUid? PlayingStream;
 }
diff --git a/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs b/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs
index 620ddfd1942..46249fdd0de 100644
--- a/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs
+++ b/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs
@@ -8,7 +8,7 @@ namespace Content.Shared.Item.ItemToggle.Components;
 /// </summary>
 /// <remarks>
 /// If you need extended functionality (e.g. requiring power) then add a new component and use events:
-/// ItemToggleActivateAttemptEvent, ItemToggleDeactivateAttemptEvent or ItemToggleForceToggleEvent.
+/// ItemToggleActivateAttemptEvent, ItemToggleDeactivateAttemptEvent, ItemToggledEvent.
 /// </remarks>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class ItemToggleComponent : Component
@@ -19,6 +19,13 @@ public sealed partial class ItemToggleComponent : Component
     [DataField, AutoNetworkedField]
     public bool Activated = false;
 
+    /// <summary>
+    /// If this is set to false then the item can't be toggled by pressing Z.
+    /// Use another system to do it then.
+    /// </summary>
+    [DataField]
+    public bool OnUse = true;
+
     /// <summary>
     ///     Whether the item's toggle can be predicted by the client.
     /// </summary>
diff --git a/Content.Shared/Item/ItemToggle/Components/ToggleVerbComponent.cs b/Content.Shared/Item/ItemToggle/Components/ToggleVerbComponent.cs
new file mode 100644
index 00000000000..b673c55e0f1
--- /dev/null
+++ b/Content.Shared/Item/ItemToggle/Components/ToggleVerbComponent.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Item.ItemToggle;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Item.ItemToggle.Components;
+
+/// <summary>
+/// Adds a verb for toggling something, requires <see cref="ItemToggleComponent"/>.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(ToggleVerbSystem))]
+public sealed partial class ToggleVerbComponent : Component
+{
+    /// <summary>
+    /// Text the verb will have.
+    /// Gets passed "entity" as the entity's identity string.
+    /// </summary>
+    [DataField(required: true)]
+    public LocId Text = string.Empty;
+}
diff --git a/Content.Shared/Item/ItemToggle/SharedItemToggleSystem.cs b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs
similarity index 67%
rename from Content.Shared/Item/ItemToggle/SharedItemToggleSystem.cs
rename to Content.Shared/Item/ItemToggle/ItemToggleSystem.cs
index d07fd5a735e..c4e4150659b 100644
--- a/Content.Shared/Item/ItemToggle/SharedItemToggleSystem.cs
+++ b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs
@@ -18,12 +18,12 @@ namespace Content.Shared.Item.ItemToggle;
 /// <remarks>
 /// If you need extended functionality (e.g. requiring power) then add a new component and use events.
 /// </remarks>
-public abstract class SharedItemToggleSystem : EntitySystem
+public sealed class ItemToggleSystem : EntitySystem
 {
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly INetManager _netManager = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedPointLightSystem _light = default!;
-    [Dependency] private readonly INetManager _netManager = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
 
     public override void Initialize()
@@ -31,8 +31,9 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<ItemToggleComponent, ComponentStartup>(OnStartup);
-        SubscribeLocalEvent<ItemToggleComponent, ItemUnwieldedEvent>(TurnOffonUnwielded);
-        SubscribeLocalEvent<ItemToggleComponent, ItemWieldedEvent>(TurnOnonWielded);
+        SubscribeLocalEvent<ItemToggleComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ItemToggleComponent, ItemUnwieldedEvent>(TurnOffOnUnwielded);
+        SubscribeLocalEvent<ItemToggleComponent, ItemWieldedEvent>(TurnOnOnWielded);
         SubscribeLocalEvent<ItemToggleComponent, UseInHandEvent>(OnUseInHand);
 
         SubscribeLocalEvent<ItemToggleHotComponent, IsHotEvent>(OnIsHotEvent);
@@ -47,57 +48,76 @@ private void OnStartup(Entity<ItemToggleComponent> ent, ref ComponentStartup arg
         UpdateVisuals(ent);
     }
 
-    private void OnUseInHand(EntityUid uid, ItemToggleComponent itemToggle, UseInHandEvent args)
+    private void OnMapInit(Entity<ItemToggleComponent> ent, ref MapInitEvent args)
+    {
+        if (!ent.Comp.Activated)
+            return;
+
+        var ev = new ItemToggledEvent(Predicted: ent.Comp.Predictable, Activated: ent.Comp.Activated, User: null);
+        RaiseLocalEvent(ent, ref ev);
+    }
+
+    private void OnUseInHand(Entity<ItemToggleComponent> ent, ref UseInHandEvent args)
     {
-        if (args.Handled)
+        if (args.Handled || !ent.Comp.OnUse)
             return;
 
         args.Handled = true;
 
-        Toggle(uid, args.User, predicted: itemToggle.Predictable, itemToggle: itemToggle);
+        Toggle((ent, ent.Comp), args.User, predicted: ent.Comp.Predictable);
     }
 
     /// <summary>
     /// Used when an item is attempted to be toggled.
+    /// Sets its state to the opposite of what it is.
     /// </summary>
-    public void Toggle(EntityUid uid, EntityUid? user = null, bool predicted = true, ItemToggleComponent? itemToggle = null)
+    /// <returns>Same as <see cref="TrySetActive"/></returns>
+    public bool Toggle(Entity<ItemToggleComponent?> ent, EntityUid? user = null, bool predicted = true)
     {
-        if (!Resolve(uid, ref itemToggle))
-            return;
+        if (!Resolve(ent, ref ent.Comp))
+            return false;
 
-        if (itemToggle.Activated)
-        {
-            TryDeactivate(uid, user, itemToggle: itemToggle, predicted: predicted);
-        }
+        return TrySetActive(ent, !ent.Comp.Activated, user, predicted);
+    }
+
+    /// <summary>
+    /// Tries to set the activated bool from a value.
+    /// </summary>
+    /// <returns>false if the attempt fails for any reason</returns>
+    public bool TrySetActive(Entity<ItemToggleComponent?> ent, bool active, EntityUid? user = null, bool predicted = true)
+    {
+        if (active)
+            return TryActivate(ent, user, predicted: predicted);
         else
-        {
-            TryActivate(uid, user, itemToggle: itemToggle, predicted: predicted);
-        }
+            return TryDeactivate(ent, user, predicted: predicted);
     }
 
     /// <summary>
     /// Used when an item is attempting to be activated. It returns false if the attempt fails any reason, interrupting the activation.
     /// </summary>
-    public bool TryActivate(EntityUid uid, EntityUid? user = null, bool predicted = true, ItemToggleComponent? itemToggle = null)
+    public bool TryActivate(Entity<ItemToggleComponent?> ent, EntityUid? user = null, bool predicted = true)
     {
-        if (!Resolve(uid, ref itemToggle))
+        if (!Resolve(ent, ref ent.Comp))
             return false;
 
-        if (itemToggle.Activated)
+        var uid = ent.Owner;
+        var comp = ent.Comp;
+        if (comp.Activated)
             return true;
 
-        if (!itemToggle.Predictable && _netManager.IsClient)
+        if (!comp.Predictable && _netManager.IsClient)
             return true;
 
         var attempt = new ItemToggleActivateAttemptEvent(user);
         RaiseLocalEvent(uid, ref attempt);
 
+        if (!comp.Predictable) predicted = false;
         if (attempt.Cancelled)
         {
             if (predicted)
-                _audio.PlayPredicted(itemToggle.SoundFailToActivate, uid, user);
+                _audio.PlayPredicted(comp.SoundFailToActivate, uid, user);
             else
-                _audio.PlayPvs(itemToggle.SoundFailToActivate, uid);
+                _audio.PlayPvs(comp.SoundFailToActivate, uid);
 
             if (attempt.Popup != null && user != null)
             {
@@ -110,7 +130,7 @@ public bool TryActivate(EntityUid uid, EntityUid? user = null, bool predicted =
             return false;
         }
 
-        Activate(uid, itemToggle, predicted, user);
+        Activate((uid, comp), predicted, user);
 
         return true;
     }
@@ -118,75 +138,65 @@ public bool TryActivate(EntityUid uid, EntityUid? user = null, bool predicted =
     /// <summary>
     /// Used when an item is attempting to be deactivated. It returns false if the attempt fails any reason, interrupting the deactivation.
     /// </summary>
-    public bool TryDeactivate(EntityUid uid, EntityUid? user = null, bool predicted = true, ItemToggleComponent? itemToggle = null)
+    public bool TryDeactivate(Entity<ItemToggleComponent?> ent, EntityUid? user = null, bool predicted = true)
     {
-        if (!Resolve(uid, ref itemToggle))
+        if (!Resolve(ent, ref ent.Comp))
             return false;
 
-        if (!itemToggle.Predictable && _netManager.IsClient)
+        var uid = ent.Owner;
+        var comp = ent.Comp;
+        if (!comp.Activated)
             return true;
 
-        if (!itemToggle.Activated)
+        if (!comp.Predictable && _netManager.IsClient)
             return true;
 
         var attempt = new ItemToggleDeactivateAttemptEvent(user);
         RaiseLocalEvent(uid, ref attempt);
 
         if (attempt.Cancelled)
-        {
             return false;
-        }
 
-        Deactivate(uid, itemToggle, predicted, user);
+        if (!comp.Predictable) predicted = false;
+        Deactivate((uid, comp), predicted, user);
         return true;
     }
 
-    private void Activate(EntityUid uid, ItemToggleComponent itemToggle, bool predicted, EntityUid? user = null)
+    private void Activate(Entity<ItemToggleComponent> ent, bool predicted, EntityUid? user = null)
     {
-        // TODO: Fix this hardcoding
-        TryComp(uid, out AppearanceComponent? appearance);
-        _appearance.SetData(uid, ToggleableLightVisuals.Enabled, true, appearance);
-        _appearance.SetData(uid, ToggleVisuals.Toggled, true, appearance);
-
-        if (_light.TryGetLight(uid, out var light))
-        {
-            _light.SetEnabled(uid, true, light);
-        }
-
-        var soundToPlay = itemToggle.SoundActivate;
+        var (uid, comp) = ent;
+        var soundToPlay = comp.SoundActivate;
         if (predicted)
             _audio.PlayPredicted(soundToPlay, uid, user);
         else
             _audio.PlayPvs(soundToPlay, uid);
 
-        // END FIX HARDCODING
+        comp.Activated = true;
+        UpdateVisuals((uid, comp));
+        Dirty(uid, comp);
 
         var toggleUsed = new ItemToggledEvent(predicted, Activated: true, user);
         RaiseLocalEvent(uid, ref toggleUsed);
-
-        itemToggle.Activated = true;
-        UpdateVisuals((uid, itemToggle));
-        Dirty(uid, itemToggle);
     }
 
     /// <summary>
     /// Used to make the actual changes to the item's components on deactivation.
     /// </summary>
-    private void Deactivate(EntityUid uid, ItemToggleComponent itemToggle, bool predicted, EntityUid? user = null)
+    private void Deactivate(Entity<ItemToggleComponent> ent, bool predicted, EntityUid? user = null)
     {
-        var soundToPlay = itemToggle.SoundDeactivate;
+        var (uid, comp) = ent;
+        var soundToPlay = comp.SoundDeactivate;
         if (predicted)
             _audio.PlayPredicted(soundToPlay, uid, user);
         else
             _audio.PlayPvs(soundToPlay, uid);
-        // END FIX HARDCODING
+
+        comp.Activated = false;
+        UpdateVisuals((uid, comp));
+        Dirty(uid, comp);
 
         var toggleUsed = new ItemToggledEvent(predicted, Activated: false, user);
         RaiseLocalEvent(uid, ref toggleUsed);
-
-        itemToggle.Activated = false;
-        UpdateVisuals((uid, itemToggle));
-        Dirty(uid, itemToggle);
     }
 
     private void UpdateVisuals(Entity<ItemToggleComponent> ent)
@@ -209,68 +219,56 @@ private void UpdateVisuals(Entity<ItemToggleComponent> ent)
     /// <summary>
     /// Used for items that require to be wielded in both hands to activate. For instance the dual energy sword will turn off if not wielded.
     /// </summary>
-    private void TurnOffonUnwielded(EntityUid uid, ItemToggleComponent itemToggle, ItemUnwieldedEvent args)
+    private void TurnOffOnUnwielded(Entity<ItemToggleComponent> ent, ref ItemUnwieldedEvent args)
     {
-        if (itemToggle.Activated)
-            TryDeactivate(uid, args.User, itemToggle: itemToggle);
+        TryDeactivate((ent, ent.Comp), args.User);
     }
 
     /// <summary>
     /// Wieldable items will automatically turn on when wielded.
     /// </summary>
-    private void TurnOnonWielded(EntityUid uid, ItemToggleComponent itemToggle, ref ItemWieldedEvent args)
+    private void TurnOnOnWielded(Entity<ItemToggleComponent> ent, ref ItemWieldedEvent args)
     {
-        if (!itemToggle.Activated)
-            TryActivate(uid, itemToggle: itemToggle);
+        // FIXME: for some reason both client and server play sound
+        TryActivate((ent, ent.Comp));
     }
 
-    public bool IsActivated(EntityUid uid, ItemToggleComponent? comp = null)
+    public bool IsActivated(Entity<ItemToggleComponent?> ent)
     {
-        if (!Resolve(uid, ref comp, false))
+        if (!Resolve(ent, ref ent.Comp, false))
             return true; // assume always activated if no component
 
-        return comp.Activated;
+        return ent.Comp.Activated;
     }
 
     /// <summary>
     /// Used to make the item hot when activated.
     /// </summary>
-    private void OnIsHotEvent(EntityUid uid, ItemToggleHotComponent itemToggleHot, IsHotEvent args)
+    private void OnIsHotEvent(Entity<ItemToggleHotComponent> ent, ref IsHotEvent args)
     {
-        args.IsHot |= IsActivated(uid);
+        args.IsHot |= IsActivated(ent.Owner);
     }
 
     /// <summary>
     /// Used to update the looping active sound linked to the entity.
     /// </summary>
-    private void UpdateActiveSound(EntityUid uid, ItemToggleActiveSoundComponent activeSound, ref ItemToggledEvent args)
+    private void UpdateActiveSound(Entity<ItemToggleActiveSoundComponent> ent, ref ItemToggledEvent args)
     {
-        if (args.Activated)
+        var (uid, comp) = ent;
+        if (!args.Activated)
         {
-            if (activeSound.ActiveSound != null && activeSound.PlayingStream == null)
-            {
-                if (args.Predicted)
-                {
-                    var playingStream = _audio.PlayPredicted(activeSound.ActiveSound, uid, args.User, AudioParams.Default.WithLoop(true));
-
-                    if (playingStream == null)
-                        return;
-
-                    activeSound.PlayingStream = playingStream!.Value.Entity;
-                } else
-                {
-                    var playingStream = _audio.PlayPvs(activeSound.ActiveSound, uid, AudioParams.Default.WithLoop(true));
-
-                    if (playingStream == null)
-                        return;
-
-                    activeSound.PlayingStream = playingStream!.Value.Entity;
-                }
-            }
+            comp.PlayingStream = _audio.Stop(comp.PlayingStream);
+            return;
         }
-        else
+
+        if (comp.ActiveSound != null && comp.PlayingStream == null)
         {
-            activeSound.PlayingStream = _audio.Stop(activeSound.PlayingStream);
+            var loop = AudioParams.Default.WithLoop(true);
+            var stream = args.Predicted
+                ? _audio.PlayPredicted(comp.ActiveSound, uid, args.User, loop)
+                : _audio.PlayPvs(comp.ActiveSound, uid, loop);
+            if (stream?.Entity is {} entity)
+                comp.PlayingStream = entity;
         }
     }
 
diff --git a/Content.Shared/Item/ItemToggle/ToggleVerbSystem.cs b/Content.Shared/Item/ItemToggle/ToggleVerbSystem.cs
new file mode 100644
index 00000000000..858cd9bc111
--- /dev/null
+++ b/Content.Shared/Item/ItemToggle/ToggleVerbSystem.cs
@@ -0,0 +1,34 @@
+using Content.Shared.IdentityManagement;
+using Content.Shared.Item.ItemToggle.Components;
+using Content.Shared.Verbs;
+
+namespace Content.Shared.Item.ItemToggle;
+
+/// <summary>
+/// Adds a verb for toggling something with <see cref="ToggleVerbComponent"/>.
+/// </summary>
+public sealed class ToggleVerbSystem : EntitySystem
+{
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ToggleVerbComponent, GetVerbsEvent<ActivationVerb>>(OnGetVerbs);
+    }
+
+    private void OnGetVerbs(Entity<ToggleVerbComponent> ent, ref GetVerbsEvent<ActivationVerb> args)
+    {
+        if (!args.CanAccess || !args.CanInteract)
+            return;
+
+        var name = Identity.Entity(ent, EntityManager);
+        var user = args.User;
+        args.Verbs.Add(new ActivationVerb()
+        {
+            Text = Loc.GetString(ent.Comp.Text, ("entity", name)),
+            Act = () => _toggle.Toggle(ent.Owner, user)
+        });
+    }
+}
diff --git a/Content.Shared/Medical/DefibrillatorComponent.cs b/Content.Shared/Medical/DefibrillatorComponent.cs
index 2da52852854..1d6f690bc3b 100644
--- a/Content.Shared/Medical/DefibrillatorComponent.cs
+++ b/Content.Shared/Medical/DefibrillatorComponent.cs
@@ -10,16 +10,11 @@ namespace Content.Shared.Medical;
 /// <summary>
 /// This is used for defibrillators; a machine that shocks a dead
 /// person back into the world of the living.
+/// Uses <c>ItemToggleComponent</c>
 /// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentPause]
 public sealed partial class DefibrillatorComponent : Component
 {
-    /// <summary>
-    /// Whether or not it's turned on and able to be used.
-    /// </summary>
-    [DataField("enabled"), ViewVariables(VVAccess.ReadWrite)]
-    public bool Enabled;
-
     /// <summary>
     /// The time at which the zap cooldown will be completed
     /// </summary>
@@ -66,15 +61,6 @@ public sealed partial class DefibrillatorComponent : Component
     [ViewVariables(VVAccess.ReadWrite), DataField("zapSound")]
     public SoundSpecifier? ZapSound = new SoundPathSpecifier("/Audio/Items/Defib/defib_zap.ogg");
 
-    /// <summary>
-    /// The sound when the defib is powered on.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("powerOnSound")]
-    public SoundSpecifier? PowerOnSound = new SoundPathSpecifier("/Audio/Items/Defib/defib_safety_on.ogg");
-
-    [ViewVariables(VVAccess.ReadWrite), DataField("powerOffSound")]
-    public SoundSpecifier? PowerOffSound = new SoundPathSpecifier("/Audio/Items/Defib/defib_safety_off.ogg");
-
     [ViewVariables(VVAccess.ReadWrite), DataField("chargeSound")]
     public SoundSpecifier? ChargeSound = new SoundPathSpecifier("/Audio/Items/Defib/defib_charge.ogg");
 
diff --git a/Content.Shared/Ninja/Components/BatteryDrainerComponent.cs b/Content.Shared/Ninja/Components/BatteryDrainerComponent.cs
index 55bcdd0f0a5..9c39c4724ce 100644
--- a/Content.Shared/Ninja/Components/BatteryDrainerComponent.cs
+++ b/Content.Shared/Ninja/Components/BatteryDrainerComponent.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Ninja.Systems;
 using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Ninja.Components;
 
@@ -7,32 +8,33 @@ namespace Content.Shared.Ninja.Components;
 /// Component for draining power from APCs/substations/SMESes, when ProviderUid is set to a battery cell.
 /// Does not rely on relay, simply being on the user and having BatteryUid set is enough.
 /// </summary>
-[RegisterComponent, Access(typeof(SharedBatteryDrainerSystem))]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SharedBatteryDrainerSystem))]
 public sealed partial class BatteryDrainerComponent : Component
 {
     /// <summary>
     /// The powercell entity to drain power into.
     /// Determines whether draining is possible.
     /// </summary>
-    [DataField("batteryUid"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public EntityUid? BatteryUid;
 
     /// <summary>
     /// Conversion rate between joules in a device and joules added to battery.
     /// Should be very low since powercells store nothing compared to even an APC.
     /// </summary>
-    [DataField("drainEfficiency"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float DrainEfficiency = 0.001f;
 
     /// <summary>
     /// Time that the do after takes to drain charge from a battery, in seconds
     /// </summary>
-    [DataField("drainTime"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float DrainTime = 1f;
 
     /// <summary>
     /// Sound played after the doafter ends.
     /// </summary>
-    [DataField("sparkSound")]
+    [DataField]
     public SoundSpecifier SparkSound = new SoundCollectionSpecifier("sparks");
 }
diff --git a/Content.Shared/Ninja/Components/BombingTargetComponent.cs b/Content.Shared/Ninja/Components/BombingTargetComponent.cs
index bf0eaec84be..c429eb6880e 100644
--- a/Content.Shared/Ninja/Components/BombingTargetComponent.cs
+++ b/Content.Shared/Ninja/Components/BombingTargetComponent.cs
@@ -4,6 +4,4 @@ namespace Content.Shared.Ninja.Components;
 /// Makes this warp point a valid bombing target for ninja's spider charge.
 /// </summary>
 [RegisterComponent]
-public sealed partial class BombingTargetComponent : Component
-{
-}
+public sealed partial class BombingTargetComponent : Component;
diff --git a/Content.Shared/Ninja/Components/DashAbilityComponent.cs b/Content.Shared/Ninja/Components/DashAbilityComponent.cs
index ba4060c7035..464f48f187e 100644
--- a/Content.Shared/Ninja/Components/DashAbilityComponent.cs
+++ b/Content.Shared/Ninja/Components/DashAbilityComponent.cs
@@ -8,6 +8,7 @@ namespace Content.Shared.Ninja.Components;
 
 /// <summary>
 /// Adds an action to dash, teleport to clicked position, when this item is held.
+/// Cancel <see cref="CheckDashEvent"/> to prevent using it.
 /// </summary>
 [RegisterComponent, NetworkedComponent, Access(typeof(DashAbilitySystem)), AutoGenerateComponentState]
 public sealed partial class DashAbilityComponent : Component
@@ -16,19 +17,10 @@ public sealed partial class DashAbilityComponent : Component
     /// The action id for dashing.
     /// </summary>
     [DataField]
-    public EntProtoId DashAction = "ActionEnergyKatanaDash";
+    public EntProtoId<WorldTargetActionComponent> DashAction = "ActionEnergyKatanaDash";
 
     [DataField, AutoNetworkedField]
     public EntityUid? DashActionEntity;
-
-    /// <summary>
-    /// Sound played when using dash action.
-    /// </summary>
-    [DataField("blinkSound"), ViewVariables(VVAccess.ReadWrite)]
-    public SoundSpecifier BlinkSound = new SoundPathSpecifier("/Audio/Magic/blink.ogg")
-    {
-        Params = AudioParams.Default.WithVolume(5f)
-    };
 }
 
-public sealed partial class DashEvent : WorldTargetActionEvent { }
+public sealed partial class DashEvent : WorldTargetActionEvent;
diff --git a/Content.Shared/Ninja/Components/EmagProviderComponent.cs b/Content.Shared/Ninja/Components/EmagProviderComponent.cs
index db7678f61d7..ae3e85cbe42 100644
--- a/Content.Shared/Ninja/Components/EmagProviderComponent.cs
+++ b/Content.Shared/Ninja/Components/EmagProviderComponent.cs
@@ -2,7 +2,7 @@
 using Content.Shared.Tag;
 using Content.Shared.Whitelist;
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Ninja.Components;
 
@@ -10,19 +10,18 @@ namespace Content.Shared.Ninja.Components;
 /// Component for emagging things on click.
 /// No charges but checks against a whitelist.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-[Access(typeof(EmagProviderSystem))]
+[RegisterComponent, NetworkedComponent, Access(typeof(EmagProviderSystem))]
 public sealed partial class EmagProviderComponent : Component
 {
     /// <summary>
     /// The tag that marks an entity as immune to emagging.
     /// </summary>
-    [DataField("emagImmuneTag", customTypeSerializer: typeof(PrototypeIdSerializer<TagPrototype>))]
-    public string EmagImmuneTag = "EmagImmune";
+    [DataField]
+    public ProtoId<TagPrototype> EmagImmuneTag = "EmagImmune";
 
     /// <summary>
     /// Whitelist that entities must be on to work.
     /// </summary>
-    [DataField("whitelist"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
-    public EntityWhitelist? Whitelist = null;
+    [DataField]
+    public EntityWhitelist? Whitelist;
 }
diff --git a/Content.Shared/Ninja/Components/EnergyKatanaComponent.cs b/Content.Shared/Ninja/Components/EnergyKatanaComponent.cs
index 33b8fc78933..84c58bb6480 100644
--- a/Content.Shared/Ninja/Components/EnergyKatanaComponent.cs
+++ b/Content.Shared/Ninja/Components/EnergyKatanaComponent.cs
@@ -7,6 +7,4 @@ namespace Content.Shared.Ninja.Components;
 /// Requires a ninja with a suit for abilities to work.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
-public sealed partial class EnergyKatanaComponent : Component
-{
-}
+public sealed partial class EnergyKatanaComponent : Component;
diff --git a/Content.Shared/Ninja/Components/ItemCreatorComponent.cs b/Content.Shared/Ninja/Components/ItemCreatorComponent.cs
new file mode 100644
index 00000000000..d9f66d21a31
--- /dev/null
+++ b/Content.Shared/Ninja/Components/ItemCreatorComponent.cs
@@ -0,0 +1,52 @@
+using Content.Shared.Actions;
+using Content.Shared.Ninja.Systems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Ninja.Components;
+
+/// <summary>
+/// Uses battery charge to spawn an item and place it in the user's hands.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SharedItemCreatorSystem))]
+public sealed partial class ItemCreatorComponent : Component
+{
+    /// <summary>
+    /// The battery entity to use charge from
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? Battery;
+
+    /// <summary>
+    /// The action id for creating an item.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId<InstantActionComponent> Action = string.Empty;
+
+    [DataField, AutoNetworkedField]
+    public EntityUid? ActionEntity;
+
+    /// <summary>
+    /// Battery charge used to create an item.
+    /// </summary>
+    [DataField(required: true)]
+    public float Charge = 14.4f;
+
+    /// <summary>
+    /// Item to create with the action
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId SpawnedPrototype = string.Empty;
+
+    /// <summary>
+    /// Popup shown to the user when there isn't enough power to create an item.
+    /// </summary>
+    [DataField(required: true)]
+    public LocId NoPowerPopup = string.Empty;
+}
+
+/// <summary>
+/// Action event to use an <see cref="ItemCreator"/>.
+/// </summary>
+public sealed partial class CreateItemEvent : InstantActionEvent;
diff --git a/Content.Shared/Ninja/Components/NinjaGlovesComponent.cs b/Content.Shared/Ninja/Components/NinjaGlovesComponent.cs
index 7b57926330b..3b9e2a5e356 100644
--- a/Content.Shared/Ninja/Components/NinjaGlovesComponent.cs
+++ b/Content.Shared/Ninja/Components/NinjaGlovesComponent.cs
@@ -1,20 +1,17 @@
-using Content.Shared.DoAfter;
 using Content.Shared.Ninja.Systems;
-using Content.Shared.Toggleable;
-using Content.Shared.Whitelist;
+using Content.Shared.Objectives.Components;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Utility;
 
 namespace Content.Shared.Ninja.Components;
 
 /// <summary>
 /// Component for toggling glove powers.
-/// Powers being enabled is controlled by User not being null.
 /// </summary>
+/// <remarks>
+/// Requires <c>ItemToggleComponent</c>.
+/// </remarks>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 [Access(typeof(SharedNinjaGlovesSystem))]
 public sealed partial class NinjaGlovesComponent : Component
@@ -22,24 +19,33 @@ public sealed partial class NinjaGlovesComponent : Component
     /// <summary>
     /// Entity of the ninja using these gloves, usually means enabled
     /// </summary>
-    [DataField("user"), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public EntityUid? User;
 
     /// <summary>
-    /// The action id for toggling ninja gloves abilities
+    /// Abilities to give to the user when enabled.
     /// </summary>
-    [DataField("toggleAction", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string ToggleAction = "ActionToggleNinjaGloves";
+    [DataField(required: true)]
+    public List<NinjaGloveAbility> Abilities = new();
+}
 
-    [DataField, AutoNetworkedField]
-    public EntityUid? ToggleActionEntity;
+/// <summary>
+/// An ability that adds components to the user when the gloves are enabled.
+/// </summary>
+[DataRecord]
+public record struct NinjaGloveAbility()
+{
+    /// <summary>
+    /// If not null, checks if an objective with this prototype has been completed.
+    /// If it has, the ability components are skipped to prevent doing the objective twice.
+    /// The objective must have <c>CodeConditionComponent</c> to be checked.
+    /// </summary>
+    [DataField]
+    public EntProtoId<ObjectiveComponent>? Objective;
 
     /// <summary>
-    /// The whitelist used for the emag provider to emag airlocks only (not regular doors).
+    /// Components to add and remove.
     /// </summary>
-    [DataField("doorjackWhitelist")]
-    public EntityWhitelist DoorjackWhitelist = new()
-    {
-        Components = new[] {"Airlock"}
-    };
+    [DataField(required: true)]
+    public ComponentRegistry Components = new();
 }
diff --git a/Content.Shared/Ninja/Components/NinjaSuitComponent.cs b/Content.Shared/Ninja/Components/NinjaSuitComponent.cs
index 7e7b1ffcd30..8b477b2aa5f 100644
--- a/Content.Shared/Ninja/Components/NinjaSuitComponent.cs
+++ b/Content.Shared/Ninja/Components/NinjaSuitComponent.cs
@@ -3,9 +3,6 @@
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Ninja.Components;
@@ -14,68 +11,27 @@ namespace Content.Shared.Ninja.Components;
 /// Component for ninja suit abilities and power consumption.
 /// As an implementation detail, dashing with katana is a suit action which isn't ideal.
 /// </summary>
-[RegisterComponent, NetworkedComponent, Access(typeof(SharedNinjaSuitSystem)), AutoGenerateComponentState]
-[AutoGenerateComponentPause]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SharedNinjaSuitSystem))]
 public sealed partial class NinjaSuitComponent : Component
 {
-    /// <summary>
-    /// Battery charge used passively, in watts. Will last 1000 seconds on a small-capacity power cell.
-    /// </summary>
-    [DataField("passiveWattage")]
-    public float PassiveWattage = 0.36f;
-
-    /// <summary>
-    /// Battery charge used while cloaked, stacks with passive. Will last 200 seconds while cloaked on a small-capacity power cell.
-    /// </summary>
-    [DataField("cloakWattage")]
-    public float CloakWattage = 1.44f;
-
     /// <summary>
     /// Sound played when a ninja is hit while cloaked.
     /// </summary>
-    [DataField("revealSound")]
+    [DataField]
     public SoundSpecifier RevealSound = new SoundPathSpecifier("/Audio/Effects/chime.ogg");
 
     /// <summary>
-    /// How long to disable all abilities when revealed.
-    /// Normally, ninjas are revealed when attacking or getting damaged.
-    /// </summary>
-    [DataField("disableTime")]
-    public TimeSpan DisableTime = TimeSpan.FromSeconds(5);
-
-    /// <summary>
-    /// Time at which we will be able to use our abilities again
+    /// ID of the use delay to disable all ninja abilities.
     /// </summary>
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
-    [AutoPausedField]
-    public TimeSpan DisableCooldown;
-
-    /// <summary>
-    /// The action id for creating throwing stars.
-    /// </summary>
-    [DataField("createThrowingStarAction", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string CreateThrowingStarAction = "ActionCreateThrowingStar";
-
-    [DataField, AutoNetworkedField]
-    public EntityUid? CreateThrowingStarActionEntity;
-
-    /// <summary>
-    /// Battery charge used to create a throwing star. Can do it 25 times on a small-capacity power cell.
-    /// </summary>
-    [DataField("throwingStarCharge")]
-    public float ThrowingStarCharge = 14.4f;
-
-    /// <summary>
-    /// Throwing star item to create with the action
-    /// </summary>
-    [DataField("throwingStarPrototype", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string ThrowingStarPrototype = "ThrowingStarNinja";
+    [DataField]
+    public string DisableDelayId = "suit_powers";
 
     /// <summary>
     /// The action id for recalling a bound energy katana
     /// </summary>
-    [DataField("recallKatanaAction", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string RecallKatanaAction = "ActionRecallKatana";
+    [DataField]
+    public EntProtoId RecallKatanaAction = "ActionRecallKatana";
 
     [DataField, AutoNetworkedField]
     public EntityUid? RecallKatanaActionEntity;
@@ -84,14 +40,14 @@ public sealed partial class NinjaSuitComponent : Component
     /// Battery charge used per tile the katana teleported.
     /// Uses 1% of a default battery per tile.
     /// </summary>
-    [DataField("recallCharge")]
+    [DataField]
     public float RecallCharge = 3.6f;
 
     /// <summary>
     /// The action id for creating an EMP burst
     /// </summary>
-    [DataField("empAction", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string EmpAction = "ActionNinjaEmp";
+    [DataField]
+    public EntProtoId EmpAction = "ActionNinjaEmp";
 
     [DataField, AutoNetworkedField]
     public EntityUid? EmpActionEntity;
@@ -99,36 +55,29 @@ public sealed partial class NinjaSuitComponent : Component
     /// <summary>
     /// Battery charge used to create an EMP burst. Can do it 2 times on a small-capacity power cell.
     /// </summary>
-    [DataField("empCharge")]
+    [DataField]
     public float EmpCharge = 180f;
 
+    // TODO: EmpOnTrigger bruh
     /// <summary>
     /// Range of the EMP in tiles.
     /// </summary>
-    [DataField("empRange")]
+    [DataField]
     public float EmpRange = 6f;
 
     /// <summary>
     /// Power consumed from batteries by the EMP
     /// </summary>
-    [DataField("empConsumption")]
+    [DataField]
     public float EmpConsumption = 100000f;
 
     /// <summary>
     /// How long the EMP effects last for, in seconds
     /// </summary>
-    [DataField("empDuration")]
+    [DataField]
     public float EmpDuration = 60f;
 }
 
-public sealed partial class CreateThrowingStarEvent : InstantActionEvent
-{
-}
-
-public sealed partial class RecallKatanaEvent : InstantActionEvent
-{
-}
+public sealed partial class RecallKatanaEvent : InstantActionEvent;
 
-public sealed partial class NinjaEmpEvent : InstantActionEvent
-{
-}
+public sealed partial class NinjaEmpEvent : InstantActionEvent;
diff --git a/Content.Shared/Ninja/Components/SpaceNinjaComponent.cs b/Content.Shared/Ninja/Components/SpaceNinjaComponent.cs
index 91c816df5c9..a19537be1c8 100644
--- a/Content.Shared/Ninja/Components/SpaceNinjaComponent.cs
+++ b/Content.Shared/Ninja/Components/SpaceNinjaComponent.cs
@@ -7,34 +7,28 @@ namespace Content.Shared.Ninja.Components;
 
 /// <summary>
 /// Component placed on a mob to make it a space ninja, able to use suit and glove powers.
-/// Contains ids of all ninja equipment and the game rule.
+/// Contains ids of all ninja equipment.
 /// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 [Access(typeof(SharedSpaceNinjaSystem))]
 public sealed partial class SpaceNinjaComponent : Component
 {
-    /// <summary>
-    /// The ninja game rule that spawned this ninja.
-    /// </summary>
-    [DataField("rule")]
-    public EntityUid? Rule;
-
     /// <summary>
     /// Currently worn suit
     /// </summary>
-    [DataField("suit"), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public EntityUid? Suit;
 
     /// <summary>
-    /// Currently worn gloves
+    /// Currently worn gloves, if enabled.
     /// </summary>
-    [DataField("gloves"), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public EntityUid? Gloves;
 
     /// <summary>
     /// Bound katana, set once picked up and never removed
     /// </summary>
-    [DataField("katana"), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public EntityUid? Katana;
 
     /// <summary>
@@ -55,6 +49,9 @@ public sealed partial class SpaceNinjaComponent : Component
     [DataField]
     public EntProtoId SpiderChargeObjective = "SpiderChargeObjective";
 
+    /// <summary>
+    /// Alert to show for suit power.
+    /// </summary>
     [DataField]
     public ProtoId<AlertPrototype> SuitPowerAlert = "SuitPower";
 }
diff --git a/Content.Shared/Ninja/Components/SpiderChargeComponent.cs b/Content.Shared/Ninja/Components/SpiderChargeComponent.cs
index dacf47bb235..3ba4494cca4 100644
--- a/Content.Shared/Ninja/Components/SpiderChargeComponent.cs
+++ b/Content.Shared/Ninja/Components/SpiderChargeComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Ninja.Systems;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Ninja.Components;
@@ -6,14 +7,14 @@ namespace Content.Shared.Ninja.Components;
 /// Component for the Space Ninja's unique Spider Charge.
 /// Only this component detonating can trigger the ninja's objective.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedSpiderChargeSystem))]
 public sealed partial class SpiderChargeComponent : Component
 {
     /// Range for planting within the target area
-    [DataField("range")]
+    [DataField]
     public float Range = 10f;
 
     /// The ninja that planted this charge
-    [DataField("planter")]
-    public EntityUid? Planter = null;
+    [DataField]
+    public EntityUid? Planter;
 }
diff --git a/Content.Shared/Ninja/Components/StunProviderComponent.cs b/Content.Shared/Ninja/Components/StunProviderComponent.cs
index 37a27074a49..2da094291d7 100644
--- a/Content.Shared/Ninja/Components/StunProviderComponent.cs
+++ b/Content.Shared/Ninja/Components/StunProviderComponent.cs
@@ -3,7 +3,6 @@
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Ninja.Components;
 
@@ -11,32 +10,33 @@ namespace Content.Shared.Ninja.Components;
 /// Component for stunning mobs on click outside of harm mode.
 /// Knocks them down for a bit and deals shock damage.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedStunProviderSystem))]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SharedStunProviderSystem))]
 public sealed partial class StunProviderComponent : Component
 {
     /// <summary>
     /// The powercell entity to take power from.
     /// Determines whether stunning is possible.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public EntityUid? BatteryUid;
 
     /// <summary>
     /// Sound played when stunning someone.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public SoundSpecifier Sound = new SoundCollectionSpecifier("sparks");
 
     /// <summary>
     /// Joules required in the battery to stun someone. Defaults to 10 uses on a small battery.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float StunCharge = 36f;
 
     /// <summary>
     /// Damage dealt when stunning someone
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public DamageSpecifier StunDamage = new()
     {
         DamageDict = new()
@@ -48,34 +48,30 @@ public sealed partial class StunProviderComponent : Component
     /// <summary>
     /// Time that someone is stunned for, stacks if done multiple times.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public TimeSpan StunTime = TimeSpan.FromSeconds(5);
 
     /// <summary>
     /// How long stunning is disabled after stunning something.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public TimeSpan Cooldown = TimeSpan.FromSeconds(2);
 
     /// <summary>
-    /// Locale string to popup when there is no power
+    /// ID of the cooldown use delay.
     /// </summary>
-    [DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
-    public string NoPowerPopup = string.Empty;
+    [DataField]
+    public string DelayId = "stun_cooldown";
 
     /// <summary>
-    /// Whitelist for what counts as a mob.
+    /// Locale string to popup when there is no power
     /// </summary>
-    [DataField]
-    public EntityWhitelist Whitelist = new()
-    {
-        Components = new[] {"Stamina"}
-    };
+    [DataField(required: true)]
+    public LocId NoPowerPopup = string.Empty;
 
     /// <summary>
-    /// When someone can next be stunned.
-    /// Essentially a UseDelay unique to this component.
+    /// Whitelist for what counts as a mob.
     /// </summary>
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
-    public TimeSpan NextStun = TimeSpan.Zero;
+    [DataField(required: true)]
+    public EntityWhitelist Whitelist = new();
 }
diff --git a/Content.Shared/Ninja/Systems/DashAbilitySystem.cs b/Content.Shared/Ninja/Systems/DashAbilitySystem.cs
index 4853968b61f..1385219e473 100644
--- a/Content.Shared/Ninja/Systems/DashAbilitySystem.cs
+++ b/Content.Shared/Ninja/Systems/DashAbilitySystem.cs
@@ -16,6 +16,7 @@ namespace Content.Shared.Ninja.Systems;
 /// </summary>
 public sealed class DashAbilitySystem : EntitySystem
 {
+    [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedChargesSystem _charges = default!;
@@ -23,48 +24,40 @@ public sealed class DashAbilitySystem : EntitySystem
     [Dependency] private readonly ExamineSystemShared _examine = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
-    [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<DashAbilityComponent, GetItemActionsEvent>(OnGetItemActions);
+        SubscribeLocalEvent<DashAbilityComponent, GetItemActionsEvent>(OnGetActions);
         SubscribeLocalEvent<DashAbilityComponent, DashEvent>(OnDash);
         SubscribeLocalEvent<DashAbilityComponent, MapInitEvent>(OnMapInit);
     }
 
-    private void OnMapInit(EntityUid uid, DashAbilityComponent component, MapInitEvent args)
+    private void OnMapInit(Entity<DashAbilityComponent> ent, ref MapInitEvent args)
     {
-        _actionContainer.EnsureAction(uid, ref component.DashActionEntity, component.DashAction);
-        Dirty(uid, component);
+        var (uid, comp) = ent;
+        _actionContainer.EnsureAction(uid, ref comp.DashActionEntity, comp.DashAction);
+        Dirty(uid, comp);
     }
 
-    private void OnGetItemActions(EntityUid uid, DashAbilityComponent comp, GetItemActionsEvent args)
+    private void OnGetActions(Entity<DashAbilityComponent> ent, ref GetItemActionsEvent args)
     {
-        var ev = new AddDashActionEvent(args.User);
-        RaiseLocalEvent(uid, ev);
-
-        if (ev.Cancelled)
-            return;
-
-        args.AddAction(ref comp.DashActionEntity, comp.DashAction);
+        if (CheckDash(ent, args.User))
+            args.AddAction(ent.Comp.DashActionEntity);
     }
 
     /// <summary>
     /// Handle charges and teleport to a visible location.
     /// </summary>
-    private void OnDash(EntityUid uid, DashAbilityComponent comp, DashEvent args)
+    private void OnDash(Entity<DashAbilityComponent> ent, ref DashEvent args)
     {
         if (!_timing.IsFirstTimePredicted)
             return;
 
+        var (uid, comp) = ent;
         var user = args.Performer;
-        args.Handled = true;
-
-        var ev = new DashAttemptEvent(user);
-        RaiseLocalEvent(uid, ev);
-        if (ev.Cancelled)
+        if (!CheckDash(uid, user))
             return;
 
         if (!_hands.IsHolding(user, uid, out var _))
@@ -73,15 +66,8 @@ private void OnDash(EntityUid uid, DashAbilityComponent comp, DashEvent args)
             return;
         }
 
-        TryComp<LimitedChargesComponent>(uid, out var charges);
-        if (_charges.IsEmpty(uid, charges))
-        {
-            _popup.PopupClient(Loc.GetString("dash-ability-no-charges", ("item", uid)), user, user);
-            return;
-        }
         var origin = _transform.GetMapCoordinates(user);
         var target = args.Target.ToMap(EntityManager, _transform);
-        // prevent collision with the user duh
         if (!_examine.InRangeUnOccluded(origin, target, SharedInteractionSystem.MaxRaycastRange, null))
         {
             // can only dash if the destination is visible on screen
@@ -89,36 +75,28 @@ private void OnDash(EntityUid uid, DashAbilityComponent comp, DashEvent args)
             return;
         }
 
-        _transform.SetCoordinates(user, args.Target);
-        _transform.AttachToGridOrMap(user);
-        _audio.PlayPredicted(comp.BlinkSound, user, user);
-        if (charges != null)
-            _charges.UseCharge(uid, charges);
-    }
-}
+        if (!_charges.TryUseCharge(uid))
+        {
+            _popup.PopupClient(Loc.GetString("dash-ability-no-charges", ("item", uid)), user, user);
+            return;
+        }
 
-/// <summary>
-/// Raised on the item before adding the dash action
-/// </summary>
-public sealed class AddDashActionEvent : CancellableEntityEventArgs
-{
-    public EntityUid User;
+        var xform = Transform(user);
+        _transform.SetCoordinates(user, xform, args.Target);
+        _transform.AttachToGridOrMap(user, xform);
+        args.Handled = true;
+    }
 
-    public AddDashActionEvent(EntityUid user)
+    public bool CheckDash(EntityUid uid, EntityUid user)
     {
-        User = user;
+        var ev = new CheckDashEvent(user);
+        RaiseLocalEvent(uid, ref ev);
+        return !ev.Cancelled;
     }
 }
 
 /// <summary>
-/// Raised on the item before dashing is done.
+/// Raised on the item before adding the dash action and when using the action.
 /// </summary>
-public sealed class DashAttemptEvent : CancellableEntityEventArgs
-{
-    public EntityUid User;
-
-    public DashAttemptEvent(EntityUid user)
-    {
-        User = user;
-    }
-}
+[ByRefEvent]
+public record struct CheckDashEvent(EntityUid User, bool Cancelled = false);
diff --git a/Content.Shared/Ninja/Systems/EmagProviderSystem.cs b/Content.Shared/Ninja/Systems/EmagProviderSystem.cs
index df9cf8ac825..ae0bacaf5f6 100644
--- a/Content.Shared/Ninja/Systems/EmagProviderSystem.cs
+++ b/Content.Shared/Ninja/Systems/EmagProviderSystem.cs
@@ -1,6 +1,6 @@
 using Content.Shared.Administration.Logs;
-using Content.Shared.Emag.Systems;
 using Content.Shared.Database;
+using Content.Shared.Emag.Systems;
 using Content.Shared.Interaction;
 using Content.Shared.Ninja.Components;
 using Content.Shared.Tag;
@@ -14,9 +14,10 @@ namespace Content.Shared.Ninja.Systems;
 public sealed class EmagProviderSystem : EntitySystem
 {
     [Dependency] private readonly EmagSystem _emag = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
     [Dependency] private readonly SharedNinjaGlovesSystem _gloves = default!;
-    [Dependency] private readonly TagSystem _tags = default!;
+    [Dependency] private readonly TagSystem _tag = default!;
 
     public override void Initialize()
     {
@@ -28,18 +29,20 @@ public override void Initialize()
     /// <summary>
     /// Emag clicked entities that are on the whitelist.
     /// </summary>
-    private void OnBeforeInteractHand(EntityUid uid, EmagProviderComponent comp, BeforeInteractHandEvent args)
+    private void OnBeforeInteractHand(Entity<EmagProviderComponent> ent, ref BeforeInteractHandEvent args)
     {
         // TODO: change this into a generic check event thing
-        if (args.Handled || !_gloves.AbilityCheck(uid, args, out var target))
+        if (args.Handled || !_gloves.AbilityCheck(ent, args, out var target))
             return;
 
+        var (uid, comp) = ent;
+
         // only allowed to emag entities on the whitelist
-        if (comp.Whitelist != null && !comp.Whitelist.IsValid(target, EntityManager))
+        if (_whitelist.IsWhitelistFail(comp.Whitelist, target))
             return;
 
         // only allowed to emag non-immune entities
-        if (_tags.HasTag(target, comp.EmagImmuneTag))
+        if (_tag.HasTag(target, comp.EmagImmuneTag))
             return;
 
         var handled = _emag.DoEmagEffect(uid, target);
@@ -51,18 +54,6 @@ private void OnBeforeInteractHand(EntityUid uid, EmagProviderComponent comp, Bef
         RaiseLocalEvent(uid, ref ev);
         args.Handled = true;
     }
-
-    /// <summary>
-    /// Set the whitelist for emagging something outside of yaml.
-    /// </summary>
-    public void SetWhitelist(EntityUid uid, EntityWhitelist? whitelist, EmagProviderComponent? comp = null)
-    {
-        if (!Resolve(uid, ref comp))
-            return;
-
-        comp.Whitelist = whitelist;
-        Dirty(uid, comp);
-    }
 }
 
 /// <summary>
diff --git a/Content.Shared/Ninja/Systems/EnergyKatanaSystem.cs b/Content.Shared/Ninja/Systems/EnergyKatanaSystem.cs
index d427ffa39b4..281b97a648a 100644
--- a/Content.Shared/Ninja/Systems/EnergyKatanaSystem.cs
+++ b/Content.Shared/Ninja/Systems/EnergyKatanaSystem.cs
@@ -15,33 +15,20 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<EnergyKatanaComponent, GotEquippedEvent>(OnEquipped);
-        SubscribeLocalEvent<EnergyKatanaComponent, AddDashActionEvent>(OnAddDashAction);
-        SubscribeLocalEvent<EnergyKatanaComponent, DashAttemptEvent>(OnDashAttempt);
+        SubscribeLocalEvent<EnergyKatanaComponent, CheckDashEvent>(OnCheckDash);
     }
 
     /// <summary>
     /// When equipped by a ninja, try to bind it.
     /// </summary>
-    private void OnEquipped(EntityUid uid, EnergyKatanaComponent comp, GotEquippedEvent args)
+    private void OnEquipped(Entity<EnergyKatanaComponent> ent, ref GotEquippedEvent args)
     {
-        // check if user isnt a ninja or already has a katana bound
-        var user = args.Equipee;
-        if (!TryComp<SpaceNinjaComponent>(user, out var ninja) || ninja.Katana != null)
-            return;
-
-        // bind it since its unbound
-        _ninja.BindKatana(user, uid, ninja);
-    }
-
-    private void OnAddDashAction(EntityUid uid, EnergyKatanaComponent comp, AddDashActionEvent args)
-    {
-        if (!HasComp<SpaceNinjaComponent>(args.User))
-            args.Cancel();
+        _ninja.BindKatana(args.Equipee, ent);
     }
 
-    private void OnDashAttempt(EntityUid uid, EnergyKatanaComponent comp, DashAttemptEvent args)
+    private void OnCheckDash(Entity<EnergyKatanaComponent> ent, ref CheckDashEvent args)
     {
-        if (!TryComp<SpaceNinjaComponent>(args.User, out var ninja) || ninja.Katana != uid)
-            args.Cancel();
+        if (!_ninja.IsNinja(args.User))
+            args.Cancelled = true;
     }
 }
diff --git a/Content.Shared/Ninja/Systems/ItemCreatorSystem.cs b/Content.Shared/Ninja/Systems/ItemCreatorSystem.cs
new file mode 100644
index 00000000000..56112e9a697
--- /dev/null
+++ b/Content.Shared/Ninja/Systems/ItemCreatorSystem.cs
@@ -0,0 +1,56 @@
+using Content.Shared.Actions;
+using Content.Shared.Ninja.Components;
+
+namespace Content.Shared.Ninja.Systems;
+
+/// <summary>
+/// Handles predicting that the action exists, creating items is done serverside.
+/// </summary>
+public abstract class SharedItemCreatorSystem : EntitySystem
+{
+    [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ItemCreatorComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ItemCreatorComponent, GetItemActionsEvent>(OnGetActions);
+    }
+
+    private void OnMapInit(Entity<ItemCreatorComponent> ent, ref MapInitEvent args)
+    {
+        var (uid, comp) = ent;
+        // test funny dont mind me
+        if (string.IsNullOrEmpty(comp.Action))
+            return;
+
+        _actionContainer.EnsureAction(uid, ref comp.ActionEntity, comp.Action);
+        Dirty(uid, comp);
+    }
+
+    private void OnGetActions(Entity<ItemCreatorComponent> ent, ref GetItemActionsEvent args)
+    {
+        if (CheckItemCreator(ent, args.User))
+            args.AddAction(ent.Comp.ActionEntity);
+    }
+
+    public bool CheckItemCreator(EntityUid uid, EntityUid user)
+    {
+        var ev = new CheckItemCreatorEvent(user);
+        RaiseLocalEvent(uid, ref ev);
+        return !ev.Cancelled;
+    }
+}
+
+/// <summary>
+/// Raised on the item creator before adding the action.
+/// </summary>
+[ByRefEvent]
+public record struct CheckItemCreatorEvent(EntityUid User, bool Cancelled = false);
+
+/// <summary>
+/// Raised on the item creator before creating an item.
+/// </summary>
+[ByRefEvent]
+public record struct CreateItemAttemptEvent(EntityUid User, bool Cancelled = false);
diff --git a/Content.Shared/Ninja/Systems/SharedBatteryDrainerSystem.cs b/Content.Shared/Ninja/Systems/SharedBatteryDrainerSystem.cs
index ac11063eb71..0abcca7d1bd 100644
--- a/Content.Shared/Ninja/Systems/SharedBatteryDrainerSystem.cs
+++ b/Content.Shared/Ninja/Systems/SharedBatteryDrainerSystem.cs
@@ -18,34 +18,32 @@ public override void Initialize()
     }
 
     /// <summary>
-    /// Cancel any drain doafters if the battery is removed or gets filled.
+    /// Cancel any drain doafters if the battery is removed or, on the server, gets filled.
     /// </summary>
-    protected virtual void OnDoAfterAttempt(EntityUid uid, BatteryDrainerComponent comp, DoAfterAttemptEvent<DrainDoAfterEvent> args)
+    protected virtual void OnDoAfterAttempt(Entity<BatteryDrainerComponent> ent, ref DoAfterAttemptEvent<DrainDoAfterEvent> args)
     {
-        if (comp.BatteryUid == null)
-        {
+        if (ent.Comp.BatteryUid == null)
             args.Cancel();
-        }
     }
 
     /// <summary>
     /// Drain power from a power source (on server) and repeat if it succeeded.
     /// Client will predict always succeeding since power is serverside.
     /// </summary>
-    private void OnDoAfter(EntityUid uid, BatteryDrainerComponent comp, DrainDoAfterEvent args)
+    private void OnDoAfter(Entity<BatteryDrainerComponent> ent, ref DrainDoAfterEvent args)
     {
-        if (args.Cancelled || args.Handled || args.Target == null)
+        if (args.Cancelled || args.Handled || args.Target is not {} target)
             return;
 
         // repeat if there is still power to drain
-        args.Repeat = TryDrainPower(uid, comp, args.Target.Value);
+        args.Repeat = TryDrainPower(ent, target);
     }
 
     /// <summary>
     /// Attempt to drain as much power as possible into the powercell.
     /// Client always predicts this as succeeding since power is serverside and it can only fail once, when the powercell is filled or the target is emptied.
     /// </summary>
-    protected virtual bool TryDrainPower(EntityUid uid, BatteryDrainerComponent comp, EntityUid target)
+    protected virtual bool TryDrainPower(Entity<BatteryDrainerComponent> ent, EntityUid target)
     {
         return true;
     }
@@ -53,12 +51,13 @@ protected virtual bool TryDrainPower(EntityUid uid, BatteryDrainerComponent comp
     /// <summary>
     /// Sets the battery field on the drainer.
     /// </summary>
-    public void SetBattery(EntityUid uid, EntityUid? battery, BatteryDrainerComponent? comp = null)
+    public void SetBattery(Entity<BatteryDrainerComponent?> ent, EntityUid? battery)
     {
-        if (!Resolve(uid, ref comp))
+        if (!Resolve(ent, ref ent.Comp) || ent.Comp.BatteryUid == battery)
             return;
 
-        comp.BatteryUid = battery;
+        ent.Comp.BatteryUid = battery;
+        Dirty(ent, ent.Comp);
     }
 }
 
@@ -66,4 +65,4 @@ public void SetBattery(EntityUid uid, EntityUid? battery, BatteryDrainerComponen
 /// DoAfter event for <see cref="BatteryDrainerComponent"/>.
 /// </summary>
 [Serializable, NetSerializable]
-public sealed partial class DrainDoAfterEvent : SimpleDoAfterEvent { }
+public sealed partial class DrainDoAfterEvent : SimpleDoAfterEvent;
diff --git a/Content.Shared/Ninja/Systems/SharedNinjaGlovesSystem.cs b/Content.Shared/Ninja/Systems/SharedNinjaGlovesSystem.cs
index f61d0c6a908..8b892190b7b 100644
--- a/Content.Shared/Ninja/Systems/SharedNinjaGlovesSystem.cs
+++ b/Content.Shared/Ninja/Systems/SharedNinjaGlovesSystem.cs
@@ -1,15 +1,13 @@
-using Content.Shared.Actions;
+using Content.Shared.Clothing.Components;
 using Content.Shared.CombatMode;
-using Content.Shared.Communications;
-using Content.Shared.CriminalRecords.Components;
 using Content.Shared.Examine;
 using Content.Shared.Hands.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Inventory.Events;
+using Content.Shared.Item.ItemToggle;
+using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.Ninja.Components;
 using Content.Shared.Popups;
-using Content.Shared.Research.Components;
-using Content.Shared.Toggleable;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Ninja.Systems;
@@ -20,85 +18,105 @@ namespace Content.Shared.Ninja.Systems;
 public abstract class SharedNinjaGlovesSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
     [Dependency] private readonly SharedCombatModeSystem _combatMode = default!;
-    [Dependency] protected readonly SharedInteractionSystem Interaction = default!;
-    [Dependency] protected readonly SharedPopupSystem Popup = default!;
-    [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
+    [Dependency] private readonly SharedInteractionSystem _interaction = default!;
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedSpaceNinjaSystem _ninja = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<NinjaGlovesComponent, GetItemActionsEvent>(OnGetItemActions);
+        SubscribeLocalEvent<NinjaGlovesComponent, ToggleClothingCheckEvent>(OnToggleCheck);
+        SubscribeLocalEvent<NinjaGlovesComponent, ItemToggleActivateAttemptEvent>(OnActivateAttempt);
+        SubscribeLocalEvent<NinjaGlovesComponent, ItemToggledEvent>(OnToggled);
         SubscribeLocalEvent<NinjaGlovesComponent, ExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<NinjaGlovesComponent, GotUnequippedEvent>(OnUnequipped);
-        SubscribeLocalEvent<NinjaGlovesComponent, MapInitEvent>(OnMapInit);
-    }
-
-    private void OnMapInit(EntityUid uid, NinjaGlovesComponent component, MapInitEvent args)
-    {
-        _actionContainer.EnsureAction(uid, ref component.ToggleActionEntity, component.ToggleAction);
-        Dirty(uid, component);
     }
 
     /// <summary>
     /// Disable glove abilities and show the popup if they were enabled previously.
     /// </summary>
-    public void DisableGloves(EntityUid uid, NinjaGlovesComponent? comp = null)
+    private void DisableGloves(Entity<NinjaGlovesComponent> ent)
     {
+        var (uid, comp) = ent;
+
         // already disabled?
-        if (!Resolve(uid, ref comp) || comp.User == null)
+        if (comp.User is not {} user)
             return;
 
-        var user = comp.User.Value;
         comp.User = null;
         Dirty(uid, comp);
 
-        Appearance.SetData(uid, ToggleVisuals.Toggled, false);
-        Popup.PopupClient(Loc.GetString("ninja-gloves-off"), user, user);
-
-        RemComp<BatteryDrainerComponent>(user);
-        RemComp<EmagProviderComponent>(user);
-        RemComp<StunProviderComponent>(user);
-        RemComp<ResearchStealerComponent>(user);
-        RemComp<CommsHackerComponent>(user);
-        RemComp<CriminalRecordsHackerComponent>(user);
+        foreach (var ability in comp.Abilities)
+        {
+            EntityManager.RemoveComponents(user, ability.Components);
+        }
     }
 
     /// <summary>
-    /// Adds the toggle action when equipped.
+    /// Adds the toggle action when equipped by a ninja only.
     /// </summary>
-    private void OnGetItemActions(EntityUid uid, NinjaGlovesComponent comp, GetItemActionsEvent args)
+    private void OnToggleCheck(Entity<NinjaGlovesComponent> ent, ref ToggleClothingCheckEvent args)
     {
-        if (HasComp<SpaceNinjaComponent>(args.User))
-            args.AddAction(ref comp.ToggleActionEntity, comp.ToggleAction);
+        if (!_ninja.IsNinja(args.User))
+            args.Cancelled = true;
     }
 
     /// <summary>
     /// Show if the gloves are enabled when examining.
     /// </summary>
-    private void OnExamined(EntityUid uid, NinjaGlovesComponent comp, ExaminedEvent args)
+    private void OnExamined(Entity<NinjaGlovesComponent> ent, ref ExaminedEvent args)
     {
         if (!args.IsInDetailsRange)
             return;
 
-        args.PushText(Loc.GetString(comp.User != null ? "ninja-gloves-examine-on" : "ninja-gloves-examine-off"));
+        var on = _toggle.IsActivated(ent.Owner) ? "on" : "off";
+        args.PushText(Loc.GetString($"ninja-gloves-examine-{on}"));
     }
 
-    /// <summary>
-    /// Disable gloves when unequipped and clean up ninja's gloves reference
-    /// </summary>
-    private void OnUnequipped(EntityUid uid, NinjaGlovesComponent comp, GotUnequippedEvent args)
+    private void OnActivateAttempt(Entity<NinjaGlovesComponent> ent, ref ItemToggleActivateAttemptEvent args)
     {
-        if (comp.User != null)
+        if (args.User is not {} user
+            || !_ninja.NinjaQuery.TryComp(user, out var ninja)
+            // need to wear suit to enable gloves
+            || !HasComp<NinjaSuitComponent>(ninja.Suit))
         {
-            var user = comp.User.Value;
-            Popup.PopupClient(Loc.GetString("ninja-gloves-off"), user, user);
-            DisableGloves(uid, comp);
+            args.Cancelled = true;
+            args.Popup = Loc.GetString("ninja-gloves-not-wearing-suit");
+            return;
         }
     }
 
+    private void OnToggled(Entity<NinjaGlovesComponent> ent, ref ItemToggledEvent args)
+    {
+        if ((args.User ?? ent.Comp.User) is not {} user)
+            return;
+
+        var message = Loc.GetString(args.Activated ? "ninja-gloves-on" : "ninja-gloves-off");
+        _popup.PopupClient(message, user, user);
+
+        if (args.Activated && _ninja.NinjaQuery.TryComp(user, out var ninja))
+            EnableGloves(ent, (user, ninja));
+        else
+            DisableGloves(ent);
+    }
+
+    protected virtual void EnableGloves(Entity<NinjaGlovesComponent> ent, Entity<SpaceNinjaComponent> user)
+    {
+        var (uid, comp) = ent;
+        comp.User = user;
+        Dirty(uid, comp);
+        _ninja.AssignGloves(user, uid);
+
+        // yeah this is just ComponentToggler but with objective checking
+        foreach (var ability in comp.Abilities)
+        {
+            // can't predict the objective related abilities
+            if (ability.Objective == null)
+                EntityManager.AddComponents(user, ability.Components);
+        }
+    }
 
     // TODO: generic event thing
     /// <summary>
@@ -112,6 +130,6 @@ public bool AbilityCheck(EntityUid uid, BeforeInteractHandEvent args, out Entity
             && !_combatMode.IsInCombatMode(uid)
             && TryComp<HandsComponent>(uid, out var hands)
             && hands.ActiveHandEntity == null
-            && Interaction.InRangeUnobstructed(uid, target);
+            && _interaction.InRangeUnobstructed(uid, target);
     }
 }
diff --git a/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs b/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs
index fed41eaed8a..3800d15b267 100644
--- a/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs
+++ b/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs
@@ -1,11 +1,14 @@
 using Content.Shared.Actions;
+using Content.Shared.Clothing;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Clothing.EntitySystems;
 using Content.Shared.Inventory.Events;
+using Content.Shared.Item.ItemToggle;
+using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.Ninja.Components;
 using Content.Shared.Popups;
+using Content.Shared.Timing;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Timing;
 
 namespace Content.Shared.Ninja.Systems;
 
@@ -14,137 +17,158 @@ namespace Content.Shared.Ninja.Systems;
 /// </summary>
 public abstract class SharedNinjaSuitSystem : EntitySystem
 {
-    [Dependency] protected readonly IGameTiming GameTiming = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedNinjaGlovesSystem _gloves = default!;
-    [Dependency] private readonly SharedSpaceNinjaSystem _ninja = default!;
     [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
     [Dependency] protected readonly SharedPopupSystem Popup = default!;
-    [Dependency] protected readonly StealthClothingSystem StealthClothing = default!;
+    [Dependency] private readonly SharedSpaceNinjaSystem _ninja = default!;
+    [Dependency] private readonly UseDelaySystem _useDelay = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<NinjaSuitComponent, MapInitEvent>(OnMapInit);
-
-        SubscribeLocalEvent<NinjaSuitComponent, GotEquippedEvent>(OnEquipped);
+        SubscribeLocalEvent<NinjaSuitComponent, ClothingGotEquippedEvent>(OnEquipped);
         SubscribeLocalEvent<NinjaSuitComponent, GetItemActionsEvent>(OnGetItemActions);
-        SubscribeLocalEvent<NinjaSuitComponent, AddStealthActionEvent>(OnAddStealthAction);
+        SubscribeLocalEvent<NinjaSuitComponent, ToggleClothingCheckEvent>(OnCloakCheck);
+        SubscribeLocalEvent<NinjaSuitComponent, CheckItemCreatorEvent>(OnStarCheck);
+        SubscribeLocalEvent<NinjaSuitComponent, CreateItemAttemptEvent>(OnCreateStarAttempt);
+        SubscribeLocalEvent<NinjaSuitComponent, ItemToggleActivateAttemptEvent>(OnActivateAttempt);
         SubscribeLocalEvent<NinjaSuitComponent, GotUnequippedEvent>(OnUnequipped);
     }
 
-    private void OnMapInit(EntityUid uid, NinjaSuitComponent component, MapInitEvent args)
+    private void OnEquipped(Entity<NinjaSuitComponent> ent, ref ClothingGotEquippedEvent args)
     {
-        _actionContainer.EnsureAction(uid, ref component.RecallKatanaActionEntity, component.RecallKatanaAction);
-        _actionContainer.EnsureAction(uid, ref component.CreateThrowingStarActionEntity, component.CreateThrowingStarAction);
-        _actionContainer.EnsureAction(uid, ref component.EmpActionEntity, component.EmpAction);
-        Dirty(uid, component);
+        var user = args.Wearer;
+        if (_ninja.NinjaQuery.TryComp(user, out var ninja))
+            NinjaEquipped(ent, (user, ninja));
     }
 
-    /// <summary>
-    /// Call the shared and serverside code for when a ninja equips the suit.
-    /// </summary>
-    private void OnEquipped(EntityUid uid, NinjaSuitComponent comp, GotEquippedEvent args)
+    protected virtual void NinjaEquipped(Entity<NinjaSuitComponent> ent, Entity<SpaceNinjaComponent> user)
     {
-        var user = args.Equipee;
-        if (!TryComp<SpaceNinjaComponent>(user, out var ninja))
-            return;
+        // mark the user as wearing this suit, used when being attacked among other things
+        _ninja.AssignSuit(user, ent);
+    }
 
-        NinjaEquippedSuit(uid, comp, user, ninja);
+    private void OnMapInit(Entity<NinjaSuitComponent> ent, ref MapInitEvent args)
+    {
+        var (uid, comp) = ent;
+        _actionContainer.EnsureAction(uid, ref comp.RecallKatanaActionEntity, comp.RecallKatanaAction);
+        _actionContainer.EnsureAction(uid, ref comp.EmpActionEntity, comp.EmpAction);
+        Dirty(uid, comp);
     }
 
     /// <summary>
     /// Add all the actions when a suit is equipped by a ninja.
     /// </summary>
-    private void OnGetItemActions(EntityUid uid, NinjaSuitComponent comp, GetItemActionsEvent args)
+    private void OnGetItemActions(Entity<NinjaSuitComponent> ent, ref GetItemActionsEvent args)
     {
-        if (!HasComp<SpaceNinjaComponent>(args.User))
+        if (!_ninja.IsNinja(args.User))
             return;
 
+        var comp = ent.Comp;
         args.AddAction(ref comp.RecallKatanaActionEntity, comp.RecallKatanaAction);
-        args.AddAction(ref comp.CreateThrowingStarActionEntity, comp.CreateThrowingStarAction);
         args.AddAction(ref comp.EmpActionEntity, comp.EmpAction);
     }
 
     /// <summary>
-    /// Only add stealth clothing's toggle action when equipped by a ninja.
+    /// Only add toggle cloak action when equipped by a ninja.
     /// </summary>
-    private void OnAddStealthAction(EntityUid uid, NinjaSuitComponent comp, AddStealthActionEvent args)
+    private void OnCloakCheck(Entity<NinjaSuitComponent> ent, ref ToggleClothingCheckEvent args)
     {
-        if (!HasComp<SpaceNinjaComponent>(args.User))
-            args.Cancel();
+        if (!_ninja.IsNinja(args.User))
+            args.Cancelled = true;
     }
 
-    /// <summary>
-    /// Call the shared and serverside code for when anyone unequips a suit.
-    /// </summary>
-    private void OnUnequipped(EntityUid uid, NinjaSuitComponent comp, GotUnequippedEvent args)
+    private void OnStarCheck(Entity<NinjaSuitComponent> ent, ref CheckItemCreatorEvent args)
+    {
+        if (!_ninja.IsNinja(args.User))
+            args.Cancelled = true;
+    }
+
+    private void OnCreateStarAttempt(Entity<NinjaSuitComponent> ent, ref CreateItemAttemptEvent args)
     {
-        UserUnequippedSuit(uid, comp, args.Equipee);
+        if (CheckDisabled(ent, args.User))
+            args.Cancelled = true;
     }
 
     /// <summary>
-    /// Called when a suit is equipped by a space ninja.
-    /// In the future it might be changed to an explicit activation toggle/verb like gloves are.
+    /// Call the shared and serverside code for when anyone unequips a suit.
     /// </summary>
-    protected virtual void NinjaEquippedSuit(EntityUid uid, NinjaSuitComponent comp, EntityUid user, SpaceNinjaComponent ninja)
+    private void OnUnequipped(Entity<NinjaSuitComponent> ent, ref GotUnequippedEvent args)
     {
-        // mark the user as wearing this suit, used when being attacked among other things
-        _ninja.AssignSuit(user, uid, ninja);
-
-        // initialize phase cloak, but keep it off
-        StealthClothing.SetEnabled(uid, user, false);
+        var user = args.Equipee;
+        if (_ninja.NinjaQuery.TryComp(user, out var ninja))
+            UserUnequippedSuit(ent, (user, ninja));
     }
 
     /// <summary>
     /// Force uncloaks the user and disables suit abilities.
     /// </summary>
-    public void RevealNinja(EntityUid uid, EntityUid user, bool disable = true, NinjaSuitComponent? comp = null, StealthClothingComponent? stealthClothing = null)
+    public void RevealNinja(Entity<NinjaSuitComponent?> ent, EntityUid user, bool disable = true)
     {
-        if (!Resolve(uid, ref comp, ref stealthClothing))
+        if (!Resolve(ent, ref ent.Comp))
             return;
 
-        if (!StealthClothing.SetEnabled(uid, user, false, stealthClothing))
-            return;
-
-        if (!disable)
+        var uid = ent.Owner;
+        var comp = ent.Comp;
+        if (_toggle.TryDeactivate(uid, user) || !disable)
             return;
 
         // previously cloaked, disable abilities for a short time
         _audio.PlayPredicted(comp.RevealSound, uid, user);
         Popup.PopupClient(Loc.GetString("ninja-revealed"), user, user, PopupType.MediumCaution);
-        comp.DisableCooldown = GameTiming.CurTime + comp.DisableTime;
+        _useDelay.TryResetDelay(uid, id: comp.DisableDelayId);
+    }
+
+    private void OnActivateAttempt(Entity<NinjaSuitComponent> ent, ref ItemToggleActivateAttemptEvent args)
+    {
+        if (!_ninja.IsNinja(args.User))
+        {
+            args.Cancelled = true;
+            return;
+        }
+
+        if (IsDisabled((ent, ent.Comp, null)))
+        {
+            args.Cancelled = true;
+            args.Popup = Loc.GetString("ninja-suit-cooldown");
+        }
     }
 
-    // TODO: modify PowerCellDrain
     /// <summary>
-    /// Returns the power used by a suit
+    /// Returns true if the suit is currently disabled
     /// </summary>
-    public float SuitWattage(EntityUid uid, NinjaSuitComponent? suit = null)
+    public bool IsDisabled(Entity<NinjaSuitComponent?, UseDelayComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp1, ref ent.Comp2))
+            return false;
+
+        return _useDelay.IsDelayed((ent, ent.Comp2), ent.Comp1.DisableDelayId);
+    }
+
+    protected bool CheckDisabled(Entity<NinjaSuitComponent> ent, EntityUid user)
     {
-        if (!Resolve(uid, ref suit))
-            return 0f;
+        if (IsDisabled((ent, ent.Comp, null)))
+        {
+            Popup.PopupEntity(Loc.GetString("ninja-suit-cooldown"), user, user, PopupType.Medium);
+            return true;
+        }
 
-        float wattage = suit.PassiveWattage;
-        if (TryComp<StealthClothingComponent>(uid, out var stealthClothing) && stealthClothing.Enabled)
-            wattage += suit.CloakWattage;
-        return wattage;
+        return false;
     }
 
     /// <summary>
     /// Called when a suit is unequipped, not necessarily by a space ninja.
     /// In the future it might be changed to also have explicit deactivation via toggle.
     /// </summary>
-    protected virtual void UserUnequippedSuit(EntityUid uid, NinjaSuitComponent comp, EntityUid user)
+    protected virtual void UserUnequippedSuit(Entity<NinjaSuitComponent> ent, Entity<SpaceNinjaComponent> user)
     {
-        if (!TryComp<SpaceNinjaComponent>(user, out var ninja))
-            return;
-
         // mark the user as not wearing a suit
-        _ninja.AssignSuit(user, null, ninja);
+        _ninja.AssignSuit(user, null);
         // disable glove abilities
-        if (ninja.Gloves != null && TryComp<NinjaGlovesComponent>(ninja.Gloves.Value, out var gloves))
-            _gloves.DisableGloves(ninja.Gloves.Value, gloves);
+        if (user.Comp.Gloves is {} uid)
+            _toggle.TryDeactivate(uid, user: user);
     }
 }
diff --git a/Content.Shared/Ninja/Systems/SharedSpaceNinjaSystem.cs b/Content.Shared/Ninja/Systems/SharedSpaceNinjaSystem.cs
index 522f29fe420..d738f2dd8a2 100644
--- a/Content.Shared/Ninja/Systems/SharedSpaceNinjaSystem.cs
+++ b/Content.Shared/Ninja/Systems/SharedSpaceNinjaSystem.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.Weapons.Ranged.Events;
 using Content.Shared.Popups;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Content.Shared.Ninja.Systems;
 
@@ -14,49 +15,59 @@ public abstract class SharedSpaceNinjaSystem : EntitySystem
     [Dependency] protected readonly SharedNinjaSuitSystem Suit = default!;
     [Dependency] protected readonly SharedPopupSystem Popup = default!;
 
+    public EntityQuery<SpaceNinjaComponent> NinjaQuery;
+
     public override void Initialize()
     {
         base.Initialize();
 
+        NinjaQuery = GetEntityQuery<SpaceNinjaComponent>();
+
         SubscribeLocalEvent<SpaceNinjaComponent, AttackedEvent>(OnNinjaAttacked);
         SubscribeLocalEvent<SpaceNinjaComponent, MeleeAttackEvent>(OnNinjaAttack);
         SubscribeLocalEvent<SpaceNinjaComponent, ShotAttemptedEvent>(OnShotAttempted);
     }
 
+    public bool IsNinja([NotNullWhen(true)] EntityUid? uid)
+    {
+        return NinjaQuery.HasComp(uid);
+    }
+
     /// <summary>
     /// Set the ninja's worn suit entity
     /// </summary>
-    public void AssignSuit(EntityUid uid, EntityUid? suit, SpaceNinjaComponent? comp = null)
+    public void AssignSuit(Entity<SpaceNinjaComponent> ent, EntityUid? suit)
     {
-        if (!Resolve(uid, ref comp) || comp.Suit == suit)
+        if (ent.Comp.Suit == suit)
             return;
 
-        comp.Suit = suit;
-        Dirty(uid, comp);
+        ent.Comp.Suit = suit;
+        Dirty(ent, ent.Comp);
     }
 
     /// <summary>
     /// Set the ninja's worn gloves entity
     /// </summary>
-    public void AssignGloves(EntityUid uid, EntityUid? gloves, SpaceNinjaComponent? comp = null)
+    public void AssignGloves(Entity<SpaceNinjaComponent> ent, EntityUid? gloves)
     {
-        if (!Resolve(uid, ref comp) || comp.Gloves == gloves)
+        if (ent.Comp.Gloves == gloves)
             return;
 
-        comp.Gloves = gloves;
-        Dirty(uid, comp);
+        ent.Comp.Gloves = gloves;
+        Dirty(ent, ent.Comp);
     }
 
     /// <summary>
     /// Bind a katana entity to a ninja, letting it be recalled and dash.
+    /// Does nothing if the player is not a ninja or already has a katana bound.
     /// </summary>
-    public void BindKatana(EntityUid uid, EntityUid? katana, SpaceNinjaComponent? comp = null)
+    public void BindKatana(Entity<SpaceNinjaComponent?> ent, EntityUid katana)
     {
-        if (!Resolve(uid, ref comp) || comp.Katana == katana)
+        if (!NinjaQuery.Resolve(ent, ref ent.Comp) || ent.Comp.Katana != null)
             return;
 
-        comp.Katana = katana;
-        Dirty(uid, comp);
+        ent.Comp.Katana = katana;
+        Dirty(ent, ent.Comp);
     }
 
     /// <summary>
@@ -71,32 +82,32 @@ public virtual bool TryUseCharge(EntityUid user, float charge)
     /// <summary>
     /// Handle revealing ninja if cloaked when attacked.
     /// </summary>
-    private void OnNinjaAttacked(EntityUid uid, SpaceNinjaComponent comp, AttackedEvent args)
+    private void OnNinjaAttacked(Entity<SpaceNinjaComponent> ent, ref AttackedEvent args)
     {
-        if (comp.Suit != null && TryComp<StealthClothingComponent>(comp.Suit, out var stealthClothing) && stealthClothing.Enabled)
-        {
-            Suit.RevealNinja(comp.Suit.Value, uid, true, null, stealthClothing);
-        }
+        TryRevealNinja(ent, disable: true);
     }
 
     /// <summary>
     /// Handle revealing ninja if cloaked when attacking.
     /// Only reveals, there is no cooldown.
     /// </summary>
-    private void OnNinjaAttack(EntityUid uid, SpaceNinjaComponent comp, ref MeleeAttackEvent args)
+    private void OnNinjaAttack(Entity<SpaceNinjaComponent> ent, ref MeleeAttackEvent args)
+    {
+        TryRevealNinja(ent, disable: false);
+    }
+
+    private void TryRevealNinja(Entity<SpaceNinjaComponent> ent, bool disable)
     {
-        if (comp.Suit != null && TryComp<StealthClothingComponent>(comp.Suit, out var stealthClothing) && stealthClothing.Enabled)
-        {
-            Suit.RevealNinja(comp.Suit.Value, uid, false, null, stealthClothing);
-        }
+        if (ent.Comp.Suit is {} uid && TryComp<NinjaSuitComponent>(ent.Comp.Suit, out var suit))
+            Suit.RevealNinja((uid, suit), ent, disable: disable);
     }
 
     /// <summary>
     /// Require ninja to fight with HONOR, no guns!
     /// </summary>
-    private void OnShotAttempted(EntityUid uid, SpaceNinjaComponent comp, ref ShotAttemptedEvent args)
+    private void OnShotAttempted(Entity<SpaceNinjaComponent> ent, ref ShotAttemptedEvent args)
     {
-        Popup.PopupClient(Loc.GetString("gun-disabled"), uid, uid);
+        Popup.PopupClient(Loc.GetString("gun-disabled"), ent, ent);
         args.Cancel();
     }
 }
diff --git a/Content.Shared/Ninja/Systems/SharedSpiderChargeSystem.cs b/Content.Shared/Ninja/Systems/SharedSpiderChargeSystem.cs
new file mode 100644
index 00000000000..f4b158aced4
--- /dev/null
+++ b/Content.Shared/Ninja/Systems/SharedSpiderChargeSystem.cs
@@ -0,0 +1,6 @@
+namespace Content.Shared.Ninja.Systems;
+
+/// <summary>
+/// Sticking triggering and exploding are all in server so this is just for access.
+/// </summary>
+public abstract class SharedSpiderChargeSystem : EntitySystem;
diff --git a/Content.Shared/Ninja/Systems/SharedStunProviderSystem.cs b/Content.Shared/Ninja/Systems/SharedStunProviderSystem.cs
index 61b6e4313ed..061c019c9b6 100644
--- a/Content.Shared/Ninja/Systems/SharedStunProviderSystem.cs
+++ b/Content.Shared/Ninja/Systems/SharedStunProviderSystem.cs
@@ -11,22 +11,12 @@ public abstract class SharedStunProviderSystem : EntitySystem
     /// <summary>
     /// Set the battery field on the stun provider.
     /// </summary>
-    public void SetBattery(EntityUid uid, EntityUid? battery, StunProviderComponent? comp = null)
+    public void SetBattery(Entity<StunProviderComponent?> ent, EntityUid? battery)
     {
-        if (!Resolve(uid, ref comp))
+        if (!Resolve(ent, ref ent.Comp) || ent.Comp.BatteryUid == battery)
             return;
 
-        comp.BatteryUid = battery;
-    }
-
-    /// <summary>
-    /// Set the no power popup field on the stun provider.
-    /// </summary>
-    public void SetNoPowerPopup(EntityUid uid, string popup, StunProviderComponent? comp = null)
-    {
-        if (!Resolve(uid, ref comp))
-            return;
-
-        comp.NoPowerPopup = popup;
+        ent.Comp.BatteryUid = battery;
+        Dirty(ent, ent.Comp);
     }
 }
diff --git a/Content.Shared/Objectives/Systems/SharedObjectivesSystem.cs b/Content.Shared/Objectives/Systems/SharedObjectivesSystem.cs
index 07032a00ce9..8d2c4dcfebe 100644
--- a/Content.Shared/Objectives/Systems/SharedObjectivesSystem.cs
+++ b/Content.Shared/Objectives/Systems/SharedObjectivesSystem.cs
@@ -92,7 +92,7 @@ public bool CanBeAssigned(EntityUid uid, EntityUid mindId, MindComponent mind, O
     }
 
     /// <summary>
-    /// Get the title, description, icon and progress of an objective using <see cref="ObjectiveGetInfoEvent"/>.
+    /// Get the title, description, icon and progress of an objective using <see cref="ObjectiveGetProgressEvent"/>.
     /// If any of them are null it is logged and null is returned.
     /// </summary>
     /// <param name="uid"/>ID of the condition entity</param>
@@ -103,20 +103,43 @@ public bool CanBeAssigned(EntityUid uid, EntityUid mindId, MindComponent mind, O
         if (!Resolve(mindId, ref mind))
             return null;
 
-        var ev = new ObjectiveGetProgressEvent(mindId, mind);
-        RaiseLocalEvent(uid, ref ev);
+        if (GetProgress(uid, (mindId, mind)) is not {} progress)
+            return null;
 
         var comp = Comp<ObjectiveComponent>(uid);
         var meta = MetaData(uid);
         var title = meta.EntityName;
         var description = meta.EntityDescription;
-        if (comp.Icon == null || ev.Progress == null)
+        if (comp.Icon == null)
         {
-            Log.Error($"An objective {ToPrettyString(uid):objective} of {_mind.MindOwnerLoggingString(mind)} is missing icon or progress ({ev.Progress})");
+            Log.Error($"An objective {ToPrettyString(uid):objective} of {_mind.MindOwnerLoggingString(mind)} is missing an icon!");
             return null;
         }
 
-        return new ObjectiveInfo(title, description, comp.Icon, ev.Progress.Value);
+        return new ObjectiveInfo(title, description, comp.Icon, progress);
+    }
+
+    /// <summary>
+    /// Gets the progress of an objective using <see cref="ObjectiveGetProgressEvent"/>.
+    /// Returning null is a programmer error.
+    /// </summary>
+    public float? GetProgress(EntityUid uid, Entity<MindComponent> mind)
+    {
+        var ev = new ObjectiveGetProgressEvent(mind, mind.Comp);
+        RaiseLocalEvent(uid, ref ev);
+        if (ev.Progress != null)
+            return ev.Progress;
+
+        Log.Error($"Objective {ToPrettyString(uid):objective} of {_mind.MindOwnerLoggingString(mind.Comp)} didn't set a progress value!");
+        return null;
+    }
+
+    /// <summary>
+    /// Returns true if an objective is completed.
+    /// </summary>
+    public bool IsCompleted(EntityUid uid, Entity<MindComponent> mind)
+    {
+        return (GetProgress(uid, mind) ?? 0f) >= 0.999f;
     }
 
     /// <summary>
diff --git a/Content.Shared/Pinpointer/SharedProximityBeeper.cs b/Content.Shared/Pinpointer/SharedProximityBeeper.cs
deleted file mode 100644
index 51631126833..00000000000
--- a/Content.Shared/Pinpointer/SharedProximityBeeper.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Pinpointer;
-
-[Serializable, NetSerializable]
-public enum ProximityBeeperVisuals : byte
-{
-    Enabled
-}
diff --git a/Content.Shared/PowerCell/PowerCellDrawComponent.cs b/Content.Shared/PowerCell/PowerCellDrawComponent.cs
index 708a86a8eaf..94de7c77878 100644
--- a/Content.Shared/PowerCell/PowerCellDrawComponent.cs
+++ b/Content.Shared/PowerCell/PowerCellDrawComponent.cs
@@ -6,6 +6,10 @@ namespace Content.Shared.PowerCell;
 /// <summary>
 /// Indicates that the entity's ActivatableUI requires power or else it closes.
 /// </summary>
+/// <remarks>
+/// With ActivatableUI it will activate and deactivate when the ui is opened and closed, drawing power inbetween.
+/// Requires <see cref="ItemToggleComponent"/> to work.
+/// </remarks>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
 public sealed partial class PowerCellDrawComponent : Component
 {
@@ -26,10 +30,12 @@ public sealed partial class PowerCellDrawComponent : Component
     #endregion
 
     /// <summary>
-    /// Is this power cell currently drawing power every tick.
+    /// Whether drawing is enabled, regardless of ItemToggle.
+    /// Having no cell will still disable it.
+    /// Only use this if you really don't want it to use power for some time.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("enabled")]
-    public bool Drawing;
+    [DataField, AutoNetworkedField]
+    public bool Enabled = true;
 
     /// <summary>
     /// How much the entity draws while the UI is open.
@@ -51,4 +57,10 @@ public sealed partial class PowerCellDrawComponent : Component
     [DataField("nextUpdate", customTypeSerializer: typeof(TimeOffsetSerializer))]
     [AutoPausedField]
     public TimeSpan NextUpdateTime;
+
+    /// <summary>
+    /// How long to wait between power drawing.
+    /// </summary>
+    [DataField]
+    public TimeSpan Delay = TimeSpan.FromSeconds(1);
 }
diff --git a/Content.Shared/PowerCell/SharedPowerCellSystem.cs b/Content.Shared/PowerCell/SharedPowerCellSystem.cs
index 508bfc85f08..2b2a836633c 100644
--- a/Content.Shared/PowerCell/SharedPowerCellSystem.cs
+++ b/Content.Shared/PowerCell/SharedPowerCellSystem.cs
@@ -1,4 +1,6 @@
 using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Item.ItemToggle;
+using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.PowerCell.Components;
 using Content.Shared.Rejuvenate;
 using Robust.Shared.Containers;
@@ -11,14 +13,19 @@ public abstract class SharedPowerCellSystem : EntitySystem
     [Dependency] protected readonly IGameTiming Timing = default!;
     [Dependency] private readonly ItemSlotsSystem _itemSlots = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] protected readonly ItemToggleSystem Toggle = default!;
 
     public override void Initialize()
     {
         base.Initialize();
+
         SubscribeLocalEvent<PowerCellSlotComponent, RejuvenateEvent>(OnRejuvenate);
         SubscribeLocalEvent<PowerCellSlotComponent, EntInsertedIntoContainerMessage>(OnCellInserted);
         SubscribeLocalEvent<PowerCellSlotComponent, EntRemovedFromContainerMessage>(OnCellRemoved);
         SubscribeLocalEvent<PowerCellSlotComponent, ContainerIsInsertingAttemptEvent>(OnCellInsertAttempt);
+
+        SubscribeLocalEvent<PowerCellDrawComponent, ItemToggleActivateAttemptEvent>(OnActivateAttempt);
+        SubscribeLocalEvent<PowerCellDrawComponent, ItemToggledEvent>(OnToggled);
     }
 
     private void OnRejuvenate(EntityUid uid, PowerCellSlotComponent component, RejuvenateEvent args)
@@ -63,13 +70,25 @@ protected virtual void OnCellRemoved(EntityUid uid, PowerCellSlotComponent compo
         RaiseLocalEvent(uid, new PowerCellChangedEvent(true), false);
     }
 
-    public void SetPowerCellDrawEnabled(EntityUid uid, bool enabled, PowerCellDrawComponent? component = null)
+    private void OnActivateAttempt(Entity<PowerCellDrawComponent> ent, ref ItemToggleActivateAttemptEvent args)
+    {
+        if (!HasDrawCharge(ent, ent.Comp, user: args.User)
+            || !HasActivatableCharge(ent, ent.Comp, user: args.User))
+            args.Cancelled = true;
+    }
+
+    private void OnToggled(Entity<PowerCellDrawComponent> ent, ref ItemToggledEvent args)
+    {
+        ent.Comp.NextUpdateTime = Timing.CurTime;
+    }
+
+    public void SetDrawEnabled(Entity<PowerCellDrawComponent?> ent, bool enabled)
     {
-        if (!Resolve(uid, ref component, false) || enabled == component.Drawing)
+        if (!Resolve(ent, ref ent.Comp, false) || ent.Comp.Enabled == enabled)
             return;
 
-        component.Drawing = enabled;
-        component.NextUpdateTime = Timing.CurTime;
+        ent.Comp.Enabled = enabled;
+        Dirty(ent, ent.Comp);
     }
 
     /// <summary>
diff --git a/Content.Shared/ProximityDetection/Components/ProximityDetectorComponent.cs b/Content.Shared/ProximityDetection/Components/ProximityDetectorComponent.cs
index 09cb7f06d5d..7e2bb4dfe62 100644
--- a/Content.Shared/ProximityDetection/Components/ProximityDetectorComponent.cs
+++ b/Content.Shared/ProximityDetection/Components/ProximityDetectorComponent.cs
@@ -10,12 +10,6 @@ namespace Content.Shared.ProximityDetection.Components;
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState ,Access(typeof(ProximityDetectionSystem))]
 public sealed partial class ProximityDetectorComponent : Component
 {
-    /// <summary>
-    /// Whether or not it's on.
-    /// </summary>
-    [DataField, AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
-    public bool Enabled = true;
-
     /// <summary>
     /// The criteria used to filter entities
     /// Note: RequireAll is only supported for tags, all components are required to count as a match!
@@ -35,13 +29,13 @@ public sealed partial class ProximityDetectorComponent : Component
     [ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
     public FixedPoint2 Distance = -1;
 
-
     /// <summary>
     /// The farthest distance to search for targets
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
     public FixedPoint2 Range = 10f;
 
+    // TODO: use timespans not this
     public float AccumulatedFrameTime;
 
     [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
diff --git a/Content.Shared/ProximityDetection/Systems/ProximityDetectionSystem.cs b/Content.Shared/ProximityDetection/Systems/ProximityDetectionSystem.cs
index db25e8bc511..df302f94771 100644
--- a/Content.Shared/ProximityDetection/Systems/ProximityDetectionSystem.cs
+++ b/Content.Shared/ProximityDetection/Systems/ProximityDetectionSystem.cs
@@ -1,4 +1,6 @@
-using Content.Shared.ProximityDetection.Components;
+using Content.Shared.Item.ItemToggle;
+using Content.Shared.Item.ItemToggle.Components;
+using Content.Shared.ProximityDetection.Components;
 using Content.Shared.Tag;
 using Robust.Shared.Network;
 
@@ -9,6 +11,7 @@ namespace Content.Shared.ProximityDetection.Systems;
 public sealed class ProximityDetectionSystem : EntitySystem
 {
     [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly TagSystem _tagSystem = default!;
     [Dependency] private readonly INetManager _net = default!;
@@ -17,10 +20,10 @@ public sealed class ProximityDetectionSystem : EntitySystem
 
     public override void Initialize()
     {
-        SubscribeLocalEvent<ProximityDetectorComponent, EntityPausedEvent>(OnPaused);
-        SubscribeLocalEvent<ProximityDetectorComponent, EntityUnpausedEvent>(OnUnpaused);
-        SubscribeLocalEvent<ProximityDetectorComponent, ComponentInit>(OnCompInit);
+        base.Initialize();
 
+        SubscribeLocalEvent<ProximityDetectorComponent, ComponentInit>(OnCompInit);
+        SubscribeLocalEvent<ProximityDetectorComponent, ItemToggledEvent>(OnToggled);
     }
 
     private void OnCompInit(EntityUid uid, ProximityDetectorComponent component, ComponentInit args)
@@ -30,57 +33,39 @@ private void OnCompInit(EntityUid uid, ProximityDetectorComponent component, Com
         Log.Debug("DetectorComponent only supports requireAll = false for tags. All components are required for a match!");
     }
 
-    private void OnPaused(EntityUid owner, ProximityDetectorComponent component, EntityPausedEvent args)
-    {
-        SetEnable_Internal(owner,component,false);
-    }
-
-    private void OnUnpaused(EntityUid owner, ProximityDetectorComponent detector, ref EntityUnpausedEvent args)
-    {
-        SetEnable_Internal(owner, detector,true);
-    }
-    public void SetEnable(EntityUid owner, bool enabled, ProximityDetectorComponent? detector = null)
-    {
-        if (!Resolve(owner, ref detector) || detector.Enabled == enabled)
-            return;
-        SetEnable_Internal(owner ,detector, enabled);
-    }
-
     public override void Update(float frameTime)
     {
         if (_net.IsClient)
             return;
+
         var query = EntityQueryEnumerator<ProximityDetectorComponent>();
         while (query.MoveNext(out var owner, out var detector))
         {
-            if (!detector.Enabled)
+            if (!_toggle.IsActivated(owner))
                 continue;
+
             detector.AccumulatedFrameTime += frameTime;
             if (detector.AccumulatedFrameTime < detector.UpdateRate)
                 continue;
+
             detector.AccumulatedFrameTime -= detector.UpdateRate;
             RunUpdate_Internal(owner, detector);
         }
     }
 
-    public bool GetEnable(EntityUid owner, ProximityDetectorComponent? detector = null)
+    private void OnToggled(Entity<ProximityDetectorComponent> ent, ref ItemToggledEvent args)
     {
-        return Resolve(owner, ref detector, false) && detector.Enabled;
-    }
-
-    private void SetEnable_Internal(EntityUid owner,ProximityDetectorComponent detector, bool enabled)
-    {
-        detector.Enabled = enabled;
-        var noDetectEvent = new ProximityTargetUpdatedEvent(detector, detector.TargetEnt, detector.Distance);
-        RaiseLocalEvent(owner, ref noDetectEvent);
-        if (!enabled)
+        if (args.Activated)
         {
-            detector.AccumulatedFrameTime = 0;
-            RunUpdate_Internal(owner, detector);
-            Dirty(owner, detector);
+            RunUpdate_Internal(ent, ent.Comp);
             return;
         }
-        RunUpdate_Internal(owner, detector);
+
+        var noDetectEvent = new ProximityTargetUpdatedEvent(ent.Comp, Target: null, ent.Comp.Distance);
+        RaiseLocalEvent(ent, ref noDetectEvent);
+
+        ent.Comp.AccumulatedFrameTime = 0;
+        Dirty(ent, ent.Comp);
     }
 
     public void ForceUpdate(EntityUid owner, ProximityDetectorComponent? detector = null)
@@ -90,11 +75,31 @@ public void ForceUpdate(EntityUid owner, ProximityDetectorComponent? detector =
         RunUpdate_Internal(owner, detector);
     }
 
+    private void ClearTarget(Entity<ProximityDetectorComponent> ent)
+    {
+        var (uid, comp) = ent;
+        if (comp.TargetEnt == null)
+            return;
+
+        comp.Distance = -1;
+        comp.TargetEnt = null;
+        var noDetectEvent = new ProximityTargetUpdatedEvent(comp, null, -1);
+        RaiseLocalEvent(uid, ref noDetectEvent);
+        var newTargetEvent = new NewProximityTargetEvent(comp, null);
+        RaiseLocalEvent(uid, ref newTargetEvent);
+        Dirty(uid, comp);
+    }
 
     private void RunUpdate_Internal(EntityUid owner,ProximityDetectorComponent detector)
     {
         if (!_net.IsServer) //only run detection checks on the server!
             return;
+
+        if (Deleted(detector.TargetEnt))
+        {
+            ClearTarget((owner, detector));
+        }
+
         var xformQuery = GetEntityQuery<TransformComponent>();
         var xform = xformQuery.GetComponent(owner);
         List<(EntityUid TargetEnt, float Distance)> detections = new();
@@ -173,15 +178,7 @@ private void UpdateTargetFromClosest(EntityUid owner, ProximityDetectorComponent
     {
         if (detections.Count == 0)
         {
-            if (detector.TargetEnt == null)
-                return;
-            detector.Distance = -1;
-            detector.TargetEnt = null;
-            var noDetectEvent = new ProximityTargetUpdatedEvent(detector, null, -1);
-            RaiseLocalEvent(owner, ref noDetectEvent);
-            var newTargetEvent = new NewProximityTargetEvent(detector, null);
-            RaiseLocalEvent(owner, ref newTargetEvent);
-            Dirty(owner, detector);
+            ClearTarget((owner, detector));
             return;
         }
         var closestDistance = detections[0].Distance;
@@ -198,6 +195,7 @@ private void UpdateTargetFromClosest(EntityUid owner, ProximityDetectorComponent
         var newData = newTarget || detector.Distance != closestDistance;
         detector.TargetEnt = closestEnt;
         detector.Distance = closestDistance;
+        Dirty(owner, detector);
         if (newTarget)
         {
             var newTargetEvent = new NewProximityTargetEvent(detector, closestEnt);
diff --git a/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs b/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs
index e1776873da9..de0fe0bce38 100644
--- a/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs
+++ b/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs
@@ -15,12 +15,6 @@ namespace Content.Shared.Silicons.Borgs.Components;
 [RegisterComponent, NetworkedComponent, Access(typeof(SharedBorgSystem)), AutoGenerateComponentState]
 public sealed partial class BorgChassisComponent : Component
 {
-    /// <summary>
-    /// Whether or not the borg is activated, meaning it has access to modules and a heightened movement speed
-    /// </summary>
-    [DataField("activated"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
-    public bool Activated;
-
     #region Brain
     /// <summary>
     /// A whitelist for which entities count as valid brains
@@ -68,7 +62,7 @@ public sealed partial class BorgChassisComponent : Component
     /// <summary>
     /// The currently selected module
     /// </summary>
-    [DataField("selectedModule")]
+    [DataField("selectedModule"), AutoNetworkedField]
     public EntityUid? SelectedModule;
 
     #region Visuals
diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
index 0431d95a42f..896d97bf52c 100644
--- a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
+++ b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Access.Components;
 using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Item.ItemToggle;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Popups;
@@ -17,6 +18,7 @@ public abstract partial class SharedBorgSystem : EntitySystem
 {
     [Dependency] protected readonly SharedContainerSystem Container = default!;
     [Dependency] protected readonly ItemSlotsSystem ItemSlots = default!;
+    [Dependency] protected readonly ItemToggleSystem Toggle = default!;
     [Dependency] protected readonly SharedPopupSystem Popup = default!;
 
     /// <inheritdoc/>
@@ -87,7 +89,7 @@ protected virtual void OnRemoved(EntityUid uid, BorgChassisComponent component,
 
     private void OnRefreshMovementSpeedModifiers(EntityUid uid, BorgChassisComponent component, RefreshMovementSpeedModifiersEvent args)
     {
-        if (component.Activated)
+        if (Toggle.IsActivated(uid))
             return;
 
         if (!TryComp<MovementSpeedModifierComponent>(uid, out var movement))
diff --git a/Content.Shared/Toggleable/ToggleActionEvent.cs b/Content.Shared/Toggleable/ToggleActionEvent.cs
index 1283b6699bf..f28e62e7dd1 100644
--- a/Content.Shared/Toggleable/ToggleActionEvent.cs
+++ b/Content.Shared/Toggleable/ToggleActionEvent.cs
@@ -4,9 +4,12 @@
 namespace Content.Shared.Toggleable;
 
 /// <summary>
-///     Generic action-event for toggle-able components.
+/// Generic action-event for toggle-able components.
 /// </summary>
-public sealed partial class ToggleActionEvent : InstantActionEvent { }
+/// <remarks>
+/// If you are using <c>ItemToggleComponent</c> subscribe to <c>ItemToggledEvent</c> instead.
+/// </remarks>
+public sealed partial class ToggleActionEvent : InstantActionEvent;
 
 /// <summary>
 ///     Generic enum keys for toggle-visualizer appearance data & sprite layers.
diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.cs b/Content.Shared/Tools/Systems/SharedToolSystem.cs
index 0d7972a8de6..aa69d3db78a 100644
--- a/Content.Shared/Tools/Systems/SharedToolSystem.cs
+++ b/Content.Shared/Tools/Systems/SharedToolSystem.cs
@@ -24,7 +24,7 @@ public abstract partial class SharedToolSystem : EntitySystem
     [Dependency] private   readonly SharedAudioSystem _audioSystem = default!;
     [Dependency] private   readonly SharedDoAfterSystem _doAfterSystem = default!;
     [Dependency] protected readonly SharedInteractionSystem InteractionSystem = default!;
-    [Dependency] protected readonly SharedItemToggleSystem ItemToggle = default!;
+    [Dependency] protected readonly ItemToggleSystem ItemToggle = default!;
     [Dependency] private   readonly SharedMapSystem _maps = default!;
     [Dependency] private   readonly SharedPopupSystem _popup = default!;
     [Dependency] protected readonly SharedSolutionContainerSystem SolutionContainerSystem = default!;
diff --git a/Content.Shared/UserInterface/ActivatableUISystem.Power.cs b/Content.Shared/UserInterface/ActivatableUISystem.Power.cs
index b8a815c7a81..e494253c832 100644
--- a/Content.Shared/UserInterface/ActivatableUISystem.Power.cs
+++ b/Content.Shared/UserInterface/ActivatableUISystem.Power.cs
@@ -1,3 +1,5 @@
+using Content.Shared.Item.ItemToggle;
+using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.PowerCell;
 using Robust.Shared.Containers;
 
@@ -5,6 +7,7 @@ namespace Content.Shared.UserInterface;
 
 public sealed partial class ActivatableUISystem
 {
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
     [Dependency] private readonly SharedPowerCellSystem _cell = default!;
 
     private void InitializePower()
@@ -12,27 +15,22 @@ private void InitializePower()
         SubscribeLocalEvent<ActivatableUIRequiresPowerCellComponent, ActivatableUIOpenAttemptEvent>(OnBatteryOpenAttempt);
         SubscribeLocalEvent<ActivatableUIRequiresPowerCellComponent, BoundUIOpenedEvent>(OnBatteryOpened);
         SubscribeLocalEvent<ActivatableUIRequiresPowerCellComponent, BoundUIClosedEvent>(OnBatteryClosed);
-
-        SubscribeLocalEvent<PowerCellDrawComponent, EntRemovedFromContainerMessage>(OnPowerCellRemoved);
+        SubscribeLocalEvent<ActivatableUIRequiresPowerCellComponent, ItemToggledEvent>(OnToggled);
     }
 
-    private void OnPowerCellRemoved(EntityUid uid, PowerCellDrawComponent component, EntRemovedFromContainerMessage args)
+    private void OnToggled(Entity<ActivatableUIRequiresPowerCellComponent> ent, ref ItemToggledEvent args)
     {
-        _cell.SetPowerCellDrawEnabled(uid, false);
-
-        if (!HasComp<ActivatableUIRequiresPowerCellComponent>(uid) ||
-            !TryComp(uid, out ActivatableUIComponent? activatable))
-        {
+        // only close ui when losing power
+        if (!TryComp<ActivatableUIComponent>(ent, out var activatable) || args.Activated)
             return;
-        }
 
         if (activatable.Key == null)
         {
-            Log.Error($"Encountered null key in activatable ui on entity {ToPrettyString(uid)}");
+            Log.Error($"Encountered null key in activatable ui on entity {ToPrettyString(ent)}");
             return;
         }
 
-        _uiSystem.CloseUi(uid, activatable.Key);
+        _uiSystem.CloseUi(ent.Owner, activatable.Key);
     }
 
     private void OnBatteryOpened(EntityUid uid, ActivatableUIRequiresPowerCellComponent component, BoundUIOpenedEvent args)
@@ -42,7 +40,7 @@ private void OnBatteryOpened(EntityUid uid, ActivatableUIRequiresPowerCellCompon
         if (!args.UiKey.Equals(activatable.Key))
             return;
 
-        _cell.SetPowerCellDrawEnabled(uid, true);
+        _toggle.TryActivate(uid);
     }
 
     private void OnBatteryClosed(EntityUid uid, ActivatableUIRequiresPowerCellComponent component, BoundUIClosedEvent args)
@@ -54,7 +52,7 @@ private void OnBatteryClosed(EntityUid uid, ActivatableUIRequiresPowerCellCompon
 
         // Stop drawing power if this was the last person with the UI open.
         if (!_uiSystem.IsUiOpen(uid, activatable.Key))
-            _cell.SetPowerCellDrawEnabled(uid, false);
+            _toggle.TryDeactivate(uid);
     }
 
     /// <summary>
diff --git a/Content.Shared/Weapons/Reflect/ReflectComponent.cs b/Content.Shared/Weapons/Reflect/ReflectComponent.cs
index 5d8432ac776..5edd445afcb 100644
--- a/Content.Shared/Weapons/Reflect/ReflectComponent.cs
+++ b/Content.Shared/Weapons/Reflect/ReflectComponent.cs
@@ -5,16 +5,11 @@ namespace Content.Shared.Weapons.Reflect;
 
 /// <summary>
 /// Entities with this component have a chance to reflect projectiles and hitscan shots
+/// Uses <c>ItemToggleComponent</c> to control reflection.
 /// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class ReflectComponent : Component
 {
-    /// <summary>
-    /// Can only reflect when enabled
-    /// </summary>
-    [DataField("enabled"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
-    public bool Enabled = true;
-
     /// <summary>
     /// What we reflect.
     /// </summary>
diff --git a/Content.Shared/Weapons/Reflect/ReflectSystem.cs b/Content.Shared/Weapons/Reflect/ReflectSystem.cs
index 76c98a427f5..7f20974a144 100644
--- a/Content.Shared/Weapons/Reflect/ReflectSystem.cs
+++ b/Content.Shared/Weapons/Reflect/ReflectSystem.cs
@@ -9,6 +9,7 @@
 using Content.Shared.Hands;
 using Content.Shared.Inventory;
 using Content.Shared.Inventory.Events;
+using Content.Shared.Item.ItemToggle;
 using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.Popups;
 using Content.Shared.Projectiles;
@@ -31,10 +32,11 @@ namespace Content.Shared.Weapons.Reflect;
 /// </summary>
 public sealed class ReflectSystem : EntitySystem
 {
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly INetManager _netManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
@@ -102,10 +104,9 @@ private void OnReflectCollide(EntityUid uid, ReflectComponent component, ref Pro
 
     private bool TryReflectProjectile(EntityUid user, EntityUid reflector, EntityUid projectile, ProjectileComponent? projectileComp = null, ReflectComponent? reflect = null)
     {
-        // Do we have the components needed to try a reflect at all?
         if (
             !Resolve(reflector, ref reflect, false) ||
-            !reflect.Enabled ||
+            !_toggle.IsActivated(reflector) ||
             !TryComp<ReflectiveComponent>(projectile, out var reflective) ||
             (reflect.Reflects & reflective.Reflective) == 0x0 ||
             !TryComp<PhysicsComponent>(projectile, out var physics) ||
@@ -210,16 +211,10 @@ private bool TryReflectHitscan(
     {
         newDirection = null;
         if (!TryComp<ReflectComponent>(reflector, out var reflect) ||
-            !reflect.Enabled ||
-            TryComp<StaminaComponent>(reflector, out var staminaComponent) && staminaComponent.Critical ||
-            _standing.IsDown(reflector))
-            return false;
-
-        // Non cultists can't use cult items to reflect anything.
-        if (HasComp<CultItemComponent>(reflector) && !HasComp<BloodCultistComponent>(user))
-            return false;
-
-        if (!_random.Prob(CalcReflectChance(reflector, reflect)))
+            !_toggle.IsActivated(reflector) ||
+            !_random.Prob(reflect.ReflectProb))
+        {
+            newDirection = null;
             return false;
 
         if (_netManager.IsServer)
@@ -273,13 +268,8 @@ private void OnReflectHandUnequipped(EntityUid uid, ReflectComponent component,
 
     private void OnToggleReflect(EntityUid uid, ReflectComponent comp, ref ItemToggledEvent args)
     {
-        comp.Enabled = args.Activated;
-        Dirty(uid, comp);
-
-        if (comp.Enabled)
-            EnableAlert(uid);
-        else
-            DisableAlert(uid);
+        if (args.User is {} user)
+            RefreshReflectUser(user);
     }
 
     /// <summary>
@@ -289,7 +279,7 @@ private void RefreshReflectUser(EntityUid user)
     {
         foreach (var ent in _inventorySystem.GetHandOrInventoryEntities(user, SlotFlags.WITHOUT_POCKET))
         {
-            if (!HasComp<ReflectComponent>(ent))
+            if (!HasComp<ReflectComponent>(ent) || !_toggle.IsActivated(ent))
                 continue;
 
             EnsureComp<ReflectUserComponent>(user);
diff --git a/Resources/Prototypes/Actions/ninja.yml b/Resources/Prototypes/Actions/ninja.yml
index 51bfc33c494..3ad67844d66 100644
--- a/Resources/Prototypes/Actions/ninja.yml
+++ b/Resources/Prototypes/Actions/ninja.yml
@@ -2,7 +2,7 @@
 - type: entity
   id: ActionToggleNinjaGloves
   name: Toggle ninja gloves
-  description: Toggles all glove actions on left click. Includes your doorjack, draining power, stunning enemies, downloading research and calling in a threat.
+  description: Toggles all glove actions on left click. Includes your doorjack, draining power, stunning enemies and hacking certain computers.
   categories: [ HideSpawnMenu ]
   components:
   - type: InstantAction
@@ -23,7 +23,7 @@
       state: icon
     itemIconStyle: NoItem
     priority: -10
-    event: !type:CreateThrowingStarEvent {}
+    event: !type:CreateItemEvent {}
 
 - type: entity
   id: ActionRecallKatana
@@ -64,7 +64,7 @@
     # have to plan (un)cloaking ahead of time
     useDelay: 5
     priority: -9
-    event: !type:ToggleStealthEvent
+    event: !type:ToggleActionEvent
 
 # katana
 - type: entity
@@ -78,6 +78,10 @@
       sprite: Objects/Magic/magicactions.rsi
       state: blink
     itemIconStyle: NoItem
+    sound:
+      path: /Audio/Magic/blink.ogg
+      params:
+        volume: 5
     priority: -12
     event: !type:DashEvent
     checkCanAccess: false
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
index 2abe1f0a80f..748e3482a8e 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -206,7 +206,7 @@
   - type: FingerprintMask
 
 - type: entity
-  parent: ClothingHandsBase
+  parent: [ClothingHandsBase, BaseToggleClothing]
   id: ClothingHandsGlovesSpaceNinja
   name: space ninja gloves
   description: These black nano-enhanced gloves insulate from electricity and provide fire resistance.
@@ -233,7 +233,32 @@
   - type: FingerprintMask
   - type: Thieving
     stripTimeReduction: 1
+    stealthy: true
+  - type: ToggleClothing
+    action: ActionToggleNinjaGloves
   - type: NinjaGloves
+    abilities:
+    - components:
+      - type: BatteryDrainer
+      - type: StunProvider
+        noPowerPopup: ninja-no-power
+        whitelist:
+          components:
+          - Stamina
+      - type: EmagProvider
+        whitelist:
+          components:
+          - Airlock
+    - objective: StealResearchObjective
+      components:
+      - type: ResearchStealer
+    - objective: TerrorObjective
+      components:
+      - type: CommsHacker
+        threats: NinjaThreats
+    - objective: MassArrestObjective
+      components:
+      - type: CriminalRecordsHacker
 
 - type: entity
   parent: ClothingHandsGlovesColorBlack
diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
index c7ba6e0b32a..10eaf1cb44e 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
@@ -172,6 +172,36 @@
   - type: AddAccentClothing
     accent: OwOAccent
 
+- type: entity
+  parent: [ClothingHeadHatCatEars, BaseToggleClothing]
+  id: ClothingHeadHatCatEarsValid
+  suffix: Valid, DO NOT MAP
+  components:
+  - type: ToggleClothing
+    action: ActionBecomeValid
+    disableOnUnequip: true
+  - type: ComponentToggler
+    parent: true
+    components:
+    - type: KillSign
+  - type: Tag
+    tags: [] # ignore "WhitelistChameleon" tag
+  - type: Sprite
+    sprite: Clothing/Head/Hats/catears.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/catears.rsi
+  - type: AddAccentClothing
+    accent: OwOAccent
+
+- type: entity
+  noSpawn: true
+  id: ActionBecomeValid
+  name: Become Valid
+  description: "*notices your killsign* owo whats this"
+  components:
+  - type: InstantAction
+    event: !type:ToggleActionEvent
+
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatDogEars
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
index 6215fb3b45a..7ba33bd0da6 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -154,7 +154,7 @@
       - HidesHarpyWings
 
 - type: entity
-  parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing]
+  parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseToggleClothing]
   id: ClothingOuterSuitSpaceNinja
   name: space ninja suit
   description: This black technologically advanced, cybernetically-enhanced suit provides many abilities like invisibility or teleportation.
@@ -163,9 +163,7 @@
     sprite: Clothing/OuterClothing/Suits/spaceninja.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/spaceninja.rsi
-  - type: StealthClothing
-    visibility: 1.1
-    toggleAction: ActionTogglePhaseCloak
+  # hardsuit stuff
   - type: PressureProtection
     highPressureMultiplier: 0.6
     lowPressureMultiplier: 1000
@@ -178,7 +176,27 @@
         Slash: 0.8
         Piercing: 0.8
         Heat: 0.8
+  # phase cloak
+  - type: ToggleClothing
+    action: ActionTogglePhaseCloak
+  - type: ComponentToggler
+    parent: true
+    components:
+    - type: Stealth
+      minVisibility: 0.1
+      lastVisibility: 0.1
+  - type: PowerCellDraw
+    drawRate: 1.8 # 200 seconds on the default cell
+  # throwing star ability
+  - type: ItemCreator
+    action: ActionCreateThrowingStar
+    charge: 14.4
+    spawnedPrototype: ThrowingStarNinja
+    noPowerPopup: ninja-no-power
+  # core ninja suit stuff
   - type: NinjaSuit
+  - type: UseDelay
+    delay: 5 # disable time
   - type: PowerCellSlot
     cellSlotId: cell_slot
     # throwing in a recharger would bypass glove charging mechanic
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
index 13fbc087164..bb2b163f080 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
@@ -1,45 +1,39 @@
 - type: entity
-  parent: ClothingShoesBase
+  parent: [ClothingShoesBase, BaseToggleClothing]
   id: ClothingShoesBootsMag
   name: magboots
   description: Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
   components:
-    - type: Sprite
-      sprite: Clothing/Shoes/Boots/magboots.rsi
-      layers:
-      - state: icon
-        map: [ "enum.ToggleVisuals.Layer" ]
-    - type: Clothing
-      sprite: Clothing/Shoes/Boots/magboots.rsi
-    - type: Magboots
-    - type: ClothingSpeedModifier
-      walkModifier: 0.85
-      sprintModifier: 0.8
-      enabled: false
-    - type: Appearance
-    - type: GenericVisualizer
-      visuals:
-        enum.ToggleVisuals.Toggled:
-          enum.ToggleVisuals.Layer:
-            True: {state: icon-on}
-            False: {state: icon}
-    - type: StaticPrice
-      price: 200
-    - type: Tag
-      tags:
-      - WhitelistChameleon
-    - type: ReverseEngineering
-      difficulty: 2
-      recipes:
-        - ClothingShoesBootsMag
-    - type: DamageOtherOnHit
-      damage:
-        types:
-          Blunt: 9
-      staminaCost: 11.5
-      soundHit:
-        path: /Audio/Weapons/smash.ogg
-
+  - type: Sprite
+    sprite: Clothing/Shoes/Boots/magboots.rsi
+    layers:
+    - state: icon
+      map: [ "enum.ToggleVisuals.Layer" ]
+  - type: Clothing
+    sprite: Clothing/Shoes/Boots/magboots.rsi
+  - type: ToggleClothing
+    action: ActionToggleMagboots
+  - type: ToggleVerb
+    text: toggle-magboots-verb-get-data-text
+  - type: ComponentToggler
+    components:
+    - type: NoSlip
+  - type: Magboots
+  - type: ClothingSpeedModifier
+    walkModifier: 0.85
+    sprintModifier: 0.8
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.ToggleVisuals.Toggled:
+        enum.ToggleVisuals.Layer:
+          True: {state: icon-on}
+          False: {state: icon}
+  - type: StaticPrice
+    price: 200
+  - type: Tag
+    tags:
+    - WhitelistChameleon
 
 - type: entity
   parent: ClothingShoesBootsMag
@@ -52,13 +46,9 @@
     state: icon
   - type: Clothing
     sprite: Clothing/Shoes/Boots/magboots-advanced.rsi
-  - type: Magboots
-    toggleAction: ActionToggleMagbootsAdvanced
   - type: ClothingSpeedModifier
     walkModifier: 1
     sprintModifier: 1
-    enabled: false
-  - type: NoSlip
   - type: Tag
     tags:
     - WhitelistChameleon
@@ -81,8 +71,6 @@
     sprite: Clothing/Shoes/Boots/magboots-science.rsi
   - type: Clothing
     sprite: Clothing/Shoes/Boots/magboots-science.rsi
-  - type: Magboots
-    toggleAction: ActionToggleMagbootsSci
 
 - type: entity
   parent: ClothingShoesBootsMag
@@ -93,7 +81,6 @@
   - type: ClothingSpeedModifier
     walkModifier: 1.10 #PVS isn't too much of an issue when you are blind...
     sprintModifier: 1.10
-    enabled: false
   - type: StaticPrice
     price: 3000
 
@@ -108,12 +95,9 @@
     state: icon
   - type: Clothing
     sprite: Clothing/Shoes/Boots/magboots-syndicate.rsi
-  - type: Magboots
-    toggleAction: ActionToggleMagbootsSyndie
   - type: ClothingSpeedModifier
     walkModifier: 0.95
     sprintModifier: 0.9
-    enabled: false
   - type: GasTank
     outputPressure: 42.6
     air:
@@ -121,79 +105,18 @@
       volume: 0.75
       temperature: 293.15
       moles:
-        - 0.153853429 # oxygen
-        - 0.153853429 # nitrogen
-  - type: ActivatableUI
-    key: enum.SharedGasTankUiKey.Key
-  - type: UserInterface
-    interfaces:
-      enum.SharedGasTankUiKey.Key:
-        type: GasTankBoundUserInterface
-  - type: Explosive
-    explosionType: Default
-    maxIntensity: 20
-  - type: Jetpack
-    moleUsage: 0.00085
-  - type: CanMoveInAir
-  - type: InputMover
-    toParent: true
-  - type: MovementSpeedModifier
-    weightlessAcceleration: 1
-    weightlessFriction: 0.3
-    weightlessModifier: 1.2
-  - type: Tag
-    tags:
-      - WhitelistChameleon
-  - type: DamageOtherOnHit
-    damage:
-      types:
-        Blunt: 20
-    staminaCost: 25
-    soundHit:
-      collection: MetalThud
+      - 0.153853429 # oxygen
+      - 0.153853429 # nitrogen
+  - type: Item
+    sprite: null
+    size: Normal
 
 - type: entity
-  id: ActionBaseToggleMagboots
+  id: ActionToggleMagboots
   name: Toggle Magboots
   description: Toggles the magboots on and off.
   categories: [ HideSpawnMenu ]
   components:
   - type: InstantAction
-    itemIconStyle: NoItem
-    event: !type:ToggleMagbootsEvent
-
-- type: entity
-  id: ActionToggleMagboots
-  parent: ActionBaseToggleMagboots
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: InstantAction
-    icon: { sprite: Clothing/Shoes/Boots/magboots.rsi, state: icon }
-    iconOn: { sprite : Clothing/Shoes/Boots/magboots.rsi, state: icon-on }
-
-- type: entity
-  id: ActionToggleMagbootsAdvanced
-  parent: ActionBaseToggleMagboots
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: InstantAction
-    icon: { sprite: Clothing/Shoes/Boots/magboots-advanced.rsi, state: icon }
-    iconOn: Clothing/Shoes/Boots/magboots-advanced.rsi/icon-on.png
-
-- type: entity
-  id: ActionToggleMagbootsSci
-  parent: ActionBaseToggleMagboots
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: InstantAction
-    icon: { sprite: Clothing/Shoes/Boots/magboots-science.rsi, state: icon }
-    iconOn: Clothing/Shoes/Boots/magboots-science.rsi/icon-on.png
-
-- type: entity
-  id: ActionToggleMagbootsSyndie
-  parent: ActionBaseToggleMagboots
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: InstantAction
-    icon: { sprite: Clothing/Shoes/Boots/magboots-syndicate.rsi, state: icon }
-    iconOn: Clothing/Shoes/Boots/magboots-syndicate.rsi/icon-on.png
+    itemIconStyle: BigItem
+    event: !type:ToggleActionEvent
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
index 888bcd769cf..5d81a416199 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
@@ -88,7 +88,7 @@
   - type: NoSlip
 
 - type: entity
-  parent: [ClothingShoesBase, PowerCellSlotSmallItem]
+  parent: [ClothingShoesBase, PowerCellSlotSmallItem, BaseToggleClothing]
   id: ClothingShoesBootsSpeed
   name: speed boots
   description: High-tech boots woven with quantum fibers, able to convert electricity into pure speed!
@@ -100,12 +100,11 @@
       map: [ "enum.ToggleVisuals.Layer" ]
   - type: Clothing
     sprite: Clothing/Shoes/Boots/speedboots.rsi
-  - type: ToggleClothingSpeed
-    toggleAction: ActionToggleSpeedBoots
+  - type: ToggleClothing
+    action: ActionToggleSpeedBoots
   - type: ClothingSpeedModifier
     walkModifier: 1.5
     sprintModifier: 1.5
-    enabled: false
   - type: Appearance
   - type: GenericVisualizer
     visuals:
@@ -131,7 +130,23 @@
   categories: [ HideSpawnMenu ]
   components:
   - type: InstantAction
-    itemIconStyle: NoItem
-    event: !type:ToggleClothingSpeedEvent
-    icon: { sprite: Clothing/Shoes/Boots/speedboots.rsi, state: icon }
-    iconOn: { sprite: Clothing/Shoes/Boots/speedboots.rsi, state: icon-on }
+    itemIconStyle: BigItem
+    event: !type:ToggleActionEvent
+
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesBootsMoon
+  name: moon boots
+  description: Special anti-gravity boots developed with a speciality blend of lunar rock gel. Shipped from the Netherlands.
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Boots/moonboots.rsi
+    layers:
+    - state: icon
+  - type: Clothing
+    sprite: Clothing/Shoes/Boots/moonboots.rsi
+  - type: AntiGravityClothing
+  - type: StaticPrice
+    price: 75
+  - type: Tag
+    tags: [ ]
diff --git a/Resources/Prototypes/Entities/Clothing/base_clothing.yml b/Resources/Prototypes/Entities/Clothing/base_clothing.yml
index bc592616be9..3d0732d1cab 100644
--- a/Resources/Prototypes/Entities/Clothing/base_clothing.yml
+++ b/Resources/Prototypes/Entities/Clothing/base_clothing.yml
@@ -51,3 +51,12 @@
   - type: GroupExamine
   - type: Armor
     modifiers: {}
+
+# for clothing that can be toggled, like magboots
+- type: entity
+  abstract: true
+  id: BaseToggleClothing
+  components:
+  - type: ItemToggle
+    onUse: false # can't really wear it like that
+  - type: ToggleClothing
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
index 3911a686266..f0f37822f4c 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
@@ -130,10 +130,9 @@
       state: alive
 
 - type: entity
+  noSpawn: true
+  parent: BaseAntagSpawner
   id: SpawnPointGhostSpaceNinja
-  name: ghost role spawn point
-  suffix: space ninja
-  parent: MarkerBase
   components:
   - type: GhostRole
     name: ghost-role-information-space-ninja-name
@@ -141,8 +140,6 @@
     rules: ghost-role-information-space-ninja-rules
     raffle:
       settings: default
-  - type: GhostRoleMobSpawner
-    prototype: MobHumanSpaceNinja
   - type: Sprite
     sprite: Markers/jobs.rsi
     layers:
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 1d0a8d92280..2989c40ff77 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -114,6 +114,11 @@
   - type: PowerCellSlot
     cellSlotId: cell_slot
     fitsInCharger: true
+  - type: ItemToggle
+    onUse: false # no item-borg toggling sorry
+  - type: AccessToggle
+  # TODO: refactor movement to just be based on toggle like speedboots but for the boots themselves
+  # TODO: or just have sentient speedboots be fast idk
   - type: PowerCellDraw
     drawRate: 0.6
   - type: ItemSlots
diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml
index 4284632d288..a7fb7de2f87 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml
@@ -69,28 +69,3 @@
       - Syndicate
     - type: Psionic
       powerRollMultiplier: 7
-
-# Space Ninja
-- type: entity
-  categories: [ HideSpawnMenu ]
-  name: Space Ninja
-  parent: MobHuman
-  id: MobHumanSpaceNinja
-  components:
-  - type: RandomHumanoidAppearance
-    randomizeName: false
-  - type: Loadout
-    prototypes: [SpaceNinjaGear]
-  - type: NpcFactionMember
-    factions:
-    - Syndicate
-  - type: SpaceNinja
-  - type: GenericAntag
-    rule: Ninja
-  - type: AutoImplant
-    implants:
-    - DeathAcidifierImplant
-  - type: RandomMetadata
-    nameSegments:
-    - names_ninja_title
-    - names_ninja
diff --git a/Resources/Prototypes/Entities/Objects/Devices/base_handheld.yml b/Resources/Prototypes/Entities/Objects/Devices/base_handheld.yml
new file mode 100644
index 00000000000..259323fede3
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Devices/base_handheld.yml
@@ -0,0 +1,11 @@
+- type: entity
+  abstract: true
+  parent: [BaseItem, PowerCellSlotSmallItem]
+  id: BaseHandheldComputer
+  components:
+  - type: ActivatableUIRequiresPowerCell
+  - type: ItemToggle
+    onUse: false # above component does the toggling
+  - type: PowerCellDraw
+    drawRate: 0
+    useRate: 20
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 2dbcfc60ab3..00df4e02cbe 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -118,6 +118,9 @@
   id: BaseMedicalPDA
   abstract: true
   components:
+  - type: ItemToggle
+    toggleLight: false
+    onUse: false
   - type: HealthAnalyzer
     scanDelay: 1
     scanningEndSound:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_map.yml b/Resources/Prototypes/Entities/Objects/Devices/station_map.yml
index 0d2f890a1d3..54fc4a70c5a 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/station_map.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/station_map.yml
@@ -1,9 +1,9 @@
 - type: entity
+  parent: BaseItem
   id: BaseHandheldStationMap
   name: station map
   description: Displays a readout of the current station.
   abstract: true
-  parent: BaseItem
   components:
     - type: StationMap
     - type: Sprite
@@ -34,14 +34,9 @@
 - type: entity
   id: HandheldStationMap
   parent:
-    - BaseHandheldStationMap
-    - PowerCellSlotSmallItem
+  - BaseHandheldStationMap
+  - BaseHandheldComputer
   suffix: Handheld, Powered
-  components:
-    - type: PowerCellDraw
-      drawRate: 0
-      useRate: 20
-    - type: ActivatableUIRequiresPowerCell
 
 - type: entity
   id: HandheldStationMapEmpty
diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
index f0d9a7c0b1b..ac23bd3995d 100644
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -325,8 +325,10 @@
         path: /Audio/Weapons/ebladehum.ogg
     - type: ItemToggleSize
       activatedSize: Huge
-    - type: ItemToggleDisarmMalus
-      activatedDisarmMalus: 0.6
+    - type: ComponentToggler
+      components:
+      - type: DisarmMalus
+        malus: 0.6
     - type: Sprite
       sprite: Objects/Weapons/Melee/e_shield.rsi
       layers:
@@ -358,7 +360,6 @@
       energy: 2
       color: blue
     - type: Reflect
-      enabled: false
       reflectProb: 0.95
       innate: true
       reflects:
@@ -436,8 +437,10 @@
         path: /Audio/Weapons/telescopicoff.ogg
         params:
           volume: -5
-    - type: ItemToggleDisarmMalus
-      activatedDisarmMalus: 0.6
+    - type: ComponentToggler
+      components:
+      - type: DisarmMalus
+        malus: 0.6
     - type: ItemToggleSize
       activatedSize: Huge
     - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
index 1a905685934..0a7041ea548 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
@@ -31,6 +31,11 @@
       size: Large
     - type: Speech
       speechVerb: Robotic
+    - type: ItemToggle
+      soundActivate:
+        path: /Audio/Items/Defib/defib_safety_on.ogg
+      soundDeactivate:
+        path: /Audio/Items/Defib/defib_safety_off.ogg
     - type: Defibrillator
       zapHeal:
         types:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
index a9d6bbb20f5..93208f80c00 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
@@ -1,19 +1,14 @@
 - type: entity
   name: handheld crew monitor
   suffix: DO NOT MAP
-  parent:
-  - BaseItem
-  - PowerCellSlotSmallItem
+  parent: BaseHandheldComputer
+  # CMO-only bud, don't add more.
   id: HandheldCrewMonitor
   description: A hand-held crew monitor displaying the status of suit sensors.
   components:
   - type: Sprite
     sprite: Objects/Specific/Medical/handheldcrewmonitor.rsi
     state: scanner
-  - type: PowerCellDraw
-    drawRate: 0
-    useRate: 20
-  - type: ActivatableUIRequiresPowerCell
   - type: ActivatableUI
     key: enum.CrewMonitoringUIKey.Key
   - type: UserInterface
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
index 47e633276b8..df9c27149d3 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
@@ -21,6 +21,8 @@
     interfaces:
       enum.HealthAnalyzerUiKey.Key:
         type: HealthAnalyzerBoundUserInterface
+  - type: ItemToggle
+    onUse: false
   - type: HealthAnalyzer
     scanningEndSound:
       path: "/Audio/Items/Medical/healthscanner.ogg"
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
index 3c3b2154226..a90f7099adc 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
@@ -40,23 +40,22 @@
       - state: screen
         shader: unshaded
         visible: false
-        map: ["enum.PowerDeviceVisualLayers.Powered"]
+        map: ["enum.ToggleVisuals.Layer"]
   - type: Appearance
   - type: GenericVisualizer
     visuals:
-      enum.ProximityBeeperVisuals.Enabled:
-        enum.PowerDeviceVisualLayers.Powered:
+      enum.ToggleVisuals.Toggled:
+        enum.ToggleVisuals.Layer:
           True: { visible: true }
           False: { visible: false }
+  - type: ItemToggle
   - type: ProximityBeeper
   - type: ProximityDetector
-    enabled: false
     range: 20
     criteria:
       components:
       - Anomaly
   - type: Beeper
-    enabled: false
     minBeepInterval: 0.15
     maxBeepInterval: 1.00
     beepSound:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml b/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
index 38b1f7cda9f..6491f699f00 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: handheld mass scanner
-  parent: [ BaseItem, PowerCellSlotSmallItem]
+  parent: BaseHandheldComputer
   id: HandHeldMassScanner
   description: A hand-held mass scanner.
   components:
@@ -27,7 +27,6 @@
   - type: PowerCellDraw
     drawRate: 3
     useRate: 100
-  - type: ActivatableUIRequiresPowerCell
   - type: ActivatableUI
     key: enum.RadarConsoleUiKey.Key
     inHandsOnly: true
diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
index eae5cdbf46f..3b4394bdc3c 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
@@ -64,8 +64,10 @@
   - type: ItemToggleSize
     activatedSize: Large
   - type: ItemToggleHot
-  - type: ItemToggleDisarmMalus
-    activatedDisarmMalus: 0.6
+  - type: ComponentToggler
+    components:
+    - type: DisarmMalus
+      malus: 0.6
   - type: ToggleableLightVisuals
     spriteLayer: flame
     inhandVisuals:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
index dc49dce0f3a..e95db1c6e9b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -180,6 +180,8 @@
     - type: TetherGun
       frequency: 5
       dampingRatio: 4
+    - type: ItemToggle
+      onUse: false
     - type: PowerCellDraw
     - type: Sprite
       sprite: Objects/Weapons/Guns/Launchers/tether_gun.rsi
@@ -225,6 +227,8 @@
         path: /Audio/Weapons/soup.ogg
         params:
           volume: 2
+    - type: ItemToggle
+      onUse: false
     - type: PowerCellDraw
     - type: Sprite
       sprite: Objects/Weapons/Guns/Launchers/force_gun.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index 59c6d63c6e1..e4dd7b5b418 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -13,10 +13,12 @@
   - type: ItemToggleActiveSound
     activeSound:
       path: /Audio/Weapons/ebladehum.ogg
-  - type: ItemToggleSharp
+  - type: ComponentToggler
+    components:
+    - type: Sharp
+    - type: DisarmMalus
+      malus: 0.6
   - type: ItemToggleHot
-  - type: ItemToggleDisarmMalus
-    activatedDisarmMalus: 0.6
   - type: ItemToggleSize
     activatedSize: Huge
   - type: ItemToggleMeleeWeapon
@@ -86,15 +88,7 @@
       right:
       - state: inhand-right-blade
         shader: unshaded
-  - type: DisarmMalus
-    malus: 0
   - type: Reflect
-    enabled: false
-    reflectProb: 0.5
-    minReflectProb: 0.25
-  - type: Tag
-    tags:
-      - NoPaint
   - type: IgnitionSource
     temperature: 700
   - type: Scalpel
@@ -129,7 +123,6 @@
   suffix: E-Dagger
   description: 'A dark ink pen.'
   components:
-  - type: EnergySword
   - type: ItemToggle
     soundActivate:
       path: /Audio/Weapons/ebladeon.ogg
@@ -155,14 +148,11 @@
       path: /Audio/Weapons/ebladehum.ogg
       params:
         volume: -6
-  - type: ItemToggleDisarmMalus
-    activatedDisarmMalus: 0.4
-  - type: ItemToggleEmbeddableProjectile
-    activatedOffset: 0.0,0.0
-    activatedRemovalTime: 3
-  - type: ItemToggleThrowingAngle
-    activatedAngle: 135
-    deleteOnDeactivate: false
+  - type: ComponentToggler
+    components:
+    - type: Sharp
+    - type: DisarmMalus
+      malus: 0.4
   - type: Sprite
     sprite: Objects/Weapons/Melee/e_dagger.rsi
     layers:
@@ -246,15 +236,12 @@
   id: EnergyCutlass
   description: An exotic energy weapon, brutal blade crackling with crudely harnessed plasma. #DeltaV - nicer description.
   components:
-  - type: EnergySword
   - type: ItemToggleMeleeWeapon
     activatedDamage:
         types:
             Slash: 10
             Heat: 12
     deactivatedSecret: true
-  - type: ItemToggleDisarmMalus
-    activatedDisarmMalus: 0.6
   - type: Sprite
     sprite: DeltaV/Objects/Weapons/Melee/e_cutlass.rsi # DeltaV
     layers:
@@ -290,8 +277,8 @@
   id: EnergySwordDouble
   description: Syndicate Command's intern thought that having only one blade on energy swords was not cool enough. This can be stored in pockets.
   components:
-  - type: EnergySword
   - type: ItemToggle
+    onUse: false # wielding events control it instead
     soundActivate:
       path: /Audio/Weapons/ebladeon.ogg
       params:
@@ -316,9 +303,13 @@
       path: /Audio/Weapons/ebladehum.ogg
       params:
         volume: 3
-  - type: ItemToggleDisarmMalus
-    activatedDisarmMalus: 0.7
+  - type: ComponentToggler
+    components:
+    - type: Sharp
+    - type: DisarmMalus
+      malus: 0.7
   - type: Wieldable
+    wieldSound: null # esword light sound instead
   - type: MeleeWeapon
     wideAnimationRotation: -135
     attackRate: .6666
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
index 2da3d3bb92e..d36f0704751 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -30,13 +30,7 @@
   - type: ThrowingAngle
     angle: 225
   - type: Reflect
-    enabled: true
-    # Design intent: a robust captain or tot can sacrifice movement to make the most of this weapon, but they have to
-    # really restrict themselves to walking speed or less.
-    reflectProb: 0.5
-    velocityBeforeNotMaxProb: 1.0
-    velocityBeforeMinProb: 3.0
-    minReflectProb: 0.1
+    reflectProb: .1
     spread: 90
   - type: Item
     size: Normal
@@ -261,11 +255,7 @@
         path: /Audio/Effects/explosion_small1.ogg
     - type: DamageOtherOnHit
     - type: Reflect
-      enabled: true
-      reflectProb: 0.5 # In robust hands, deflects as well as an e-sword
-      velocityBeforeNotMaxProb: 1.0
-      velocityBeforeMinProb: 3.0
-      minReflectProb: 0.1
+      reflectProb: .25
       spread: 90
     - type: Item
       size: Ginormous
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
index 4cb76ea4b92..0485b5a5178 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
@@ -85,6 +85,7 @@
         whitelist:
           components:
             - FitsInDispenser
+  - type: ItemToggle
   - type: HealthAnalyzer
     scanDelay: 0
   - type: UserInterface
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index a0649eb2d6b..8a9c4880884 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -104,7 +104,43 @@
     earliestStart: 30
     reoccurrenceDelay: 20
     minimumPlayers: 30
-  - type: NinjaSpawnRule
+  - type: SpaceSpawnRule
+  - type: AntagLoadProfileRule
+  - type: AntagObjectives
+    objectives:
+    - StealResearchObjective
+    - DoorjackObjective
+    - SpiderChargeObjective
+    - TerrorObjective
+    - MassArrestObjective
+    - NinjaSurviveObjective
+  - type: AntagSelection
+    agentName: ninja-round-end-agent-name
+    definitions:
+    - spawnerPrototype: SpawnPointGhostSpaceNinja
+      min: 1
+      max: 1
+      pickPlayer: false
+      startingGear: SpaceNinjaGear
+      briefing:
+        text: ninja-role-greeting
+        color: Green
+        sound: /Audio/Misc/ninja_greeting.ogg
+      components:
+      - type: SpaceNinja
+      - type: NpcFactionMember
+        factions:
+        - Syndicate
+      - type: AutoImplant
+        implants:
+        - DeathAcidifierImplant
+      - type: RandomMetadata
+        nameSegments:
+        - names_ninja_title
+        - names_ninja
+      mindComponents:
+      - type: NinjaRole
+        prototype: SpaceNinja
 
 - type: entity
   parent: BaseGameRule
diff --git a/Resources/Prototypes/GameRules/midround.yml b/Resources/Prototypes/GameRules/midround.yml
index ba2cd530480..50864930b0f 100644
--- a/Resources/Prototypes/GameRules/midround.yml
+++ b/Resources/Prototypes/GameRules/midround.yml
@@ -1,34 +1,3 @@
-# doesnt spawn a ninja or anything, just stores configuration for it
-# see NinjaSpawn event for spawning
-- type: entity
-  id: Ninja
-  parent: BaseGameRule
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: GenericAntagRule
-    agentName: ninja-round-end-agent-name
-    objectives:
-    - StealResearchObjective
-    - DoorjackObjective
-    - SpiderChargeObjective
-    - TerrorObjective
-    - MassArrestObjective
-    - NinjaSurviveObjective
-  - type: NinjaRule
-    threats: NinjaThreats
-
-# stores configuration for dragon
-- type: entity
-  categories: [ HideSpawnMenu ]
-  parent: BaseGameRule
-  id: Dragon
-  components:
-  - type: GenericAntagRule
-    agentName: dragon-round-end-agent-name
-    objectives:
-    - CarpRiftsObjective
-    - DragonSurviveObjective
-
 - type: entity
   categories: [ HideSpawnMenu ]
   parent: BaseGameRule

From 0102f7d21b079348115c0ef581e44faaaa105784 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Sun, 4 Aug 2024 07:38:53 +0200
Subject: [PATCH 008/366] replace all uses of TryGetContainingContainer with
 non-obsolete overload (#30583)

* replace all uses of TryGetContainerContainer with non-obsolete overload

* rerun
---
 Content.Client/Commands/HideMechanismsCommand.cs     |  2 +-
 Content.Client/Instruments/UI/InstrumentMenu.xaml.cs |  2 +-
 Content.Client/Items/Systems/ItemSystem.cs           |  2 +-
 Content.Client/Movement/Systems/JetpackSystem.cs     |  4 ++--
 Content.Server/Atmos/Rotting/RottingSystem.cs        |  6 +++---
 Content.Server/Cargo/Systems/CargoSystem.Bounty.cs   |  2 +-
 .../Nutrition/EntitySystems/SmokingSystem.cs         |  2 +-
 Content.Server/PDA/PdaSystem.cs                      |  2 +-
 Content.Server/Polymorph/Systems/PolymorphSystem.cs  |  2 +-
 Content.Server/PowerCell/PowerCellSystem.cs          |  4 ++--
 Content.Server/Resist/EscapeInventorySystem.cs       |  2 +-
 .../Singularity/EntitySystems/EventHorizonSystem.cs  |  6 +++---
 .../Body/Systems/SharedBodySystem.Organs.cs          |  2 +-
 .../Body/Systems/SharedBodySystem.Parts.cs           |  6 +++---
 .../Clothing/ClothingSpeedModifierSystem.cs          |  4 ++--
 .../Clothing/EntitySystems/ClothingSystem.cs         |  2 +-
 Content.Shared/Clothing/MagbootsSystem.cs            |  2 +-
 .../Damage/Systems/DamageOnHoldingSystem.cs          |  2 +-
 .../Interaction/SharedInteractionSystem.cs           |  4 ++--
 Content.Shared/Item/SharedItemSystem.cs              |  4 ++--
 .../Materials/SharedMaterialReclaimerSystem.cs       |  2 +-
 .../Movement/Systems/SharedJetpackSystem.cs          | 12 ++++++------
 .../Storage/EntitySystems/SharedStorageSystem.cs     |  2 +-
 .../Ranged/Systems/SharedGunSystem.Clothing.cs       |  2 +-
 24 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/Content.Client/Commands/HideMechanismsCommand.cs b/Content.Client/Commands/HideMechanismsCommand.cs
index 5f9afc78b98..97d792628a6 100644
--- a/Content.Client/Commands/HideMechanismsCommand.cs
+++ b/Content.Client/Commands/HideMechanismsCommand.cs
@@ -30,7 +30,7 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
             sprite.ContainerOccluded = false;
 
             var tempParent = uid;
-            while (containerSys.TryGetContainingContainer(tempParent, out var container))
+            while (containerSys.TryGetContainingContainer((tempParent, null, null), out var container))
             {
                 if (!container.ShowContents)
                 {
diff --git a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
index da443e3fb5b..b54a91ee975 100644
--- a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
+++ b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
@@ -180,7 +180,7 @@ private bool PlayCheck()
 
             var container = _owner.Entities.System<SharedContainerSystem>();
             // If we're a handheld instrument, we might be in a container. Get it just in case.
-            container.TryGetContainingContainer(instrumentEnt, out var conMan);
+            container.TryGetContainingContainer((Entity, null, null), out var conMan);
 
             // If the instrument is handheld and we're not holding it, we return.
             if ((instrument.Handheld && (conMan == null || conMan.Owner != localEntity)))
diff --git a/Content.Client/Items/Systems/ItemSystem.cs b/Content.Client/Items/Systems/ItemSystem.cs
index 5e60d06d0ce..2b5a41c6ce7 100644
--- a/Content.Client/Items/Systems/ItemSystem.cs
+++ b/Content.Client/Items/Systems/ItemSystem.cs
@@ -43,7 +43,7 @@ private void OnEquipped(EntityUid uid, SpriteComponent component, GotEquippedEve
     public override void VisualsChanged(EntityUid uid)
     {
         // if the item is in a container, it might be equipped to hands or inventory slots --> update visuals.
-        if (Container.TryGetContainingContainer(uid, out var container))
+        if (Container.TryGetContainingContainer((uid, null, null), out var container))
             RaiseLocalEvent(container.Owner, new VisualsChangedEvent(GetNetEntity(uid), container.ID));
     }
 
diff --git a/Content.Client/Movement/Systems/JetpackSystem.cs b/Content.Client/Movement/Systems/JetpackSystem.cs
index b7f5e48821f..6f9ef830408 100644
--- a/Content.Client/Movement/Systems/JetpackSystem.cs
+++ b/Content.Client/Movement/Systems/JetpackSystem.cs
@@ -63,15 +63,15 @@ public override void Update(float frameTime)
 
     private void CreateParticles(EntityUid uid)
     {
+        var uidXform = Transform(uid);
         // Don't show particles unless the user is moving.
-        if (Container.TryGetContainingContainer(uid, out var container) &&
+        if (Container.TryGetContainingContainer((uid, uidXform, null), out var container) &&
             TryComp<PhysicsComponent>(container.Owner, out var body) &&
             body.LinearVelocity.LengthSquared() < 1f)
         {
             return;
         }
 
-        var uidXform = Transform(uid);
         var coordinates = uidXform.Coordinates;
         var gridUid = coordinates.GetGridUid(EntityManager);
 
diff --git a/Content.Server/Atmos/Rotting/RottingSystem.cs b/Content.Server/Atmos/Rotting/RottingSystem.cs
index 40bdf657439..bfff8a91d0d 100644
--- a/Content.Server/Atmos/Rotting/RottingSystem.cs
+++ b/Content.Server/Atmos/Rotting/RottingSystem.cs
@@ -34,7 +34,7 @@ private void OnGibbed(EntityUid uid, RottingComponent component, BeingGibbedEven
         if (!TryComp<PerishableComponent>(uid, out var perishable))
             return;
 
-        var molsToDump = perishable.MolsPerSecondPerUnitMass * physics.FixturesMass * (float) component.TotalRotTime.TotalSeconds;
+        var molsToDump = perishable.MolsPerSecondPerUnitMass * physics.FixturesMass * (float)component.TotalRotTime.TotalSeconds;
         var tileMix = _atmosphere.GetTileMixture(uid, excite: true);
         tileMix?.AdjustMoles(Gas.Ammonia, molsToDump);
     }
@@ -77,7 +77,7 @@ public void ReduceAccumulator(EntityUid uid, TimeSpan time)
     /// <returns></returns>
     private float GetRotRate(EntityUid uid)
     {
-        if (_container.TryGetContainingContainer(uid, out var container) &&
+        if (_container.TryGetContainingContainer((uid, null, null), out var container) &&
             TryComp<ProRottingContainerComponent>(container.Owner, out var rotContainer))
         {
             return rotContainer.DecayModifier;
@@ -147,7 +147,7 @@ public override void Update(float frameTime)
                 continue;
             // We need a way to get the mass of the mob alone without armor etc in the future
             // or just remove the mass mechanics altogether because they aren't good.
-            var molRate = perishable.MolsPerSecondPerUnitMass * (float) rotting.RotUpdateRate.TotalSeconds;
+            var molRate = perishable.MolsPerSecondPerUnitMass * (float)rotting.RotUpdateRate.TotalSeconds;
             var tileMix = _atmosphere.GetTileMixture(uid, excite: true);
             tileMix?.AdjustMoles(Gas.Ammonia, molRate * physics.FixturesMass);
         }
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
index e132e4f12a3..9922cc5a37e 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
@@ -135,7 +135,7 @@ private void OnGetBountyPrice(EntityUid uid, CargoBountyLabelComponent component
             return;
 
         // make sure this label was actually applied to a crate.
-        if (!_container.TryGetContainingContainer(uid, out var container) || container.ID != LabelSystem.ContainerName)
+        if (!_container.TryGetContainingContainer((uid, null, null), out var container) || container.ID != LabelSystem.ContainerName)
             return;
 
         if (component.AssociatedStationId is not { } station || !TryComp<StationCargoBountyDatabaseComponent>(station, out var database))
diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs
index a33c944c994..7f8253efedf 100644
--- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs
@@ -142,7 +142,7 @@ public override void Update(float frameTime)
 
                 // This is awful. I hate this so much.
                 // TODO: Please, someone refactor containers and free me from this bullshit.
-                if (!_container.TryGetContainingContainer(uid, out var containerManager) ||
+                if (!_container.TryGetContainingContainer((uid, null, null), out var containerManager) ||
                     !(_inventorySystem.TryGetSlotEntity(containerManager.Owner, "mask", out var inMaskSlotUid) && inMaskSlotUid == uid) ||
                     !TryComp(containerManager.Owner, out BloodstreamComponent? bloodstream))
                 {
diff --git a/Content.Server/PDA/PdaSystem.cs b/Content.Server/PDA/PdaSystem.cs
index d4934ee24e5..f75fd9920f3 100644
--- a/Content.Server/PDA/PdaSystem.cs
+++ b/Content.Server/PDA/PdaSystem.cs
@@ -121,7 +121,7 @@ private void OnNotification(Entity<PdaComponent> ent, ref CartridgeLoaderNotific
         {
             _ringer.RingerPlayRingtone(ent.Owner);
 
-            if (!_containerSystem.TryGetContainingContainer(ent, out var container)
+            if (!_containerSystem.TryGetContainingContainer((ent, null, null), out var container)
                 || !TryComp<ActorComponent>(container.Owner, out var actor))
                 return;
 
diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.cs
index 5c970b1a748..913299eea91 100644
--- a/Content.Server/Polymorph/Systems/PolymorphSystem.cs
+++ b/Content.Server/Polymorph/Systems/PolymorphSystem.cs
@@ -226,7 +226,7 @@ private void OnDestruction(Entity<PolymorphedEntityComponent> ent, ref Destructi
         var childXform = Transform(child);
         _transform.SetLocalRotation(child, targetTransformComp.LocalRotation, childXform);
 
-        if (_container.TryGetContainingContainer(uid, out var cont))
+        if (_container.TryGetContainingContainer((uid, targetTransformComp, null), out var cont))
             _container.Insert(child, cont);
 
         //Transfers all damage from the original to the new one
diff --git a/Content.Server/PowerCell/PowerCellSystem.cs b/Content.Server/PowerCell/PowerCellSystem.cs
index 0d2d9012bc7..f7b4cf02491 100644
--- a/Content.Server/PowerCell/PowerCellSystem.cs
+++ b/Content.Server/PowerCell/PowerCellSystem.cs
@@ -64,11 +64,11 @@ private void OnChargeChanged(EntityUid uid, PowerCellComponent component, ref Ch
         }
 
         var frac = args.Charge / args.MaxCharge;
-        var level = (byte) ContentHelpers.RoundToNearestLevels(frac, 1, PowerCellComponent.PowerCellVisualsLevels);
+        var level = (byte)ContentHelpers.RoundToNearestLevels(frac, 1, PowerCellComponent.PowerCellVisualsLevels);
         _sharedAppearanceSystem.SetData(uid, PowerCellVisuals.ChargeLevel, level);
 
         // If this power cell is inside a cell-slot, inform that entity that the power has changed (for updating visuals n such).
-        if (_containerSystem.TryGetContainingContainer(uid, out var container)
+        if (_containerSystem.TryGetContainingContainer((uid, null, null), out var container)
             && TryComp(container.Owner, out PowerCellSlotComponent? slot)
             && _itemSlotsSystem.TryGetSlot(container.Owner, slot.CellSlotId, out var itemSlot))
         {
diff --git a/Content.Server/Resist/EscapeInventorySystem.cs b/Content.Server/Resist/EscapeInventorySystem.cs
index 2e060b1b42d..a6eb703ab0f 100644
--- a/Content.Server/Resist/EscapeInventorySystem.cs
+++ b/Content.Server/Resist/EscapeInventorySystem.cs
@@ -56,7 +56,7 @@ private void OnRelayMovement(EntityUid uid, CanEscapeInventoryComponent componen
         if (!args.HasDirectionalMovement)
             return;
 
-        if (!_containerSystem.TryGetContainingContainer(uid, out var container) || !_actionBlockerSystem.CanInteract(uid, container.Owner))
+        if (!_containerSystem.TryGetContainingContainer((uid, null, null), out var container) || !_actionBlockerSystem.CanInteract(uid, container.Owner))
             return;
 
         // Make sure there's nothing stopped the removal (like being glued)
diff --git a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
index c74a3c49d63..2aec9a45ad1 100644
--- a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
@@ -97,7 +97,7 @@ public void Update(EntityUid uid, EventHorizonComponent? eventHorizon = null, Tr
             return;
 
         // Handle singularities some admin smited into a locker.
-        if (_containerSystem.TryGetContainingContainer(uid, out var container, transform: xform)
+        if (_containerSystem.TryGetContainingContainer((uid, xform, null), out var container)
         && !AttemptConsumeEntity(uid, container.Owner, eventHorizon))
         {
             // Locker is indestructible. Consume everything else in the locker instead of magically teleporting out.
@@ -214,7 +214,7 @@ public void ConsumeEntitiesInContainer(EntityUid hungry, BaseContainer container
                 if (_containerSystem.Insert(entity, target_container))
                     break;
 
-                _containerSystem.TryGetContainingContainer(target_container.Owner, out target_container);
+                _containerSystem.TryGetContainingContainer((target_container.Owner, null, null), out target_container);
             }
 
             // If we couldn't or there was no container to insert into just dump them to the map/grid.
@@ -470,7 +470,7 @@ private void OnContainerConsumed(EntityUid uid, ContainerManagerComponent comp,
     {
         var drop_container = args.Container;
         if (drop_container is null)
-            _containerSystem.TryGetContainingContainer(uid, out drop_container);
+            _containerSystem.TryGetContainingContainer((uid, null, null), out drop_container);
 
         foreach (var container in comp.GetAllContainers())
         {
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
index 9c9fdc57276..a67d4b1f7fa 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
@@ -148,7 +148,7 @@ public bool InsertOrgan(
     /// </summary>
     public bool RemoveOrgan(EntityUid organId, OrganComponent? organ = null)
     {
-        if (!Containers.TryGetContainingContainer(organId, out var container))
+        if (!Containers.TryGetContainingContainer((organId, null, null), out var container))
             return false;
 
         var parent = container.Owner;
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
index dc088542279..36a650863e4 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
@@ -379,7 +379,7 @@ private void DisablePart(Entity<BodyPartComponent> partEnt)
     /// </summary>
     public EntityUid? GetParentPartOrNull(EntityUid uid)
     {
-        if (!Containers.TryGetContainingContainer(uid, out var container))
+        if (!Containers.TryGetContainingContainer((uid, null, null), out var container))
             return null;
 
         var parent = container.Owner;
@@ -395,7 +395,7 @@ private void DisablePart(Entity<BodyPartComponent> partEnt)
     /// </summary>
     public (EntityUid Parent, string Slot)? GetParentPartAndSlotOrNull(EntityUid uid)
     {
-        if (!Containers.TryGetContainingContainer(uid, out var container))
+        if (!Containers.TryGetContainingContainer((uid, null, null), out var container))
             return null;
 
         var slotId = GetPartSlotContainerIdFromContainer(container.ID);
@@ -425,7 +425,7 @@ public bool TryGetParentBodyPart(
         parentUid = null;
         parentComponent = null;
 
-        if (Containers.TryGetContainingContainer(partUid, out var container) &&
+        if (Containers.TryGetContainingContainer((partUid, null, null), out var container) &&
             TryComp(container.Owner, out parentComponent))
         {
             parentUid = container.Owner;
diff --git a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs
index c89ab827e67..670bf99ef90 100644
--- a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs
+++ b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs
@@ -51,7 +51,7 @@ private void OnHandleState(EntityUid uid, ClothingSpeedModifierComponent compone
 
         // Avoid raising the event for the container if nothing changed.
         // We'll still set the values in case they're slightly different but within tolerance.
-        if (diff && _container.TryGetContainingContainer(uid, out var container))
+        if (diff && _container.TryGetContainingContainer((uid, null, null), out var container))
         {
             _movementSpeed.RefreshMovementSpeedModifiers(container.Owner);
         }
@@ -115,7 +115,7 @@ private void OnToggled(Entity<ClothingSpeedModifierComponent> ent, ref ItemToggl
         // make sentient boots slow or fast too
         _movementSpeed.RefreshMovementSpeedModifiers(ent);
 
-        if (_container.TryGetContainingContainer(ent.Owner, out var container))
+        if (_container.TryGetContainingContainer((ent.Owner, null, null), out var container))
         {
             // inventory system will automatically hook into the event raised by this and update accordingly
             _movementSpeed.RefreshMovementSpeedModifiers(container.Owner);
diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
index 9e3f917e96f..d03cd095bb7 100644
--- a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
@@ -165,7 +165,7 @@ private void OnHandleState(EntityUid uid, ClothingComponent component, ref Compo
         if (args.Current is ClothingComponentState state)
         {
             SetEquippedPrefix(uid, state.EquippedPrefix, component);
-            if (component.InSlot != null && _containerSys.TryGetContainingContainer(uid, out var container))
+            if (component.InSlot != null && _containerSys.TryGetContainingContainer((uid, null, null), out var container))
             {
                 CheckEquipmentForLayerHide(uid, container.Owner);
             }
diff --git a/Content.Shared/Clothing/MagbootsSystem.cs b/Content.Shared/Clothing/MagbootsSystem.cs
index 88d987aae18..d41f27fefb0 100644
--- a/Content.Shared/Clothing/MagbootsSystem.cs
+++ b/Content.Shared/Clothing/MagbootsSystem.cs
@@ -36,7 +36,7 @@ private void OnToggled(Entity<MagbootsComponent> ent, ref ItemToggledEvent args)
     {
         var (uid, comp) = ent;
         // only stick to the floor if being worn in the correct slot
-        if (_container.TryGetContainingContainer(uid, out var container) &&
+        if (_container.TryGetContainingContainer((uid, null, null), out var container) &&
             _inventory.TryGetSlotEntity(container.Owner, comp.Slot, out var worn)
             && uid == worn)
         {
diff --git a/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs b/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs
index c13ec0a1b9f..78e86f5ab42 100644
--- a/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs
@@ -37,7 +37,7 @@ public override void Update(float frameTime)
         {
             if (!component.Enabled || component.NextDamage > _timing.CurTime)
                 continue;
-            if (_container.TryGetContainingContainer(uid, out var container))
+            if (_container.TryGetContainingContainer((uid, null, null), out var container))
             {
                 _damageableSystem.TryChangeDamage(container.Owner, component.Damage, origin: uid);
             }
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 32d69dc8e73..53a66e5ada5 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -1226,7 +1226,7 @@ public bool IsAccessible(Entity<TransformComponent?> user, Entity<TransformCompo
         /// </summary>
         public bool CanAccessViaStorage(EntityUid user, EntityUid target)
         {
-            if (!_containerSystem.TryGetContainingContainer(target, out var container))
+            if (!_containerSystem.TryGetContainingContainer((target, null, null), out var container))
                 return false;
 
             return CanAccessViaStorage(user, target, container);
@@ -1252,7 +1252,7 @@ public bool CanAccessEquipment(EntityUid user, EntityUid target)
             if (Deleted(target))
                 return false;
 
-            if (!_containerSystem.TryGetContainingContainer(target, out var container))
+            if (!_containerSystem.TryGetContainingContainer((target, null, null), out var container))
                 return false;
 
             var wearer = container.Owner;
diff --git a/Content.Shared/Item/SharedItemSystem.cs b/Content.Shared/Item/SharedItemSystem.cs
index 5eaa25f4847..a058cb86588 100644
--- a/Content.Shared/Item/SharedItemSystem.cs
+++ b/Content.Shared/Item/SharedItemSystem.cs
@@ -110,8 +110,8 @@ private void AddPickupVerb(EntityUid uid, ItemComponent component, GetVerbsEvent
 
         // if the item already in a container (that is not the same as the user's), then change the text.
         // this occurs when the item is in their inventory or in an open backpack
-        Container.TryGetContainingContainer(args.User, out var userContainer);
-        if (Container.TryGetContainingContainer(args.Target, out var container) && container != userContainer)
+        Container.TryGetContainingContainer((args.User, null, null), out var userContainer);
+        if (Container.TryGetContainingContainer((args.Target, null, null), out var container) && container != userContainer)
             verb.Text = Loc.GetString("pick-up-verb-get-data-text-inventory");
         else
             verb.Text = Loc.GetString("pick-up-verb-get-data-text");
diff --git a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
index cd4ae2e7676..d57eea7e3ed 100644
--- a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
+++ b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
@@ -100,7 +100,7 @@ public bool TryStartProcessItem(EntityUid uid, EntityUid item, MaterialReclaimer
         if (component.Blacklist is {} blacklist && blacklist.IsValid(item))
             return false;
 
-        if (Container.TryGetContainingContainer(item, out _) && !Container.TryRemoveFromContainer(item))
+        if (Container.TryGetContainingContainer((item, null, null), out _) && !Container.TryRemoveFromContainer(item))
             return false;
 
         if (user != null)
diff --git a/Content.Shared/Movement/Systems/SharedJetpackSystem.cs b/Content.Shared/Movement/Systems/SharedJetpackSystem.cs
index 8d358f8db39..8eb943d7153 100644
--- a/Content.Shared/Movement/Systems/SharedJetpackSystem.cs
+++ b/Content.Shared/Movement/Systems/SharedJetpackSystem.cs
@@ -15,12 +15,12 @@ namespace Content.Shared.Movement.Systems;
 
 public abstract class SharedJetpackSystem : EntitySystem
 {
-    [Dependency] private   readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
-    [Dependency] protected  readonly SharedAppearanceSystem Appearance = default!;
+    [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
+    [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
     [Dependency] protected readonly SharedContainerSystem Container = default!;
-    [Dependency] private   readonly SharedMoverController _mover = default!;
-    [Dependency] private   readonly SharedPopupSystem _popup = default!;
-    [Dependency] private   readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] private readonly SharedMoverController _mover = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
     [Dependency] private readonly IConfigurationManager _config = default!;
 
@@ -164,7 +164,7 @@ public void SetEnabled(EntityUid uid, JetpackComponent component, bool enabled,
 
         if (user == null)
         {
-            Container.TryGetContainingContainer(uid, out var container);
+            Container.TryGetContainingContainer((uid, null, null), out var container);
             user = container?.Owner;
         }
 
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index fad9d724388..d5449e88f8a 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -1408,7 +1408,7 @@ private void OnLockToggled(EntityUid uid, StorageComponent component, ref LockTo
 
     private void OnStackCountChanged(EntityUid uid, MetaDataComponent component, StackCountChangedEvent args)
     {
-        if (_containerSystem.TryGetContainingContainer(uid, out var container, component) &&
+        if (_containerSystem.TryGetContainingContainer((uid, null, component), out var container) &&
             container.ID == StorageComponent.ContainerId)
         {
             UpdateAppearance(container.Owner);
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs
index 77ee419ac3b..78386e89519 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs
@@ -33,7 +33,7 @@ private bool TryGetClothingSlotEntity(EntityUid uid, ClothingSlotAmmoProviderCom
     {
         slotEntity = null;
 
-        if (!Containers.TryGetContainingContainer(uid, out var container))
+        if (!Containers.TryGetContainingContainer((uid, null, null), out var container))
             return false;
         var user = container.Owner;
 

From 1e4cb00770c0b40e3857c847be8763e8a7826ddc Mon Sep 17 00:00:00 2001
From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Date: Sat, 10 Aug 2024 19:29:44 -0700
Subject: [PATCH 009/366] Add a component that inserts the held item when no
 interaction happens on the stored item (#29823)

* Insert when held item has no interaction with stored item

* Decouple inserting on failure

* Add component that stores the used entity when no interaction happened

* Add prediction
---
 .../Interaction/SharedInteractionSystem.cs    | 67 +++++++++++++------
 .../StoreAfterFailedInteractComponent.cs      |  8 +++
 .../EntitySystems/SharedStorageSystem.cs      | 40 ++++++-----
 .../StoreAfterFailedInteractSystem.cs         | 21 ++++++
 .../Events/StorageInsertFailedEvent.cs        |  6 ++
 5 files changed, 105 insertions(+), 37 deletions(-)
 create mode 100644 Content.Shared/Storage/Components/StoreAfterFailedInteractComponent.cs
 create mode 100644 Content.Shared/Storage/EntitySystems/StoreAfterFailedInteractSystem.cs
 create mode 100644 Content.Shared/Storage/Events/StorageInsertFailedEvent.cs

diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 53a66e5ada5..d325de92c83 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -956,11 +956,21 @@ public bool RangedInteractDoBefore(
         }
 
         /// <summary>
-        /// Uses a item/object on an entity
+        /// Uses an item/object on an entity
         /// Finds components with the InteractUsing interface and calls their function
         /// NOTE: Does not have an InRangeUnobstructed check
         /// </summary>
-        public void InteractUsing(
+        /// <param name="user">User doing the interaction.</param>
+        /// <param name="used">Item being used on the <paramref name="target"/>.</param>
+        /// <param name="target">Entity getting interacted with by the <paramref name="user"/> using the
+        ///     <paramref name="used"/> entity.</param>
+        /// <param name="clickLocation">The location that the <paramref name="user"/> clicked.</param>
+        /// <param name="checkCanInteract">Whether to check that the <paramref name="user"/> can interact with the
+        ///     <paramref name="target"/>.</param>
+        /// <param name="checkCanUse">Whether to check that the <paramref name="user"/> can use the
+        ///     <paramref name="used"/> entity.</param>
+        /// <returns>True if the interaction was handled. Otherwise, false.</returns>
+        public bool InteractUsing(
             EntityUid user,
             EntityUid used,
             EntityUid target,
@@ -972,13 +982,21 @@ public void InteractUsing(
                 return;
 
             if (checkCanInteract && !_actionBlockerSystem.CanInteract(user, target))
-                return;
+                return false;
+
+            if (checkCanInteract && !_actionBlockerSystem.CanInteract(user, target))
+                return false;
 
             if (checkCanUse && !_actionBlockerSystem.CanUseHeldEntity(user, used))
-                return;
+                return false;
+
+            _adminLogger.Add(
+                LogType.InteractUsing,
+                LogImpact.Low,
+                $"{ToPrettyString(user):user} interacted with {ToPrettyString(target):target} using {ToPrettyString(used):used}");
 
             if (RangedInteractDoBefore(user, used, target, clickLocation, true))
-                return;
+                return true;
 
             // all interactions should only happen when in range / unobstructed, so no range check is needed
             var interactUsingEvent = new InteractUsingEvent(user, used, target, clickLocation);
@@ -987,42 +1005,44 @@ public void InteractUsing(
             DoContactInteraction(user, target, interactUsingEvent);
             // Contact interactions are currently only used for forensics, so we don't raise used -> target
             if (interactUsingEvent.Handled)
-                return;
+                return true;
 
-            InteractDoAfter(user, used, target, clickLocation, canReach: true);
+            if (InteractDoAfter(user, used, target, clickLocation, canReach: true))
+                return true;
+            return false;
         }
 
         /// <summary>
         ///     Used when clicking on an entity resulted in no other interaction. Used for low-priority interactions.
         /// </summary>
-        public void InteractDoAfter(
-            EntityUid user,
-            EntityUid used,
-            EntityUid? target,
-            EntityCoordinates clickLocation,
-            bool canReach,
-            bool checkDeletion = false
-        )
+        /// <param name="user"><inheritdoc cref="InteractUsing"/></param>
+        /// <param name="used"><inheritdoc cref="InteractUsing"/></param>
+        /// <param name="target"><inheritdoc cref="InteractUsing"/></param>
+        /// <param name="clickLocation"><inheritdoc cref="InteractUsing"/></param>
+        /// <param name="canReach">Whether the <paramref name="user"/> is in range of the <paramref name="target"/>.
+        ///     </param>
+        /// <returns>True if the interaction was handled. Otherwise, false.</returns>
+        public bool InteractDoAfter(EntityUid user, EntityUid used, EntityUid? target, EntityCoordinates clickLocation, bool canReach)
         {
             if (target is { Valid: false })
                 target = null;
 
             if (checkDeletion && (IsDeleted(user) || IsDeleted(used) || IsDeleted(target)))
-                return;
+                return false;
 
             var afterInteractEvent = new AfterInteractEvent(user, used, target, clickLocation, canReach);
             RaiseLocalEvent(used, afterInteractEvent);
             DoContactInteraction(user, used, afterInteractEvent);
+
             if (canReach)
                 DoContactInteraction(user, target, afterInteractEvent);
-                // Contact interactions are currently only used for forensics, so we don't raise used -> target
-            }
+            // Contact interactions are currently only used for forensics, so we don't raise used -> target
 
             if (afterInteractEvent.Handled)
-                return;
+                return true;
 
             if (target == null)
-                return;
+                return false;
 
             var afterInteractUsingEvent = new AfterInteractUsingEvent(user, used, target, clickLocation, canReach);
             RaiseLocalEvent(target.Value, afterInteractUsingEvent);
@@ -1030,8 +1050,11 @@ public void InteractDoAfter(
             DoContactInteraction(user, used, afterInteractUsingEvent);
             if (canReach)
                 DoContactInteraction(user, target, afterInteractUsingEvent);
-                // Contact interactions are currently only used for forensics, so we don't raise used -> target
-            }
+            // Contact interactions are currently only used for forensics, so we don't raise used -> target
+            
+            if (afterInteractUsingEvent.Handled)
+                return true;
+            return false;
         }
 
         #region ActivateItemInWorld
diff --git a/Content.Shared/Storage/Components/StoreAfterFailedInteractComponent.cs b/Content.Shared/Storage/Components/StoreAfterFailedInteractComponent.cs
new file mode 100644
index 00000000000..578da52dfc1
--- /dev/null
+++ b/Content.Shared/Storage/Components/StoreAfterFailedInteractComponent.cs
@@ -0,0 +1,8 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Storage.Components;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class StoreAfterFailedInteractComponent : Component
+{
+}
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index d5449e88f8a..9fd8bdf5e7b 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -21,6 +21,7 @@
 using Content.Shared.Stacks;
 using Content.Shared.Storage.Components;
 using Content.Shared.Timing;
+using Content.Shared.Storage.Events;
 using Content.Shared.Verbs;
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio.Systems;
@@ -350,7 +351,7 @@ private void OnInteractUsing(EntityUid uid, StorageComponent storageComp, Intera
         if (HasComp<PlaceableSurfaceComponent>(uid))
             return;
 
-        PlayerInsertHeldEntity(uid, args.User, storageComp);
+        PlayerInsertHeldEntity((uid, storageComp), args.User);
         // Always handle it, even if insertion fails.
         // We don't want to trigger any AfterInteract logic here.
         // Example issue would be placing wires if item doesn't fit in backpack.
@@ -597,7 +598,15 @@ private void OnInteractWithItem(StorageInteractWithItemEvent msg, EntitySessionE
         }
 
         // Else, interact using the held item
-        _interactionSystem.InteractUsing(player, hands.ActiveHandEntity.Value, entity, Transform(entity).Coordinates, checkCanInteract: false);
+        if (_interactionSystem.InteractUsing(player,
+                player.Comp.ActiveHandEntity.Value,
+                item,
+                Transform(item).Coordinates,
+                checkCanInteract: false))
+            return;
+
+        var failedEv = new StorageInsertFailedEvent((storage, storage.Comp), (player, player.Comp));
+        RaiseLocalEvent(storage, ref failedEv);
     }
 
     private void OnSetItemLocation(StorageSetItemLocationEvent msg, EntitySessionEventArgs args)
@@ -1039,35 +1048,36 @@ public bool Insert(
     /// <summary>
     ///     Inserts an entity into storage from the player's active hand
     /// </summary>
-    /// <param name="uid"></param>
-    /// <param name="player">The player to insert an entity from</param>
-    /// <param name="storageComp"></param>
-    /// <returns>true if inserted, false otherwise</returns>
-    public bool PlayerInsertHeldEntity(EntityUid uid, EntityUid player, StorageComponent? storageComp = null)
+    /// <param name="ent">The storage entity and component to insert into.</param>
+    /// <param name="player">The player and hands component to insert the held entity from.</param>
+    /// <returns>True if inserted, otherwise false.</returns>
+    public bool PlayerInsertHeldEntity(Entity<StorageComponent?> ent, Entity<HandsComponent?> player)
     {
-        if (!Resolve(uid, ref storageComp) || !TryComp(player, out HandsComponent? hands) || hands.ActiveHandEntity == null)
+        if (!Resolve(ent.Owner, ref ent.Comp)
+            || !Resolve(player.Owner, ref player.Comp)
+            || player.Comp.ActiveHandEntity == null)
             return false;
 
-        var toInsert = hands.ActiveHandEntity;
+        var toInsert = player.Comp.ActiveHandEntity;
 
-        if (!CanInsert(uid, toInsert.Value, out var reason, storageComp))
+        if (!CanInsert(ent, toInsert.Value, out var reason, ent.Comp))
         {
-            _popupSystem.PopupClient(Loc.GetString(reason ?? "comp-storage-cant-insert"), uid, player);
+            _popupSystem.PopupClient(Loc.GetString(reason ?? "comp-storage-cant-insert"), ent, player);
             return false;
         }
 
-        if (!_sharedHandsSystem.CanDrop(player, toInsert.Value, hands))
+        if (!_sharedHandsSystem.CanDrop(player, toInsert.Value, player.Comp))
         {
-            _popupSystem.PopupClient(Loc.GetString("comp-storage-cant-drop", ("entity", toInsert.Value)), uid, player);
+            _popupSystem.PopupClient(Loc.GetString("comp-storage-cant-drop", ("entity", toInsert.Value)), ent, player);
             return false;
         }
 
-        return PlayerInsertEntityInWorld((uid, storageComp), player, toInsert.Value);
+        return PlayerInsertEntityInWorld((ent, ent.Comp), player, toInsert.Value);
     }
 
     /// <summary>
     ///     Inserts an Entity (<paramref name="toInsert"/>) in the world into storage, informing <paramref name="player"/> if it fails.
-    ///     <paramref name="toInsert"/> is *NOT* held, see <see cref="PlayerInsertHeldEntity(EntityUid,EntityUid,StorageComponent)"/>.
+    ///     <paramref name="toInsert"/> is *NOT* held, see <see cref="PlayerInsertHeldEntity(Entity{StorageComponent?},Entity{HandsComponent?})"/>.
     /// </summary>
     /// <param name="uid"></param>
     /// <param name="player">The player to insert an entity with</param>
diff --git a/Content.Shared/Storage/EntitySystems/StoreAfterFailedInteractSystem.cs b/Content.Shared/Storage/EntitySystems/StoreAfterFailedInteractSystem.cs
new file mode 100644
index 00000000000..77f72806f4b
--- /dev/null
+++ b/Content.Shared/Storage/EntitySystems/StoreAfterFailedInteractSystem.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Storage.Components;
+using Content.Shared.Storage.Events;
+
+namespace Content.Shared.Storage.EntitySystems;
+
+public sealed class StoreAfterFailedInteractSystem : EntitySystem
+{
+    [Dependency] private readonly SharedStorageSystem _storage = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<StoreAfterFailedInteractComponent, StorageInsertFailedEvent>(OnStorageInsertFailed);
+    }
+
+    private void OnStorageInsertFailed(Entity<StoreAfterFailedInteractComponent> ent, ref StorageInsertFailedEvent args)
+    {
+        _storage.PlayerInsertHeldEntity(args.Storage, args.Player);
+    }
+}
diff --git a/Content.Shared/Storage/Events/StorageInsertFailedEvent.cs b/Content.Shared/Storage/Events/StorageInsertFailedEvent.cs
new file mode 100644
index 00000000000..50f759e43fd
--- /dev/null
+++ b/Content.Shared/Storage/Events/StorageInsertFailedEvent.cs
@@ -0,0 +1,6 @@
+using Content.Shared.Hands.Components;
+
+namespace Content.Shared.Storage.Events;
+
+[ByRefEvent]
+public record struct StorageInsertFailedEvent(Entity<StorageComponent?> Storage, Entity<HandsComponent?> Player);

From 89c061be103501c25c3ce1d58c9db683d24854fd Mon Sep 17 00:00:00 2001
From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Date: Wed, 29 May 2024 23:46:22 -0700
Subject: [PATCH 010/366] meow

---
 .../Components/ApcPowerReceiverComponent.cs   |  8 +++
 .../EntitySystems/PowerReceiverSystem.cs      | 23 ++++++++
 .../Components/ApcPowerReceiverComponent.cs   | 18 +++----
 .../Power/EntitySystems/PowerNetSystem.cs     | 21 +++++---
 .../EntitySystems/PowerReceiverSystem.cs      | 52 ++++++-------------
 .../ApcPowerReceiverComponentState.cs         |  9 ++++
 .../SharedApcPowerReceiverComponent.cs        | 10 ++++
 .../SharedPowerReceiverSystem.cs              |  6 +++
 8 files changed, 92 insertions(+), 55 deletions(-)
 create mode 100644 Content.Client/Power/Components/ApcPowerReceiverComponent.cs
 create mode 100644 Content.Client/Power/EntitySystems/PowerReceiverSystem.cs
 create mode 100644 Content.Shared/Power/Components/ApcPowerReceiverComponentState.cs
 create mode 100644 Content.Shared/Power/Components/SharedApcPowerReceiverComponent.cs
 create mode 100644 Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs

diff --git a/Content.Client/Power/Components/ApcPowerReceiverComponent.cs b/Content.Client/Power/Components/ApcPowerReceiverComponent.cs
new file mode 100644
index 00000000000..fbebcb7cf83
--- /dev/null
+++ b/Content.Client/Power/Components/ApcPowerReceiverComponent.cs
@@ -0,0 +1,8 @@
+using Content.Shared.Power.Components;
+
+namespace Content.Client.Power.Components;
+
+[RegisterComponent]
+public sealed partial class ApcPowerReceiverComponent : SharedApcPowerReceiverComponent
+{
+}
diff --git a/Content.Client/Power/EntitySystems/PowerReceiverSystem.cs b/Content.Client/Power/EntitySystems/PowerReceiverSystem.cs
new file mode 100644
index 00000000000..4d56592c232
--- /dev/null
+++ b/Content.Client/Power/EntitySystems/PowerReceiverSystem.cs
@@ -0,0 +1,23 @@
+using Content.Client.Power.Components;
+using Content.Shared.Power.Components;
+using Content.Shared.Power.EntitySystems;
+using Robust.Shared.GameStates;
+
+namespace Content.Client.Power.EntitySystems;
+
+public sealed class PowerReceiverSystem : SharedPowerReceiverSystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<ApcPowerReceiverComponent, ComponentHandleState>(OnHandleState);
+    }
+
+    private void OnHandleState(EntityUid uid, ApcPowerReceiverComponent component, ref ComponentHandleState args)
+    {
+        if (args.Current is not ApcPowerReceiverComponentState state)
+            return;
+
+        component.Powered = state.Powered;
+    }
+}
diff --git a/Content.Server/Power/Components/ApcPowerReceiverComponent.cs b/Content.Server/Power/Components/ApcPowerReceiverComponent.cs
index b8340d0be4b..9a68e2aabb8 100644
--- a/Content.Server/Power/Components/ApcPowerReceiverComponent.cs
+++ b/Content.Server/Power/Components/ApcPowerReceiverComponent.cs
@@ -1,5 +1,6 @@
 using Content.Server.Power.NodeGroups;
 using Content.Server.Power.Pow3r;
+using Content.Shared.Power.Components;
 
 namespace Content.Server.Power.Components
 {
@@ -8,11 +9,8 @@ namespace Content.Server.Power.Components
     ///     so that it can receive power from a <see cref="IApcNet"/>.
     /// </summary>
     [RegisterComponent]
-    public sealed partial class ApcPowerReceiverComponent : Component
+    public sealed partial class ApcPowerReceiverComponent : SharedApcPowerReceiverComponent
     {
-        [ViewVariables]
-        public bool Powered => (MathHelper.CloseToPercent(NetworkLoad.ReceivingPower, Load) || !NeedsPower) && !PowerDisabled;
-
         /// <summary>
         ///     Amount of charge this needs from an APC per second to function.
         /// </summary>
@@ -33,7 +31,7 @@ public bool NeedsPower
             {
                 _needsPower = value;
                 // Reset this so next tick will do a power update.
-                PoweredLastUpdate = null;
+                Recalculate = true;
             }
         }
 
@@ -50,7 +48,8 @@ public bool PowerDisabled {
             set => NetworkLoad.Enabled = !value;
         }
 
-        public bool? PoweredLastUpdate;
+        // TODO Is this needed? It forces a PowerChangedEvent when NeedsPower is toggled even if it changes to the same state.
+        public bool Recalculate;
 
         [ViewVariables]
         public PowerState.Load NetworkLoad { get; } = new PowerState.Load
@@ -66,10 +65,5 @@ public bool PowerDisabled {
     /// Does nothing on the client.
     /// </summary>
     [ByRefEvent]
-    public readonly record struct PowerChangedEvent(bool Powered, float ReceivingPower)
-    {
-        public readonly bool Powered = Powered;
-        public readonly float ReceivingPower = ReceivingPower;
-    }
-
+    public readonly record struct PowerChangedEvent(bool Powered, float ReceivingPower);
 }
diff --git a/Content.Server/Power/EntitySystems/PowerNetSystem.cs b/Content.Server/Power/EntitySystems/PowerNetSystem.cs
index 2d80c810e2e..6c35ba20083 100644
--- a/Content.Server/Power/EntitySystems/PowerNetSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerNetSystem.cs
@@ -22,6 +22,7 @@ public sealed class PowerNetSystem : EntitySystem
         [Dependency] private readonly PowerNetConnectorSystem _powerNetConnector = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly IParallelManager _parMan = default!;
+        [Dependency] private readonly PowerReceiverSystem _powerReceiver = default!;
 
         private readonly PowerState _powerState = new();
         private readonly HashSet<PowerNet> _powerNetReconnectQueue = new();
@@ -313,19 +314,27 @@ private void UpdateApcPowerReceiver()
             var enumerator = AllEntityQuery<ApcPowerReceiverComponent>();
             while (enumerator.MoveNext(out var uid, out var apcReceiver))
             {
-                var powered = apcReceiver.Powered;
-                if (powered == apcReceiver.PoweredLastUpdate)
+                var powered = !apcReceiver.PowerDisabled
+                              && (!apcReceiver.NeedsPower
+                                  || MathHelper.CloseToPercent(apcReceiver.NetworkLoad.ReceivingPower,
+                                      apcReceiver.Load));
+
+                // If new value is the same as the old, then exit
+                if (!apcReceiver.Recalculate && apcReceiver.Powered == powered)
                     continue;
 
-                if (metaQuery.GetComponent(uid).EntityPaused)
+                var metadata = metaQuery.Comp(uid);
+                if (metadata.EntityPaused)
                     continue;
 
-                apcReceiver.PoweredLastUpdate = powered;
-                var ev = new PowerChangedEvent(apcReceiver.Powered, apcReceiver.NetworkLoad.ReceivingPower);
+                apcReceiver.Recalculate = false;
+                apcReceiver.Powered = powered;
+                Dirty(uid, apcReceiver, metadata);
 
+                var ev = new PowerChangedEvent(powered, apcReceiver.NetworkLoad.ReceivingPower);
                 RaiseLocalEvent(uid, ref ev);
 
-                if (appearanceQuery.TryGetComponent(uid, out var appearance))
+                if (appearanceQuery.TryComp(uid, out var appearance))
                     _appearance.SetData(uid, PowerDeviceVisuals.Powered, powered, appearance);
             }
         }
diff --git a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
index 9ba30813dd5..0a5d475f27f 100644
--- a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
@@ -7,10 +7,13 @@
 using Content.Shared.Examine;
 using Content.Shared.Hands.Components;
 using Content.Shared.Power;
+using Content.Shared.Power.Components;
+using Content.Shared.Power.EntitySystems;
 using Content.Shared.Verbs;
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
 using Robust.Shared.Utility;
 using Content.Shared.Emp;
 using Content.Shared.Interaction;
@@ -18,7 +21,7 @@
 
 namespace Content.Server.Power.EntitySystems
 {
-    public sealed class PowerReceiverSystem : EntitySystem
+    public sealed class PowerReceiverSystem : SharedPowerReceiverSystem
     {
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
         [Dependency] private readonly IAdminManager _adminManager = default!;
@@ -43,8 +46,7 @@ public override void Initialize()
             SubscribeLocalEvent<ApcPowerReceiverComponent, GetVerbsEvent<Verb>>(OnGetVerbs);
             SubscribeLocalEvent<PowerSwitchComponent, GetVerbsEvent<AlternativeVerb>>(AddSwitchPowerVerb);
 
-            SubscribeLocalEvent<ApcPowerReceiverComponent, EmpPulseEvent>(OnEmpPulse);
-            SubscribeLocalEvent<ApcPowerReceiverComponent, EmpDisabledRemoved>(OnEmpEnd);
+            SubscribeLocalEvent<ApcPowerReceiverComponent, ComponentGetState>(OnGetState);
 
             _recQuery = GetEntityQuery<ApcPowerReceiverComponent>();
             _provQuery = GetEntityQuery<ApcPowerProviderComponent>();
@@ -151,14 +153,18 @@ private void AddSwitchPowerVerb(EntityUid uid, PowerSwitchComponent component, G
             args.Verbs.Add(verb);
         }
 
+        private void OnGetState(EntityUid uid, ApcPowerReceiverComponent component, ref ComponentGetState args)
+        {
+            args.State = new ApcPowerReceiverComponentState
+            {
+                Powered = component.Powered
+            };
+        }
+
         private void ProviderChanged(Entity<ApcPowerReceiverComponent> receiver)
         {
             var comp = receiver.Comp;
             comp.NetworkLoad.LinkedNetwork = default;
-            var ev = new PowerChangedEvent(comp.Powered, comp.NetworkLoad.ReceivingPower);
-
-            RaiseLocalEvent(receiver, ref ev);
-            _appearance.SetData(receiver, PowerDeviceVisuals.Powered, comp.Powered);
         }
 
         /// <summary>
@@ -166,12 +172,10 @@ private void ProviderChanged(Entity<ApcPowerReceiverComponent> receiver)
         /// Otherwise, it returns 'true' because if something doesn't take power
         /// it's effectively always powered.
         /// </summary>
+        /// <returns>True when entity has no ApcPowerReceiverComponent or is Powered. False when not.</returns>
         public bool IsPowered(EntityUid uid, ApcPowerReceiverComponent? receiver = null)
         {
-            if (!_recQuery.Resolve(uid, ref receiver, false))
-                return true;
-
-            return receiver.Powered;
+            return !_recQuery.Resolve(uid, ref receiver, false) || receiver.Powered;
         }
 
         /// <summary>
@@ -204,35 +208,9 @@ public bool TogglePower(EntityUid uid, bool playSwitchSound = true, ApcPowerRece
             return !receiver.PowerDisabled; // i.e. PowerEnabled
         }
 
-        public bool TryTogglePower(EntityUid uid, bool playSwitchSound = true, ApcPowerReceiverComponent? receiver = null, EntityUid? user = null)
-        {
-            if (HasComp<EmpDisabledComponent>(uid))
-                return false;
-
-            return TogglePower(uid, playSwitchSound, receiver, user);
-        }
-
         public void SetLoad(ApcPowerReceiverComponent comp, float load)
         {
             comp.Load = load;
         }
-
-        private void OnEmpPulse(EntityUid uid, ApcPowerReceiverComponent component, ref EmpPulseEvent args)
-        {
-            if (!component.PowerDisabled)
-            {
-                args.Affected = true;
-                args.Disabled = true;
-                TogglePower(uid, false);
-            }
-        }
-
-        private void OnEmpEnd(EntityUid uid, ApcPowerReceiverComponent component, ref EmpDisabledRemoved args)
-        {
-            if (component.PowerDisabled)
-            {
-                TogglePower(uid, false);
-            }
-        }
     }
 }
diff --git a/Content.Shared/Power/Components/ApcPowerReceiverComponentState.cs b/Content.Shared/Power/Components/ApcPowerReceiverComponentState.cs
new file mode 100644
index 00000000000..9b18d6ad938
--- /dev/null
+++ b/Content.Shared/Power/Components/ApcPowerReceiverComponentState.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Power.Components;
+
+[Serializable, NetSerializable]
+public sealed class ApcPowerReceiverComponentState : ComponentState
+{
+    public bool Powered;
+}
diff --git a/Content.Shared/Power/Components/SharedApcPowerReceiverComponent.cs b/Content.Shared/Power/Components/SharedApcPowerReceiverComponent.cs
new file mode 100644
index 00000000000..d73993357a3
--- /dev/null
+++ b/Content.Shared/Power/Components/SharedApcPowerReceiverComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Power.Components;
+
+[NetworkedComponent]
+public abstract partial class SharedApcPowerReceiverComponent : Component
+{
+    [ViewVariables]
+    public bool Powered;
+}
diff --git a/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs b/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs
new file mode 100644
index 00000000000..be2a9dc3abc
--- /dev/null
+++ b/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs
@@ -0,0 +1,6 @@
+namespace Content.Shared.Power.EntitySystems;
+
+public abstract class SharedPowerReceiverSystem : EntitySystem
+{
+
+}

From ee6f398e50457cb596765eccf55fcedc83f17fad Mon Sep 17 00:00:00 2001
From: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Date: Sun, 12 May 2024 15:07:54 +0000
Subject: [PATCH 011/366] Record deletion (#27883)

* Allow for Station Records interface for aghosts to delete records

* Fix record consoles not working when there are more than 2 crew members.

HOW DID NOONE NOTICE THIS SOONER???

* Stop being unconventional
---
 .../StationRecords/GeneralRecord.xaml         | 13 +++++
 .../StationRecords/GeneralRecord.xaml.cs      | 33 ++++++++++++
 ...lStationRecordConsoleBoundUserInterface.cs |  1 +
 .../GeneralStationRecordConsoleWindow.xaml    |  2 +-
 .../GeneralStationRecordConsoleWindow.xaml.cs | 51 +++----------------
 .../GeneralStationRecordConsoleComponent.cs   |  6 +++
 .../GeneralStationRecordConsoleSystem.cs      | 20 ++++++--
 .../StationRecords/GeneralRecordsUi.cs        | 23 +++++++--
 .../general-station-records.ftl               |  1 +
 .../Entities/Mobs/Player/admin_ghost.yml      |  1 +
 10 files changed, 100 insertions(+), 51 deletions(-)
 create mode 100644 Content.Client/StationRecords/GeneralRecord.xaml
 create mode 100644 Content.Client/StationRecords/GeneralRecord.xaml.cs

diff --git a/Content.Client/StationRecords/GeneralRecord.xaml b/Content.Client/StationRecords/GeneralRecord.xaml
new file mode 100644
index 00000000000..add688c3f38
--- /dev/null
+++ b/Content.Client/StationRecords/GeneralRecord.xaml
@@ -0,0 +1,13 @@
+<Control xmlns="https://spacestation14.io">
+    <BoxContainer Orientation="Vertical" Margin="5">
+        <Label Name="RecordName" StyleClasses="LabelBig"/>
+        <Label Name="Age"/>
+        <Label Name="Title"/>
+        <Label Name="Job"/>
+        <Label Name="Species"/>
+        <Label Name="Gender"/>
+        <Label Name="Fingerprint"/>
+        <Label Name="Dna"/>
+        <Button Visible="False" Name="DeleteButton" Text="{Loc 'general-station-record-console-delete'}"/>
+    </BoxContainer>
+</Control>
diff --git a/Content.Client/StationRecords/GeneralRecord.xaml.cs b/Content.Client/StationRecords/GeneralRecord.xaml.cs
new file mode 100644
index 00000000000..6a2622fba9e
--- /dev/null
+++ b/Content.Client/StationRecords/GeneralRecord.xaml.cs
@@ -0,0 +1,33 @@
+using Content.Shared.StationRecords;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.StationRecords;
+
+[GenerateTypedNameReferences]
+public sealed partial class GeneralRecord : Control
+{
+    public Action<uint>? OnDeletePressed;
+    public GeneralRecord(GeneralStationRecord record, bool canDelete, uint? id)
+    {
+        RobustXamlLoader.Load(this);
+        RecordName.Text = record.Name;
+        Age.Text = Loc.GetString("general-station-record-console-record-age", ("age", record.Age.ToString()));
+        Title.Text = Loc.GetString("general-station-record-console-record-title",
+            ("job", Loc.GetString(record.JobTitle)));
+        Species.Text = Loc.GetString("general-station-record-console-record-species", ("species", record.Species));
+        Gender.Text = Loc.GetString("general-station-record-console-record-gender",
+            ("gender", record.Gender.ToString()));
+        Fingerprint.Text = Loc.GetString("general-station-record-console-record-fingerprint",
+            ("fingerprint", record.Fingerprint ?? Loc.GetString("generic-not-available-shorthand")));
+        Dna.Text = Loc.GetString("general-station-record-console-record-dna",
+            ("dna", record.DNA ?? Loc.GetString("generic-not-available-shorthand")));
+
+        if (canDelete && id != null )
+        {
+            DeleteButton.Visible = true;
+            DeleteButton.OnPressed += _ => OnDeletePressed?.Invoke(id.Value);
+        }
+    }
+}
diff --git a/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs b/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs
index 3be3d98778d..720a2efb9dd 100644
--- a/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs
+++ b/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs
@@ -20,6 +20,7 @@ protected override void Open()
             SendMessage(new SelectStationRecord(key));
         _window.OnFiltersChanged += (type, filterValue) =>
             SendMessage(new SetStationRecordFilter(type, filterValue));
+        _window.OnDeleted += id => SendMessage(new DeleteStationRecord(id));
         _window.OnClose += Close;
 
         _window.OpenCentered();
diff --git a/Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml b/Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml
index a915d329bc3..3615eb8e008 100644
--- a/Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml
+++ b/Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml
@@ -19,7 +19,7 @@
             </BoxContainer>
             <BoxContainer Orientation="Vertical" Margin="5">
                 <Label Name="RecordContainerStatus" Visible="False" Text="{Loc 'general-station-record-console-select-record-info'}"/>
-                <BoxContainer Name="RecordContainer" Orientation="Vertical" />
+                <Control Name="RecordContainer" Visible="False"/>
             </BoxContainer>
         </BoxContainer>
     </BoxContainer>
diff --git a/Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml.cs b/Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml.cs
index fbdd6c2f0b5..272e6c3b251 100644
--- a/Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml.cs
+++ b/Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml.cs
@@ -1,7 +1,5 @@
 using Content.Shared.StationRecords;
 using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 
@@ -13,6 +11,7 @@ public sealed partial class GeneralStationRecordConsoleWindow : DefaultWindow
     public Action<uint?>? OnKeySelected;
 
     public Action<StationRecordFilterType, string>? OnFiltersChanged;
+    public Action<uint>? OnDeleted;
 
     private bool _isPopulating;
 
@@ -112,11 +111,10 @@ public void UpdateState(GeneralStationRecordConsoleState state)
             RecordContainerStatus.Text = state.SelectedKey == null
                 ? Loc.GetString("general-station-record-console-no-record-found")
                 : Loc.GetString("general-station-record-console-select-record-info");
-            PopulateRecordContainer(state.Record);
+            PopulateRecordContainer(state.Record, state.CanDeleteEntries, state.SelectedKey);
         }
         else
         {
-            RecordContainer.DisposeAllChildren();
             RecordContainer.RemoveAllChildren();
         }
     }
@@ -138,49 +136,13 @@ private void PopulateRecordListing(Dictionary<uint, string> listing, uint? selec
         RecordListing.SortItemsByText();
     }
 
-    private void PopulateRecordContainer(GeneralStationRecord record)
+    private void PopulateRecordContainer(GeneralStationRecord record, bool enableDelete, uint? id)
     {
-        RecordContainer.DisposeAllChildren();
         RecordContainer.RemoveAllChildren();
-        // sure
-        var recordControls = new Control[]
-        {
-            new Label()
-            {
-                Text = record.Name,
-                StyleClasses = { "LabelBig" }
-            },
-            new Label()
-            {
-                Text = Loc.GetString("general-station-record-console-record-age", ("age", record.Age.ToString()))
-
-            },
-            new Label()
-            {
-                Text = Loc.GetString("general-station-record-console-record-title", ("job", Loc.GetString(record.JobTitle)))
-            },
-            new Label()
-            {
-                Text = Loc.GetString("general-station-record-console-record-species", ("species", record.Species))
-            },
-            new Label()
-            {
-                Text = Loc.GetString("general-station-record-console-record-gender", ("gender", record.Gender.ToString()))
-            },
-            new Label()
-            {
-                Text = Loc.GetString("general-station-record-console-record-fingerprint", ("fingerprint", record.Fingerprint ?? Loc.GetString("generic-not-available-shorthand")))
-            },
-            new Label()
-            {
-                Text = Loc.GetString("general-station-record-console-record-dna", ("dna", record.DNA ?? Loc.GetString("generic-not-available-shorthand")))
-            }
-        };
+        var newRecord = new GeneralRecord(record, enableDelete, id);
+        newRecord.OnDeletePressed = OnDeleted;
 
-        foreach (var control in recordControls)
-        {
-            RecordContainer.AddChild(control);
-        }
+        RecordContainer.AddChild(newRecord);
     }
 
     private void FilterListingOfRecords(string text = "")
@@ -195,4 +157,5 @@ private string GetTypeFilterLocals(StationRecordFilterType type)
     {
         return Loc.GetString($"general-station-record-{type.ToString().ToLower()}-filter");
     }
+
 }
diff --git a/Content.Server/StationRecords/Components/GeneralStationRecordConsoleComponent.cs b/Content.Server/StationRecords/Components/GeneralStationRecordConsoleComponent.cs
index 9076bee436f..a6356f0baa3 100644
--- a/Content.Server/StationRecords/Components/GeneralStationRecordConsoleComponent.cs
+++ b/Content.Server/StationRecords/Components/GeneralStationRecordConsoleComponent.cs
@@ -18,4 +18,10 @@ public sealed partial class GeneralStationRecordConsoleComponent : Component
     /// </summary>
     [DataField]
     public StationRecordsFilter? Filter;
+
+    /// <summary>
+    /// Whether this Records Console is able to delete entries.
+    /// </summary>
+    [DataField]
+    public bool CanDeleteEntries;
 }
diff --git a/Content.Server/StationRecords/Systems/GeneralStationRecordConsoleSystem.cs b/Content.Server/StationRecords/Systems/GeneralStationRecordConsoleSystem.cs
index a5202285d99..87246ab6757 100644
--- a/Content.Server/StationRecords/Systems/GeneralStationRecordConsoleSystem.cs
+++ b/Content.Server/StationRecords/Systems/GeneralStationRecordConsoleSystem.cs
@@ -23,9 +23,22 @@ public override void Initialize()
             subs.Event<BoundUIOpenedEvent>(UpdateUserInterface);
             subs.Event<SelectStationRecord>(OnKeySelected);
             subs.Event<SetStationRecordFilter>(OnFiltersChanged);
+            subs.Event<DeleteStationRecord>(OnRecordDelete);
         });
     }
 
+    private void OnRecordDelete(Entity<GeneralStationRecordConsoleComponent> ent, ref DeleteStationRecord args)
+    {
+        if (!ent.Comp.CanDeleteEntries)
+            return;
+
+        var owning = _station.GetOwningStation(ent.Owner);
+
+        if (owning != null)
+            _stationRecords.RemoveRecord(new StationRecordKey(args.Id, owning.Value));
+        UpdateUserInterface(ent); // Apparently an event does not get raised for this.
+    }
+
     private void UpdateUserInterface<T>(Entity<GeneralStationRecordConsoleComponent> ent, ref T args)
     {
         UpdateUserInterface(ent);
@@ -68,8 +81,9 @@ private void UpdateUserInterface(Entity<GeneralStationRecordConsoleComponent> en
             case 0:
                 _ui.SetUiState(uid, GeneralStationRecordConsoleKey.Key, new GeneralStationRecordConsoleState());
                 return;
-            case 1:
-                console.ActiveKey = listing.Keys.First();
+            default:
+                if (console.ActiveKey == null)
+                    console.ActiveKey = listing.Keys.First();
                 break;
         }
 
@@ -79,7 +93,7 @@ private void UpdateUserInterface(Entity<GeneralStationRecordConsoleComponent> en
         var key = new StationRecordKey(id, owningStation.Value);
         _stationRecords.TryGetRecord<GeneralStationRecord>(key, out var record, stationRecords);
 
-        GeneralStationRecordConsoleState newState = new(id, record, listing, console.Filter);
+        GeneralStationRecordConsoleState newState = new(id, record, listing, console.Filter, ent.Comp.CanDeleteEntries);
         _ui.SetUiState(uid, GeneralStationRecordConsoleKey.Key, newState);
     }
 }
diff --git a/Content.Shared/StationRecords/GeneralRecordsUi.cs b/Content.Shared/StationRecords/GeneralRecordsUi.cs
index 860454efde5..2105c53df25 100644
--- a/Content.Shared/StationRecords/GeneralRecordsUi.cs
+++ b/Content.Shared/StationRecords/GeneralRecordsUi.cs
@@ -37,17 +37,22 @@ public sealed class GeneralStationRecordConsoleState : BoundUserInterfaceState
     public readonly GeneralStationRecord? Record;
     public readonly Dictionary<uint, string>? RecordListing;
     public readonly StationRecordsFilter? Filter;
+    public readonly bool CanDeleteEntries;
 
-    public GeneralStationRecordConsoleState(uint? key, GeneralStationRecord? record,
-        Dictionary<uint, string>? recordListing, StationRecordsFilter? newFilter)
+    public GeneralStationRecordConsoleState(uint? key,
+        GeneralStationRecord? record,
+        Dictionary<uint, string>? recordListing,
+        StationRecordsFilter? newFilter,
+        bool canDeleteEntries)
     {
         SelectedKey = key;
         Record = record;
         RecordListing = recordListing;
         Filter = newFilter;
+        CanDeleteEntries = canDeleteEntries;
     }
 
-    public GeneralStationRecordConsoleState() : this(null, null, null, null)
+    public GeneralStationRecordConsoleState() : this(null, null, null, null, false)
     {
     }
 
@@ -69,3 +74,15 @@ public SelectStationRecord(uint? selectedKey)
         SelectedKey = selectedKey;
     }
 }
+
+
+[Serializable, NetSerializable]
+public sealed class DeleteStationRecord : BoundUserInterfaceMessage
+{
+    public DeleteStationRecord(uint id)
+    {
+        Id = id;
+    }
+
+    public readonly uint Id;
+}
diff --git a/Resources/Locale/en-US/station-records/general-station-records.ftl b/Resources/Locale/en-US/station-records/general-station-records.ftl
index e36bfac7cb3..4516a547f4d 100644
--- a/Resources/Locale/en-US/station-records/general-station-records.ftl
+++ b/Resources/Locale/en-US/station-records/general-station-records.ftl
@@ -16,3 +16,4 @@ general-station-record-prints-filter = Fingerprints
 general-station-record-dna-filter = DNA
 general-station-record-console-search-records = Search
 general-station-record-console-reset-filters = Reset
+general-station-record-console-delete = Delete
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index c9aac35732b..1366dfb76ab 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -80,6 +80,7 @@
   - type: CargoOrderConsole
   - type: CrewMonitoringConsole
   - type: GeneralStationRecordConsole
+    canDeleteEntries: true
   - type: DeviceNetwork
     deviceNetId: Wireless
     receiveFrequencyId: CrewMonitor

From 47710b6e8e246da7732d7227f4c5313b8f0da3b9 Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Tue, 18 Jun 2024 06:59:37 -0400
Subject: [PATCH 012/366] Implement vital chef's hat functionality (#25950)

* Implement crucial chef's hat functionality

* Unified stopping code and added events.

* Added documentation to events

* Rerun tests

* Made review changes, and fixed potential desync bug.

* Update whitelist
---
 .../Systems/PilotedByClothingSystem.cs        |  19 ++
 .../Components/PilotedByClothingComponent.cs  |  12 ++
 .../Components/PilotedClothingComponent.cs    |  38 ++++
 .../EntitySystems/PilotedClothingSystem.cs    | 169 ++++++++++++++++++
 .../Entities/Clothing/Head/hats.yml           |   4 +
 .../Prototypes/Entities/Mobs/NPCs/animals.yml |   2 +
 Resources/Prototypes/tags.yml                 |   4 +
 7 files changed, 248 insertions(+)
 create mode 100644 Content.Client/Clothing/Systems/PilotedByClothingSystem.cs
 create mode 100644 Content.Shared/Clothing/Components/PilotedByClothingComponent.cs
 create mode 100644 Content.Shared/Clothing/Components/PilotedClothingComponent.cs
 create mode 100644 Content.Shared/Clothing/EntitySystems/PilotedClothingSystem.cs

diff --git a/Content.Client/Clothing/Systems/PilotedByClothingSystem.cs b/Content.Client/Clothing/Systems/PilotedByClothingSystem.cs
new file mode 100644
index 00000000000..c04cf0a60ba
--- /dev/null
+++ b/Content.Client/Clothing/Systems/PilotedByClothingSystem.cs
@@ -0,0 +1,19 @@
+using Content.Shared.Clothing.Components;
+using Robust.Client.Physics;
+
+namespace Content.Client.Clothing.Systems;
+
+public sealed partial class PilotedByClothingSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<PilotedByClothingComponent, UpdateIsPredictedEvent>(OnUpdatePredicted);
+    }
+
+    private void OnUpdatePredicted(Entity<PilotedByClothingComponent> entity, ref UpdateIsPredictedEvent args)
+    {
+        args.BlockPrediction = true;
+    }
+}
diff --git a/Content.Shared/Clothing/Components/PilotedByClothingComponent.cs b/Content.Shared/Clothing/Components/PilotedByClothingComponent.cs
new file mode 100644
index 00000000000..cd4d0d62030
--- /dev/null
+++ b/Content.Shared/Clothing/Components/PilotedByClothingComponent.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Clothing.Components;
+
+/// <summary>
+/// Disables client-side physics prediction for this entity.
+/// Without this, movement with <see cref="PilotedClothingSystem"/> is very rubberbandy.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class PilotedByClothingComponent : Component
+{
+}
diff --git a/Content.Shared/Clothing/Components/PilotedClothingComponent.cs b/Content.Shared/Clothing/Components/PilotedClothingComponent.cs
new file mode 100644
index 00000000000..a349e4e485e
--- /dev/null
+++ b/Content.Shared/Clothing/Components/PilotedClothingComponent.cs
@@ -0,0 +1,38 @@
+using Content.Shared.Whitelist;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Clothing.Components;
+
+/// <summary>
+/// Allows an entity stored in this clothing item to pass inputs to the entity wearing it.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class PilotedClothingComponent : Component
+{
+    /// <summary>
+    /// Whitelist for entities that are allowed to act as pilots when inside this entity.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? PilotWhitelist;
+
+    /// <summary>
+    /// Should movement input be relayed from the pilot to the target?
+    /// </summary>
+    [DataField]
+    public bool RelayMovement = true;
+
+
+    /// <summary>
+    /// Reference to the entity contained in the clothing and acting as pilot.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? Pilot;
+
+    /// <summary>
+    /// Reference to the entity wearing this clothing who will be controlled by the pilot.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? Wearer;
+
+    public bool IsActive => Pilot != null && Wearer != null;
+}
diff --git a/Content.Shared/Clothing/EntitySystems/PilotedClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/PilotedClothingSystem.cs
new file mode 100644
index 00000000000..49df7aee943
--- /dev/null
+++ b/Content.Shared/Clothing/EntitySystems/PilotedClothingSystem.cs
@@ -0,0 +1,169 @@
+using Content.Shared.Clothing.Components;
+using Content.Shared.Inventory.Events;
+using Content.Shared.Movement.Components;
+using Content.Shared.Movement.Systems;
+using Content.Shared.Storage;
+using Content.Shared.Whitelist;
+using Robust.Shared.Containers;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Clothing.EntitySystems;
+
+public sealed partial class PilotedClothingSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedMoverController _moverController = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<PilotedClothingComponent, EntInsertedIntoContainerMessage>(OnEntInserted);
+        SubscribeLocalEvent<PilotedClothingComponent, EntRemovedFromContainerMessage>(OnEntRemoved);
+        SubscribeLocalEvent<PilotedClothingComponent, GotEquippedEvent>(OnEquipped);
+        SubscribeLocalEvent<PilotedClothingComponent, GotUnequippedEvent>(OnUnequipped);
+    }
+
+    private void OnEntInserted(Entity<PilotedClothingComponent> entity, ref EntInsertedIntoContainerMessage args)
+    {
+        // Make sure the entity was actually inserted into storage and not a different container.
+        if (!TryComp(entity, out StorageComponent? storage) || args.Container != storage.Container)
+            return;
+
+        // Check potential pilot against whitelist, if one exists.
+        if (_whitelist.IsWhitelistFail(entity.Comp.PilotWhitelist, args.Entity))
+            return;
+
+        entity.Comp.Pilot = args.Entity;
+        Dirty(entity);
+
+        // Attempt to setup control link, if Pilot and Wearer are both present.
+        StartPiloting(entity);
+    }
+
+    private void OnEntRemoved(Entity<PilotedClothingComponent> entity, ref EntRemovedFromContainerMessage args)
+    {
+        // Make sure the removed entity is actually the pilot.
+        if (args.Entity != entity.Comp.Pilot)
+            return;
+
+        StopPiloting(entity);
+        entity.Comp.Pilot = null;
+        Dirty(entity);
+    }
+
+    private void OnEquipped(Entity<PilotedClothingComponent> entity, ref GotEquippedEvent args)
+    {
+        if (!TryComp(entity, out ClothingComponent? clothing))
+            return;
+
+        // Make sure the clothing item was equipped to the right slot, and not just held in a hand.
+        var isCorrectSlot = (clothing.Slots & args.SlotFlags) != Inventory.SlotFlags.NONE;
+        if (!isCorrectSlot)
+            return;
+
+        entity.Comp.Wearer = args.Equipee;
+        Dirty(entity);
+
+        // Attempt to setup control link, if Pilot and Wearer are both present.
+        StartPiloting(entity);
+    }
+
+    private void OnUnequipped(Entity<PilotedClothingComponent> entity, ref GotUnequippedEvent args)
+    {
+        StopPiloting(entity);
+
+        entity.Comp.Wearer = null;
+        Dirty(entity);
+    }
+
+    /// <summary>
+    /// Attempts to establish movement/interaction relay connection(s) from Pilot to Wearer.
+    /// If either is missing, fails and returns false.
+    /// </summary>
+    private bool StartPiloting(Entity<PilotedClothingComponent> entity)
+    {
+        // Make sure we have both a Pilot and a Wearer
+        if (entity.Comp.Pilot == null || entity.Comp.Wearer == null)
+            return false;
+
+        if (!_timing.IsFirstTimePredicted)
+            return false;
+
+        var pilotEnt = entity.Comp.Pilot.Value;
+        var wearerEnt = entity.Comp.Wearer.Value;
+
+        // Add component to block prediction of wearer
+        EnsureComp<PilotedByClothingComponent>(wearerEnt);
+
+        if (entity.Comp.RelayMovement)
+        {
+            // Establish movement input relay.
+            _moverController.SetRelay(pilotEnt, wearerEnt);
+        }
+
+        var pilotEv = new StartedPilotingClothingEvent(entity, wearerEnt);
+        RaiseLocalEvent(pilotEnt, ref pilotEv);
+
+        var wearerEv = new StartingBeingPilotedByClothing(entity, pilotEnt);
+        RaiseLocalEvent(wearerEnt, ref wearerEv);
+
+        return true;
+    }
+
+    /// <summary>
+    /// Removes components from the Pilot and Wearer to stop the control relay.
+    /// Returns false if a connection does not already exist.
+    /// </summary>
+    private bool StopPiloting(Entity<PilotedClothingComponent> entity)
+    {
+        if (entity.Comp.Pilot == null || entity.Comp.Wearer == null)
+            return false;
+
+        // Clean up components on the Pilot
+        var pilotEnt = entity.Comp.Pilot.Value;
+        RemCompDeferred<RelayInputMoverComponent>(pilotEnt);
+
+        // Clean up components on the Wearer
+        var wearerEnt = entity.Comp.Wearer.Value;
+        RemCompDeferred<MovementRelayTargetComponent>(wearerEnt);
+        RemCompDeferred<PilotedByClothingComponent>(wearerEnt);
+
+        // Raise an event on the Pilot
+        var pilotEv = new StoppedPilotingClothingEvent(entity, wearerEnt);
+        RaiseLocalEvent(pilotEnt, ref pilotEv);
+
+        // Raise an event on the Wearer
+        var wearerEv = new StoppedBeingPilotedByClothing(entity, pilotEnt);
+        RaiseLocalEvent(wearerEnt, ref wearerEv);
+
+        return true;
+    }
+}
+
+/// <summary>
+/// Raised on the Pilot when they gain control of the Wearer.
+/// </summary>
+[ByRefEvent]
+public record struct StartedPilotingClothingEvent(EntityUid Clothing, EntityUid Wearer);
+
+/// <summary>
+/// Raised on the Pilot when they lose control of the Wearer,
+/// due to the Pilot exiting the clothing or the clothing being unequipped by the Wearer.
+/// </summary>
+[ByRefEvent]
+public record struct StoppedPilotingClothingEvent(EntityUid Clothing, EntityUid Wearer);
+
+/// <summary>
+/// Raised on the Wearer when the Pilot gains control of them.
+/// </summary>
+[ByRefEvent]
+public record struct StartingBeingPilotedByClothing(EntityUid Clothing, EntityUid Pilot);
+
+/// <summary>
+/// Raised on the Wearer when the Pilot loses control of them
+/// due to the Pilot exiting the clothing or the clothing being unequipped by the Wearer.
+/// </summary>
+[ByRefEvent]
+public record struct StoppedBeingPilotedByClothing(EntityUid Clothing, EntityUid Pilot);
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 5b5d281362d..6bba9320e8b 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -252,6 +252,10 @@
   - type: ContainerContainer
     containers:
       storagebase: !type:Container
+  - type: PilotedClothing
+    pilotWhitelist:
+      tags:
+        - ChefPilot
   - type: Tag
     tags:
     - ClothMade
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 6e369389a90..5aa41301d77 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1726,6 +1726,7 @@
     tags:
     - Trash
     - VimPilot
+    - ChefPilot
     - Mouse
     - Meat
   - type: Respirator
@@ -3374,6 +3375,7 @@
   - type: Tag
     tags:
     - VimPilot
+    - ChefPilot
     - Trash
     - Hamster
     - Meat
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index e7f20f8f47b..415f9369dc7 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -371,6 +371,10 @@
 - type: Tag
   id: Chicken
 
+# Allowed to control someone wearing a Chef's hat if inside their hat.
+- type: Tag
+  id: ChefPilot
+
 - type: Tag
   id: ChemDispensable # container that can go into the chem dispenser
 

From c5f663bf5567865be921d501af25b74d3393b572 Mon Sep 17 00:00:00 2001
From: Mervill <mervills.email@gmail.com>
Date: Mon, 29 Jul 2024 00:28:17 -0700
Subject: [PATCH 013/366] Make the powered examine text fully client predicted
 (#30441)

* Make the powered examine text fully client predicted

* switch to using the Entity<T> API for the examine event
---
 .../Power/EntitySystems/PowerReceiverSystem.cs   |  9 ++++++++-
 .../Power/EntitySystems/PowerReceiverSystem.cs   | 16 +++++-----------
 .../EntitySystems/SharedPowerReceiverSystem.cs   | 13 +++++++++++--
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/Content.Client/Power/EntitySystems/PowerReceiverSystem.cs b/Content.Client/Power/EntitySystems/PowerReceiverSystem.cs
index 4d56592c232..61e20f751ca 100644
--- a/Content.Client/Power/EntitySystems/PowerReceiverSystem.cs
+++ b/Content.Client/Power/EntitySystems/PowerReceiverSystem.cs
@@ -1,6 +1,7 @@
-using Content.Client.Power.Components;
+using Content.Client.Power.Components;
 using Content.Shared.Power.Components;
 using Content.Shared.Power.EntitySystems;
+using Content.Shared.Examine;
 using Robust.Shared.GameStates;
 
 namespace Content.Client.Power.EntitySystems;
@@ -10,9 +11,15 @@ public sealed class PowerReceiverSystem : SharedPowerReceiverSystem
     public override void Initialize()
     {
         base.Initialize();
+        SubscribeLocalEvent<ApcPowerReceiverComponent, ExaminedEvent>(OnExamined);
         SubscribeLocalEvent<ApcPowerReceiverComponent, ComponentHandleState>(OnHandleState);
     }
 
+    private void OnExamined(Entity<ApcPowerReceiverComponent> ent, ref ExaminedEvent args)
+    {
+        args.PushMarkup(GetExamineText(ent.Comp.Powered));
+    }
+
     private void OnHandleState(EntityUid uid, ApcPowerReceiverComponent component, ref ComponentHandleState args)
     {
         if (args.Current is not ApcPowerReceiverComponentState state)
diff --git a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
index 0a5d475f27f..a314fe0ca11 100644
--- a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
@@ -52,6 +52,11 @@ public override void Initialize()
             _provQuery = GetEntityQuery<ApcPowerProviderComponent>();
         }
 
+        private void OnExamined(Entity<ApcPowerReceiverComponent> ent, ref ExaminedEvent args)
+        {
+            args.PushMarkup(GetExamineText(ent.Comp.Powered));
+        }
+
         private void OnGetVerbs(EntityUid uid, ApcPowerReceiverComponent component, GetVerbsEvent<Verb> args)
         {
             if (!_adminManager.HasAdminFlag(args.User, AdminFlags.Admin))
@@ -67,17 +72,6 @@ private void OnGetVerbs(EntityUid uid, ApcPowerReceiverComponent component, GetV
             });
         }
 
-        ///<summary>
-        ///Adds some markup to the examine text of whatever object is using this component to tell you if it's powered or not, even if it doesn't have an icon state to do this for you.
-        ///</summary>
-        private void OnExamined(EntityUid uid, ApcPowerReceiverComponent component, ExaminedEvent args)
-        {
-            args.PushMarkup(Loc.GetString("power-receiver-component-on-examine-main",
-                                            ("stateText", Loc.GetString( component.Powered
-                                                ? "power-receiver-component-on-examine-powered"
-                                                : "power-receiver-component-on-examine-unpowered"))));
-        }
-
         private void OnProviderShutdown(EntityUid uid, ApcPowerProviderComponent component, ComponentShutdown args)
         {
             foreach (var receiver in component.LinkedReceivers)
diff --git a/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs b/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs
index be2a9dc3abc..37ac7518896 100644
--- a/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs
+++ b/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs
@@ -1,6 +1,15 @@
-namespace Content.Shared.Power.EntitySystems;
+using Content.Shared.Examine;
+using Content.Shared.Power.Components;
+
+namespace Content.Shared.Power.EntitySystems;
 
 public abstract class SharedPowerReceiverSystem : EntitySystem
 {
-
+    protected string GetExamineText(bool powered)
+    {
+        return Loc.GetString("power-receiver-component-on-examine-main",
+                                ("stateText", Loc.GetString(powered
+                                    ? "power-receiver-component-on-examine-powered"
+                                    : "power-receiver-component-on-examine-unpowered")));
+    }
 }

From 9824a9ea1bc09248a60d3645cc61b94f0cb33a30 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Sun, 25 Aug 2024 22:18:42 +1000
Subject: [PATCH 014/366] Power stuff (#31314)

* Power stuff

- Add shared IsPowered
- Add shared ResolveApc
- Move PowerChangedEvent to shared for now
- Add SlimPoweredLight that actually functions how you'd expect a PoweredLight to function it id didn't have a bunch of bloat on it.

* big update

* boing
---
 .../UI/BanList/BanListWindow.xaml.cs          |  1 +
 .../UI/Bwoink/BwoinkControl.xaml.cs           |  3 +-
 .../UI/SetOutfit/SetOutfitMenu.xaml.cs        |  1 +
 .../Cartridges/CrewManifestUiFragment.xaml.cs |  3 +-
 .../UI/FlatpackCreatorMenu.xaml.cs            |  1 +
 .../CrewManifest/CrewManifestUi.xaml.cs       |  1 +
 .../UI/LobbyCharacterPreviewPanel.xaml.cs     |  1 +
 Content.Client/Lobby/UI/LobbyGui.xaml.cs      |  1 +
 .../UI/SignalTimerWindow.xaml.cs              |  1 +
 Content.Client/Options/UI/OptionsMenu.xaml.cs |  1 +
 .../EntitySystems/PowerReceiverSystem.cs      | 13 ++++
 .../Power/Generator/GeneratorWindow.xaml.cs   |  1 +
 Content.Client/Radio/Ui/IntercomMenu.xaml.cs  |  1 +
 .../StationRecords/GeneralRecord.xaml.cs      |  1 +
 .../Ui/AnalysisConsoleMenu.xaml.cs            |  1 +
 .../AlertLevel/AlertLevelDisplaySystem.cs     |  1 +
 .../Ame/EntitySystems/AmeControllerSystem.cs  |  1 +
 .../Anomaly/AnomalySynchronizerSystem.cs      |  1 +
 .../Anomaly/AnomalySystem.Generator.cs        |  1 +
 .../Arcade/BlockGame/BlockGameArcadeSystem.cs |  1 +
 .../SpaceVillainArcadeSystem.cs               |  1 +
 .../Atmos/Monitor/Systems/AirAlarmSystem.cs   |  1 +
 .../Monitor/Systems/AtmosAlarmableSystem.cs   |  1 +
 .../Monitor/Systems/AtmosMonitoringSystem.cs  |  1 +
 .../Unary/EntitySystems/GasVentPumpSystem.cs  |  1 +
 .../EntitySystems/GasVentScrubberSystem.cs    |  1 +
 .../Atmos/Portable/PortableScrubberSystem.cs  |  1 +
 .../Atmos/Portable/SpaceHeaterSystem.cs       |  1 +
 Content.Server/Audio/AmbientSoundSystem.cs    |  1 +
 Content.Server/Audio/Jukebox/JukeboxSystem.cs |  1 +
 Content.Server/Bed/BedSystem.cs               |  1 +
 .../Buckle/Systems/AntiRotOnBuckleSystem.cs   |  1 +
 .../Cargo/Systems/CargoSystem.Telepad.cs      |  1 +
 .../SolutionContainerMixerSystem.cs           |  1 +
 .../EntitySystems/SolutionHeaterSystem.cs     |  1 +
 .../Cloning/CloningConsoleSystem.cs           |  1 +
 .../ConstructionSystem.Computer.cs            |  1 +
 Content.Server/Construction/FlatpackSystem.cs |  2 +
 .../DeviceNetworkRequiresPowerSystem.cs       |  1 +
 .../Systems/SingletonDeviceNetServerSystem.cs |  1 +
 .../Unit/EntitySystems/DisposalUnitSystem.cs  |  2 +-
 Content.Server/Doors/Systems/AirlockSystem.cs |  1 +
 Content.Server/Doors/Systems/DoorSystem.cs    |  2 +-
 .../Doors/Systems/FirelockSystem.cs           |  1 +
 Content.Server/Fax/FaxSystem.cs               |  2 +
 .../EntitySystems/ReagentGrinderSystem.cs     |  1 +
 Content.Server/Lathe/LatheSystem.cs           |  1 +
 .../EntitySystems/EmergencyLightSystem.cs     |  2 +
 .../Light/EntitySystems/LitOnPoweredSystem.cs |  2 +
 .../Light/EntitySystems/PoweredLightSystem.cs |  4 ++
 .../Materials/MaterialReclaimerSystem.cs      |  4 ++
 .../BiomassReclaimerSystem.cs                 |  1 +
 Content.Server/Medical/CryoPodSystem.cs       |  1 +
 .../EntitySystems/FatExtractorSystem.cs       |  1 +
 .../Paper/PaperRandomStoryComponent.cs        |  4 ++
 .../ParticleAcceleratorSystem.ControlBox.cs   |  1 +
 .../Physics/Controllers/ConveyorController.cs |  1 +
 .../Components/ApcPowerReceiverComponent.cs   |  7 --
 .../Power/Components/CableComponent.cs        |  9 +--
 .../ActivatableUIRequiresPowerSystem.cs       |  3 +
 .../EntitySystems/CableMultitoolSystem.cs     |  5 +-
 .../Power/EntitySystems/ChargerSystem.cs      |  1 +
 .../Power/EntitySystems/PowerNetSystem.cs     |  1 +
 .../EntitySystems/PowerReceiverSystem.cs      | 13 ++++
 .../Power/Generation/Teg/TegSystem.cs         |  2 +
 .../Power/Generator/GasPowerReceiverSystem.cs |  2 +
 .../Radio/EntitySystems/RadioDeviceSystem.cs  |  1 +
 .../Shuttles/Systems/ShuttleConsoleSystem.cs  |  1 +
 .../Shuttles/Systems/ThrusterSystem.cs        |  2 +
 .../EntitySystems/EmitterSystem.cs            |  1 +
 .../Sound/SpamEmitSoundRequirePowerSystem.cs  |  2 +
 .../SurveillanceCameraMonitorSystem.cs        |  1 +
 .../Systems/SurveillanceCameraRouterSystem.cs |  1 +
 .../Systems/SurveillanceCameraSystem.cs       |  1 +
 .../Temperature/Systems/EntityHeaterSystem.cs |  1 +
 .../VendingMachines/VendingMachineSystem.cs   |  1 +
 Content.Server/Wires/WiresSystem.cs           |  1 +
 .../Systems/ArtifactAnalyzerSystem.cs         |  1 +
 .../Systems/ArtifactCrusherSystem.cs          |  1 +
 .../Cabinet/ItemCabinetComponent.cs           |  1 -
 .../Components/PilotedByClothingComponent.cs  |  1 +
 .../Components/ToggleClothingComponent.cs     |  2 +
 .../Components/SlimPoweredLightComponent.cs   | 17 +++++
 .../EntitySystems/SlimPoweredLightSystem.cs   | 67 +++++++++++++++++++
 .../UnpoweredFlashlightSystem.cs              |  2 +
 .../SharedPowerReceiverSystem.cs              | 11 +++
 Content.Shared/Power/PowerChangedEvent.cs     |  8 +++
 .../PowerCell/PowerCellDrawComponent.cs       |  1 +
 .../Tools/Systems/SharedToolSystem.cs         |  3 +
 89 files changed, 240 insertions(+), 19 deletions(-)
 create mode 100644 Content.Shared/Light/Components/SlimPoweredLightComponent.cs
 create mode 100644 Content.Shared/Light/EntitySystems/SlimPoweredLightSystem.cs
 create mode 100644 Content.Shared/Power/PowerChangedEvent.cs

diff --git a/Content.Client/Administration/UI/BanList/BanListWindow.xaml.cs b/Content.Client/Administration/UI/BanList/BanListWindow.xaml.cs
index c95f8f204dd..fad55f96273 100644
--- a/Content.Client/Administration/UI/BanList/BanListWindow.xaml.cs
+++ b/Content.Client/Administration/UI/BanList/BanListWindow.xaml.cs
@@ -1,4 +1,5 @@
 using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 
diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
index af977f763c6..6ffb7147661 100644
--- a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
+++ b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
@@ -11,9 +11,8 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Network;
-using Robust.Shared.Utility;
-using Robust.Shared.Timing;
 using Robust.Shared.Configuration;
+using Robust.Shared.Utility;
 
 namespace Content.Client.Administration.UI.Bwoink
 {
diff --git a/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs b/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs
index a2faf208d92..7cb32b43df5 100644
--- a/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs
+++ b/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs
@@ -1,4 +1,5 @@
 using System.Numerics;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Roles;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Console;
diff --git a/Content.Client/CartridgeLoader/Cartridges/CrewManifestUiFragment.xaml.cs b/Content.Client/CartridgeLoader/Cartridges/CrewManifestUiFragment.xaml.cs
index 273707cb6ea..27ddd51815e 100644
--- a/Content.Client/CartridgeLoader/Cartridges/CrewManifestUiFragment.xaml.cs
+++ b/Content.Client/CartridgeLoader/Cartridges/CrewManifestUiFragment.xaml.cs
@@ -1,4 +1,5 @@
-using Content.Shared.CrewManifest;
+using Content.Client.CrewManifest.UI;
+using Content.Shared.CrewManifest;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
index ad19bc30f42..fcf0ada947c 100644
--- a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
+++ b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using Content.Client.Materials;
+using Content.Client.Materials.UI;
 using Content.Client.Message;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Construction.Components;
diff --git a/Content.Client/CrewManifest/CrewManifestUi.xaml.cs b/Content.Client/CrewManifest/CrewManifestUi.xaml.cs
index 4183c908141..f07e54eb65b 100644
--- a/Content.Client/CrewManifest/CrewManifestUi.xaml.cs
+++ b/Content.Client/CrewManifest/CrewManifestUi.xaml.cs
@@ -1,3 +1,4 @@
+using Content.Client.CrewManifest.UI;
 using Content.Shared.CrewManifest;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
diff --git a/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.xaml.cs b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.xaml.cs
index 14709f8b1f0..619cac68391 100644
--- a/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.xaml.cs
+++ b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.xaml.cs
@@ -1,5 +1,6 @@
 using System.Numerics;
 using Content.Client.UserInterface.Controls;
+using Prometheus;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml.cs b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
index 3ab2caad786..d19643f20a9 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml.cs
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
@@ -3,6 +3,7 @@
 using Content.Client.UserInterface.Systems.EscapeMenu;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Console;
+using Robust.Client.State;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
 
diff --git a/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs b/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs
index b62595595e5..fbaaf5624b4 100644
--- a/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs
+++ b/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs
@@ -3,6 +3,7 @@
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Timing;
 using Content.Client.TextScreen;
+using Robust.Client.UserInterface.Controls;
 
 namespace Content.Client.MachineLinking.UI;
 
diff --git a/Content.Client/Options/UI/OptionsMenu.xaml.cs b/Content.Client/Options/UI/OptionsMenu.xaml.cs
index c3a8e664705..c03e50dda00 100644
--- a/Content.Client/Options/UI/OptionsMenu.xaml.cs
+++ b/Content.Client/Options/UI/OptionsMenu.xaml.cs
@@ -1,3 +1,4 @@
+using Content.Client.Options.UI.Tabs;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/Power/EntitySystems/PowerReceiverSystem.cs b/Content.Client/Power/EntitySystems/PowerReceiverSystem.cs
index 61e20f751ca..ebf6c18c953 100644
--- a/Content.Client/Power/EntitySystems/PowerReceiverSystem.cs
+++ b/Content.Client/Power/EntitySystems/PowerReceiverSystem.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using Content.Client.Power.Components;
 using Content.Shared.Power.Components;
 using Content.Shared.Power.EntitySystems;
@@ -27,4 +28,16 @@ private void OnHandleState(EntityUid uid, ApcPowerReceiverComponent component, r
 
         component.Powered = state.Powered;
     }
+
+    public override bool ResolveApc(EntityUid entity, [NotNullWhen(true)] ref SharedApcPowerReceiverComponent? component)
+    {
+        if (component != null)
+            return true;
+
+        if (!TryComp(entity, out ApcPowerReceiverComponent? receiver))
+            return false;
+
+        component = receiver;
+        return true;
+    }
 }
diff --git a/Content.Client/Power/Generator/GeneratorWindow.xaml.cs b/Content.Client/Power/Generator/GeneratorWindow.xaml.cs
index bd5b75de1da..edd2d7e11b0 100644
--- a/Content.Client/Power/Generator/GeneratorWindow.xaml.cs
+++ b/Content.Client/Power/Generator/GeneratorWindow.xaml.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Power.Generator;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Network;
 
 namespace Content.Client.Power.Generator;
 
diff --git a/Content.Client/Radio/Ui/IntercomMenu.xaml.cs b/Content.Client/Radio/Ui/IntercomMenu.xaml.cs
index 8b4b38753c1..ea040d1e44c 100644
--- a/Content.Client/Radio/Ui/IntercomMenu.xaml.cs
+++ b/Content.Client/Radio/Ui/IntercomMenu.xaml.cs
@@ -1,3 +1,4 @@
+using System.Threading.Channels;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Radio;
 using Robust.Client.AutoGenerated;
diff --git a/Content.Client/StationRecords/GeneralRecord.xaml.cs b/Content.Client/StationRecords/GeneralRecord.xaml.cs
index 6a2622fba9e..e84c2dc0982 100644
--- a/Content.Client/StationRecords/GeneralRecord.xaml.cs
+++ b/Content.Client/StationRecords/GeneralRecord.xaml.cs
@@ -2,6 +2,7 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Enums;
 
 namespace Content.Client.StationRecords;
 
diff --git a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs
index 2890bb3dbf7..2723db1efbf 100644
--- a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs
+++ b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs
@@ -1,6 +1,7 @@
 using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Xenoarchaeology.Equipment;
+using Microsoft.VisualBasic;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs b/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs
index 4f2108748b8..3dd216c5dce 100644
--- a/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs
+++ b/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.Power.Components;
 using Content.Server.Station.Systems;
 using Content.Shared.AlertLevel;
+using Content.Shared.Power;
 
 namespace Content.Server.AlertLevel;
 
diff --git a/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs b/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs
index 1b323d66437..98f33b84244 100644
--- a/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs
+++ b/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs
@@ -10,6 +10,7 @@
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Database;
 using Content.Shared.Mind.Components;
+using Content.Shared.Power;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
diff --git a/Content.Server/Anomaly/AnomalySynchronizerSystem.cs b/Content.Server/Anomaly/AnomalySynchronizerSystem.cs
index 434a3fef66b..170676e08ca 100644
--- a/Content.Server/Anomaly/AnomalySynchronizerSystem.cs
+++ b/Content.Server/Anomaly/AnomalySynchronizerSystem.cs
@@ -7,6 +7,7 @@
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
+using Content.Shared.Power;
 using Robust.Shared.Audio.Systems;
 using Content.Shared.Verbs;
 
diff --git a/Content.Server/Anomaly/AnomalySystem.Generator.cs b/Content.Server/Anomaly/AnomalySystem.Generator.cs
index 056a985cbe2..6eb84b94418 100644
--- a/Content.Server/Anomaly/AnomalySystem.Generator.cs
+++ b/Content.Server/Anomaly/AnomalySystem.Generator.cs
@@ -13,6 +13,7 @@
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Map;
 using System.Numerics;
+using Content.Shared.Power;
 using Robust.Server.GameObjects;
 
 namespace Content.Server.Anomaly;
diff --git a/Content.Server/Arcade/BlockGame/BlockGameArcadeSystem.cs b/Content.Server/Arcade/BlockGame/BlockGameArcadeSystem.cs
index 561cad8d7ee..b0bf3895092 100644
--- a/Content.Server/Arcade/BlockGame/BlockGameArcadeSystem.cs
+++ b/Content.Server/Arcade/BlockGame/BlockGameArcadeSystem.cs
@@ -3,6 +3,7 @@
 using Content.Server.Advertise;
 using Content.Server.Advertise.Components;
 using Content.Shared.Arcade;
+using Content.Shared.Power;
 using Robust.Server.GameObjects;
 using Robust.Shared.Player;
 
diff --git a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs
index 07a4d044cab..624f4cac3e8 100644
--- a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs
+++ b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs
@@ -3,6 +3,7 @@
 using Content.Server.Advertise;
 using Content.Server.Advertise.Components;
 using Content.Shared.Mood;
+using Content.Shared.Power;
 using static Content.Shared.Arcade.SharedSpaceVillainArcadeComponent;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
diff --git a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
index 2f56142aa60..7ac4c653d3f 100644
--- a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
@@ -18,6 +18,7 @@
 using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Systems;
 using Content.Shared.Interaction;
+using Content.Shared.Power;
 using Content.Shared.Wires;
 using Robust.Server.GameObjects;
 using Robust.Shared.Player;
diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
index 2875d4a3d5d..b9ab1098977 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
@@ -7,6 +7,7 @@
 using Content.Server.Power.Components;
 using Content.Shared.Atmos.Monitor;
 using Content.Shared.DeviceNetwork;
+using Content.Shared.Power;
 using Content.Shared.Tag;
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
index c1a5256fdd5..2c9a3587559 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
@@ -9,6 +9,7 @@
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Monitor;
 using Content.Shared.DeviceNetwork;
+using Content.Shared.Power;
 using Content.Shared.Tag;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
index 7c12cf3f77f..0921a763d5a 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
@@ -18,6 +18,7 @@
 using Content.Shared.Audio;
 using Content.Shared.DeviceNetwork;
 using Content.Shared.Examine;
+using Content.Shared.Power;
 using Content.Shared.Tools.Systems;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
index b27689ed586..a35cf6c2e30 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
@@ -16,6 +16,7 @@
 using Content.Shared.Atmos.Piping.Unary.Components;
 using Content.Shared.Audio;
 using Content.Shared.DeviceNetwork;
+using Content.Shared.Power;
 using Content.Shared.Tools.Systems;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Atmos/Portable/PortableScrubberSystem.cs b/Content.Server/Atmos/Portable/PortableScrubberSystem.cs
index fbe40deedb1..7dc141f8753 100644
--- a/Content.Server/Atmos/Portable/PortableScrubberSystem.cs
+++ b/Content.Server/Atmos/Portable/PortableScrubberSystem.cs
@@ -16,6 +16,7 @@
 using Content.Server.NodeContainer.EntitySystems;
 using Content.Shared.Atmos;
 using Content.Shared.Database;
+using Content.Shared.Power;
 
 namespace Content.Server.Atmos.Portable
 {
diff --git a/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs b/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs
index 70eea2d9b78..b3ad5bbdb37 100644
--- a/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs
+++ b/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs
@@ -6,6 +6,7 @@
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Atmos.Piping.Portable.Components;
 using Content.Shared.Atmos.Visuals;
+using Content.Shared.Power;
 using Content.Shared.UserInterface;
 using Robust.Server.GameObjects;
 
diff --git a/Content.Server/Audio/AmbientSoundSystem.cs b/Content.Server/Audio/AmbientSoundSystem.cs
index e78970d1243..1f4abf34f77 100644
--- a/Content.Server/Audio/AmbientSoundSystem.cs
+++ b/Content.Server/Audio/AmbientSoundSystem.cs
@@ -2,6 +2,7 @@
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Audio;
 using Content.Shared.Mobs;
+using Content.Shared.Power;
 
 namespace Content.Server.Audio;
 
diff --git a/Content.Server/Audio/Jukebox/JukeboxSystem.cs b/Content.Server/Audio/Jukebox/JukeboxSystem.cs
index cc9235e3d7a..3535f6b2382 100644
--- a/Content.Server/Audio/Jukebox/JukeboxSystem.cs
+++ b/Content.Server/Audio/Jukebox/JukeboxSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Audio.Jukebox;
+using Content.Shared.Power;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Components;
diff --git a/Content.Server/Bed/BedSystem.cs b/Content.Server/Bed/BedSystem.cs
index 089ce322366..2335859f0b8 100644
--- a/Content.Server/Bed/BedSystem.cs
+++ b/Content.Server/Bed/BedSystem.cs
@@ -13,6 +13,7 @@
 using Content.Shared.Emag.Components;
 using Content.Shared.Emag.Systems;
 using Content.Shared.Mobs.Systems;
+using Content.Shared.Power;
 using Robust.Shared.Timing;
 using Content.Shared.Silicon.Components; // I shouldn't have to modify this.
 using Robust.Shared.Utility;
diff --git a/Content.Server/Buckle/Systems/AntiRotOnBuckleSystem.cs b/Content.Server/Buckle/Systems/AntiRotOnBuckleSystem.cs
index 4458b020a11..6f356baf073 100644
--- a/Content.Server/Buckle/Systems/AntiRotOnBuckleSystem.cs
+++ b/Content.Server/Buckle/Systems/AntiRotOnBuckleSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.Power.Components;
 using Content.Shared.Atmos.Rotting;
 using Content.Shared.Buckle.Components;
+using Content.Shared.Power;
 
 namespace Content.Server.Buckle.Systems;
 
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs b/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs
index 223dd2ac329..a78b6b1b25f 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs
@@ -8,6 +8,7 @@
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Components;
 using Content.Shared.DeviceLinking;
+using Content.Shared.Power;
 using Robust.Shared.Audio;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
diff --git a/Content.Server/Chemistry/EntitySystems/SolutionContainerMixerSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionContainerMixerSystem.cs
index a942d34e7a8..45a85010b19 100644
--- a/Content.Server/Chemistry/EntitySystems/SolutionContainerMixerSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/SolutionContainerMixerSystem.cs
@@ -2,6 +2,7 @@
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Power;
 
 namespace Content.Server.Chemistry.EntitySystems;
 
diff --git a/Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs
index 1ef589ab5cb..a9aaa211c77 100644
--- a/Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs
@@ -6,6 +6,7 @@
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Placeable;
+using Content.Shared.Power;
 
 namespace Content.Server.Chemistry.EntitySystems;
 
diff --git a/Content.Server/Cloning/CloningConsoleSystem.cs b/Content.Server/Cloning/CloningConsoleSystem.cs
index c0685024aae..7a54cce31f7 100644
--- a/Content.Server/Cloning/CloningConsoleSystem.cs
+++ b/Content.Server/Cloning/CloningConsoleSystem.cs
@@ -15,6 +15,7 @@
 using Content.Shared.Mind;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
+using Content.Shared.Power;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
diff --git a/Content.Server/Construction/ConstructionSystem.Computer.cs b/Content.Server/Construction/ConstructionSystem.Computer.cs
index 0685b08f4ff..6951d44b4d5 100644
--- a/Content.Server/Construction/ConstructionSystem.Computer.cs
+++ b/Content.Server/Construction/ConstructionSystem.Computer.cs
@@ -1,6 +1,7 @@
 using Content.Server.Construction.Components;
 using Content.Server.Power.Components;
 using Content.Shared.Computer;
+using Content.Shared.Power;
 using Robust.Shared.Containers;
 
 namespace Content.Server.Construction;
diff --git a/Content.Server/Construction/FlatpackSystem.cs b/Content.Server/Construction/FlatpackSystem.cs
index be082eba307..8068783abfe 100644
--- a/Content.Server/Construction/FlatpackSystem.cs
+++ b/Content.Server/Construction/FlatpackSystem.cs
@@ -4,6 +4,8 @@
 using Content.Shared.Construction;
 using Content.Shared.Construction.Components;
 using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Power;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
 namespace Content.Server.Construction;
diff --git a/Content.Server/DeviceNetwork/Systems/DeviceNetworkRequiresPowerSystem.cs b/Content.Server/DeviceNetwork/Systems/DeviceNetworkRequiresPowerSystem.cs
index 6e7bd255c5d..f47a5df8ac4 100644
--- a/Content.Server/DeviceNetwork/Systems/DeviceNetworkRequiresPowerSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/DeviceNetworkRequiresPowerSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
+using Content.Shared.Power.EntitySystems;
 
 namespace Content.Server.DeviceNetwork.Systems;
 
diff --git a/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs b/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs
index cdc083feacd..d189afc0a02 100644
--- a/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs
@@ -3,6 +3,7 @@
 using Content.Server.Medical.CrewMonitoring;
 using Content.Server.Power.Components;
 using Content.Server.Station.Systems;
+using Content.Shared.Power;
 
 namespace Content.Server.DeviceNetwork.Systems;
 
diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
index 84a835f523c..39d10583951 100644
--- a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
+++ b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
@@ -24,7 +24,7 @@
 using Content.Shared.Item;
 using Content.Shared.Movement.Events;
 using Content.Shared.Popups;
-using Content.Shared.Throwing;
+using Content.Shared.Power;
 using Content.Shared.Verbs;
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Doors/Systems/AirlockSystem.cs b/Content.Server/Doors/Systems/AirlockSystem.cs
index fd5d3a9ceba..e9f1db13ffb 100644
--- a/Content.Server/Doors/Systems/AirlockSystem.cs
+++ b/Content.Server/Doors/Systems/AirlockSystem.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Doors.Components;
 using Content.Shared.Doors.Systems;
 using Content.Shared.Interaction;
+using Content.Shared.Power;
 using Content.Shared.Wires;
 using Robust.Shared.Player;
 
diff --git a/Content.Server/Doors/Systems/DoorSystem.cs b/Content.Server/Doors/Systems/DoorSystem.cs
index 5968e445c19..292f8ec8e97 100644
--- a/Content.Server/Doors/Systems/DoorSystem.cs
+++ b/Content.Server/Doors/Systems/DoorSystem.cs
@@ -1,9 +1,9 @@
 using Content.Server.Access;
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.Power.Components;
 using Content.Shared.Doors.Components;
 using Content.Shared.Doors.Systems;
+using Content.Shared.Power;
 using Robust.Shared.Physics.Components;
 
 namespace Content.Server.Doors.Systems;
diff --git a/Content.Server/Doors/Systems/FirelockSystem.cs b/Content.Server/Doors/Systems/FirelockSystem.cs
index 3d4c8a4ec59..3c86ccc82d5 100644
--- a/Content.Server/Doors/Systems/FirelockSystem.cs
+++ b/Content.Server/Doors/Systems/FirelockSystem.cs
@@ -11,6 +11,7 @@
 using Content.Shared.Doors;
 using Content.Shared.Doors.Components;
 using Content.Shared.Doors.Systems;
+using Content.Shared.Power;
 using Content.Shared.Popups;
 using Content.Shared.Prying.Components;
 using Robust.Shared.Map.Components;
diff --git a/Content.Server/Fax/FaxSystem.cs b/Content.Server/Fax/FaxSystem.cs
index e86dbca4a13..bd7bf0c4e08 100644
--- a/Content.Server/Fax/FaxSystem.cs
+++ b/Content.Server/Fax/FaxSystem.cs
@@ -29,6 +29,8 @@
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
+using Content.Shared.NameModifier.Components;
+using Content.Shared.Power;
 
 namespace Content.Server.Fax;
 
diff --git a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
index 0d6fb3fb90c..4a118e696fa 100644
--- a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
@@ -22,6 +22,7 @@
 using System.Linq;
 using Content.Server.Jittering;
 using Content.Shared.Jittering;
+using Content.Shared.Power;
 
 namespace Content.Server.Kitchen.EntitySystems
 {
diff --git a/Content.Server/Lathe/LatheSystem.cs b/Content.Server/Lathe/LatheSystem.cs
index 7448a9b84dd..c41909ac7c9 100644
--- a/Content.Server/Lathe/LatheSystem.cs
+++ b/Content.Server/Lathe/LatheSystem.cs
@@ -14,6 +14,7 @@
 using Content.Shared.Emag.Components;
 using Content.Shared.Lathe;
 using Content.Shared.Materials;
+using Content.Shared.Power;
 using Content.Shared.ReagentSpeed;
 using Content.Shared.Research.Components;
 using Content.Shared.Research.Prototypes;
diff --git a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
index f2c4c7dcc59..154a4081259 100644
--- a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
@@ -8,6 +8,8 @@
 using Content.Shared.Examine;
 using Content.Shared.Light;
 using Content.Shared.Light.Components;
+using Content.Shared.Power;
+using Content.Shared.Station.Components;
 using Robust.Server.GameObjects;
 using Color = Robust.Shared.Maths.Color;
 
diff --git a/Content.Server/Light/EntitySystems/LitOnPoweredSystem.cs b/Content.Server/Light/EntitySystems/LitOnPoweredSystem.cs
index 752fb8f5fe6..3c5f7eaecb2 100644
--- a/Content.Server/Light/EntitySystems/LitOnPoweredSystem.cs
+++ b/Content.Server/Light/EntitySystems/LitOnPoweredSystem.cs
@@ -1,6 +1,8 @@
 using Content.Server.Light.Components;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
+using Content.Shared.Power;
+using Content.Shared.Power.Components;
 
 namespace Content.Server.Light.EntitySystems
 {
diff --git a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs
index e880cec5bbb..3c44ea46155 100644
--- a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs
@@ -24,6 +24,10 @@
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
 using Robust.Shared.Audio.Systems;
+using Content.Shared.Damage.Systems;
+using Content.Shared.Damage.Components;
+using Content.Shared.Power;
+using Content.Shared.Power.Components;
 
 namespace Content.Server.Light.EntitySystems
 {
diff --git a/Content.Server/Materials/MaterialReclaimerSystem.cs b/Content.Server/Materials/MaterialReclaimerSystem.cs
index 3b23308758d..44f92502553 100644
--- a/Content.Server/Materials/MaterialReclaimerSystem.cs
+++ b/Content.Server/Materials/MaterialReclaimerSystem.cs
@@ -23,6 +23,10 @@
 using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Shared.Database;
+using Content.Shared.Destructible;
+using Content.Shared.Emag.Components;
+using Content.Shared.Power;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Materials;
 
diff --git a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
index 97a758a5ed3..ec27c717286 100644
--- a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
+++ b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
@@ -24,6 +24,7 @@
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Popups;
+using Content.Shared.Power;
 using Content.Shared.Throwing;
 using Robust.Server.Player;
 using Robust.Shared.Audio.Systems;
diff --git a/Content.Server/Medical/CryoPodSystem.cs b/Content.Server/Medical/CryoPodSystem.cs
index caae6c5f17e..d90e49d2016 100644
--- a/Content.Server/Medical/CryoPodSystem.cs
+++ b/Content.Server/Medical/CryoPodSystem.cs
@@ -29,6 +29,7 @@
 using Content.Shared.Interaction;
 using Content.Shared.Medical.Cryogenics;
 using Content.Shared.MedicalScanner;
+using Content.Shared.Power;
 using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
diff --git a/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs b/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs
index dc1f67c7400..3eaadfa0dec 100644
--- a/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs
@@ -9,6 +9,7 @@
 using Content.Shared.Emag.Systems;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.Power;
 using Content.Shared.Storage.Components;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
diff --git a/Content.Server/Paper/PaperRandomStoryComponent.cs b/Content.Server/Paper/PaperRandomStoryComponent.cs
index 7c5744f0878..e5eb3860024 100644
--- a/Content.Server/Paper/PaperRandomStoryComponent.cs
+++ b/Content.Server/Paper/PaperRandomStoryComponent.cs
@@ -1,3 +1,7 @@
+using Content.Shared.Paper;
+using Content.Shared.StoryGen;
+using Robust.Shared.Prototypes;
+
 namespace Content.Server.Paper;
 
 /// <summary>
diff --git a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.ControlBox.cs b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.ControlBox.cs
index f3cff9f2e72..14dca2c7bb2 100644
--- a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.ControlBox.cs
+++ b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.ControlBox.cs
@@ -6,6 +6,7 @@
 using System.Diagnostics;
 using Content.Server.Administration.Managers;
 using Content.Shared.CCVar;
+using Content.Shared.Power;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Timing;
diff --git a/Content.Server/Physics/Controllers/ConveyorController.cs b/Content.Server/Physics/Controllers/ConveyorController.cs
index b3508025cb9..e459d7e87e0 100644
--- a/Content.Server/Physics/Controllers/ConveyorController.cs
+++ b/Content.Server/Physics/Controllers/ConveyorController.cs
@@ -6,6 +6,7 @@
 using Content.Shared.Maps;
 using Content.Shared.Physics;
 using Content.Shared.Physics.Controllers;
+using Content.Shared.Power;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Collision.Shapes;
 using Robust.Shared.Physics.Components;
diff --git a/Content.Server/Power/Components/ApcPowerReceiverComponent.cs b/Content.Server/Power/Components/ApcPowerReceiverComponent.cs
index 9a68e2aabb8..ebb3c6b42f3 100644
--- a/Content.Server/Power/Components/ApcPowerReceiverComponent.cs
+++ b/Content.Server/Power/Components/ApcPowerReceiverComponent.cs
@@ -59,11 +59,4 @@ public bool PowerDisabled {
 
         public float PowerReceived => NetworkLoad.ReceivingPower;
     }
-
-    /// <summary>
-    /// Raised whenever an ApcPowerReceiver becomes powered / unpowered.
-    /// Does nothing on the client.
-    /// </summary>
-    [ByRefEvent]
-    public readonly record struct PowerChangedEvent(bool Powered, float ReceivingPower);
 }
diff --git a/Content.Server/Power/Components/CableComponent.cs b/Content.Server/Power/Components/CableComponent.cs
index a2a02a60f68..7398bc0616e 100644
--- a/Content.Server/Power/Components/CableComponent.cs
+++ b/Content.Server/Power/Components/CableComponent.cs
@@ -4,6 +4,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using System.Diagnostics.Tracing;
+using Content.Shared.Tools.Systems;
 
 namespace Content.Server.Power.Components;
 
@@ -14,11 +15,11 @@ namespace Content.Server.Power.Components;
 [Access(typeof(CableSystem))]
 public sealed partial class CableComponent : Component
 {
-    [DataField("cableDroppedOnCutPrototype", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string CableDroppedOnCutPrototype = "CableHVStack1";
+    [DataField]
+    public EntProtoId CableDroppedOnCutPrototype = "CableHVStack1";
 
-    [DataField("cuttingQuality", customTypeSerializer:typeof(PrototypeIdSerializer<ToolQualityPrototype>))]
-    public string CuttingQuality = "Cutting";
+    [DataField]
+    public ProtoId<ToolQualityPrototype> CuttingQuality = SharedToolSystem.CutQuality;
 
     /// <summary>
     ///     Checked by <see cref="CablePlacerComponent"/> to determine if there is
diff --git a/Content.Server/Power/EntitySystems/ActivatableUIRequiresPowerSystem.cs b/Content.Server/Power/EntitySystems/ActivatableUIRequiresPowerSystem.cs
index 72843a65b84..e1c223c01e4 100644
--- a/Content.Server/Power/EntitySystems/ActivatableUIRequiresPowerSystem.cs
+++ b/Content.Server/Power/EntitySystems/ActivatableUIRequiresPowerSystem.cs
@@ -1,5 +1,8 @@
 using Content.Shared.Popups;
 using Content.Server.Power.Components;
+using Content.Shared.Power;
+using Content.Shared.Power.Components;
+using Content.Shared.Power.EntitySystems;
 using Content.Shared.UserInterface;
 using JetBrains.Annotations;
 using Content.Shared.Wires;
diff --git a/Content.Server/Power/EntitySystems/CableMultitoolSystem.cs b/Content.Server/Power/EntitySystems/CableMultitoolSystem.cs
index 15b967bb1d5..4a63be894ef 100644
--- a/Content.Server/Power/EntitySystems/CableMultitoolSystem.cs
+++ b/Content.Server/Power/EntitySystems/CableMultitoolSystem.cs
@@ -4,6 +4,7 @@
 using Content.Server.Tools;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
+using Content.Shared.Tools.Systems;
 using Content.Shared.Verbs;
 using JetBrains.Annotations;
 using Robust.Shared.Utility;
@@ -27,7 +28,7 @@ public override void Initialize()
 
         private void OnAfterInteractUsing(EntityUid uid, CableComponent component, AfterInteractUsingEvent args)
         {
-            if (args.Handled || args.Target == null || !args.CanReach || !_toolSystem.HasQuality(args.Used, "Pulsing"))
+            if (args.Handled || args.Target == null || !args.CanReach || !_toolSystem.HasQuality(args.Used, SharedToolSystem.PulseQuality))
                 return;
 
             var markup = FormattedMessage.FromMarkup(GenerateCableMarkup(uid));
@@ -45,7 +46,7 @@ private void OnGetExamineVerbs(EntityUid uid, CableComponent component, GetVerbs
 
                 // Pulsing is hardcoded here because I don't think it needs to be more complex than that right now.
                 // Update if I'm wrong.
-                var enabled = held != null && _toolSystem.HasQuality(held.Value, "Pulsing");
+                var enabled = held != null && _toolSystem.HasQuality(held.Value, SharedToolSystem.PulseQuality);
                 var verb = new ExamineVerb
                 {
                     Disabled = !enabled,
diff --git a/Content.Server/Power/EntitySystems/ChargerSystem.cs b/Content.Server/Power/EntitySystems/ChargerSystem.cs
index 038295eac11..2aa69024df3 100644
--- a/Content.Server/Power/EntitySystems/ChargerSystem.cs
+++ b/Content.Server/Power/EntitySystems/ChargerSystem.cs
@@ -8,6 +8,7 @@
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
 using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Power.Components;
 using Content.Shared.Storage.Components;
 using Robust.Server.Containers;
 using Content.Shared.Whitelist;
diff --git a/Content.Server/Power/EntitySystems/PowerNetSystem.cs b/Content.Server/Power/EntitySystems/PowerNetSystem.cs
index 6c35ba20083..8dcb6240a56 100644
--- a/Content.Server/Power/EntitySystems/PowerNetSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerNetSystem.cs
@@ -5,6 +5,7 @@
 using Content.Server.Power.Pow3r;
 using Content.Shared.CCVar;
 using Content.Shared.Power;
+using Content.Shared.Power.Components;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Configuration;
diff --git a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
index a314fe0ca11..47ac38b9972 100644
--- a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using Content.Server.Administration.Logs;
 using Content.Server.Administration.Managers;
 using Content.Server.Power.Components;
@@ -206,5 +207,17 @@ public void SetLoad(ApcPowerReceiverComponent comp, float load)
         {
             comp.Load = load;
         }
+
+        public override bool ResolveApc(EntityUid entity, [NotNullWhen(true)] ref SharedApcPowerReceiverComponent? component)
+        {
+            if (component != null)
+                return true;
+
+            if (!TryComp(entity, out ApcPowerReceiverComponent? receiver))
+                return false;
+
+            component = receiver;
+            return true;
+        }
     }
 }
diff --git a/Content.Server/Power/Generation/Teg/TegSystem.cs b/Content.Server/Power/Generation/Teg/TegSystem.cs
index 540bd6c4832..dd09467efe0 100644
--- a/Content.Server/Power/Generation/Teg/TegSystem.cs
+++ b/Content.Server/Power/Generation/Teg/TegSystem.cs
@@ -10,6 +10,8 @@
 using Content.Shared.Atmos;
 using Content.Shared.DeviceNetwork;
 using Content.Shared.Examine;
+using Content.Shared.Power;
+using Content.Shared.Power.Components;
 using Content.Shared.Power.Generation.Teg;
 using Content.Shared.Rounding;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Power/Generator/GasPowerReceiverSystem.cs b/Content.Server/Power/Generator/GasPowerReceiverSystem.cs
index 5f79906c995..5a1bd31a15c 100644
--- a/Content.Server/Power/Generator/GasPowerReceiverSystem.cs
+++ b/Content.Server/Power/Generator/GasPowerReceiverSystem.cs
@@ -5,6 +5,8 @@
 using Content.Server.NodeContainer.Nodes;
 using Content.Server.Power.Components;
 using Content.Shared.Atmos;
+using Content.Shared.Power;
+using Content.Shared.Power.Components;
 
 namespace Content.Server.Power.Generator;
 
diff --git a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
index 02e46e6b11d..0cb20b3187b 100644
--- a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
@@ -11,6 +11,7 @@
 using Content.Shared.Chat;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
+using Content.Shared.Power;
 using Content.Shared.Radio;
 using Content.Shared.Radio.Components;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
index 5550201202f..e37be3d1a52 100644
--- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
@@ -12,6 +12,7 @@
 using Content.Shared.Shuttles.Systems;
 using Content.Shared.Tag;
 using Content.Shared.Movement.Systems;
+using Content.Shared.Power;
 using Content.Shared.Shuttles.UI.MapObjects;
 using Content.Shared.Timing;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Shuttles/Systems/ThrusterSystem.cs b/Content.Server/Shuttles/Systems/ThrusterSystem.cs
index 2454856a701..b1426802135 100644
--- a/Content.Server/Shuttles/Systems/ThrusterSystem.cs
+++ b/Content.Server/Shuttles/Systems/ThrusterSystem.cs
@@ -19,6 +19,8 @@
 using Robust.Shared.Physics.Systems;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using Content.Shared.Localizations;
+using Content.Shared.Power;
 
 namespace Content.Server.Shuttles.Systems;
 
diff --git a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
index 652ca236e44..e728f4986bb 100644
--- a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
@@ -12,6 +12,7 @@
 using Content.Shared.Interaction;
 using Content.Shared.Lock;
 using Content.Shared.Popups;
+using Content.Shared.Power;
 using Content.Shared.Projectiles;
 using Content.Shared.Singularity.Components;
 using Content.Shared.Singularity.EntitySystems;
diff --git a/Content.Server/Sound/SpamEmitSoundRequirePowerSystem.cs b/Content.Server/Sound/SpamEmitSoundRequirePowerSystem.cs
index 9cc85060c6e..d2c2a8a1ca7 100644
--- a/Content.Server/Sound/SpamEmitSoundRequirePowerSystem.cs
+++ b/Content.Server/Sound/SpamEmitSoundRequirePowerSystem.cs
@@ -1,5 +1,7 @@
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
+using Content.Shared.Power;
+using Content.Shared.Power.Components;
 using Content.Shared.Sound;
 using Content.Shared.Sound.Components;
 
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
index ca0f59cd14d..5cc3c52be45 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
@@ -3,6 +3,7 @@
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.Power.Components;
 using Content.Shared.DeviceNetwork;
+using Content.Shared.Power;
 using Content.Shared.UserInterface;
 using Content.Shared.SurveillanceCamera;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraRouterSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraRouterSystem.cs
index d0c2cd78d32..315273a0cc4 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraRouterSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraRouterSystem.cs
@@ -4,6 +4,7 @@
 using Content.Server.Power.Components;
 using Content.Shared.ActionBlocker;
 using Content.Shared.DeviceNetwork;
+using Content.Shared.Power;
 using Content.Shared.SurveillanceCamera;
 using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
index accaa75d1c3..f84039276f4 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
@@ -4,6 +4,7 @@
 using Content.Server.Power.Components;
 using Content.Shared.ActionBlocker;
 using Content.Shared.DeviceNetwork;
+using Content.Shared.Power;
 using Content.Shared.SurveillanceCamera;
 using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Temperature/Systems/EntityHeaterSystem.cs b/Content.Server/Temperature/Systems/EntityHeaterSystem.cs
index 6da774ba076..cf86400b0ea 100644
--- a/Content.Server/Temperature/Systems/EntityHeaterSystem.cs
+++ b/Content.Server/Temperature/Systems/EntityHeaterSystem.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Examine;
 using Content.Shared.Placeable;
 using Content.Shared.Popups;
+using Content.Shared.Power;
 using Content.Shared.Temperature;
 using Content.Shared.Verbs;
 
diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs
index 60be1ad6f1b..6b233cd43f1 100644
--- a/Content.Server/VendingMachines/VendingMachineSystem.cs
+++ b/Content.Server/VendingMachines/VendingMachineSystem.cs
@@ -16,6 +16,7 @@
 using Content.Shared.Emag.Systems;
 using Content.Shared.Emp;
 using Content.Shared.Popups;
+using Content.Shared.Power;
 using Content.Shared.Throwing;
 using Content.Shared.UserInterface;
 using Content.Shared.VendingMachines;
diff --git a/Content.Server/Wires/WiresSystem.cs b/Content.Server/Wires/WiresSystem.cs
index fce81db3277..440b1f6dce7 100644
--- a/Content.Server/Wires/WiresSystem.cs
+++ b/Content.Server/Wires/WiresSystem.cs
@@ -10,6 +10,7 @@
 using Content.Shared.Hands.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
+using Content.Shared.Power;
 using Content.Shared.Tools.Components;
 using Content.Shared.UserInterface;
 using Content.Shared.Wires;
diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs
index 72d99460fe2..a9f224ad5d9 100644
--- a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs
+++ b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs
@@ -11,6 +11,7 @@
 using Content.Shared.DeviceLinking.Events;
 using Content.Shared.Placeable;
 using Content.Shared.Popups;
+using Content.Shared.Power;
 using Content.Shared.Research.Components;
 using Content.Shared.Xenoarchaeology.Equipment;
 using Content.Shared.Xenoarchaeology.XenoArtifacts;
diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
index 6606f284327..b4303f97d81 100644
--- a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
+++ b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
@@ -7,6 +7,7 @@
 using Content.Server.Xenoarchaeology.XenoArtifacts;
 using Content.Shared.Body.Components;
 using Content.Shared.Damage;
+using Content.Shared.Power;
 using Content.Shared.Verbs;
 using Content.Shared.Xenoarchaeology.Equipment;
 using Robust.Shared.Collections;
diff --git a/Content.Shared/Cabinet/ItemCabinetComponent.cs b/Content.Shared/Cabinet/ItemCabinetComponent.cs
index dcc276e5651..0ea30a8ca54 100644
--- a/Content.Shared/Cabinet/ItemCabinetComponent.cs
+++ b/Content.Shared/Cabinet/ItemCabinetComponent.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Containers.ItemSlots;
-using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Cabinet;
diff --git a/Content.Shared/Clothing/Components/PilotedByClothingComponent.cs b/Content.Shared/Clothing/Components/PilotedByClothingComponent.cs
index cd4d0d62030..a5303ac1212 100644
--- a/Content.Shared/Clothing/Components/PilotedByClothingComponent.cs
+++ b/Content.Shared/Clothing/Components/PilotedByClothingComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Clothing.EntitySystems;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Clothing.Components;
diff --git a/Content.Shared/Clothing/Components/ToggleClothingComponent.cs b/Content.Shared/Clothing/Components/ToggleClothingComponent.cs
index c77aa03475f..04bc3ed4e83 100644
--- a/Content.Shared/Clothing/Components/ToggleClothingComponent.cs
+++ b/Content.Shared/Clothing/Components/ToggleClothingComponent.cs
@@ -1,5 +1,7 @@
 using Content.Shared.Actions;
 using Content.Shared.Clothing.EntitySystems;
+using Content.Shared.Item.ItemToggle.Components;
+using Content.Shared.Toggleable;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/Light/Components/SlimPoweredLightComponent.cs b/Content.Shared/Light/Components/SlimPoweredLightComponent.cs
new file mode 100644
index 00000000000..bf6ae0e5251
--- /dev/null
+++ b/Content.Shared/Light/Components/SlimPoweredLightComponent.cs
@@ -0,0 +1,17 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Light.Components;
+
+// All content light code is terrible and everything is baked-in. Power code got predicted before light code did.
+/// <summary>
+/// Handles turning a pointlight on / off based on power. Nothing else
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class SlimPoweredLightComponent : Component
+{
+    /// <summary>
+    /// Used to make this as being lit. If unpowered then the light will still be off.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Enabled = true;
+}
diff --git a/Content.Shared/Light/EntitySystems/SlimPoweredLightSystem.cs b/Content.Shared/Light/EntitySystems/SlimPoweredLightSystem.cs
new file mode 100644
index 00000000000..6d984ed19a3
--- /dev/null
+++ b/Content.Shared/Light/EntitySystems/SlimPoweredLightSystem.cs
@@ -0,0 +1,67 @@
+using Content.Shared.Light.Components;
+using Content.Shared.Power;
+using Content.Shared.Power.Components;
+using Content.Shared.Power.EntitySystems;
+
+namespace Content.Shared.Light.EntitySystems;
+
+public sealed class SlimPoweredLightSystem : EntitySystem
+{
+    [Dependency] private readonly SharedPowerReceiverSystem _receiver = default!;
+    [Dependency] private readonly SharedPointLightSystem _lights = default!;
+
+    private bool _setting;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<SlimPoweredLightComponent, AttemptPointLightToggleEvent>(OnLightAttempt);
+        SubscribeLocalEvent<SlimPoweredLightComponent, PowerChangedEvent>(OnLightPowerChanged);
+    }
+
+    private void OnLightAttempt(Entity<SlimPoweredLightComponent> ent, ref AttemptPointLightToggleEvent args)
+    {
+        // Early-out to avoid having to trycomp stuff if we're the caller setting it
+        if (_setting)
+            return;
+
+        if (args.Enabled && !_receiver.IsPowered(ent.Owner))
+            args.Cancelled = true;
+    }
+
+    private void OnLightPowerChanged(Entity<SlimPoweredLightComponent> ent, ref PowerChangedEvent args)
+    {
+        // Early out if we don't need to trycomp.
+        if (args.Powered)
+        {
+            if (!ent.Comp.Enabled)
+                return;
+        }
+        else
+        {
+            if (!ent.Comp.Enabled)
+                return;
+        }
+
+        if (!_lights.TryGetLight(ent.Owner, out var light))
+            return;
+
+        var enabled = ent.Comp.Enabled && args.Powered;
+        _setting = true;
+        _lights.SetEnabled(ent.Owner, enabled, light);
+        _setting = false;
+    }
+
+    public void SetEnabled(Entity<SlimPoweredLightComponent?> entity, bool enabled)
+    {
+        if (!Resolve(entity.Owner, ref entity.Comp, false))
+            return;
+
+        if (entity.Comp.Enabled == enabled)
+            return;
+
+        entity.Comp.Enabled = enabled;
+        Dirty(entity);
+        _lights.SetEnabled(entity.Owner, enabled);
+    }
+}
diff --git a/Content.Shared/Light/EntitySystems/UnpoweredFlashlightSystem.cs b/Content.Shared/Light/EntitySystems/UnpoweredFlashlightSystem.cs
index 42e55bea55d..8754de50583 100644
--- a/Content.Shared/Light/EntitySystems/UnpoweredFlashlightSystem.cs
+++ b/Content.Shared/Light/EntitySystems/UnpoweredFlashlightSystem.cs
@@ -13,6 +13,8 @@ namespace Content.Shared.Light.EntitySystems;
 
 public sealed class UnpoweredFlashlightSystem : EntitySystem
 {
+    // TODO: Split some of this to ItemTogglePointLight
+
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
diff --git a/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs b/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs
index 37ac7518896..2bc2af78314 100644
--- a/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs
+++ b/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Examine;
 using Content.Shared.Power.Components;
 
@@ -5,6 +6,16 @@ namespace Content.Shared.Power.EntitySystems;
 
 public abstract class SharedPowerReceiverSystem : EntitySystem
 {
+    public abstract bool ResolveApc(EntityUid entity, [NotNullWhen(true)] ref SharedApcPowerReceiverComponent? component);
+
+    public bool IsPowered(Entity<SharedApcPowerReceiverComponent?> entity)
+    {
+        if (!ResolveApc(entity.Owner, ref entity.Comp))
+            return true;
+
+        return entity.Comp.Powered;
+    }
+
     protected string GetExamineText(bool powered)
     {
         return Loc.GetString("power-receiver-component-on-examine-main",
diff --git a/Content.Shared/Power/PowerChangedEvent.cs b/Content.Shared/Power/PowerChangedEvent.cs
new file mode 100644
index 00000000000..578a34142a8
--- /dev/null
+++ b/Content.Shared/Power/PowerChangedEvent.cs
@@ -0,0 +1,8 @@
+namespace Content.Shared.Power;
+
+/// <summary>
+/// Raised whenever an ApcPowerReceiver becomes powered / unpowered.
+/// Does nothing on the client.
+/// </summary>
+[ByRefEvent]
+public readonly record struct PowerChangedEvent(bool Powered, float ReceivingPower);
\ No newline at end of file
diff --git a/Content.Shared/PowerCell/PowerCellDrawComponent.cs b/Content.Shared/PowerCell/PowerCellDrawComponent.cs
index 94de7c77878..e4402e9eff4 100644
--- a/Content.Shared/PowerCell/PowerCellDrawComponent.cs
+++ b/Content.Shared/PowerCell/PowerCellDrawComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Item.ItemToggle.Components;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.cs b/Content.Shared/Tools/Systems/SharedToolSystem.cs
index aa69d3db78a..1336fe1527c 100644
--- a/Content.Shared/Tools/Systems/SharedToolSystem.cs
+++ b/Content.Shared/Tools/Systems/SharedToolSystem.cs
@@ -33,6 +33,9 @@ public abstract partial class SharedToolSystem : EntitySystem
     [Dependency] private   readonly TurfSystem _turfs = default!;
     [Dependency] protected readonly SharedSolutionContainerSystem SolutionContainer = default!;
 
+    public const string CutQuality = "Cutting";
+    public const string PulseQuality = "Pulsing";
+
     public override void Initialize()
     {
         InitializeMultipleTool();

From 2257634fc9c0c53f6607853e258d01cf26449632 Mon Sep 17 00:00:00 2001
From: Simon <63975668+Simyon264@users.noreply.github.com>
Date: Fri, 9 Aug 2024 08:16:22 +0200
Subject: [PATCH 015/366] UI to edit silicon laws from admin verb (#28483)

* UI to edit silicon laws from admin verb

(peak shitcode)

* Improve UI

* Use Moderator admin flag

* Reviews
---
 .../SiliconLawEditUi/SiliconLawContainer.xaml | 31 +++++++
 .../SiliconLawContainer.xaml.cs               | 61 +++++++++++++
 .../Laws/SiliconLawEditUi/SiliconLawEui.cs    | 38 ++++++++
 .../Laws/SiliconLawEditUi/SiliconLawUi.xaml   | 22 +++++
 .../SiliconLawEditUi/SiliconLawUi.xaml.cs     | 89 +++++++++++++++++++
 Content.Client/Stylesheets/StyleNano.cs       |  5 ++
 .../Administration/Systems/AdminVerbSystem.cs | 25 ++++++
 Content.Server/Silicons/Laws/SiliconLawEui.cs | 70 +++++++++++++++
 .../Silicons/Laws/SiliconLawSystem.cs         | 16 ++++
 .../Silicons/Laws/SiliconLawEditEuiState.cs   | 29 ++++++
 .../administration/ui/silicon-law-ui.ftl      | 10 +++
 11 files changed, 396 insertions(+)
 create mode 100644 Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml
 create mode 100644 Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml.cs
 create mode 100644 Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawEui.cs
 create mode 100644 Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml
 create mode 100644 Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml.cs
 create mode 100644 Content.Server/Silicons/Laws/SiliconLawEui.cs
 create mode 100644 Content.Shared/Silicons/Laws/SiliconLawEditEuiState.cs
 create mode 100644 Resources/Locale/en-US/administration/ui/silicon-law-ui.ftl

diff --git a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml
new file mode 100644
index 00000000000..1bcac4bca65
--- /dev/null
+++ b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml
@@ -0,0 +1,31 @@
+<BoxContainer
+    xmlns="https://spacestation14.io"
+    xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    HorizontalExpand="True"
+    Orientation="Vertical"
+    >
+    <customControls:HSeparator></customControls:HSeparator>
+    <BoxContainer>
+        <Label StyleClasses="SiliconLawPositionLabel" Name="PositionText" Margin="5 0 0 0"></Label>
+        <PanelContainer
+            Margin="20 10 0 0"
+            MinHeight="128"
+        >
+            <PanelContainer.PanelOverride>
+                <graphics:StyleBoxFlat BackgroundColor="#1B1B1B"></graphics:StyleBoxFlat>
+            </PanelContainer.PanelOverride>
+            <BoxContainer Orientation="Horizontal" SeparationOverride="5">
+                <TextEdit Name="LawContent" HorizontalExpand="True" Editable="True" MinWidth="500" MinHeight="80"></TextEdit>
+            </BoxContainer>
+        </PanelContainer>
+    </BoxContainer>
+    <BoxContainer Orientation="Horizontal" Margin="0 5 0 0" MaxHeight="64" Align="Begin">
+        <Button Name="MoveUp" Text="{Loc silicon-law-ui-minus-one}" StyleClasses="OpenRight"></Button>
+        <Button Name="MoveDown" Text="{Loc silicon-law-ui-plus-one}" StyleClasses="OpenLeft"></Button>
+        <CheckBox Name="Corrupted" Text="{Loc silicon-law-ui-check-corrupted}" ToolTip="{Loc silicon-law-ui-check-corrupted-tooltip}"></CheckBox>
+    </BoxContainer>
+    <BoxContainer Orientation="Horizontal" Align="End" Margin="0 10 5 10">
+        <Button Name="Delete" Text="{Loc silicon-law-ui-delete}" ModulateSelfOverride="Red"></Button>
+    </BoxContainer>
+</BoxContainer>
diff --git a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml.cs b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml.cs
new file mode 100644
index 00000000000..2e44b820df9
--- /dev/null
+++ b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml.cs
@@ -0,0 +1,61 @@
+using Content.Shared.Silicons.Laws;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Silicons.Laws.SiliconLawEditUi;
+
+[GenerateTypedNameReferences]
+public sealed partial class SiliconLawContainer : BoxContainer
+{
+    public const string StyleClassSiliconLawPositionLabel = "SiliconLawPositionLabel";
+
+    public static readonly string CorruptedString =
+        Loc.GetString("ion-storm-law-scrambled-number", ("length", 5));
+
+    private SiliconLaw? _law;
+
+    public event Action<SiliconLaw>? MoveLawUp;
+    public event Action<SiliconLaw>? MoveLawDown;
+    public event Action<SiliconLaw>? DeleteAction;
+
+
+    public SiliconLawContainer()
+    {
+        RobustXamlLoader.Load(this);
+
+        MoveUp.OnPressed += _ => MoveLawUp?.Invoke(_law!);
+        MoveDown.OnPressed += _ => MoveLawDown?.Invoke(_law!);
+        Corrupted.OnPressed += _ =>
+        {
+            if (Corrupted.Pressed)
+            {
+                _law!.LawIdentifierOverride = CorruptedString;
+            }
+            else
+            {
+                _law!.LawIdentifierOverride = null;
+            }
+        };
+
+        LawContent.OnTextChanged += _ => _law!.LawString = Rope.Collapse(LawContent.TextRope).Trim();
+        LawContent.Placeholder = new Rope.Leaf(Loc.GetString("silicon-law-ui-placeholder"));
+        Delete.OnPressed += _ => DeleteAction?.Invoke(_law!);
+    }
+
+    public void SetLaw(SiliconLaw law)
+    {
+        _law = law;
+        LawContent.TextRope = new Rope.Leaf(Loc.GetString(law.LawString));
+        PositionText.Text = law.Order.ToString();
+        if (!string.IsNullOrEmpty(law.LawIdentifierOverride))
+        {
+            Corrupted.Pressed = true;
+        }
+        else
+        {
+            Corrupted.Pressed = false;
+        }
+    }
+}
diff --git a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawEui.cs b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawEui.cs
new file mode 100644
index 00000000000..a4d59d1f315
--- /dev/null
+++ b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawEui.cs
@@ -0,0 +1,38 @@
+using Content.Client.Eui;
+using Content.Shared.Eui;
+using Content.Shared.Silicons.Laws;
+
+namespace Content.Client.Silicons.Laws.SiliconLawEditUi;
+
+public sealed class SiliconLawEui : BaseEui
+{
+    public readonly EntityManager _entityManager = default!;
+
+    private SiliconLawUi _siliconLawUi;
+    private EntityUid _target;
+
+    public SiliconLawEui()
+    {
+        _entityManager = IoCManager.Resolve<EntityManager>();
+
+        _siliconLawUi = new SiliconLawUi();
+        _siliconLawUi.OnClose += () => SendMessage(new CloseEuiMessage());
+        _siliconLawUi.Save.OnPressed += _ => SendMessage(new SiliconLawsSaveMessage(_siliconLawUi.GetLaws(), _entityManager.GetNetEntity(_target)));
+    }
+
+    public override void HandleState(EuiStateBase state)
+    {
+        if (state is not SiliconLawsEuiState s)
+        {
+            return;
+        }
+
+        _target = _entityManager.GetEntity(s.Target);
+        _siliconLawUi.SetLaws(s.Laws);
+    }
+
+    public override void Opened()
+    {
+        _siliconLawUi.OpenCentered();
+    }
+}
diff --git a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml
new file mode 100644
index 00000000000..19dcbac6202
--- /dev/null
+++ b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml
@@ -0,0 +1,22 @@
+<controls:FancyWindow
+    xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    Title="{Loc silicon-law-ui-title}"
+    MinSize="560 400"
+>
+    <!-->
+    this shit does not layout properly unless I put the horizontal boxcontainer inside of a vertical one
+    ????
+    <!-->
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Horizontal" Align="End">
+            <Button Name="NewLawButton" Text="{Loc silicon-law-ui-new-law}" MaxSize="256 64" StyleClasses="OpenRight"></Button>
+            <Button Name="Save" Text="{Loc silicon-law-ui-save}" MaxSize="256 64" Access="Public" StyleClasses="OpenLeft"></Button>
+        </BoxContainer>
+    </BoxContainer>
+    <BoxContainer Orientation="Vertical" Margin="4 60 0 0">
+        <ScrollContainer VerticalExpand="True" HorizontalExpand="True" HScrollEnabled="False">
+            <BoxContainer Orientation="Vertical" Name="LawContainer" Access="Public" VerticalExpand="True" />
+        </ScrollContainer>
+    </BoxContainer>
+</controls:FancyWindow>
diff --git a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml.cs b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml.cs
new file mode 100644
index 00000000000..372961ea9a3
--- /dev/null
+++ b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml.cs
@@ -0,0 +1,89 @@
+using System.Linq;
+using Content.Client.UserInterface.Controls;
+using Content.Shared.FixedPoint;
+using Content.Shared.Silicons.Laws;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Silicons.Laws.SiliconLawEditUi;
+
+[GenerateTypedNameReferences]
+public sealed partial class SiliconLawUi : FancyWindow
+{
+    private List<SiliconLaw> _laws = new();
+
+    public SiliconLawUi()
+    {
+        RobustXamlLoader.Load(this);
+        NewLawButton.OnPressed += _ => AddNewLaw();
+    }
+
+    private void AddNewLaw()
+    {
+        var newLaw = new SiliconLaw();
+        newLaw.Order = FixedPoint2.New(_laws.Count + 1);
+        _laws.Add(newLaw);
+        SetLaws(_laws);
+    }
+
+    public void SetLaws(List<SiliconLaw> sLaws)
+    {
+        _laws = sLaws;
+        LawContainer.RemoveAllChildren();
+        foreach (var law in sLaws.OrderBy(l => l.Order))
+        {
+            var lawControl = new SiliconLawContainer();
+            lawControl.SetLaw(law);
+            lawControl.MoveLawDown += MoveLawDown;
+            lawControl.MoveLawUp += MoveLawUp;
+            lawControl.DeleteAction += DeleteLaw;
+
+            LawContainer.AddChild(lawControl);
+        }
+    }
+
+    public void DeleteLaw(SiliconLaw law)
+    {
+        _laws.Remove(law);
+        SetLaws(_laws);
+    }
+
+    public void MoveLawDown(SiliconLaw law)
+    {
+        if (_laws.Count == 0)
+        {
+            return;
+        }
+
+        var index = _laws.IndexOf(law);
+        if (index == -1)
+        {
+            return;
+        }
+
+        _laws[index].Order += FixedPoint2.New(1);
+        SetLaws(_laws);
+    }
+
+    public void MoveLawUp(SiliconLaw law)
+    {
+        if (_laws.Count == 0)
+        {
+            return;
+        }
+
+        var index = _laws.IndexOf(law);
+        if (index == -1)
+        {
+            return;
+        }
+
+        _laws[index].Order += FixedPoint2.New(-1);
+        SetLaws(_laws);
+    }
+
+    public List<SiliconLaw> GetLaws()
+    {
+        return _laws;
+    }
+}
diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs
index 67b81c11454..aa170c9cf5a 100644
--- a/Content.Client/Stylesheets/StyleNano.cs
+++ b/Content.Client/Stylesheets/StyleNano.cs
@@ -4,6 +4,7 @@
 using Content.Client.Examine;
 using Content.Client.PDA;
 using Content.Client.Resources;
+using Content.Client.Silicons.Laws.SiliconLawEditUi;
 using Content.Client.UserInterface.Controls;
 using Content.Client.UserInterface.Controls.FancyTree;
 using Content.Client.Verbs.UI;
@@ -1626,6 +1627,10 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                     {
                         BackgroundColor = FancyTreeSelectedRowColor,
                     }),
+
+                // Silicon law edit ui
+                Element<Label>().Class(SiliconLawContainer.StyleClassSiliconLawPositionLabel)
+                    .Prop(Label.StylePropertyFontColor, NanoGold),
                 // Pinned button style
                 new StyleRule(
                     new SelectorElement(typeof(TextureButton), new[] { StyleClassPinButtonPinned }, null, null),
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.cs b/Content.Server/Administration/Systems/AdminVerbSystem.cs
index 5bb75b4c99c..32e349a9024 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs
@@ -35,6 +35,9 @@
 using Robust.Shared.Utility;
 using System.Linq;
 using System.Numerics;
+using Content.Server.Silicons.Laws;
+using Content.Shared.Silicons.Laws.Components;
+using Robust.Server.Player;
 using Robust.Shared.Physics.Components;
 using static Content.Shared.Configurable.ConfigurationComponent;
 
@@ -67,6 +70,9 @@ public sealed partial class AdminVerbSystem : EntitySystem
         [Dependency] private readonly StationSystem _stations = default!;
         [Dependency] private readonly StationSpawningSystem _spawning = default!;
         [Dependency] private readonly ExamineSystemShared _examine = default!;
+        [Dependency] private readonly AdminFrozenSystem _freeze = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly SiliconLawSystem _siliconLawSystem = default!;
 
         private readonly Dictionary<ICommonSession, List<EditSolutionsEui>> _openSolutionUis = new();
 
@@ -294,6 +300,25 @@ private void AddAdminVerbs(GetVerbsEvent<Verb> args)
                     Impact = LogImpact.Low
                 });
 
+                if (TryComp<SiliconLawBoundComponent>(args.Target, out var lawBoundComponent))
+                {
+                    args.Verbs.Add(new Verb()
+                    {
+                        Text = Loc.GetString("silicon-law-ui-verb"),
+                        Category = VerbCategory.Admin,
+                        Act = () =>
+                        {
+                            var ui = new SiliconLawEui(_siliconLawSystem, EntityManager, _adminManager);
+                            if (!_playerManager.TryGetSessionByEntity(args.User, out var session))
+                            {
+                                return;
+                            }
+                            _euiManager.OpenEui(ui, session);
+                            ui.UpdateLaws(lawBoundComponent, args.Target);
+                        },
+                        Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Interface/Actions/actions_borg.rsi"), "state-laws"),
+                    });
+                }
             }
         }
 
diff --git a/Content.Server/Silicons/Laws/SiliconLawEui.cs b/Content.Server/Silicons/Laws/SiliconLawEui.cs
new file mode 100644
index 00000000000..d5a5c4f4091
--- /dev/null
+++ b/Content.Server/Silicons/Laws/SiliconLawEui.cs
@@ -0,0 +1,70 @@
+using Content.Server.Administration.Managers;
+using Content.Server.EUI;
+using Content.Shared.Administration;
+using Content.Shared.Eui;
+using Content.Shared.Silicons.Laws;
+using Content.Shared.Silicons.Laws.Components;
+
+namespace Content.Server.Silicons.Laws;
+
+public sealed class SiliconLawEui : BaseEui
+{
+    private readonly SiliconLawSystem _siliconLawSystem;
+    private readonly EntityManager _entityManager;
+    private readonly IAdminManager _adminManager;
+
+    private List<SiliconLaw> _laws = new();
+    private ISawmill _sawmill = default!;
+    private EntityUid _target;
+
+    public SiliconLawEui(SiliconLawSystem siliconLawSystem, EntityManager entityManager, IAdminManager manager)
+    {
+        _siliconLawSystem = siliconLawSystem;
+        _adminManager = manager;
+        _entityManager = entityManager;
+        _sawmill = Logger.GetSawmill("silicon-law-eui");
+    }
+
+    public override EuiStateBase GetNewState()
+    {
+        return new SiliconLawsEuiState(_laws, _entityManager.GetNetEntity(_target));
+    }
+
+    public void UpdateLaws(SiliconLawBoundComponent? lawBoundComponent, EntityUid player)
+    {
+        if (!IsAllowed())
+            return;
+
+        var laws = _siliconLawSystem.GetLaws(player, lawBoundComponent);
+        _laws = laws.Laws;
+        _target = player;
+        StateDirty();
+    }
+
+    public override void HandleMessage(EuiMessageBase msg)
+    {
+        if (msg is not SiliconLawsSaveMessage message)
+        {
+            return;
+        }
+
+        if (!IsAllowed())
+            return;
+
+        var player = _entityManager.GetEntity(message.Target);
+
+        _siliconLawSystem.SetLaws(message.Laws, player);
+    }
+
+    private bool IsAllowed()
+    {
+        var adminData = _adminManager.GetAdminData(Player);
+        if (adminData == null || !adminData.HasFlag(AdminFlags.Moderator))
+        {
+            _sawmill.Warning("Player {0} tried to open / use silicon law UI without permission.", Player.UserId);
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/Content.Server/Silicons/Laws/SiliconLawSystem.cs b/Content.Server/Silicons/Laws/SiliconLawSystem.cs
index bc7a7b35c27..0c0f68c23f3 100644
--- a/Content.Server/Silicons/Laws/SiliconLawSystem.cs
+++ b/Content.Server/Silicons/Laws/SiliconLawSystem.cs
@@ -22,6 +22,7 @@
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Toolshed;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Silicons.Laws;
 
@@ -278,6 +279,21 @@ public SiliconLawset GetLawset(string lawset)
 
         return laws;
     }
+
+    /// <summary>
+    /// Set the laws of a silicon entity while notifying the player.
+    /// </summary>
+    public void SetLaws(List<SiliconLaw> newLaws, EntityUid target)
+    {
+        if (!TryComp<SiliconLawProviderComponent>(target, out var component))
+            return;
+
+        if (component.Lawset == null)
+            component.Lawset = new SiliconLawset();
+
+        component.Lawset.Laws = newLaws;
+        NotifyLawsChanged(target);
+    }
 }
 
 [ToolshedCommand, AdminCommand(AdminFlags.Admin)]
diff --git a/Content.Shared/Silicons/Laws/SiliconLawEditEuiState.cs b/Content.Shared/Silicons/Laws/SiliconLawEditEuiState.cs
new file mode 100644
index 00000000000..b5b35837153
--- /dev/null
+++ b/Content.Shared/Silicons/Laws/SiliconLawEditEuiState.cs
@@ -0,0 +1,29 @@
+using Content.Shared.Eui;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Silicons.Laws;
+
+[Serializable, NetSerializable]
+public sealed class SiliconLawsEuiState : EuiStateBase
+{
+    public List<SiliconLaw> Laws { get; }
+    public NetEntity Target { get; }
+    public SiliconLawsEuiState(List<SiliconLaw> laws, NetEntity target)
+    {
+        Laws = laws;
+        Target = target;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class SiliconLawsSaveMessage : EuiMessageBase
+{
+    public List<SiliconLaw> Laws { get; }
+    public NetEntity Target { get; }
+
+    public SiliconLawsSaveMessage(List<SiliconLaw> laws, NetEntity target)
+    {
+        Laws = laws;
+        Target = target;
+    }
+}
diff --git a/Resources/Locale/en-US/administration/ui/silicon-law-ui.ftl b/Resources/Locale/en-US/administration/ui/silicon-law-ui.ftl
new file mode 100644
index 00000000000..0a68d08063a
--- /dev/null
+++ b/Resources/Locale/en-US/administration/ui/silicon-law-ui.ftl
@@ -0,0 +1,10 @@
+silicon-law-ui-verb = Manage laws
+silicon-law-ui-title = Silicon laws
+silicon-law-ui-new-law = New law
+silicon-law-ui-save = Save changes
+silicon-law-ui-plus-one = +1
+silicon-law-ui-minus-one = -1
+silicon-law-ui-delete = Delete
+silicon-law-ui-check-corrupted = Corrupted law
+silicon-law-ui-check-corrupted-tooltip = If the law identifier should be set as 'corrupted', so symbols shuffling around.
+silicon-law-ui-placeholder = Type here to change law text...

From 7c1721f168eeaf10dd731c9aa7786422048650e3 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Fri, 23 Aug 2024 15:13:47 +1000
Subject: [PATCH 016/366] Station AI overlay (#31335)

Split
---
 .../Silicons/StationAi/StationAiOverlay.cs    | 119 ++++
 .../Silicons/StationAi/StationAiSystem.cs     |  80 +++
 .../Systems/Sandbox/SandboxUIController.cs    |  20 +
 .../Sandbox/Windows/SandboxWindow.xaml        |   1 +
 .../StationAi/StationAiOverlayComponent.cs    |   9 +
 .../StationAi/StationAiVisionComponent.cs     |  19 +
 .../StationAi/StationAiVisionSystem.cs        | 518 ++++++++++++++++++
 .../Locale/en-US/sandbox/sandbox-manager.ftl  |   1 +
 .../Wallmounts/surveillance_camera.yml        |   1 +
 9 files changed, 768 insertions(+)
 create mode 100644 Content.Client/Silicons/StationAi/StationAiOverlay.cs
 create mode 100644 Content.Client/Silicons/StationAi/StationAiSystem.cs
 create mode 100644 Content.Shared/Silicons/StationAi/StationAiOverlayComponent.cs
 create mode 100644 Content.Shared/Silicons/StationAi/StationAiVisionComponent.cs
 create mode 100644 Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs

diff --git a/Content.Client/Silicons/StationAi/StationAiOverlay.cs b/Content.Client/Silicons/StationAi/StationAiOverlay.cs
new file mode 100644
index 00000000000..efa1b8dbeff
--- /dev/null
+++ b/Content.Client/Silicons/StationAi/StationAiOverlay.cs
@@ -0,0 +1,119 @@
+using System.Numerics;
+using Content.Shared.Silicons.StationAi;
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Shared.Enums;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.Silicons.StationAi;
+
+public sealed class StationAiOverlay : Overlay
+{
+    [Dependency] private readonly IClyde _clyde = default!;
+    [Dependency] private readonly IEntityManager _entManager = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+
+    public override OverlaySpace Space => OverlaySpace.WorldSpace;
+
+    private readonly HashSet<Vector2i> _visibleTiles = new();
+
+    private IRenderTexture? _staticTexture;
+    private IRenderTexture? _stencilTexture;
+
+    public StationAiOverlay()
+    {
+        IoCManager.InjectDependencies(this);
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        if (_stencilTexture?.Texture.Size != args.Viewport.Size)
+        {
+            _staticTexture?.Dispose();
+            _stencilTexture?.Dispose();
+            _stencilTexture = _clyde.CreateRenderTarget(args.Viewport.Size, new RenderTargetFormatParameters(RenderTargetColorFormat.Rgba8Srgb), name: "station-ai-stencil");
+            _staticTexture = _clyde.CreateRenderTarget(args.Viewport.Size,
+                new RenderTargetFormatParameters(RenderTargetColorFormat.Rgba8Srgb),
+                name: "station-ai-static");
+        }
+
+        var worldHandle = args.WorldHandle;
+
+        var worldBounds = args.WorldBounds;
+
+        var playerEnt = _player.LocalEntity;
+        _entManager.TryGetComponent(playerEnt, out TransformComponent? playerXform);
+        var gridUid = playerXform?.GridUid ?? EntityUid.Invalid;
+        _entManager.TryGetComponent(gridUid, out MapGridComponent? grid);
+
+        var invMatrix = args.Viewport.GetWorldToLocalMatrix();
+
+        if (grid != null)
+        {
+            // TODO: Pass in attached entity's grid.
+            // TODO: Credit OD on the moved to code
+            // TODO: Call the moved-to code here.
+
+            _visibleTiles.Clear();
+            var lookups = _entManager.System<EntityLookupSystem>();
+            var xforms = _entManager.System<SharedTransformSystem>();
+            _entManager.System<StationAiVisionSystem>().GetView((gridUid, grid), worldBounds, _visibleTiles);
+
+            var gridMatrix = xforms.GetWorldMatrix(gridUid);
+            var matty =  Matrix3x2.Multiply(gridMatrix, invMatrix);
+
+            // Draw visible tiles to stencil
+            worldHandle.RenderInRenderTarget(_stencilTexture!, () =>
+            {
+                worldHandle.SetTransform(matty);
+
+                foreach (var tile in _visibleTiles)
+                {
+                    var aabb = lookups.GetLocalBounds(tile, grid.TileSize);
+                    worldHandle.DrawRect(aabb, Color.White);
+                }
+            },
+            Color.Transparent);
+
+            // Once this is gucci optimise rendering.
+            worldHandle.RenderInRenderTarget(_staticTexture!,
+            () =>
+            {
+                worldHandle.SetTransform(invMatrix);
+                var shader = _proto.Index<ShaderPrototype>("CameraStatic").Instance();
+                worldHandle.UseShader(shader);
+                worldHandle.DrawRect(worldBounds, Color.White);
+            },
+            Color.Black);
+        }
+        // Not on a grid
+        else
+        {
+            worldHandle.RenderInRenderTarget(_stencilTexture!, () =>
+            {
+            },
+            Color.Transparent);
+
+            worldHandle.RenderInRenderTarget(_staticTexture!,
+            () =>
+            {
+                worldHandle.SetTransform(Matrix3x2.Identity);
+                worldHandle.DrawRect(worldBounds, Color.Black);
+            }, Color.Black);
+        }
+
+        // Use the lighting as a mask
+        worldHandle.UseShader(_proto.Index<ShaderPrototype>("StencilMask").Instance());
+        worldHandle.DrawTextureRect(_stencilTexture!.Texture, worldBounds);
+
+        // Draw the static
+        worldHandle.UseShader(_proto.Index<ShaderPrototype>("StencilDraw").Instance());
+        worldHandle.DrawTextureRect(_staticTexture!.Texture, worldBounds);
+
+        worldHandle.SetTransform(Matrix3x2.Identity);
+        worldHandle.UseShader(null);
+
+    }
+}
diff --git a/Content.Client/Silicons/StationAi/StationAiSystem.cs b/Content.Client/Silicons/StationAi/StationAiSystem.cs
new file mode 100644
index 00000000000..2ed06175252
--- /dev/null
+++ b/Content.Client/Silicons/StationAi/StationAiSystem.cs
@@ -0,0 +1,80 @@
+using Content.Shared.Silicons.StationAi;
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Shared.Player;
+
+namespace Content.Client.Silicons.StationAi;
+
+public sealed partial class StationAiSystem : EntitySystem
+{
+    [Dependency] private readonly IOverlayManager _overlayMgr = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+
+    private StationAiOverlay? _overlay;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        // InitializeAirlock();
+        // InitializePowerToggle();
+
+        SubscribeLocalEvent<StationAiOverlayComponent, LocalPlayerAttachedEvent>(OnAiAttached);
+        SubscribeLocalEvent<StationAiOverlayComponent, LocalPlayerDetachedEvent>(OnAiDetached);
+        SubscribeLocalEvent<StationAiOverlayComponent, ComponentInit>(OnAiOverlayInit);
+        SubscribeLocalEvent<StationAiOverlayComponent, ComponentRemove>(OnAiOverlayRemove);
+    }
+
+    private void OnAiOverlayInit(Entity<StationAiOverlayComponent> ent, ref ComponentInit args)
+    {
+        var attachedEnt = _player.LocalEntity;
+
+        if (attachedEnt != ent.Owner)
+            return;
+
+        AddOverlay();
+    }
+
+    private void OnAiOverlayRemove(Entity<StationAiOverlayComponent> ent, ref ComponentRemove args)
+    {
+        var attachedEnt = _player.LocalEntity;
+
+        if (attachedEnt != ent.Owner)
+            return;
+
+        RemoveOverlay();
+    }
+
+    private void AddOverlay()
+    {
+        if (_overlay != null)
+            return;
+
+        _overlay = new StationAiOverlay();
+        _overlayMgr.AddOverlay(_overlay);
+    }
+
+    private void RemoveOverlay()
+    {
+        if (_overlay == null)
+            return;
+
+        _overlayMgr.RemoveOverlay(_overlay);
+        _overlay = null;
+    }
+
+    private void OnAiAttached(Entity<StationAiOverlayComponent> ent, ref LocalPlayerAttachedEvent args)
+    {
+        AddOverlay();
+    }
+
+    private void OnAiDetached(Entity<StationAiOverlayComponent> ent, ref LocalPlayerDetachedEvent args)
+    {
+        RemoveOverlay();
+    }
+
+    public override void Shutdown()
+    {
+        base.Shutdown();
+        _overlayMgr.RemoveOverlay<StationAiOverlay>();
+    }
+}
diff --git a/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs b/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs
index 752c89ca970..58c8a1451bd 100644
--- a/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs
+++ b/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs
@@ -7,14 +7,17 @@
 using Content.Client.UserInterface.Systems.DecalPlacer;
 using Content.Client.UserInterface.Systems.Sandbox.Windows;
 using Content.Shared.Input;
+using Content.Shared.Silicons.StationAi;
 using JetBrains.Annotations;
 using Robust.Client.Console;
 using Robust.Client.Debugging;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
+using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controllers;
 using Robust.Client.UserInterface.Controllers.Implementations;
+using Robust.Shared.Console;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
@@ -27,10 +30,12 @@ namespace Content.Client.UserInterface.Systems.Sandbox;
 [UsedImplicitly]
 public sealed class SandboxUIController : UIController, IOnStateChanged<GameplayState>, IOnSystemChanged<SandboxSystem>
 {
+    [Dependency] private readonly IConsoleHost _console = default!;
     [Dependency] private readonly IEyeManager _eye = default!;
     [Dependency] private readonly IInputManager _input = default!;
     [Dependency] private readonly ILightManager _light = default!;
     [Dependency] private readonly IClientAdminManager _admin = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
 
     [UISystemDependency] private readonly DebugPhysicsSystem _debugPhysics = default!;
     [UISystemDependency] private readonly MarkerSystem _marker = default!;
@@ -116,6 +121,21 @@ private void EnsureWindow()
         _window.ShowMarkersButton.Pressed = _marker.MarkersVisible;
         _window.ShowBbButton.Pressed = (_debugPhysics.Flags & PhysicsDebugFlags.Shapes) != 0x0;
 
+        _window.AiOverlayButton.OnPressed += args =>
+        {
+            var player = _player.LocalEntity;
+
+            if (player == null)
+                return;
+
+            var pnent = EntityManager.GetNetEntity(player.Value);
+
+            // Need NetworkedAddComponent but engine PR.
+            if (args.Button.Pressed)
+                _console.ExecuteCommand($"addcomp {pnent.Id} StationAiOverlay");
+            else
+                _console.ExecuteCommand($"rmcomp {pnent.Id} StationAiOverlay");
+        };
         _window.RespawnButton.OnPressed += _ => _sandbox.Respawn();
         _window.SpawnTilesButton.OnPressed += _ => TileSpawningController.ToggleWindow();
         _window.SpawnEntitiesButton.OnPressed += _ => EntitySpawningController.ToggleWindow();
diff --git a/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml b/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml
index 64367ea27af..05e65cf29c3 100644
--- a/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml
+++ b/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml
@@ -4,6 +4,7 @@
     Title="{Loc sandbox-window-title}"
     Resizable="False">
     <BoxContainer Orientation="Vertical" SeparationOverride="4">
+        <Button Name="AiOverlayButton" Access="Public" Text="{Loc sandbox-window-ai-overlay-button}" ToggleMode="True"/>
         <Button Name="RespawnButton" Access="Public" Text="{Loc sandbox-window-respawn-button}"/>
         <Button Name="SpawnEntitiesButton" Access="Public" Text="{Loc sandbox-window-spawn-entities-button}"/>
         <Button Name="SpawnTilesButton" Access="Public" Text="{Loc sandbox-window-spawn-tiles-button}"/>
diff --git a/Content.Shared/Silicons/StationAi/StationAiOverlayComponent.cs b/Content.Shared/Silicons/StationAi/StationAiOverlayComponent.cs
new file mode 100644
index 00000000000..8416d44d5a1
--- /dev/null
+++ b/Content.Shared/Silicons/StationAi/StationAiOverlayComponent.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Silicons.StationAi;
+
+/// <summary>
+/// Handles the static overlay for station AI.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class StationAiOverlayComponent : Component;
diff --git a/Content.Shared/Silicons/StationAi/StationAiVisionComponent.cs b/Content.Shared/Silicons/StationAi/StationAiVisionComponent.cs
new file mode 100644
index 00000000000..94aef8ad366
--- /dev/null
+++ b/Content.Shared/Silicons/StationAi/StationAiVisionComponent.cs
@@ -0,0 +1,19 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Silicons.StationAi;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]//, Access(typeof(SharedStationAiSystem))]
+public sealed partial class StationAiVisionComponent : Component
+{
+    [DataField, AutoNetworkedField]
+    public bool Enabled = true;
+
+    [DataField, AutoNetworkedField]
+    public bool Occluded = true;
+
+    /// <summary>
+    /// Range in tiles
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float Range = 7.5f;
+}
diff --git a/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs b/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs
new file mode 100644
index 00000000000..c1f5d98afdb
--- /dev/null
+++ b/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs
@@ -0,0 +1,518 @@
+using Robust.Shared.Map.Components;
+using Robust.Shared.Threading;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Silicons.StationAi;
+
+public sealed class StationAiVisionSystem : EntitySystem
+{
+    /*
+     * This class handles 2 things:
+     * 1. It handles general "what tiles are visible" line of sight checks.
+     * 2. It does single-tile lookups to tell if they're visible or not with support for a faster range-only path.
+     */
+
+    [Dependency] private readonly IParallelManager _parallel = default!;
+    [Dependency] private readonly EntityLookupSystem _lookup = default!;
+    [Dependency] private readonly SharedMapSystem _maps = default!;
+    [Dependency] private readonly SharedTransformSystem _xforms = default!;
+
+    private SeedJob _seedJob;
+    private ViewJob _job;
+
+    private readonly HashSet<Entity<OccluderComponent>> _occluders = new();
+    private readonly HashSet<Entity<StationAiVisionComponent>> _seeds = new();
+    private readonly HashSet<Vector2i> _viewportTiles = new();
+
+    // Dummy set
+    private readonly HashSet<Vector2i> _singleTiles = new();
+
+    // Occupied tiles per-run.
+    // For now it's only 1-grid supported but updating to TileRefs if required shouldn't be too hard.
+    private readonly HashSet<Vector2i> _opaque = new();
+
+    /// <summary>
+    /// Do we skip line of sight checks and just check vision ranges.
+    /// </summary>
+    private bool FastPath;
+
+    /// <summary>
+    /// Have we found the target tile if we're only checking for a single one.
+    /// </summary>
+    private bool TargetFound;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _seedJob = new()
+        {
+            System = this,
+        };
+
+        _job = new ViewJob()
+        {
+            EntManager = EntityManager,
+            Maps = _maps,
+            System = this,
+        };
+    }
+
+    /// <summary>
+    /// Returns whether a tile is accessible based on vision.
+    /// </summary>
+    public bool IsAccessible(Entity<MapGridComponent> grid, Vector2i tile, float expansionSize = 8.5f, bool fastPath = false)
+    {
+        _viewportTiles.Clear();
+        _opaque.Clear();
+        _seeds.Clear();
+        _viewportTiles.Add(tile);
+        var localBounds = _lookup.GetLocalBounds(tile, grid.Comp.TileSize);
+        var expandedBounds = localBounds.Enlarged(expansionSize);
+
+        _seedJob.Grid = grid;
+        _seedJob.ExpandedBounds = expandedBounds;
+        _parallel.ProcessNow(_seedJob);
+        _job.Data.Clear();
+        FastPath = fastPath;
+
+        foreach (var seed in _seeds)
+        {
+            if (!seed.Comp.Enabled)
+                continue;
+
+            _job.Data.Add(seed);
+        }
+
+        if (_seeds.Count == 0)
+            return false;
+
+        // Skip occluders step if we're just doing range checks.
+        if (!fastPath)
+        {
+            var tileEnumerator = _maps.GetLocalTilesEnumerator(grid, grid, expandedBounds, ignoreEmpty: false);
+
+            // Get all other relevant tiles.
+            while (tileEnumerator.MoveNext(out var tileRef))
+            {
+                var tileBounds = _lookup.GetLocalBounds(tileRef.GridIndices, grid.Comp.TileSize).Enlarged(-0.05f);
+
+                _occluders.Clear();
+                _lookup.GetLocalEntitiesIntersecting(grid.Owner, tileBounds, _occluders, LookupFlags.Static);
+
+                if (_occluders.Count > 0)
+                {
+                    _opaque.Add(tileRef.GridIndices);
+                }
+            }
+        }
+
+        for (var i = _job.Vis1.Count; i < _job.Data.Count; i++)
+        {
+            _job.Vis1.Add(new Dictionary<Vector2i, int>());
+            _job.Vis2.Add(new Dictionary<Vector2i, int>());
+            _job.SeedTiles.Add(new HashSet<Vector2i>());
+            _job.BoundaryTiles.Add(new HashSet<Vector2i>());
+        }
+
+        _job.TargetTile = tile;
+        TargetFound = false;
+        _singleTiles.Clear();
+        _job.Grid = grid;
+        _job.VisibleTiles = _singleTiles;
+        _parallel.ProcessNow(_job, _job.Data.Count);
+
+        return TargetFound;
+    }
+
+    /// <summary>
+    /// Gets a byond-equivalent for tiles in the specified worldAABB.
+    /// </summary>
+    /// <param name="expansionSize">How much to expand the bounds before to find vision intersecting it. Makes this the largest vision size + 1 tile.</param>
+    public void GetView(Entity<MapGridComponent> grid, Box2Rotated worldBounds, HashSet<Vector2i> visibleTiles, float expansionSize = 8.5f)
+    {
+        _viewportTiles.Clear();
+        _opaque.Clear();
+        _seeds.Clear();
+        var expandedBounds = worldBounds.Enlarged(expansionSize);
+
+        // TODO: Would be nice to be able to run this while running the other stuff.
+        _seedJob.Grid = grid;
+        var localAABB = _xforms.GetInvWorldMatrix(grid).TransformBox(expandedBounds);
+        _seedJob.ExpandedBounds = localAABB;
+        _parallel.ProcessNow(_seedJob);
+        _job.Data.Clear();
+        FastPath = false;
+
+        foreach (var seed in _seeds)
+        {
+            if (!seed.Comp.Enabled)
+                continue;
+
+            _job.Data.Add(seed);
+        }
+
+        if (_seeds.Count == 0)
+            return;
+
+        // Get viewport tiles
+        var tileEnumerator = _maps.GetLocalTilesEnumerator(grid, grid, localAABB, ignoreEmpty: false);
+
+        while (tileEnumerator.MoveNext(out var tileRef))
+        {
+            var tileBounds = _lookup.GetLocalBounds(tileRef.GridIndices, grid.Comp.TileSize).Enlarged(-0.05f);
+
+            _occluders.Clear();
+            _lookup.GetLocalEntitiesIntersecting(grid.Owner, tileBounds, _occluders, LookupFlags.Static);
+
+            if (_occluders.Count > 0)
+            {
+                _opaque.Add(tileRef.GridIndices);
+            }
+
+            _viewportTiles.Add(tileRef.GridIndices);
+        }
+
+        tileEnumerator = _maps.GetLocalTilesEnumerator(grid, grid, localAABB, ignoreEmpty: false);
+
+        // Get all other relevant tiles.
+        while (tileEnumerator.MoveNext(out var tileRef))
+        {
+            if (_viewportTiles.Contains(tileRef.GridIndices))
+                continue;
+
+            var tileBounds = _lookup.GetLocalBounds(tileRef.GridIndices, grid.Comp.TileSize).Enlarged(-0.05f);
+
+            _occluders.Clear();
+            _lookup.GetLocalEntitiesIntersecting(grid.Owner, tileBounds, _occluders, LookupFlags.Static);
+
+            if (_occluders.Count > 0)
+            {
+                _opaque.Add(tileRef.GridIndices);
+            }
+        }
+
+        // Wait for seed job here
+
+        for (var i = _job.Vis1.Count; i < _job.Data.Count; i++)
+        {
+            _job.Vis1.Add(new Dictionary<Vector2i, int>());
+            _job.Vis2.Add(new Dictionary<Vector2i, int>());
+            _job.SeedTiles.Add(new HashSet<Vector2i>());
+            _job.BoundaryTiles.Add(new HashSet<Vector2i>());
+        }
+
+        _job.TargetTile = null;
+        TargetFound = false;
+        _job.Grid = grid;
+        _job.VisibleTiles = visibleTiles;
+        _parallel.ProcessNow(_job, _job.Data.Count);
+    }
+
+    private int GetMaxDelta(Vector2i tile, Vector2i center)
+    {
+        var delta = tile - center;
+        return Math.Max(Math.Abs(delta.X), Math.Abs(delta.Y));
+    }
+
+    private int GetSumDelta(Vector2i tile, Vector2i center)
+    {
+        var delta = tile - center;
+        return Math.Abs(delta.X) + Math.Abs(delta.Y);
+    }
+
+    /// <summary>
+    /// Checks if any of a tile's neighbors are visible.
+    /// </summary>
+    private bool CheckNeighborsVis(
+        Dictionary<Vector2i, int> vis,
+        Vector2i index,
+        int d)
+    {
+        for (var x = -1; x <= 1; x++)
+        {
+            for (var y = -1; y <= 1; y++)
+            {
+                if (x == 0 && y == 0)
+                    continue;
+
+                var neighbor = index + new Vector2i(x, y);
+                var neighborD = vis.GetValueOrDefault(neighbor);
+
+                if (neighborD == d)
+                    return true;
+            }
+        }
+        return false;
+    }
+
+    /// Checks whether this tile fits the definition of a "corner"
+    /// </summary>
+    private bool IsCorner(
+        HashSet<Vector2i> tiles,
+        HashSet<Vector2i> blocked,
+        Dictionary<Vector2i, int> vis1,
+        Vector2i index,
+        Vector2i delta)
+    {
+        var diagonalIndex = index + delta;
+
+        if (!tiles.TryGetValue(diagonalIndex, out var diagonal))
+            return false;
+
+        var cardinal1 = new Vector2i(index.X, diagonal.Y);
+        var cardinal2 = new Vector2i(diagonal.X, index.Y);
+
+        return vis1.GetValueOrDefault(diagonal) != 0 &&
+               vis1.GetValueOrDefault(cardinal1) != 0 &&
+               vis1.GetValueOrDefault(cardinal2) != 0 &&
+               blocked.Contains(cardinal1) &&
+               blocked.Contains(cardinal2) &&
+               !blocked.Contains(diagonal);
+    }
+
+    /// <summary>
+    /// Gets the relevant vision seeds for later.
+    /// </summary>
+    private record struct SeedJob() : IRobustJob
+    {
+        public StationAiVisionSystem System;
+
+        public Entity<MapGridComponent> Grid;
+        public Box2 ExpandedBounds;
+
+        public void Execute()
+        {
+            System._lookup.GetLocalEntitiesIntersecting(Grid.Owner, ExpandedBounds, System._seeds);
+        }
+    }
+
+    private record struct ViewJob() : IParallelRobustJob
+    {
+        public int BatchSize => 1;
+
+        public IEntityManager EntManager;
+        public SharedMapSystem Maps;
+        public StationAiVisionSystem System;
+
+        public Entity<MapGridComponent> Grid;
+        public List<Entity<StationAiVisionComponent>> Data = new();
+
+        // If we're doing range-checks might be able to early out
+        public Vector2i? TargetTile;
+
+        public HashSet<Vector2i> VisibleTiles;
+
+        public readonly List<Dictionary<Vector2i, int>> Vis1 = new();
+        public readonly List<Dictionary<Vector2i, int>> Vis2 = new();
+
+        public readonly List<HashSet<Vector2i>> SeedTiles = new();
+        public readonly List<HashSet<Vector2i>> BoundaryTiles = new();
+
+        public void Execute(int index)
+        {
+            // If we're looking for a single tile then early-out if someone else has found it.
+            if (TargetTile != null)
+            {
+                lock (System)
+                {
+                    if (System.TargetFound)
+                    {
+                        return;
+                    }
+                }
+            }
+
+            var seed = Data[index];
+            var seedXform = EntManager.GetComponent<TransformComponent>(seed);
+
+            // Fastpath just get tiles in range.
+            // Either xray-vision or system is doing a quick-and-dirty check.
+            if (!seed.Comp.Occluded || System.FastPath)
+            {
+                var squircles = Maps.GetLocalTilesIntersecting(Grid.Owner,
+                    Grid.Comp,
+                    new Circle(System._xforms.GetWorldPosition(seedXform), seed.Comp.Range), ignoreEmpty: false);
+
+                // Try to find the target tile.
+                if (TargetTile != null)
+                {
+                    foreach (var tile in squircles)
+                    {
+                        if (tile.GridIndices == TargetTile)
+                        {
+                            lock (System)
+                            {
+                                System.TargetFound = true;
+                            }
+
+                            return;
+                        }
+                    }
+                }
+                else
+                {
+                    lock (VisibleTiles)
+                    {
+                        foreach (var tile in squircles)
+                        {
+                            VisibleTiles.Add(tile.GridIndices);
+                        }
+                    }
+                }
+
+                return;
+            }
+
+            // Code based upon https://github.com/OpenDreamProject/OpenDream/blob/c4a3828ccb997bf3722673620460ebb11b95ccdf/OpenDreamShared/Dream/ViewAlgorithm.cs
+
+            var range = seed.Comp.Range;
+            var vis1 = Vis1[index];
+            var vis2 = Vis2[index];
+
+            var seedTiles = SeedTiles[index];
+            var boundary = BoundaryTiles[index];
+
+            // Cleanup last run
+            vis1.Clear();
+            vis2.Clear();
+
+            seedTiles.Clear();
+            boundary.Clear();
+
+            var maxDepthMax = 0;
+            var sumDepthMax = 0;
+
+            var eyePos = Maps.GetTileRef(Grid.Owner, Grid, seedXform.Coordinates).GridIndices;
+
+            for (var x = Math.Floor(eyePos.X - range); x <= eyePos.X + range; x++)
+            {
+                for (var y = Math.Floor(eyePos.Y - range); y <= eyePos.Y + range; y++)
+                {
+                    var tile = new Vector2i((int)x, (int)y);
+                    var delta = tile - eyePos;
+                    var xDelta = Math.Abs(delta.X);
+                    var yDelta = Math.Abs(delta.Y);
+
+                    var deltaSum = xDelta + yDelta;
+
+                    maxDepthMax = Math.Max(maxDepthMax, Math.Max(xDelta, yDelta));
+                    sumDepthMax = Math.Max(sumDepthMax, deltaSum);
+                    seedTiles.Add(tile);
+                }
+            }
+
+            // Step 3, Diagonal shadow loop
+            for (var d = 0; d < maxDepthMax; d++)
+            {
+                foreach (var tile in seedTiles)
+                {
+                    var maxDelta = System.GetMaxDelta(tile, eyePos);
+
+                    if (maxDelta == d + 1 && System.CheckNeighborsVis(vis2, tile, d))
+                    {
+                        vis2[tile] = (System._opaque.Contains(tile) ? -1 : d + 1);
+                    }
+                }
+            }
+
+            // Step 4, Straight shadow loop
+            for (var d = 0; d < sumDepthMax; d++)
+            {
+                foreach (var tile in seedTiles)
+                {
+                    var sumDelta = System.GetSumDelta(tile, eyePos);
+
+                    if (sumDelta == d + 1 && System.CheckNeighborsVis(vis1, tile, d))
+                    {
+                        if (System._opaque.Contains(tile))
+                        {
+                            vis1[tile] = -1;
+                        }
+                        else if (vis2.GetValueOrDefault(tile) != 0)
+                        {
+                            vis1[tile] = d + 1;
+                        }
+                    }
+                }
+            }
+
+            // Add the eye itself
+            vis1[eyePos] = 1;
+
+            // Step 6.
+
+            // Step 7.
+
+            // Step 8.
+            foreach (var tile in seedTiles)
+            {
+                vis2[tile] = vis1.GetValueOrDefault(tile, 0);
+            }
+
+            // Step 9
+            foreach (var tile in seedTiles)
+            {
+                if (!System._opaque.Contains(tile))
+                    continue;
+
+                var tileVis1 = vis1.GetValueOrDefault(tile);
+
+                if (tileVis1 != 0)
+                    continue;
+
+                if (System.IsCorner(seedTiles, System._opaque, vis1, tile, Vector2i.UpRight) ||
+                    System.IsCorner(seedTiles, System._opaque, vis1, tile, Vector2i.UpLeft) ||
+                    System.IsCorner(seedTiles, System._opaque, vis1, tile, Vector2i.DownLeft) ||
+                    System.IsCorner(seedTiles, System._opaque, vis1, tile, Vector2i.DownRight))
+                {
+                    boundary.Add(tile);
+                }
+            }
+
+            // Make all wall/corner tiles visible
+            foreach (var tile in boundary)
+            {
+                vis1[tile] = -1;
+            }
+
+            if (TargetTile != null)
+            {
+                if (vis2.TryGetValue(TargetTile.Value, out var tileVis2))
+                {
+                    DebugTools.Assert(seedTiles.Contains(TargetTile.Value));
+
+                    if (tileVis2 != 0)
+                    {
+                        lock (System)
+                        {
+                            System.TargetFound = true;
+                            return;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                // vis2 is what we care about for LOS.
+                foreach (var tile in seedTiles)
+                {
+                    // If not in viewport don't care.
+                    if (!System._viewportTiles.Contains(tile))
+                        continue;
+
+                    var tileVis2 = vis2.GetValueOrDefault(tile, 0);
+
+                    if (tileVis2 != 0)
+                    {
+                        // No idea if it's better to do this inside or out.
+                        lock (VisibleTiles)
+                        {
+                            VisibleTiles.Add(tile);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/Resources/Locale/en-US/sandbox/sandbox-manager.ftl b/Resources/Locale/en-US/sandbox/sandbox-manager.ftl
index b7f4d03451f..b6f97367323 100644
--- a/Resources/Locale/en-US/sandbox/sandbox-manager.ftl
+++ b/Resources/Locale/en-US/sandbox/sandbox-manager.ftl
@@ -1,4 +1,5 @@
 sandbox-window-title = Sandbox Panel
+sandbox-window-ai-overlay-button = AI Overlay
 sandbox-window-respawn-button = Respawn
 sandbox-window-spawn-entities-button = Spawn Entities
 sandbox-window-spawn-tiles-button = Spawn Tiles
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml
index 3347b0e4b1c..954caf67aeb 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml
@@ -4,6 +4,7 @@
   name: camera
   description: A surveillance camera. It's watching you. Kinda.
   components:
+  - type: StationAiVision
   - type: Clickable
   - type: InteractionOutline
   - type: Construction

From 1c74d0bfd4e3c942d79aa71482ff7f95df3cda25 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Fri, 23 Aug 2024 15:57:57 +1000
Subject: [PATCH 017/366] Fix AI vision occlusion (#31341)

Forgot to do this, but how tf do doors work then.
---
 .../StationAi/StationAiVisionSystem.cs        | 40 ++++++++++---------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs b/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs
index c1f5d98afdb..33771cb963a 100644
--- a/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs
+++ b/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs
@@ -95,12 +95,7 @@ public bool IsAccessible(Entity<MapGridComponent> grid, Vector2i tile, float exp
             // Get all other relevant tiles.
             while (tileEnumerator.MoveNext(out var tileRef))
             {
-                var tileBounds = _lookup.GetLocalBounds(tileRef.GridIndices, grid.Comp.TileSize).Enlarged(-0.05f);
-
-                _occluders.Clear();
-                _lookup.GetLocalEntitiesIntersecting(grid.Owner, tileBounds, _occluders, LookupFlags.Static);
-
-                if (_occluders.Count > 0)
+                if (IsOccluded(grid, tileRef.GridIndices))
                 {
                     _opaque.Add(tileRef.GridIndices);
                 }
@@ -125,6 +120,25 @@ public bool IsAccessible(Entity<MapGridComponent> grid, Vector2i tile, float exp
         return TargetFound;
     }
 
+    private bool IsOccluded(Entity<MapGridComponent> grid, Vector2i tile)
+    {
+        var tileBounds = _lookup.GetLocalBounds(tile, grid.Comp.TileSize).Enlarged(-0.05f);
+        _occluders.Clear();
+        _lookup.GetLocalEntitiesIntersecting(grid.Owner, tileBounds, _occluders, LookupFlags.Static);
+        var anyOccluders = false;
+
+        foreach (var occluder in _occluders)
+        {
+            if (!occluder.Comp.Enabled)
+                continue;
+
+            anyOccluders = true;
+            break;
+        }
+
+        return anyOccluders;
+    }
+
     /// <summary>
     /// Gets a byond-equivalent for tiles in the specified worldAABB.
     /// </summary>
@@ -160,12 +174,7 @@ public void GetView(Entity<MapGridComponent> grid, Box2Rotated worldBounds, Hash
 
         while (tileEnumerator.MoveNext(out var tileRef))
         {
-            var tileBounds = _lookup.GetLocalBounds(tileRef.GridIndices, grid.Comp.TileSize).Enlarged(-0.05f);
-
-            _occluders.Clear();
-            _lookup.GetLocalEntitiesIntersecting(grid.Owner, tileBounds, _occluders, LookupFlags.Static);
-
-            if (_occluders.Count > 0)
+            if (IsOccluded(grid, tileRef.GridIndices))
             {
                 _opaque.Add(tileRef.GridIndices);
             }
@@ -181,12 +190,7 @@ public void GetView(Entity<MapGridComponent> grid, Box2Rotated worldBounds, Hash
             if (_viewportTiles.Contains(tileRef.GridIndices))
                 continue;
 
-            var tileBounds = _lookup.GetLocalBounds(tileRef.GridIndices, grid.Comp.TileSize).Enlarged(-0.05f);
-
-            _occluders.Clear();
-            _lookup.GetLocalEntitiesIntersecting(grid.Owner, tileBounds, _occluders, LookupFlags.Static);
-
-            if (_occluders.Count > 0)
+            if (IsOccluded(grid, tileRef.GridIndices))
             {
                 _opaque.Add(tileRef.GridIndices);
             }

From e36d65e8f7d6267ffd15135465ba45244221d55d Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Fri, 23 Aug 2024 18:34:39 +1000
Subject: [PATCH 018/366] Make AI overlay use vis1 (#31348)

* Make AI overlay use vis1

I think this is what get_hear in 13 uses idk this shit is esoteric.

vis1 is luminosity vis2 is line of sight.

* boark
---
 .../Silicons/StationAi/StationAiVisionSystem.cs           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs b/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs
index 33771cb963a..c144f330e11 100644
--- a/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs
+++ b/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs
@@ -482,11 +482,11 @@ public void Execute(int index)
 
             if (TargetTile != null)
             {
-                if (vis2.TryGetValue(TargetTile.Value, out var tileVis2))
+                if (vis1.TryGetValue(TargetTile.Value, out var tileVis))
                 {
                     DebugTools.Assert(seedTiles.Contains(TargetTile.Value));
 
-                    if (tileVis2 != 0)
+                    if (tileVis != 0)
                     {
                         lock (System)
                         {
@@ -505,9 +505,9 @@ public void Execute(int index)
                     if (!System._viewportTiles.Contains(tile))
                         continue;
 
-                    var tileVis2 = vis2.GetValueOrDefault(tile, 0);
+                    var tileVis = vis1.GetValueOrDefault(tile, 0);
 
-                    if (tileVis2 != 0)
+                    if (tileVis != 0)
                     {
                         // No idea if it's better to do this inside or out.
                         lock (VisibleTiles)

From 076b6e133a75f5ae1837159f938e683878f29239 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 02:24:42 -0400
Subject: [PATCH 019/366] Implement GridCast for AI

---
 .../NPC/SharedPathfindingSystem.Line.cs       | 74 +++++++++++++++++++
 Content.Shared/NPC/SharedPathfindingSystem.cs | 31 +++++++-
 2 files changed, 103 insertions(+), 2 deletions(-)
 create mode 100644 Content.Shared/NPC/SharedPathfindingSystem.Line.cs

diff --git a/Content.Shared/NPC/SharedPathfindingSystem.Line.cs b/Content.Shared/NPC/SharedPathfindingSystem.Line.cs
new file mode 100644
index 00000000000..7e7bdd082b1
--- /dev/null
+++ b/Content.Shared/NPC/SharedPathfindingSystem.Line.cs
@@ -0,0 +1,74 @@
+namespace Content.Shared.NPC;
+
+public abstract partial class SharedPathfindingSystem
+{
+    public static void GridCast(Vector2i start, Vector2i end, Vector2iCallback callback)
+    {
+        // https://gist.github.com/Pyr3z/46884d67641094d6cf353358566db566
+        // declare all locals at the top so it's obvious how big the footprint is
+        int dx, dy, xinc, yinc, side, i, error;
+
+        // starting cell is always returned
+        if (!callback(start))
+            return;
+
+        xinc  = (end.X < start.X) ? -1 : 1;
+        yinc  = (end.Y < start.Y) ? -1 : 1;
+        dx    = xinc * (end.X - start.X);
+        dy    = yinc * (end.Y - start.Y);
+        var ax = start.X;
+        var ay = start.Y;
+
+        if (dx == dy) // Handle perfect diagonals
+        {
+            // I include this "optimization" for more aesthetic reasons, actually.
+            // While Bresenham's Line can handle perfect diagonals just fine, it adds
+            // additional cells to the line that make it not a perfect diagonal
+            // anymore. So, while this branch is ~twice as fast as the next branch,
+            // the real reason it is here is for style.
+
+            // Also, there *is* the reason of performance. If used for cell-based
+            // raycasts, for example, then perfect diagonals will check half as many
+            // cells.
+
+            while (dx --> 0)
+            {
+                ax += xinc;
+                ay += yinc;
+                if (!callback(new Vector2i(ax, ay)))
+                    return;
+            }
+
+            return;
+        }
+
+        // Handle all other lines
+
+        side = -1 * ((dx == 0 ? yinc : xinc) - 1);
+
+        i     = dx + dy;
+        error = dx - dy;
+
+        dx *= 2;
+        dy *= 2;
+
+        while (i --> 0)
+        {
+            if (error > 0 || error == side)
+            {
+                ax    += xinc;
+                error -= dy;
+            }
+            else
+            {
+                ay    += yinc;
+                error += dx;
+            }
+
+            if (!callback(new Vector2i(ax, ay)))
+                return;
+        }
+    }
+
+    public delegate bool Vector2iCallback(Vector2i index);
+}
\ No newline at end of file
diff --git a/Content.Shared/NPC/SharedPathfindingSystem.cs b/Content.Shared/NPC/SharedPathfindingSystem.cs
index 8831acc1ddb..f59e6d3c462 100644
--- a/Content.Shared/NPC/SharedPathfindingSystem.cs
+++ b/Content.Shared/NPC/SharedPathfindingSystem.cs
@@ -2,7 +2,7 @@
 
 namespace Content.Shared.NPC;
 
-public abstract class SharedPathfindingSystem : EntitySystem
+public abstract partial class SharedPathfindingSystem : EntitySystem
 {
     /// <summary>
     /// This is equivalent to agent radii for navmeshes. In our case it's preferable that things are cleanly
@@ -37,4 +37,31 @@ public static float OctileDistance(Vector2i start, Vector2i end)
         var ab = Vector2.Abs(diff);
         return ab.X + ab.Y + (1.41f - 2) * Math.Min(ab.X, ab.Y);
     }
-}
+
+    public static IEnumerable<Vector2i> GetTileOutline(Vector2i center, float radius)
+    {
+        // https://www.redblobgames.com/grids/circle-drawing/
+        var vecCircle = center + Vector2.One / 2f;
+
+        for (var r = 0; r <= Math.Floor(radius * MathF.Sqrt(0.5f)); r++)
+        {
+            var d = MathF.Floor(MathF.Sqrt(radius * radius - r * r));
+
+            yield return new Vector2(vecCircle.X - d, vecCircle.Y + r).Floored();
+
+            yield return new Vector2(vecCircle.X + d, vecCircle.Y + r).Floored();
+
+            yield return new Vector2(vecCircle.X - d, vecCircle.Y - r).Floored();
+
+            yield return new Vector2(vecCircle.X + d, vecCircle.Y - r).Floored();
+
+            yield return new Vector2(vecCircle.X + r, vecCircle.Y - d).Floored();
+
+            yield return new Vector2(vecCircle.X + r, vecCircle.Y + d).Floored();
+
+            yield return new Vector2(vecCircle.X - r, vecCircle.Y - d).Floored();
+
+            yield return new Vector2(vecCircle.X - r, vecCircle.Y + d).Floored();
+        }
+    }
+}
\ No newline at end of file

From af9c4036900cf5fb9017874c9a93149c90acd24a Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Sun, 25 Aug 2024 22:18:42 +1000
Subject: [PATCH 020/366] Power stuff (#31314)

* Power stuff

- Add shared IsPowered
- Add shared ResolveApc
- Move PowerChangedEvent to shared for now
- Add SlimPoweredLight that actually functions how you'd expect a PoweredLight to function it id didn't have a bunch of bloat on it.

* big update

* boing
---
 Content.Server/Doors/Systems/FirelockSystem.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Content.Server/Doors/Systems/FirelockSystem.cs b/Content.Server/Doors/Systems/FirelockSystem.cs
index 3c86ccc82d5..6c1e711b6f1 100644
--- a/Content.Server/Doors/Systems/FirelockSystem.cs
+++ b/Content.Server/Doors/Systems/FirelockSystem.cs
@@ -14,6 +14,7 @@
 using Content.Shared.Power;
 using Content.Shared.Popups;
 using Content.Shared.Prying.Components;
+using Robust.Server.GameObjects;
 using Robust.Shared.Map.Components;
 
 namespace Content.Server.Doors.Systems

From 45f440007d8f2ff3b3fb1326f03d2706c08c39f7 Mon Sep 17 00:00:00 2001
From: TGRCDev <tgrc@tgrc.dev>
Date: Sat, 21 Sep 2024 00:33:22 -0700
Subject: [PATCH 021/366] Added a directory to station maps (#31156)

* Added directory to station maps

* Add null checks to map directory sorting/filtering

* Reworked station map directory to be more readable and responsive
---
 .../UI/StationMapBeaconControl.xaml           | 19 ++++++
 .../UI/StationMapBeaconControl.xaml.cs        | 50 ++++++++++++++++
 .../UI/StationMapBoundUserInterface.cs        | 20 ++++---
 .../Pinpointer/UI/StationMapWindow.xaml       | 23 +++++++-
 .../Pinpointer/UI/StationMapWindow.xaml.cs    | 58 +++++++++++++++++--
 .../en-US/navmap-beacons/station_map.ftl      |  1 +
 6 files changed, 156 insertions(+), 15 deletions(-)
 create mode 100644 Content.Client/Pinpointer/UI/StationMapBeaconControl.xaml
 create mode 100644 Content.Client/Pinpointer/UI/StationMapBeaconControl.xaml.cs

diff --git a/Content.Client/Pinpointer/UI/StationMapBeaconControl.xaml b/Content.Client/Pinpointer/UI/StationMapBeaconControl.xaml
new file mode 100644
index 00000000000..e1c55131cd6
--- /dev/null
+++ b/Content.Client/Pinpointer/UI/StationMapBeaconControl.xaml
@@ -0,0 +1,19 @@
+<Control xmlns="https://spacestation14.io" HorizontalExpand="True">
+    <BoxContainer Name="MainContainer"
+                  Orientation="Horizontal"
+                  HorizontalExpand="True">
+        <PanelContainer Name="ColorPanel"
+                        VerticalExpand="True"
+                        SetWidth="7"
+                        Margin="0 1 0 0" />
+        <Button Name="MainButton"
+                HorizontalExpand="True"
+                VerticalExpand="True"
+                StyleClasses="ButtonSquare"
+                Margin="-1 0 0 0">
+            <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+                <Label Name="BeaconNameLabel" />
+            </BoxContainer>
+        </Button>
+    </BoxContainer>
+</Control>
diff --git a/Content.Client/Pinpointer/UI/StationMapBeaconControl.xaml.cs b/Content.Client/Pinpointer/UI/StationMapBeaconControl.xaml.cs
new file mode 100644
index 00000000000..a4d4055c7df
--- /dev/null
+++ b/Content.Client/Pinpointer/UI/StationMapBeaconControl.xaml.cs
@@ -0,0 +1,50 @@
+using Content.Shared.Pinpointer;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Map;
+
+namespace Content.Client.Pinpointer.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class StationMapBeaconControl : Control, IComparable<StationMapBeaconControl>
+{
+    [Dependency] private readonly IEntityManager _entMan = default!;
+
+    public readonly EntityCoordinates BeaconPosition;
+    public Action<EntityCoordinates>? OnPressed;
+    public string? Label => BeaconNameLabel.Text;
+    private StyleBoxFlat _styleBox;
+    public Color Color => _styleBox.BackgroundColor;
+
+    public StationMapBeaconControl(EntityUid mapUid, SharedNavMapSystem.NavMapBeacon beacon)
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        BeaconPosition = new EntityCoordinates(mapUid, beacon.Position);
+
+        _styleBox = new StyleBoxFlat { BackgroundColor = beacon.Color };
+        ColorPanel.PanelOverride = _styleBox;
+        BeaconNameLabel.Text = beacon.Text;
+
+        MainButton.OnPressed += args => OnPressed?.Invoke(BeaconPosition);
+    }
+
+    public int CompareTo(StationMapBeaconControl? other)
+    {
+        if (other == null)
+            return 1;
+
+        // Group by color
+        var colorCompare = Color.ToArgb().CompareTo(other.Color.ToArgb());
+        if (colorCompare != 0)
+        {
+            return colorCompare;
+        }
+
+        // If same color, sort by text
+        return string.Compare(Label, other.Label);
+    }
+}
diff --git a/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs b/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs
index 1483e75e732..6e62dbfda9e 100644
--- a/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs
+++ b/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs
@@ -22,14 +22,18 @@ protected override void Open()
             gridUid = xform.GridUid;
         }
 
-        _window = new StationMapWindow(gridUid, Owner);
-        _window.OpenCentered();
-        _window.OnClose += Close;
-    }
+        _window = this.CreateWindow<StationMapWindow>();
+        _window.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
 
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        _window?.Dispose();
+        string stationName = string.Empty;
+        if(EntMan.TryGetComponent<MetaDataComponent>(gridUid, out var gridMetaData))
+        {
+            stationName = gridMetaData.EntityName;
+        }
+        
+        if (EntMan.TryGetComponent<StationMapComponent>(Owner, out var comp) && comp.ShowLocation)
+            _window.Set(stationName, gridUid, Owner);
+        else
+            _window.Set(stationName, gridUid, null);
     }
 }
diff --git a/Content.Client/Pinpointer/UI/StationMapWindow.xaml b/Content.Client/Pinpointer/UI/StationMapWindow.xaml
index 00424a3566a..c79fc8f9e7b 100644
--- a/Content.Client/Pinpointer/UI/StationMapWindow.xaml
+++ b/Content.Client/Pinpointer/UI/StationMapWindow.xaml
@@ -3,11 +3,28 @@
                       xmlns:ui="clr-namespace:Content.Client.Pinpointer.UI"
                       Title="{Loc 'station-map-window-title'}"
                       Resizable="False"
-                      SetSize="668 713"
-                      MinSize="668 713">
+                      SetSize="868 748"
+                      MinSize="868 748">
     <BoxContainer Orientation="Vertical">
-        <BoxContainer Orientation="Horizontal"  HorizontalExpand="True" Margin="0 8 0 10" VerticalAlignment="Top">
+        <!-- Station name -->
+        <controls:StripeBack>
+            <PanelContainer>
+                <Label Name="StationName" Text="Unknown station" StyleClasses="LabelBig" Align="Center"/>
+            </PanelContainer>
+        </controls:StripeBack>
+
+        <BoxContainer Orientation="Horizontal" HorizontalExpand="True" VerticalAlignment="Top">
             <ui:NavMapControl Name="NavMapScreen"/>
+
+            <BoxContainer Orientation="Vertical" SetWidth="200">
+                <!-- Search bar -->
+                <LineEdit Name="FilterBar" PlaceHolder="{Loc 'station-map-filter-placeholder'}" Margin="0 0 10 10" HorizontalExpand="True"/>
+
+                <ScrollContainer HorizontalExpand="True" VerticalExpand="True">
+                    <!-- Beacon Buttons (filled by code) -->
+                    <BoxContainer Name="BeaconButtons" Orientation="Vertical" HorizontalExpand="True" />
+                </ScrollContainer>
+            </BoxContainer>
         </BoxContainer>
 
         <!-- Footer -->
diff --git a/Content.Client/Pinpointer/UI/StationMapWindow.xaml.cs b/Content.Client/Pinpointer/UI/StationMapWindow.xaml.cs
index 1b01fe4e304..52ef2ab7da4 100644
--- a/Content.Client/Pinpointer/UI/StationMapWindow.xaml.cs
+++ b/Content.Client/Pinpointer/UI/StationMapWindow.xaml.cs
@@ -3,25 +3,75 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Map;
+using Content.Shared.Pinpointer;
 
 namespace Content.Client.Pinpointer.UI;
 
 [GenerateTypedNameReferences]
 public sealed partial class StationMapWindow : FancyWindow
 {
-    public StationMapWindow(EntityUid? mapUid, EntityUid? trackedEntity)
+    [Dependency] private readonly IEntityManager _entMan = default!;
+
+    private readonly List<StationMapBeaconControl> _buttons = new();
+
+    public StationMapWindow()
     {
         RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        FilterBar.OnTextChanged += (bar) => OnFilterChanged(bar.Text);
+    }
+
+    public void Set(string stationName, EntityUid? mapUid, EntityUid? trackedEntity)
+    {
         NavMapScreen.MapUid = mapUid;
 
         if (trackedEntity != null)
             NavMapScreen.TrackedCoordinates.Add(new EntityCoordinates(trackedEntity.Value, Vector2.Zero), (true, Color.Cyan));
 
-        if (IoCManager.Resolve<IEntityManager>().TryGetComponent<MetaDataComponent>(mapUid, out var metadata))
+        if (!string.IsNullOrEmpty(stationName))
         {
-            Title = metadata.EntityName;
+            StationName.Text = stationName;
         }
 
         NavMapScreen.ForceNavMapUpdate();
+        UpdateBeaconList(mapUid);
+    }
+
+    public void OnFilterChanged(string newFilter)
+    {
+        foreach (var button in _buttons)
+        {
+            button.Visible = string.IsNullOrEmpty(newFilter) || (
+                !string.IsNullOrEmpty(button.Label) &&
+                button.Label.Contains(newFilter, StringComparison.OrdinalIgnoreCase)
+            );
+        };
+    }
+
+    public void UpdateBeaconList(EntityUid? mapUid)
+    {
+        BeaconButtons.Children.Clear();
+        _buttons.Clear();
+
+        if (!mapUid.HasValue)
+            return;
+
+        if (!_entMan.TryGetComponent<NavMapComponent>(mapUid, out var navMap))
+            return;
+
+        foreach (var beacon in navMap.Beacons.Values)
+        {
+            var button = new StationMapBeaconControl(mapUid.Value, beacon);
+
+            button.OnPressed += NavMapScreen.CenterToCoordinates;
+
+            _buttons.Add(button);
+        }
+
+        _buttons.Sort();
+
+        foreach (var button in _buttons)
+            BeaconButtons.AddChild(button);
     }
-}
+}
\ No newline at end of file
diff --git a/Resources/Locale/en-US/navmap-beacons/station_map.ftl b/Resources/Locale/en-US/navmap-beacons/station_map.ftl
index 1563e0abaf2..e2528515566 100644
--- a/Resources/Locale/en-US/navmap-beacons/station_map.ftl
+++ b/Resources/Locale/en-US/navmap-beacons/station_map.ftl
@@ -1,6 +1,7 @@
 station-map-window-title = Station map
 station-map-user-interface-flavor-left = Don't panic
 station-map-user-interface-flavor-right = v1.42
+station-map-filter-placeholder = Search by name
 
 nav-beacon-window-title = Station Beacon
 nav-beacon-toggle-visible = Visible

From c19b06efdbd00cd89d84947dc947f6f2147182b2 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Sun, 21 Jul 2024 14:48:13 +1000
Subject: [PATCH 022/366] Reapply "Remove some BUI boilerplate" (#30214)
 (#30219)

* Reapply "Remove some BUI boilerplate" (#30214)

This reverts commit cb0ba66be38677d248ce11f809221230ebe89642.

* Fix gas tank

* Fix PA

* Fix microwave

* Comms console underwrap

* Fix rcd

* log wehs
---
 .../UI/AccessOverriderBoundUserInterface.cs   |  45 ++---
 .../Access/UI/AccessOverriderWindow.xaml.cs   |  39 ++--
 .../UI/AgentIDCardBoundUserInterface.cs       |  20 +--
 .../Access/UI/AgentIDCardWindow.xaml.cs       |  10 +-
 .../Ame/UI/AmeControllerBoundUserInterface.cs |  16 +-
 Content.Client/Ame/UI/AmeWindow.xaml.cs       |  19 +-
 .../Ui/AnomalyGeneratorBoundUserInterface.cs  |  20 +--
 .../Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs |   8 +-
 Content.Client/Arcade/BlockGameMenu.cs        |  45 ++---
 .../Arcade/SpaceVillainArcadeMenu.cs          |  45 ++---
 .../Arcade/UI/BlockGameBoundUserInterface.cs  |   5 +-
 .../SpaceVillainArcadeBoundUserInterface.cs   |  16 +-
 .../Monitor/UI/AirAlarmBoundUserInterface.cs  |  12 +-
 .../Atmos/Monitor/UI/AirAlarmWindow.xaml.cs   |   7 +-
 .../Atmos/UI/GasCanisterBoundUserInterface.cs |   9 +-
 .../Atmos/UI/GasFilterBoundUserInterface.cs   |  11 +-
 .../Atmos/UI/GasFilterWindow.xaml.cs          |   7 +-
 .../Atmos/UI/GasMixerBoundUserInteface.cs     |  18 +-
 .../UI/GasPressurePumpBoundUserInterface.cs   |  17 +-
 .../UI/GasThermomachineBoundUserInterface.cs  |  17 +-
 .../UI/GasVolumePumpBoundUserInterface.cs     |  19 +-
 .../Atmos/UI/SpaceHeaterBoundUserInterface.cs |  10 +-
 .../Jukebox/JukeboxBoundUserInterface.cs      |  21 +--
 .../CryostorageBoundUserInterface.cs          |  15 +-
 .../CargoBountyConsoleBoundUserInterface.cs   |  17 +-
 .../CargoPalletConsoleBoundUserInterface.cs   |  15 +-
 .../CargoShuttleConsoleBoundUserInterface.cs  |  24 +--
 .../Cargo/UI/CargoShuttleMenu.xaml.cs         |  13 +-
 .../UI/ChemMasterBoundUserInterface.cs        |  20 +--
 .../UI/ReagentDispenserBoundUserInterface.cs  |  27 +--
 .../UI/TransferAmountBoundUserInterface.cs    |  12 +-
 .../UI/CloningConsoleBoundUserInterface.cs    |  25 +--
 .../UI/ChameleonBoundUserInterface.cs         |  16 +-
 ...CommunicationsConsoleBoundUserInterface.cs |  72 +++-----
 .../UI/CommunicationsConsoleMenu.xaml.cs      |  83 ++++-----
 .../Computer/ComputerBoundUserInterface.cs    |  15 +-
 .../UI/ConfigurationBoundUserInterface.cs     |  28 +--
 .../Configurable/UI/ConfigurationMenu.cs      |  18 +-
 .../UI/FlatpackCreatorBoundUserInterface.cs   |  14 +-
 .../UI/FlatpackCreatorMenu.xaml.cs            |  13 +-
 .../Crayon/UI/CrayonBoundUserInterface.cs     |  40 +++--
 Content.Client/Crayon/UI/CrayonWindow.xaml.cs |  18 +-
 .../UI/DisposalRouterBoundUserInterface.cs    |  22 +--
 .../UI/DisposalTaggerBoundUserInterface.cs    |  23 +--
 .../DoorElectronicsBoundUserInterface.cs      |  31 ++--
 .../DoorElectronicsConfigurationMenu.xaml.cs  |  21 +--
 Content.Client/Fax/UI/FaxBoundUi.cs           |  12 +-
 .../ForensicScannerBoundUserInterface.cs      |  15 +-
 .../Gateway/UI/GatewayBoundUserInterface.cs   |  16 +-
 .../Gateway/UI/GatewayWindow.xaml.cs          |  10 +-
 .../UI/GravityGeneratorBoundUserInterface.cs  |  23 +--
 .../Gravity/UI/GravityGeneratorWindow.xaml.cs |  15 +-
 .../UI/HealthAnalyzerBoundUserInterface.cs    |  29 +--
 ...manoidMarkingModifierBoundUserInterface.cs |   4 +-
 .../Instruments/UI/BandMenu.xaml.cs           |   6 +-
 .../Instruments/UI/ChannelsMenu.xaml.cs       |   5 +-
 .../UI/InstrumentBoundUserInterface.cs        |  36 ++--
 .../Instruments/UI/InstrumentMenu.xaml.cs     | 169 ++++++++++--------
 .../Inventory/StrippableBoundUserInterface.cs |  21 +--
 Content.Client/Kitchen/UI/GrinderMenu.xaml.cs |  42 ++---
 .../Kitchen/UI/MicrowaveBoundUserInterface.cs |  43 +----
 .../Kitchen/UI/MicrowaveMenu.xaml.cs          |  25 +--
 .../UI/ReagentGrinderBoundUserInterface.cs    |  34 ++--
 .../UI/HandLabelerBoundUserInterface.cs       |  16 +-
 .../Lathe/UI/LatheBoundUserInterface.cs       |  17 +-
 Content.Client/Lathe/UI/LatheMenu.xaml.cs     |  41 +++--
 .../UI/SignalTimerBoundUserInterface.cs       |  24 +--
 .../UI/SignalTimerWindow.xaml.cs              |  24 +--
 .../MagicMirrorBoundUserInterface.cs          |  15 +-
 .../Ui/NewsWriterBoundUserInterface.cs        |  18 +-
 .../MassMedia/Ui/NewsWriterMenu.xaml.cs       |   6 +-
 .../Mech/Ui/MechBoundUserInterface.cs         |  16 +-
 Content.Client/Mech/Ui/MechMenu.xaml.cs       |   9 +-
 .../CrewMonitoringBoundUserInterface.cs       |  18 +-
 .../CrewMonitoringWindow.xaml.cs              |  17 +-
 .../NetworkConfiguratorBoundUserInterface.cs  |  39 ++--
 ...tworkConfiguratorConfigurationMenu.xaml.cs |   8 +-
 .../NetworkConfiguratorDeviceList.xaml.cs     |  12 +-
 .../NetworkConfiguratorLinkMenu.xaml.cs       |  16 +-
 .../NetworkConfiguratorListMenu.xaml.cs       |  13 +-
 Content.Client/Nuke/NukeBoundUserInterface.cs |  17 +-
 .../WarDeclaratorBoundUserInterface.cs        |  18 +-
 .../NukeOps/WarDeclaratorWindow.xaml.cs       |   9 +-
 Content.Client/PDA/PdaBoundUserInterface.cs   |  21 +--
 .../PDA/Ringer/RingerBoundUserInterface.cs    |   4 +-
 .../Paper/UI/PaperBoundUserInterface.cs       |  17 +-
 Content.Client/Paper/UI/PaperWindow.xaml.cs   |   6 +-
 .../ParticleAcceleratorBoundUserInterface.cs  |  16 +-
 .../UI/ParticleAcceleratorControlMenu.cs      |  31 ++--
 .../UI/NavMapBeaconBoundUserInterface.cs      |  16 +-
 .../Pinpointer/UI/NavMapBeaconWindow.xaml.cs  |  25 ++-
 .../UI/StationMapBoundUserInterface.cs        |  15 +-
 .../UI/UntrackedMapBoundUserInterface.cs      |  15 +-
 .../Power/APC/ApcBoundUserInterface.cs        |  16 +-
 Content.Client/Power/APC/UI/ApcMenu.xaml.cs   |  12 +-
 .../Power/Generator/GeneratorWindow.xaml.cs   |  52 +++---
 .../PortableGeneratorBoundUserInterface.cs    |  25 ++-
 ...owerMonitoringConsoleBoundUserInterface.cs |  19 +-
 .../PowerMonitoringWindow.xaml.Widgets.cs     |   6 +-
 .../Power/PowerMonitoringWindow.xaml.cs       |  84 +++++----
 Content.Client/RCD/RCDMenu.xaml.cs            |  40 ++---
 .../RCD/RCDMenuBoundUserInterface.cs          |  16 +-
 .../Radio/Ui/IntercomBoundUserInterface.cs    |  28 +--
 .../UI/DiskConsoleBoundUserInterface.cs       |  14 +-
 .../UI/ResearchClientBoundUserInterface.cs    |  15 +-
 .../ResearchClientServerSelectionMenu.xaml.cs |  11 +-
 .../UI/ResearchConsoleBoundUserInterface.cs   |  29 +--
 .../Research/UI/ResearchConsoleMenu.xaml.cs   |  29 +--
 .../UI/RoboticsConsoleBoundUserInterface.cs   |  18 +-
 .../Robotics/UI/RoboticsConsoleWindow.xaml.cs |  27 ++-
 ...vageExpeditionConsoleBoundUserInterface.cs |  12 +-
 .../BUI/IFFConsoleBoundUserInterface.cs       |   4 +-
 .../BUI/RadarConsoleBoundUserInterface.cs     |  14 +-
 .../BUI/ShuttleConsoleBoundUserInterface.cs   |   5 +-
 .../Silicons/Borgs/BorgBoundUserInterface.cs  |  18 +-
 Content.Client/Silicons/Borgs/BorgMenu.xaml   |   2 +-
 .../Silicons/Borgs/BorgMenu.xaml.cs           |  62 ++++---
 .../Laws/Ui/SiliconLawBoundUserInterface.cs   |  15 +-
 .../UI/SprayPainterBoundUserInterface.cs      |  27 +--
 ...lStationRecordConsoleBoundUserInterface.cs |  13 +-
 .../Store/Ui/StoreBoundUserInterface.cs       |  18 +-
 Content.Client/Strip/StrippingMenu.cs         |  11 +-
 .../UI/SurveillanceCameraMonitorBoundUi.cs    |  11 +-
 .../Thief/ThiefBackpackBoundUserInterface.cs  |  19 +-
 .../Thief/ThiefBackpackMenu.xaml.cs           |  28 ++-
 .../GasTank/GasTankBoundUserInterface.cs      |  10 +-
 .../Systems/Atmos/GasTank/GasTankWindow.cs    | 124 +++++++------
 .../VendingMachineBoundUserInterface.cs       |   8 +-
 .../VoiceMask/VoiceMaskBoundUserInterface.cs  |   8 +-
 .../VoiceMaskNameChangeWindow.xaml.cs         |   6 +-
 .../Melee/UI/MeleeSpeechBoundUserInterface.cs |  10 +-
 .../Wires/UI/WiresBoundUserInterface.cs       |   7 +-
 Content.Client/Wires/UI/WiresMenu.cs          |  16 +-
 .../Ui/AnalysisConsoleBoundUserInterface.cs   |   6 +-
 134 files changed, 1151 insertions(+), 1786 deletions(-)

diff --git a/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs b/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs
index c1b63dc4d05..d80c600c03e 100644
--- a/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs
+++ b/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
 using Content.Shared.Containers.ItemSlots;
+using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
 using static Content.Shared.Access.Components.AccessOverriderComponent;
 
@@ -23,6 +24,28 @@ protected override void Open()
         {
             base.Open();
 
+            _window = this.CreateWindow<AccessOverriderWindow>();
+            RefreshAccess();
+            _window.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
+            _window.OnSubmit += SubmitData;
+
+            _window.PrivilegedIdButton.OnPressed += _ => SendMessage(new ItemSlotButtonPressedEvent(PrivilegedIdCardSlotId));
+        }
+
+        public override void OnProtoReload(PrototypesReloadedEventArgs args)
+        {
+            base.OnProtoReload(args);
+            if (!args.WasModified<AccessLevelPrototype>())
+                return;
+
+            RefreshAccess();
+
+            if (State != null)
+                _window?.UpdateState(_prototypeManager, (AccessOverriderBoundUserInterfaceState) State);
+        }
+
+        private void RefreshAccess()
+        {
             List<ProtoId<AccessLevelPrototype>> accessLevels;
 
             if (EntMan.TryGetComponent<AccessOverriderComponent>(Owner, out var accessOverrider))
@@ -30,38 +53,20 @@ protected override void Open()
                 accessLevels = accessOverrider.AccessLevels;
                 accessLevels.Sort();
             }
-
             else
             {
                 accessLevels = new List<ProtoId<AccessLevelPrototype>>();
                 _accessOverriderSystem.Log.Error($"No AccessOverrider component found for {EntMan.ToPrettyString(Owner)}!");
             }
 
-            _window = new AccessOverriderWindow(this, _prototypeManager, accessLevels)
-            {
-                Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName
-            };
-
-            _window.PrivilegedIdButton.OnPressed += _ => SendMessage(new ItemSlotButtonPressedEvent(PrivilegedIdCardSlotId));
-
-            _window.OnClose += Close;
-            _window.OpenCentered();
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing)
-                return;
-
-            _window?.Dispose();
+            _window?.SetAccessLevels(_prototypeManager, accessLevels);
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
         {
             base.UpdateState(state);
             var castState = (AccessOverriderBoundUserInterfaceState) state;
-            _window?.UpdateState(castState);
+            _window?.UpdateState(_prototypeManager, castState);
         }
 
         public void SubmitData(List<ProtoId<AccessLevelPrototype>> newAccessList)
diff --git a/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs b/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs
index b5c480ff71b..ef6a3bb6717 100644
--- a/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs
+++ b/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs
@@ -13,26 +13,24 @@ namespace Content.Client.Access.UI
     [GenerateTypedNameReferences]
     public sealed partial class AccessOverriderWindow : DefaultWindow
     {
-        [Dependency] private readonly ILogManager _logManager = default!;
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-
-        private readonly AccessOverriderBoundUserInterface _owner;
         private readonly Dictionary<string, Button> _accessButtons = new();
 
-        public AccessOverriderWindow(AccessOverriderBoundUserInterface owner, IPrototypeManager prototypeManager,
-            List<ProtoId<AccessLevelPrototype>> accessLevels)
+        public event Action<List<ProtoId<AccessLevelPrototype>>>? OnSubmit;
+
+        public AccessOverriderWindow()
         {
             RobustXamlLoader.Load(this);
-            IoCManager.InjectDependencies(this);
-            var logMill = _logManager.GetSawmill(SharedAccessOverriderSystem.Sawmill);
+        }
 
-            _owner = owner;
+        public void SetAccessLevels(IPrototypeManager protoManager, List<ProtoId<AccessLevelPrototype>> accessLevels)
+        {
+            _accessButtons.Clear();
+            AccessLevelGrid.DisposeAllChildren();
 
             foreach (var access in accessLevels)
             {
-                if (!prototypeManager.TryIndex(access, out var accessLevel))
+                if (!protoManager.TryIndex(access, out var accessLevel))
                 {
-                    logMill.Error($"Unable to find access level for {access}");
                     continue;
                 }
 
@@ -44,11 +42,16 @@ public AccessOverriderWindow(AccessOverriderBoundUserInterface owner, IPrototype
 
                 AccessLevelGrid.AddChild(newButton);
                 _accessButtons.Add(accessLevel.ID, newButton);
-                newButton.OnPressed += _ => SubmitData();
+                newButton.OnPressed += _ =>
+                {
+                    OnSubmit?.Invoke(
+                        // Iterate over the buttons dictionary, filter by `Pressed`, only get key from the key/value pair
+                        _accessButtons.Where(x => x.Value.Pressed).Select(x => new ProtoId<AccessLevelPrototype>(x.Key)).ToList());
+                };
             }
         }
 
-        public void UpdateState(AccessOverriderBoundUserInterfaceState state)
+        public void UpdateState(IPrototypeManager protoManager, AccessOverriderBoundUserInterfaceState state)
         {
             PrivilegedIdLabel.Text = state.PrivilegedIdName;
             PrivilegedIdButton.Text = state.IsPrivilegedIdPresent
@@ -70,7 +73,7 @@ public void UpdateState(AccessOverriderBoundUserInterfaceState state)
 
                 foreach (string tag in state.MissingPrivilegesList)
                 {
-                    var privilege = Loc.GetString(_prototypeManager.Index<AccessLevelPrototype>(tag)?.Name ?? "generic-unknown");
+                    var privilege = Loc.GetString(protoManager.Index<AccessLevelPrototype>(tag)?.Name ?? "generic-unknown");
                     missingPrivileges.Add(privilege);
                 }
 
@@ -90,13 +93,5 @@ public void UpdateState(AccessOverriderBoundUserInterfaceState state)
                 button.Disabled = (!state.AllowedModifyAccessList?.Contains<ProtoId<AccessLevelPrototype>>(accessName)) ?? true;
             }
         }
-
-        private void SubmitData() =>
-            _owner.SubmitData(
-                // Iterate over the buttons dictionary, filter by `Pressed`, only get key from the key/value pair
-                _accessButtons.Where(x => x.Value.Pressed)
-                    .Select(x => new ProtoId<AccessLevelPrototype>(x.Key))
-                    .ToList()
-                );
     }
 }
diff --git a/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs b/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs
index c3fac8cb92a..ee5ed26d2e3 100644
--- a/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs
+++ b/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs
@@ -1,5 +1,7 @@
 using Content.Shared.Access.Systems;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Access.UI
 {
@@ -18,16 +20,11 @@ protected override void Open()
         {
             base.Open();
 
-            _window?.Dispose();
-            _window = new AgentIDCardWindow(this);
-            if (State != null)
-                UpdateState(State);
+            _window = this.CreateWindow<AgentIDCardWindow>();
 
-            _window.OpenCentered();
-
-            _window.OnClose += Close;
             _window.OnNameChanged += OnNameChanged;
             _window.OnJobChanged += OnJobChanged;
+            _window.OnJobIconChanged += OnJobIconChanged;
         }
 
         private void OnNameChanged(string newName)
@@ -59,14 +56,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
             _window.SetCurrentJob(cast.CurrentJob);
             _window.SetAllowedIcons(cast.Icons, cast.CurrentJobIconId);
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing)
-                return;
-
-            _window?.Dispose();
-        }
     }
 }
diff --git a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
index 9a38c0c4853..91cb8b0ebdb 100644
--- a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
+++ b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
@@ -17,19 +17,19 @@ public sealed partial class AgentIDCardWindow : DefaultWindow
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IEntitySystemManager _entitySystem = default!;
         private readonly SpriteSystem _spriteSystem;
-        private readonly AgentIDCardBoundUserInterface _bui;
 
         private const int JobIconColumnCount = 10;
 
         public event Action<string>? OnNameChanged;
         public event Action<string>? OnJobChanged;
 
-        public AgentIDCardWindow(AgentIDCardBoundUserInterface bui)
+        public event Action<ProtoId<StatusIconPrototype>>? OnJobIconChanged;
+
+        public AgentIDCardWindow()
         {
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);
             _spriteSystem = _entitySystem.GetEntitySystem<SpriteSystem>();
-            _bui = bui;
 
             NameLineEdit.OnTextEntered += e => OnNameChanged?.Invoke(e.Text);
             NameLineEdit.OnFocusExit += e => OnNameChanged?.Invoke(e.Text);
@@ -69,7 +69,7 @@ public void SetAllowedIcons(HashSet<string> icons, string currentJobIconId)
                 };
 
                 // Generate buttons textures
-                TextureRect jobIconTexture = new TextureRect
+                var jobIconTexture = new TextureRect
                 {
                     Texture = _spriteSystem.Frame0(jobIcon.Icon),
                     TextureScale = new Vector2(2.5f, 2.5f),
@@ -77,7 +77,7 @@ public void SetAllowedIcons(HashSet<string> icons, string currentJobIconId)
                 };
 
                 jobIconButton.AddChild(jobIconTexture);
-                jobIconButton.OnPressed += _ => _bui.OnJobIconChanged(jobIcon.ID);
+                jobIconButton.OnPressed += _ => OnJobIconChanged?.Invoke(jobIcon.ID);
                 IconGrid.AddChild(jobIconButton);
 
                 if (jobIconId.Equals(currentJobIconId))
diff --git a/Content.Client/Ame/UI/AmeControllerBoundUserInterface.cs b/Content.Client/Ame/UI/AmeControllerBoundUserInterface.cs
index e84cf5d34de..3d65f751899 100644
--- a/Content.Client/Ame/UI/AmeControllerBoundUserInterface.cs
+++ b/Content.Client/Ame/UI/AmeControllerBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Ame.Components;
 using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Ame.UI
 {
@@ -16,9 +17,8 @@ protected override void Open()
         {
             base.Open();
 
-            _window = new AmeWindow(this);
-            _window.OnClose += Close;
-            _window.OpenCentered();
+            _window = this.CreateWindow<AmeWindow>();
+            _window.OnAmeButton += ButtonPressed;
         }
 
         /// <summary>
@@ -40,15 +40,5 @@ public void ButtonPressed(UiButton button)
         {
             SendMessage(new UiButtonPressedMessage(button));
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (disposing)
-            {
-                _window?.Dispose();
-            }
-        }
     }
 }
diff --git a/Content.Client/Ame/UI/AmeWindow.xaml.cs b/Content.Client/Ame/UI/AmeWindow.xaml.cs
index 8b91ec59660..d6d580bcdaf 100644
--- a/Content.Client/Ame/UI/AmeWindow.xaml.cs
+++ b/Content.Client/Ame/UI/AmeWindow.xaml.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Client.UserInterface;
 using Content.Shared.Ame.Components;
 using Robust.Client.AutoGenerated;
@@ -9,15 +10,17 @@ namespace Content.Client.Ame.UI
     [GenerateTypedNameReferences]
     public sealed partial class AmeWindow : DefaultWindow
     {
-        public AmeWindow(AmeControllerBoundUserInterface ui)
+        public event Action<UiButton>? OnAmeButton;
+
+        public AmeWindow()
         {
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);
 
-            EjectButton.OnPressed += _ => ui.ButtonPressed(UiButton.Eject);
-            ToggleInjection.OnPressed += _ => ui.ButtonPressed(UiButton.ToggleInjection);
-            IncreaseFuelButton.OnPressed += _ => ui.ButtonPressed(UiButton.IncreaseFuel);
-            DecreaseFuelButton.OnPressed += _ => ui.ButtonPressed(UiButton.DecreaseFuel);
+            EjectButton.OnPressed += _ => OnAmeButton?.Invoke(UiButton.Eject);
+            ToggleInjection.OnPressed += _ => OnAmeButton?.Invoke(UiButton.ToggleInjection);
+            IncreaseFuelButton.OnPressed += _ => OnAmeButton?.Invoke(UiButton.IncreaseFuel);
+            DecreaseFuelButton.OnPressed += _ => OnAmeButton?.Invoke(UiButton.DecreaseFuel);
         }
 
         /// <summary>
@@ -29,7 +32,7 @@ public void UpdateState(BoundUserInterfaceState state)
             var castState = (AmeControllerBoundUserInterfaceState) state;
 
             // Disable all buttons if not powered
-            if (Contents.Children != null)
+            if (Contents.Children.Any())
             {
                 ButtonHelpers.SetButtonDisabledRecursive(Contents, !castState.HasPower);
                 EjectButton.Disabled = false;
@@ -65,8 +68,8 @@ public void UpdateState(BoundUserInterfaceState state)
             CoreCount.Text = $"{castState.CoreCount}";
             InjectionAmount.Text = $"{castState.InjectionAmount}";
             // format power statistics to pretty numbers
-            CurrentPowerSupply.Text = $"{castState.CurrentPowerSupply.ToString("N1")}";
-            TargetedPowerSupply.Text = $"{castState.TargetedPowerSupply.ToString("N1")}";
+            CurrentPowerSupply.Text = $"{castState.CurrentPowerSupply:N1}";
+            TargetedPowerSupply.Text = $"{castState.TargetedPowerSupply:N1}";
         }
     }
 }
diff --git a/Content.Client/Anomaly/Ui/AnomalyGeneratorBoundUserInterface.cs b/Content.Client/Anomaly/Ui/AnomalyGeneratorBoundUserInterface.cs
index 5764d0a097d..5d1985485c4 100644
--- a/Content.Client/Anomaly/Ui/AnomalyGeneratorBoundUserInterface.cs
+++ b/Content.Client/Anomaly/Ui/AnomalyGeneratorBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Gravity;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Anomaly.Ui;
 
@@ -18,10 +19,8 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new(Owner);
-
-        _window.OpenCentered();
-        _window.OnClose += Close;
+        _window = this.CreateWindow<AnomalyGeneratorWindow>();
+        _window.SetEntity(Owner);
 
         _window.OnGenerateButtonPressed += () =>
         {
@@ -37,18 +36,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
             return;
         _window?.UpdateState(msg);
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing) return;
-
-        _window?.Dispose();
-    }
-
-    public void SetPowerSwitch(bool on)
-    {
-        SendMessage(new SharedGravityGeneratorComponent.SwitchGeneratorMessage(on));
-    }
 }
 
diff --git a/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs b/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs
index 08438e2a1b2..82d41192dd0 100644
--- a/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs
+++ b/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs
@@ -18,17 +18,21 @@ public sealed partial class AnomalyGeneratorWindow : FancyWindow
 
     public Action? OnGenerateButtonPressed;
 
-    public AnomalyGeneratorWindow(EntityUid gen)
+    public AnomalyGeneratorWindow()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
 
-        EntityView.SetEntity(gen);
         EntityView.SpriteOffset = false;
 
         GenerateButton.OnPressed += _ => OnGenerateButtonPressed?.Invoke();
     }
 
+    public void SetEntity(EntityUid uid)
+    {
+        EntityView.SetEntity(uid);
+    }
+
     public void UpdateState(AnomalyGeneratorUserInterfaceState state)
     {
         _cooldownEnd = state.CooldownEndTime;
diff --git a/Content.Client/Arcade/BlockGameMenu.cs b/Content.Client/Arcade/BlockGameMenu.cs
index eeda2a31020..4a579fc4bf4 100644
--- a/Content.Client/Arcade/BlockGameMenu.cs
+++ b/Content.Client/Arcade/BlockGameMenu.cs
@@ -28,8 +28,6 @@ public sealed class BlockGameMenu : DefaultWindow
 
         private static readonly Vector2 BlockSize = new(15, 15);
 
-        private readonly BlockGameBoundUserInterface _owner;
-
         private readonly PanelContainer _mainPanel;
 
         private readonly BoxContainer _gameRootContainer;
@@ -58,10 +56,11 @@ public sealed class BlockGameMenu : DefaultWindow
         private bool _isPlayer = false;
         private bool _gameOver = false;
 
-        public BlockGameMenu(BlockGameBoundUserInterface owner)
+        public event Action<BlockGamePlayerAction>? OnAction;
+
+        public BlockGameMenu()
         {
             Title = Loc.GetString("blockgame-menu-title");
-            _owner = owner;
 
             MinSize = SetSize = new Vector2(410, 490);
 
@@ -176,7 +175,7 @@ public BlockGameMenu(BlockGameBoundUserInterface owner)
             };
             _newGameButton.OnPressed += (e) =>
             {
-                _owner.SendAction(BlockGamePlayerAction.NewGame);
+                OnAction?.Invoke(BlockGamePlayerAction.NewGame);
             };
             pauseMenuContainer.AddChild(_newGameButton);
             pauseMenuContainer.AddChild(new Control { MinSize = new Vector2(1, 10) });
@@ -186,7 +185,10 @@ public BlockGameMenu(BlockGameBoundUserInterface owner)
                 Text = Loc.GetString("blockgame-menu-button-scoreboard"),
                 TextAlign = Label.AlignMode.Center
             };
-            _scoreBoardButton.OnPressed += (e) => _owner.SendAction(BlockGamePlayerAction.ShowHighscores);
+            _scoreBoardButton.OnPressed += (e) =>
+            {
+                OnAction?.Invoke(BlockGamePlayerAction.ShowHighscores);
+            };
             pauseMenuContainer.AddChild(_scoreBoardButton);
             _unpauseButtonMargin = new Control { MinSize = new Vector2(1, 10), Visible = false };
             pauseMenuContainer.AddChild(_unpauseButtonMargin);
@@ -199,7 +201,7 @@ public BlockGameMenu(BlockGameBoundUserInterface owner)
             };
             _unpauseButton.OnPressed += (e) =>
             {
-                _owner.SendAction(BlockGamePlayerAction.Unpause);
+                OnAction?.Invoke(BlockGamePlayerAction.Unpause);
             };
             pauseMenuContainer.AddChild(_unpauseButton);
 
@@ -257,7 +259,7 @@ public BlockGameMenu(BlockGameBoundUserInterface owner)
             };
             _finalNewGameButton.OnPressed += (e) =>
             {
-                _owner.SendAction(BlockGamePlayerAction.NewGame);
+                OnAction?.Invoke(BlockGamePlayerAction.NewGame);
             };
             gameOverMenuContainer.AddChild(_finalNewGameButton);
 
@@ -327,7 +329,10 @@ public BlockGameMenu(BlockGameBoundUserInterface owner)
                 Text = Loc.GetString("blockgame-menu-button-back"),
                 TextAlign = Label.AlignMode.Center
             };
-            _highscoreBackButton.OnPressed += (e) => _owner.SendAction(BlockGamePlayerAction.Pause);
+            _highscoreBackButton.OnPressed += (e) =>
+            {
+                OnAction?.Invoke(BlockGamePlayerAction.Pause);
+            };
             menuContainer.AddChild(_highscoreBackButton);
 
             menuInnerPanel.AddChild(menuContainer);
@@ -473,7 +478,7 @@ protected override void KeyboardFocusExited()
 
         private void TryPause()
         {
-            _owner.SendAction(BlockGamePlayerAction.Pause);
+            OnAction?.Invoke(BlockGamePlayerAction.Pause);
         }
 
         public void SetStarted()
@@ -576,19 +581,19 @@ protected override void KeyBindDown(GUIBoundKeyEventArgs args)
                 return;
 
             else if (args.Function == ContentKeyFunctions.ArcadeLeft)
-                _owner.SendAction(BlockGamePlayerAction.StartLeft);
+                OnAction?.Invoke(BlockGamePlayerAction.StartLeft);
             else if (args.Function == ContentKeyFunctions.ArcadeRight)
-                _owner.SendAction(BlockGamePlayerAction.StartRight);
+                OnAction?.Invoke(BlockGamePlayerAction.StartRight);
             else if (args.Function == ContentKeyFunctions.ArcadeUp)
-                _owner.SendAction(BlockGamePlayerAction.Rotate);
+                OnAction?.Invoke(BlockGamePlayerAction.Rotate);
             else if (args.Function == ContentKeyFunctions.Arcade3)
-                _owner.SendAction(BlockGamePlayerAction.CounterRotate);
+                OnAction?.Invoke(BlockGamePlayerAction.CounterRotate);
             else if (args.Function == ContentKeyFunctions.ArcadeDown)
-                _owner.SendAction(BlockGamePlayerAction.SoftdropStart);
+                OnAction?.Invoke(BlockGamePlayerAction.SoftdropStart);
             else if (args.Function == ContentKeyFunctions.Arcade2)
-                _owner.SendAction(BlockGamePlayerAction.Hold);
+                OnAction?.Invoke(BlockGamePlayerAction.Hold);
             else if (args.Function == ContentKeyFunctions.Arcade1)
-                _owner.SendAction(BlockGamePlayerAction.Harddrop);
+                OnAction?.Invoke(BlockGamePlayerAction.Harddrop);
         }
 
         protected override void KeyBindUp(GUIBoundKeyEventArgs args)
@@ -599,11 +604,11 @@ protected override void KeyBindUp(GUIBoundKeyEventArgs args)
                 return;
 
             else if (args.Function == ContentKeyFunctions.ArcadeLeft)
-                _owner.SendAction(BlockGamePlayerAction.EndLeft);
+                OnAction?.Invoke(BlockGamePlayerAction.EndLeft);
             else if (args.Function == ContentKeyFunctions.ArcadeRight)
-                _owner.SendAction(BlockGamePlayerAction.EndRight);
+                OnAction?.Invoke(BlockGamePlayerAction.EndRight);
             else if (args.Function == ContentKeyFunctions.ArcadeDown)
-                _owner.SendAction(BlockGamePlayerAction.SoftdropEnd);
+                OnAction?.Invoke(BlockGamePlayerAction.SoftdropEnd);
         }
 
         public void UpdateNextBlock(BlockGameBlock[] blocks)
diff --git a/Content.Client/Arcade/SpaceVillainArcadeMenu.cs b/Content.Client/Arcade/SpaceVillainArcadeMenu.cs
index e5542a5848e..1ee4c268184 100644
--- a/Content.Client/Arcade/SpaceVillainArcadeMenu.cs
+++ b/Content.Client/Arcade/SpaceVillainArcadeMenu.cs
@@ -8,8 +8,6 @@ namespace Content.Client.Arcade
 {
     public sealed class SpaceVillainArcadeMenu : DefaultWindow
     {
-        public SpaceVillainArcadeBoundUserInterface Owner { get; set; }
-
         private readonly Label _enemyNameLabel;
         private readonly Label _playerInfoLabel;
         private readonly Label _enemyInfoLabel;
@@ -17,11 +15,13 @@ public sealed class SpaceVillainArcadeMenu : DefaultWindow
         private readonly Label _enemyActionLabel;
 
         private readonly Button[] _gameButtons = new Button[3]; //used to disable/enable all game buttons
-        public SpaceVillainArcadeMenu(SpaceVillainArcadeBoundUserInterface owner)
+
+        public event Action<SharedSpaceVillainArcadeComponent.PlayerAction>? OnPlayerAction;
+
+        public SpaceVillainArcadeMenu()
         {
             MinSize = SetSize = new Vector2(300, 225);
             Title = Loc.GetString("spacevillain-menu-title");
-            Owner = owner;
 
             var grid = new GridContainer { Columns = 1 };
 
@@ -47,32 +47,43 @@ public SpaceVillainArcadeMenu(SpaceVillainArcadeBoundUserInterface owner)
             grid.AddChild(_enemyActionLabel);
 
             var buttonGrid = new GridContainer { Columns = 3 };
-            _gameButtons[0] = new ActionButton(Owner, SharedSpaceVillainArcadeComponent.PlayerAction.Attack)
+            _gameButtons[0] = new Button()
             {
                 Text = Loc.GetString("spacevillain-menu-button-attack")
             };
+
+            _gameButtons[0].OnPressed +=
+                _ => OnPlayerAction?.Invoke(SharedSpaceVillainArcadeComponent.PlayerAction.Attack);
             buttonGrid.AddChild(_gameButtons[0]);
 
-            _gameButtons[1] = new ActionButton(Owner, SharedSpaceVillainArcadeComponent.PlayerAction.Heal)
+            _gameButtons[1] = new Button()
             {
                 Text = Loc.GetString("spacevillain-menu-button-heal")
             };
+
+            _gameButtons[1].OnPressed +=
+                _ => OnPlayerAction?.Invoke(SharedSpaceVillainArcadeComponent.PlayerAction.Heal);
             buttonGrid.AddChild(_gameButtons[1]);
 
-            _gameButtons[2] = new ActionButton(Owner, SharedSpaceVillainArcadeComponent.PlayerAction.Recharge)
+            _gameButtons[2] = new Button()
             {
                 Text = Loc.GetString("spacevillain-menu-button-recharge")
             };
+
+            _gameButtons[2].OnPressed +=
+                _ => OnPlayerAction?.Invoke(SharedSpaceVillainArcadeComponent.PlayerAction.Recharge);
             buttonGrid.AddChild(_gameButtons[2]);
 
             centerContainer = new CenterContainer();
             centerContainer.AddChild(buttonGrid);
             grid.AddChild(centerContainer);
 
-            var newGame = new ActionButton(Owner, SharedSpaceVillainArcadeComponent.PlayerAction.NewGame)
+            var newGame = new Button()
             {
                 Text = Loc.GetString("spacevillain-menu-button-new-game")
             };
+
+            newGame.OnPressed += _ => OnPlayerAction?.Invoke(SharedSpaceVillainArcadeComponent.PlayerAction.NewGame);
             grid.AddChild(newGame);
 
             Contents.AddChild(grid);
@@ -99,23 +110,5 @@ public void UpdateInfo(SharedSpaceVillainArcadeComponent.SpaceVillainArcadeDataU
             _playerActionLabel.Text = message.PlayerActionMessage;
             _enemyActionLabel.Text = message.EnemyActionMessage;
         }
-
-        private sealed class ActionButton : Button
-        {
-            private readonly SpaceVillainArcadeBoundUserInterface _owner;
-            private readonly SharedSpaceVillainArcadeComponent.PlayerAction _playerAction;
-
-            public ActionButton(SpaceVillainArcadeBoundUserInterface owner, SharedSpaceVillainArcadeComponent.PlayerAction playerAction)
-            {
-                _owner = owner;
-                _playerAction = playerAction;
-                OnPressed += Clicked;
-            }
-
-            private void Clicked(ButtonEventArgs e)
-            {
-                _owner.SendAction(_playerAction);
-            }
-        }
     }
 }
diff --git a/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs b/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs
index 1a3422dec0f..8fa8035afd6 100644
--- a/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs
+++ b/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Arcade;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Arcade.UI;
 
@@ -15,9 +16,7 @@ protected override void Open()
     {
         base.Open();
 
-        _menu = new BlockGameMenu(this);
-        _menu.OnClose += Close;
-        _menu.OpenCentered();
+        _menu = this.CreateWindow<BlockGameMenu>();
     }
 
     protected override void ReceiveMessage(BoundUserInterfaceMessage message)
diff --git a/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs b/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs
index 40bbe8b2d8c..c0704530de2 100644
--- a/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs
+++ b/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs
@@ -1,4 +1,5 @@
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 using static Content.Shared.Arcade.SharedSpaceVillainArcadeComponent;
@@ -9,8 +10,6 @@ public sealed class SpaceVillainArcadeBoundUserInterface : BoundUserInterface
 {
     [ViewVariables] private SpaceVillainArcadeMenu? _menu;
 
-    //public SharedSpaceVillainArcadeComponent SpaceVillainArcade;
-
     public SpaceVillainArcadeBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
     {
         SendAction(PlayerAction.RequestData);
@@ -25,10 +24,7 @@ protected override void Open()
     {
         base.Open();
 
-        _menu = new SpaceVillainArcadeMenu(this);
-
-        _menu.OnClose += Close;
-        _menu.OpenCentered();
+        _menu = this.CreateWindow<SpaceVillainArcadeMenu>();
     }
 
     protected override void ReceiveMessage(BoundUserInterfaceMessage message)
@@ -36,12 +32,4 @@ protected override void ReceiveMessage(BoundUserInterfaceMessage message)
         if (message is SpaceVillainArcadeDataUpdateMessage msg)
             _menu?.UpdateInfo(msg);
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-
-        if (disposing)
-            _menu?.Dispose();
-    }
 }
diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs b/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs
index 8f3b507c806..2ae15188355 100644
--- a/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs
+++ b/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Atmos.Monitor;
 using Content.Shared.Atmos.Monitor.Components;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
@@ -20,16 +21,9 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new AirAlarmWindow(this);
+        _window = this.CreateWindow<AirAlarmWindow>();
+        _window.SetEntity(Owner);
 
-        if (State != null)
-        {
-            UpdateState(State);
-        }
-
-        _window.OpenCentered();
-
-        _window.OnClose += Close;
         _window.AtmosDeviceDataChanged += OnDeviceDataChanged;
 		_window.AtmosDeviceDataCopied += OnDeviceDataCopied;
         _window.AtmosAlarmThresholdChanged += OnThresholdChanged;
diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
index 43be67c9d6b..eeec11c7660 100644
--- a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
@@ -47,7 +47,7 @@ public sealed partial class AirAlarmWindow : FancyWindow
 
     private CheckBox _autoMode => AutoModeCheckBox;
 
-    public AirAlarmWindow(BoundUserInterface owner)
+    public AirAlarmWindow()
     {
         RobustXamlLoader.Load(this);
 
@@ -95,8 +95,11 @@ public AirAlarmWindow(BoundUserInterface owner)
             _sensors.Clear();
             ResyncAllRequested!.Invoke();
         };
+    }
 
-        EntityView.SetEntity(owner.Owner);
+    public void SetEntity(EntityUid uid)
+    {
+        EntityView.SetEntity(uid);
     }
 
     public void UpdateState(AirAlarmUIState state)
diff --git a/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs b/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs
index a5e316a8def..7bf9b396d5e 100644
--- a/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs
+++ b/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Atmos.Piping.Binary.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Atmos.UI
 {
@@ -21,14 +22,8 @@ protected override void Open()
         {
             base.Open();
 
-            _window = new GasCanisterWindow();
+            _window = this.CreateWindow<GasCanisterWindow>();
 
-            if (State != null)
-                UpdateState(State);
-
-            _window.OpenCentered();
-
-            _window.OnClose += Close;
             _window.ReleaseValveCloseButtonPressed += OnReleaseValveClosePressed;
             _window.ReleaseValveOpenButtonPressed += OnReleaseValveOpenPressed;
             _window.ReleasePressureSet += OnReleasePressureSet;
diff --git a/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs b/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs
index 1904e2b3402..2b8020924cf 100644
--- a/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs
+++ b/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Atmos.Piping.Trinary.Components;
 using Content.Shared.Localizations;
 using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Atmos.UI
 {
@@ -28,14 +29,8 @@ protected override void Open()
 
             var atmosSystem = EntMan.System<AtmosphereSystem>();
 
-            _window = new GasFilterWindow(atmosSystem.Gases);
-
-            if (State != null)
-                UpdateState(State);
-
-            _window.OpenCentered();
-
-            _window.OnClose += Close;
+            _window = this.CreateWindow<GasFilterWindow>();
+            _window.PopulateGasList(atmosSystem.Gases);
 
             _window.ToggleStatusButtonPressed += OnToggleStatusButtonPressed;
             _window.FilterTransferRateChanged += OnFilterTransferRatePressed;
diff --git a/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs b/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs
index 28766c688a0..62748b52592 100644
--- a/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs
+++ b/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs
@@ -26,10 +26,9 @@ public sealed partial class GasFilterWindow : DefaultWindow
         public event Action<string>? FilterTransferRateChanged;
         public event Action? SelectGasPressed;
 
-        public GasFilterWindow(IEnumerable<GasPrototype> gases)
+        public GasFilterWindow()
         {
             RobustXamlLoader.Load(this);
-            PopulateGasList(gases);
 
             ToggleStatusButton.OnPressed += _ => SetFilterStatus(!FilterStatus);
             ToggleStatusButton.OnPressed += _ => ToggleStatusButtonPressed?.Invoke();
@@ -73,7 +72,7 @@ public void SetGasFiltered(string? id, string name)
             SelectGasButton.Disabled = true;
         }
 
-        private void PopulateGasList(IEnumerable<GasPrototype> gases)
+        public void PopulateGasList(IEnumerable<GasPrototype> gases)
         {
             GasList.Add(new ItemList.Item(GasList)
             {
@@ -81,7 +80,7 @@ private void PopulateGasList(IEnumerable<GasPrototype> gases)
                 Text = Loc.GetString("comp-gas-filter-ui-filter-gas-none")
             });
 
-            foreach (GasPrototype gas in gases)
+            foreach (var gas in gases)
             {
                 var gasName = Loc.GetString(gas.Name);
                 GasList.Add(GetGasItem(gas.ID, gasName, GasList));
diff --git a/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs b/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs
index 709c06517cb..392fbf1cd9a 100644
--- a/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs
+++ b/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs
@@ -2,7 +2,7 @@
 using Content.Shared.Atmos.Piping.Trinary.Components;
 using Content.Shared.Localizations;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Atmos.UI
 {
@@ -26,14 +26,7 @@ protected override void Open()
         {
             base.Open();
 
-            _window = new GasMixerWindow();
-
-            if (State != null)
-                UpdateState(State);
-
-            _window.OpenCentered();
-
-            _window.OnClose += Close;
+            _window = this.CreateWindow<GasMixerWindow>();
 
             _window.ToggleStatusButtonPressed += OnToggleStatusButtonPressed;
             _window.MixerOutputPressureChanged += OnMixerOutputPressurePressed;
@@ -83,12 +76,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
             _window.SetOutputPressure(cast.OutputPressure);
             _window.SetNodePercentages(cast.NodeOne);
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing) return;
-            _window?.Dispose();
-        }
     }
 }
diff --git a/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs b/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs
index 6eba2e0d215..220fdbe875c 100644
--- a/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs
+++ b/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Localizations;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Atmos.UI
 {
@@ -26,14 +27,7 @@ protected override void Open()
         {
             base.Open();
 
-            _window = new GasPressurePumpWindow();
-
-            if (State != null)
-                UpdateState(State);
-
-            _window.OpenCentered();
-
-            _window.OnClose += Close;
+            _window = this.CreateWindow<GasPressurePumpWindow>();
 
             _window.ToggleStatusButtonPressed += OnToggleStatusButtonPressed;
             _window.PumpOutputPressureChanged += OnPumpOutputPressurePressed;
@@ -67,12 +61,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
             _window.SetPumpStatus(cast.Enabled);
             _window.SetOutputPressure(cast.OutputPressure);
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing) return;
-            _window?.Dispose();
-        }
     }
 }
diff --git a/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs b/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs
index 1664c8b9d75..d62be8f4bb4 100644
--- a/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs
+++ b/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Atmos.Piping.Unary.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Atmos.UI
 {
@@ -31,14 +32,7 @@ protected override void Open()
         {
             base.Open();
 
-            _window = new GasThermomachineWindow();
-
-            if (State != null)
-                UpdateState(State);
-
-            _window.OpenCentered();
-
-            _window.OnClose += Close;
+            _window = this.CreateWindow<GasThermomachineWindow>();
 
             _window.ToggleStatusButton.OnPressed += _ => OnToggleStatusButtonPressed();
             _window.TemperatureSpinbox.OnValueChanged += _ => OnTemperatureChanged(_window.TemperatureSpinbox.Value);
@@ -91,12 +85,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
                 true => Loc.GetString("comp-gas-thermomachine-ui-title-heater")
             };
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing) return;
-            _window?.Dispose();
-        }
     }
 }
diff --git a/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs b/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs
index 1b39306181a..642f34c2f92 100644
--- a/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs
+++ b/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Localizations;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Atmos.UI
 {
@@ -26,14 +27,7 @@ protected override void Open()
         {
             base.Open();
 
-            _window = new GasVolumePumpWindow();
-
-            if (State != null)
-                UpdateState(State);
-
-            _window.OpenCentered();
-
-            _window.OnClose += Close;
+            _window = this.CreateWindow<GasVolumePumpWindow>();
 
             _window.ToggleStatusButtonPressed += OnToggleStatusButtonPressed;
             _window.PumpTransferRateChanged += OnPumpTransferRatePressed;
@@ -64,16 +58,9 @@ protected override void UpdateState(BoundUserInterfaceState state)
             if (_window == null || state is not GasVolumePumpBoundUserInterfaceState cast)
                 return;
 
-            _window.Title = (cast.PumpLabel);
+            _window.Title = cast.PumpLabel;
             _window.SetPumpStatus(cast.Enabled);
             _window.SetTransferRate(cast.TransferRate);
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing) return;
-            _window?.Dispose();
-        }
     }
 }
diff --git a/Content.Client/Atmos/UI/SpaceHeaterBoundUserInterface.cs b/Content.Client/Atmos/UI/SpaceHeaterBoundUserInterface.cs
index 4d8d1191e91..e70426575d4 100644
--- a/Content.Client/Atmos/UI/SpaceHeaterBoundUserInterface.cs
+++ b/Content.Client/Atmos/UI/SpaceHeaterBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Atmos.Piping.Portable.Components;
 using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 
 namespace Content.Client.Atmos.UI;
@@ -21,14 +22,7 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new SpaceHeaterWindow();
-
-        if (State != null)
-            UpdateState(State);
-
-        _window.OpenCentered();
-
-        _window.OnClose += Close;
+        _window = this.CreateWindow<SpaceHeaterWindow>();
 
         _window.ToggleStatusButton.OnPressed += _ => OnToggleStatusButtonPressed();
         _window.IncreaseTempRange.OnPressed += _ => OnTemperatureRangeChanged(_window.TemperatureChangeDelta);
diff --git a/Content.Client/Audio/Jukebox/JukeboxBoundUserInterface.cs b/Content.Client/Audio/Jukebox/JukeboxBoundUserInterface.cs
index 60fe339069a..865dfc478d0 100644
--- a/Content.Client/Audio/Jukebox/JukeboxBoundUserInterface.cs
+++ b/Content.Client/Audio/Jukebox/JukeboxBoundUserInterface.cs
@@ -1,8 +1,7 @@
 using Content.Shared.Audio.Jukebox;
 using Robust.Client.Audio;
-using Robust.Client.Player;
+using Robust.Client.UserInterface;
 using Robust.Shared.Audio.Components;
-using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.Audio.Jukebox;
@@ -23,9 +22,7 @@ protected override void Open()
     {
         base.Open();
 
-        _menu = new JukeboxMenu();
-        _menu.OnClose += Close;
-        _menu.OpenCentered();
+        _menu = this.CreateWindow<JukeboxMenu>();
 
         _menu.OnPlayPressed += args =>
         {
@@ -100,19 +97,5 @@ public void SetTime(float time)
 
         SendMessage(new JukeboxSetTimeMessage(sentTime));
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing)
-            return;
-
-        if (_menu == null)
-            return;
-
-        _menu.OnClose -= Close;
-        _menu.Dispose();
-        _menu = null;
-    }
 }
 
diff --git a/Content.Client/Bed/Cryostorage/CryostorageBoundUserInterface.cs b/Content.Client/Bed/Cryostorage/CryostorageBoundUserInterface.cs
index ffab1625483..09f3cec8fbf 100644
--- a/Content.Client/Bed/Cryostorage/CryostorageBoundUserInterface.cs
+++ b/Content.Client/Bed/Cryostorage/CryostorageBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Bed.Cryostorage;
 using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Bed.Cryostorage;
 
@@ -17,9 +18,7 @@ protected override void Open()
     {
         base.Open();
 
-        _menu = new();
-
-        _menu.OnClose += Close;
+        _menu = this.CreateWindow<CryostorageMenu>();
 
         _menu.SlotRemoveButtonPressed += (ent, slot) =>
         {
@@ -30,8 +29,6 @@ protected override void Open()
         {
             SendMessage(new CryostorageRemoveItemBuiMessage(ent, hand, CryostorageRemoveItemBuiMessage.RemovalType.Hand));
         };
-
-        _menu.OpenCentered();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -45,12 +42,4 @@ protected override void UpdateState(BoundUserInterfaceState state)
                 break;
         }
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing)
-            return;
-        _menu?.Dispose();
-    }
 }
diff --git a/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs
index d3365702bcf..44c40143d83 100644
--- a/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs
+++ b/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Client.Cargo.UI;
 using Content.Shared.Cargo.Components;
 using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Cargo.BUI;
 
@@ -18,9 +19,7 @@ protected override void Open()
     {
         base.Open();
 
-        _menu = new();
-
-        _menu.OnClose += Close;
+        _menu = this.CreateWindow<CargoBountyMenu>();
 
         _menu.OnLabelButtonPressed += id =>
         {
@@ -31,8 +30,6 @@ protected override void Open()
         {
             SendMessage(new BountySkipMessage(id));
         };
-
-        _menu.OpenCentered();
     }
 
     protected override void UpdateState(BoundUserInterfaceState message)
@@ -44,14 +41,4 @@ protected override void UpdateState(BoundUserInterfaceState message)
 
         _menu?.UpdateEntries(state.Bounties, state.UntilNextSkip);
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-
-        if (!disposing)
-            return;
-
-        _menu?.Dispose();
-    }
 }
diff --git a/Content.Client/Cargo/BUI/CargoPalletConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoPalletConsoleBoundUserInterface.cs
index 20c23a48a0d..2461dafb5f3 100644
--- a/Content.Client/Cargo/BUI/CargoPalletConsoleBoundUserInterface.cs
+++ b/Content.Client/Cargo/BUI/CargoPalletConsoleBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Cargo.BUI;
 using Content.Shared.Cargo.Events;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Cargo.BUI;
 
@@ -18,21 +19,9 @@ protected override void Open()
     {
         base.Open();
 
-        _menu = new CargoPalletMenu();
+        _menu = this.CreateWindow<CargoPalletMenu>();
         _menu.AppraiseRequested += OnAppraisal;
         _menu.SellRequested += OnSell;
-        _menu.OnClose += Close;
-
-        _menu.OpenCentered();
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (disposing)
-        {
-            _menu?.Dispose();
-        }
     }
 
     private void OnAppraisal()
diff --git a/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs
index 422d03707a0..02b721b9020 100644
--- a/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs
+++ b/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Cargo.BUI;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.Cargo.BUI;
@@ -9,6 +10,8 @@ namespace Content.Client.Cargo.BUI;
 [UsedImplicitly]
 public sealed class CargoShuttleConsoleBoundUserInterface : BoundUserInterface
 {
+    [Dependency] private readonly IPrototypeManager _protoManager = default!;
+
     [ViewVariables]
     private CargoShuttleMenu? _menu;
 
@@ -19,24 +22,7 @@ public CargoShuttleConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base
     protected override void Open()
     {
         base.Open();
-        var collection = IoCManager.Instance;
-
-        if (collection == null)
-            return;
-
-        _menu = new CargoShuttleMenu(collection.Resolve<IPrototypeManager>(), collection.Resolve<IEntitySystemManager>().GetEntitySystem<SpriteSystem>());
-        _menu.OnClose += Close;
-
-        _menu.OpenCentered();
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (disposing)
-        {
-            _menu?.Dispose();
-        }
+        _menu = this.CreateWindow<CargoShuttleMenu>();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -45,6 +31,6 @@ protected override void UpdateState(BoundUserInterfaceState state)
         if (state is not CargoShuttleConsoleBoundUserInterfaceState cargoState) return;
         _menu?.SetAccountName(cargoState.AccountName);
         _menu?.SetShuttleName(cargoState.ShuttleName);
-        _menu?.SetOrders(cargoState.Orders);
+        _menu?.SetOrders(EntMan.System<SpriteSystem>(), _protoManager, cargoState.Orders);
     }
 }
diff --git a/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs b/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs
index c591f917da3..43b00089e16 100644
--- a/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs
@@ -12,14 +12,9 @@ namespace Content.Client.Cargo.UI
     [GenerateTypedNameReferences]
     public sealed partial class CargoShuttleMenu : FancyWindow
     {
-        private readonly IPrototypeManager _protoManager;
-        private readonly SpriteSystem _spriteSystem;
-
-        public CargoShuttleMenu(IPrototypeManager protoManager, SpriteSystem spriteSystem)
+        public CargoShuttleMenu()
         {
             RobustXamlLoader.Load(this);
-            _protoManager = protoManager;
-            _spriteSystem = spriteSystem;
             Title = Loc.GetString("cargo-shuttle-console-menu-title");
         }
 
@@ -33,19 +28,19 @@ public void SetShuttleName(string name)
             ShuttleNameLabel.Text = name;
         }
 
-        public void SetOrders(List<CargoOrderData> orders)
+        public void SetOrders(SpriteSystem sprites, IPrototypeManager protoManager, List<CargoOrderData> orders)
         {
             Orders.DisposeAllChildren();
 
             foreach (var order in orders)
             {
-                 var product = _protoManager.Index<EntityPrototype>(order.ProductId);
+                 var product = protoManager.Index<EntityPrototype>(order.ProductId);
                  var productName = product.Name;
 
                  var row = new CargoOrderRow
                  {
                      Order = order,
-                     Icon = { Texture = _spriteSystem.Frame0(product) },
+                     Icon = { Texture = sprites.Frame0(product) },
                      ProductName =
                      {
                          Text = Loc.GetString(
diff --git a/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs b/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs
index 988fea7978b..3ef7f0ae73e 100644
--- a/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs
+++ b/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Containers.ItemSlots;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Chemistry.UI
 {
@@ -27,13 +28,8 @@ protected override void Open()
             base.Open();
 
             // Setup window layout/elements
-            _window = new ChemMasterWindow
-            {
-                Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName,
-            };
-
-            _window.OpenCentered();
-            _window.OnClose += Close;
+            _window = this.CreateWindow<ChemMasterWindow>();
+            _window.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
 
             // Setup static button actions.
             _window.InputEjectButton.OnPressed += _ => SendMessage(
@@ -75,15 +71,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
             _window?.UpdateState(castState); // Update window state
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (disposing)
-            {
-                _window?.Dispose();
-            }
-        }
     }
 }
diff --git a/Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs b/Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs
index 99e5a3d3953..2ad1b718887 100644
--- a/Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs
+++ b/Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Containers.ItemSlots;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Chemistry.UI
 {
@@ -15,9 +16,6 @@ public sealed class ReagentDispenserBoundUserInterface : BoundUserInterface
         [ViewVariables]
         private ReagentDispenserWindow? _window;
 
-        [ViewVariables]
-        private ReagentDispenserBoundUserInterfaceState? _lastState;
-
         public ReagentDispenserBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
         {
         }
@@ -32,14 +30,9 @@ protected override void Open()
             base.Open();
 
             // Setup window layout/elements
-            _window = new()
-            {
-                Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName,
-                HelpGuidebookIds = EntMan.GetComponent<GuideHelpComponent>(Owner).Guides
-            };
-
-            _window.OpenCentered();
-            _window.OnClose += Close;
+            _window = this.CreateWindow<ReagentDispenserWindow>();
+            _window.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
+            _window.HelpGuidebookIds = EntMan.GetComponent<GuideHelpComponent>(Owner).Guides;
 
             // Setup static button actions.
             _window.EjectButton.OnPressed += _ => SendMessage(new ItemSlotButtonPressedEvent(SharedReagentDispenser.OutputSlotName));
@@ -63,19 +56,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
             base.UpdateState(state);
 
             var castState = (ReagentDispenserBoundUserInterfaceState) state;
-            _lastState = castState;
-
             _window?.UpdateState(castState); //Update window state
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (disposing)
-            {
-                _window?.Dispose();
-            }
-        }
     }
 }
diff --git a/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs b/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs
index 35df131312d..f1cb27a62a4 100644
--- a/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs
+++ b/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.FixedPoint;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Chemistry.UI
 {
@@ -18,7 +19,7 @@ public TransferAmountBoundUserInterface(EntityUid owner, Enum uiKey) : base(owne
         protected override void Open()
         {
             base.Open();
-            _window = new TransferAmountWindow();
+            _window = this.CreateWindow<TransferAmountWindow>();
 
             _window.ApplyButton.OnPressed += _ =>
             {
@@ -28,15 +29,6 @@ protected override void Open()
                     _window.Close();
                 }
             };
-            _window.OnClose += Close;
-            _window.OpenCentered();
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing) return;
-            _window?.Dispose();
         }
     }
 }
diff --git a/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs b/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs
index 26f0994701e..62a02f37186 100644
--- a/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs
+++ b/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Content.Shared.Cloning.CloningConsole;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.CloningConsole.UI
 {
@@ -17,13 +18,11 @@ public CloningConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owne
         protected override void Open()
         {
             base.Open();
-            _window = new CloningConsoleWindow
-            {
-                Title = Loc.GetString("cloning-console-window-title")
-            };
-            _window.OnClose += Close;
+
+            _window = this.CreateWindow<CloningConsoleWindow>();
+            _window.Title = Loc.GetString("cloning-console-window-title");
+
             _window.CloneButton.OnPressed += _ => SendMessage(new UiButtonPressedMessage(UiButton.Clone));
-            _window.OpenCentered();
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
@@ -32,19 +31,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
             _window?.Populate((CloningConsoleBoundUserInterfaceState) state);
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing)
-                return;
-
-            if (_window != null)
-            {
-                _window.OnClose -= Close;
-                _window.CloneButton.OnPressed -= _ => SendMessage(new UiButtonPressedMessage(UiButton.Clone));
-            }
-            _window?.Dispose();
-        }
     }
 }
diff --git a/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs b/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs
index 5b0d5fcf21f..83f6ba15662 100644
--- a/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs
+++ b/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Clothing.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Clothing.UI;
 
@@ -22,10 +23,8 @@ protected override void Open()
     {
         base.Open();
 
-        _menu = new ChameleonMenu();
-        _menu.OnClose += Close;
+        _menu = this.CreateWindow<ChameleonMenu>();
         _menu.OnIdSelected += OnIdSelected;
-        _menu.OpenCentered();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -42,15 +41,4 @@ private void OnIdSelected(string selectedId)
     {
         SendMessage(new ChameleonPrototypeSelectedMessage(selectedId));
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-
-        if (disposing)
-        {
-            _menu?.Close();
-            _menu = null;
-        }
-    }
 }
diff --git a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs
index 1c94d32bf8d..0310e91eeb0 100644
--- a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs
+++ b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using Content.Shared.Communications;
+using Robust.Client.UserInterface;
 using Robust.Shared.Configuration;
 using Robust.Shared.Timing;
 
@@ -8,34 +9,11 @@ namespace Content.Client.Communications.UI
 {
     public sealed class CommunicationsConsoleBoundUserInterface : BoundUserInterface
     {
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
 
         [ViewVariables]
         private CommunicationsConsoleMenu? _menu;
 
-        [ViewVariables]
-        public bool CanAnnounce { get; private set; }
-        [ViewVariables]
-        public bool CanBroadcast { get; private set; }
-
-        [ViewVariables]
-        public bool CanCall { get; private set; }
-
-        [ViewVariables]
-        public bool CountdownStarted { get; private set; }
-
-        [ViewVariables]
-        public bool AlertLevelSelectable { get; private set; }
-
-        [ViewVariables]
-        public string CurrentLevel { get; private set; } = default!;
-
-        [ViewVariables]
-        private TimeSpan? _expectedCountdownTime;
-
-        public int Countdown => _expectedCountdownTime == null ? 0 : Math.Max((int) _expectedCountdownTime.Value.Subtract(_gameTiming.CurTime).TotalSeconds, 0);
-
         public CommunicationsConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
         {
         }
@@ -44,23 +22,25 @@ protected override void Open()
         {
             base.Open();
 
-            _menu = new CommunicationsConsoleMenu(this);
-            _menu.OnClose += Close;
-            _menu.OpenCentered();
+            _menu = this.CreateWindow<CommunicationsConsoleMenu>();
+            _menu.OnAnnounce += AnnounceButtonPressed;
+            _menu.OnBroadcast += BroadcastButtonPressed;
+            _menu.OnAlertLevel += AlertLevelSelected;
+            _menu.OnEmergencyLevel += EmergencyShuttleButtonPressed;
         }
 
         public void AlertLevelSelected(string level)
         {
-            if (AlertLevelSelectable)
+            if (_menu!.AlertLevelSelectable)
             {
-                CurrentLevel = level;
+                _menu.CurrentLevel = level;
                 SendMessage(new CommunicationsConsoleSelectAlertLevelMessage(level));
             }
         }
 
         public void EmergencyShuttleButtonPressed()
         {
-            if (CountdownStarted)
+            if (_menu!.CountdownStarted)
                 RecallShuttle();
             else
                 CallShuttle();
@@ -95,31 +75,23 @@ protected override void UpdateState(BoundUserInterfaceState state)
             if (state is not CommunicationsConsoleInterfaceState commsState)
                 return;
 
-            CanAnnounce = commsState.CanAnnounce;
-            CanBroadcast = commsState.CanBroadcast;
-            CanCall = commsState.CanCall;
-            _expectedCountdownTime = commsState.ExpectedCountdownEnd;
-            CountdownStarted = commsState.CountdownStarted;
-            AlertLevelSelectable = commsState.AlertLevels != null && !float.IsNaN(commsState.CurrentAlertDelay) && commsState.CurrentAlertDelay <= 0;
-            CurrentLevel = commsState.CurrentAlert;
-
             if (_menu != null)
             {
+                _menu.CanAnnounce = commsState.CanAnnounce;
+                _menu.CanBroadcast = commsState.CanBroadcast;
+                _menu.CanCall = commsState.CanCall;
+                _menu.CountdownStarted = commsState.CountdownStarted;
+                _menu.AlertLevelSelectable = commsState.AlertLevels != null && !float.IsNaN(commsState.CurrentAlertDelay) && commsState.CurrentAlertDelay <= 0;
+                _menu.CurrentLevel = commsState.CurrentAlert;
+                _menu.CountdownEnd = commsState.ExpectedCountdownEnd;
+
                 _menu.UpdateCountdown();
-                _menu.UpdateAlertLevels(commsState.AlertLevels, CurrentLevel);
-                _menu.AlertLevelButton.Disabled = !AlertLevelSelectable;
-                _menu.EmergencyShuttleButton.Disabled = !CanCall;
-                _menu.AnnounceButton.Disabled = !CanAnnounce;
-                _menu.BroadcastButton.Disabled = !CanBroadcast;
+                _menu.UpdateAlertLevels(commsState.AlertLevels, _menu.CurrentLevel);
+                _menu.AlertLevelButton.Disabled = !_menu.AlertLevelSelectable;
+                _menu.EmergencyShuttleButton.Disabled = !_menu.CanCall;
+                _menu.AnnounceButton.Disabled = !_menu.CanAnnounce;
+                _menu.BroadcastButton.Disabled = !_menu.CanBroadcast;
             }
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing) return;
-
-            _menu?.Dispose();
-        }
     }
 }
diff --git a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs
index 4d8dd86a4dc..63868e7a93e 100644
--- a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs
+++ b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs
@@ -1,31 +1,40 @@
-using Content.Client.UserInterface.Controls;
-using System.Threading;
+using System.Globalization;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.CCVar;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Configuration;
+using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using Timer = Robust.Shared.Timing.Timer;
 
 namespace Content.Client.Communications.UI
 {
     [GenerateTypedNameReferences]
     public sealed partial class CommunicationsConsoleMenu : FancyWindow
     {
-        private CommunicationsConsoleBoundUserInterface Owner { get; set; }
-        private readonly CancellationTokenSource _timerCancelTokenSource = new();
-
         [Dependency] private readonly IConfigurationManager _cfg = default!;
-
-        public CommunicationsConsoleMenu(CommunicationsConsoleBoundUserInterface owner)
+        [Dependency] private readonly IGameTiming _timing = default!;
+        [Dependency] private readonly ILocalizationManager _loc = default!;
+
+        public bool CanAnnounce;
+        public bool CanBroadcast;
+        public bool CanCall;
+        public bool AlertLevelSelectable;
+        public bool CountdownStarted;
+        public string CurrentLevel = string.Empty;
+        public TimeSpan? CountdownEnd;
+
+        public event Action? OnEmergencyLevel;
+        public event Action<string>? OnAlertLevel;
+        public event Action<string>? OnAnnounce;
+        public event Action<string>? OnBroadcast;
+
+        public CommunicationsConsoleMenu()
         {
             IoCManager.InjectDependencies(this);
             RobustXamlLoader.Load(this);
 
-            Owner = owner;
-
-            var loc = IoCManager.Resolve<ILocalizationManager>();
-            MessageInput.Placeholder = new Rope.Leaf(loc.GetString("comms-console-menu-announcement-placeholder"));
+            MessageInput.Placeholder = new Rope.Leaf(_loc.GetString("comms-console-menu-announcement-placeholder"));
 
             var maxAnnounceLength = _cfg.GetCVar(CCVars.ChatMaxAnnouncementLength);
             MessageInput.OnTextChanged += (args) =>
@@ -37,33 +46,38 @@ public CommunicationsConsoleMenu(CommunicationsConsoleBoundUserInterface owner)
                 }
                 else
                 {
-                    AnnounceButton.Disabled = !owner.CanAnnounce;
+                    AnnounceButton.Disabled = !CanAnnounce;
                     AnnounceButton.ToolTip = null;
 
                 }
             };
 
-            AnnounceButton.OnPressed += (_) => Owner.AnnounceButtonPressed(Rope.Collapse(MessageInput.TextRope));
-            AnnounceButton.Disabled = !owner.CanAnnounce;
+            AnnounceButton.OnPressed += _ => OnAnnounce?.Invoke(Rope.Collapse(MessageInput.TextRope));
+            AnnounceButton.Disabled = !CanAnnounce;
 
-            BroadcastButton.OnPressed += (_) => Owner.BroadcastButtonPressed(Rope.Collapse(MessageInput.TextRope));
-            BroadcastButton.Disabled = !owner.CanBroadcast;
+            BroadcastButton.OnPressed += _ => OnBroadcast?.Invoke(Rope.Collapse(MessageInput.TextRope));
+            BroadcastButton.Disabled = !CanBroadcast;
 
             AlertLevelButton.OnItemSelected += args =>
             {
                 var metadata = AlertLevelButton.GetItemMetadata(args.Id);
                 if (metadata != null && metadata is string cast)
                 {
-                    Owner.AlertLevelSelected(cast);
+                    OnAlertLevel?.Invoke(cast);
                 }
             };
-            AlertLevelButton.Disabled = !owner.AlertLevelSelectable;
 
-            EmergencyShuttleButton.OnPressed += (_) => Owner.EmergencyShuttleButtonPressed();
-            EmergencyShuttleButton.Disabled = !owner.CanCall;
 
+            AlertLevelButton.Disabled = !AlertLevelSelectable;
+
+            EmergencyShuttleButton.OnPressed += _ => OnEmergencyLevel?.Invoke();
+            EmergencyShuttleButton.Disabled = !CanCall;
+        }
+
+        protected override void FrameUpdate(FrameEventArgs args)
+        {
+            base.FrameUpdate(args);
             UpdateCountdown();
-            Timer.SpawnRepeating(1000, UpdateCountdown, _timerCancelTokenSource.Token);
         }
 
         // The current alert could make levels unselectable, so we need to ensure that the UI reacts properly.
@@ -105,30 +119,19 @@ public void UpdateAlertLevels(List<string>? alerts, string currentAlert)
 
         public void UpdateCountdown()
         {
-            if (!Owner.CountdownStarted)
+            if (!CountdownStarted)
             {
-                CountdownLabel.SetMessage("");
+                CountdownLabel.SetMessage(string.Empty);
                 EmergencyShuttleButton.Text = Loc.GetString("comms-console-menu-call-shuttle");
                 return;
             }
 
-            EmergencyShuttleButton.Text = Loc.GetString("comms-console-menu-recall-shuttle");
-            CountdownLabel.SetMessage($"Time remaining\n{Owner.Countdown.ToString()}s");
-        }
-
-        public override void Close()
-        {
-            base.Close();
-
-            _timerCancelTokenSource.Cancel();
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
+            var diff = MathHelper.Max((CountdownEnd - _timing.CurTime) ?? TimeSpan.Zero, TimeSpan.Zero);
 
-            if (disposing)
-                _timerCancelTokenSource.Cancel();
+            EmergencyShuttleButton.Text = Loc.GetString("comms-console-menu-recall-shuttle");
+            var infoText = Loc.GetString($"comms-console-menu-time-remaining",
+            ("time", diff.TotalSeconds.ToString(CultureInfo.CurrentCulture)));
+            CountdownLabel.SetMessage(infoText);
         }
     }
 }
diff --git a/Content.Client/Computer/ComputerBoundUserInterface.cs b/Content.Client/Computer/ComputerBoundUserInterface.cs
index bdbfe03fa10..11c26b252e9 100644
--- a/Content.Client/Computer/ComputerBoundUserInterface.cs
+++ b/Content.Client/Computer/ComputerBoundUserInterface.cs
@@ -1,4 +1,5 @@
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.CustomControls;
 
 namespace Content.Client.Computer
@@ -19,10 +20,8 @@ protected override void Open()
         {
             base.Open();
 
-            _window = (TWindow) _dynamicTypeFactory.CreateInstance(typeof(TWindow));
+            _window = this.CreateWindow<TWindow>();
             _window.SetupComputerWindow(this);
-            _window.OnClose += Close;
-            _window.OpenCentered();
         }
 
         // Alas, this constructor has to be copied to the subclass. :(
@@ -42,16 +41,6 @@ protected override void UpdateState(BoundUserInterfaceState state)
             _window.UpdateState((TState) state);
         }
 
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (disposing)
-            {
-                _window?.Dispose();
-            }
-        }
-
         protected override void ReceiveMessage(BoundUserInterfaceMessage message)
         {
             _window?.ReceiveMessage(message);
diff --git a/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs b/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs
index 4fea44f2253..e4966f1ec43 100644
--- a/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs
+++ b/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using System.Text.RegularExpressions;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using static Content.Shared.Configurable.ConfigurationComponent;
 
 namespace Content.Client.Configurable.UI
@@ -9,9 +10,6 @@ public sealed class ConfigurationBoundUserInterface : BoundUserInterface
         [ViewVariables]
         private ConfigurationMenu? _menu;
 
-        [ViewVariables]
-        public Regex? Validation { get; internal set; }
-
         public ConfigurationBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
         {
         }
@@ -19,10 +17,8 @@ public ConfigurationBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner
         protected override void Open()
         {
             base.Open();
-            _menu = new ConfigurationMenu(this);
-
-            _menu.OnClose += Close;
-            _menu.OpenCentered();
+            _menu = this.CreateWindow<ConfigurationMenu>();
+            _menu.OnConfiguration += SendConfiguration;
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
@@ -30,9 +26,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
             base.UpdateState(state);
 
             if (state is not ConfigurationBoundUserInterfaceState configurationState)
-            {
                 return;
-            }
 
             _menu?.Populate(configurationState);
         }
@@ -41,9 +35,12 @@ protected override void ReceiveMessage(BoundUserInterfaceMessage message)
         {
             base.ReceiveMessage(message);
 
+            if (_menu == null)
+                return;
+
             if (message is ValidationUpdateMessage msg)
             {
-                Validation = new Regex(msg.ValidationString, RegexOptions.Compiled);
+                _menu.Validation = new Regex(msg.ValidationString, RegexOptions.Compiled);
             }
         }
 
@@ -51,16 +48,5 @@ public void SendConfiguration(Dictionary<string, string> config)
         {
             SendMessage(new ConfigurationUpdatedMessage(config));
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (disposing && _menu != null)
-            {
-                _menu.OnClose -= Close;
-                _menu.Close();
-            }
-        }
     }
 }
diff --git a/Content.Client/Configurable/UI/ConfigurationMenu.cs b/Content.Client/Configurable/UI/ConfigurationMenu.cs
index cc24af28692..29217eef7be 100644
--- a/Content.Client/Configurable/UI/ConfigurationMenu.cs
+++ b/Content.Client/Configurable/UI/ConfigurationMenu.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Numerics;
+using System.Text.RegularExpressions;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
@@ -13,23 +14,25 @@ namespace Content.Client.Configurable.UI
 {
     public sealed class ConfigurationMenu : DefaultWindow
     {
-        public ConfigurationBoundUserInterface Owner { get; }
-
         private readonly BoxContainer _column;
         private readonly BoxContainer _row;
 
         private readonly List<(string  name, LineEdit input)> _inputs;
 
-        public ConfigurationMenu(ConfigurationBoundUserInterface owner)
+        [ViewVariables]
+        public Regex? Validation { get; internal set; }
+
+        public event Action<Dictionary<string, string>>? OnConfiguration;
+
+        public ConfigurationMenu()
         {
             MinSize = SetSize = new Vector2(300, 250);
-            Owner = owner;
 
             _inputs = new List<(string name, LineEdit input)>();
 
             Title = Loc.GetString("configuration-menu-device-title");
 
-            BoxContainer baseContainer = new BoxContainer
+            var baseContainer = new BoxContainer
             {
                 Orientation = LayoutOrientation.Vertical,
                 VerticalExpand = true,
@@ -116,14 +119,13 @@ public void Populate(ConfigurationBoundUserInterfaceState state)
         private void OnConfirm(ButtonEventArgs args)
         {
             var config = GenerateDictionary(_inputs, "Text");
-
-            Owner.SendConfiguration(config);
+            OnConfiguration?.Invoke(config);
             Close();
         }
 
         private bool Validate(string value)
         {
-            return Owner.Validation == null || Owner.Validation.IsMatch(value);
+            return Validation?.IsMatch(value) != false;
         }
 
         private Dictionary<string, string> GenerateDictionary(IEnumerable<(string name, LineEdit input)> inputs, string propertyName)
diff --git a/Content.Client/Construction/UI/FlatpackCreatorBoundUserInterface.cs b/Content.Client/Construction/UI/FlatpackCreatorBoundUserInterface.cs
index 86f1b8b83c7..887492955e9 100644
--- a/Content.Client/Construction/UI/FlatpackCreatorBoundUserInterface.cs
+++ b/Content.Client/Construction/UI/FlatpackCreatorBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Construction.Components;
 using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Construction.UI
 {
@@ -17,8 +18,8 @@ protected override void Open()
         {
             base.Open();
 
-            _menu = new FlatpackCreatorMenu(Owner);
-            _menu.OnClose += Close;
+            _menu = this.CreateWindow<FlatpackCreatorMenu>();
+            _menu.SetEntity(Owner);
 
             _menu.PackButtonPressed += () =>
             {
@@ -27,14 +28,5 @@ protected override void Open()
 
             _menu.OpenCentered();
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing)
-                return;
-
-            _menu?.Dispose();
-        }
     }
 }
diff --git a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
index fcf0ada947c..f020991224c 100644
--- a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
+++ b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
@@ -26,7 +26,7 @@ public sealed partial class FlatpackCreatorMenu : FancyWindow
     private readonly MaterialStorageSystem _materialStorage;
     private readonly SpriteSystem _spriteSystem;
 
-    private readonly EntityUid _owner;
+    private EntityUid _owner;
 
     [ValidatePrototypeId<EntityPrototype>]
     public const string NoBoardEffectId = "FlatpackerNoBoardEffect";
@@ -36,7 +36,7 @@ public sealed partial class FlatpackCreatorMenu : FancyWindow
 
     public event Action? PackButtonPressed;
 
-    public FlatpackCreatorMenu(EntityUid uid)
+    public FlatpackCreatorMenu()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
@@ -46,14 +46,17 @@ public FlatpackCreatorMenu(EntityUid uid)
         _materialStorage = _entityManager.System<MaterialStorageSystem>();
         _spriteSystem = _entityManager.System<SpriteSystem>();
 
-        _owner = uid;
-
         PackButton.OnPressed += _ => PackButtonPressed?.Invoke();
 
-        MaterialStorageControl.SetOwner(uid);
         InsertLabel.SetMarkup(Loc.GetString("flatpacker-ui-insert-board"));
     }
 
+    public void SetEntity(EntityUid uid)
+    {
+        _owner = uid;
+        MaterialStorageControl.SetOwner(uid);
+    }
+
     protected override void FrameUpdate(FrameEventArgs args)
     {
         base.FrameUpdate(args);
diff --git a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs
index e2c4d51ecd1..e5be0b1811f 100644
--- a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs
+++ b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs
@@ -2,12 +2,15 @@
 using Content.Shared.Crayon;
 using Content.Shared.Decals;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.Crayon.UI
 {
     public sealed class CrayonBoundUserInterface : BoundUserInterface
     {
+        [Dependency] private readonly IPrototypeManager _protoManager = default!;
+
         [ViewVariables]
         private CrayonWindow? _menu;
 
@@ -18,15 +21,29 @@ public CrayonBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey
         protected override void Open()
         {
             base.Open();
-            _menu = new CrayonWindow(this);
-
-            _menu.OnClose += Close;
-            var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
-            var crayonDecals = prototypeManager.EnumeratePrototypes<DecalPrototype>().Where(x => x.Tags.Contains("crayon"));
-            _menu.Populate(crayonDecals);
+            _menu = this.CreateWindow<CrayonWindow>();
+            _menu.OnColorSelected += SelectColor;
+            _menu.OnSelected += Select;
+            PopulateCrayons();
             _menu.OpenCenteredLeft();
         }
 
+        private void PopulateCrayons()
+        {
+            var crayonDecals = _protoManager.EnumeratePrototypes<DecalPrototype>().Where(x => x.Tags.Contains("crayon"));
+            _menu?.Populate(crayonDecals);
+        }
+
+        public override void OnProtoReload(PrototypesReloadedEventArgs args)
+        {
+            base.OnProtoReload(args);
+
+            if (!args.WasModified<DecalPrototype>())
+                return;
+
+            PopulateCrayons();
+        }
+
         protected override void UpdateState(BoundUserInterfaceState state)
         {
             base.UpdateState(state);
@@ -43,16 +60,5 @@ public void SelectColor(Color color)
         {
             SendMessage(new CrayonColorMessage(color));
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (disposing)
-            {
-                _menu?.Close();
-                _menu = null;
-            }
-        }
     }
 }
diff --git a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs
index 2a5801ccf2d..b97786cd41a 100644
--- a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs
+++ b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs
@@ -18,18 +18,17 @@ namespace Content.Client.Crayon.UI
     [GenerateTypedNameReferences]
     public sealed partial class CrayonWindow : DefaultWindow
     {
-        public CrayonBoundUserInterface Owner { get; }
-
         private Dictionary<string, Texture>? _decals;
         private string? _selected;
         private Color _color;
 
-        public CrayonWindow(CrayonBoundUserInterface owner)
+        public event Action<Color>? OnColorSelected;
+        public event Action<string>? OnSelected;
+
+        public CrayonWindow()
         {
             RobustXamlLoader.Load(this);
 
-            Owner = owner;
-
             Search.OnTextChanged += _ => RefreshList();
             ColorSelector.OnColorChanged += SelectColor;
         }
@@ -38,16 +37,16 @@ private void SelectColor(Color color)
         {
             _color = color;
 
-            Owner.SelectColor(color);
-
+            OnColorSelected?.Invoke(color);
             RefreshList();
         }
 
         private void RefreshList()
         {
             // Clear
-            Grid.RemoveAllChildren();
-            if (_decals == null) return;
+            Grid.DisposeAllChildren();
+            if (_decals == null)
+                return;
 
             var filter = Search.Text;
             foreach (var (decal, tex) in _decals)
@@ -89,7 +88,6 @@ private void ButtonOnPressed(ButtonEventArgs obj)
         {
             if (obj.Button.Name == null) return;
 
-            Owner.Select(obj.Button.Name);
             _selected = obj.Button.Name;
             RefreshList();
         }
diff --git a/Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs b/Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs
index e8e77217ea5..296e71d3a95 100644
--- a/Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs
+++ b/Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using static Content.Shared.Disposal.Components.SharedDisposalRouterComponent;
 
 namespace Content.Client.Disposal.UI
@@ -21,20 +22,16 @@ protected override void Open()
         {
             base.Open();
 
-            _window = new DisposalRouterWindow();
-
-            _window.OpenCentered();
-            _window.OnClose += Close;
+            _window = this.CreateWindow<DisposalRouterWindow>();
 
             _window.Confirm.OnPressed += _ => ButtonPressed(UiAction.Ok, _window.TagInput.Text);
             _window.TagInput.OnTextEntered += args => ButtonPressed(UiAction.Ok, args.Text);
-
         }
 
         private void ButtonPressed(UiAction action, string tag)
         {
             SendMessage(new UiActionMessage(action, tag));
-            _window?.Close();
+            Close();
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
@@ -48,18 +45,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
             _window?.UpdateState(cast);
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (disposing)
-            {
-                _window?.Dispose();
-            }
-        }
-
-
     }
-
 }
diff --git a/Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs b/Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs
index 3aeed8dc802..7fc0eb85401 100644
--- a/Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs
+++ b/Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using static Content.Shared.Disposal.Components.SharedDisposalTaggerComponent;
 
 namespace Content.Client.Disposal.UI
@@ -21,20 +22,17 @@ protected override void Open()
         {
             base.Open();
 
-            _window = new DisposalTaggerWindow();
-
-            _window.OpenCentered();
-            _window.OnClose += Close;
+            _window = this.CreateWindow<DisposalTaggerWindow>();
 
             _window.Confirm.OnPressed += _ => ButtonPressed(UiAction.Ok, _window.TagInput.Text);
             _window.TagInput.OnTextEntered += args => ButtonPressed(UiAction.Ok, args.Text);
-
         }
 
         private void ButtonPressed(UiAction action, string tag)
         {
+            // TODO: This looks copy-pasted with the other mailing stuff...
             SendMessage(new UiActionMessage(action, tag));
-            _window?.Close();
+            Close();
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
@@ -48,18 +46,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
             _window?.UpdateState(cast);
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (disposing)
-            {
-                _window?.Dispose();
-            }
-        }
-
-
     }
-
 }
diff --git a/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs b/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs
index cd7ea717ce3..9b7e23c03aa 100644
--- a/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs
+++ b/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Access;
 using Content.Shared.Doors.Electronics;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.Doors.Electronics;
@@ -18,6 +19,23 @@ public DoorElectronicsBoundUserInterface(EntityUid owner, Enum uiKey) : base(own
     protected override void Open()
     {
         base.Open();
+        _window = this.CreateWindow<DoorElectronicsConfigurationMenu>();
+        _window.OnAccessChanged += UpdateConfiguration;
+        Reset();
+    }
+
+    public override void OnProtoReload(PrototypesReloadedEventArgs args)
+    {
+        base.OnProtoReload(args);
+
+        if (!args.WasModified<AccessLevelPrototype>())
+            return;
+
+        Reset();
+    }
+
+    private void Reset()
+    {
         List<ProtoId<AccessLevelPrototype>> accessLevels = new();
 
         foreach (var accessLevel in _prototypeManager.EnumeratePrototypes<AccessLevelPrototype>())
@@ -29,10 +47,7 @@ protected override void Open()
         }
 
         accessLevels.Sort();
-
-        _window = new DoorElectronicsConfigurationMenu(this, accessLevels, _prototypeManager);
-        _window.OnClose += Close;
-        _window.OpenCentered();
+        _window?.Reset(_prototypeManager, accessLevels);
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -44,14 +59,6 @@ protected override void UpdateState(BoundUserInterfaceState state)
         _window?.UpdateState(castState);
     }
 
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing) return;
-
-        _window?.Dispose();
-    }
-
     public void UpdateConfiguration(List<ProtoId<AccessLevelPrototype>> newAccessList)
     {
         SendMessage(new DoorElectronicsUpdateConfigurationMessage(newAccessList));
diff --git a/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml.cs b/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml.cs
index c01f13a462e..2112a562971 100644
--- a/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml.cs
+++ b/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml.cs
@@ -15,22 +15,23 @@ namespace Content.Client.Doors.Electronics;
 [GenerateTypedNameReferences]
 public sealed partial class DoorElectronicsConfigurationMenu : FancyWindow
 {
-    private readonly DoorElectronicsBoundUserInterface _owner;
-    private AccessLevelControl _buttonsList = new();
+    private readonly AccessLevelControl _buttonsList = new();
 
-    public DoorElectronicsConfigurationMenu(DoorElectronicsBoundUserInterface ui, List<ProtoId<AccessLevelPrototype>> accessLevels, IPrototypeManager prototypeManager)
+    public event Action<List<ProtoId<AccessLevelPrototype>>>? OnAccessChanged;
+
+    public DoorElectronicsConfigurationMenu()
     {
         RobustXamlLoader.Load(this);
-
-        _owner = ui;
-
-        _buttonsList.Populate(accessLevels, prototypeManager);
         AccessLevelControlContainer.AddChild(_buttonsList);
+    }
+
+    public void Reset(IPrototypeManager protoManager, List<ProtoId<AccessLevelPrototype>> accessLevels)
+    {
+        _buttonsList.Populate(accessLevels, protoManager);
 
-        foreach (var (id, button) in _buttonsList.ButtonsList)
+        foreach (var button in _buttonsList.ButtonsList.Values)
         {
-            button.OnPressed += _ => _owner.UpdateConfiguration(
-                _buttonsList.ButtonsList.Where(x => x.Value.Pressed).Select(x => x.Key).ToList());
+            button.OnPressed += _ => OnAccessChanged?.Invoke(_buttonsList.ButtonsList.Where(x => x.Value.Pressed).Select(x => x.Key).ToList());
         }
     }
 
diff --git a/Content.Client/Fax/UI/FaxBoundUi.cs b/Content.Client/Fax/UI/FaxBoundUi.cs
index a95066a3b58..ca2e834b4fe 100644
--- a/Content.Client/Fax/UI/FaxBoundUi.cs
+++ b/Content.Client/Fax/UI/FaxBoundUi.cs
@@ -25,10 +25,7 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new FaxWindow();
-        _window.OpenCentered();
-
-        _window.OnClose += Close;
+        _window = this.CreateWindow<FaxWindow>();
         _window.FileButtonPressed += OnFileButtonPressed;
         _window.CopyButtonPressed += OnCopyButtonPressed;
         _window.SendButtonPressed += OnSendButtonPressed;
@@ -104,11 +101,4 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
         _window.UpdateState(cast);
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (disposing)
-            _window?.Dispose();
-    }
 }
diff --git a/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs b/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs
index ba49f11ea0f..08596b04e6e 100644
--- a/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs
+++ b/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Robust.Client.GameObjects;
 using Robust.Shared.Timing;
 using Content.Shared.Forensics;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Forensics
 {
@@ -21,11 +22,9 @@ public ForensicScannerBoundUserInterface(EntityUid owner, Enum uiKey) : base(own
         protected override void Open()
         {
             base.Open();
-            _window = new ForensicScannerMenu();
-            _window.OnClose += Close;
+            _window = this.CreateWindow<ForensicScannerMenu>();
             _window.Print.OnPressed += _ => Print();
             _window.Clear.OnPressed += _ => Clear();
-            _window.OpenCentered();
         }
 
         private void Print()
@@ -62,6 +61,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
             _printCooldown = cast.PrintCooldown;
 
+            // TODO: Fix this
             if (cast.PrintReadyAt > _gameTiming.CurTime)
                 Timer.Spawn(cast.PrintReadyAt - _gameTiming.CurTime, () =>
                 {
@@ -71,14 +71,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
             _window.UpdateState(cast);
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing)
-                return;
-
-            _window?.Dispose();
-        }
     }
 }
diff --git a/Content.Client/Gateway/UI/GatewayBoundUserInterface.cs b/Content.Client/Gateway/UI/GatewayBoundUserInterface.cs
index fdb3cdbc010..457b70ca7ca 100644
--- a/Content.Client/Gateway/UI/GatewayBoundUserInterface.cs
+++ b/Content.Client/Gateway/UI/GatewayBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Gateway;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Gateway.UI;
 
@@ -17,24 +18,13 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new GatewayWindow(EntMan.GetNetEntity(Owner));
+        _window = this.CreateWindow<GatewayWindow>();
+        _window.SetEntity(EntMan.GetNetEntity(Owner));
 
         _window.OpenPortal += destination =>
         {
             SendMessage(new GatewayOpenPortalMessage(destination));
         };
-        _window.OnClose += Close;
-        _window?.OpenCentered();
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (disposing)
-        {
-            _window?.Dispose();
-            _window = null;
-        }
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
diff --git a/Content.Client/Gateway/UI/GatewayWindow.xaml.cs b/Content.Client/Gateway/UI/GatewayWindow.xaml.cs
index b3e1333a7a9..0cc03a36149 100644
--- a/Content.Client/Gateway/UI/GatewayWindow.xaml.cs
+++ b/Content.Client/Gateway/UI/GatewayWindow.xaml.cs
@@ -22,7 +22,7 @@ public sealed partial class GatewayWindow : FancyWindow,
     public event Action<NetEntity>? OpenPortal;
     private List<GatewayDestinationData> _destinations = new();
 
-    public readonly NetEntity Owner;
+    public NetEntity Owner;
 
     private NetEntity? _current;
     private TimeSpan _nextReady;
@@ -46,16 +46,20 @@ public sealed partial class GatewayWindow : FancyWindow,
     /// </summary>
     private bool _isCooldownPending = true;
 
-    public GatewayWindow(NetEntity netEntity)
+    public GatewayWindow()
     {
         RobustXamlLoader.Load(this);
         var dependencies = IoCManager.Instance!;
         _timing = dependencies.Resolve<IGameTiming>();
-        Owner = netEntity;
 
         NextUnlockBar.ForegroundStyleBoxOverride = new StyleBoxFlat(Color.FromHex("#C74EBD"));
     }
 
+    public void SetEntity(NetEntity entity)
+    {
+
+    }
+
     public void UpdateState(GatewayBoundUserInterfaceState state)
     {
         _destinations = state.Destinations;
diff --git a/Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs b/Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs
index d72da3e8120..32b40747d55 100644
--- a/Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs
+++ b/Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs
@@ -1,6 +1,6 @@
 using Content.Shared.Gravity;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Gravity.UI
 {
@@ -18,17 +18,8 @@ protected override void Open()
         {
             base.Open();
 
-            _window = new GravityGeneratorWindow(this);
-
-            /*
-            _window.Switch.OnPressed += _ =>
-            {
-                SendMessage(new SharedGravityGeneratorComponent.SwitchGeneratorMessage(!IsOn));
-            };
-            */
-
-            _window.OpenCentered();
-            _window.OnClose += Close;
+            _window = this.CreateWindow<GravityGeneratorWindow>();
+            _window.SetEntity(Owner);
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
@@ -39,14 +30,6 @@ protected override void UpdateState(BoundUserInterfaceState state)
             _window?.UpdateState(castState);
         }
 
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing) return;
-
-            _window?.Dispose();
-        }
-
         public void SetPowerSwitch(bool on)
         {
             SendMessage(new SharedGravityGeneratorComponent.SwitchGeneratorMessage(on));
diff --git a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs b/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs
index 75f8eb479b5..6f04133b594 100644
--- a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs
+++ b/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs
@@ -12,22 +12,23 @@ public sealed partial class GravityGeneratorWindow : FancyWindow
     {
         private readonly ButtonGroup _buttonGroup = new();
 
-        private readonly GravityGeneratorBoundUserInterface _owner;
+        public event Action<bool>? OnPowerSwitch;
 
-        public GravityGeneratorWindow(GravityGeneratorBoundUserInterface owner)
+        public GravityGeneratorWindow()
         {
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);
 
-            _owner = owner;
-
             OnButton.Group = _buttonGroup;
             OffButton.Group = _buttonGroup;
 
-            OnButton.OnPressed += _ => _owner.SetPowerSwitch(true);
-            OffButton.OnPressed += _ => _owner.SetPowerSwitch(false);
+            OnButton.OnPressed += _ => OnPowerSwitch?.Invoke(true);
+            OffButton.OnPressed += _ => OnPowerSwitch?.Invoke(false);
+        }
 
-            EntityView.SetEntity(owner.Owner);
+        public void SetEntity(EntityUid uid)
+        {
+            EntityView.SetEntity(uid);
         }
 
         public void UpdateState(SharedGravityGeneratorComponent.GeneratorState state)
diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs
index 39bb52d72c0..dba7e39b63a 100644
--- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs
+++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs
@@ -1,7 +1,7 @@
 using Content.Shared.MedicalScanner;
 using Content.Shared.Targeting;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.HealthAnalyzer.UI
 {
@@ -18,13 +18,9 @@ public HealthAnalyzerBoundUserInterface(EntityUid owner, Enum uiKey) : base(owne
         protected override void Open()
         {
             base.Open();
-            _window = new HealthAnalyzerWindow
-            {
-                Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName,
-            };
-            _window.OnClose += Close;
-            _window.OnBodyPartSelected += SendBodyPartMessage;
-            _window.OpenCentered();
+            _window = this.CreateWindow<HealthAnalyzerWindow>();
+
+            _window.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
         }
 
         protected override void ReceiveMessage(BoundUserInterfaceMessage message)
@@ -37,22 +33,5 @@ protected override void ReceiveMessage(BoundUserInterfaceMessage message)
 
             _window.Populate(cast);
         }
-
-        private void SendBodyPartMessage(TargetBodyPart? part, EntityUid target) => SendMessage(new HealthAnalyzerPartMessage(EntMan.GetNetEntity(target), part ?? null));
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing)
-                return;
-
-            if (_window != null)
-            {
-                _window.OnClose -= Close;
-                _window.OnBodyPartSelected -= SendBodyPartMessage;
-            }
-
-            _window?.Dispose();
-        }
     }
 }
diff --git a/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs b/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs
index a8872604a4c..53977eb636b 100644
--- a/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs
+++ b/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Humanoid;
 
@@ -20,8 +21,7 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new();
-        _window.OnClose += Close;
+        _window = this.CreateWindow<HumanoidMarkingModifierWindow>();
         _window.OnMarkingAdded += SendMarkingSet;
         _window.OnMarkingRemoved += SendMarkingSet;
         _window.OnMarkingColorChange += SendMarkingSetNoResend;
diff --git a/Content.Client/Instruments/UI/BandMenu.xaml.cs b/Content.Client/Instruments/UI/BandMenu.xaml.cs
index 5fb293a194d..26cd1369e55 100644
--- a/Content.Client/Instruments/UI/BandMenu.xaml.cs
+++ b/Content.Client/Instruments/UI/BandMenu.xaml.cs
@@ -11,7 +11,9 @@ public sealed partial class BandMenu : DefaultWindow
 {
     private readonly InstrumentBoundUserInterface _owner;
 
-    public BandMenu(InstrumentBoundUserInterface owner) : base()
+    public EntityUid? Master;
+
+    public BandMenu(InstrumentBoundUserInterface owner)
     {
         RobustXamlLoader.Load(this);
 
@@ -40,7 +42,7 @@ public void Populate((NetEntity, string)[] nearby, IEntityManager entManager)
         {
             var uid = entManager.GetEntity(nent);
             var item = BandList.AddItem(name, null, true, uid);
-            item.Selected = _owner.Instrument?.Master == uid;
+            item.Selected = Master == uid;
         }
     }
 }
diff --git a/Content.Client/Instruments/UI/ChannelsMenu.xaml.cs b/Content.Client/Instruments/UI/ChannelsMenu.xaml.cs
index 2814d415365..c175e67842f 100644
--- a/Content.Client/Instruments/UI/ChannelsMenu.xaml.cs
+++ b/Content.Client/Instruments/UI/ChannelsMenu.xaml.cs
@@ -51,7 +51,7 @@ private void OnClearPressed(BaseButton.ButtonEventArgs obj)
         }
     }
 
-    public void Populate()
+    public void Populate(InstrumentComponent? instrument)
     {
         ChannelList.Clear();
 
@@ -60,7 +60,8 @@ public void Populate()
             var item = ChannelList.AddItem(_owner.Loc.GetString("instrument-component-channel-name",
                 ("number", i)), null, true, i);
 
-            item.Selected = !_owner.Instrument?.FilteredChannels[i] ?? false;
+
+            item.Selected = !instrument?.FilteredChannels[i] ?? false;
         }
     }
 }
diff --git a/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs b/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs
index 0f5729f55b1..4816ce8c365 100644
--- a/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs
+++ b/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs
@@ -24,8 +24,6 @@ public sealed class InstrumentBoundUserInterface : BoundUserInterface
         [ViewVariables] private BandMenu? _bandMenu;
         [ViewVariables] private ChannelsMenu? _channelsMenu;
 
-        [ViewVariables] public InstrumentComponent? Instrument { get; private set; }
-
         public InstrumentBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
         {
             IoCManager.InjectDependencies(this);
@@ -43,14 +41,20 @@ protected override void ReceiveMessage(BoundUserInterfaceMessage message)
 
         protected override void Open()
         {
-            if (!EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument))
-                return;
+            _instrumentMenu = this.CreateWindow<InstrumentMenu>();
+            _instrumentMenu.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
 
-            Instrument = instrument;
-            _instrumentMenu = new InstrumentMenu(this);
-            _instrumentMenu.OnClose += Close;
+            _instrumentMenu.OnOpenBand += OpenBandMenu;
+            _instrumentMenu.OnOpenChannels += OpenChannelsMenu;
+            _instrumentMenu.OnCloseChannels += CloseChannelsMenu;
+            _instrumentMenu.OnCloseBands += CloseBandMenu;
 
-            _instrumentMenu.OpenCentered();
+            _instrumentMenu.SetMIDI(MidiManager.IsAvailable);
+
+            if (EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument))
+            {
+                _instrumentMenu.SetInstrument((Owner, instrument));
+            }
         }
 
         protected override void Dispose(bool disposing)
@@ -58,7 +62,12 @@ protected override void Dispose(bool disposing)
             base.Dispose(disposing);
             if (!disposing)
                 return;
-            _instrumentMenu?.Dispose();
+
+            if (EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument))
+            {
+                _instrumentMenu?.RemoveInstrument(instrument);
+            }
+
             _bandMenu?.Dispose();
             _channelsMenu?.Dispose();
         }
@@ -72,6 +81,11 @@ public void OpenBandMenu()
         {
             _bandMenu ??= new BandMenu(this);
 
+            if (EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument))
+            {
+                _bandMenu.Master = instrument.Master;
+            }
+
             // Refresh cache...
             RefreshBands();
 
@@ -87,7 +101,9 @@ public void CloseBandMenu()
         public void OpenChannelsMenu()
         {
             _channelsMenu ??= new ChannelsMenu(this);
-            _channelsMenu.Populate();
+            EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument);
+
+            _channelsMenu.Populate(instrument);
             _channelsMenu.OpenCenteredRight();
         }
 
diff --git a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
index b54a91ee975..9b14e01fb57 100644
--- a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
+++ b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
@@ -1,7 +1,10 @@
 using System.IO;
 using System.Numerics;
 using System.Threading.Tasks;
+using Content.Client.Interactable;
+using Content.Shared.ActionBlocker;
 using Robust.Client.AutoGenerated;
+using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
@@ -16,33 +19,23 @@ namespace Content.Client.Instruments.UI
     [GenerateTypedNameReferences]
     public sealed partial class InstrumentMenu : DefaultWindow
     {
-        private readonly InstrumentBoundUserInterface _owner;
+        [Dependency] private readonly IEntityManager _entManager = default!;
+        [Dependency] private readonly IFileDialogManager _dialogs = default!;
+        [Dependency] private readonly IPlayerManager _player = default!;
 
         private bool _isMidiFileDialogueWindowOpen;
 
-        public InstrumentMenu(InstrumentBoundUserInterface owner)
-        {
-            RobustXamlLoader.Load(this);
-
-            _owner = owner;
+        public event Action? OnOpenBand;
+        public event Action? OnOpenChannels;
+        public event Action? OnCloseBands;
+        public event Action? OnCloseChannels;
 
-            if (_owner.Instrument != null)
-            {
-                _owner.Instrument.OnMidiPlaybackEnded += InstrumentOnMidiPlaybackEnded;
-                Title = _owner.Entities.GetComponent<MetaDataComponent>(_owner.Owner).EntityName;
-                LoopButton.Disabled = !_owner.Instrument.IsMidiOpen;
-                LoopButton.Pressed = _owner.Instrument.LoopMidi;
-                ChannelsButton.Disabled = !_owner.Instrument.IsRendererAlive;
-                StopButton.Disabled = !_owner.Instrument.IsMidiOpen;
-                PlaybackSlider.MouseFilter = _owner.Instrument.IsMidiOpen ? MouseFilterMode.Pass : MouseFilterMode.Ignore;
-            }
+        public EntityUid Entity;
 
-            if (!_owner.MidiManager.IsAvailable)
-            {
-                UnavailableOverlay.Visible = true;
-                // We return early as to not give the buttons behavior.
-                return;
-            }
+        public InstrumentMenu()
+        {
+            RobustXamlLoader.Load(this);
+            IoCManager.InjectDependencies(this);
 
             InputButton.OnToggled += MidiInputButtonOnOnToggled;
             BandButton.OnPressed += BandButtonOnPressed;
@@ -57,12 +50,34 @@ public InstrumentMenu(InstrumentBoundUserInterface owner)
             MinSize = SetSize = new Vector2(400, 150);
         }
 
+        public void SetInstrument(Entity<InstrumentComponent> entity)
+        {
+            Entity = entity;
+            var component = entity.Comp;
+            component.OnMidiPlaybackEnded += InstrumentOnMidiPlaybackEnded;
+            LoopButton.Disabled = !component.IsMidiOpen;
+            LoopButton.Pressed = component.LoopMidi;
+            ChannelsButton.Disabled = !component.IsRendererAlive;
+            StopButton.Disabled = !component.IsMidiOpen;
+            PlaybackSlider.MouseFilter = component.IsMidiOpen ? MouseFilterMode.Pass : MouseFilterMode.Ignore;
+        }
+
+        public void RemoveInstrument(InstrumentComponent component)
+        {
+            component.OnMidiPlaybackEnded -= InstrumentOnMidiPlaybackEnded;
+        }
+
+        public void SetMIDI(bool available)
+        {
+            UnavailableOverlay.Visible = !available;
+        }
+
         private void BandButtonOnPressed(ButtonEventArgs obj)
         {
             if (!PlayCheck())
                 return;
 
-            _owner.OpenBandMenu();
+            OnOpenBand?.Invoke();
         }
 
         private void BandButtonOnToggled(ButtonToggledEventArgs obj)
@@ -70,12 +85,15 @@ private void BandButtonOnToggled(ButtonToggledEventArgs obj)
             if (obj.Pressed)
                 return;
 
-            _owner.Instruments.SetMaster(_owner.Owner, null);
+            if (_entManager.TryGetComponent(Entity, out InstrumentComponent? instrument))
+            {
+                _entManager.System<InstrumentSystem>().SetMaster(Entity, instrument.Master);
+            }
         }
 
         private void ChannelsButtonOnPressed(ButtonEventArgs obj)
         {
-            _owner.OpenChannelsMenu();
+            OnOpenChannels?.Invoke();
         }
 
         private void InstrumentOnMidiPlaybackEnded()
@@ -85,8 +103,10 @@ private void InstrumentOnMidiPlaybackEnded()
 
         public void MidiPlaybackSetButtonsDisabled(bool disabled)
         {
-            if(disabled)
-                _owner.CloseChannelsMenu();
+            if (disabled)
+            {
+                OnCloseChannels?.Invoke();
+            }
 
             LoopButton.Disabled = disabled;
             StopButton.Disabled = disabled;
@@ -100,7 +120,7 @@ private async void MidiFileButtonOnOnPressed(ButtonEventArgs obj)
             if (_isMidiFileDialogueWindowOpen)
                 return;
 
-            _owner.CloseBandMenu();
+            OnCloseBands?.Invoke();
 
             var filters = new FileDialogFilters(new FileDialogFilters.Group("mid", "midi"));
 
@@ -108,7 +128,7 @@ private async void MidiFileButtonOnOnPressed(ButtonEventArgs obj)
             // or focus the previously-opened window.
             _isMidiFileDialogueWindowOpen = true;
 
-            await using var file = await _owner.FileDialogManager.OpenFile(filters);
+            await using var file = await _dialogs.OpenFile(filters);
 
             _isMidiFileDialogueWindowOpen = false;
 
@@ -129,9 +149,18 @@ private async void MidiFileButtonOnOnPressed(ButtonEventArgs obj)
 
             await file.CopyToAsync(memStream);
 
-            if (_owner.Instrument is not {} instrument
-                || !_owner.Instruments.OpenMidi(_owner.Owner, memStream.GetBuffer().AsSpan(0, (int) memStream.Length), instrument))
+            if (!_entManager.TryGetComponent<InstrumentComponent>(Entity, out var instrument))
+            {
                 return;
+            }
+
+            if (!_entManager.System<InstrumentSystem>()
+                    .OpenMidi(Entity,
+                    memStream.GetBuffer().AsSpan(0, (int) memStream.Length),
+                    instrument))
+            {
+                return;
+            }
 
             MidiPlaybackSetButtonsDisabled(false);
             if (InputButton.Pressed)
@@ -140,7 +169,7 @@ private async void MidiFileButtonOnOnPressed(ButtonEventArgs obj)
 
         private void MidiInputButtonOnOnToggled(ButtonToggledEventArgs obj)
         {
-            _owner.CloseBandMenu();
+            OnCloseBands?.Invoke();
 
             if (obj.Pressed)
             {
@@ -148,109 +177,99 @@ private void MidiInputButtonOnOnToggled(ButtonToggledEventArgs obj)
                     return;
 
                 MidiStopButtonOnPressed(null);
-                if(_owner.Instrument is {} instrument)
-                    _owner.Instruments.OpenInput(_owner.Owner, instrument);
+
+                if (_entManager.TryGetComponent(Entity, out InstrumentComponent? instrument))
+                    _entManager.System<InstrumentSystem>().OpenInput(Entity, instrument);
             }
-            else if (_owner.Instrument is { } instrument)
+            else
             {
-                _owner.Instruments.CloseInput(_owner.Owner, false, instrument);
-                _owner.CloseChannelsMenu();
+                _entManager.System<InstrumentSystem>().CloseInput(Entity, false);
+                OnCloseChannels?.Invoke();
             }
         }
 
         private bool PlayCheck()
         {
             // TODO all of these checks should also be done server-side.
-
-            var instrumentEnt = _owner.Owner;
-            var instrument = _owner.Instrument;
-
-            if (instrument == null)
+            if (!_entManager.TryGetComponent(Entity, out InstrumentComponent? instrument))
                 return false;
 
-            var localEntity = _owner.PlayerManager.LocalEntity;
+            var localEntity = _player.LocalEntity;
 
             // If we don't have a player or controlled entity, we return.
             if (localEntity == null)
                 return false;
 
             // By default, allow an instrument to play itself and skip all other checks
-            if (localEntity == instrumentEnt)
+            if (localEntity == Entity)
                 return true;
 
-            var container = _owner.Entities.System<SharedContainerSystem>();
+            var container = _entManager.System<SharedContainerSystem>();
             // If we're a handheld instrument, we might be in a container. Get it just in case.
             container.TryGetContainingContainer((Entity, null, null), out var conMan);
 
             // If the instrument is handheld and we're not holding it, we return.
-            if ((instrument.Handheld && (conMan == null || conMan.Owner != localEntity)))
+            if (instrument.Handheld && (conMan == null || conMan.Owner != localEntity))
                 return false;
 
-            if (!_owner.ActionBlocker.CanInteract(localEntity.Value, instrumentEnt))
+            if (!_entManager.System<ActionBlockerSystem>().CanInteract(localEntity.Value, Entity))
                 return false;
 
             // We check that we're in range unobstructed just in case.
-            return _owner.Interactions.InRangeUnobstructed(localEntity.Value, instrumentEnt);
+            return _entManager.System<InteractionSystem>().InRangeUnobstructed(localEntity.Value, Entity);
         }
 
         private void MidiStopButtonOnPressed(ButtonEventArgs? obj)
         {
             MidiPlaybackSetButtonsDisabled(true);
 
-            if (_owner.Instrument is not {} instrument)
-                return;
-
-            _owner.Instruments.CloseMidi(_owner.Owner, false, instrument);
-            _owner.CloseChannelsMenu();
+            _entManager.System<InstrumentSystem>().CloseMidi(Entity, false);
+            OnCloseChannels?.Invoke();
         }
 
         private void MidiLoopButtonOnOnToggled(ButtonToggledEventArgs obj)
         {
-            if (_owner.Instrument == null)
-                return;
+            var instrument = _entManager.System<InstrumentSystem>();
+
+            if (_entManager.TryGetComponent(Entity, out InstrumentComponent? instrumentComp))
+            {
+                instrumentComp.LoopMidi = obj.Pressed;
+            }
 
-            _owner.Instrument.LoopMidi = obj.Pressed;
-            _owner.Instruments.UpdateRenderer(_owner.Owner, _owner.Instrument);
+            instrument.UpdateRenderer(Entity);
         }
 
         private void PlaybackSliderSeek(Range _)
         {
             // Do not seek while still grabbing.
-            if (PlaybackSlider.Grabbed || _owner.Instrument is not {} instrument)
+            if (PlaybackSlider.Grabbed)
                 return;
 
-            _owner.Instruments.SetPlayerTick(_owner.Owner, (int)Math.Ceiling(PlaybackSlider.Value), instrument);
+            _entManager.System<InstrumentSystem>().SetPlayerTick(Entity, (int)Math.Ceiling(PlaybackSlider.Value));
         }
 
         private void PlaybackSliderKeyUp(GUIBoundKeyEventArgs args)
         {
-            if (args.Function != EngineKeyFunctions.UIClick || _owner.Instrument is not {} instrument)
+            if (args.Function != EngineKeyFunctions.UIClick)
                 return;
 
-            _owner.Instruments.SetPlayerTick(_owner.Owner, (int)Math.Ceiling(PlaybackSlider.Value), instrument);
-        }
-
-        public override void Close()
-        {
-            base.Close();
-            _owner.CloseBandMenu();
-            _owner.CloseChannelsMenu();
+            _entManager.System<InstrumentSystem>().SetPlayerTick(Entity, (int)Math.Ceiling(PlaybackSlider.Value));
         }
 
         protected override void FrameUpdate(FrameEventArgs args)
         {
             base.FrameUpdate(args);
 
-            if (_owner.Instrument == null)
+            if (!_entManager.TryGetComponent(Entity, out InstrumentComponent? instrument))
                 return;
 
-            var hasMaster = _owner.Instrument.Master != null;
+            var hasMaster = instrument.Master != null;
             BandButton.ToggleMode = hasMaster;
             BandButton.Pressed = hasMaster;
-            BandButton.Disabled = _owner.Instrument.IsMidiOpen || _owner.Instrument.IsInputOpen;
-            ChannelsButton.Disabled = !_owner.Instrument.IsRendererAlive;
+            BandButton.Disabled = instrument.IsMidiOpen || instrument.IsInputOpen;
+            ChannelsButton.Disabled = !instrument.IsRendererAlive;
 
-            if (!_owner.Instrument.IsMidiOpen)
+            if (!instrument.IsMidiOpen)
             {
                 PlaybackSlider.MaxValue = 1;
                 PlaybackSlider.SetValueWithoutEvent(0);
@@ -260,8 +279,8 @@ protected override void FrameUpdate(FrameEventArgs args)
             if (PlaybackSlider.Grabbed)
                 return;
 
-            PlaybackSlider.MaxValue = _owner.Instrument.PlayerTotalTick;
-            PlaybackSlider.SetValueWithoutEvent(_owner.Instrument.PlayerTick);
+            PlaybackSlider.MaxValue = instrument.PlayerTotalTick;
+            PlaybackSlider.SetValueWithoutEvent(instrument.PlayerTick);
         }
     }
 }
diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs
index 4ccede7f5d4..468c325822d 100644
--- a/Content.Client/Inventory/StrippableBoundUserInterface.cs
+++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs
@@ -44,7 +44,7 @@ public sealed class StrippableBoundUserInterface : BoundUserInterface
         public const string HiddenPocketEntityId = "StrippingHiddenEntity";
 
         [ViewVariables]
-        private readonly StrippingMenu? _strippingMenu;
+        private StrippingMenu? _strippingMenu;
 
         [ViewVariables]
         private readonly EntityUid _virtualHiddenEntity;
@@ -54,29 +54,30 @@ public StrippableBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, u
             _examine = EntMan.System<ExamineSystem>();
             _inv = EntMan.System<InventorySystem>();
             _cuffable = EntMan.System<SharedCuffableSystem>();
-
-            var title = Loc.GetString("strippable-bound-user-interface-stripping-menu-title", ("ownerName", Identity.Name(Owner, EntMan)));
-            _strippingMenu = new StrippingMenu(title, this);
-            _strippingMenu.OnClose += Close;
             _virtualHiddenEntity = EntMan.SpawnEntity(HiddenPocketEntityId, MapCoordinates.Nullspace);
         }
 
         protected override void Open()
         {
             base.Open();
+
+            _strippingMenu = this.CreateWindow<StrippingMenu>();
+            _strippingMenu.OnDirty += UpdateMenu;
+            _strippingMenu.Title = Loc.GetString("strippable-bound-user-interface-stripping-menu-title", ("ownerName", Identity.Name(Owner, EntMan)));
+
             _strippingMenu?.OpenCenteredLeft();
         }
 
         protected override void Dispose(bool disposing)
         {
-            base.Dispose(disposing);
-
-            EntMan.DeleteEntity(_virtualHiddenEntity);
-
             if (!disposing)
                 return;
 
-            _strippingMenu?.Dispose();
+            if (_strippingMenu != null)
+                _strippingMenu.OnDirty -= UpdateMenu;
+
+            EntMan.DeleteEntity(_virtualHiddenEntity);
+            base.Dispose(disposing);
         }
 
         public void DirtyMenu()
diff --git a/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs b/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs
index f97d8a73302..7884268c428 100644
--- a/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs
+++ b/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs
@@ -12,42 +12,34 @@ namespace Content.Client.Kitchen.UI
     [GenerateTypedNameReferences]
     public sealed partial class GrinderMenu : FancyWindow
     {
-        private readonly IEntityManager _entityManager;
-        private readonly IPrototypeManager _prototypeManager;
-        private readonly ReagentGrinderBoundUserInterface _owner;
+        [Dependency] private readonly IEntityManager _entityManager = default!;
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
         private readonly Dictionary<int, EntityUid> _chamberVisualContents = new();
 
-        public GrinderMenu(ReagentGrinderBoundUserInterface owner, IEntityManager entityManager, IPrototypeManager prototypeManager)
+        public event Action? OnToggleAuto;
+        public event Action? OnGrind;
+        public event Action? OnJuice;
+        public event Action? OnEjectAll;
+        public event Action? OnEjectBeaker;
+        public event Action<EntityUid>? OnEjectChamber;
+
+        public GrinderMenu()
         {
             RobustXamlLoader.Load(this);
-            _entityManager = entityManager;
-            _prototypeManager = prototypeManager;
-            _owner = owner;
-            AutoModeButton.OnPressed += owner.ToggleAutoMode;
-            GrindButton.OnPressed += owner.StartGrinding;
-            JuiceButton.OnPressed += owner.StartJuicing;
-            ChamberContentBox.EjectButton.OnPressed += owner.EjectAll;
-            BeakerContentBox.EjectButton.OnPressed += owner.EjectBeaker;
+            IoCManager.InjectDependencies(this);
+            AutoModeButton.OnPressed += _ => OnToggleAuto?.Invoke();
+            GrindButton.OnPressed += _ => OnGrind?.Invoke();
+            JuiceButton.OnPressed += _ => OnJuice?.Invoke();
+            ChamberContentBox.EjectButton.OnPressed += _ => OnEjectAll?.Invoke();
+            BeakerContentBox.EjectButton.OnPressed += _ => OnEjectBeaker?.Invoke();
             ChamberContentBox.BoxContents.OnItemSelected += OnChamberBoxContentsItemSelected;
             BeakerContentBox.BoxContents.SelectMode = ItemList.ItemListSelectMode.None;
         }
 
         private void OnChamberBoxContentsItemSelected(ItemList.ItemListSelectedEventArgs args)
         {
-            _owner.EjectChamberContent(_chamberVisualContents[args.ItemIndex]);
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            _chamberVisualContents.Clear();
-            GrindButton.OnPressed -= _owner.StartGrinding;
-            JuiceButton.OnPressed -= _owner.StartJuicing;
-            ChamberContentBox.EjectButton.OnPressed -= _owner.EjectAll;
-            BeakerContentBox.EjectButton.OnPressed -= _owner.EjectBeaker;
-            ChamberContentBox.BoxContents.OnItemSelected -= OnChamberBoxContentsItemSelected;
+            OnEjectChamber?.Invoke(_chamberVisualContents[args.ItemIndex]);
         }
 
         public void UpdateState(ReagentGrinderInterfaceState state)
diff --git a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
index 7e7dd2d6935..643ac47054b 100644
--- a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
+++ b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
@@ -3,6 +3,7 @@
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Timing;
 
@@ -19,28 +20,15 @@ public sealed class MicrowaveBoundUserInterface : BoundUserInterface
 
         [ViewVariables]
         private readonly Dictionary<int, ReagentQuantity> _reagents = new();
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
-
-        public MicrowaveUpdateUserInterfaceState currentState = default!;
-
-        private IEntityManager _entManager;
 
         public MicrowaveBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
         {
-            _entManager = IoCManager.Resolve<IEntityManager>();
-        }
-
-        public TimeSpan GetCurrentTime()
-        {
-            return _gameTiming.CurTime;
         }
 
         protected override void Open()
         {
             base.Open();
-            _menu = new MicrowaveMenu(this);
-            _menu.OpenCentered();
-            _menu.OnClose += Close;
+            _menu = this.CreateWindow<MicrowaveMenu>();
             _menu.StartButton.OnPressed += _ => SendPredictedMessage(new MicrowaveStartCookMessage());
             _menu.EjectButton.OnPressed += _ => SendPredictedMessage(new MicrowaveEjectMessage());
             _menu.IngredientsList.OnItemSelected += args =>
@@ -74,38 +62,23 @@ protected override void Open()
             };
         }
 
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (!disposing)
-            {
-                return;
-            }
-
-            _solids.Clear();
-            _menu?.Dispose();
-        }
-
         protected override void UpdateState(BoundUserInterfaceState state)
         {
             base.UpdateState(state);
-            if (state is not MicrowaveUpdateUserInterfaceState cState)
+            if (state is not MicrowaveUpdateUserInterfaceState cState || _menu == null)
             {
                 return;
             }
 
+            _menu.IsBusy = cState.IsMicrowaveBusy;
+            _menu.CurrentCooktimeEnd = cState.CurrentCookTimeEnd;
 
-            _menu?.ToggleBusyDisableOverlayPanel(cState.IsMicrowaveBusy || cState.ContainedSolids.Length == 0);
-            currentState = cState;
-
+            _menu.ToggleBusyDisableOverlayPanel(cState.IsMicrowaveBusy || cState.ContainedSolids.Length == 0);
             // TODO move this to a component state and ensure the net ids.
-            RefreshContentsDisplay(_entManager.GetEntityArray(cState.ContainedSolids));
-
-            if (_menu == null) return;
+            RefreshContentsDisplay(EntMan.GetEntityArray(cState.ContainedSolids));
 
             //Set the cook time info label
-            var cookTime = cState.ActiveButtonIndex == 0 
+            var cookTime = cState.ActiveButtonIndex == 0
                 ? Loc.GetString("microwave-menu-instant-button")
                 : cState.CurrentCookTime.ToString();
 
diff --git a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs
index b292e9f1465..13029e38469 100644
--- a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs
+++ b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs
@@ -9,22 +9,21 @@ namespace Content.Client.Kitchen.UI
     [GenerateTypedNameReferences]
     public sealed partial class MicrowaveMenu : FancyWindow
     {
-        public sealed class MicrowaveCookTimeButton : Button
-        {
-            public uint CookTime;
-        }
+        [Dependency] private readonly IGameTiming _timing = default!;
 
         public event Action<BaseButton.ButtonEventArgs, int>? OnCookTimeSelected;
 
         public ButtonGroup CookTimeButtonGroup { get; }
-        private readonly MicrowaveBoundUserInterface _owner;
 
-        public MicrowaveMenu(MicrowaveBoundUserInterface owner)
+        public bool IsBusy;
+        public TimeSpan CurrentCooktimeEnd;
+
+        public MicrowaveMenu()
         {
             RobustXamlLoader.Load(this);
+            IoCManager.InjectDependencies(this);
             CookTimeButtonGroup = new ButtonGroup();
             InstantCookButton.Group = CookTimeButtonGroup;
-            _owner = owner;
             InstantCookButton.OnPressed += args =>
             {
                 OnCookTimeSelected?.Invoke(args, 0);
@@ -65,14 +64,20 @@ public void ToggleBusyDisableOverlayPanel(bool shouldDisable)
         protected override void FrameUpdate(FrameEventArgs args)
         {
             base.FrameUpdate(args);
-            if(!_owner.currentState.IsMicrowaveBusy)
+
+            if (!IsBusy)
                 return;
 
-            if(_owner.currentState.CurrentCookTimeEnd > _owner.GetCurrentTime())
+            if (CurrentCooktimeEnd > _timing.CurTime)
             {
                 CookTimeInfoLabel.Text = Loc.GetString("microwave-bound-user-interface-cook-time-label",
-                ("time",_owner.currentState.CurrentCookTimeEnd.Subtract(_owner.GetCurrentTime()).Seconds)); 
+                ("time", CurrentCooktimeEnd.Subtract(_timing.CurTime).Seconds));
             }
         }
+
+        public sealed class MicrowaveCookTimeButton : Button
+        {
+            public uint CookTime;
+        }
     }
 }
diff --git a/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs b/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs
index e6f108b3050..bc4cc75b4d1 100644
--- a/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs
+++ b/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Kitchen;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Prototypes;
 
@@ -8,8 +9,6 @@ namespace Content.Client.Kitchen.UI
 {
     public sealed class ReagentGrinderBoundUserInterface : BoundUserInterface
     {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-
         [ViewVariables]
         private GrinderMenu? _menu;
 
@@ -21,20 +20,13 @@ protected override void Open()
         {
             base.Open();
 
-            _menu = new GrinderMenu(this, EntMan, _prototypeManager);
-            _menu.OpenCentered();
-            _menu.OnClose += Close;
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing)
-            {
-                return;
-            }
-
-            _menu?.Dispose();
+            _menu = this.CreateWindow<GrinderMenu>();
+            _menu.OnToggleAuto += ToggleAutoMode;
+            _menu.OnGrind += StartGrinding;
+            _menu.OnJuice += StartJuicing;
+            _menu.OnEjectAll += EjectAll;
+            _menu.OnEjectBeaker += EjectBeaker;
+            _menu.OnEjectChamber += EjectChamberContent;
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
@@ -52,27 +44,27 @@ protected override void ReceiveMessage(BoundUserInterfaceMessage message)
             _menu?.HandleMessage(message);
         }
 
-        public void ToggleAutoMode(BaseButton.ButtonEventArgs args)
+        public void ToggleAutoMode()
         {
             SendMessage(new ReagentGrinderToggleAutoModeMessage());
         }
 
-        public void StartGrinding(BaseButton.ButtonEventArgs? _ = null)
+        public void StartGrinding()
         {
             SendMessage(new ReagentGrinderStartMessage(GrinderProgram.Grind));
         }
 
-        public void StartJuicing(BaseButton.ButtonEventArgs? _ = null)
+        public void StartJuicing()
         {
             SendMessage(new ReagentGrinderStartMessage(GrinderProgram.Juice));
         }
 
-        public void EjectAll(BaseButton.ButtonEventArgs? _ = null)
+        public void EjectAll()
         {
             SendMessage(new ReagentGrinderEjectChamberAllMessage());
         }
 
-        public void EjectBeaker(BaseButton.ButtonEventArgs? _ = null)
+        public void EjectBeaker()
         {
             SendMessage(new ItemSlotButtonPressedEvent(SharedReagentGrinder.BeakerSlotId));
         }
diff --git a/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs b/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs
index 555f1ff09e6..6b656123412 100644
--- a/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs
+++ b/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Labels;
 using Content.Shared.Labels.Components;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Labels.UI
 {
@@ -23,13 +24,8 @@ protected override void Open()
         {
             base.Open();
 
-            _window = new HandLabelerWindow();
-            if (State != null)
-                UpdateState(State);
+            _window = this.CreateWindow<HandLabelerWindow>();
 
-            _window.OpenCentered();
-
-            _window.OnClose += Close;
             _window.OnLabelChanged += OnLabelChanged;
             Reload();
         }
@@ -51,13 +47,5 @@ public void Reload()
 
             _window.SetCurrentLabel(component.AssignedLabel);
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing) return;
-            _window?.Dispose();
-        }
     }
-
 }
diff --git a/Content.Client/Lathe/UI/LatheBoundUserInterface.cs b/Content.Client/Lathe/UI/LatheBoundUserInterface.cs
index 6e6d1b91761..a599f79152e 100644
--- a/Content.Client/Lathe/UI/LatheBoundUserInterface.cs
+++ b/Content.Client/Lathe/UI/LatheBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Lathe;
 using Content.Shared.Research.Components;
 using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Lathe.UI
 {
@@ -17,9 +18,9 @@ protected override void Open()
         {
             base.Open();
 
-            _menu = new LatheMenu(this);
-            _menu.OnClose += Close;
-
+            _menu = this.CreateWindow<LatheMenu>();
+            _menu.SetEntity(Owner);
+            _menu.OpenCenteredRight();
 
             _menu.OnServerListButtonPressed += _ =>
             {
@@ -30,8 +31,6 @@ protected override void Open()
             {
                 SendMessage(new LatheQueueRecipeMessage(recipe, amount));
             };
-
-            _menu.OpenCenteredRight();
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
@@ -50,13 +49,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
                     break;
             }
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing)
-                return;
-            _menu?.Dispose();
-        }
     }
 }
diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml.cs b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
index 9e15f8239e5..649c8acc859 100644
--- a/Content.Client/Lathe/UI/LatheMenu.xaml.cs
+++ b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
@@ -1,3 +1,4 @@
+using System.Buffers;
 using System.Linq;
 using System.Text;
 using Content.Client.Materials;
@@ -23,7 +24,6 @@ public sealed partial class LatheMenu : DefaultWindow
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IResourceCache _resources = default!;
 
-    private EntityUid _owner;
     private readonly SpriteSystem _spriteSystem;
     private readonly LatheSystem _lathe;
     private readonly MaterialStorageSystem _materialStorage;
@@ -37,9 +37,10 @@ public sealed partial class LatheMenu : DefaultWindow
 
     public ProtoId<LatheCategoryPrototype>? CurrentCategory;
 
-    public LatheMenu(LatheBoundUserInterface owner)
+    public EntityUid Entity;
+
+    public LatheMenu()
     {
-        _owner = owner.Owner;
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
 
@@ -47,8 +48,6 @@ public LatheMenu(LatheBoundUserInterface owner)
         _lathe = _entityManager.System<LatheSystem>();
         _materialStorage = _entityManager.System<MaterialStorageSystem>();
 
-        Title = _entityManager.GetComponent<MetaDataComponent>(owner.Owner).EntityName;
-
         SearchBar.OnTextChanged += _ =>
         {
             PopulateRecipes();
@@ -61,8 +60,13 @@ public LatheMenu(LatheBoundUserInterface owner)
         FilterOption.OnItemSelected += OnItemSelected;
 
         ServerListButton.OnPressed += a => OnServerListButtonPressed?.Invoke(a);
+    }
 
-        if (_entityManager.TryGetComponent<LatheComponent>(owner.Owner, out var latheComponent))
+    public void SetEntity(EntityUid uid)
+    {
+        Entity = uid;
+
+        if (_entityManager.TryGetComponent<LatheComponent>(Entity, out var latheComponent))
         {
             if (!latheComponent.DynamicRecipes.Any())
             {
@@ -70,7 +74,7 @@ public LatheMenu(LatheBoundUserInterface owner)
             }
         }
 
-        MaterialsList.SetOwner(owner.Owner);
+        MaterialsList.SetOwner(Entity);
     }
 
     /// <summary>
@@ -106,21 +110,15 @@ public void PopulateRecipes()
 
         var sortedRecipesToShow = recipesToShow.OrderBy(p => p.Name);
         RecipeList.Children.Clear();
+        _entityManager.TryGetComponent(Entity, out LatheComponent? lathe);
+
         foreach (var prototype in sortedRecipesToShow)
         {
-            List<Texture> textures;
-            if (_prototypeManager.TryIndex(prototype.Result, out EntityPrototype? entityProto) && entityProto != null)
-            {
-                textures = SpriteComponent.GetPrototypeTextures(entityProto, _resources).Select(o => o.Default).ToList();
-            }
-            else
-            {
-                textures = prototype.Icon == null
-                    ? new List<Texture> { _spriteSystem.GetPrototypeIcon(prototype.Result).Default }
-                    : new List<Texture> { _spriteSystem.Frame0(prototype.Icon) };
-            }
+            EntityPrototype? recipeProto = null;
+            if (_prototypeManager.TryIndex(prototype.Result, out EntityPrototype? entityProto))
+                recipeProto = entityProto;
 
-            var canProduce = _lathe.CanProduce(_owner, prototype, quantity);
+            var canProduce = _lathe.CanProduce(Entity, prototype, quantity, component: lathe);
 
             var control = new RecipeControl(prototype, () => GenerateTooltipText(prototype), canProduce, textures);
             control.OnButtonPressed += s =>
@@ -136,19 +134,20 @@ public void PopulateRecipes()
     private string GenerateTooltipText(LatheRecipePrototype prototype)
     {
         StringBuilder sb = new();
+        var multiplier = _entityManager.GetComponent<LatheComponent>(Entity).MaterialUseMultiplier;
 
         foreach (var (id, amount) in prototype.RequiredMaterials)
         {
             if (!_prototypeManager.TryIndex<MaterialPrototype>(id, out var proto))
                 continue;
 
-            var adjustedAmount = SharedLatheSystem.AdjustMaterial(amount, prototype.ApplyMaterialDiscount, _entityManager.GetComponent<LatheComponent>(_owner).MaterialUseMultiplier);
+            var adjustedAmount = SharedLatheSystem.AdjustMaterial(amount, prototype.ApplyMaterialDiscount, multiplier);
             var sheetVolume = _materialStorage.GetSheetVolume(proto);
 
             var unit = Loc.GetString(proto.Unit);
             var sheets = adjustedAmount / (float) sheetVolume;
 
-            var availableAmount = _materialStorage.GetMaterialAmount(_owner, id);
+            var availableAmount = _materialStorage.GetMaterialAmount(Entity, id);
             var missingAmount = Math.Max(0, adjustedAmount - availableAmount);
             var missingSheets = missingAmount / (float) sheetVolume;
 
diff --git a/Content.Client/MachineLinking/UI/SignalTimerBoundUserInterface.cs b/Content.Client/MachineLinking/UI/SignalTimerBoundUserInterface.cs
index 09bdedfd94c..11abe8c2451 100644
--- a/Content.Client/MachineLinking/UI/SignalTimerBoundUserInterface.cs
+++ b/Content.Client/MachineLinking/UI/SignalTimerBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using Content.Shared.MachineLinking;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Shared.Timing;
 
 namespace Content.Client.MachineLinking.UI;
@@ -19,19 +20,14 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new SignalTimerWindow(this);
-
-        if (State != null)
-            UpdateState(State);
-
-        _window.OpenCentered();
-        _window.OnClose += Close;
+        _window = this.CreateWindow<SignalTimerWindow>();
+        _window.OnStartTimer += StartTimer;
         _window.OnCurrentTextChanged += OnTextChanged;
         _window.OnCurrentDelayMinutesChanged += OnDelayChanged;
         _window.OnCurrentDelaySecondsChanged += OnDelayChanged;
     }
 
-    public void OnStartTimer()
+    public void StartTimer()
     {
         SendMessage(new SignalTimerStartMessage());
     }
@@ -48,11 +44,6 @@ private void OnDelayChanged(string newDelay)
         SendMessage(new SignalTimerDelayChangedMessage(_window.GetDelay()));
     }
 
-    public TimeSpan GetCurrentTime()
-    {
-        return _gameTiming.CurTime;
-    }
-
     /// <summary>
     /// Update the UI state based on server-sent info
     /// </summary>
@@ -72,11 +63,4 @@ protected override void UpdateState(BoundUserInterfaceState state)
         _window.SetTimerStarted(cast.TimerStarted);
         _window.SetHasAccess(cast.HasAccess);
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing) return;
-        _window?.Dispose();
-    }
 }
diff --git a/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs b/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs
index fbaaf5624b4..441ca9ea365 100644
--- a/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs
+++ b/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs
@@ -10,42 +10,44 @@ namespace Content.Client.MachineLinking.UI;
 [GenerateTypedNameReferences]
 public sealed partial class SignalTimerWindow : DefaultWindow
 {
+    [Dependency] private readonly IGameTiming _timing = default!;
+
     private const int MaxTextLength = 5;
 
     public event Action<string>? OnCurrentTextChanged;
     public event Action<string>? OnCurrentDelayMinutesChanged;
     public event Action<string>? OnCurrentDelaySecondsChanged;
 
-    private readonly SignalTimerBoundUserInterface _owner;
-
     private TimeSpan? _triggerTime;
 
     private bool _timerStarted;
 
-    public SignalTimerWindow(SignalTimerBoundUserInterface owner)
+    public event Action? OnStartTimer;
+
+    public SignalTimerWindow()
     {
         RobustXamlLoader.Load(this);
-
-        _owner = owner;
+        IoCManager.InjectDependencies(this);
 
         CurrentTextEdit.OnTextChanged += e => OnCurrentTextChange(e.Text);
         CurrentDelayEditMinutes.OnTextChanged += e => OnCurrentDelayMinutesChange(e.Text);
         CurrentDelayEditSeconds.OnTextChanged += e => OnCurrentDelaySecondsChange(e.Text);
-        StartTimer.OnPressed += _ => OnStartTimer();
+        StartTimer.OnPressed += _ => StartTimerWeh();
     }
 
-    public void OnStartTimer()
+    private void StartTimerWeh()
     {
         if (!_timerStarted)
         {
             _timerStarted = true;
-            _triggerTime = _owner.GetCurrentTime() + GetDelay();
+            _triggerTime = _timing.CurTime + GetDelay();
         }
         else
         {
             SetTimerStarted(false);
         }
-        _owner.OnStartTimer();
+
+        OnStartTimer?.Invoke();
     }
 
     protected override void FrameUpdate(FrameEventArgs args)
@@ -55,9 +57,9 @@ protected override void FrameUpdate(FrameEventArgs args)
         if (!_timerStarted || _triggerTime == null)
             return;
 
-        if (_owner.GetCurrentTime() < _triggerTime.Value)
+        if (_timing.CurTime < _triggerTime.Value)
         {
-            StartTimer.Text = TextScreenSystem.TimeToString(_triggerTime.Value - _owner.GetCurrentTime());
+            StartTimer.Text = TextScreenSystem.TimeToString(_triggerTime.Value - _timing.CurTime);
         }
         else
         {
diff --git a/Content.Client/MagicMirror/MagicMirrorBoundUserInterface.cs b/Content.Client/MagicMirror/MagicMirrorBoundUserInterface.cs
index f6979bf8d7b..0a87948ff62 100644
--- a/Content.Client/MagicMirror/MagicMirrorBoundUserInterface.cs
+++ b/Content.Client/MagicMirror/MagicMirrorBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.MagicMirror;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.MagicMirror;
 
@@ -17,7 +18,7 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new();
+        _window = this.CreateWindow<MagicMirrorWindow>();
 
         _window.OnHairSelected += tuple => SelectHair(MagicMirrorCategory.Hair, tuple.id, tuple.slot);
         _window.OnHairColorChanged += args => ChangeColor(MagicMirrorCategory.Hair, args.marking, args.slot);
@@ -29,9 +30,6 @@ protected override void Open()
             args => ChangeColor(MagicMirrorCategory.FacialHair, args.marking, args.slot);
         _window.OnFacialHairSlotAdded += delegate () { AddSlot(MagicMirrorCategory.FacialHair); };
         _window.OnFacialHairSlotRemoved += args => RemoveSlot(MagicMirrorCategory.FacialHair, args);
-
-        _window.OnClose += Close;
-        _window.OpenCentered();
     }
 
     private void SelectHair(MagicMirrorCategory category, string marking, int slot)
@@ -65,14 +63,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
         _window.UpdateState(data);
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing)
-            return;
-
-        _window?.Dispose();
-    }
 }
 
diff --git a/Content.Client/MassMedia/Ui/NewsWriterBoundUserInterface.cs b/Content.Client/MassMedia/Ui/NewsWriterBoundUserInterface.cs
index 80eca82e324..22e5bc452a0 100644
--- a/Content.Client/MassMedia/Ui/NewsWriterBoundUserInterface.cs
+++ b/Content.Client/MassMedia/Ui/NewsWriterBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using JetBrains.Annotations;
 using Content.Shared.MassMedia.Systems;
 using Content.Shared.MassMedia.Components;
+using Robust.Client.UserInterface;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
@@ -9,8 +10,6 @@ namespace Content.Client.MassMedia.Ui;
 [UsedImplicitly]
 public sealed class NewsWriterBoundUserInterface : BoundUserInterface
 {
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
-
     [ViewVariables]
     private NewsWriterMenu? _menu;
 
@@ -21,10 +20,7 @@ public NewsWriterBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, u
 
     protected override void Open()
     {
-        _menu = new NewsWriterMenu(_gameTiming);
-
-        _menu.OpenCentered();
-        _menu.OnClose += Close;
+        _menu = this.CreateWindow<NewsWriterMenu>();
 
         _menu.ArticleEditorPanel.PublishButtonPressed += OnPublishButtonPressed;
         _menu.DeleteButtonPressed += OnDeleteButtonPressed;
@@ -32,16 +28,6 @@ protected override void Open()
         SendMessage(new NewsWriterArticlesRequestMessage());
     }
 
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing)
-            return;
-
-        _menu?.Close();
-        _menu?.Dispose();
-    }
-
     protected override void UpdateState(BoundUserInterfaceState state)
     {
         base.UpdateState(state);
diff --git a/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml.cs b/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml.cs
index e2d57935e3a..c059ce785af 100644
--- a/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml.cs
+++ b/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml.cs
@@ -10,17 +10,17 @@ namespace Content.Client.MassMedia.Ui;
 [GenerateTypedNameReferences]
 public sealed partial class NewsWriterMenu : FancyWindow
 {
-    private readonly IGameTiming _gameTiming;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
 
     private TimeSpan? _nextPublish;
 
     public event Action<int>? DeleteButtonPressed;
 
-    public NewsWriterMenu(IGameTiming gameTiming)
+    public NewsWriterMenu()
     {
         RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
 
-        _gameTiming = gameTiming;
         ContentsContainer.RectClipContent = false;
 
         // Customize scrollbar width and margin. This is not possible in xaml
diff --git a/Content.Client/Mech/Ui/MechBoundUserInterface.cs b/Content.Client/Mech/Ui/MechBoundUserInterface.cs
index 4172bdc90f1..2130a8c6099 100644
--- a/Content.Client/Mech/Ui/MechBoundUserInterface.cs
+++ b/Content.Client/Mech/Ui/MechBoundUserInterface.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Mech.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Mech.Ui;
 
@@ -20,9 +21,8 @@ protected override void Open()
     {
         base.Open();
 
-        _menu = new(Owner);
-
-        _menu.OnClose += Close;
+        _menu = this.CreateWindow<MechMenu>();
+        _menu.SetEntity(Owner);
         _menu.OpenCenteredLeft();
 
         _menu.OnRemoveButtonPressed += uid =>
@@ -60,16 +60,6 @@ public void UpdateEquipmentControls(MechBoundUiState state)
         }
     }
 
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-
-        if (!disposing)
-            return;
-
-        _menu?.Close();
-    }
-
     public UIFragment? GetEquipmentUi(EntityUid? uid)
     {
         var component = EntMan.GetComponentOrNull<UIFragmentComponent>(uid);
diff --git a/Content.Client/Mech/Ui/MechMenu.xaml.cs b/Content.Client/Mech/Ui/MechMenu.xaml.cs
index fad76488086..6f39bc386ee 100644
--- a/Content.Client/Mech/Ui/MechMenu.xaml.cs
+++ b/Content.Client/Mech/Ui/MechMenu.xaml.cs
@@ -16,14 +16,15 @@ public sealed partial class MechMenu : FancyWindow
 
     public event Action<EntityUid>? OnRemoveButtonPressed;
 
-    public MechMenu(EntityUid mech)
+    public MechMenu()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
+    }
 
-        _mech = mech;
-
-        MechView.SetEntity(mech);
+    public void SetEntity(EntityUid uid)
+    {
+        MechView.SetEntity(uid);
     }
 
     public void UpdateMechStats()
diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs
index 39788809871..b1f239cd78e 100644
--- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs
+++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Medical.CrewMonitoring;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Medical.CrewMonitoring;
 
@@ -14,7 +15,7 @@ public CrewMonitoringBoundUserInterface(EntityUid owner, Enum uiKey) : base(owne
     protected override void Open()
     {
         EntityUid? gridUid = null;
-        string stationName = string.Empty;
+        var stationName = string.Empty;
 
         if (EntMan.TryGetComponent<TransformComponent>(Owner, out var xform))
         {
@@ -26,10 +27,8 @@ protected override void Open()
             }
         }
 
-        _menu = new CrewMonitoringWindow(stationName, gridUid);
-
-        _menu.OpenCentered();
-        _menu.OnClose += Close;
+        _menu = this.CreateWindow<CrewMonitoringWindow>();
+        _menu.Set(stationName, gridUid);
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -44,13 +43,4 @@ protected override void UpdateState(BoundUserInterfaceState state)
                 break;
         }
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing)
-            return;
-
-        _menu?.Dispose();
-    }
 }
diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
index 863412e5532..e861864c144 100644
--- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
+++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
@@ -23,22 +23,27 @@ namespace Content.Client.Medical.CrewMonitoring;
 [GenerateTypedNameReferences]
 public sealed partial class CrewMonitoringWindow : FancyWindow
 {
-    private readonly IEntityManager _entManager;
-    private readonly IPrototypeManager _prototypeManager;
+    [Dependency] private readonly IEntityManager _entManager = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     private readonly SpriteSystem _spriteSystem;
 
     private NetEntity? _trackedEntity;
     private bool _tryToScrollToListFocus;
     private Texture? _blipTexture;
 
-    public CrewMonitoringWindow(string stationName, EntityUid? mapUid)
+    public CrewMonitoringWindow()
     {
         RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
 
-        _entManager = IoCManager.Resolve<IEntityManager>();
-        _prototypeManager = IoCManager.Resolve<IPrototypeManager>();
         _spriteSystem = _entManager.System<SpriteSystem>();
 
+        NavMap.TrackedEntitySelectedAction += SetTrackedEntityFromNavMap;
+
+    }
+
+    public void Set(string stationName, EntityUid? mapUid)
+    {
         _blipTexture = _spriteSystem.Frame0(new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")));
 
         if (_entManager.TryGetComponent<TransformComponent>(mapUid, out var xform))
@@ -49,8 +54,6 @@ public CrewMonitoringWindow(string stationName, EntityUid? mapUid)
 
         StationName.AddStyleClass("LabelBig");
         StationName.Text = stationName;
-
-        NavMap.TrackedEntitySelectedAction += SetTrackedEntityFromNavMap;
         NavMap.ForceNavMapUpdate();
     }
 
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs
index 80c98f143b9..f85220a9266 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Client.NetworkConfigurator.Systems;
 using Content.Shared.DeviceNetwork;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 
 namespace Content.Client.NetworkConfigurator;
@@ -35,14 +36,12 @@ protected override void Open()
         switch (UiKey)
         {
             case NetworkConfiguratorUiKey.List:
-                _listMenu = new NetworkConfiguratorListMenu(this);
-                _listMenu.OnClose += Close;
+                _listMenu = this.CreateWindow<NetworkConfiguratorListMenu>();
                 _listMenu.ClearButton.OnPressed += _ => OnClearButtonPressed();
-                _listMenu.OpenCenteredRight();
+                _listMenu.OnRemoveAddress += OnRemoveButtonPressed;
                 break;
             case NetworkConfiguratorUiKey.Configure:
-                _configurationMenu = new NetworkConfiguratorConfigurationMenu();
-                _configurationMenu.OnClose += Close;
+                _configurationMenu = this.CreateWindow<NetworkConfiguratorConfigurationMenu>();
                 _configurationMenu.Set.OnPressed += _ => OnConfigButtonPressed(NetworkConfiguratorButtonKey.Set);
                 _configurationMenu.Add.OnPressed += _ => OnConfigButtonPressed(NetworkConfiguratorButtonKey.Add);
                 //_configurationMenu.Edit.OnPressed += _ => OnConfigButtonPressed(NetworkConfiguratorButtonKey.Edit);
@@ -50,12 +49,24 @@ protected override void Open()
                 _configurationMenu.Copy.OnPressed += _ => OnConfigButtonPressed(NetworkConfiguratorButtonKey.Copy);
                 _configurationMenu.Show.OnPressed += OnShowPressed;
                 _configurationMenu.Show.Pressed = _netConfig.ConfiguredListIsTracked(Owner);
-                _configurationMenu.OpenCentered();
+                _configurationMenu.OnRemoveAddress += OnRemoveButtonPressed;
                 break;
             case NetworkConfiguratorUiKey.Link:
-                _linkMenu = new NetworkConfiguratorLinkMenu(this);
-                _linkMenu.OnClose += Close;
-                _linkMenu.OpenCentered();
+                _linkMenu = this.CreateWindow<NetworkConfiguratorLinkMenu>();
+                _linkMenu.OnLinkDefaults += args =>
+                {
+                    SendMessage(new NetworkConfiguratorLinksSaveMessage(args));
+                };
+
+                _linkMenu.OnToggleLink += (left, right) =>
+                {
+                    SendMessage(new NetworkConfiguratorToggleLinkMessage(left, right));
+                };
+
+                _linkMenu.OnClearLinks += () =>
+                {
+                    SendMessage(new NetworkConfiguratorClearLinksMessage());
+                };
                 break;
         }
     }
@@ -83,16 +94,6 @@ protected override void UpdateState(BoundUserInterfaceState state)
         }
     }
 
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing) return;
-
-        _linkMenu?.Dispose();
-        _listMenu?.Dispose();
-        _configurationMenu?.Dispose();
-    }
-
     private void OnClearButtonPressed()
     {
         SendMessage(new NetworkConfiguratorClearDevicesMessage());
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs
index 19d04cd3464..fcd2f759187 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs
@@ -9,17 +9,23 @@ namespace Content.Client.NetworkConfigurator;
 [GenerateTypedNameReferences]
 public sealed partial class NetworkConfiguratorConfigurationMenu : FancyWindow
 {
+    public event Action<string>? OnRemoveAddress;
+
     public NetworkConfiguratorConfigurationMenu()
     {
         RobustXamlLoader.Load(this);
 
         Clear.StyleClasses.Add(StyleBase.ButtonOpenLeft);
         Clear.StyleClasses.Add(StyleNano.StyleClassButtonColorRed);
+        DeviceList.OnRemoveAddress += args =>
+        {
+            OnRemoveAddress?.Invoke(args);
+        };
     }
 
     public void UpdateState(DeviceListUserInterfaceState state)
     {
-        DeviceList.UpdateState(null, state.DeviceList);
+        DeviceList.UpdateState(state.DeviceList, false);
 
         Count.Text = Loc.GetString("network-configurator-ui-count-label", ("count", state.DeviceList.Count));
     }
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorDeviceList.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorDeviceList.xaml.cs
index 8cfa97dc6c2..e75c60058cb 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorDeviceList.xaml.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorDeviceList.xaml.cs
@@ -7,17 +7,19 @@ namespace Content.Client.NetworkConfigurator;
 [GenerateTypedNameReferences]
 public sealed partial class NetworkConfiguratorDeviceList : ScrollContainer
 {
-    public void UpdateState(NetworkConfiguratorBoundUserInterface? ui, HashSet<(string address, string name)> devices)
+    public event Action<string>? OnRemoveAddress;
+
+    public void UpdateState(HashSet<(string address, string name)> devices, bool ui)
     {
         DeviceList.RemoveAllChildren();
 
         foreach (var device in devices)
         {
-            DeviceList.AddChild(BuildDeviceListRow(ui, device));
+            DeviceList.AddChild(BuildDeviceListRow(device, ui));
         }
     }
 
-    private static BoxContainer BuildDeviceListRow(NetworkConfiguratorBoundUserInterface? ui, (string address, string name) savedDevice)
+    private BoxContainer BuildDeviceListRow((string address, string name) savedDevice, bool ui)
     {
         var row = new BoxContainer()
         {
@@ -48,10 +50,10 @@ private static BoxContainer BuildDeviceListRow(NetworkConfiguratorBoundUserInter
         row.AddChild(name);
         row.AddChild(address);
 
-        if (ui != null)
+        if (ui)
         {
             row.AddChild(removeButton);
-            removeButton.OnPressed += _ => ui.OnRemoveButtonPressed(savedDevice.address);
+            removeButton.OnPressed += _ => OnRemoveAddress?.Invoke(savedDevice.address);
         }
 
         return row;
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs
index c04b42f249b..8cdffd16af6 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs
@@ -18,20 +18,20 @@ public sealed partial class NetworkConfiguratorLinkMenu : FancyWindow
 
     private readonly LinksRender _links;
 
-
     private readonly List<SourcePortPrototype> _sources = new();
 
     private readonly List<SinkPortPrototype> _sinks = new();
 
-    private readonly NetworkConfiguratorBoundUserInterface _userInterface;
-
     private (ButtonPosition position, string id, int index)? _selectedButton;
 
     private List<(string left, string right)>? _defaults;
 
-    public NetworkConfiguratorLinkMenu(NetworkConfiguratorBoundUserInterface userInterface)
+    public event Action? OnClearLinks;
+    public event Action<string, string>? OnToggleLink;
+    public event Action<List<(string left, string right)>>? OnLinkDefaults;
+
+    public NetworkConfiguratorLinkMenu()
     {
-        _userInterface = userInterface;
         RobustXamlLoader.Load(this);
 
         var footerStyleBox = new StyleBoxFlat()
@@ -52,7 +52,7 @@ public NetworkConfiguratorLinkMenu(NetworkConfiguratorBoundUserInterface userInt
 
         ButtonOk.OnPressed += _ => Close();
         ButtonLinkDefault.OnPressed += _ => LinkDefaults();
-        ButtonClear.OnPressed += _ => _userInterface.SendMessage(new NetworkConfiguratorClearLinksMessage());
+        ButtonClear.OnPressed += _ => OnClearLinks?.Invoke();
     }
 
     public void UpdateState(DeviceLinkUserInterfaceState linkState)
@@ -98,7 +98,7 @@ private void LinkDefaults()
         if (_defaults == default)
             return;
 
-        _userInterface.SendMessage(new NetworkConfiguratorLinksSaveMessage(_defaults));
+        OnLinkDefaults?.Invoke(_defaults);
     }
 
     private Button CreateButton(ButtonPosition position, string name, string description, string id, int index)
@@ -138,7 +138,7 @@ private void OnButtonPressed(BaseButton.ButtonEventArgs args, ButtonPosition pos
         var left = _selectedButton.Value.position == ButtonPosition.Left ? _selectedButton.Value.id : id;
         var right = _selectedButton.Value.position == ButtonPosition.Left ? id : _selectedButton.Value.id;
 
-        _userInterface.SendMessage(new NetworkConfiguratorToggleLinkMessage(left, right));
+        OnToggleLink?.Invoke(left, right);
 
         args.Button.Pressed = false;
 
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs
index fb4aec1974b..6294facaeed 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs
@@ -9,17 +9,20 @@ namespace Content.Client.NetworkConfigurator;
 [GenerateTypedNameReferences]
 public sealed partial class NetworkConfiguratorListMenu : FancyWindow
 {
-    private readonly NetworkConfiguratorBoundUserInterface _ui;
-    public NetworkConfiguratorListMenu(NetworkConfiguratorBoundUserInterface ui)
+    public event Action<string>? OnRemoveAddress;
+
+    public NetworkConfiguratorListMenu()
     {
         RobustXamlLoader.Load(this);
-
-        _ui = ui;
+        DeviceList.OnRemoveAddress += args =>
+        {
+            OnRemoveAddress?.Invoke(args);
+        };
     }
 
     public void UpdateState(NetworkConfiguratorUserInterfaceState state)
     {
         DeviceCountLabel.Text = Loc.GetString("network-configurator-ui-count-label", ("count", state.DeviceList.Count));
-        DeviceList.UpdateState(_ui, state.DeviceList);
+        DeviceList.UpdateState(state.DeviceList, true);
     }
 }
diff --git a/Content.Client/Nuke/NukeBoundUserInterface.cs b/Content.Client/Nuke/NukeBoundUserInterface.cs
index 59fbc5b319b..2e150423734 100644
--- a/Content.Client/Nuke/NukeBoundUserInterface.cs
+++ b/Content.Client/Nuke/NukeBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Nuke;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Nuke
 {
@@ -11,15 +12,13 @@ public sealed class NukeBoundUserInterface : BoundUserInterface
         [ViewVariables]
         private NukeMenu? _menu;
 
-        public NukeBoundUserInterface([NotNull] EntityUid owner, [NotNull] Enum uiKey) : base(owner, uiKey)
+        public NukeBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 
         protected override void Open()
         {
-            _menu = new NukeMenu();
-            _menu.OpenCentered();
-            _menu.OnClose += Close;
+            _menu = this.CreateWindow<NukeMenu>();
 
             _menu.OnKeypadButtonPressed += i =>
             {
@@ -62,15 +61,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
                     break;
             }
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing)
-                return;
-
-            _menu?.Close();
-            _menu?.Dispose();
-        }
     }
 }
diff --git a/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs b/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs
index ec055b3240c..ad4f1a75d47 100644
--- a/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs
+++ b/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Chat;
 using Content.Shared.NukeOps;
 using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 using Robust.Shared.Configuration;
 using Robust.Shared.Timing;
 
@@ -11,8 +12,6 @@ namespace Content.Client.NukeOps;
 public sealed class WarDeclaratorBoundUserInterface : BoundUserInterface
 {
     [Dependency] private readonly IConfigurationManager _cfg = default!;
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
-    [Dependency] private readonly ILocalizationManager _localizationManager = default!;
 
     [ViewVariables]
     private WarDeclaratorWindow? _window;
@@ -23,13 +22,7 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new WarDeclaratorWindow(_gameTiming, _localizationManager);
-        if (State != null)
-            UpdateState(State);
-
-        _window.OpenCentered();
-
-        _window.OnClose += Close;
+        _window = this.CreateWindow<WarDeclaratorWindow>();
         _window.OnActivated += OnWarDeclaratorActivated;
     }
 
@@ -42,13 +35,6 @@ protected override void UpdateState(BoundUserInterfaceState state)
         _window?.UpdateState(cast);
     }
 
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (disposing)
-            _window?.Dispose();
-    }
-
     private void OnWarDeclaratorActivated(string message)
     {
         var maxLength = _cfg.GetCVar(CCVars.ChatMaxAnnouncementLength);
diff --git a/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs b/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs
index b4a3f1c7fa5..aeceae13275 100644
--- a/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs
+++ b/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs
@@ -11,7 +11,8 @@ namespace Content.Client.NukeOps;
 [GenerateTypedNameReferences]
 public sealed partial class WarDeclaratorWindow : FancyWindow
 {
-    private readonly IGameTiming _gameTiming;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly ILocalizationManager _localizationManager = default!;
 
     public event Action<string>? OnActivated;
 
@@ -19,15 +20,13 @@ public sealed partial class WarDeclaratorWindow : FancyWindow
     private TimeSpan _shuttleDisabledTime;
     private WarConditionStatus _status;
 
-    public WarDeclaratorWindow(IGameTiming gameTiming, ILocalizationManager localizationManager)
+    public WarDeclaratorWindow()
     {
         RobustXamlLoader.Load(this);
 
-        _gameTiming = gameTiming;
-
         WarButton.OnPressed += (_) => OnActivated?.Invoke(Rope.Collapse(MessageEdit.TextRope));
 
-        MessageEdit.Placeholder = new Rope.Leaf(localizationManager.GetString("war-declarator-message-placeholder"));
+        MessageEdit.Placeholder = new Rope.Leaf(_localizationManager.GetString("war-declarator-message-placeholder"));
     }
 
     protected override void FrameUpdate(FrameEventArgs args)
diff --git a/Content.Client/PDA/PdaBoundUserInterface.cs b/Content.Client/PDA/PdaBoundUserInterface.cs
index 07352b512b0..37ce9c4280f 100644
--- a/Content.Client/PDA/PdaBoundUserInterface.cs
+++ b/Content.Client/PDA/PdaBoundUserInterface.cs
@@ -21,9 +21,16 @@ public PdaBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
         protected override void Open()
         {
             base.Open();
-            _menu = new PdaMenu();
+
+            if (_menu == null)
+                CreateMenu();
+        }
+
+        private void CreateMenu()
+        {
+            _menu = this.CreateWindow<PdaMenu>();
             _menu.OpenCenteredLeft();
-            _menu.OnClose += Close;
+
             _menu.FlashLightToggleButton.OnToggled += _ =>
             {
                 SendMessage(new PdaToggleFlashlightMessage());
@@ -88,7 +95,6 @@ protected override void UpdateState(BoundUserInterfaceState state)
             _menu?.UpdateState(updateState);
         }
 
-
         protected override void AttachCartridgeUI(Control cartridgeUIFragment, string? title)
         {
             _menu?.ProgramView.AddChild(cartridgeUIFragment);
@@ -110,15 +116,6 @@ protected override void UpdateAvailablePrograms(List<(EntityUid, CartridgeCompon
             _menu?.UpdateAvailablePrograms(programs);
         }
 
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing)
-                return;
-
-            _menu?.Dispose();
-        }
-
         private PdaBorderColorComponent? GetBorderColorComponent()
         {
             return EntMan.GetComponentOrNull<PdaBorderColorComponent>(Owner);
diff --git a/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs b/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs
index a0688523f1e..170a296ac2e 100644
--- a/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs
+++ b/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.PDA;
 using Content.Shared.PDA.Ringer;
 using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 using Robust.Shared.Timing;
 
 namespace Content.Client.PDA.Ringer
@@ -18,9 +19,8 @@ public RingerBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey
         protected override void Open()
         {
             base.Open();
-            _menu = new RingtoneMenu();
+            _menu = this.CreateWindow<RingtoneMenu>();
             _menu.OpenToLeft();
-            _menu.OnClose += Close;
 
             _menu.TestRingerButton.OnPressed += _ =>
             {
diff --git a/Content.Client/Paper/UI/PaperBoundUserInterface.cs b/Content.Client/Paper/UI/PaperBoundUserInterface.cs
index 4b0ac868f01..f3ad1e347e7 100644
--- a/Content.Client/Paper/UI/PaperBoundUserInterface.cs
+++ b/Content.Client/Paper/UI/PaperBoundUserInterface.cs
@@ -1,4 +1,5 @@
 using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Utility;
 using static Content.Shared.Paper.SharedPaperComponent;
@@ -19,16 +20,13 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new PaperWindow();
-        _window.OnClose += Close;
-        _window.OnSaved += Input_OnTextEntered;
+        _window = this.CreateWindow<PaperWindow>();
+        _window.OnSaved += InputOnTextEntered;
 
         if (EntMan.TryGetComponent<PaperVisualsComponent>(Owner, out var visuals))
         {
             _window.InitVisuals(Owner, visuals);
         }
-
-        _window.OpenCentered();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -37,7 +35,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
         _window?.Populate((PaperBoundUserInterfaceState) state);
     }
 
-    private void Input_OnTextEntered(string text)
+    private void InputOnTextEntered(string text)
     {
         SendMessage(new PaperInputTextMessage(text));
 
@@ -47,11 +45,4 @@ private void Input_OnTextEntered(string text)
             _window.Input.CursorPosition = new TextEdit.CursorPos(0, TextEdit.LineBreakBias.Top);
         }
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing) return;
-        _window?.Dispose();
-    }
 }
diff --git a/Content.Client/Paper/UI/PaperWindow.xaml.cs b/Content.Client/Paper/UI/PaperWindow.xaml.cs
index 7a5fd652643..f7cace642ce 100644
--- a/Content.Client/Paper/UI/PaperWindow.xaml.cs
+++ b/Content.Client/Paper/UI/PaperWindow.xaml.cs
@@ -17,6 +17,7 @@ namespace Content.Client.Paper.UI
     public sealed partial class PaperWindow : BaseWindow
     {
         [Dependency] private readonly IInputManager _inputManager = default!;
+        [Dependency] private readonly IResourceCache _resCache = default!;
 
         private static Color DefaultTextColor = new(25, 25, 25);
 
@@ -85,11 +86,10 @@ public void InitVisuals(EntityUid entity, PaperVisualsComponent visuals)
             // Randomize the placement of any stamps based on the entity UID
             // so that there's some variety in different papers.
             StampDisplay.PlacementSeed = (int)entity;
-            var resCache = IoCManager.Resolve<IResourceCache>();
 
             // Initialize the background:
             PaperBackground.ModulateSelfOverride = visuals.BackgroundModulate;
-            var backgroundImage = visuals.BackgroundImagePath != null? resCache.GetResource<TextureResource>(visuals.BackgroundImagePath) : null;
+            var backgroundImage = visuals.BackgroundImagePath != null? _resCache.GetResource<TextureResource>(visuals.BackgroundImagePath) : null;
             if (backgroundImage != null)
             {
                 var backgroundImageMode = visuals.BackgroundImageTile ? StyleBoxTexture.StretchMode.Tile : StyleBoxTexture.StretchMode.Stretch;
@@ -127,7 +127,7 @@ public void InitVisuals(EntityUid entity, PaperVisualsComponent visuals)
             PaperContent.ModulateSelfOverride = visuals.ContentImageModulate;
             WrittenTextLabel.ModulateSelfOverride = visuals.FontAccentColor;
 
-            var contentImage = visuals.ContentImagePath != null ? resCache.GetResource<TextureResource>(visuals.ContentImagePath) : null;
+            var contentImage = visuals.ContentImagePath != null ? _resCache.GetResource<TextureResource>(visuals.ContentImagePath) : null;
             if (contentImage != null)
             {
                 // Setup the paper content texture, but keep a reference to it, as we can't set
diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs
index cde5ba9ef79..ff1eae36f55 100644
--- a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs
+++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Singularity.Components;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.ParticleAccelerator.UI
 {
@@ -16,9 +17,10 @@ protected override void Open()
         {
             base.Open();
 
-            _menu = new ParticleAcceleratorControlMenu(this);
-            _menu.OnClose += Close;
-            _menu.OpenCentered();
+            _menu = this.CreateWindow<ParticleAcceleratorControlMenu>();
+            _menu.OnOverallState += SendEnableMessage;
+            _menu.OnPowerState += SendPowerStateMessage;
+            _menu.OnScanPartsRequested += SendScanPartsMessage;
         }
 
         public void SendEnableMessage(bool enable)
@@ -40,13 +42,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
         {
             _menu?.DataUpdate((ParticleAcceleratorUIState) state);
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            _menu?.Dispose();
-            _menu = null;
-        }
     }
 }
diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs
index c69e0271372..05a296edf39 100644
--- a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs
+++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs
@@ -18,9 +18,10 @@ namespace Content.Client.ParticleAccelerator.UI
 {
     public sealed class ParticleAcceleratorControlMenu : BaseWindow
     {
-        private readonly ShaderInstance _greyScaleShader;
+        [Dependency] private readonly IPrototypeManager _protoManager = default!;
+        [Dependency] private readonly IResourceCache _cache = default!;
 
-        private readonly ParticleAcceleratorBoundUserInterface _owner;
+        private readonly ShaderInstance _greyScaleShader;
 
         private readonly Label _drawLabel;
         private readonly FastNoiseLite _drawNoiseGenerator;
@@ -50,19 +51,22 @@ public sealed class ParticleAcceleratorControlMenu : BaseWindow
         private bool _shouldContinueAnimating;
         private int _maxStrength = 3;
 
-        public ParticleAcceleratorControlMenu(ParticleAcceleratorBoundUserInterface owner)
+        public event Action<bool>? OnOverallState;
+        public event Action<ParticleAcceleratorPowerState>? OnPowerState;
+        public event Action? OnScanPartsRequested;
+
+        public ParticleAcceleratorControlMenu()
         {
+            IoCManager.InjectDependencies(this);
             SetSize = new Vector2(400, 320);
-            _greyScaleShader = IoCManager.Resolve<IPrototypeManager>().Index<ShaderPrototype>("Greyscale").Instance();
+            _greyScaleShader = _protoManager.Index<ShaderPrototype>("Greyscale").Instance();
 
-            _owner = owner;
             _drawNoiseGenerator = new();
             _drawNoiseGenerator.SetFractalType(FastNoiseLite.FractalType.FBm);
             _drawNoiseGenerator.SetFrequency(0.5f);
 
-            var resourceCache = IoCManager.Resolve<IResourceCache>();
-            var font = resourceCache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13);
-            var panelTex = resourceCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png");
+            var font = _cache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13);
+            var panelTex = _cache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png");
 
             MouseFilter = MouseFilterMode.Stop;
 
@@ -112,7 +116,8 @@ public ParticleAcceleratorControlMenu(ParticleAcceleratorBoundUserInterface owne
                 Text = Loc.GetString("particle-accelerator-control-menu-off-button"),
                 StyleClasses = { StyleBase.ButtonOpenRight },
             };
-            _offButton.OnPressed += args => owner.SendEnableMessage(false);
+
+            _offButton.OnPressed += args => OnOverallState?.Invoke(false);
 
             _onButton = new Button
             {
@@ -120,7 +125,7 @@ public ParticleAcceleratorControlMenu(ParticleAcceleratorBoundUserInterface owne
                 Text = Loc.GetString("particle-accelerator-control-menu-on-button"),
                 StyleClasses = { StyleBase.ButtonOpenLeft },
             };
-            _onButton.OnPressed += args => owner.SendEnableMessage(true);
+            _onButton.OnPressed += args => OnOverallState?.Invoke(true);
 
             var closeButton = new TextureButton
             {
@@ -316,7 +321,7 @@ public ParticleAcceleratorControlMenu(ParticleAcceleratorBoundUserInterface owne
                 }
             });
 
-            _scanButton.OnPressed += args => _owner.SendScanPartsMessage();
+            _scanButton.OnPressed += args => OnScanPartsRequested?.Invoke();
 
             _alarmControl.AnimationCompleted += s =>
             {
@@ -332,7 +337,7 @@ public ParticleAcceleratorControlMenu(ParticleAcceleratorBoundUserInterface owne
 
             PASegmentControl Segment(string name)
             {
-                return new(this, resourceCache, name);
+                return new(this, _cache, name);
             }
 
             UpdateUI(false, false, false, false);
@@ -368,7 +373,7 @@ private void PowerStateChanged(ValueChangedEventArgs e)
             }
 
             _stateSpinBox.SetButtonDisabled(true);
-            _owner.SendPowerStateMessage(newState);
+            OnPowerState?.Invoke(newState);
         }
 
         protected override DragMode GetDragModeFor(Vector2 relativeMousePos)
diff --git a/Content.Client/Pinpointer/UI/NavMapBeaconBoundUserInterface.cs b/Content.Client/Pinpointer/UI/NavMapBeaconBoundUserInterface.cs
index 3ebcf7cbced..0df6787170a 100644
--- a/Content.Client/Pinpointer/UI/NavMapBeaconBoundUserInterface.cs
+++ b/Content.Client/Pinpointer/UI/NavMapBeaconBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Pinpointer;
 using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Pinpointer.UI;
 
@@ -16,19 +17,16 @@ public NavMapBeaconBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner,
     protected override void Open()
     {
         base.Open();
-        _window = new NavMapBeaconWindow(Owner);
-        _window.OpenCentered();
-        _window.OnClose += Close;
+        _window = this.CreateWindow<NavMapBeaconWindow>();
+
+        if (EntMan.TryGetComponent(Owner, out NavMapBeaconComponent? beacon))
+        {
+            _window.SetEntity(Owner, beacon);
+        }
 
         _window.OnApplyButtonPressed += (label, enabled, color) =>
         {
             SendMessage(new NavMapBeaconConfigureBuiMessage(label, enabled, color));
         };
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        _window?.Dispose();
-    }
 }
diff --git a/Content.Client/Pinpointer/UI/NavMapBeaconWindow.xaml.cs b/Content.Client/Pinpointer/UI/NavMapBeaconWindow.xaml.cs
index 968fe188f75..b77f1af0472 100644
--- a/Content.Client/Pinpointer/UI/NavMapBeaconWindow.xaml.cs
+++ b/Content.Client/Pinpointer/UI/NavMapBeaconWindow.xaml.cs
@@ -10,38 +10,37 @@ namespace Content.Client.Pinpointer.UI;
 [GenerateTypedNameReferences]
 public sealed partial class NavMapBeaconWindow : FancyWindow
 {
-    [Dependency] private readonly IEntityManager _entityManager = default!;
-
     private string? _defaultLabel;
     private bool _defaultEnabled;
     private Color _defaultColor;
 
     public event Action<string?, bool, Color>? OnApplyButtonPressed;
 
-    public NavMapBeaconWindow(EntityUid beaconEntity)
+    public NavMapBeaconWindow()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
 
-        if (!_entityManager.TryGetComponent<NavMapBeaconComponent>(beaconEntity, out var navMap))
-            return;
-        _defaultLabel = navMap.Text;
-        _defaultEnabled = navMap.Enabled;
-        _defaultColor = navMap.Color;
 
-        UpdateVisibleButton(navMap.Enabled);
         VisibleButton.OnPressed += args => UpdateVisibleButton(args.Button.Pressed);
-
-        LabelLineEdit.Text = navMap.Text ?? string.Empty;
         LabelLineEdit.OnTextChanged += OnTextChanged;
-
-        ColorSelector.Color = navMap.Color;
         ColorSelector.OnColorChanged += _ => TryEnableApplyButton();
 
         TryEnableApplyButton();
         ApplyButton.OnPressed += OnApplyPressed;
     }
 
+    public void SetEntity(EntityUid uid, NavMapBeaconComponent navMap)
+    {
+        _defaultLabel = navMap.Text;
+        _defaultEnabled = navMap.Enabled;
+        _defaultColor = navMap.Color;
+
+        UpdateVisibleButton(navMap.Enabled);
+        LabelLineEdit.Text = navMap.Text ?? string.Empty;
+        ColorSelector.Color = navMap.Color;
+    }
+
     private void UpdateVisibleButton(bool value)
     {
         VisibleButton.Pressed = value;
diff --git a/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs b/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs
index 6e62dbfda9e..7417fafede5 100644
--- a/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs
+++ b/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs
@@ -1,4 +1,4 @@
-using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Pinpointer.UI;
 
@@ -14,7 +14,6 @@ public StationMapBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, u
     protected override void Open()
     {
         base.Open();
-        _window?.Close();
         EntityUid? gridUid = null;
 
         if (EntMan.TryGetComponent<TransformComponent>(Owner, out var xform))
@@ -24,16 +23,6 @@ protected override void Open()
 
         _window = this.CreateWindow<StationMapWindow>();
         _window.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
-
-        string stationName = string.Empty;
-        if(EntMan.TryGetComponent<MetaDataComponent>(gridUid, out var gridMetaData))
-        {
-            stationName = gridMetaData.EntityName;
-        }
-        
-        if (EntMan.TryGetComponent<StationMapComponent>(Owner, out var comp) && comp.ShowLocation)
-            _window.Set(stationName, gridUid, Owner);
-        else
-            _window.Set(stationName, gridUid, null);
+        _window.Set(gridUid, Owner);
     }
 }
diff --git a/Content.Client/Pinpointer/UI/UntrackedMapBoundUserInterface.cs b/Content.Client/Pinpointer/UI/UntrackedMapBoundUserInterface.cs
index 57965b030a2..a3ca6f65da2 100644
--- a/Content.Client/Pinpointer/UI/UntrackedMapBoundUserInterface.cs
+++ b/Content.Client/Pinpointer/UI/UntrackedMapBoundUserInterface.cs
@@ -1,4 +1,4 @@
-using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Pinpointer.UI;
 
@@ -14,22 +14,15 @@ public UntrackedStationMapBoundUserInterface(EntityUid owner, Enum uiKey) : base
     protected override void Open()
     {
         base.Open();
-        _window?.Close();
         EntityUid? gridUid = null;
 
+        // TODO: What this just looks like it's been copy-pasted wholesale from StationMapBoundUserInterface?
         if (EntMan.TryGetComponent<TransformComponent>(Owner, out var xform))
         {
             gridUid = xform.GridUid;
         }
 
-        _window = new StationMapWindow(gridUid, null);
-        _window.OpenCentered();
-        _window.OnClose += Close;
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        _window?.Dispose();
+        _window = this.CreateWindow<StationMapWindow>();
+        _window.Set(gridUid, Owner);
     }
 }
diff --git a/Content.Client/Power/APC/ApcBoundUserInterface.cs b/Content.Client/Power/APC/ApcBoundUserInterface.cs
index fbcbf011569..759a5949ba6 100644
--- a/Content.Client/Power/APC/ApcBoundUserInterface.cs
+++ b/Content.Client/Power/APC/ApcBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.APC;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Power.APC
 {
@@ -19,9 +20,8 @@ protected override void Open()
         {
             base.Open();
 
-            _menu = new ApcMenu(this);
-            _menu.OnClose += Close;
-            _menu.OpenCentered();
+            _menu = this.CreateWindow<ApcMenu>();
+            _menu.OnBreaker += BreakerPressed;
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
@@ -36,15 +36,5 @@ public void BreakerPressed()
         {
             SendMessage(new ApcToggleMainBreakerMessage());
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (disposing)
-            {
-                _menu?.Dispose();
-            }
-        }
     }
 }
diff --git a/Content.Client/Power/APC/UI/ApcMenu.xaml.cs b/Content.Client/Power/APC/UI/ApcMenu.xaml.cs
index dbf68ea07b0..2f61ea63a86 100644
--- a/Content.Client/Power/APC/UI/ApcMenu.xaml.cs
+++ b/Content.Client/Power/APC/UI/ApcMenu.xaml.cs
@@ -17,13 +17,19 @@ namespace Content.Client.Power.APC.UI
     [GenerateTypedNameReferences]
     public sealed partial class ApcMenu : FancyWindow
     {
-        public ApcMenu(ApcBoundUserInterface owner)
+        public event Action? OnBreaker;
+
+        public ApcMenu()
         {
             IoCManager.InjectDependencies(this);
             RobustXamlLoader.Load(this);
 
-            EntityView.SetEntity(owner.Owner);
-            BreakerButton.OnPressed += _ => owner.BreakerPressed();
+            BreakerButton.OnPressed += _ => OnBreaker?.Invoke();
+        }
+
+        public void SetEntity(EntityUid entity)
+        {
+            EntityView.SetEntity(entity);
         }
 
         public void UpdateState(BoundUserInterfaceState state)
diff --git a/Content.Client/Power/Generator/GeneratorWindow.xaml.cs b/Content.Client/Power/Generator/GeneratorWindow.xaml.cs
index edd2d7e11b0..161482e0905 100644
--- a/Content.Client/Power/Generator/GeneratorWindow.xaml.cs
+++ b/Content.Client/Power/Generator/GeneratorWindow.xaml.cs
@@ -10,35 +10,39 @@ namespace Content.Client.Power.Generator;
 [GenerateTypedNameReferences]
 public sealed partial class GeneratorWindow : FancyWindow
 {
-    private readonly EntityUid _entity;
-
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly ILocalizationManager _loc = default!;
 
-    private readonly SharedPowerSwitchableSystem _switchable;
-    private readonly FuelGeneratorComponent? _component;
-    private PortableGeneratorComponentBuiState? _lastState;
+    private EntityUid _entity;
+
+    public float? MaximumPower;
+
+    public event Action<int>? OnPower;
+    public event Action<bool>? OnState;
+    public event Action? OnSwitchOutput;
+    public event Action? OnEjectFuel;
 
-    public GeneratorWindow(PortableGeneratorBoundUserInterface bui, EntityUid entity)
+    public GeneratorWindow()
     {
-        _entity = entity;
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
 
-        _entityManager.TryGetComponent(entity, out _component);
-        _switchable = _entityManager.System<SharedPowerSwitchableSystem>();
-
-        EntityView.SetEntity(entity);
         TargetPower.IsValid += IsValid;
         TargetPower.ValueChanged += (args) =>
         {
-            bui.SetTargetPower(args.Value);
+            OnPower?.Invoke(args.Value);
         };
 
-        StartButton.OnPressed += _ => bui.Start();
-        StopButton.OnPressed += _ => bui.Stop();
-        OutputSwitchButton.OnPressed += _ => bui.SwitchOutput();
-        FuelEject.OnPressed += _ => bui.EjectFuel();
+        StartButton.OnPressed += _ => OnState?.Invoke(true);
+        StopButton.OnPressed += _ => OnState?.Invoke(false);
+        OutputSwitchButton.OnPressed += _ => OnSwitchOutput?.Invoke();
+        FuelEject.OnPressed += _ => OnEjectFuel?.Invoke();
+    }
+
+    public void SetEntity(EntityUid entity)
+    {
+        _entity = entity;
+        EntityView.SetEntity(entity);
     }
 
     private bool IsValid(int arg)
@@ -46,7 +50,7 @@ private bool IsValid(int arg)
         if (arg < 0)
             return false;
 
-        if (arg > (_lastState?.MaximumPower / 1000.0f ?? 0))
+        if (arg > (MaximumPower / 1000.0f ?? 0))
             return false;
 
         return true;
@@ -54,16 +58,17 @@ private bool IsValid(int arg)
 
     public void Update(PortableGeneratorComponentBuiState state)
     {
-        if (_component == null)
+        MaximumPower = state.MaximumPower;
+
+        if (!_entityManager.TryGetComponent(_entity, out FuelGeneratorComponent? component))
             return;
 
-        _lastState = state;
         if (!TargetPower.LineEditControl.HasKeyboardFocus())
             TargetPower.OverrideValue((int)(state.TargetPower / 1000.0f));
-        var efficiency = SharedGeneratorSystem.CalcFuelEfficiency(state.TargetPower, state.OptimalPower, _component);
+        var efficiency = SharedGeneratorSystem.CalcFuelEfficiency(state.TargetPower, state.OptimalPower, component);
         Efficiency.Text = efficiency.ToString("P1");
 
-        var burnRate = _component.OptimalBurnRate / efficiency;
+        var burnRate = component.OptimalBurnRate / efficiency;
         var left = state.RemainingFuel / burnRate;
 
         Eta.Text = Loc.GetString(
@@ -103,14 +108,15 @@ public void Update(PortableGeneratorComponentBuiState state)
         }
 
         var canSwitch = _entityManager.TryGetComponent(_entity, out PowerSwitchableComponent? switchable);
+        var switcher = _entityManager.System<SharedPowerSwitchableSystem>();
         OutputSwitchLabel.Visible = canSwitch;
         OutputSwitchButton.Visible = canSwitch;
 
         if (switchable != null)
         {
-            var voltage = _switchable.VoltageString(_switchable.GetVoltage(_entity, switchable));
+            var voltage = switcher.VoltageString(switcher.GetVoltage(_entity, switchable));
             OutputSwitchLabel.Text = Loc.GetString("portable-generator-ui-current-output", ("voltage", voltage));
-            var nextVoltage = _switchable.VoltageString(_switchable.GetNextVoltage(_entity, switchable));
+            var nextVoltage = switcher.VoltageString(switcher.GetNextVoltage(_entity, switchable));
             OutputSwitchButton.Text = Loc.GetString("power-switchable-switch-voltage", ("voltage", nextVoltage));
             OutputSwitchButton.Disabled = state.On;
         }
diff --git a/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs b/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs
index 30679d71fd6..550e1041b62 100644
--- a/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs
+++ b/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Power.Generator;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Power.Generator;
 
@@ -16,10 +17,25 @@ public PortableGeneratorBoundUserInterface(EntityUid owner, Enum uiKey) : base(o
     protected override void Open()
     {
         base.Open();
-        _window = new GeneratorWindow(this, Owner);
+        _window = this.CreateWindow<GeneratorWindow>();
+        _window.SetEntity(Owner);
+        _window.OnState += args =>
+        {
+            if (args)
+            {
+                Start();
+            }
+            else
+            {
+                Stop();
+            }
+        };
+
+        _window.OnPower += SetTargetPower;
+        _window.OnEjectFuel += EjectFuel;
+        _window.OnSwitchOutput += SwitchOutput;
 
         _window.OpenCenteredLeft();
-        _window.OnClose += Close;
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -30,11 +46,6 @@ protected override void UpdateState(BoundUserInterfaceState state)
         _window?.Update(msg);
     }
 
-    protected override void Dispose(bool disposing)
-    {
-       _window?.Dispose();
-    }
-
     public void SetTargetPower(int target)
     {
         SendMessage(new PortableGeneratorSetTargetPowerMessage(target));
diff --git a/Content.Client/Power/PowerMonitoringConsoleBoundUserInterface.cs b/Content.Client/Power/PowerMonitoringConsoleBoundUserInterface.cs
index dc1dcd03ef1..cbc343c06c6 100644
--- a/Content.Client/Power/PowerMonitoringConsoleBoundUserInterface.cs
+++ b/Content.Client/Power/PowerMonitoringConsoleBoundUserInterface.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Power;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Power;
 
@@ -11,9 +12,9 @@ public PowerMonitoringConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : b
 
     protected override void Open()
     {
-        _menu = new PowerMonitoringWindow(this, Owner);
-        _menu.OpenCentered();
-        _menu.OnClose += Close;
+        _menu = this.CreateWindow<PowerMonitoringWindow>();
+        _menu.SetEntity(Owner);
+        _menu.SendPowerMonitoringConsoleMessageAction += SendPowerMonitoringConsoleMessage;
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -22,9 +23,6 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
         var castState = (PowerMonitoringConsoleBoundInterfaceState) state;
 
-        if (castState == null)
-            return;
-
         EntMan.TryGetComponent<TransformComponent>(Owner, out var xform);
         _menu?.ShowEntites
             (castState.TotalSources,
@@ -40,13 +38,4 @@ public void SendPowerMonitoringConsoleMessage(NetEntity? netEntity, PowerMonitor
     {
         SendMessage(new PowerMonitoringConsoleMessage(netEntity, group));
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing)
-            return;
-
-        _menu?.Dispose();
-    }
 }
diff --git a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
index 25a586a75de..0fb49df5344 100644
--- a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
+++ b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
@@ -32,7 +32,7 @@ private void UpdateWindowConsoleEntry
         if (windowEntry == null)
             return;
 
-        // Update sources and loads 
+        // Update sources and loads
         UpdateEntrySourcesOrLoads(masterContainer, windowEntry.SourcesContainer, focusSources, _sourceIcon);
         UpdateEntrySourcesOrLoads(masterContainer, windowEntry.LoadsContainer, focusLoads, _loadIconPath);
 
@@ -133,7 +133,7 @@ private void UpdateEntrySourcesOrLoads(BoxContainer masterContainer, BoxContaine
             subEntry.Button.OnButtonUp += args => { ButtonAction(subEntry, masterContainer); };
         }
 
-        if (!_entManager.TryGetComponent<PowerMonitoringConsoleComponent>(_owner, out var console))
+        if (!_entManager.TryGetComponent<PowerMonitoringConsoleComponent>(Entity, out var console))
             return;
 
         // Update all children
@@ -378,7 +378,7 @@ public PowerMonitoringWindowEntry(PowerMonitoringConsoleEntry entry) : base(entr
 
         AddChild(MainContainer);
 
-        // Grid container to hold the list of sources when selected 
+        // Grid container to hold the list of sources when selected
         SourcesContainer = new BoxContainer()
         {
             Orientation = LayoutOrientation.Vertical,
diff --git a/Content.Client/Power/PowerMonitoringWindow.xaml.cs b/Content.Client/Power/PowerMonitoringWindow.xaml.cs
index 81fe1f4d047..e3043252486 100644
--- a/Content.Client/Power/PowerMonitoringWindow.xaml.cs
+++ b/Content.Client/Power/PowerMonitoringWindow.xaml.cs
@@ -15,13 +15,12 @@ namespace Content.Client.Power;
 [GenerateTypedNameReferences]
 public sealed partial class PowerMonitoringWindow : FancyWindow
 {
-    private readonly IEntityManager _entManager;
+    [Dependency] private IEntityManager _entManager = default!;
     private readonly SpriteSystem _spriteSystem;
-    private readonly IGameTiming _gameTiming;
+    [Dependency] private IGameTiming _gameTiming = default!;
 
     private const float BlinkFrequency = 1f;
 
-    private EntityUid? _owner;
     private NetEntity? _focusEntity;
 
     public event Action<NetEntity?, PowerMonitoringConsoleGroup>? SendPowerMonitoringConsoleMessageAction;
@@ -34,31 +33,56 @@ public sealed partial class PowerMonitoringWindow : FancyWindow
         { PowerMonitoringConsoleGroup.APC, (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_triangle.png")), Color.LimeGreen) },
     };
 
-    public PowerMonitoringWindow(PowerMonitoringConsoleBoundUserInterface userInterface, EntityUid? owner)
+    public EntityUid Entity;
+
+    public PowerMonitoringWindow()
     {
         RobustXamlLoader.Load(this);
-        _entManager = IoCManager.Resolve<IEntityManager>();
-        _gameTiming = IoCManager.Resolve<IGameTiming>();
+        IoCManager.InjectDependencies(this);
 
         _spriteSystem = _entManager.System<SpriteSystem>();
-        _owner = owner;
+
+        // Set trackable entity selected action
+        NavMap.TrackedEntitySelectedAction += SetTrackedEntityFromNavMap;
+
+        // Update nav map
+        NavMap.ForceNavMapUpdate();
+
+        // Set UI tab titles
+        MasterTabContainer.SetTabTitle(0, Loc.GetString("power-monitoring-window-label-sources"));
+        MasterTabContainer.SetTabTitle(1, Loc.GetString("power-monitoring-window-label-smes"));
+        MasterTabContainer.SetTabTitle(2, Loc.GetString("power-monitoring-window-label-substation"));
+        MasterTabContainer.SetTabTitle(3, Loc.GetString("power-monitoring-window-label-apc"));
+
+        // Track when the MasterTabContainer changes its tab
+        MasterTabContainer.OnTabChanged += OnTabChanged;
+
+        // Set UI toggles
+        ShowHVCable.OnToggled += _ => OnShowCableToggled(PowerMonitoringConsoleLineGroup.HighVoltage);
+        ShowMVCable.OnToggled += _ => OnShowCableToggled(PowerMonitoringConsoleLineGroup.MediumVoltage);
+        ShowLVCable.OnToggled += _ => OnShowCableToggled(PowerMonitoringConsoleLineGroup.Apc);
+    }
+
+    public void SetEntity(EntityUid uid)
+    {
+        Entity = uid;
 
         // Pass owner to nav map
-        NavMap.Owner = _owner;
+        NavMap.Owner = uid;
 
         // Set nav map grid uid
         var stationName = Loc.GetString("power-monitoring-window-unknown-location");
 
-        if (_entManager.TryGetComponent<TransformComponent>(owner, out var xform))
+        if (_entManager.TryGetComponent<TransformComponent>(uid, out var xform))
         {
             NavMap.MapUid = xform.GridUid;
 
-            // Assign station name      
+            // Assign station name
             if (_entManager.TryGetComponent<MetaDataComponent>(xform.GridUid, out var stationMetaData))
                 stationName = stationMetaData.EntityName;
 
             var msg = new FormattedMessage();
-            msg.AddMarkup(Loc.GetString("power-monitoring-window-station-name", ("stationName", stationName)));
+            msg.AddMarkupOrThrow(Loc.GetString("power-monitoring-window-station-name", ("stationName", stationName)));
 
             StationName.SetMessage(msg);
         }
@@ -68,29 +92,6 @@ public PowerMonitoringWindow(PowerMonitoringConsoleBoundUserInterface userInterf
             StationName.SetMessage(stationName);
             NavMap.Visible = false;
         }
-
-        // Set trackable entity selected action
-        NavMap.TrackedEntitySelectedAction += SetTrackedEntityFromNavMap;
-
-        // Update nav map
-        NavMap.ForceNavMapUpdate();
-
-        // Set UI tab titles
-        MasterTabContainer.SetTabTitle(0, Loc.GetString("power-monitoring-window-label-sources"));
-        MasterTabContainer.SetTabTitle(1, Loc.GetString("power-monitoring-window-label-smes"));
-        MasterTabContainer.SetTabTitle(2, Loc.GetString("power-monitoring-window-label-substation"));
-        MasterTabContainer.SetTabTitle(3, Loc.GetString("power-monitoring-window-label-apc"));
-
-        // Track when the MasterTabContainer changes its tab
-        MasterTabContainer.OnTabChanged += OnTabChanged;
-
-        // Set UI toggles
-        ShowHVCable.OnToggled += _ => OnShowCableToggled(PowerMonitoringConsoleLineGroup.HighVoltage);
-        ShowMVCable.OnToggled += _ => OnShowCableToggled(PowerMonitoringConsoleLineGroup.MediumVoltage);
-        ShowLVCable.OnToggled += _ => OnShowCableToggled(PowerMonitoringConsoleLineGroup.Apc);
-
-        // Set power monitoring message action
-        SendPowerMonitoringConsoleMessageAction += userInterface.SendPowerMonitoringConsoleMessage;
     }
 
     private void OnTabChanged(int tab)
@@ -113,10 +114,7 @@ public void ShowEntites
         PowerMonitoringConsoleEntry[] focusLoads,
         EntityCoordinates? monitorCoords)
     {
-        if (_owner == null)
-            return;
-
-        if (!_entManager.TryGetComponent<PowerMonitoringConsoleComponent>(_owner.Value, out var console))
+        if (!_entManager.TryGetComponent<PowerMonitoringConsoleComponent>(Entity, out var console))
             return;
 
         // Update power status text
@@ -161,13 +159,13 @@ public void ShowEntites
         }
 
         // Show monitor location
-        var mon = _entManager.GetNetEntity(_owner);
+        var mon = _entManager.GetNetEntity(Entity);
 
-        if (monitorCoords != null && mon != null)
+        if (monitorCoords != null && mon.IsValid())
         {
             var texture = _spriteSystem.Frame0(new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")));
             var blip = new NavMapBlip(monitorCoords.Value, texture, Color.Cyan, true, false);
-            NavMap.TrackedEntities[mon.Value] = blip;
+            NavMap.TrackedEntities[mon] = blip;
         }
 
         // If the entry group doesn't match the current tab, the data is out dated, do not use it
@@ -239,7 +237,7 @@ private void SetTrackedEntityFromNavMap(NetEntity? netEntity)
         if (netEntity == null)
             return;
 
-        if (!_entManager.TryGetComponent<PowerMonitoringConsoleComponent>(_owner, out var console))
+        if (!_entManager.TryGetComponent<PowerMonitoringConsoleComponent>(Entity, out var console))
             return;
 
         if (!console.PowerMonitoringDeviceMetaData.TryGetValue(netEntity.Value, out var metaData))
@@ -266,7 +264,7 @@ protected override void FrameUpdate(FrameEventArgs args)
     {
         AutoScrollToFocus();
 
-        // Warning sign pulse        
+        // Warning sign pulse
         var lit = _gameTiming.RealTime.TotalSeconds % BlinkFrequency > BlinkFrequency / 2f;
         SystemWarningPanel.Modulate = lit ? Color.White : new Color(178, 178, 178);
     }
diff --git a/Content.Client/RCD/RCDMenu.xaml.cs b/Content.Client/RCD/RCDMenu.xaml.cs
index 3eb0397a690..f0d27d6b1fb 100644
--- a/Content.Client/RCD/RCDMenu.xaml.cs
+++ b/Content.Client/RCD/RCDMenu.xaml.cs
@@ -20,31 +20,37 @@ public sealed partial class RCDMenu : RadialMenu
     [Dependency] private readonly IPrototypeManager _protoManager = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
 
-    private readonly SpriteSystem _spriteSystem;
-    private readonly SharedPopupSystem _popup;
+    private SharedPopupSystem _popup;
+    private SpriteSystem _sprites;
 
     public event Action<ProtoId<RCDPrototype>>? SendRCDSystemMessageAction;
 
     private EntityUid _owner;
 
-    public RCDMenu(EntityUid owner, RCDMenuBoundUserInterface bui)
+    public RCDMenu()
     {
         IoCManager.InjectDependencies(this);
         RobustXamlLoader.Load(this);
 
-        _spriteSystem = _entManager.System<SpriteSystem>();
         _popup = _entManager.System<SharedPopupSystem>();
+        _sprites = _entManager.System<SpriteSystem>();
 
-        _owner = owner;
+        OnChildAdded += AddRCDMenuButtonOnClickActions;
+    }
+
+    public void SetEntity(EntityUid uid)
+    {
+        _owner = uid;
+        Refresh();
+    }
 
+    public void Refresh()
+    {
         // Find the main radial container
         var main = FindControl<RadialContainer>("Main");
 
-        if (main == null)
-            return;
-
         // Populate secondary radial containers
-        if (!_entManager.TryGetComponent<RCDComponent>(owner, out var rcd))
+        if (!_entManager.TryGetComponent<RCDComponent>(_owner, out var rcd))
             return;
 
         foreach (var protoId in rcd.AvailablePrototypes)
@@ -56,14 +62,10 @@ public RCDMenu(EntityUid owner, RCDMenuBoundUserInterface bui)
                 continue;
 
             var parent = FindControl<RadialContainer>(proto.Category);
-
-            if (parent == null)
-                continue;
-
             var tooltip = Loc.GetString(proto.SetName);
 
             if ((proto.Mode == RcdMode.ConstructTile || proto.Mode == RcdMode.ConstructObject) &&
-                proto.Prototype != null && _protoManager.TryIndex(proto.Prototype, out var entProto))
+                proto.Prototype != null && _protoManager.TryIndex(proto.Prototype, out var entProto, logError: false))
             {
                 tooltip = Loc.GetString(entProto.Name);
             }
@@ -84,7 +86,7 @@ public RCDMenu(EntityUid owner, RCDMenuBoundUserInterface bui)
                 {
                     VerticalAlignment = VAlignment.Center,
                     HorizontalAlignment = HAlignment.Center,
-                    Texture = _spriteSystem.Frame0(proto.Sprite),
+                    Texture = _sprites.Frame0(proto.Sprite),
                     TextureScale = new Vector2(2f, 2f),
                 };
 
@@ -112,11 +114,9 @@ public RCDMenu(EntityUid owner, RCDMenuBoundUserInterface bui)
 
         // Set up menu actions
         foreach (var child in Children)
+        {
             AddRCDMenuButtonOnClickActions(child);
-
-        OnChildAdded += AddRCDMenuButtonOnClickActions;
-
-        SendRCDSystemMessageAction += bui.SendRCDSystemMessage;
+        }
     }
 
     private static string OopsConcat(string a, string b)
@@ -153,7 +153,7 @@ private void AddRCDMenuButtonOnClickActions(Control control)
                         var name = Loc.GetString(proto.SetName);
 
                         if (proto.Prototype != null &&
-                            _protoManager.TryIndex(proto.Prototype, out var entProto))
+                            _protoManager.TryIndex(proto.Prototype, out var entProto, logError: false))
                             name = entProto.Name;
 
                         msg = Loc.GetString("rcd-component-change-build-mode", ("name", name));
diff --git a/Content.Client/RCD/RCDMenuBoundUserInterface.cs b/Content.Client/RCD/RCDMenuBoundUserInterface.cs
index a37dbcecf8c..1dd03626ae6 100644
--- a/Content.Client/RCD/RCDMenuBoundUserInterface.cs
+++ b/Content.Client/RCD/RCDMenuBoundUserInterface.cs
@@ -3,6 +3,7 @@
 using JetBrains.Annotations;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
+using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.RCD;
@@ -24,8 +25,9 @@ protected override void Open()
     {
         base.Open();
 
-        _menu = new(Owner, this);
-        _menu.OnClose += Close;
+        _menu = this.CreateWindow<RCDMenu>();
+        _menu.SetEntity(Owner);
+        _menu.SendRCDSystemMessageAction += SendRCDSystemMessage;
 
         // Open the menu, centered on the mouse
         var vpSize = _displayManager.ScreenSize;
@@ -34,16 +36,8 @@ protected override void Open()
 
     public void SendRCDSystemMessage(ProtoId<RCDPrototype> protoId)
     {
-        // A predicted message cannot be used here as the RCD UI is closed immediately 
+        // A predicted message cannot be used here as the RCD UI is closed immediately
         // after this message is sent, which will stop the server from receiving it
         SendMessage(new RCDSystemMessage(protoId));
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing) return;
-
-        _menu?.Dispose();
-    }
 }
diff --git a/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs b/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs
index abbb1d58ec4..922715bdadc 100644
--- a/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs
+++ b/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Radio;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Radio.Ui;
 
@@ -19,7 +20,12 @@ protected override void Open()
     {
         base.Open();
 
-        _menu = new();
+        _menu = this.CreateWindow<IntercomMenu>();
+
+        if (EntMan.TryGetComponent(Owner, out IntercomComponent? intercom))
+        {
+            _menu.Update((Owner, intercom));
+        }
 
         _menu.OnMicPressed += enabled =>
         {
@@ -33,26 +39,10 @@ protected override void Open()
         {
             SendMessage(new SelectIntercomChannelMessage(channel));
         };
-
-        _menu.OnClose += Close;
-        _menu.OpenCentered();
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing)
-            return;
-        _menu?.Close();
     }
 
-    protected override void UpdateState(BoundUserInterfaceState state)
+    public void Update(Entity<IntercomComponent> ent)
     {
-        base.UpdateState(state);
-
-        if (state is not IntercomBoundUIState msg)
-            return;
-
-        _menu?.Update(msg);
+        _menu?.Update(ent);
     }
 }
diff --git a/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs b/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs
index da008ca04c9..9641adb5b2d 100644
--- a/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs
+++ b/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Research;
 using Content.Shared.Research.Components;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Research.UI
 {
@@ -17,10 +18,7 @@ protected override void Open()
         {
             base.Open();
 
-            _menu = new();
-
-            _menu.OnClose += Close;
-            _menu.OpenCentered();
+            _menu = this.CreateWindow<DiskConsoleMenu>();
 
             _menu.OnServerButtonPressed += () =>
             {
@@ -32,14 +30,6 @@ protected override void Open()
             };
         }
 
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing)
-                return;
-            _menu?.Close();
-        }
-
         protected override void UpdateState(BoundUserInterfaceState state)
         {
             base.UpdateState(state);
diff --git a/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs b/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs
index 07dd35a0056..288445e4dea 100644
--- a/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs
+++ b/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Research.Components;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Research.UI
 {
@@ -16,10 +17,9 @@ public ResearchClientBoundUserInterface(EntityUid owner, Enum uiKey) : base(owne
         protected override void Open()
         {
             base.Open();
-
-            _menu = new ResearchClientServerSelectionMenu(this);
-            _menu.OnClose += Close;
-            _menu.OpenCentered();
+            _menu = this.CreateWindow<ResearchClientServerSelectionMenu>();
+            _menu.OnServerSelected += SelectServer;
+            _menu.OnServerDeselected += DeselectServer;
         }
 
         public void SelectServer(int serverId)
@@ -38,12 +38,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
             if (state is not ResearchClientBoundInterfaceState rState) return;
             _menu?.Populate(rState.ServerCount, rState.ServerNames, rState.ServerIds, rState.SelectedServerId);
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing) return;
-            _menu?.Dispose();
-        }
     }
 }
diff --git a/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs b/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs
index ceaa965e59f..d10f8b39f48 100644
--- a/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs
+++ b/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs
@@ -13,27 +13,26 @@ public sealed partial class ResearchClientServerSelectionMenu : DefaultWindow
         private int[] _serverIds = Array.Empty<int>();
         private int _selectedServerId = -1;
 
-        private ResearchClientBoundUserInterface Owner { get; }
+        public event Action<int>? OnServerSelected;
+        public event Action? OnServerDeselected;
 
-        public ResearchClientServerSelectionMenu(ResearchClientBoundUserInterface owner)
+        public ResearchClientServerSelectionMenu()
         {
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);
 
-            Owner = owner;
-
             Servers.OnItemSelected += OnItemSelected;
             Servers.OnItemDeselected += OnItemDeselected;
         }
 
         public void OnItemSelected(ItemList.ItemListSelectedEventArgs itemListSelectedEventArgs)
         {
-            Owner.SelectServer(_serverIds[itemListSelectedEventArgs.ItemIndex]);
+            OnServerSelected?.Invoke(_serverIds[itemListSelectedEventArgs.ItemIndex]);
         }
 
         public void OnItemDeselected(ItemList.ItemListDeselectedEventArgs itemListDeselectedEventArgs)
         {
-            Owner.DeselectServer();
+            OnServerDeselected?.Invoke();
         }
 
         public void Populate(int serverCount, string[] serverNames, int[] serverIds, int selectedServerId)
diff --git a/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs
index f29e66baaeb..2895ada61fb 100644
--- a/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs
+++ b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs
@@ -1,6 +1,8 @@
 using Content.Shared.Research.Components;
+using Content.Shared.Research.Prototypes;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Research.UI;
 
@@ -20,7 +22,8 @@ protected override void Open()
 
         var owner = Owner;
 
-        _consoleMenu = new ResearchConsoleMenu(owner);
+        _consoleMenu = this.CreateWindow<ResearchConsoleMenu>();
+        _consoleMenu.SetEntity(owner);
 
         _consoleMenu.OnTechnologyCardPressed += id =>
         {
@@ -31,10 +34,20 @@ protected override void Open()
         {
             SendMessage(new ConsoleServerSelectionMessage());
         };
+    }
+
+    public override void OnProtoReload(PrototypesReloadedEventArgs args)
+    {
+        base.OnProtoReload(args);
+
+        if (!args.WasModified<TechnologyPrototype>())
+            return;
 
-        _consoleMenu.OnClose += Close;
+        if (State is not ResearchConsoleBoundInterfaceState rState)
+            return;
 
-        _consoleMenu.OpenCentered();
+        _consoleMenu?.UpdatePanels(rState);
+        _consoleMenu?.UpdateInformationPanel(rState);
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -46,12 +59,4 @@ protected override void UpdateState(BoundUserInterfaceState state)
         _consoleMenu?.UpdatePanels(castState);
         _consoleMenu?.UpdateInformationPanel(castState);
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing)
-            return;
-        _consoleMenu?.Dispose();
-    }
 }
diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
index b364b833124..d1021f82e56 100644
--- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
+++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
@@ -25,14 +25,13 @@ public sealed partial class ResearchConsoleMenu : FancyWindow
     [Dependency] private readonly IEntityManager _entity = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IPlayerManager _player = default!;
-    private readonly TechnologyDatabaseComponent? _technologyDatabase;
     private readonly ResearchSystem _research;
     private readonly SpriteSystem _sprite;
     private readonly AccessReaderSystem _accessReader;
 
-    public readonly EntityUid Entity;
+    public EntityUid Entity;
 
-    public ResearchConsoleMenu(EntityUid entity)
+    public ResearchConsoleMenu()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
@@ -40,21 +39,23 @@ public ResearchConsoleMenu(EntityUid entity)
         _research = _entity.System<ResearchSystem>();
         _sprite = _entity.System<SpriteSystem>();
         _accessReader = _entity.System<AccessReaderSystem>();
-        Entity = entity;
 
         ServerButton.OnPressed += _ => OnServerButtonPressed?.Invoke();
+    }
 
-        _entity.TryGetComponent(entity, out _technologyDatabase);
+    public void SetEntity(EntityUid entity)
+    {
+        Entity = entity;
     }
 
-    public void  UpdatePanels(ResearchConsoleBoundInterfaceState state)
+    public void UpdatePanels(ResearchConsoleBoundInterfaceState state)
     {
         TechnologyCardsContainer.Children.Clear();
 
         var availableTech = _research.GetAvailableTechnologies(Entity);
         SyncTechnologyList(AvailableCardsContainer, availableTech);
 
-        if (_technologyDatabase == null)
+        if (!_entity.TryGetComponent(Entity, out TechnologyDatabaseComponent? database))
             return;
 
         // i can't figure out the spacing so here you go
@@ -66,7 +67,7 @@ public void  UpdatePanels(ResearchConsoleBoundInterfaceState state)
         var hasAccess = _player.LocalEntity is not { } local ||
                         !_entity.TryGetComponent<AccessReaderComponent>(Entity, out var access) ||
                         _accessReader.IsAllowed(local, Entity, access);
-        foreach (var techId in _technologyDatabase.CurrentTechnologyCards)
+        foreach (var techId in database.CurrentTechnologyCards)
         {
             var tech = _prototype.Index<TechnologyPrototype>(techId);
             var cardControl = new TechnologyCardControl(tech, _prototype, _sprite, _research.GetTechnologyDescription(tech, includeTier: false), state.Points, hasAccess);
@@ -74,7 +75,7 @@ public void  UpdatePanels(ResearchConsoleBoundInterfaceState state)
             TechnologyCardsContainer.AddChild(cardControl);
         }
 
-        var unlockedTech = _technologyDatabase.UnlockedTechnologies.Select(x => _prototype.Index<TechnologyPrototype>(x));
+        var unlockedTech = database.UnlockedTechnologies.Select(x => _prototype.Index<TechnologyPrototype>(x));
         SyncTechnologyList(UnlockedCardsContainer, unlockedTech);
     }
 
@@ -85,14 +86,14 @@ public void UpdateInformationPanel(ResearchConsoleBoundInterfaceState state)
             ("points", state.Points)));
         ResearchAmountLabel.SetMessage(amountMsg);
 
-        if (_technologyDatabase == null)
+        if (!_entity.TryGetComponent(Entity, out TechnologyDatabaseComponent? database))
             return;
 
         var disciplineText = Loc.GetString("research-discipline-none");
         var disciplineColor = Color.Gray;
-        if (_technologyDatabase.MainDiscipline != null)
+        if (database.MainDiscipline != null)
         {
-            var discipline = _prototype.Index<TechDisciplinePrototype>(_technologyDatabase.MainDiscipline);
+            var discipline = _prototype.Index<TechDisciplinePrototype>(database.MainDiscipline);
             disciplineText = Loc.GetString(discipline.Name);
             disciplineColor = discipline.Color;
         }
@@ -103,10 +104,10 @@ public void UpdateInformationPanel(ResearchConsoleBoundInterfaceState state)
         MainDisciplineLabel.SetMessage(msg);
 
         TierDisplayContainer.Children.Clear();
-        foreach (var disciplineId in _technologyDatabase.SupportedDisciplines)
+        foreach (var disciplineId in database.SupportedDisciplines)
         {
             var discipline = _prototype.Index<TechDisciplinePrototype>(disciplineId);
-            var tier = _research.GetHighestDisciplineTier(_technologyDatabase, discipline);
+            var tier = _research.GetHighestDisciplineTier(database, discipline);
 
             // don't show tiers with no available tech
             if (tier == 0)
diff --git a/Content.Client/Robotics/UI/RoboticsConsoleBoundUserInterface.cs b/Content.Client/Robotics/UI/RoboticsConsoleBoundUserInterface.cs
index 6185979eee6..9a5159880f9 100644
--- a/Content.Client/Robotics/UI/RoboticsConsoleBoundUserInterface.cs
+++ b/Content.Client/Robotics/UI/RoboticsConsoleBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Robotics;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Robotics.UI;
 
@@ -16,7 +17,9 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new RoboticsConsoleWindow(Owner);
+        _window = this.CreateWindow<RoboticsConsoleWindow>();
+        _window.SetEntity(Owner);
+
         _window.OnDisablePressed += address =>
         {
             SendMessage(new RoboticsConsoleDisableMessage(address));
@@ -25,9 +28,6 @@ protected override void Open()
         {
             SendMessage(new RoboticsConsoleDestroyMessage(address));
         };
-        _window.OnClose += Close;
-
-        _window.OpenCentered();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -37,14 +37,6 @@ protected override void UpdateState(BoundUserInterfaceState state)
         if (state is not RoboticsConsoleState cast)
             return;
 
-        _window?.UpdateState(cast);
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-
-        if (disposing)
-            _window?.Dispose();
+        _window.UpdateState(cast);
     }
 }
diff --git a/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs b/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs
index 367114f2aa6..87d7e62c392 100644
--- a/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs
+++ b/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs
@@ -23,11 +23,12 @@ public sealed partial class RoboticsConsoleWindow : FancyWindow
     public Action<string>? OnDisablePressed;
     public Action<string>? OnDestroyPressed;
 
-    private Entity<RoboticsConsoleComponent, LockComponent?> _console;
     private string? _selected;
     private Dictionary<string, CyborgControlData> _cyborgs = new();
 
-    public RoboticsConsoleWindow(EntityUid console)
+    public EntityUid Entity;
+
+    public RoboticsConsoleWindow()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
@@ -35,9 +36,6 @@ public RoboticsConsoleWindow(EntityUid console)
         _lock = _entMan.System<LockSystem>();
         _sprite = _entMan.System<SpriteSystem>();
 
-        _console = (console, _entMan.GetComponent<RoboticsConsoleComponent>(console), null);
-        _entMan.TryGetComponent(_console, out _console.Comp2);
-
         Cyborgs.OnItemSelected += args =>
         {
             if (Cyborgs[args.ItemIndex].Metadata is not string address)
@@ -66,6 +64,11 @@ public RoboticsConsoleWindow(EntityUid console)
         DestroyButton.StyleClasses.Add(StyleBase.ButtonCaution);
     }
 
+    public void SetEntity(EntityUid uid)
+    {
+        Entity = uid;
+    }
+
     public void UpdateState(RoboticsConsoleState state)
     {
         _cyborgs = state.Cyborgs;
@@ -81,7 +84,7 @@ public void UpdateState(RoboticsConsoleState state)
 
         PopulateData();
 
-        var locked = _lock.IsLocked((_console, _console.Comp2));
+        var locked = _lock.IsLocked(Entity);
         DangerZone.Visible = !locked;
         LockedMessage.Visible = locked;
     }
@@ -134,14 +137,20 @@ private void PopulateData()
         BorgInfo.SetMessage(text);
 
         // how the turntables
-        DisableButton.Disabled = !data.HasBrain;
-        DestroyButton.Disabled = _timing.CurTime < _console.Comp1.NextDestroy;
+        DisableButton.Disabled = !(data.HasBrain && data.CanDisable);
     }
 
     protected override void FrameUpdate(FrameEventArgs args)
     {
         base.FrameUpdate(args);
 
-        DestroyButton.Disabled = _timing.CurTime < _console.Comp1.NextDestroy;
+        if (_entMan.TryGetComponent(Entity, out RoboticsConsoleComponent? console))
+        {
+            DestroyButton.Disabled = _timing.CurTime < console.NextDestroy;
+        }
+        else
+        {
+            DestroyButton.Disabled = true;
+        }
     }
 }
diff --git a/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs b/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs
index 8f1723d1f22..663bde15b0d 100644
--- a/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs
+++ b/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs
@@ -30,17 +30,9 @@ public SalvageExpeditionConsoleBoundUserInterface(EntityUid owner, Enum uiKey) :
     protected override void Open()
     {
         base.Open();
-        _window = new OfferingWindow();
+        _window = this.CreateWindow<OfferingWindow>();
         _window.Title = Loc.GetString("salvage-expedition-window-title");
-        _window.OnClose += Close;
-        _window?.OpenCenteredLeft();
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        _window?.Dispose();
-        _window = null;
+        _window.OpenCenteredLeft();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
diff --git a/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs b/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs
index 086369aa264..b8b4fb8a746 100644
--- a/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs
+++ b/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Shuttles.Events;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Shuttles.BUI;
 
@@ -20,8 +21,7 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new IFFConsoleWindow();
-        _window.OnClose += Close;
+        _window = this.CreateWindow<IFFConsoleWindow>();
         _window.ShowIFF += SendIFFMessage;
         _window.ShowVessel += SendVesselMessage;
         _window.OpenCenteredLeft();
diff --git a/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs b/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs
index 4bd44a47a8e..f75759b042f 100644
--- a/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs
+++ b/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Shuttles.BUIStates;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using RadarConsoleWindow = Content.Client.Shuttles.UI.RadarConsoleWindow;
 
 namespace Content.Client.Shuttles.BUI;
@@ -20,18 +21,7 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new RadarConsoleWindow();
-        _window.OnClose += Close;
-        _window.OpenCentered();
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (disposing)
-        {
-            _window?.Dispose();
-        }
+        _window = this.CreateWindow<RadarConsoleWindow>();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
diff --git a/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs b/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs
index af7b6055c80..e677181419e 100644
--- a/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs
+++ b/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Shuttles.BUIStates;
 using Content.Shared.Shuttles.Events;
 using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 using Robust.Shared.Map;
 
 namespace Content.Client.Shuttles.BUI;
@@ -19,9 +20,7 @@ public ShuttleConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owne
     protected override void Open()
     {
         base.Open();
-        _window = new ShuttleConsoleWindow();
-        _window.OpenCentered();
-        _window.OnClose += Close;
+        _window = this.CreateWindow<ShuttleConsoleWindow>();
 
         _window.RequestFTL += OnFTLRequest;
         _window.RequestBeaconFTL += OnFTLBeaconRequest;
diff --git a/Content.Client/Silicons/Borgs/BorgBoundUserInterface.cs b/Content.Client/Silicons/Borgs/BorgBoundUserInterface.cs
index 3cc2a35d795..ed9bf40a481 100644
--- a/Content.Client/Silicons/Borgs/BorgBoundUserInterface.cs
+++ b/Content.Client/Silicons/Borgs/BorgBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Silicons.Borgs;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Silicons.Borgs;
 
@@ -18,9 +19,8 @@ protected override void Open()
     {
         base.Open();
 
-        var owner = Owner;
-
-        _menu = new BorgMenu(owner);
+        _menu = this.CreateWindow<BorgMenu>();
+        _menu.SetEntity(Owner);
 
         _menu.BrainButtonPressed += () =>
         {
@@ -41,10 +41,6 @@ protected override void Open()
         {
             SendMessage(new BorgRemoveModuleBuiMessage(EntMan.GetNetEntity(module)));
         };
-
-        _menu.OnClose += Close;
-
-        _menu.OpenCentered();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -55,12 +51,4 @@ protected override void UpdateState(BoundUserInterfaceState state)
             return;
         _menu?.UpdateState(msg);
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing)
-            return;
-        _menu?.Dispose();
-    }
 }
diff --git a/Content.Client/Silicons/Borgs/BorgMenu.xaml b/Content.Client/Silicons/Borgs/BorgMenu.xaml
index 7d8fd9fe57d..4cc2e41a8fb 100644
--- a/Content.Client/Silicons/Borgs/BorgMenu.xaml
+++ b/Content.Client/Silicons/Borgs/BorgMenu.xaml
@@ -10,7 +10,7 @@
                   VerticalExpand="True">
         <BoxContainer Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True" Margin="15 10 15 15">
             <BoxContainer Orientation="Horizontal">
-                <ProgressBar Name="ChargeBar" Access="Public" HorizontalExpand="True" MinValue="0" MaxValue="1">
+                <ProgressBar Name="ChargeBar" Access="Public" HorizontalExpand="True" MinValue="0" Value="1" MaxValue="1">
                     <Label Name="ChargeLabel" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5 0 0 0"/>
                 </ProgressBar>
                 <Control MinWidth="5"/>
diff --git a/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs b/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs
index 046d8e299fe..08f15d9de22 100644
--- a/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs
+++ b/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs
@@ -21,24 +21,33 @@ public sealed partial class BorgMenu : FancyWindow
     public Action<string>? NameChanged;
     public Action<EntityUid>? RemoveModuleButtonPressed;
 
-    private readonly BorgChassisComponent? _chassis;
-    public readonly EntityUid Entity;
     public float AccumulatedTime;
     private string _lastValidName;
+    private List<EntityUid> _modules = new();
 
-    public BorgMenu(EntityUid entity)
+    public EntityUid Entity;
+
+    public BorgMenu()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
 
-        Entity = entity;
+        _lastValidName = NameLineEdit.Text;
 
-        if (_entity.TryGetComponent<BorgChassisComponent>(Entity, out var chassis))
-            _chassis = chassis;
+        EjectBatteryButton.OnPressed += _ => EjectBatteryButtonPressed?.Invoke();
+        BrainButton.OnPressed += _ => BrainButtonPressed?.Invoke();
 
+        NameLineEdit.OnTextChanged += OnNameChanged;
+        NameLineEdit.OnTextEntered += OnNameEntered;
+        NameLineEdit.OnFocusExit += OnNameFocusExit;
+
+        UpdateBrainButton();
+    }
+
+    public void SetEntity(EntityUid entity)
+    {
+        Entity = entity;
         BorgSprite.SetEntity(entity);
-        ChargeBar.MaxValue = 1f;
-        ChargeBar.Value = 1f;
 
         if (_entity.TryGetComponent<NameIdentifierComponent>(Entity, out var nameIdentifierComponent))
         {
@@ -54,17 +63,6 @@ public BorgMenu(EntityUid entity)
             NameIdentifierLabel.Visible = false;
             NameLineEdit.Text = _entity.GetComponent<MetaDataComponent>(Entity).EntityName;
         }
-
-        _lastValidName = NameLineEdit.Text;
-
-        EjectBatteryButton.OnPressed += _ => EjectBatteryButtonPressed?.Invoke();
-        BrainButton.OnPressed += _ => BrainButtonPressed?.Invoke();
-
-        NameLineEdit.OnTextChanged += OnNameChanged;
-        NameLineEdit.OnTextEntered += OnNameEntered;
-        NameLineEdit.OnFocusExit += OnNameFocusExit;
-
-        UpdateBrainButton();
     }
 
     protected override void FrameUpdate(FrameEventArgs args)
@@ -88,7 +86,7 @@ public void UpdateState(BorgBuiState state)
 
     private void UpdateBrainButton()
     {
-        if (_chassis?.BrainEntity is { } brain)
+        if (_entity.TryGetComponent(Entity, out BorgChassisComponent? chassis) && chassis.BrainEntity is { } brain)
         {
             BrainButton.Text = _entity.GetComponent<MetaDataComponent>(brain).EntityName;
             BrainView.Visible = true;
@@ -107,15 +105,31 @@ private void UpdateBrainButton()
 
     private void UpdateModulePanel()
     {
-        if (_chassis == null)
+        if (!_entity.TryGetComponent(Entity, out BorgChassisComponent? chassis))
             return;
 
         ModuleCounter.Text = Loc.GetString("borg-ui-module-counter",
-            ("actual", _chassis.ModuleCount),
-            ("max", _chassis.MaxModules));
+            ("actual", chassis.ModuleCount),
+            ("max", chassis.MaxModules));
+
+        if (chassis.ModuleContainer.Count == _modules.Count)
+        {
+            var isSame = true;
+            foreach (var module in chassis.ModuleContainer.ContainedEntities)
+            {
+                if (_modules.Contains(module))
+                    continue;
+                isSame = false;
+                break;
+            }
+
+            if (isSame)
+                return;
+        }
 
         ModuleContainer.Children.Clear();
-        foreach (var module in _chassis.ModuleContainer.ContainedEntities)
+        _modules.Clear();
+        foreach (var module in chassis.ModuleContainer.ContainedEntities)
         {
             var control = new BorgModuleControl(module, _entity);
             control.RemoveButtonPressed += () =>
diff --git a/Content.Client/Silicons/Laws/Ui/SiliconLawBoundUserInterface.cs b/Content.Client/Silicons/Laws/Ui/SiliconLawBoundUserInterface.cs
index 2aee0a38c0f..93349794b82 100644
--- a/Content.Client/Silicons/Laws/Ui/SiliconLawBoundUserInterface.cs
+++ b/Content.Client/Silicons/Laws/Ui/SiliconLawBoundUserInterface.cs
@@ -1,6 +1,6 @@
 using Content.Shared.Silicons.Laws.Components;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Silicons.Laws.Ui;
 
@@ -20,18 +20,7 @@ protected override void Open()
     {
         base.Open();
 
-        _menu = new();
-
-        _menu.OnClose += Close;
-        _menu.OpenCentered();
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing)
-            return;
-        _menu?.Close();
+        _menu = this.CreateWindow<SiliconLawMenu>();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
diff --git a/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs b/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs
index e8442d23908..7d6a6cf2a5a 100644
--- a/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs
+++ b/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs
@@ -1,6 +1,6 @@
 using Content.Shared.SprayPainter;
 using Content.Shared.SprayPainter.Components;
-using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 
 namespace Content.Client.SprayPainter.UI;
@@ -10,9 +10,6 @@ public sealed class SprayPainterBoundUserInterface : BoundUserInterface
     [ViewVariables]
     private SprayPainterWindow? _window;
 
-    [ViewVariables]
-    private SprayPainterSystem? _painter;
-
     public SprayPainterBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
     {
     }
@@ -21,27 +18,15 @@ protected override void Open()
     {
         base.Open();
 
-        if (!EntMan.TryGetComponent<SprayPainterComponent>(Owner, out var comp))
-            return;
-
-        _window = new SprayPainterWindow();
+        _window = this.CreateWindow<SprayPainterWindow>();
 
-        _painter = EntMan.System<SprayPainterSystem>();
-
-        _window.OnClose += Close;
         _window.OnSpritePicked = OnSpritePicked;
         _window.OnColorPicked = OnColorPicked;
 
-        _window.Populate(_painter.Entries, comp.Index, comp.PickedColor, comp.ColorPalette);
-
-        _window.OpenCentered();
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-
-        _window?.Dispose();
+        if (EntMan.TryGetComponent(Owner, out SprayPainterComponent? comp))
+        {
+            _window.Populate(EntMan.System<SprayPainterSystem>().Entries, comp.Index, comp.PickedColor, comp.ColorPalette);
+        }
     }
 
     private void OnSpritePicked(ItemList.ItemListSelectedEventArgs args)
diff --git a/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs b/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs
index 720a2efb9dd..e7bab71e38e 100644
--- a/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs
+++ b/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs
@@ -1,4 +1,5 @@
 using Content.Shared.StationRecords;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.StationRecords;
 
@@ -15,15 +16,12 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new();
+        _window = this.CreateWindow<GeneralStationRecordConsoleWindow>();
         _window.OnKeySelected += key =>
             SendMessage(new SelectStationRecord(key));
         _window.OnFiltersChanged += (type, filterValue) =>
             SendMessage(new SetStationRecordFilter(type, filterValue));
         _window.OnDeleted += id => SendMessage(new DeleteStationRecord(id));
-        _window.OnClose += Close;
-
-        _window.OpenCentered();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -35,11 +33,4 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
         _window?.UpdateState(cast);
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-
-        _window?.Close();
-    }
 }
diff --git a/Content.Client/Store/Ui/StoreBoundUserInterface.cs b/Content.Client/Store/Ui/StoreBoundUserInterface.cs
index 88ad0e3de8b..5eb5507f678 100644
--- a/Content.Client/Store/Ui/StoreBoundUserInterface.cs
+++ b/Content.Client/Store/Ui/StoreBoundUserInterface.cs
@@ -1,6 +1,8 @@
 using Content.Shared.Store;
 using JetBrains.Annotations;
 using System.Linq;
+using Content.Shared.Store.Components;
+using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.Store.Ui;
@@ -28,10 +30,9 @@ public StoreBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
 
     protected override void Open()
     {
-        _menu = new StoreMenu(_windowName);
-
-        _menu.OpenCentered();
-        _menu.OnClose += Close;
+        _menu = this.CreateWindow<StoreMenu>();
+        if (EntMan.TryGetComponent<StoreComponent>(Owner, out var store))
+            _menu.Title = Loc.GetString(store.Name);
 
         _menu.OnListingButtonPressed += (_, listing) =>
         {
@@ -87,15 +88,6 @@ protected override void UpdateState(BoundUserInterfaceState state)
         }
     }
 
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing)
-            return;
-        _menu?.Close();
-        _menu?.Dispose();
-    }
-
     private void UpdateListingsWithSearchFilter()
     {
         if (_menu == null)
diff --git a/Content.Client/Strip/StrippingMenu.cs b/Content.Client/Strip/StrippingMenu.cs
index eea867b7948..1c46b4be35c 100644
--- a/Content.Client/Strip/StrippingMenu.cs
+++ b/Content.Client/Strip/StrippingMenu.cs
@@ -1,4 +1,3 @@
-using Content.Client.Inventory;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Timing;
@@ -11,14 +10,12 @@ public sealed class StrippingMenu : DefaultWindow
         public LayoutContainer InventoryContainer = new();
         public BoxContainer HandsContainer = new() { Orientation = LayoutOrientation.Horizontal };
         public BoxContainer SnareContainer = new();
-        private StrippableBoundUserInterface _bui;
         public bool Dirty = true;
 
-        public StrippingMenu(string title, StrippableBoundUserInterface bui)
-        {
-            Title = title;
-            _bui = bui;
+        public event Action? OnDirty;
 
+        public StrippingMenu()
+        {
             var box = new BoxContainer() { Orientation = LayoutOrientation.Vertical, Margin = new Thickness(0, 8) };
             Contents.AddChild(box);
             box.AddChild(SnareContainer);
@@ -39,7 +36,7 @@ protected override void FrameUpdate(FrameEventArgs args)
                 return;
 
             Dirty = false;
-            _bui.UpdateMenu();
+            OnDirty?.Invoke();
         }
     }
 }
diff --git a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs
index 9132dd6ed5f..e3646c00cc3 100644
--- a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs
+++ b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs
@@ -1,6 +1,7 @@
 using Content.Client.Eye;
 using Content.Shared.SurveillanceCamera;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.SurveillanceCamera.UI;
 
@@ -25,20 +26,12 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new SurveillanceCameraMonitorWindow();
-
-        if (State != null)
-        {
-            UpdateState(State);
-        }
-
-        _window.OpenCentered();
+        _window = this.CreateWindow<SurveillanceCameraMonitorWindow>();
 
         _window.CameraSelected += OnCameraSelected;
         _window.SubnetOpened += OnSubnetRequest;
         _window.CameraRefresh += OnCameraRefresh;
         _window.SubnetRefresh += OnSubnetRefresh;
-        _window.OnClose += Close;
         _window.CameraSwitchTimer += OnCameraSwitchTimer;
         _window.CameraDisconnect += OnCameraDisconnect;
     }
diff --git a/Content.Client/Thief/ThiefBackpackBoundUserInterface.cs b/Content.Client/Thief/ThiefBackpackBoundUserInterface.cs
index 37384daafef..0631d98993a 100644
--- a/Content.Client/Thief/ThiefBackpackBoundUserInterface.cs
+++ b/Content.Client/Thief/ThiefBackpackBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Thief;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Thief;
 
@@ -15,21 +16,9 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new ThiefBackpackMenu(this);
-        _window.OnClose += Close;
-        _window.OpenCentered();
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing)
-            return;
-
-        if (_window != null)
-            _window.OnClose -= Close;
-
-        _window?.Dispose();
+        _window = this.CreateWindow<ThiefBackpackMenu>();
+        _window.OnApprove += SendApprove;
+        _window.OnSetChange += SendChangeSelected;
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
diff --git a/Content.Client/Thief/ThiefBackpackMenu.xaml.cs b/Content.Client/Thief/ThiefBackpackMenu.xaml.cs
index b2314cf3fe2..d9be1a6305a 100644
--- a/Content.Client/Thief/ThiefBackpackMenu.xaml.cs
+++ b/Content.Client/Thief/ThiefBackpackMenu.xaml.cs
@@ -12,45 +12,41 @@ public sealed partial class ThiefBackpackMenu : FancyWindow
     [Dependency] private readonly IEntitySystemManager _sysMan = default!;
     private readonly SpriteSystem _spriteSystem;
 
-    private readonly ThiefBackpackBoundUserInterface _owner;
+    public event Action? OnApprove;
+    public event Action<int>? OnSetChange;
 
-    public ThiefBackpackMenu(ThiefBackpackBoundUserInterface owner)
+    public ThiefBackpackMenu()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
         _spriteSystem = _sysMan.GetEntitySystem<SpriteSystem>();
 
-        _owner = owner;
-
-        ApproveButton.OnButtonDown += (args) =>
+        ApproveButton.OnPressed += args =>
         {
-            _owner.SendApprove();
+            OnApprove?.Invoke();
         };
     }
 
     public void UpdateState(ThiefBackpackBoundUserInterfaceState state)
     {
-        SetsGrid.RemoveAllChildren();
-        int count = 0;
-        int selectedNumber = 0;
-        foreach (var set in state.Sets)
+        SetsGrid.DisposeAllChildren();
+        var selectedNumber = 0;
+        foreach (var (set, info) in state.Sets)
         {
-            var child = new ThiefBackpackSet(set.Value, _spriteSystem);
+            var child = new ThiefBackpackSet(info, _spriteSystem);
 
             child.SetButton.OnButtonDown += (args) =>
             {
-                _owner.SendChangeSelected(set.Key);
+                OnSetChange?.Invoke(set);
             };
 
             SetsGrid.AddChild(child);
 
-            count++;
-
-            if (set.Value.Selected)
+            if (info.Selected)
                 selectedNumber++;
         }
 
         SelectedSets.Text = Loc.GetString("thief-backpack-window-selected", ("selectedCount", selectedNumber), ("maxCount", state.MaxSelectedSets));
-        ApproveButton.Disabled = selectedNumber == state.MaxSelectedSets ? false : true;
+        ApproveButton.Disabled = selectedNumber != state.MaxSelectedSets;
     }
 }
diff --git a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankBoundUserInterface.cs b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankBoundUserInterface.cs
index ee8cb28d2cc..4ae74a5d65e 100644
--- a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankBoundUserInterface.cs
+++ b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Atmos.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.UserInterface.Systems.Atmos.GasTank
 {
@@ -14,7 +15,7 @@ public GasTankBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKe
         {
         }
 
-        public void SetOutputPressure(in float value)
+        public void SetOutputPressure(float value)
         {
             SendMessage(new GasTankSetPressureMessage
             {
@@ -30,9 +31,10 @@ public void ToggleInternals()
         protected override void Open()
         {
             base.Open();
-            _window = new GasTankWindow(this);
-            _window.OnClose += Close;
-            _window.OpenCentered();
+            _window = this.CreateWindow<GasTankWindow>();
+            _window.SetTitle(EntMan.GetComponent<MetaDataComponent>(Owner).EntityName);
+            _window.OnOutputPressure += SetOutputPressure;
+            _window.OnToggleInternals += ToggleInternals;
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
diff --git a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs
index 7797a096de3..bf0e93b36c8 100644
--- a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs
+++ b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs
@@ -10,39 +10,39 @@
 using Robust.Client.UserInterface.CustomControls;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
 
-namespace Content.Client.UserInterface.Systems.Atmos.GasTank
+namespace Content.Client.UserInterface.Systems.Atmos.GasTank;
+
+public sealed class GasTankWindow
+    : BaseWindow
 {
-    public sealed class GasTankWindow
-        : BaseWindow
-    {
-        private GasTankBoundUserInterface _owner;
-        private readonly Label _lblName;
-        private readonly BoxContainer _topContainer;
-        private readonly Control _contentContainer;
+    [Dependency] private readonly IResourceCache _cache = default!;
 
+    private readonly RichTextLabel _lblPressure;
+    private readonly FloatSpinBox _spbPressure;
+    private readonly RichTextLabel _lblInternals;
+    private readonly Button _btnInternals;
+    private readonly Label _topLabel;
 
-        private readonly IResourceCache _resourceCache = default!;
-        private readonly RichTextLabel _lblPressure;
-        private readonly FloatSpinBox _spbPressure;
-        private readonly RichTextLabel _lblInternals;
-        private readonly Button _btnInternals;
+    public event Action<float>? OnOutputPressure;
+    public event Action? OnToggleInternals;
 
-        public GasTankWindow(GasTankBoundUserInterface owner)
-        {
-            TextureButton btnClose;
-            _resourceCache = IoCManager.Resolve<IResourceCache>();
-            _owner = owner;
-            var rootContainer = new LayoutContainer {Name = "GasTankRoot"};
-            AddChild(rootContainer);
+    public GasTankWindow()
+    {
+        IoCManager.InjectDependencies(this);
+        Control contentContainer;
+        BoxContainer topContainer;
+        TextureButton btnClose;
+        var rootContainer = new LayoutContainer { Name = "GasTankRoot" };
+        AddChild(rootContainer);
 
             MouseFilter = MouseFilterMode.Stop;
 
-            var panelTex = _resourceCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png");
-            var back = new StyleBoxTexture
-            {
-                Texture = panelTex,
-                Modulate = Color.FromHex("#25252A"),
-            };
+        var panelTex = _cache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png");
+        var back = new StyleBoxTexture
+        {
+            Texture = panelTex,
+            Modulate = Color.FromHex("#25252A"),
+        };
 
             back.SetPatchMargin(StyleBox.Margin.All, 10);
 
@@ -84,31 +84,32 @@ public GasTankWindow(GasTankBoundUserInterface owner)
 
             LayoutContainer.SetAnchorPreset(topContainerWrap, LayoutContainer.LayoutPreset.Wide);
 
-            var font = _resourceCache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13);
+        var font = _cache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13);
 
-            var topRow = new BoxContainer
+        _topLabel = new Label
+        {
+            FontOverride = font,
+            FontColorOverride = StyleNano.NanoGold,
+            VerticalAlignment = VAlignment.Center,
+            HorizontalExpand = true,
+            HorizontalAlignment = HAlignment.Left,
+            Margin = new Thickness(0, 0, 20, 0),
+        };
+
+        var topRow = new BoxContainer
+        {
+            Orientation = LayoutOrientation.Horizontal,
+            Margin = new Thickness(4, 2, 12, 2),
+            Children =
             {
-                Orientation = LayoutOrientation.Horizontal,
-                Margin = new Thickness(4, 2, 12, 2),
-                Children =
+                _topLabel,
+                (btnClose = new TextureButton
                 {
-                    (_lblName = new Label
-                    {
-                        Text = Loc.GetString("gas-tank-window-label"),
-                        FontOverride = font,
-                        FontColorOverride = StyleNano.NanoGold,
-                        VerticalAlignment = VAlignment.Center,
-                        HorizontalExpand = true,
-                        HorizontalAlignment = HAlignment.Left,
-                        Margin = new Thickness(0, 0, 20, 0),
-                    }),
-                    (btnClose = new TextureButton
-                    {
-                        StyleClasses = {DefaultWindow.StyleClassWindowCloseButton},
-                        VerticalAlignment = VAlignment.Center
-                    })
-                }
-            };
+                    StyleClasses = {DefaultWindow.StyleClassWindowCloseButton},
+                    VerticalAlignment = VAlignment.Center
+                })
+            }
+        };
 
             var middle = new PanelContainer
             {
@@ -171,19 +172,24 @@ public GasTankWindow(GasTankBoundUserInterface owner)
             };
             _contentContainer.AddChild(_spbPressure);
 
-            // Handlers
-            _spbPressure.OnValueChanged += args =>
-            {
-                _owner.SetOutputPressure(args.Value);
-            };
+        // Handlers
+        _spbPressure.OnValueChanged += args =>
+        {
+            OnOutputPressure?.Invoke(args.Value);
+        };
 
-            _btnInternals.OnPressed += args =>
-            {
-                _owner.ToggleInternals();
-            };
+        _btnInternals.OnPressed += args =>
+        {
+            OnToggleInternals?.Invoke();
+        };
 
-            btnClose.OnPressed += _ => Close();
-        }
+        btnClose.OnPressed += _ => Close();
+    }
+
+    public void SetTitle(string name)
+    {
+        _topLabel.Text = name;
+    }
 
         public void UpdateState(GasTankBoundUserInterfaceState state)
         {
diff --git a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs
index 17ddba77ffc..eafab84ed63 100644
--- a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs
+++ b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.VendingMachines;
 using Robust.Client.UserInterface.Controls;
 using System.Linq;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.VendingMachines
 {
@@ -28,15 +29,14 @@ protected override void Open()
 
             _cachedInventory = vendingMachineSys.GetAllInventory(Owner);
 
-            _menu = new VendingMachineMenu { Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName };
+            _menu = this.CreateWindow<VendingMachineMenu>();
+            _menu.OpenCenteredLeft();
+            _menu.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
 
-            _menu.OnClose += Close;
             _menu.OnItemSelected += OnItemSelected;
             _menu.OnSearchChanged += OnSearchChanged;
 
             _menu.Populate(_cachedInventory, out _cachedFilteredIndex);
-
-            _menu.OpenCenteredLeft();
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
diff --git a/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs b/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
index f700c6663b9..891804674d3 100644
--- a/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
+++ b/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
@@ -1,12 +1,13 @@
 using Content.Shared.VoiceMask;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.VoiceMask;
 
 public sealed class VoiceMaskBoundUserInterface : BoundUserInterface
 {
-    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly IPrototypeManager _protomanager = default!;
 
     [ViewVariables]
     private VoiceMaskNameChangeWindow? _window;
@@ -19,12 +20,11 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new(_proto);
+        _window = this.CreateWindow<VoiceMaskNameChangeWindow>();
+        _window.ReloadVerbs(_protomanager);
 
-        _window.OpenCentered();
         _window.OnNameChange += OnNameSelected;
         _window.OnVerbChange += verb => SendMessage(new VoiceMaskChangeVerbMessage(verb));
-        _window.OnClose += Close;
     }
 
     private void OnNameSelected(string name)
diff --git a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
index 16a28f9d9b3..0dc41f807ab 100644
--- a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
+++ b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
@@ -17,7 +17,7 @@ public sealed partial class VoiceMaskNameChangeWindow : FancyWindow
 
     private string? _verb;
 
-    public VoiceMaskNameChangeWindow(IPrototypeManager proto)
+    public VoiceMaskNameChangeWindow()
     {
         RobustXamlLoader.Load(this);
 
@@ -32,12 +32,10 @@ public VoiceMaskNameChangeWindow(IPrototypeManager proto)
             SpeechVerbSelector.SelectId(args.Id);
         };
 
-        ReloadVerbs(proto);
-
         AddVerbs();
     }
 
-    private void ReloadVerbs(IPrototypeManager proto)
+    public void ReloadVerbs(IPrototypeManager proto)
     {
         foreach (var verb in proto.EnumeratePrototypes<SpeechVerbPrototype>())
         {
diff --git a/Content.Client/Weapons/Melee/UI/MeleeSpeechBoundUserInterface.cs b/Content.Client/Weapons/Melee/UI/MeleeSpeechBoundUserInterface.cs
index f3e0c0a539a..3f01808c422 100644
--- a/Content.Client/Weapons/Melee/UI/MeleeSpeechBoundUserInterface.cs
+++ b/Content.Client/Weapons/Melee/UI/MeleeSpeechBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using Robust.Client.GameObjects;
 using Content.Shared.Speech.Components;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Weapons.Melee.UI;
 
@@ -19,17 +20,10 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new MeleeSpeechWindow();
-        if (State != null)
-            UpdateState(State);
-
-        _window.OpenCentered();
-
-        _window.OnClose += Close;
+        _window = this.CreateWindow<MeleeSpeechWindow>();
         _window.OnBattlecryEntered += OnBattlecryChanged;
     }
 
-
     private void OnBattlecryChanged(string newBattlecry)
     {
         SendMessage(new MeleeSpeechBattlecryChangedMessage(newBattlecry));
diff --git a/Content.Client/Wires/UI/WiresBoundUserInterface.cs b/Content.Client/Wires/UI/WiresBoundUserInterface.cs
index 5a8869a204e..edf1a2d3770 100644
--- a/Content.Client/Wires/UI/WiresBoundUserInterface.cs
+++ b/Content.Client/Wires/UI/WiresBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Wires;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Wires.UI
 {
@@ -15,10 +16,8 @@ public WiresBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
         protected override void Open()
         {
             base.Open();
-
-            _menu = new WiresMenu(this);
-            _menu.OnClose += Close;
-            _menu.OpenCenteredLeft();
+            _menu = this.CreateWindow<WiresMenu>();
+            _menu.OnAction += PerformAction;
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
diff --git a/Content.Client/Wires/UI/WiresMenu.cs b/Content.Client/Wires/UI/WiresMenu.cs
index 7bccc208616..eccc548297c 100644
--- a/Content.Client/Wires/UI/WiresMenu.cs
+++ b/Content.Client/Wires/UI/WiresMenu.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Numerics;
 using Content.Client.Examine;
 using Content.Client.Resources;
@@ -12,10 +11,6 @@
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Animations;
 using Robust.Shared.Input;
-using Robust.Shared.IoC;
-using Robust.Shared.Localization;
-using Robust.Shared.Maths;
-using Robust.Shared.Random;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Wires.UI
@@ -24,8 +19,6 @@ public sealed class WiresMenu : BaseWindow
     {
         [Dependency] private readonly IResourceCache _resourceCache = default!;
 
-        public WiresBoundUserInterface Owner { get; }
-
         private readonly Control _wiresHBox;
         private readonly Control _topContainer;
         private readonly Control _statusContainer;
@@ -35,11 +28,12 @@ public sealed class WiresMenu : BaseWindow
 
         public TextureButton CloseButton { get; set; }
 
-        public WiresMenu(WiresBoundUserInterface owner)
+        public event Action<int, WiresAction>? OnAction;
+
+        public WiresMenu()
         {
             IoCManager.InjectDependencies(this);
 
-            Owner = owner;
             var rootContainer = new LayoutContainer {Name = "WireRoot"};
             AddChild(rootContainer);
 
@@ -257,12 +251,12 @@ public void Populate(WiresBoundUserInterfaceState state)
 
                 control.WireClicked += () =>
                 {
-                    Owner.PerformAction(wire.Id, wire.IsCut ? WiresAction.Mend : WiresAction.Cut);
+                    OnAction?.Invoke(wire.Id, wire.IsCut ? WiresAction.Mend : WiresAction.Cut);
                 };
 
                 control.ContactsClicked += () =>
                 {
-                    Owner.PerformAction(wire.Id, WiresAction.Pulse);
+                    OnAction?.Invoke(wire.Id, WiresAction.Pulse);
                 };
             }
 
diff --git a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs
index 2538caf6eb8..c7a74815b6b 100644
--- a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs
+++ b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Xenoarchaeology.Equipment;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Xenoarchaeology.Ui;
 
@@ -18,10 +19,7 @@ protected override void Open()
     {
         base.Open();
 
-        _consoleMenu = new AnalysisConsoleMenu();
-
-        _consoleMenu.OnClose += Close;
-        _consoleMenu.OpenCentered();
+        _consoleMenu = this.CreateWindow<AnalysisConsoleMenu>();
 
         _consoleMenu.OnServerSelectionButtonPressed += () =>
         {

From c7ef8b46a6e671d1134e5eb3b3735bd9597dea7c Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 02:44:20 -0400
Subject: [PATCH 023/366] Use station name

---
 .../Pinpointer/UI/StationMapBoundUserInterface.cs   | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs b/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs
index 7417fafede5..4421f8ec08e 100644
--- a/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs
+++ b/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs
@@ -17,12 +17,19 @@ protected override void Open()
         EntityUid? gridUid = null;
 
         if (EntMan.TryGetComponent<TransformComponent>(Owner, out var xform))
-        {
             gridUid = xform.GridUid;
-        }
 
         _window = this.CreateWindow<StationMapWindow>();
         _window.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
-        _window.Set(gridUid, Owner);
+
+        string stationName = string.Empty;
+
+        if(EntMan.TryGetComponent<MetaDataComponent>(gridUid, out var gridMetaData))
+            stationName = gridMetaData.EntityName;
+        
+        if (EntMan.TryGetComponent<StationMapComponent>(Owner, out var comp) && comp.ShowLocation)
+            _window.Set(stationName, gridUid, Owner);
+        else
+            _window.Set(stationName, gridUid, null);
     }
 }

From 230d0101e91d1cfcd1a13eaa15fa03a463dfd4b6 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 02:49:22 -0400
Subject: [PATCH 024/366] Silly.

---
 .../Weapons/Reflect/ReflectSystem.cs          | 85 +++----------------
 1 file changed, 10 insertions(+), 75 deletions(-)

diff --git a/Content.Shared/Weapons/Reflect/ReflectSystem.cs b/Content.Shared/Weapons/Reflect/ReflectSystem.cs
index 7f20974a144..881b547f27f 100644
--- a/Content.Shared/Weapons/Reflect/ReflectSystem.cs
+++ b/Content.Shared/Weapons/Reflect/ReflectSystem.cs
@@ -3,9 +3,7 @@
 using Content.Shared.Administration.Logs;
 using Content.Shared.Alert;
 using Content.Shared.Audio;
-using Content.Shared.Damage.Components;
 using Content.Shared.Database;
-using Content.Shared.Gravity;
 using Content.Shared.Hands;
 using Content.Shared.Inventory;
 using Content.Shared.Inventory.Events;
@@ -13,11 +11,9 @@
 using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.Popups;
 using Content.Shared.Projectiles;
-using Content.Shared.Standing;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
-using Content.Shared.WhiteDream.BloodCult.BloodCultist;
-using Content.Shared.WhiteDream.BloodCult.Items;
+using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Network;
 using Robust.Shared.Physics.Components;
@@ -42,12 +38,6 @@ public sealed class ReflectSystem : EntitySystem
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly InventorySystem _inventorySystem = default!;
-    [Dependency] private readonly SharedGravitySystem _gravity = default!;
-    [Dependency] private readonly StandingStateSystem _standing = default!;
-    [Dependency] private readonly AlertsSystem _alerts = default!;
-
-    [ValidatePrototypeId<AlertPrototype>]
-    private const string DeflectingAlert = "Deflecting";
 
     public override void Initialize()
     {
@@ -70,7 +60,7 @@ private void OnReflectUserHitscan(EntityUid uid, ReflectUserComponent component,
         if (args.Reflected)
             return;
 
-        foreach (var ent in _inventorySystem.GetHandOrInventoryEntities(uid, SlotFlags.WITHOUT_POCKET))
+        foreach (var ent in _inventorySystem.GetHandOrInventoryEntities(uid, SlotFlags.All & ~SlotFlags.POCKET))
         {
             if (!TryReflectHitscan(uid, ent, args.Shooter, args.SourceItem, args.Direction, out var dir))
                 continue;
@@ -83,7 +73,7 @@ private void OnReflectUserHitscan(EntityUid uid, ReflectUserComponent component,
 
     private void OnReflectUserCollide(EntityUid uid, ReflectUserComponent component, ref ProjectileReflectAttemptEvent args)
     {
-        foreach (var ent in _inventorySystem.GetHandOrInventoryEntities(uid, SlotFlags.WITHOUT_POCKET))
+        foreach (var ent in _inventorySystem.GetHandOrInventoryEntities(uid, SlotFlags.All & ~SlotFlags.POCKET))
         {
             if (!TryReflectProjectile(uid, ent, args.ProjUid))
                 continue;
@@ -104,23 +94,15 @@ private void OnReflectCollide(EntityUid uid, ReflectComponent component, ref Pro
 
     private bool TryReflectProjectile(EntityUid user, EntityUid reflector, EntityUid projectile, ProjectileComponent? projectileComp = null, ReflectComponent? reflect = null)
     {
-        if (
-            !Resolve(reflector, ref reflect, false) ||
+        if (!Resolve(reflector, ref reflect, false) ||
             !_toggle.IsActivated(reflector) ||
             !TryComp<ReflectiveComponent>(projectile, out var reflective) ||
             (reflect.Reflects & reflective.Reflective) == 0x0 ||
-            !TryComp<PhysicsComponent>(projectile, out var physics) ||
-            TryComp<StaminaComponent>(reflector, out var staminaComponent) && staminaComponent.Critical ||
-            _standing.IsDown(reflector)
-        )
-            return false;
-
-        // Non cultists can't use cult items to reflect anything.
-        if (HasComp<CultItemComponent>(reflector) && !HasComp<BloodCultistComponent>(user))
-            return false;
-
-        if (!_random.Prob(CalcReflectChance(reflector, reflect)))
+            !_random.Prob(reflect.ReflectProb) ||
+            !TryComp<PhysicsComponent>(projectile, out var physics))
+        {
             return false;
+        }
 
         var rotation = _random.NextAngle(-reflect.Spread / 2, reflect.Spread / 2).Opposite();
         var existingVelocity = _physics.GetMapLinearVelocity(projectile, component: physics);
@@ -158,34 +140,6 @@ private bool TryReflectProjectile(EntityUid user, EntityUid reflector, EntityUid
         return true;
     }
 
-    private float CalcReflectChance(EntityUid reflector, ReflectComponent reflect)
-    {
-        /*
-         *  The rules of deflection are as follows:
-         *  If you innately reflect things via magic, biology etc., you always have a full chance.
-         *  If you are standing up and standing still, you're prepared to deflect and have full chance.
-         *  If you have velocity, your deflection chance depends on your velocity, clamped.
-         *  If you are floating, your chance is the minimum value possible.
-         *  You cannot deflect if you are knocked down or stunned.
-         */
-
-        if (reflect.Innate)
-            return reflect.ReflectProb;
-
-        if (_gravity.IsWeightless(reflector))
-            return reflect.MinReflectProb;
-
-        if (!TryComp<PhysicsComponent>(reflector, out var reflectorPhysics))
-            return reflect.ReflectProb;
-
-        return MathHelper.Lerp(
-            reflect.MinReflectProb,
-            reflect.ReflectProb,
-            // Inverse progression between velocities fed in as progression between probabilities. We go high -> low so the output here needs to be _inverted_.
-            1 - Math.Clamp((reflectorPhysics.LinearVelocity.Length() - reflect.VelocityBeforeNotMaxProb) / (reflect.VelocityBeforeMinProb - reflect.VelocityBeforeNotMaxProb), 0, 1)
-        );
-    }
-
     private void OnReflectHitscan(EntityUid uid, ReflectComponent component, ref HitScanReflectAttemptEvent args)
     {
         if (args.Reflected ||
@@ -209,13 +163,13 @@ private bool TryReflectHitscan(
         Vector2 direction,
         [NotNullWhen(true)] out Vector2? newDirection)
     {
-        newDirection = null;
         if (!TryComp<ReflectComponent>(reflector, out var reflect) ||
             !_toggle.IsActivated(reflector) ||
             !_random.Prob(reflect.ReflectProb))
         {
             newDirection = null;
             return false;
+        }
 
         if (_netManager.IsServer)
         {
@@ -240,9 +194,6 @@ private void OnReflectEquipped(EntityUid uid, ReflectComponent component, GotEqu
             return;
 
         EnsureComp<ReflectUserComponent>(args.Equipee);
-
-        if (component.Enabled)
-            EnableAlert(args.Equipee);
     }
 
     private void OnReflectUnequipped(EntityUid uid, ReflectComponent comp, GotUnequippedEvent args)
@@ -256,9 +207,6 @@ private void OnReflectHandEquipped(EntityUid uid, ReflectComponent component, Go
             return;
 
         EnsureComp<ReflectUserComponent>(args.User);
-
-        if (component.Enabled)
-            EnableAlert(args.User);
     }
 
     private void OnReflectHandUnequipped(EntityUid uid, ReflectComponent component, GotUnequippedHandEvent args)
@@ -277,28 +225,15 @@ private void OnToggleReflect(EntityUid uid, ReflectComponent comp, ref ItemToggl
     /// </summary>
     private void RefreshReflectUser(EntityUid user)
     {
-        foreach (var ent in _inventorySystem.GetHandOrInventoryEntities(user, SlotFlags.WITHOUT_POCKET))
+        foreach (var ent in _inventorySystem.GetHandOrInventoryEntities(user, SlotFlags.All & ~SlotFlags.POCKET))
         {
             if (!HasComp<ReflectComponent>(ent) || !_toggle.IsActivated(ent))
                 continue;
 
             EnsureComp<ReflectUserComponent>(user);
-            EnableAlert(user);
-
             return;
         }
 
         RemCompDeferred<ReflectUserComponent>(user);
-        DisableAlert(user);
-    }
-
-    private void EnableAlert(EntityUid alertee)
-    {
-        _alerts.ShowAlert(alertee, DeflectingAlert);
-    }
-
-    private void DisableAlert(EntityUid alertee)
-    {
-        _alerts.ClearAlert(alertee, DeflectingAlert);
     }
 }

From 1defdceca265237f9a9a459d0ea289cefe49b3ef Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Fri, 14 Jun 2024 23:43:23 -0400
Subject: [PATCH 025/366] Add moon boots (#29009)

---
 Content.Client/Clothing/MagbootsSystem.cs     |   8 ---
 .../Components/MovedByPressureComponent.cs    |  31 -----------
 .../AtmosphereSystem.HighPressureDelta.cs     |   2 +-
 Content.Server/Clothing/MagbootsSystem.cs     |  49 ------------------
 .../Damage/Systems/GodmodeSystem.cs           |   2 +-
 Content.Server/Gravity/GravitySystem.cs       |   1 -
 .../EntitySystems/GravityWellSystem.cs        |   2 +-
 .../Components/MovedByPressureComponent.cs    |  31 +++++++++++
 .../AntiGravityClothingComponent.cs           |   9 ++++
 .../AntiGravityClothingSystem.cs              |  23 ++++++++
 Content.Shared/Gravity/SharedGravitySystem.cs |  39 +++++++-------
 .../Inventory/InventorySystem.Relay.cs        |   2 +
 .../Entities/Clothing/Shoes/misc.yml          |   6 ++-
 .../Entities/Structures/Machines/lathe.yml    |   1 +
 Resources/Prototypes/Recipes/Lathes/misc.yml  |   7 +++
 .../Prototypes/Research/experimental.yml      |   1 +
 .../Boots/moonboots.rsi/equipped-FEET-vox.png | Bin 0 -> 412 bytes
 .../Boots/moonboots.rsi/equipped-FEET.png     | Bin 0 -> 316 bytes
 .../Shoes/Boots/moonboots.rsi/icon.png        | Bin 0 -> 340 bytes
 .../Shoes/Boots/moonboots.rsi/inhand-left.png | Bin 0 -> 323 bytes
 .../Boots/moonboots.rsi/inhand-right.png      | Bin 0 -> 340 bytes
 .../Shoes/Boots/moonboots.rsi/meta.json       |  30 +++++++++++
 22 files changed, 130 insertions(+), 114 deletions(-)
 delete mode 100644 Content.Client/Clothing/MagbootsSystem.cs
 delete mode 100644 Content.Server/Atmos/Components/MovedByPressureComponent.cs
 delete mode 100644 Content.Server/Clothing/MagbootsSystem.cs
 create mode 100644 Content.Shared/Atmos/Components/MovedByPressureComponent.cs
 create mode 100644 Content.Shared/Clothing/Components/AntiGravityClothingComponent.cs
 create mode 100644 Content.Shared/Clothing/EntitySystems/AntiGravityClothingSystem.cs
 create mode 100644 Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/equipped-FEET-vox.png
 create mode 100644 Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/equipped-FEET.png
 create mode 100644 Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/meta.json

diff --git a/Content.Client/Clothing/MagbootsSystem.cs b/Content.Client/Clothing/MagbootsSystem.cs
deleted file mode 100644
index a3d39eafded..00000000000
--- a/Content.Client/Clothing/MagbootsSystem.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Content.Shared.Clothing;
-
-namespace Content.Client.Clothing;
-
-public sealed class MagbootsSystem : SharedMagbootsSystem
-{
-
-}
diff --git a/Content.Server/Atmos/Components/MovedByPressureComponent.cs b/Content.Server/Atmos/Components/MovedByPressureComponent.cs
deleted file mode 100644
index ca830767bda..00000000000
--- a/Content.Server/Atmos/Components/MovedByPressureComponent.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-namespace Content.Server.Atmos.Components
-{
-    // Unfortunately can't be friends yet due to magboots.
-    [RegisterComponent]
-    public sealed partial class MovedByPressureComponent : Component
-    {
-        public const float MoveForcePushRatio = 1f;
-        public const float MoveForceForcePushRatio = 1f;
-        public const float ProbabilityOffset = 25f;
-        public const float ProbabilityBasePercent = 10f;
-        public const float ThrowForce = 100f;
-
-        /// <summary>
-        /// Accumulates time when yeeted by high pressure deltas.
-        /// </summary>
-        [DataField("accumulator")]
-        public float Accumulator = 0f;
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("enabled")]
-        public bool Enabled { get; set; } = true;
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("pressureResistance")]
-        public float PressureResistance { get; set; } = 1f;
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("moveResist")]
-        public float MoveResist { get; set; } = 100f;
-        [ViewVariables(VVAccess.ReadWrite)]
-        public int LastHighPressureMovementAirCycle { get; set; } = 0;
-    }
-}
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
index 461435f0624..42f98089408 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
@@ -1,6 +1,6 @@
 using Content.Server.Atmos.Components;
 using Content.Shared.Atmos;
-using Content.Shared.Humanoid;
+using Content.Shared.Atmos.Components;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Physics;
 using Robust.Shared.Audio;
diff --git a/Content.Server/Clothing/MagbootsSystem.cs b/Content.Server/Clothing/MagbootsSystem.cs
deleted file mode 100644
index 3838ad168d1..00000000000
--- a/Content.Server/Clothing/MagbootsSystem.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using Content.Server.Atmos.Components;
-using Content.Shared.Alert;
-using Content.Shared.Clothing;
-
-namespace Content.Server.Clothing;
-
-public sealed class MagbootsSystem : SharedMagbootsSystem
-{
-    [Dependency] private readonly AlertsSystem _alerts = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<MagbootsComponent, ClothingGotEquippedEvent>(OnGotEquipped);
-        SubscribeLocalEvent<MagbootsComponent, ClothingGotUnequippedEvent>(OnGotUnequipped);
-    }
-
-    protected override void UpdateMagbootEffects(EntityUid parent, EntityUid uid, bool state, MagbootsComponent? component)
-    {
-        if (!Resolve(uid, ref component))
-            return;
-        state = state && component.On;
-
-        if (TryComp(parent, out MovedByPressureComponent? movedByPressure))
-        {
-            movedByPressure.Enabled = !state;
-        }
-
-        if (state)
-        {
-            _alerts.ShowAlert(parent, component.MagbootsAlert);
-        }
-        else
-        {
-            _alerts.ClearAlert(parent, component.MagbootsAlert);
-        }
-    }
-
-    private void OnGotUnequipped(EntityUid uid, MagbootsComponent component, ref ClothingGotUnequippedEvent args)
-    {
-        UpdateMagbootEffects(args.Wearer, uid, false, component);
-    }
-
-    private void OnGotEquipped(EntityUid uid, MagbootsComponent component, ref ClothingGotEquippedEvent args)
-    {
-        UpdateMagbootEffects(args.Wearer, uid, true, component);
-    }
-}
diff --git a/Content.Server/Damage/Systems/GodmodeSystem.cs b/Content.Server/Damage/Systems/GodmodeSystem.cs
index 404cc639057..d896fba71c4 100644
--- a/Content.Server/Damage/Systems/GodmodeSystem.cs
+++ b/Content.Server/Damage/Systems/GodmodeSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Atmos.Components;
+using Content.Shared.Atmos.Components;
 using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Systems;
 
diff --git a/Content.Server/Gravity/GravitySystem.cs b/Content.Server/Gravity/GravitySystem.cs
index ea62d4a8195..6807b9df4a4 100644
--- a/Content.Server/Gravity/GravitySystem.cs
+++ b/Content.Server/Gravity/GravitySystem.cs
@@ -1,7 +1,6 @@
 using Content.Shared.Gravity;
 using JetBrains.Annotations;
 using Robust.Shared.Map.Components;
-using Robust.Shared.Utility;
 
 namespace Content.Server.Gravity
 {
diff --git a/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs b/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
index 779b2f59719..f53d658ebd7 100644
--- a/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
-using Content.Server.Atmos.Components;
 using Content.Server.Singularity.Components;
+using Content.Shared.Atmos.Components;
 using Content.Shared.Ghost;
 using Content.Shared.Singularity.EntitySystems;
 using Robust.Shared.Map;
diff --git a/Content.Shared/Atmos/Components/MovedByPressureComponent.cs b/Content.Shared/Atmos/Components/MovedByPressureComponent.cs
new file mode 100644
index 00000000000..8a4e2c6d4c9
--- /dev/null
+++ b/Content.Shared/Atmos/Components/MovedByPressureComponent.cs
@@ -0,0 +1,31 @@
+namespace Content.Shared.Atmos.Components;
+
+// Unfortunately can't be friends yet due to magboots.
+[RegisterComponent]
+public sealed partial class MovedByPressureComponent : Component
+{
+    public const float MoveForcePushRatio = 1f;
+    public const float MoveForceForcePushRatio = 1f;
+    public const float ProbabilityOffset = 25f;
+    public const float ProbabilityBasePercent = 10f;
+    public const float ThrowForce = 100f;
+
+    /// <summary>
+    /// Accumulates time when yeeted by high pressure deltas.
+    /// </summary>
+    [DataField]
+    public float Accumulator;
+
+    [DataField]
+    public bool Enabled { get; set; } = true;
+
+    [DataField]
+    public float PressureResistance { get; set; } = 1f;
+
+    [DataField]
+    public float MoveResist { get; set; } = 100f;
+
+    [ViewVariables(VVAccess.ReadWrite)]
+    public int LastHighPressureMovementAirCycle { get; set; } = 0;
+}
+
diff --git a/Content.Shared/Clothing/Components/AntiGravityClothingComponent.cs b/Content.Shared/Clothing/Components/AntiGravityClothingComponent.cs
new file mode 100644
index 00000000000..a8fcbdd2eb3
--- /dev/null
+++ b/Content.Shared/Clothing/Components/AntiGravityClothingComponent.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Clothing.Components;
+
+/// <summary>
+/// This is used for clothing that makes an entity weightless when worn.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class AntiGravityClothingComponent : Component;
diff --git a/Content.Shared/Clothing/EntitySystems/AntiGravityClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/AntiGravityClothingSystem.cs
new file mode 100644
index 00000000000..c5b2ee3dfc8
--- /dev/null
+++ b/Content.Shared/Clothing/EntitySystems/AntiGravityClothingSystem.cs
@@ -0,0 +1,23 @@
+using Content.Shared.Clothing.Components;
+using Content.Shared.Gravity;
+using Content.Shared.Inventory;
+
+namespace Content.Shared.Clothing.EntitySystems;
+
+public sealed class AntiGravityClothingSystem : EntitySystem
+{
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<AntiGravityClothingComponent, InventoryRelayedEvent<IsWeightlessEvent>>(OnIsWeightless);
+    }
+
+    private void OnIsWeightless(Entity<AntiGravityClothingComponent> ent, ref InventoryRelayedEvent<IsWeightlessEvent> args)
+    {
+        if (args.Args.Handled)
+            return;
+
+        args.Args.Handled = true;
+        args.Args.IsWeightless = true;
+    }
+}
diff --git a/Content.Shared/Gravity/SharedGravitySystem.cs b/Content.Shared/Gravity/SharedGravitySystem.cs
index 59d75e453af..f9c65e9477b 100644
--- a/Content.Shared/Gravity/SharedGravitySystem.cs
+++ b/Content.Shared/Gravity/SharedGravitySystem.cs
@@ -1,9 +1,7 @@
 using Content.Shared.Alert;
-using Content.Shared.Clothing;
 using Content.Shared.Inventory;
 using Content.Shared.Movement.Components;
 using Robust.Shared.GameStates;
-using Robust.Shared.Map;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Serialization;
@@ -16,7 +14,6 @@ public abstract partial class SharedGravitySystem : EntitySystem
     {
         [Dependency] protected readonly IGameTiming Timing = default!;
         [Dependency] private readonly AlertsSystem _alerts = default!;
-        [Dependency] private readonly InventorySystem _inventory = default!;
 
         [ValidatePrototypeId<AlertPrototype>]
         public const string WeightlessAlert = "Weightless";
@@ -34,6 +31,11 @@ public bool IsWeightless(EntityUid uid, PhysicsComponent? body = null, Transform
             if (TryComp<MovementIgnoreGravityComponent>(uid, out var ignoreGravityComponent))
                 return ignoreGravityComponent.Weightless;
 
+            var ev = new IsWeightlessEvent(uid);
+            RaiseLocalEvent(uid, ref ev);
+            if (ev.Handled)
+                return ev.IsWeightless;
+
             if (!Resolve(uid, ref xform))
                 return true;
 
@@ -44,18 +46,6 @@ public bool IsWeightless(EntityUid uid, PhysicsComponent? body = null, Transform
                 return false;
             }
 
-            var hasGrav = gravity != null || mapGravity != null;
-
-            // Check for something holding us down
-            // If the planet has gravity component and no gravity it will still give gravity
-            // If there's no gravity comp at all (i.e. space) then they don't work.
-            if (hasGrav && _inventory.TryGetSlotEntity(uid, "shoes", out var ent))
-            {
-                // TODO this should just be a event that gets relayed instead of a specific slot & component check.
-                if (TryComp<MagbootsComponent>(ent, out var boots) && boots.On)
-                    return false;
-            }
-
             return true;
         }
 
@@ -78,9 +68,11 @@ public override void Update(float frameTime)
 
         private void OnHandleState(EntityUid uid, GravityComponent component, ref ComponentHandleState args)
         {
-            if (args.Current is not GravityComponentState state) return;
+            if (args.Current is not GravityComponentState state)
+                return;
 
-            if (component.EnabledVV == state.Enabled) return;
+            if (component.EnabledVV == state.Enabled)
+                return;
             component.EnabledVV = state.Enabled;
             var ev = new GravityChangedEvent(uid, component.EnabledVV);
             RaiseLocalEvent(uid, ref ev, true);
@@ -94,9 +86,10 @@ private void OnGetState(EntityUid uid, GravityComponent component, ref Component
         private void OnGravityChange(ref GravityChangedEvent ev)
         {
             var alerts = AllEntityQuery<AlertsComponent, TransformComponent>();
-            while(alerts.MoveNext(out var uid, out var comp, out var xform))
+            while(alerts.MoveNext(out var uid, out _, out var xform))
             {
-                if (xform.GridUid != ev.ChangedGridIndex) continue;
+                if (xform.GridUid != ev.ChangedGridIndex)
+                    continue;
 
                 if (!ev.HasGravity)
                 {
@@ -149,4 +142,10 @@ public GravityComponentState(bool enabled)
             }
         }
     }
-}
\ No newline at end of file
+
+    [ByRefEvent]
+    public record struct IsWeightlessEvent(EntityUid Entity, bool IsWeightless = false, bool Handled = false) : IInventoryRelayEvent
+    {
+        SlotFlags IInventoryRelayEvent.TargetSlots => ~SlotFlags.POCKET;
+    }
+}
diff --git a/Content.Shared/Inventory/InventorySystem.Relay.cs b/Content.Shared/Inventory/InventorySystem.Relay.cs
index 39e10415f8e..1f1e59bff34 100644
--- a/Content.Shared/Inventory/InventorySystem.Relay.cs
+++ b/Content.Shared/Inventory/InventorySystem.Relay.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Electrocution;
 using Content.Shared.Explosion;
 using Content.Shared.Eye.Blinding.Systems;
+using Content.Shared.Gravity;
 using Content.Shared.IdentityManagement.Components;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Movement.Systems;
@@ -34,6 +35,7 @@ public void InitializeRelay()
 
         // by-ref events
         SubscribeLocalEvent<InventoryComponent, GetExplosionResistanceEvent>(RefRelayInventoryEvent);
+        SubscribeLocalEvent<InventoryComponent, IsWeightlessEvent>(RefRelayInventoryEvent);
 
         // Eye/vision events
         SubscribeLocalEvent<InventoryComponent, CanSeeAttemptEvent>(RelayInventoryEvent);
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
index 5d81a416199..4683388dc26 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
@@ -130,8 +130,10 @@
   categories: [ HideSpawnMenu ]
   components:
   - type: InstantAction
-    itemIconStyle: BigItem
-    event: !type:ToggleActionEvent
+    itemIconStyle: NoItem
+    event: !type:ToggleClothingSpeedEvent
+    icon: { sprite: Clothing/Shoes/Boots/speedboots.rsi, state: icon }
+    iconOn: { sprite: Clothing/Shoes/Boots/speedboots.rsi, state: icon-on }
 
 - type: entity
   parent: ClothingShoesBase
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 27717049050..573717def82 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -321,6 +321,7 @@
       - SynthesizerInstrument
       - RPED
       - ClothingShoesBootsMagSci
+      - ClothingShoesBootsMoon
       - ClothingShoesBootsSpeed
       - NodeScanner
       - HolofanProjector
diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml
index 2c0e1eeec38..571e9bc97b9 100644
--- a/Resources/Prototypes/Recipes/Lathes/misc.yml
+++ b/Resources/Prototypes/Recipes/Lathes/misc.yml
@@ -126,6 +126,13 @@
     Steel: 1000
     Plastic: 500
 
+- type: latheRecipe
+  id: ClothingShoesBootsMoon
+  result: ClothingShoesBootsMoon
+  completetime: 2
+  materials:
+    Steel: 600
+
 - type: latheRecipe
   id: ClothingShoesBootsSpeed
   result: ClothingShoesBootsSpeed
diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml
index 60017fc98d1..423ec0f84da 100644
--- a/Resources/Prototypes/Research/experimental.yml
+++ b/Resources/Prototypes/Research/experimental.yml
@@ -69,6 +69,7 @@
   cost: 7500
   recipeUnlocks:
   - ClothingShoesBootsMagSci
+  - ClothingShoesBootsMoon
 
 - type: technology
   id: AnomalyCoreHarnessing
diff --git a/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/equipped-FEET-vox.png
new file mode 100644
index 0000000000000000000000000000000000000000..a65deca7604c8869eb12f083f48fd87f017e4117
GIT binary patch
literal 412
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z!#rIaLn`LH
zy=9np$U&g>p}WY$tQJ@2!}AopUQ9S@XrXbuLqN9EqH*B@$L^Tcv|!1bd`|aRtd)N4
z&s!6F-k^DPEGN)N2ymD?vo&%Sn=yBqSXcVf=ijI87msdG*=u9(J?Y-G)Aw|In^kIa
z%qA_dIluT`rT@?KcgxO&TD_gK+Gpw6KhxFjp0rP}n#<;CCBt{?{r9PUvm+&X-K6;1
zCoQ>}Rr*=;%=6D5_Qk#aTrx=|HL~nnAkUMP_piTBS#&h%qDB4U*2f=rT)O$T?00Vb
zWK;XE*MBm?9Q8roMP7a?zrtsm_g5cBi(U)m-ESqQ-?!v+;cZ`o%>}yquY6K?B`)%+
zQ2f+%CB37Da!KYXyYF7z;k|vuQ^T_6?{S`!L=r#T%Qldh^H|TWQEC47IH32c_I$ti
zzFY5_W%&P#R&xDQO><2b{+oF<+hfv_qQXU;`d?yB_!|71w;1FKPgg&ebxsLQ0A0<r
A!2kdN

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/equipped-FEET.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b4cdf400dd05d7730f985675785a8343b509ed4
GIT binary patch
literal 316
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Xa)F$xE?rg
zfR~ro%ECfWP*7G@*38UIMMWhjC`d(FSw=>txv|m5$EP4SHzp>=U3}FEpf0|WAirRS
z|HvTR>$V6`W|^mpV@O2n+iAP`4jXW|*5)d_|NsAPl2YiZlsl_}+p5`YWSS0gYqknF
zaa3xpa$pPzUjNSY>%Ux)4-<a;ZkqKo=&Y>GznhIxM}%3-&Rr;HPtJcPTGce)?8Dix
zPQH|_W-<xIQI7U*&Kcs-oipr|6<Y*8=@>-5vseA`>g@J<l^yfNR@}FqaZiD1i|zMn
zW|uV9gyW0Sm-)x?{pX%pDslV&sV}0xid)31=P>=9EAw9)=wb#>S3j3^P6<r_m`HpP

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..04f662d6d313597bc35f72926052b251eb3c75b9
GIT binary patch
literal 340
zcmV-a0jvIrP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$4oO5oR9J=Wl)a8eKom#MZd3|Hrjn=>Dlagt-ottby;4G>(D*13jV(6Beq<J_
z`_Jk8GIGyc?gfoTqtU!NZ+Bi2Lab-cc3r2eVcaR6B+35Vwk>5@GL9p09RJ9HRV8s*
z0HEtS`o2G%tGFc~gg^*E+qM7<!=TI`7kIJ*?{@^UEF%m<T-QC7KPC`G(F!1?Bu&%3
z#fI_O$nW_XPK}}O`>W$PEX%??&j5IyN7FP|mh~k!O>^&n>$>E5PF>gcr{GvT48#2!
z*LBS?-{||Es;UTr;LP3B0#}P~*tShoRsR>5rip2qkWx|<1pxCr|C%4!#<3_0Ow&{f
mDF1;gD_6x|>sX`Fyfz<2V56wR^>uOp0000<MNUMnLSTZP-IYfG

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..03bdacf9fb56813399ffd95046919fd81774980a
GIT binary patch
literal 323
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVC3?2aSW-L^Y)fuUbBJ3(U1LF
zpUtD>I$f@PVL01S#5KR6_@~B8%R?PTznI>+OyP??wOI4i|Lq%X9=10=+$;$+2M8Ke
z@9fRf{O&9H>|N>oZKqD`uD!i3sA&yD`Fc%N>yo)zpJqE>kM#14Yg*Fq^W^<yFYDHx
zs6AtDyxVtjjk*Vy#!{2(g<Av`E4_19blcsxcxsST=(0DWKw-;tZo^wU->3SYy!(3R
zd)*@$mgz4aojoG&Sjw5LUuXI*ZmM;{+IR)98$iUil$TdLtfXt&mKvWpD=v@}Q<9c&
zne|NfKa06_dxgt>-TqZQe|q<y2S@fle^)Be_N&fj-@PAymWtaye!#-es=s}A!o^!=
RMh`$ndAj<!taD0e0svssj_?2g

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..f00d861ca5441d5654b7eb67ea06e863727bf59b
GIT binary patch
literal 340
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV3hWBaSW-L^Y+%p+`|R}tq+6Q
zc3cY3)K}n7nA*fH5L3j|pOMj7!MIu_q^Qwb@I<TNjU|%~q<pHM%OG3uy=0AxAkZif
zhz|^{F6B22`d!mqTX@^#X8VFw+j3_une~F<TdaEfzVl`*p<A8rpWgR+(yK*G5pDOb
zlunzyq2{M=?EQJk*^A8`TvEQpt-GwE*rK)Zc)Y073Lty)_mf-wnFB(L&z*d;cg}Ic
z-4DeTTVC1p8CC0_+xbGbLc&4wu>Q5S4--~J<)#0dDO3&e78sm}`&b`8=^x+yjj^}?
zMJTV|WX534=lm(PMP@DMfwJ7{-8~Ae^3A4<A@8T3UUizIzE`&Wpx^Szo)4ox$hIiV
gZ~lM#A>)*{%t>c6Be$tM?*f_W>FVdQ&MBb@0M3k$`v3p{

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/meta.json
new file mode 100644
index 00000000000..2c2d49e0310
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Tau Ceti Station at commit https://github.com/TauCetiStation/TauCetiClassic/blob/HEAD/icons/obj/clothing/shoes.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-FEET",
+      "directions": 4
+    },
+    {
+      "name": "equipped-FEET-vox",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

From 02fba60755102dd12557c6900df6b209e539bb3f Mon Sep 17 00:00:00 2001
From: Errant <35878406+Errant-4@users.noreply.github.com>
Date: Fri, 18 Oct 2024 14:55:43 +0200
Subject: [PATCH 026/366] Traitor activation fix for missing PDA (#30359)

* Implant the uplink if no PDA is found

* comments

* tidy up loose ends

* Whoops usually I start with the namespace, how did I forget it, shame shame

* Consistent data type for starting TC balance, misc changes

* Implant briefing, guidebook

* Update AutoTraitor, add uplink, codeword and briefing parameters to TraitorRuleComponent,  no pda for reinforcements

* engine 5c0ce43

* pass pda to AddUplink

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* nicer string handling

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* case typo 1

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* case typo 2

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* case typo 3

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* minor layout changes

* removed redundant implant check

* minor cleanup

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 .../Rules/Components/TraitorRuleComponent.cs  |  22 ++-
 .../GameTicking/Rules/TraitorRuleSystem.cs    |  87 +++++---
 .../Components/AutoTraitorComponent.cs        |  13 +-
 .../Traitor/Systems/AutoTraitorSystem.cs      |   5 +-
 Content.Server/Traitor/Uplink/UplinkSystem.cs | 185 +++++++++++-------
 .../Implants/SharedSubdermalImplantSystem.cs  |  38 ++--
 .../game-presets/preset-traitor.ftl           |   6 +-
 .../Prototypes/Entities/Mobs/NPCs/animals.yml |   6 +-
 .../Prototypes/Entities/Mobs/Player/human.yml |   7 +-
 Resources/Prototypes/GameRules/roundstart.yml |   9 +
 .../Guidebook/Antagonist/Traitors.xml         |  52 ++---
 11 files changed, 262 insertions(+), 168 deletions(-)

diff --git a/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs
index cec635b4caa..23de66ae35b 100644
--- a/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs
@@ -1,5 +1,7 @@
 using Content.Server.NPC.Components;
 using Content.Shared.Dataset;
+using Content.Shared.FixedPoint;
+using Content.Shared.NPC.Prototypes;
 using Content.Shared.Random;
 using Content.Shared.Roles;
 using Robust.Shared.Audio;
@@ -31,6 +33,24 @@ public sealed partial class TraitorRuleComponent : Component
     [DataField]
     public ProtoId<DatasetPrototype> ObjectiveIssuers = "TraitorCorporations";
 
+    /// <summary>
+    /// Give this traitor an Uplink on spawn.
+    /// </summary>
+    [DataField]
+    public bool GiveUplink = true;
+
+    /// <summary>
+    /// Give this traitor the codewords.
+    /// </summary>
+    [DataField]
+    public bool GiveCodewords = true;
+
+    /// <summary>
+    /// Give this traitor a briefing in chat.
+    /// </summary>
+    [DataField]
+    public bool GiveBriefing = true;
+
     public int TotalTraitors => TraitorMinds.Count;
     public string[] Codewords = new string[3];
 
@@ -68,5 +88,5 @@ public enum SelectionState
     /// The amount of TC traitors start with.
     /// </summary>
     [DataField]
-    public int StartingBalance = 20;
+    public FixedPoint2 StartingBalance = 20;
 }
diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
index abf46b7b967..46fee4abfe1 100644
--- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
@@ -7,6 +7,8 @@
 using Content.Server.Roles;
 using Content.Server.Traitor.Components;
 using Content.Server.Traitor.Uplink;
+using Content.Shared.Database;
+using Content.Shared.FixedPoint;
 using Content.Shared.GameTicking.Components;
 using Content.Shared.Mind;
 using Content.Shared.Mood;
@@ -66,44 +68,45 @@ private void MakeCodewords(TraitorRuleComponent component)
         }
     }
 
-    public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component, bool giveUplink = true)
+    public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component)
     {
         //Grab the mind if it wasnt provided
         if (!_mindSystem.TryGetMind(traitor, out var mindId, out var mind))
             return false;
 
-        var briefing = Loc.GetString("traitor-role-codewords-short", ("codewords", string.Join(", ", component.Codewords)));
-        var issuer = _random.Pick(_prototypeManager.Index(component.ObjectiveIssuers).Values);
+        var briefing = "";
 
-        if (TryComp<AutoTraitorComponent>(traitor, out var autoTraitorComponent))
-        {
-            giveUplink = autoTraitorComponent.GiveUplink;
-            giveObjectives = autoTraitorComponent.GiveObjectives;
-        }
+        if (component.GiveCodewords)
+            briefing = Loc.GetString("traitor-role-codewords-short", ("codewords", string.Join(", ", component.Codewords)));
+
+        var issuer = _random.Pick(_prototypeManager.Index(component.ObjectiveIssuers).Values);
 
         Note[]? code = null;
-        if (giveUplink)
+
+        if (component.GiveUplink)
         {
             // Calculate the amount of currency on the uplink.
             var startingBalance = component.StartingBalance;
-            if (_jobs.MindTryGetJob(mindId, out _, 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
-            var pda = _uplink.FindUplinkTarget(traitor);
-            if (pda == null || !_uplink.AddUplink(traitor, startingBalance))
-                return false;
-
-            // Give traitors their codewords and uplink code to keep in their character info menu
-            code = EnsureComp<RingerUplinkComponent>(pda.Value).Code;
+            if (_jobs.MindTryGetJob(mindId, out var prototype))
+            {
+                if (startingBalance < prototype.AntagAdvantage) // Can't use Math functions on FixedPoint2
+                    startingBalance = 0;
+                else
+                    startingBalance = startingBalance - prototype.AntagAdvantage;
+            }
 
-            // If giveUplink is false the uplink code part is omitted
-            briefing = string.Format("{0}\n{1}", briefing,
-                Loc.GetString("traitor-role-uplink-code-short", ("code", string.Join("-", code).Replace("sharp", "#"))));
+            // Choose and generate an Uplink, and return the uplink code if applicable
+            var uplinkParams = RequestUplink(traitor, startingBalance, briefing);
+            code = uplinkParams.Item1;
+            briefing = uplinkParams.Item2;
         }
 
-        _antag.SendBriefing(traitor, GenerateBriefing(component.Codewords, code, issuer), null, component.GreetSoundNotification);
+        string[]? codewords = null;
+        if (component.GiveCodewords)
+            codewords = component.Codewords;
+
+        if (component.GiveBriefing)
+            _antag.SendBriefing(traitor, GenerateBriefing(codewords, code, issuer), null, component.GreetSoundNotification);
 
         component.TraitorMinds.Add(mindId);
 
@@ -122,6 +125,32 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component, bool
         return true;
     }
 
+    private (Note[]?, string) RequestUplink(EntityUid traitor, FixedPoint2 startingBalance, string briefing)
+    {
+        var pda = _uplink.FindUplinkTarget(traitor);
+        Note[]? code = null;
+
+        var uplinked = _uplink.AddUplink(traitor, startingBalance, pda, true);
+
+        if (pda is not null && uplinked)
+        {
+            // Codes are only generated if the uplink is a PDA
+            code = EnsureComp<RingerUplinkComponent>(pda.Value).Code;
+
+            // If giveUplink is false the uplink code part is omitted
+            briefing = string.Format("{0}\n{1}",
+                briefing,
+                Loc.GetString("traitor-role-uplink-code-short", ("code", string.Join("-", code).Replace("sharp", "#"))));
+            return (code, briefing);
+        }
+        else if (pda is null && uplinked)
+        {
+            briefing += "\n" + Loc.GetString("traitor-role-uplink-implant-short");
+        }
+
+        return (null, briefing);
+    }
+
     // TODO: AntagCodewordsComponent
     private void OnObjectivesTextPrepend(EntityUid uid, TraitorRuleComponent comp, ref ObjectivesTextPrependEvent args)
     {
@@ -129,13 +158,17 @@ private void OnObjectivesTextPrepend(EntityUid uid, TraitorRuleComponent comp, r
     }
 
     // TODO: figure out how to handle this? add priority to briefing event?
-    private string GenerateBriefing(string[] codewords, Note[]? uplinkCode, string? objectiveIssuer = null)
+    private string GenerateBriefing(string[]? codewords, Note[]? uplinkCode, string? objectiveIssuer = null)
     {
         var sb = new StringBuilder();
         sb.AppendLine(Loc.GetString("traitor-role-greeting", ("corporation", objectiveIssuer ?? Loc.GetString("objective-issuer-unknown"))));
-        sb.AppendLine(Loc.GetString("traitor-role-codewords-short", ("codewords", string.Join(", ", codewords))));
+        if (codewords != null)
+            sb.AppendLine(Loc.GetString("traitor-role-codewords", ("codewords", string.Join(", ", codewords))));
         if (uplinkCode != null)
-            sb.AppendLine(Loc.GetString("traitor-role-uplink-code-short", ("code", string.Join("-", uplinkCode).Replace("sharp", "#"))));
+            sb.AppendLine(Loc.GetString("traitor-role-uplink-code", ("code", string.Join("-", uplinkCode).Replace("sharp", "#"))));
+        else
+            sb.AppendLine(Loc.GetString("traitor-role-uplink-implant"));
+
 
         return sb.ToString();
     }
diff --git a/Content.Server/Traitor/Components/AutoTraitorComponent.cs b/Content.Server/Traitor/Components/AutoTraitorComponent.cs
index 473441ccec2..a4710afd8eb 100644
--- a/Content.Server/Traitor/Components/AutoTraitorComponent.cs
+++ b/Content.Server/Traitor/Components/AutoTraitorComponent.cs
@@ -1,4 +1,5 @@
 using Content.Server.Traitor.Systems;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Traitor.Components;
 
@@ -9,14 +10,8 @@ namespace Content.Server.Traitor.Components;
 public sealed partial class AutoTraitorComponent : Component
 {
     /// <summary>
-    /// Whether to give the traitor an uplink or not.
+    /// The traitor profile to use
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public bool GiveUplink = true;
-
-    /// <summary>
-    /// Whether to give the traitor objectives or not.
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public bool GiveObjectives = true;
+    [DataField]
+    public EntProtoId Profile = "Traitor";
 }
diff --git a/Content.Server/Traitor/Systems/AutoTraitorSystem.cs b/Content.Server/Traitor/Systems/AutoTraitorSystem.cs
index e9307effbc6..d5a4db591a7 100644
--- a/Content.Server/Traitor/Systems/AutoTraitorSystem.cs
+++ b/Content.Server/Traitor/Systems/AutoTraitorSystem.cs
@@ -12,9 +12,6 @@ public sealed class AutoTraitorSystem : EntitySystem
 {
     [Dependency] private readonly AntagSelectionSystem _antag = default!;
 
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string DefaultTraitorRule = "Traitor";
-
     public override void Initialize()
     {
         base.Initialize();
@@ -24,6 +21,6 @@ public override void Initialize()
 
     private void OnMindAdded(EntityUid uid, AutoTraitorComponent comp, MindAddedMessage args)
     {
-        _antag.ForceMakeAntag<AutoTraitorComponent>(args.Mind.Comp.Session, DefaultTraitorRule);
+        _antag.ForceMakeAntag<AutoTraitorComponent>(args.Mind.Comp.Session, comp.Profile);
     }
 }
diff --git a/Content.Server/Traitor/Uplink/UplinkSystem.cs b/Content.Server/Traitor/Uplink/UplinkSystem.cs
index 5670e28ec99..0e726f2a2b2 100644
--- a/Content.Server/Traitor/Uplink/UplinkSystem.cs
+++ b/Content.Server/Traitor/Uplink/UplinkSystem.cs
@@ -1,94 +1,135 @@
 using Content.Server.Store.Systems;
+using Content.Server.StoreDiscount.Systems;
+using Content.Shared.FixedPoint;
 using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Implants;
 using Content.Shared.Inventory;
 using Content.Shared.PDA;
-using Content.Server.Store.Components;
-using Content.Shared.FixedPoint;
 using Content.Shared.Store;
+using Content.Shared.Store.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Traitor.Uplink;
 
-namespace Content.Server.Traitor.Uplink
+public sealed class UplinkSystem : EntitySystem
 {
-    public sealed class UplinkSystem : EntitySystem
+    [Dependency] private readonly InventorySystem _inventorySystem = default!;
+    [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly StoreSystem _store = default!;
+    [Dependency] private readonly SharedSubdermalImplantSystem _subdermalImplant = default!;
+
+    [ValidatePrototypeId<CurrencyPrototype>]
+    public const string TelecrystalCurrencyPrototype = "Telecrystal";
+    private const string FallbackUplinkImplant = "UplinkImplant";
+    private const string FallbackUplinkCatalog = "UplinkUplinkImplanter";
+
+    /// <summary>
+    /// Adds an uplink to the target
+    /// </summary>
+    /// <param name="user">The person who is getting the uplink</param>
+    /// <param name="balance">The amount of currency on the uplink. If null, will just use the amount specified in the preset.</param>
+    /// <param name="uplinkEntity">The entity that will actually have the uplink functionality. Defaults to the PDA if null.</param>
+    /// <param name="giveDiscounts">Marker that enables discounts for uplink items.</param>
+    /// <returns>Whether or not the uplink was added successfully</returns>
+    public bool AddUplink(
+        EntityUid user,
+        FixedPoint2 balance,
+        EntityUid? uplinkEntity = null,
+        bool giveDiscounts = false)
     {
-        [Dependency] private readonly InventorySystem _inventorySystem = default!;
-        [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
-        [Dependency] private readonly StoreSystem _store = default!;
-
-        [ValidatePrototypeId<CurrencyPrototype>]
-        public const string TelecrystalCurrencyPrototype = "Telecrystal";
-
-        /// <summary>
-        ///     Gets the amount of TC on an "uplink"
-        ///     Mostly just here for legacy systems based on uplink.
-        /// </summary>
-        /// <param name="component"></param>
-        /// <returns>the amount of TC</returns>
-        public int GetTCBalance(StoreComponent component)
-        {
-            FixedPoint2? tcBalance = component.Balance.GetValueOrDefault(TelecrystalCurrencyPrototype);
-            return tcBalance?.Int() ?? 0;
-        }
+        // Try to find target item if none passed
 
-        /// <summary>
-        /// Adds an uplink to the target
-        /// </summary>
-        /// <param name="user">The person who is getting the uplink</param>
-        /// <param name="balance">The amount of currency on the uplink. If null, will just use the amount specified in the preset.</param>
-        /// <param name="uplinkPresetId">The id of the storepreset</param>
-        /// <param name="uplinkEntity">The entity that will actually have the uplink functionality. Defaults to the PDA if null.</param>
-        /// <returns>Whether or not the uplink was added successfully</returns>
-        public bool AddUplink(EntityUid user, FixedPoint2? balance, string uplinkPresetId = "StorePresetUplink", EntityUid? uplinkEntity = null)
-        {
-            // Try to find target item
-            if (uplinkEntity == null)
-            {
-                uplinkEntity = FindUplinkTarget(user);
-                if (uplinkEntity == null)
-                    return false;
-            }
+        uplinkEntity ??= FindUplinkTarget(user);
 
-            var store = EnsureComp<StoreComponent>(uplinkEntity.Value);
-            _store.InitializeFromPreset(uplinkPresetId, uplinkEntity.Value, store);
-            store.AccountOwner = user;
-            store.Balance.Clear();
+        if (uplinkEntity == null)
+            return ImplantUplink(user, balance, giveDiscounts);
 
-            if (balance != null)
-            {
-                store.Balance.Clear();
-                _store.TryAddCurrency(new Dictionary<string, FixedPoint2> { { TelecrystalCurrencyPrototype, balance.Value } }, uplinkEntity.Value, store);
-            }
+        EnsureComp<UplinkComponent>(uplinkEntity.Value);
 
-            // TODO add BUI. Currently can't be done outside of yaml -_-
+        SetUplink(user, uplinkEntity.Value, balance, giveDiscounts);
 
-            return true;
-        }
+        // TODO add BUI. Currently can't be done outside of yaml -_-
+        // ^ What does this even mean?
 
-        /// <summary>
-        /// Finds the entity that can hold an uplink for a user.
-        /// Usually this is a pda in their pda slot, but can also be in their hands. (but not pockets or inside bag, etc.)
-        /// </summary>
-        public EntityUid? FindUplinkTarget(EntityUid user)
-        {
-            // Try to find PDA in inventory
-            if (_inventorySystem.TryGetContainerSlotEnumerator(user, out var containerSlotEnumerator))
-            {
-                while (containerSlotEnumerator.MoveNext(out var pdaUid))
-                {
-                    if (!pdaUid.ContainedEntity.HasValue) continue;
+        return true;
+    }
 
-                    if (HasComp<PdaComponent>(pdaUid.ContainedEntity.Value) || HasComp<StoreComponent>(pdaUid.ContainedEntity.Value))
-                        return pdaUid.ContainedEntity.Value;
-                }
-            }
+    /// <summary>
+    /// Configure TC for the uplink
+    /// </summary>
+    private void SetUplink(EntityUid user, EntityUid uplink, FixedPoint2 balance, bool giveDiscounts)
+    {
+        var store = EnsureComp<StoreComponent>(uplink);
+        store.AccountOwner = user;
 
-            // Also check hands
-            foreach (var item in _handsSystem.EnumerateHeld(user))
+        store.Balance.Clear();
+        _store.TryAddCurrency(new Dictionary<string, FixedPoint2> { { TelecrystalCurrencyPrototype, balance } },
+            uplink,
+            store);
+
+        var uplinkInitializedEvent = new StoreInitializedEvent(
+            TargetUser: user,
+            Store: uplink,
+            UseDiscounts: giveDiscounts,
+            Listings: _store.GetAvailableListings(user, uplink, store)
+                .ToArray());
+        RaiseLocalEvent(ref uplinkInitializedEvent);
+    }
+
+    /// <summary>
+    /// Implant an uplink as a fallback measure if the traitor had no PDA
+    /// </summary>
+    private bool ImplantUplink(EntityUid user, FixedPoint2 balance, bool giveDiscounts)
+    {
+        var implantProto = new string(FallbackUplinkImplant);
+
+        if (!_proto.TryIndex<ListingPrototype>(FallbackUplinkCatalog, out var catalog))
+            return false;
+
+        if (!catalog.Cost.TryGetValue(TelecrystalCurrencyPrototype, out var cost))
+            return false;
+
+        if (balance < cost) // Can't use Math functions on FixedPoint2
+            balance = 0;
+        else
+            balance = balance - cost;
+
+        var implant = _subdermalImplant.AddImplant(user, implantProto);
+
+        if (!HasComp<StoreComponent>(implant))
+            return false;
+
+        SetUplink(user, implant.Value, balance, giveDiscounts);
+        return true;
+    }
+
+    /// <summary>
+    /// Finds the entity that can hold an uplink for a user.
+    /// Usually this is a pda in their pda slot, but can also be in their hands. (but not pockets or inside bag, etc.)
+    /// </summary>
+    public EntityUid? FindUplinkTarget(EntityUid user)
+    {
+        // Try to find PDA in inventory
+        if (_inventorySystem.TryGetContainerSlotEnumerator(user, out var containerSlotEnumerator))
+        {
+            while (containerSlotEnumerator.MoveNext(out var pdaUid))
             {
-                if (HasComp<PdaComponent>(item) || HasComp<StoreComponent>(item))
-                    return item;
+                if (!pdaUid.ContainedEntity.HasValue)
+                    continue;
+
+                if (HasComp<PdaComponent>(pdaUid.ContainedEntity.Value) || HasComp<StoreComponent>(pdaUid.ContainedEntity.Value))
+                    return pdaUid.ContainedEntity.Value;
             }
+        }
 
-            return null;
+        // Also check hands
+        foreach (var item in _handsSystem.EnumerateHeld(user))
+        {
+            if (HasComp<PdaComponent>(item) || HasComp<StoreComponent>(item))
+                return item;
         }
+
+        return null;
     }
 }
diff --git a/Content.Shared/Implants/SharedSubdermalImplantSystem.cs b/Content.Shared/Implants/SharedSubdermalImplantSystem.cs
index a43d4fca723..e1d65003a65 100644
--- a/Content.Shared/Implants/SharedSubdermalImplantSystem.cs
+++ b/Content.Shared/Implants/SharedSubdermalImplantSystem.cs
@@ -96,20 +96,36 @@ private void OnRemove(EntityUid uid, SubdermalImplantComponent component, EntGot
     /// </summary>
     public void AddImplants(EntityUid uid, IEnumerable<String> implants)
     {
-        var coords = Transform(uid).Coordinates;
         foreach (var id in implants)
         {
-            var ent = Spawn(id, coords);
-            if (TryComp<SubdermalImplantComponent>(ent, out var implant))
-            {
-                ForceImplant(uid, ent, implant);
-            }
-            else
-            {
-                Log.Warning($"Found invalid starting implant '{id}' on {uid} {ToPrettyString(uid):implanted}");
-                Del(ent);
-            }
+            AddImplant(uid, id);
+        }
+    }
+
+    /// <summary>
+    /// Adds a single implant to a person, and returns the implant.
+    /// Logs any implant ids that don't have <see cref="SubdermalImplantComponent"/>.
+    /// </summary>
+    /// <returns>
+    /// The implant, if it was successfully created. Otherwise, null.
+    /// </returns>>
+    public EntityUid? AddImplant(EntityUid uid, String implantId)
+    {
+        var coords = Transform(uid).Coordinates;
+        var ent = Spawn(implantId, coords);
+
+        if (TryComp<SubdermalImplantComponent>(ent, out var implant))
+        {
+            ForceImplant(uid, ent, implant);
+        }
+        else
+        {
+            Log.Warning($"Found invalid starting implant '{implantId}' on {uid} {ToPrettyString(uid):implanted}");
+            Del(ent);
+            return null;
         }
+
+        return ent;
     }
 
     /// <summary>
diff --git a/Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl b/Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl
index e92676a2160..c32718d6a8b 100644
--- a/Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl
+++ b/Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl
@@ -26,7 +26,7 @@ traitor-death-match-end-round-description-entry = {$originalName}'s PDA, with {$
 traitor-role-greeting =
     You are an agent sent by {$corporation} on behalf of The Syndicate.
     Your objectives and codewords are listed in the character menu.
-    Use the uplink loaded into your PDA to buy the tools you'll need for this mission.
+    Use your uplink to buy the tools you'll need for this mission.
     Death to Nanotrasen!
 traitor-role-codewords =
     The codewords are:
@@ -36,9 +36,13 @@ traitor-role-codewords =
 traitor-role-uplink-code =
     Set your ringtone to the notes {$code} to lock or unlock your uplink.
     Remember to lock it after, or the stations crew will easily open it too!
+traitor-role-uplink-implant =
+    Your uplink implant has been activated, access it from your hotbar.
+    The uplink is secure unless someone removes it from your body.
 
 # don't need all the flavour text for character menu
 traitor-role-codewords-short =
     The codewords are:
     {$codewords}.
 traitor-role-uplink-code-short = Your uplink code is {$code}. Set it as your PDA ringtone to access uplink.
+traitor-role-uplink-implant-short = Your uplink was implanted. Access it from your hotbar.
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 5aa41301d77..c7018ae0e1b 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1418,8 +1418,7 @@
   components:
     # make the player a traitor once its taken
   - type: AutoTraitor
-    giveUplink: false
-    giveObjectives: false
+    profile: TraitorReinforcement
 
 - type: entity
   id: MobMonkeySyndicateAgentNukeops # Reinforcement exclusive to nukeops uplink
@@ -1583,8 +1582,7 @@
   components:
     # make the player a traitor once its taken
   - type: AutoTraitor
-    giveUplink: false
-    giveObjectives: false
+    profile: TraitorReinforcement
 
 - type: entity
   id: MobKoboldSyndicateAgentNukeops # Reinforcement exclusive to nukeops uplink
diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml
index a7fb7de2f87..d76e698183e 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml
@@ -25,10 +25,9 @@
   name: syndicate agent
   suffix: Human, Traitor
   components:
-    # make the player a traitor once its taken
-    - type: AutoTraitor
-      giveUplink: false
-      giveObjectives: false
+  # make the player a traitor once its taken
+  - type: AutoTraitor
+    profile: TraitorReinforcement
 
 - type: entity
   parent: MobHumanSyndicateAgentBase
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index 80354861ade..f47c2651c91 100644
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -176,6 +176,15 @@
       - type: TraitorRole
         prototype: Traitor
 
+- type: entity
+  id: TraitorReinforcement
+  parent: Traitor
+  components:
+  - type: TraitorRule
+    giveUplink: false
+    giveCodewords: false # It would actually give them a different set of codewords than the regular traitors, anyway
+    giveBriefing: false
+
 - type: entity
   id: Revolutionary
   parent: BaseGameRule
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
index 45d41631c2e..e19f2ae6547 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
@@ -14,47 +14,29 @@
   <Box>
     <GuideEntityEmbed Entity="Telecrystal" Caption="Telecrystals"/>
   </Box>
-  - [color=#a4885c]Telecrystals[/color] are given at the start to give traitors an edge on the station. Other traitors can trade their [color=#a4885c]telecrystals[/color] to each other exceeding the normal given amount.
-  - Using your [color=#a4885c]PDA[/color] and setting the ringtone as your uplink code gives you a variety of options to use at your disposal against the station and its crew.
-  <Box>
-  <GuideEntityEmbed Entity="PassengerPDA" Caption="PDA"/>
-  </Box>
-  Make sure to relock your [color=#a4885c]PDA[/color] to prevent anyone else from seeing it!
-  - Various gear include:
-  <Box>
-    <GuideEntityEmbed Entity="WeaponPistolViper" Caption="Guns"/>
-    <GuideEntityEmbed Entity="FireAxe" State="icon" Caption="Melee"/>
-    <GuideEntityEmbed Entity="C4" Caption=" Explosives"/>
-    <GuideEntityEmbed Entity="Syringe" Caption="Implants"/>
-    <GuideEntityEmbed Entity="ClothingBackpackDuffelSyndicate" Caption="Bundles"/>
-  </Box>
+  Traitors are antagonists employed by the [color=#ff0000]Syndicate.[/color] You are a sleeper agent who has access to various tools and weapons through your [bold]uplink[/bold].
+  You also receive [bold]codewords[/bold] to identify other agents, and a coordinated team of traitors can have [italic]brutal results.[/italic]
 
-  ## Objectives
+  Anyone besides [textlink="department heads" link="Command"] or members of [textlink="Security" link="Security"] can be a traitor.
 
-  - When becoming a Traitor, you will have a list of objectives, ranging from escape alive, stealing something, and killing someone. Using the [color=#a4885c]Uplink[/color] will help you with most of these tasks.
+  ## Uplink & Activation
+  The [color=cyan]uplink[/color] is your most important tool as a traitor. You can exchange the 20 [color=red]telecrystals[/color] (TC) you start with for items that will help you with your objectives.
 
-  ## List of Possible Tasks
+  By pressing [color=yellow][bold][keybind="OpenCharacterMenu"][/bold][/color], you'll see your personal uplink code. [bold]Setting your PDA's ringtone as this code will open the uplink.[/bold]
+  Pressing [color=yellow][bold][keybind="OpenCharacterMenu"][/bold][/color] also lets you view your objectives and the codewords.
 
-  - Kill or maroon a randomly selected non-traitor.
-  - Kill or maroon a randomly selected traitor.
-  - Kill or maroon a randomly selected department head.
-  - Keep a randomly selected traitor alive.
-  - Escape on the evacuation shuttle alive and uncuffed.
-  - Help a randomly selected traitor finish 2/3 of their objectives.
-  - Die a glorious death.
-  - Steal the Captain's [color=#a4885c]ID Card[/color].
-  <Box>
-    <GuideEntityEmbed Entity="CaptainIDCard" Caption="Captain's ID Card"/>
-  </Box>
-  - Steal the Captain's [color=#a4885c]Antique Laser Pistol[/color].
+  If you do not have a PDA when you are activated, an [color=cyan]uplink implant[/color] is provided [bold]for the full [color=red]TC[/color] price of the implant.[/bold]
+  It can be accessed from your hotbar.
   <Box>
-    <GuideEntityEmbed Entity="WeaponAntiqueLaser" Caption="Captain's Antique Laser Pistol"/>
-  </Box>
-  - Steal the Captain's [color=#a4885c]Jetpack[/color].
-  <Box>
-    <GuideEntityEmbed Entity="JetpackCaptainFilled" Caption="Captain's Jetpack"/>
+    <GuideEntityEmbed Entity="PassengerPDA" Caption="PDA"/>
+    <GuideEntityEmbed Entity="Telecrystal" Caption="Telecrystals"/>
+    <GuideEntityEmbed Entity="BaseUplinkRadio" Caption="Uplink Implant"/>
   </Box>
-  - Steal the Chief Medical Officer's [color=#a4885c]Hypospray[/color].
+
+  [bold]Make sure to close your PDA uplink to prevent anyone else from seeing it.[/bold] You don't want [color=#cb0000]Security[/color] to get their hands on this premium selection of contraband!
+
+  Implanted uplinks are not normally accessible to other people, so they do not have any security measures. They can, however, be removed from you with an empty implanter.
+
   <Box>
     <GuideEntityEmbed Entity="Hypospray" Caption="CMO's Hypospray"/>
   </Box>

From dec945050470d29b9bdfbadfb6e23f10c1759434 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 03:07:49 -0400
Subject: [PATCH 027/366] Shhh...

---
 .../GameTicking/Rules/AntagLoadProfileRuleSystem.cs           | 2 +-
 Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs         | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Content.Server/GameTicking/Rules/AntagLoadProfileRuleSystem.cs b/Content.Server/GameTicking/Rules/AntagLoadProfileRuleSystem.cs
index fd3fb6cd655..c640c912a5f 100644
--- a/Content.Server/GameTicking/Rules/AntagLoadProfileRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/AntagLoadProfileRuleSystem.cs
@@ -34,6 +34,6 @@ private void OnSelectEntity(Entity<AntagLoadProfileRuleComponent> ent, ref Antag
             species = _proto.Index<SpeciesPrototype>(SharedHumanoidAppearanceSystem.DefaultSpecies);
 
         args.Entity = Spawn(species.Prototype);
-        _humanoid.LoadProfile(args.Entity.Value, profile);
+        _humanoid.LoadProfile(args.Entity.Value, profile!);
     }
 }
diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
index c3e8e90f843..3190a50701c 100644
--- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -22,6 +22,10 @@
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 using System.Linq;
+using Content.Server.NPC.Components;
+using Content.Server.NPC.Systems;
+using Content.Shared.GameTicking.Components;
+
 
 namespace Content.Server.GameTicking.Rules;
 

From 9cba113b469e6151824ff4b13ce13209b4a86fc2 Mon Sep 17 00:00:00 2001
From: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Date: Fri, 15 Nov 2024 15:46:01 -0800
Subject: [PATCH 028/366] Clumsy system refactor (#31147)

* First commit

* Fixes

* Added the noise

* Renames

* Timespan

* Fixed space

* entity -> ent

* This shouldn't work

* opps....

* Datafield name change

* Better comments

* small comment

* Personal skill issue

* Event renames and stuff

* Couple fixes

* Defib ref fixes (Silly me)

* Added clumsy back!

* no hard code clumsy!

* Identity fix

* Event name change

* Comment change

* Function name change

* opp

* Update names

* Damage stuff!

* Fixes!

* Fixes

* opps

* This was hidden away!!

* negative diff feeds me
---
 .../Systems/AdminVerbSystem.Smites.cs         |   1 +
 .../Administration/Systems/SuperBonkSystem.cs |  22 +--
 .../EntitySystems/HypospraySystem.cs          |  43 +++++-
 Content.Server/Cluwne/CluwneSystem.cs         |   2 +
 Content.Server/Medical/DefibrillatorSystem.cs |  74 +++++++--
 .../Weapons/Ranged/Systems/GunSystem.cs       |  30 +---
 .../Components/HyposprayComponent.cs          |   5 -
 .../Chemistry/Events/HyposprayEvents.cs       |  38 +++++
 .../Climbing/Components/BonkableComponent.cs  |  34 +---
 .../Climbing/Events/BeforeClimbEvents.cs      |  36 +++++
 Content.Shared/Climbing/Systems/BonkSystem.cs | 131 ----------------
 .../Climbing/Systems/ClimbSystem.cs           |  12 ++
 Content.Shared/Clumsy/ClumsyComponent.cs      |  61 ++++++++
 Content.Shared/Clumsy/ClumsySystem.cs         | 146 ++++++++++++++++++
 .../Interaction/Components/ClumsyComponent.cs |  24 ---
 .../SharedInteractionSystem.Clumsy.cs         |  26 ----
 .../Inventory/InventorySystem.Relay.cs        |  12 +-
 Content.Shared/Medical/DefibrillatorEvents.cs |  39 +++++
 .../Ranged/Events/BeforeGunShootEvent.cs      |  20 +++
 .../bonk/components/bonkable-component.ftl    |   6 +-
 .../Prototypes/Entities/Mobs/NPCs/animals.yml |   4 +-
 .../Entities/Mobs/Player/guardian.yml         |   2 +-
 .../Furniture/Tables/base_structuretables.yml |   2 -
 .../Prototypes/Roles/Jobs/Civilian/clown.yml  |   2 +-
 24 files changed, 490 insertions(+), 282 deletions(-)
 create mode 100644 Content.Shared/Chemistry/Events/HyposprayEvents.cs
 create mode 100644 Content.Shared/Climbing/Events/BeforeClimbEvents.cs
 delete mode 100644 Content.Shared/Climbing/Systems/BonkSystem.cs
 create mode 100644 Content.Shared/Clumsy/ClumsyComponent.cs
 create mode 100644 Content.Shared/Clumsy/ClumsySystem.cs
 delete mode 100644 Content.Shared/Interaction/Components/ClumsyComponent.cs
 delete mode 100644 Content.Shared/Interaction/SharedInteractionSystem.Clumsy.cs
 create mode 100644 Content.Shared/Medical/DefibrillatorEvents.cs
 create mode 100644 Content.Shared/Weapons/Ranged/Events/BeforeGunShootEvent.cs

diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
index bda60e9449a..183607db1a1 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
@@ -22,6 +22,7 @@
 using Content.Shared.Administration.Components;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Part;
+using Content.Shared.Clumsy;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Cluwne;
 using Content.Shared.Damage;
diff --git a/Content.Server/Administration/Systems/SuperBonkSystem.cs b/Content.Server/Administration/Systems/SuperBonkSystem.cs
index 5488a8d6f46..5cd62d83572 100644
--- a/Content.Server/Administration/Systems/SuperBonkSystem.cs
+++ b/Content.Server/Administration/Systems/SuperBonkSystem.cs
@@ -1,27 +1,27 @@
 using Content.Server.Administration.Components;
 using Content.Shared.Climbing.Components;
-using Content.Shared.Climbing.Events;
-using Content.Shared.Climbing.Systems;
-using Content.Shared.Interaction.Components;
+using Content.Shared.Clumsy;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
+using Robust.Shared.Audio.Systems;
 
 namespace Content.Server.Administration.Systems;
 
-public sealed class SuperBonkSystem: EntitySystem
+public sealed class SuperBonkSystem : EntitySystem
 {
     [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
-    [Dependency] private readonly BonkSystem _bonkSystem = default!;
+    [Dependency] private readonly ClumsySystem _clumsySystem = default!;
+    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<SuperBonkComponent, ComponentShutdown>(OnBonkShutdown);
         SubscribeLocalEvent<SuperBonkComponent, MobStateChangedEvent>(OnMobStateChanged);
+        SubscribeLocalEvent<SuperBonkComponent, ComponentShutdown>(OnBonkShutdown);
     }
 
-    public void StartSuperBonk(EntityUid target, float delay = 0.1f, bool stopWhenDead = false )
+    public void StartSuperBonk(EntityUid target, float delay = 0.1f, bool stopWhenDead = false)
     {
 
         //The other check in the code to stop when the target dies does not work if the target is already dead.
@@ -31,7 +31,6 @@ public void StartSuperBonk(EntityUid target, float delay = 0.1f, bool stopWhenDe
                 return;
         }
 
-
         var hadClumsy = EnsureComp<ClumsyComponent>(target, out _);
 
         var tables = EntityQueryEnumerator<BonkableComponent>();
@@ -79,16 +78,17 @@ public override void Update(float frameTime)
     private void Bonk(SuperBonkComponent comp)
     {
         var uid = comp.Tables.Current.Key;
-        var bonkComp = comp.Tables.Current.Value;
 
         // It would be very weird for something without a transform component to have a bonk component
         // but just in case because I don't want to crash the server.
-        if (!HasComp<TransformComponent>(uid))
+        if (!HasComp<TransformComponent>(uid) || !TryComp<ClumsyComponent>(comp.Target, out var clumsyComp))
             return;
 
         _transformSystem.SetCoordinates(comp.Target, Transform(uid).Coordinates);
 
-        _bonkSystem.TryBonk(comp.Target, uid, bonkComp);
+        _clumsySystem.HitHeadClumsy((comp.Target, clumsyComp), uid);
+
+        _audioSystem.PlayPvs(clumsyComp.TableBonkSound, comp.Target);
     }
 
     private void OnMobStateChanged(EntityUid uid, SuperBonkComponent comp, MobStateChangedEvent args)
diff --git a/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs b/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
index 56cc0f96709..7f0b797468c 100644
--- a/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
@@ -1,7 +1,8 @@
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Hypospray.Events;
+using Content.Shared.Chemistry;
 using Content.Shared.Database;
 using Content.Shared.FixedPoint;
 using Content.Shared.Forensics;
@@ -88,14 +89,44 @@ public bool TryDoInject(Entity<HyposprayComponent> entity, EntityUid target, Ent
 
         string? msgFormat = null;
 
-        if (target == user)
-            msgFormat = "hypospray-component-inject-self-message";
-        else if (EligibleEntity(user, EntityManager, component) && _interaction.TryRollClumsy(user, component.ClumsyFailChance))
+        // Self event
+        var selfEvent = new SelfBeforeHyposprayInjectsEvent(user, entity.Owner, target);
+        RaiseLocalEvent(user, selfEvent);
+
+        if (selfEvent.Cancelled)
+        {
+            _popup.PopupEntity(Loc.GetString(selfEvent.InjectMessageOverride ?? "hypospray-cant-inject", ("owner", Identity.Entity(target, EntityManager))), target, user);
+            return false;
+        }
+
+        target = selfEvent.TargetGettingInjected;
+
+        if (!EligibleEntity(target, EntityManager, component))
+            return false;
+
+        // Target event
+        var targetEvent = new TargetBeforeHyposprayInjectsEvent(user, entity.Owner, target);
+        RaiseLocalEvent(target, targetEvent);
+
+        if (targetEvent.Cancelled)
         {
-            msgFormat = "hypospray-component-inject-self-clumsy-message";
-            target = user;
+            _popup.PopupEntity(Loc.GetString(targetEvent.InjectMessageOverride ?? "hypospray-cant-inject", ("owner", Identity.Entity(target, EntityManager))), target, user);
+            return false;
         }
 
+        target = targetEvent.TargetGettingInjected;
+
+        if (!EligibleEntity(target, EntityManager, component))
+            return false;
+
+        // The target event gets priority for the overriden message.
+        if (targetEvent.InjectMessageOverride != null)
+            msgFormat = targetEvent.InjectMessageOverride;
+        else if (selfEvent.InjectMessageOverride != null)
+            msgFormat = selfEvent.InjectMessageOverride;
+        else if (target == user)
+            msgFormat = "hypospray-component-inject-self-message";
+
         if (!_solutionContainers.TryGetSolution(uid, component.SolutionName, out var hypoSpraySoln, out var hypoSpraySolution) || hypoSpraySolution.Volume == 0)
         {
             _popup.PopupEntity(Loc.GetString("hypospray-component-empty-message"), target, user);
diff --git a/Content.Server/Cluwne/CluwneSystem.cs b/Content.Server/Cluwne/CluwneSystem.cs
index bd7b7a66201..0e8669a0314 100644
--- a/Content.Server/Cluwne/CluwneSystem.cs
+++ b/Content.Server/Cluwne/CluwneSystem.cs
@@ -17,6 +17,8 @@
 using Content.Shared.Interaction.Components;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
+using Content.Shared.NameModifier.EntitySystems;
+using Content.Shared.Clumsy;
 
 namespace Content.Server.Cluwne;
 
diff --git a/Content.Server/Medical/DefibrillatorSystem.cs b/Content.Server/Medical/DefibrillatorSystem.cs
index d0c650c4e84..45e31cef5bb 100644
--- a/Content.Server/Medical/DefibrillatorSystem.cs
+++ b/Content.Server/Medical/DefibrillatorSystem.cs
@@ -78,7 +78,20 @@ private void OnDoAfter(EntityUid uid, DefibrillatorComponent component, Defibril
         Zap(uid, target, args.User, component);
     }
 
-    public bool CanZap(EntityUid uid, EntityUid target, EntityUid? user = null, DefibrillatorComponent? component = null)
+    /// <summary>
+    ///     Checks if you can actually defib a target.
+    /// </summary>
+    /// <param name="uid">Uid of the defib</param>
+    /// <param name="target">Uid of the target getting defibbed</param>
+    /// <param name="user">Uid of the entity using the defibrillator</param>
+    /// <param name="component">Defib component</param>
+    /// <param name="targetCanBeAlive">
+    ///     If true, the target can be alive. If false, the function will check if the target is alive and will return false if they are.
+    /// </param>
+    /// <returns>
+    ///     Returns true if the target is valid to be defibed, false otherwise.
+    /// </returns>
+    public bool CanZap(EntityUid uid, EntityUid target, EntityUid? user = null, DefibrillatorComponent? component = null, bool targetCanBeAlive = false)
     {
         if (!Resolve(uid, ref component))
             return false;
@@ -99,12 +112,25 @@ public bool CanZap(EntityUid uid, EntityUid target, EntityUid? user = null, Defi
         if (!_powerCell.HasActivatableCharge(uid, user: user))
             return false;
 
-        if (_mobState.IsAlive(target, mobState))
+        if (!targetCanBeAlive && _mobState.IsAlive(target, mobState))
+            return false;
+
+        if (!targetCanBeAlive && !component.CanDefibCrit && _mobState.IsCritical(target, mobState))
             return false;
 
         return true;
     }
 
+    /// <summary>
+    ///     Tries to start defibrillating the target. If the target is valid, will start the defib do-after.
+    /// </summary>
+    /// <param name="uid">Uid of the defib</param>
+    /// <param name="target">Uid of the target getting defibbed</param>
+    /// <param name="user">Uid of the entity using the defibrillator</param>
+    /// <param name="component">Defib component</param>
+    /// <returns>
+    ///     Returns true if the defibrillation do-after started, otherwise false.
+    /// </returns>
     public bool TryStartZap(EntityUid uid, EntityUid target, EntityUid user, DefibrillatorComponent? component = null)
     {
         if (!Resolve(uid, ref component))
@@ -116,28 +142,42 @@ public bool TryStartZap(EntityUid uid, EntityUid target, EntityUid user, Defibri
         _audio.PlayPvs(component.ChargeSound, uid);
         return _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, component.DoAfterDuration, new DefibrillatorZapDoAfterEvent(),
             uid, target, uid)
-            {
-                BlockDuplicate = true,
-                BreakOnUserMove = true,
-                BreakOnTargetMove = true,
-                BreakOnHandChange = true,
-                NeedHand = true
-            });
+        {
+            NeedHand = true,
+            BreakOnMove = !component.AllowDoAfterMovement
+        });
     }
 
-    public void Zap(EntityUid uid, EntityUid target, EntityUid user, DefibrillatorComponent? component = null, MobStateComponent? mob = null, MobThresholdsComponent? thresholds = null)
+    /// <summary>
+    ///     Tries to defibrillate the target with the given defibrillator.
+    /// </summary>
+    public void Zap(EntityUid uid, EntityUid target, EntityUid user, DefibrillatorComponent? component = null)
     {
-        if (!Resolve(uid, ref component) || !Resolve(target, ref mob, ref thresholds, false))
+        if (!Resolve(uid, ref component))
             return;
 
-        // clowns zap themselves
-        if (HasComp<ClumsyComponent>(user) && user != target)
-        {
-            Zap(uid, user, user, component);
+        if (!_powerCell.TryUseActivatableCharge(uid, user: user))
             return;
-        }
 
-        if (!_powerCell.TryUseActivatableCharge(uid, user: user))
+        var selfEvent = new SelfBeforeDefibrillatorZapsEvent(user, uid, target);
+        RaiseLocalEvent(user, selfEvent);
+
+        target = selfEvent.DefibTarget;
+
+        // Ensure thet new target is still valid.
+        if (selfEvent.Cancelled || !CanZap(uid, target, user, component, true))
+            return;
+
+        var targetEvent = new TargetBeforeDefibrillatorZapsEvent(user, uid, target);
+        RaiseLocalEvent(target, targetEvent);
+
+        target = targetEvent.DefibTarget;
+
+        if (targetEvent.Cancelled || !CanZap(uid, target, user, component, true))
+            return;
+
+        if (!TryComp<MobStateComponent>(target, out var mob) ||
+            !TryComp<MobThresholdsComponent>(target, out var thresholds))
             return;
 
         _audio.PlayPvs(component.ZapSound, uid);
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index cbbfc289cf5..e472d146de6 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -1,16 +1,13 @@
 using System.Linq;
 using System.Numerics;
 using Content.Server.Cargo.Systems;
-using Content.Server.Interaction;
 using Content.Server.Power.EntitySystems;
-using Content.Server.Stunnable;
 using Content.Server.Weapons.Ranged.Components;
 using Content.Shared.Contests;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
 using Content.Shared.Effects;
-using Content.Shared.Interaction.Components;
 using Content.Shared.Projectiles;
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Ranged;
@@ -32,16 +29,13 @@ public sealed partial class GunSystem : SharedGunSystem
     [Dependency] private readonly IComponentFactory _factory = default!;
     [Dependency] private readonly BatterySystem _battery = default!;
     [Dependency] private readonly DamageExamineSystem _damageExamine = default!;
-    [Dependency] private readonly InteractionSystem _interaction = default!;
     [Dependency] private readonly PricingSystem _pricing = default!;
     [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly StaminaSystem _stamina = default!;
-    [Dependency] private readonly StunSystem _stun = default!;
     [Dependency] private readonly ContestsSystem _contests = default!;
 
     private const float DamagePitchVariation = 0.05f;
-    public const float GunClumsyChance = 0.5f;
 
     public override void Initialize()
     {
@@ -70,26 +64,14 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
     {
         userImpulse = true;
 
-        // Try a clumsy roll
-        // TODO: Who put this here
-        if (TryComp<ClumsyComponent>(user, out var clumsy) && gun.ClumsyProof == false)
+        if (user != null)
         {
-            for (var i = 0; i < ammo.Count; i++)
+            var selfEvent = new SelfBeforeGunShotEvent(user.Value, (gunUid, gun), ammo);
+            RaiseLocalEvent(user.Value, selfEvent);
+            if (selfEvent.Cancelled)
             {
-                if (_interaction.TryRollClumsy(user.Value, GunClumsyChance, clumsy))
-                {
-                    // Wound them
-                    Damageable.TryChangeDamage(user, clumsy.ClumsyDamage, origin: user);
-                    _stun.TryParalyze(user.Value, TimeSpan.FromSeconds(3f), true);
-
-                    // Apply salt to the wound ("Honk!")
-                    Audio.PlayPvs(new SoundPathSpecifier("/Audio/Weapons/Guns/Gunshots/bang.ogg"), gunUid);
-                    Audio.PlayPvs(clumsy.ClumsySound, gunUid);
-
-                    PopupSystem.PopupEntity(Loc.GetString("gun-clumsy"), user.Value);
-                    userImpulse = false;
-                    return;
-                }
+                userImpulse = false;
+                return;
             }
         }
 
diff --git a/Content.Shared/Chemistry/Components/HyposprayComponent.cs b/Content.Shared/Chemistry/Components/HyposprayComponent.cs
index 05ef84bbaf7..17d52f0ad93 100644
--- a/Content.Shared/Chemistry/Components/HyposprayComponent.cs
+++ b/Content.Shared/Chemistry/Components/HyposprayComponent.cs
@@ -11,11 +11,6 @@ public sealed partial class HyposprayComponent : Component
     [DataField]
     public string SolutionName = "hypospray";
 
-    // TODO: This should be on clumsycomponent.
-    [DataField]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public float ClumsyFailChance = 0.5f;
-
     [DataField]
     [ViewVariables(VVAccess.ReadWrite)]
     public FixedPoint2 TransferAmount = FixedPoint2.New(5);
diff --git a/Content.Shared/Chemistry/Events/HyposprayEvents.cs b/Content.Shared/Chemistry/Events/HyposprayEvents.cs
new file mode 100644
index 00000000000..e8ed081a577
--- /dev/null
+++ b/Content.Shared/Chemistry/Events/HyposprayEvents.cs
@@ -0,0 +1,38 @@
+using Content.Shared.Inventory;
+
+namespace Content.Shared.Chemistry.Hypospray.Events;
+
+public abstract partial class BeforeHyposprayInjectsTargetEvent : CancellableEntityEventArgs, IInventoryRelayEvent
+{
+    public SlotFlags TargetSlots { get; } = SlotFlags.WITHOUT_POCKET;
+    public EntityUid EntityUsingHypospray;
+    public readonly EntityUid Hypospray;
+    public EntityUid TargetGettingInjected;
+    public string? InjectMessageOverride;
+
+    public BeforeHyposprayInjectsTargetEvent(EntityUid user, EntityUid hypospray, EntityUid target)
+    {
+        EntityUsingHypospray = user;
+        Hypospray = hypospray;
+        TargetGettingInjected = target;
+        InjectMessageOverride = null;
+    }
+}
+
+/// <summary>
+///     This event is raised on the user using the hypospray before the hypospray is injected.
+///     The event is triggered on the user and all their clothing.
+/// </summary>
+public sealed class SelfBeforeHyposprayInjectsEvent : BeforeHyposprayInjectsTargetEvent
+{
+    public SelfBeforeHyposprayInjectsEvent(EntityUid user, EntityUid hypospray, EntityUid target) : base(user, hypospray, target) { }
+}
+
+/// <summary>
+///     This event is raised on the target before the hypospray is injected.
+///     The event is triggered on the target itself and all its clothing.
+/// </summary>
+public sealed class TargetBeforeHyposprayInjectsEvent  : BeforeHyposprayInjectsTargetEvent
+{
+    public TargetBeforeHyposprayInjectsEvent (EntityUid user, EntityUid hypospray, EntityUid target) : base(user, hypospray, target) { }
+}
diff --git a/Content.Shared/Climbing/Components/BonkableComponent.cs b/Content.Shared/Climbing/Components/BonkableComponent.cs
index 5e97396fbad..cb4839cae71 100644
--- a/Content.Shared/Climbing/Components/BonkableComponent.cs
+++ b/Content.Shared/Climbing/Components/BonkableComponent.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Damage;
-using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Climbing.Components;
@@ -8,39 +7,18 @@ namespace Content.Shared.Climbing.Components;
 ///     Makes entity do damage and stun entities with ClumsyComponent
 ///     upon DragDrop or Climb interactions.
 /// </summary>
-[RegisterComponent, NetworkedComponent, Access(typeof(Systems.BonkSystem))]
+[RegisterComponent, NetworkedComponent]
 public sealed partial class BonkableComponent : Component
 {
     /// <summary>
-    /// Chance of bonk triggering if the user is clumsy.
+    ///     How long to stun players on bonk, in seconds.
     /// </summary>
-    [DataField("bonkClumsyChance")]
-    public float BonkClumsyChance = 0.5f;
+    [DataField]
+    public TimeSpan BonkTime = TimeSpan.FromSeconds(2);
 
     /// <summary>
-    /// Sound to play when bonking.
+    ///     How much damage to apply on bonk.
     /// </summary>
-    /// <seealso cref="Bonk"/>
-    [DataField("bonkSound")]
-    public SoundSpecifier? BonkSound;
-
-    /// <summary>
-    /// How long to stun players on bonk, in seconds.
-    /// </summary>
-    /// <seealso cref="Bonk"/>
-    [DataField("bonkTime")]
-    public float BonkTime = 2;
-
-    /// <summary>
-    /// How much damage to apply on bonk.
-    /// </summary>
-    /// <seealso cref="Bonk"/>
-    [DataField("bonkDamage")]
+    [DataField]
     public DamageSpecifier? BonkDamage;
-
-    /// <summary>
-    /// How long it takes to bonk.
-    /// </summary>
-    [DataField("bonkDelay")]
-    public float BonkDelay = 1.5f;
 }
diff --git a/Content.Shared/Climbing/Events/BeforeClimbEvents.cs b/Content.Shared/Climbing/Events/BeforeClimbEvents.cs
new file mode 100644
index 00000000000..85c40f9427c
--- /dev/null
+++ b/Content.Shared/Climbing/Events/BeforeClimbEvents.cs
@@ -0,0 +1,36 @@
+using Content.Shared.Inventory;
+using Content.Shared.Climbing.Components;
+
+namespace Content.Shared.Climbing.Events;
+
+public abstract partial class BeforeClimbEvent : CancellableEntityEventArgs
+{
+    public readonly EntityUid GettingPutOnTable;
+    public readonly EntityUid PuttingOnTable;
+    public readonly Entity<ClimbableComponent> BeingClimbedOn;
+
+    public BeforeClimbEvent(EntityUid gettingPutOntable, EntityUid puttingOnTable, Entity<ClimbableComponent> beingClimbedOn)
+    {
+        GettingPutOnTable = gettingPutOntable;
+        PuttingOnTable = puttingOnTable;
+        BeingClimbedOn = beingClimbedOn;
+    }
+}
+
+/// <summary>
+///     This event is raised on the the person either getting put on or going on the table.
+///     The event is also called on their clothing as well.
+/// </summary>
+public sealed class SelfBeforeClimbEvent : BeforeClimbEvent, IInventoryRelayEvent
+{
+    public SlotFlags TargetSlots { get; } = SlotFlags.WITHOUT_POCKET;
+    public SelfBeforeClimbEvent(EntityUid gettingPutOntable, EntityUid puttingOnTable, Entity<ClimbableComponent> beingClimbedOn) : base(gettingPutOntable, puttingOnTable, beingClimbedOn) { }
+}
+
+/// <summary>
+///     This event is raised on the thing being climbed on.
+/// </summary>
+public sealed class TargetBeforeClimbEvent : BeforeClimbEvent
+{
+    public TargetBeforeClimbEvent(EntityUid gettingPutOntable, EntityUid puttingOnTable, Entity<ClimbableComponent> beingClimbedOn) : base(gettingPutOntable, puttingOnTable, beingClimbedOn) { }
+}
diff --git a/Content.Shared/Climbing/Systems/BonkSystem.cs b/Content.Shared/Climbing/Systems/BonkSystem.cs
deleted file mode 100644
index c7c89a3b7fa..00000000000
--- a/Content.Shared/Climbing/Systems/BonkSystem.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-using Content.Shared.CCVar;
-using Content.Shared.Climbing.Components;
-using Content.Shared.Climbing.Events;
-using Content.Shared.Damage;
-using Content.Shared.DoAfter;
-using Content.Shared.DragDrop;
-using Content.Shared.Hands.Components;
-using Content.Shared.IdentityManagement;
-using Content.Shared.Interaction;
-using Content.Shared.Interaction.Components;
-using Content.Shared.Popups;
-using Content.Shared.Stunnable;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Configuration;
-using Robust.Shared.Player;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Climbing.Systems;
-
-public sealed partial class BonkSystem : EntitySystem
-{
-    [Dependency] private readonly IConfigurationManager _cfg = default!;
-    [Dependency] private readonly DamageableSystem _damageableSystem = default!;
-    [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
-    [Dependency] private readonly SharedStunSystem _stunSystem = default!;
-    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
-    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<BonkableComponent, BonkDoAfterEvent>(OnBonkDoAfter);
-        SubscribeLocalEvent<BonkableComponent, AttemptClimbEvent>(OnAttemptClimb);
-    }
-
-    private void OnBonkDoAfter(EntityUid uid, BonkableComponent component, BonkDoAfterEvent args)
-    {
-        if (args.Handled || args.Cancelled || args.Args.Used == null)
-            return;
-
-        TryBonk(args.Args.Used.Value, uid, component, source: args.Args.User);
-
-        args.Handled = true;
-    }
-
-
-    public bool TryBonk(EntityUid user, EntityUid bonkableUid, BonkableComponent? bonkableComponent = null, EntityUid? source = null)
-    {
-        if (!Resolve(bonkableUid, ref bonkableComponent, false))
-            return false;
-
-        // BONK!
-        var userName = Identity.Entity(user, EntityManager);
-        var bonkableName = Identity.Entity(bonkableUid, EntityManager);
-
-        if (user == source)
-        {
-            // Non-local, non-bonking players
-            var othersMessage = Loc.GetString("bonkable-success-message-others", ("user", userName), ("bonkable", bonkableName));
-            // Local, bonking player
-            var selfMessage = Loc.GetString("bonkable-success-message-user", ("user", userName), ("bonkable", bonkableName));
-
-            _popupSystem.PopupPredicted(selfMessage, othersMessage, user, user);
-        }
-        else if (source != null)
-        {
-            // Local, non-bonking player (dragger)
-            _popupSystem.PopupClient(Loc.GetString("bonkable-success-message-others", ("user", userName), ("bonkable", bonkableName)), user, source.Value);
-            // Non-local, non-bonking players
-            _popupSystem.PopupEntity(Loc.GetString("bonkable-success-message-others", ("user", userName), ("bonkable", bonkableName)), user, Filter.Pvs(user).RemoveWhereAttachedEntity(e => e == user || e == source.Value), true);
-            // Non-local, bonking player
-            _popupSystem.PopupEntity(Loc.GetString("bonkable-success-message-user", ("user", userName), ("bonkable", bonkableName)), user, user);
-        }
-
-
-
-        if (source != null)
-            _audioSystem.PlayPredicted(bonkableComponent.BonkSound, bonkableUid, source);
-        else
-            _audioSystem.PlayPvs(bonkableComponent.BonkSound, bonkableUid);
-
-        _stunSystem.TryParalyze(user, TimeSpan.FromSeconds(bonkableComponent.BonkTime), true);
-
-        if (bonkableComponent.BonkDamage is { } bonkDmg)
-            _damageableSystem.TryChangeDamage(user, bonkDmg, true, origin: user);
-
-        return true;
-
-    }
-
-    private bool TryStartBonk(EntityUid uid, EntityUid user, EntityUid climber, BonkableComponent? bonkableComponent = null)
-    {
-        if (!Resolve(uid, ref bonkableComponent, false))
-            return false;
-
-        if (!HasComp<ClumsyComponent>(climber) || !HasComp<HandsComponent>(user))
-            return false;
-
-        if (!_cfg.GetCVar(CCVars.GameTableBonk))
-        {
-            // Not set to always bonk, try clumsy roll.
-            if (!_interactionSystem.TryRollClumsy(climber, bonkableComponent.BonkClumsyChance))
-                return false;
-        }
-
-        var doAfterArgs = new DoAfterArgs(EntityManager, user, bonkableComponent.BonkDelay, new BonkDoAfterEvent(), uid, target: uid, used: climber)
-        {
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
-            BreakOnDamage = true,
-            DuplicateCondition = DuplicateConditions.SameTool | DuplicateConditions.SameTarget
-        };
-
-        return _doAfter.TryStartDoAfter(doAfterArgs);
-    }
-
-    private void OnAttemptClimb(EntityUid uid, BonkableComponent component, ref AttemptClimbEvent args)
-    {
-        if (args.Cancelled)
-            return;
-
-        if (TryStartBonk(uid, args.User, args.Climber, component))
-            args.Cancelled = true;
-    }
-
-    [Serializable, NetSerializable]
-    private sealed partial class BonkDoAfterEvent : SimpleDoAfterEvent
-    {
-    }
-}
diff --git a/Content.Shared/Climbing/Systems/ClimbSystem.cs b/Content.Shared/Climbing/Systems/ClimbSystem.cs
index d2b5a25aee7..36dc7c059e4 100644
--- a/Content.Shared/Climbing/Systems/ClimbSystem.cs
+++ b/Content.Shared/Climbing/Systems/ClimbSystem.cs
@@ -254,6 +254,18 @@ private void Climb(EntityUid uid, EntityUid user, EntityUid climbable, bool sile
         if (!Resolve(climbable, ref comp, false))
             return;
 
+        var selfEvent = new SelfBeforeClimbEvent(uid, user, (climbable, comp));
+        RaiseLocalEvent(uid, selfEvent);
+
+        if (selfEvent.Cancelled)
+            return;
+
+        var targetEvent = new TargetBeforeClimbEvent(uid, user, (climbable, comp));
+        RaiseLocalEvent(climbable, targetEvent);
+
+        if (targetEvent.Cancelled)
+            return;
+
         if (!ReplaceFixtures(uid, climbing, fixtures))
             return;
 
diff --git a/Content.Shared/Clumsy/ClumsyComponent.cs b/Content.Shared/Clumsy/ClumsyComponent.cs
new file mode 100644
index 00000000000..c71f5d0008a
--- /dev/null
+++ b/Content.Shared/Clumsy/ClumsyComponent.cs
@@ -0,0 +1,61 @@
+using Content.Shared.Damage;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Clumsy;
+
+/// <summary>
+/// A simple clumsy tag-component.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ClumsyComponent : Component
+{
+
+    // Standard options. Try to fit these in if you can!
+
+    /// <summary>
+    ///     Sound to play when clumsy interactions fail.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier ClumsySound = new SoundPathSpecifier("/Audio/Items/bikehorn.ogg");
+
+    /// <summary>
+    ///     Default chance to fail a clumsy interaction.
+    ///     If a system needs to use something else, add a new variable in the component, do not modify this percentage.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float ClumsyDefaultCheck = 0.5f;
+
+    /// <summary>
+    ///     Default stun time.
+    ///     If a system needs to use something else, add a new variable in the component, do not modify this number.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan ClumsyDefaultStunTime = TimeSpan.FromSeconds(2.5);
+
+    // Specific options
+
+    /// <summary>
+    ///     Sound to play after hitting your head on a table. Ouch!
+    /// </summary>
+    [DataField]
+    public SoundCollectionSpecifier TableBonkSound = new SoundCollectionSpecifier("TrayHit");
+
+    /// <summary>
+    ///     Stun time after failing to shoot a gun.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan GunShootFailStunTime = TimeSpan.FromSeconds(3);
+
+    /// <summary>
+    ///     Stun time after failing to shoot a gun.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public DamageSpecifier? GunShootFailDamage;
+
+    /// <summary>
+    ///     Noise to play after failing to shoot a gun. Boom!
+    /// </summary>
+    [DataField]
+    public SoundSpecifier GunShootFailSound = new SoundPathSpecifier("/Audio/Weapons/Guns/Gunshots/bang.ogg");
+}
diff --git a/Content.Shared/Clumsy/ClumsySystem.cs b/Content.Shared/Clumsy/ClumsySystem.cs
new file mode 100644
index 00000000000..e034458197f
--- /dev/null
+++ b/Content.Shared/Clumsy/ClumsySystem.cs
@@ -0,0 +1,146 @@
+using Content.Shared.CCVar;
+using Content.Shared.Chemistry.Hypospray.Events;
+using Content.Shared.Climbing.Components;
+using Content.Shared.Climbing.Events;
+using Content.Shared.Damage;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Medical;
+using Content.Shared.Popups;
+using Content.Shared.Stunnable;
+using Content.Shared.Weapons.Ranged.Events;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Configuration;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Clumsy;
+
+public sealed class ClumsySystem : EntitySystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedStunSystem _stun = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<ClumsyComponent, SelfBeforeHyposprayInjectsEvent>(BeforeHyposprayEvent);
+        SubscribeLocalEvent<ClumsyComponent, SelfBeforeDefibrillatorZapsEvent>(BeforeDefibrillatorZapsEvent);
+        SubscribeLocalEvent<ClumsyComponent, SelfBeforeGunShotEvent>(BeforeGunShotEvent);
+        SubscribeLocalEvent<ClumsyComponent, SelfBeforeClimbEvent>(OnBeforeClimbEvent);
+    }
+
+    // If you add more clumsy interactions add them in this section!
+    #region Clumsy interaction events
+    private void BeforeHyposprayEvent(Entity<ClumsyComponent> ent, ref SelfBeforeHyposprayInjectsEvent args)
+    {
+        // Clumsy people sometimes inject themselves! Apparently syringes are clumsy proof...
+        if (!_random.Prob(ent.Comp.ClumsyDefaultCheck))
+            return;
+
+        args.TargetGettingInjected = args.EntityUsingHypospray;
+        args.InjectMessageOverride = "hypospray-component-inject-self-clumsy-message";
+        _audio.PlayPvs(ent.Comp.ClumsySound, ent);
+    }
+
+    private void BeforeDefibrillatorZapsEvent(Entity<ClumsyComponent> ent, ref SelfBeforeDefibrillatorZapsEvent args)
+    {
+        // Clumsy people sometimes defib themselves!
+        if (!_random.Prob(ent.Comp.ClumsyDefaultCheck))
+            return;
+
+        args.DefibTarget = args.EntityUsingDefib;
+        _audio.PlayPvs(ent.Comp.ClumsySound, ent);
+
+    }
+
+    private void BeforeGunShotEvent(Entity<ClumsyComponent> ent, ref SelfBeforeGunShotEvent args)
+    {
+        // Clumsy people sometimes can't shoot :(
+
+        if (args.Gun.Comp.ClumsyProof)
+            return;
+
+        if (!_random.Prob(ent.Comp.ClumsyDefaultCheck))
+            return;
+
+        if (ent.Comp.GunShootFailDamage != null)
+            _damageable.TryChangeDamage(ent, ent.Comp.GunShootFailDamage, origin: ent);
+
+        _stun.TryParalyze(ent, ent.Comp.GunShootFailStunTime, true);
+
+        // Apply salt to the wound ("Honk!") (No idea what this comment means)
+        _audio.PlayPvs(ent.Comp.GunShootFailSound, ent);
+        _audio.PlayPvs(ent.Comp.ClumsySound, ent);
+
+        _popup.PopupEntity(Loc.GetString("gun-clumsy"), ent, ent);
+        args.Cancel();
+    }
+
+    private void OnBeforeClimbEvent(Entity<ClumsyComponent> ent, ref SelfBeforeClimbEvent args)
+    {
+        // This event is called in shared, thats why it has all the extra prediction stuff.
+        var rand = new System.Random((int)_timing.CurTick.Value);
+
+        // If someone is putting you on the table, always get past the guard.
+        if (!_cfg.GetCVar(CCVars.GameTableBonk) && args.PuttingOnTable == ent.Owner && !rand.Prob(ent.Comp.ClumsyDefaultCheck))
+            return;
+
+        HitHeadClumsy(ent, args.BeingClimbedOn);
+
+        _audio.PlayPredicted(ent.Comp.ClumsySound, ent, ent);
+
+        _audio.PlayPredicted(ent.Comp.TableBonkSound, ent, ent);
+
+        var gettingPutOnTableName = Identity.Entity(args.GettingPutOnTable, EntityManager);
+        var puttingOnTableName = Identity.Entity(args.PuttingOnTable, EntityManager);
+
+        if (args.PuttingOnTable == ent.Owner)
+        {
+            // You are slamming yourself onto the table.
+            _popup.PopupPredicted(
+                Loc.GetString("bonkable-success-message-user", ("bonkable", args.BeingClimbedOn)),
+                Loc.GetString("bonkable-success-message-others", ("victim", gettingPutOnTableName), ("bonkable", args.BeingClimbedOn)),
+                ent,
+                ent);
+        }
+        else
+        {
+            // Someone else slamed you onto the table.
+            // This is only run in server so you need to use popup entity.
+            _popup.PopupPredicted(
+                Loc.GetString("forced-bonkable-success-message",
+                    ("bonker", puttingOnTableName),
+                    ("victim", gettingPutOnTableName),
+                    ("bonkable", args.BeingClimbedOn)),
+                ent,
+                null);
+        }
+
+        args.Cancel();
+    }
+    #endregion
+
+    #region Helper functions
+    /// <summary>
+    ///     "Hits" an entites head against the given table.
+    /// </summary>
+    // Oh this fucntion is public le- NO!! This is only public for the one admin command if you use this anywhere else I will cry.
+    public void HitHeadClumsy(Entity<ClumsyComponent> target, EntityUid table)
+    {
+        var stunTime = target.Comp.ClumsyDefaultStunTime;
+
+        if (TryComp<BonkableComponent>(table, out var bonkComp))
+        {
+            stunTime = bonkComp.BonkTime;
+            if (bonkComp.BonkDamage != null)
+                _damageable.TryChangeDamage(target, bonkComp.BonkDamage, true);
+        }
+
+        _stun.TryParalyze(target, stunTime, true);
+    }
+    #endregion
+}
diff --git a/Content.Shared/Interaction/Components/ClumsyComponent.cs b/Content.Shared/Interaction/Components/ClumsyComponent.cs
deleted file mode 100644
index 824696c8385..00000000000
--- a/Content.Shared/Interaction/Components/ClumsyComponent.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Content.Shared.Damage;
-using Robust.Shared.Audio;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Interaction.Components;
-
-/// <summary>
-/// A simple clumsy tag-component.
-/// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class ClumsyComponent : Component
-{
-    /// <summary>
-    /// Damage dealt to a clumsy character when they try to fire a gun.
-    /// </summary>
-    [DataField(required: true), AutoNetworkedField]
-    public DamageSpecifier ClumsyDamage = default!;
-
-    /// <summary>
-    /// Sound to play when clumsy interactions fail.
-    /// </summary>
-    [DataField]
-    public SoundSpecifier ClumsySound = new SoundPathSpecifier("/Audio/Items/bikehorn.ogg");
-}
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.Clumsy.cs b/Content.Shared/Interaction/SharedInteractionSystem.Clumsy.cs
deleted file mode 100644
index 9e45847e078..00000000000
--- a/Content.Shared/Interaction/SharedInteractionSystem.Clumsy.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Content.Shared.Interaction.Components;
-using Robust.Shared.Random;
-
-namespace Content.Shared.Interaction
-{
-    public partial class SharedInteractionSystem
-    {
-        public bool RollClumsy(ClumsyComponent component, float chance)
-        {
-            return component.Running && _random.Prob(chance);
-        }
-
-        /// <summary>
-        ///     Rolls a probability chance for a "bad action" if the target entity is clumsy.
-        /// </summary>
-        /// <param name="entity">The entity that the clumsy check is happening for.</param>
-        /// <param name="chance">
-        /// The chance that a "bad action" happens if the user is clumsy, between 0 and 1 inclusive.
-        /// </param>
-        /// <returns>True if a "bad action" happened, false if the normal action should happen.</returns>
-        public bool TryRollClumsy(EntityUid entity, float chance, ClumsyComponent? component = null)
-        {
-            return Resolve(entity, ref component, false) && RollClumsy(component, chance);
-        }
-    }
-}
diff --git a/Content.Shared/Inventory/InventorySystem.Relay.cs b/Content.Shared/Inventory/InventorySystem.Relay.cs
index 1f1e59bff34..6cd05437424 100644
--- a/Content.Shared/Inventory/InventorySystem.Relay.cs
+++ b/Content.Shared/Inventory/InventorySystem.Relay.cs
@@ -1,4 +1,7 @@
+using Content.Shared.Chat;
 using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Hypospray.Events;
+using Content.Shared.Climbing.Events;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Events;
 using Content.Shared.Electrocution;
@@ -14,7 +17,7 @@
 using Content.Shared.Strip.Components;
 using Content.Shared.Temperature;
 using Content.Shared.Verbs;
-using Content.Shared.Chat;
+using Content.Shared.Weapons.Ranged.Events;
 
 namespace Content.Shared.Inventory;
 
@@ -31,7 +34,12 @@ public void InitializeRelay()
         SubscribeLocalEvent<InventoryComponent, SeeIdentityAttemptEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, ModifyChangedTemperatureEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, GetDefaultRadioChannelEvent>(RelayInventoryEvent);
-        SubscribeLocalEvent<InventoryComponent, TransformSpeakerSpeechEvent>(RelayInventoryEvent);
+        SubscribeLocalEvent<InventoryComponent, RefreshNameModifiersEvent>(RelayInventoryEvent);
+        SubscribeLocalEvent<InventoryComponent, TransformSpeakerNameEvent>(RelayInventoryEvent);
+        SubscribeLocalEvent<InventoryComponent, SelfBeforeHyposprayInjectsEvent>(RelayInventoryEvent);
+        SubscribeLocalEvent<InventoryComponent, TargetBeforeHyposprayInjectsEvent>(RelayInventoryEvent);
+        SubscribeLocalEvent<InventoryComponent, SelfBeforeGunShotEvent>(RelayInventoryEvent);
+        SubscribeLocalEvent<InventoryComponent, SelfBeforeClimbEvent>(RelayInventoryEvent);
 
         // by-ref events
         SubscribeLocalEvent<InventoryComponent, GetExplosionResistanceEvent>(RefRelayInventoryEvent);
diff --git a/Content.Shared/Medical/DefibrillatorEvents.cs b/Content.Shared/Medical/DefibrillatorEvents.cs
new file mode 100644
index 00000000000..54a21a40d42
--- /dev/null
+++ b/Content.Shared/Medical/DefibrillatorEvents.cs
@@ -0,0 +1,39 @@
+using Content.Shared.Inventory;
+
+namespace Content.Shared.Medical;
+
+[ByRefEvent]
+public readonly record struct TargetDefibrillatedEvent(EntityUid User, Entity<DefibrillatorComponent> Defibrillator);
+
+public abstract class BeforeDefibrillatorZapsEvent : CancellableEntityEventArgs, IInventoryRelayEvent
+{
+    public SlotFlags TargetSlots { get; } = SlotFlags.WITHOUT_POCKET;
+    public EntityUid EntityUsingDefib;
+    public readonly EntityUid Defib;
+    public EntityUid DefibTarget;
+
+    public BeforeDefibrillatorZapsEvent(EntityUid entityUsingDefib, EntityUid defib, EntityUid defibTarget)
+    {
+        EntityUsingDefib = entityUsingDefib;
+        Defib = defib;
+        DefibTarget = defibTarget;
+    }
+}
+
+/// <summary>
+///     This event is raised on the user using the defibrillator before is actually zaps someone.
+///     The event is triggered on the user and all their clothing.
+/// </summary>
+public sealed class SelfBeforeDefibrillatorZapsEvent : BeforeDefibrillatorZapsEvent
+{
+    public SelfBeforeDefibrillatorZapsEvent(EntityUid entityUsingDefib, EntityUid defib, EntityUid defibtarget) : base(entityUsingDefib, defib, defibtarget) { }
+}
+
+/// <summary>
+///     This event is raised on the target before it gets zapped with the defibrillator.
+///     The event is triggered on the target itself and all its clothing.
+/// </summary>
+public sealed class TargetBeforeDefibrillatorZapsEvent : BeforeDefibrillatorZapsEvent
+{
+    public TargetBeforeDefibrillatorZapsEvent(EntityUid entityUsingDefib, EntityUid defib, EntityUid defibtarget) : base(entityUsingDefib, defib, defibtarget) { }
+}
diff --git a/Content.Shared/Weapons/Ranged/Events/BeforeGunShootEvent.cs b/Content.Shared/Weapons/Ranged/Events/BeforeGunShootEvent.cs
new file mode 100644
index 00000000000..1d3317c840f
--- /dev/null
+++ b/Content.Shared/Weapons/Ranged/Events/BeforeGunShootEvent.cs
@@ -0,0 +1,20 @@
+using Content.Shared.Inventory;
+using Content.Shared.Weapons.Ranged.Components;
+
+namespace Content.Shared.Weapons.Ranged.Events;
+/// <summary>
+///     This event is triggered on an entity right before they shoot a gun.
+/// </summary>
+public sealed partial class SelfBeforeGunShotEvent : CancellableEntityEventArgs, IInventoryRelayEvent
+{
+    public SlotFlags TargetSlots { get; } = SlotFlags.WITHOUT_POCKET;
+    public readonly EntityUid Shooter;
+    public readonly Entity<GunComponent> Gun;
+    public readonly List<(EntityUid? Entity, IShootable Shootable)> Ammo;
+    public SelfBeforeGunShotEvent(EntityUid shooter, Entity<GunComponent> gun, List<(EntityUid? Entity, IShootable Shootable)> ammo)
+    {
+        Shooter = shooter;
+        Gun = gun;
+        Ammo = ammo;
+    }
+}
diff --git a/Resources/Locale/en-US/bonk/components/bonkable-component.ftl b/Resources/Locale/en-US/bonk/components/bonkable-component.ftl
index 560b10c46ec..1a79da3509f 100644
--- a/Resources/Locale/en-US/bonk/components/bonkable-component.ftl
+++ b/Resources/Locale/en-US/bonk/components/bonkable-component.ftl
@@ -1,2 +1,4 @@
-bonkable-success-message-others = { CAPITALIZE(THE($user)) } bonks { POSS-ADJ($user) } head against { THE($bonkable) }
-bonkable-success-message-user = You bonk your head against { THE($bonkable) }
+forced-bonkable-success-message = { CAPITALIZE($bonker) } bonks {$victim}s head against { THE($bonkable) }!
+
+bonkable-success-message-user = You bonk your head against { THE($bonkable) }!
+bonkable-success-message-others = {$victim} bonks their head against { THE($bonkable) }!
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index c7018ae0e1b..077e076959b 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1367,7 +1367,7 @@
     description: ghost-role-information-monkey-description
   - type: GhostTakeoverAvailable
   - type: Clumsy
-    clumsyDamage:
+    gunShootFailDamage:
       types:
         Blunt: 5
         Piercing: 4
@@ -1550,7 +1550,7 @@
   description: Cousins to the sentient race of lizard people, kobolds blend in with their natural habitat and are as nasty as monkeys; ready to pull out your hair and stab you to death.
   components:
   - type: Clumsy
-    clumsyDamage:
+    gunShootFailDamage:
       types:
         Blunt: 2
         Piercing: 7
diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
index 51078d1b100..baa0df7b816 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -230,7 +230,7 @@
     - type: Hands
     - type: ComplexInteraction
     - type: Clumsy
-      clumsyDamage:
+      gunShootFailDamage:
         types:
           Blunt: 5
           Piercing: 4
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
index 7a926d66d37..2b8a3d889d6 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
@@ -33,8 +33,6 @@
     bonkDamage:
       types:
         Blunt: 4
-    bonkSound: !type:SoundCollectionSpecifier
-      collection: TrayHit
   - type: Clickable
   - type: FootstepModifier
     footstepSoundCollection:
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
index 22b8cfd48ac..8cc8f5c6a72 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
@@ -17,7 +17,7 @@
   - !type:AddComponentSpecial
     components:
     - type: Clumsy
-      clumsyDamage:
+      gunShootFailDamage:
         types: #literally just picked semi random valus. i tested this once and tweaked it.
           Blunt: 5
           Piercing: 4

From d33da91e5e7fc785315fff8997147fba3f9d2ef1 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 03:17:52 -0400
Subject: [PATCH 029/366] Maow

---
 .../EntitySystems/AtmosphereSystem.HighPressureDelta.cs  | 1 +
 .../Piping/Unary/EntitySystems/GasThermoMachineSystem.cs | 5 ++---
 Content.Server/Atmos/Portable/SpaceHeaterSystem.cs       | 2 +-
 Content.Server/Cloning/CloningSystem.cs                  | 2 ++
 .../Disposal/Unit/EntitySystems/DisposalUnitSystem.cs    | 2 +-
 Content.Server/Fax/FaxSystem.cs                          | 1 -
 Content.Server/GameTicking/Rules/TraitorRuleSystem.cs    | 9 +++------
 .../Power/EntitySystems/PowerReceiverSystem.cs           | 2 +-
 8 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
index 42f98089408..4fb0f3fe5ff 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
@@ -1,6 +1,7 @@
 using Content.Server.Atmos.Components;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
+using Content.Shared.Humanoid;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Physics;
 using Robust.Shared.Audio;
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
index 01eab560a16..c753d0a2445 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
@@ -5,15 +5,14 @@
 using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
-using Content.Server.NodeContainer;
 using Content.Server.NodeContainer.EntitySystems;
 using Content.Server.NodeContainer.Nodes;
 using Content.Server.Power.Components;
+using Content.Server.Power.EntitySystems;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Piping.Unary.Components;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
-using Content.Server.Power.EntitySystems;
 using Content.Shared.UserInterface;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
@@ -143,7 +142,7 @@ private bool IsHeater(GasThermoMachineComponent comp)
 
         private void OnToggleMessage(EntityUid uid, GasThermoMachineComponent thermoMachine, GasThermomachineToggleMessage args)
         {
-            var powerState = _power.TryTogglePower(uid);
+            var powerState = _power.IsPowered(uid);
             _adminLogger.Add(LogType.AtmosPowerChanged, $"{ToPrettyString(args.Actor)} turned {(powerState ? "On" : "Off")} {ToPrettyString(uid)}");
             DirtyUI(uid, thermoMachine);
         }
diff --git a/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs b/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs
index b3ad5bbdb37..36ef59e743b 100644
--- a/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs
+++ b/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs
@@ -99,7 +99,7 @@ private void OnToggle(EntityUid uid, SpaceHeaterComponent spaceHeater, SpaceHeat
         if (!Resolve(uid, ref powerReceiver))
             return;
 
-        _power.TryTogglePower(uid);
+        _power.TogglePower(uid);
 
         UpdateAppearance(uid);
         DirtyUI(uid, spaceHeater);
diff --git a/Content.Server/Cloning/CloningSystem.cs b/Content.Server/Cloning/CloningSystem.cs
index 72104bc381f..373696844f9 100644
--- a/Content.Server/Cloning/CloningSystem.cs
+++ b/Content.Server/Cloning/CloningSystem.cs
@@ -46,6 +46,8 @@
 using Content.Server.Power.Components;
 using Content.Shared.Drunk;
 using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.Power;
+
 
 namespace Content.Server.Cloning;
 
diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
index 39d10583951..eb9871673b6 100644
--- a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
+++ b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
@@ -236,7 +236,7 @@ private void OnUiButtonPressed(EntityUid uid, SharedDisposalUnitComponent compon
                 _adminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(player):player} hit flush button on {ToPrettyString(uid)}, it's now {(component.Engaged ? "on" : "off")}");
                 break;
             case SharedDisposalUnitComponent.UiButton.Power:
-                _power.TryTogglePower(uid, user: args.Actor);
+                _power.TogglePower(uid, user: args.Actor);
                 break;
             default:
                 throw new ArgumentOutOfRangeException($"{ToPrettyString(player):player} attempted to hit a nonexistant button on {ToPrettyString(uid)}");
diff --git a/Content.Server/Fax/FaxSystem.cs b/Content.Server/Fax/FaxSystem.cs
index bd7bf0c4e08..cc21b21b55b 100644
--- a/Content.Server/Fax/FaxSystem.cs
+++ b/Content.Server/Fax/FaxSystem.cs
@@ -29,7 +29,6 @@
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
-using Content.Shared.NameModifier.Components;
 using Content.Shared.Power;
 
 namespace Content.Server.Fax;
diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
index 46fee4abfe1..42ea278c742 100644
--- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
@@ -5,14 +5,11 @@
 using Content.Server.Objectives;
 using Content.Server.PDA.Ringer;
 using Content.Server.Roles;
-using Content.Server.Traitor.Components;
 using Content.Server.Traitor.Uplink;
-using Content.Shared.Database;
 using Content.Shared.FixedPoint;
 using Content.Shared.GameTicking.Components;
 using Content.Shared.Mind;
 using Content.Shared.Mood;
-using Content.Shared.Objectives.Components;
 using Content.Shared.PDA;
 using Content.Shared.Roles;
 using Content.Shared.Roles.Jobs;
@@ -87,12 +84,12 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component)
         {
             // Calculate the amount of currency on the uplink.
             var startingBalance = component.StartingBalance;
-            if (_jobs.MindTryGetJob(mindId, out var prototype))
+            if (_jobs.MindTryGetJob(mindId, out var prototype, out var job))
             {
-                if (startingBalance < prototype.AntagAdvantage) // Can't use Math functions on FixedPoint2
+                if (startingBalance < job.AntagAdvantage) // Can't use Math functions on FixedPoint2
                     startingBalance = 0;
                 else
-                    startingBalance = startingBalance - prototype.AntagAdvantage;
+                    startingBalance = startingBalance - job.AntagAdvantage;
             }
 
             // Choose and generate an Uplink, and return the uplink code if applicable
diff --git a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
index 47ac38b9972..925ba63f916 100644
--- a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
@@ -139,7 +139,7 @@ private void AddSwitchPowerVerb(EntityUid uid, PowerSwitchComponent component, G
             {
                 Act = () =>
                 {
-                    TryTogglePower(uid, user: args.User);
+                    TogglePower(uid, user: args.User);
                 },
                 Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/Spare/poweronoff.svg.192dpi.png")),
                 Text = Loc.GetString("power-switch-component-toggle-verb"),

From 09129a7500542a5f941c1980d3c9615c10842a60 Mon Sep 17 00:00:00 2001
From: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Date: Tue, 19 Mar 2024 12:09:00 +0200
Subject: [PATCH 030/366] Simplify DoAfterArgs behavior for movement and
 distance checks (#25226)

* Merge BreakOnWeightlessMove and BreakOnMove. Provide different theshold for weightless movement.

* Adjust WeightlessMovementThresholds. Put a thing I forgot to put in the doafterargs.

* Make DoAfterArgs only use OnMove to determine whether to check for
movement and MoveThreshold to determine the threshold regardless of
weightlessness. Gave DistanceThreshold a default value which will always
be checked now.

* Fix issue introduced by merge.

* Use interaction system for determining whether a distance is within range

* Fix incorrect doafter args introduced by previous merge.
Forgor to commit these.

* Exorcise ghost.

The execution system should have been deleted when I merged previously.
For a reason I cannot comprehend it came back, but only the execution
system.

* Exorcise ghost Pt. 2

* Allow for movement check to be overriden in zero g and adjust doafter args where needed.

You can now override checking for movement in zero g with the BreakOnWeightlessMove bool. By default it will check.
The following doafters were made to ignore the movement check in zero g:
- Healing yourself with healing items,
- Removing embedded projectiles,
- Using tools like welders and crowbars

* Adjust distance for cuffing/uncuffing to work. Make injections not break on weightless movement.

* Fix evil incorrect and uneeded comments
---
 .../Access/Systems/AccessOverriderSystem.cs   |   3 +-
 Content.Server/Animals/Systems/UdderSystem.cs |   5 +-
 .../Body/Systems/InternalsSystem.cs           |   3 +-
 .../Botany/Systems/BotanySwabSystem.cs        |   3 +-
 .../Chemistry/EntitySystems/InjectorSystem.cs |   6 +-
 .../Communications/CommsHackerSystem.cs       |   2 +-
 .../ConstructionSystem.Initial.cs             |   3 +-
 .../ConstructionSystem.Interactions.cs        |   3 +-
 .../Construction/PartExchangerSystem.cs       |   2 +-
 .../Unit/EntitySystems/DisposalUnitSystem.cs  |   3 +-
 .../DisassembleOnAltVerbSystem.cs             |   2 +-
 .../EntitySystems/SpawnAfterInteractSystem.cs |   2 +-
 .../Ensnaring/EnsnareableSystem.Ensnaring.cs  |   3 +-
 .../Fluids/EntitySystems/DrainSystem.cs       |   3 +-
 .../EntitySystems/PuddleSystem.Spillable.cs   |  51 +++
 .../Forensics/Systems/ForensicPadSystem.cs    |   5 +-
 .../Systems/ForensicScannerSystem.cs          |   3 +-
 .../Forensics/Systems/ForensicsSystem.cs      |   2 +-
 Content.Server/Guardian/GuardianSystem.cs     |   6 +-
 Content.Server/Implants/ImplanterSystem.cs    |   6 +-
 .../EntitySystems/KitchenSpikeSystem.cs       |   3 +-
 .../Kitchen/EntitySystems/SharpSystem.cs      |   3 +-
 .../Light/EntitySystems/PoweredLightSystem.cs |   2 +-
 Content.Server/Magic/MagicSystem.cs           | 297 +++++++++++++++++-
 .../MagicMirror/MagicMirrorSystem.cs          |  15 +-
 .../EntitySystems/MechGrabberSystem.cs        |   3 +-
 .../Mech/Systems/MechEquipmentSystem.cs       |   3 +-
 Content.Server/Mech/Systems/MechSystem.cs     |  15 +-
 .../BiomassReclaimerSystem.cs                 |   5 +-
 Content.Server/Medical/CryoPodSystem.cs       |   3 +-
 Content.Server/Medical/DefibrillatorSystem.cs |  14 +-
 Content.Server/Medical/HealingSystem.cs       |   5 +-
 .../Medical/HealthAnalyzerSystem.cs           |   5 +-
 .../Medical/Stethoscope/StethoscopeSystem.cs  |   5 +-
 .../Ninja/Systems/BatteryDrainerSystem.cs     |   3 +-
 Content.Server/Nuke/NukeSystem.cs             |   3 +-
 .../Nutrition/EntitySystems/DrinkSystem.cs    |   3 +-
 .../Nutrition/EntitySystems/FoodSystem.cs     |   3 +-
 .../EntitySystems/SmokingSystem.Vape.cs       |   3 +-
 .../Generator/PortableGeneratorSystem.cs      |   2 +-
 .../Resist/EscapeInventorySystem.cs           |   3 +-
 Content.Server/Resist/ResistLockerSystem.cs   |   3 +-
 .../EntitySystems/RevenantSystem.Abilities.cs |   4 +-
 .../SprayPainter/SprayPainterSystem.cs        |   3 +-
 Content.Server/Sticky/Systems/StickySystem.cs |   6 +-
 Content.Server/Strip/StrippableSystem.cs      |  12 +-
 .../Teleportation/HandTeleporterSystem.cs     |   2 +-
 Content.Server/Wires/WiresSystem.cs           |   2 +-
 Content.Shared/Burial/BurialSystem.cs         |   6 +-
 .../Climbing/Systems/ClimbSystem.cs           |   3 +-
 .../EntitySystems/ToggleableClothingSystem.cs |   2 +-
 Content.Shared/Cuffs/SharedCuffableSystem.cs  |  12 +-
 Content.Shared/Devour/SharedDevourSystem.cs   |   6 +-
 Content.Shared/DoAfter/DoAfter.cs             |   6 -
 Content.Shared/DoAfter/DoAfterArgs.cs         |  25 +-
 .../DoAfter/SharedDoAfterSystem.Update.cs     |  71 +++--
 Content.Shared/DoAfter/SharedDoAfterSystem.cs |   5 +-
 .../Inventory/InventorySystem.Equip.cs        |   6 +-
 Content.Shared/Lock/LockSystem.cs             |   4 +-
 .../Mech/EntitySystems/SharedMechSystem.cs    |   2 +-
 .../Projectiles/SharedProjectileSystem.cs     |   3 +-
 Content.Shared/Prying/Systems/PryingSystem.cs |   3 +-
 Content.Shared/RCD/Systems/RCDSystem.cs       |   3 +-
 Content.Shared/RatKing/SharedRatKingSystem.cs |   2 +-
 .../Systems/SharedResearchStealerSystem.cs    |   4 +-
 .../Salvage/Fulton/SharedFultonSystem.cs      |   3 +-
 .../Sericulture/SericultureSystem.cs          |   2 +-
 .../Species/Systems/ReformSystem.cs           |   6 +-
 .../SprayPainter/SharedSprayPainterSystem.cs  |   3 +-
 .../Storage/EntitySystems/DumpableSystem.cs   |   3 +-
 .../EntitySystems/SharedStorageSystem.cs      |   2 +-
 .../Tools/Systems/SharedToolSystem.cs         |   4 +-
 .../SharedVendingMachineSystem.Restock.cs     |   3 +-
 .../Systems/SharedGunSystem.Ballistic.cs      |   3 +-
 74 files changed, 510 insertions(+), 228 deletions(-)

diff --git a/Content.Server/Access/Systems/AccessOverriderSystem.cs b/Content.Server/Access/Systems/AccessOverriderSystem.cs
index 4e7b796503f..c7b20513f42 100644
--- a/Content.Server/Access/Systems/AccessOverriderSystem.cs
+++ b/Content.Server/Access/Systems/AccessOverriderSystem.cs
@@ -57,8 +57,7 @@ private void AfterInteractOn(EntityUid uid, AccessOverriderComponent component,
 
         var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, component.DoAfter, new AccessOverriderDoAfterEvent(), uid, target: args.Target, used: uid)
         {
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             BreakOnDamage = true,
             NeedHand = true,
         };
diff --git a/Content.Server/Animals/Systems/UdderSystem.cs b/Content.Server/Animals/Systems/UdderSystem.cs
index ef43c2c89d0..b7856e90423 100644
--- a/Content.Server/Animals/Systems/UdderSystem.cs
+++ b/Content.Server/Animals/Systems/UdderSystem.cs
@@ -15,7 +15,7 @@
 namespace Content.Server.Animals.Systems;
 
 /// <summary>
-///     Gives ability to produce milkable reagents, produces endless if the 
+///     Gives ability to produce milkable reagents, produces endless if the
 ///     owner has no HungerComponent
 /// </summary>
 internal sealed class UdderSystem : EntitySystem
@@ -76,9 +76,8 @@ private void AttemptMilk(Entity<UdderComponent?> udder, EntityUid userUid, Entit
 
         var doargs = new DoAfterArgs(EntityManager, userUid, 5, new MilkingDoAfterEvent(), udder, udder, used: containerUid)
         {
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             BreakOnDamage = true,
-            BreakOnTargetMove = true,
             MovementThreshold = 1.0f,
         };
 
diff --git a/Content.Server/Body/Systems/InternalsSystem.cs b/Content.Server/Body/Systems/InternalsSystem.cs
index fdcc76718cf..c1e1de2baad 100644
--- a/Content.Server/Body/Systems/InternalsSystem.cs
+++ b/Content.Server/Body/Systems/InternalsSystem.cs
@@ -126,9 +126,8 @@ private void StartToggleInternalsDoAfter(EntityUid user, Entity<InternalsCompone
 
         _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, delay, new InternalsDoAfterEvent(), targetEnt, target: targetEnt)
         {
-            BreakOnUserMove = true,
             BreakOnDamage = true,
-            BreakOnTargetMove = true,
+            BreakOnMove =  true,
             MovementThreshold = 0.1f,
         });
     }
diff --git a/Content.Server/Botany/Systems/BotanySwabSystem.cs b/Content.Server/Botany/Systems/BotanySwabSystem.cs
index 8f300c94486..f6190bae4ea 100644
--- a/Content.Server/Botany/Systems/BotanySwabSystem.cs
+++ b/Content.Server/Botany/Systems/BotanySwabSystem.cs
@@ -47,8 +47,7 @@ private void OnAfterInteract(EntityUid uid, BotanySwabComponent swab, AfterInter
         _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, swab.SwabDelay, new BotanySwabDoAfterEvent(), uid, target: args.Target, used: uid)
         {
             Broadcast = true,
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             NeedHand = true
         });
     }
diff --git a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
index 9dd1d429b7c..77c8620ea49 100644
--- a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
@@ -205,9 +205,11 @@ private void InjectDoAfter(Entity<InjectorComponent> injector, EntityUid target,
 
         DoAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, actualDelay, new InjectorDoAfterEvent(), injector.Owner, target: target, used: injector.Owner)
         {
-            BreakOnUserMove = true,
+            BreakOnMove = true,
+            BreakOnWeightlessMove = false,
             BreakOnDamage = true,
-            BreakOnTargetMove = true,
+            NeedHand = true,
+            BreakOnHandChange = true,
             MovementThreshold = 0.1f,
         });
     }
diff --git a/Content.Server/Communications/CommsHackerSystem.cs b/Content.Server/Communications/CommsHackerSystem.cs
index bbe64a7987a..4d149ca1ad4 100644
--- a/Content.Server/Communications/CommsHackerSystem.cs
+++ b/Content.Server/Communications/CommsHackerSystem.cs
@@ -48,7 +48,7 @@ private void OnBeforeInteractHand(EntityUid uid, CommsHackerComponent comp, Befo
         var doAfterArgs = new DoAfterArgs(EntityManager, uid, comp.Delay, new TerrorDoAfterEvent(), target: target, used: uid, eventTarget: uid)
         {
             BreakOnDamage = true,
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             MovementThreshold = 0.5f,
             CancelDuplicate = false
         };
diff --git a/Content.Server/Construction/ConstructionSystem.Initial.cs b/Content.Server/Construction/ConstructionSystem.Initial.cs
index 39705fc1974..ede8d3064fa 100644
--- a/Content.Server/Construction/ConstructionSystem.Initial.cs
+++ b/Content.Server/Construction/ConstructionSystem.Initial.cs
@@ -247,8 +247,7 @@ void ShutdownContainers()
             var doAfterArgs = new DoAfterArgs(EntityManager, user, doAfterTime, new AwaitedDoAfterEvent(), null)
             {
                 BreakOnDamage = true,
-                BreakOnTargetMove = false,
-                BreakOnUserMove = true,
+                BreakOnMove = true,
                 NeedHand = false,
                 // allow simultaneously starting several construction jobs using the same stack of materials.
                 CancelDuplicate = false,
diff --git a/Content.Server/Construction/ConstructionSystem.Interactions.cs b/Content.Server/Construction/ConstructionSystem.Interactions.cs
index 5361b65b1ff..ad7b2a11b0e 100644
--- a/Content.Server/Construction/ConstructionSystem.Interactions.cs
+++ b/Content.Server/Construction/ConstructionSystem.Interactions.cs
@@ -286,8 +286,7 @@ private HandleResult HandleInteraction(EntityUid uid, object ev, ConstructionGra
                         var doAfterEventArgs = new DoAfterArgs(EntityManager, interactUsing.User, step.DoAfter, doAfterEv, uid, uid, interactUsing.Used)
                         {
                             BreakOnDamage = false,
-                            BreakOnTargetMove = true,
-                            BreakOnUserMove = true,
+                            BreakOnMove = true,
                             NeedHand = true
                         };
 
diff --git a/Content.Server/Construction/PartExchangerSystem.cs b/Content.Server/Construction/PartExchangerSystem.cs
index c84d65b75e0..97de3ee4860 100644
--- a/Content.Server/Construction/PartExchangerSystem.cs
+++ b/Content.Server/Construction/PartExchangerSystem.cs
@@ -180,7 +180,7 @@ private void OnAfterInteract(EntityUid uid, PartExchangerComponent component, Af
         _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, component.ExchangeDuration, new ExchangerDoAfterEvent(), uid, target: args.Target, used: uid)
         {
             BreakOnDamage = true,
-            BreakOnUserMove = true
+            BreakOnMove = true
         });
     }
 }
diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
index eb9871673b6..1b9ab97be6b 100644
--- a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
+++ b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
@@ -486,8 +486,7 @@ public bool TryInsert(EntityUid unitId, EntityUid toInsertId, EntityUid? userId,
         var doAfterArgs = new DoAfterArgs(EntityManager, userId.Value, delay, new DisposalDoAfterEvent(), unitId, target: toInsertId, used: unitId)
         {
             BreakOnDamage = true,
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             NeedHand = false
         };
 
diff --git a/Content.Server/Engineering/EntitySystems/DisassembleOnAltVerbSystem.cs b/Content.Server/Engineering/EntitySystems/DisassembleOnAltVerbSystem.cs
index 08bf68c4d29..61b6f3d93d2 100644
--- a/Content.Server/Engineering/EntitySystems/DisassembleOnAltVerbSystem.cs
+++ b/Content.Server/Engineering/EntitySystems/DisassembleOnAltVerbSystem.cs
@@ -45,7 +45,7 @@ public async void AttemptDisassemble(EntityUid uid, EntityUid user, EntityUid ta
             {
                 var doAfterArgs = new DoAfterArgs(EntityManager, user, component.DoAfterTime, new AwaitedDoAfterEvent(), null)
                 {
-                    BreakOnUserMove = true,
+                    BreakOnMove = true,
                 };
                 var result = await doAfterSystem.WaitDoAfter(doAfterArgs);
 
diff --git a/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs b/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
index a0bbbdf350a..281bbc47211 100644
--- a/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
+++ b/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
@@ -46,7 +46,7 @@ bool IsTileClear()
             {
                 var doAfterArgs = new DoAfterArgs(EntityManager, args.User, component.DoAfterTime, new AwaitedDoAfterEvent(), null)
                 {
-                    BreakOnUserMove = true,
+                    BreakOnMove = true,
                 };
                 var result = await _doAfterSystem.WaitDoAfter(doAfterArgs);
 
diff --git a/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs b/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs
index 8dd3d56a1ee..a5ebb0fd9e1 100644
--- a/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs
+++ b/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs
@@ -121,8 +121,7 @@ public void TryFree(EntityUid target, EntityUid user, EntityUid ensnare, Ensnari
 
         var doAfterEventArgs = new DoAfterArgs(EntityManager, user, freeTime, new EnsnareableDoAfterEvent(), target, target: target, used: ensnare)
         {
-            BreakOnUserMove = breakOnMove,
-            BreakOnTargetMove = breakOnMove,
+            BreakOnMove = breakOnMove,
             BreakOnDamage = false,
             NeedHand = true,
             BlockDuplicate = true,
diff --git a/Content.Server/Fluids/EntitySystems/DrainSystem.cs b/Content.Server/Fluids/EntitySystems/DrainSystem.cs
index 27ad2178f93..5fc406dca53 100644
--- a/Content.Server/Fluids/EntitySystems/DrainSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/DrainSystem.cs
@@ -245,9 +245,8 @@ private void OnInteract(Entity<DrainComponent> entity, ref AfterInteractUsingEve
 
         var doAfterArgs = new DoAfterArgs(EntityManager, args.User, entity.Comp.UnclogDuration, new DrainDoAfterEvent(), entity, args.Target, args.Used)
         {
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
             BreakOnDamage = true,
+            BreakOnMove = true,
             BreakOnHandChange = true
         };
 
diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
index d02dd44e81f..e4fd3fb491c 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
@@ -161,6 +161,57 @@ private void OnAttemptPacifiedThrow(Entity<SpillableComponent> ent, ref AttemptP
         args.Cancel("pacified-cannot-throw-spill");
     }
 
+    private void AddSpillVerb(Entity<SpillableComponent> entity, ref GetVerbsEvent<Verb> args)
+    {
+        if (!args.CanAccess || !args.CanInteract)
+            return;
+
+        if (!_solutionContainerSystem.TryGetSolution(args.Target, entity.Comp.SolutionName, out var soln, out var solution))
+            return;
+
+        if (_openable.IsClosed(args.Target))
+            return;
+
+        if (solution.Volume == FixedPoint2.Zero)
+            return;
+
+        if (_entityManager.HasComponent<PreventSpillerComponent>(args.User))
+            return;
+
+
+        Verb verb = new()
+        {
+            Text = Loc.GetString("spill-target-verb-get-data-text")
+        };
+
+        // TODO VERB ICONS spill icon? pouring out a glass/beaker?
+        if (entity.Comp.SpillDelay == null)
+        {
+            var target = args.Target;
+            verb.Act = () =>
+            {
+                var puddleSolution = _solutionContainerSystem.SplitSolution(soln.Value, solution.Volume);
+                TrySpillAt(Transform(target).Coordinates, puddleSolution, out _);
+            };
+        }
+        else
+        {
+            var user = args.User;
+            verb.Act = () =>
+            {
+                _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, user, entity.Comp.SpillDelay ?? 0, new SpillDoAfterEvent(), entity.Owner, target: entity.Owner)
+                {
+                    BreakOnDamage = true,
+                    BreakOnMove = true,
+                    NeedHand = true,
+                });
+            };
+        }
+        verb.Impact = LogImpact.Medium; // dangerous reagent reaction are logged separately.
+        verb.DoContactInteraction = true;
+        args.Verbs.Add(verb);
+    }
+
     private void OnDoAfter(Entity<SpillableComponent> entity, ref SpillDoAfterEvent args)
     {
         if (args.Handled || args.Cancelled || args.Args.Target == null)
diff --git a/Content.Server/Forensics/Systems/ForensicPadSystem.cs b/Content.Server/Forensics/Systems/ForensicPadSystem.cs
index ad39817f8b0..42512cb1fdc 100644
--- a/Content.Server/Forensics/Systems/ForensicPadSystem.cs
+++ b/Content.Server/Forensics/Systems/ForensicPadSystem.cs
@@ -83,9 +83,8 @@ private void StartScan(EntityUid used, EntityUid user, EntityUid target, Forensi
 
             var doAfterEventArgs = new DoAfterArgs(EntityManager, user, pad.ScanDelay, ev, used, target: target, used: used)
             {
-                BreakOnTargetMove = true,
-                BreakOnUserMove = true,
-                NeedHand = true
+                NeedHand = true,
+                BreakOnMove = true,
             };
 
             _doAfterSystem.TryStartDoAfter(doAfterEventArgs);
diff --git a/Content.Server/Forensics/Systems/ForensicScannerSystem.cs b/Content.Server/Forensics/Systems/ForensicScannerSystem.cs
index e83cde7456c..5e2a562577d 100644
--- a/Content.Server/Forensics/Systems/ForensicScannerSystem.cs
+++ b/Content.Server/Forensics/Systems/ForensicScannerSystem.cs
@@ -94,8 +94,7 @@ private void StartScan(EntityUid uid, ForensicScannerComponent component, Entity
         {
             _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, user, component.ScanDelay, new ForensicScannerDoAfterEvent(), uid, target: target, used: uid)
             {
-                BreakOnTargetMove = true,
-                BreakOnUserMove = true,
+                BreakOnMove = true,
                 NeedHand = true
             });
         }
diff --git a/Content.Server/Forensics/Systems/ForensicsSystem.cs b/Content.Server/Forensics/Systems/ForensicsSystem.cs
index 8f91ec41e80..fe1844a3ed5 100644
--- a/Content.Server/Forensics/Systems/ForensicsSystem.cs
+++ b/Content.Server/Forensics/Systems/ForensicsSystem.cs
@@ -148,7 +148,7 @@ private void OnAfterInteract(EntityUid uid, CleansForensicsComponent component,
                 BreakOnHandChange = true,
                 NeedHand = true,
                 BreakOnDamage = true,
-                BreakOnTargetMove = true,
+                BreakOnMove = true,
                 MovementThreshold = 0.01f,
                 DistanceThreshold = forensicsComp.CleanDistance,
             };
diff --git a/Content.Server/Guardian/GuardianSystem.cs b/Content.Server/Guardian/GuardianSystem.cs
index 4ad6c1f8359..97d4eb06803 100644
--- a/Content.Server/Guardian/GuardianSystem.cs
+++ b/Content.Server/Guardian/GuardianSystem.cs
@@ -194,11 +194,7 @@ private void UseCreator(EntityUid user, EntityUid target, EntityUid injector, Gu
                 return;
             }
 
-            _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, user, component.InjectionDelay, new GuardianCreatorDoAfterEvent(), injector, target: target, used: injector)
-            {
-                BreakOnTargetMove = true,
-                BreakOnUserMove = true
-            });
+            _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, user, component.InjectionDelay, new GuardianCreatorDoAfterEvent(), injector, target: target, used: injector){BreakOnMove = true});
         }
 
         private void OnDoAfter(EntityUid uid, GuardianCreatorComponent component, DoAfterEvent args)
diff --git a/Content.Server/Implants/ImplanterSystem.cs b/Content.Server/Implants/ImplanterSystem.cs
index 3cfa3a9f5f8..e441574213e 100644
--- a/Content.Server/Implants/ImplanterSystem.cs
+++ b/Content.Server/Implants/ImplanterSystem.cs
@@ -99,9 +99,8 @@ public void TryImplant(ImplanterComponent component, EntityUid user, EntityUid t
     {
         var args = new DoAfterArgs(EntityManager, user, component.ImplantTime, new ImplantEvent(), implanter, target: target, used: implanter)
         {
-            BreakOnUserMove = true,
-            BreakOnTargetMove = true,
             BreakOnDamage = true,
+            BreakOnMove = true,
             NeedHand = true,
         };
 
@@ -126,9 +125,8 @@ public void TryDraw(ImplanterComponent component, EntityUid user, EntityUid targ
     {
         var args = new DoAfterArgs(EntityManager, user, component.DrawTime, new DrawEvent(), implanter, target: target, used: implanter)
         {
-            BreakOnUserMove = true,
-            BreakOnTargetMove = true,
             BreakOnDamage = true,
+            BreakOnMove = true,
             NeedHand = true,
         };
 
diff --git a/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs b/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs
index 0419e13d230..b145bec0148 100644
--- a/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs
@@ -257,9 +257,8 @@ public bool TrySpike(EntityUid uid, EntityUid userUid, EntityUid victimUid, Kitc
 
             var doAfterArgs = new DoAfterArgs(EntityManager, userUid, component.SpikeDelay + butcherable.ButcherDelay, new SpikeDoAfterEvent(), uid, target: victimUid, used: uid)
             {
-                BreakOnTargetMove = true,
-                BreakOnUserMove = true,
                 BreakOnDamage = true,
+                BreakOnMove = true,
                 NeedHand = true
             };
 
diff --git a/Content.Server/Kitchen/EntitySystems/SharpSystem.cs b/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
index 81806a0c818..431e438fd8d 100644
--- a/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
@@ -73,9 +73,8 @@ private bool TryStartButcherDoafter(EntityUid knife, EntityUid target, EntityUid
         var doAfter =
             new DoAfterArgs(EntityManager, user, sharp.ButcherDelayModifier * butcher.ButcherDelay, new SharpDoAfterEvent(), knife, target: target, used: knife)
             {
-                BreakOnTargetMove = true,
-                BreakOnUserMove = true,
                 BreakOnDamage = true,
+                BreakOnMove = true,
                 NeedHand = true
             };
         _doAfterSystem.TryStartDoAfter(doAfter);
diff --git a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs
index 3c44ea46155..c4a07b56a86 100644
--- a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs
@@ -154,7 +154,7 @@ private void OnInteractHand(EntityUid uid, PoweredLightComponent light, Interact
             // removing a working bulb, so require a delay
             _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, userUid, light.EjectBulbDelay, new PoweredLightDoAfterEvent(), uid, target: uid)
             {
-                BreakOnUserMove = true,
+                BreakOnMove = true,
                 BreakOnDamage = true,
             });
 
diff --git a/Content.Server/Magic/MagicSystem.cs b/Content.Server/Magic/MagicSystem.cs
index 5997c56e240..30c01063b0e 100644
--- a/Content.Server/Magic/MagicSystem.cs
+++ b/Content.Server/Magic/MagicSystem.cs
@@ -18,6 +18,301 @@ public override void Initialize()
 
     private void OnSpellSpoken(ref SpeakSpellEvent args)
     {
-        _chat.TrySendInGameICMessage(args.Performer, Loc.GetString(args.Speech), args.ChatType, false);
+        if (args.Handled)
+            return;
+
+        AttemptLearn(uid, component, args);
+
+        args.Handled = true;
+    }
+
+    private void AttemptLearn(EntityUid uid, SpellbookComponent component, UseInHandEvent args)
+    {
+        var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, component.LearnTime, new SpellbookDoAfterEvent(), uid, target: uid)
+        {
+            BreakOnDamage = true,
+            BreakOnMove = true,
+            NeedHand = true //What, are you going to read with your eyes only??
+        };
+
+        _doAfter.TryStartDoAfter(doAfterEventArgs);
+    }
+
+    #region Spells
+
+    /// <summary>
+    /// Handles the instant action (i.e. on the caster) attempting to spawn an entity.
+    /// </summary>
+    private void OnInstantSpawn(InstantSpawnSpellEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        var transform = Transform(args.Performer);
+
+        foreach (var position in GetSpawnPositions(transform, args.Pos))
+        {
+            var ent = Spawn(args.Prototype, position.SnapToGrid(EntityManager, _mapManager));
+
+            if (args.PreventCollideWithCaster)
+            {
+                var comp = EnsureComp<PreventCollideComponent>(ent);
+                comp.Uid = args.Performer;
+            }
+        }
+
+        Speak(args);
+        args.Handled = true;
+    }
+
+    private void OnProjectileSpell(ProjectileSpellEvent ev)
+    {
+        if (ev.Handled)
+            return;
+
+        ev.Handled = true;
+        Speak(ev);
+
+        var xform = Transform(ev.Performer);
+        var userVelocity = _physics.GetMapLinearVelocity(ev.Performer);
+
+        foreach (var pos in GetSpawnPositions(xform, ev.Pos))
+        {
+            // If applicable, this ensures the projectile is parented to grid on spawn, instead of the map.
+            var mapPos = pos.ToMap(EntityManager);
+            var spawnCoords = _mapManager.TryFindGridAt(mapPos, out var gridUid, out _)
+                ? pos.WithEntityId(gridUid, EntityManager)
+                : new(_mapManager.GetMapEntityId(mapPos.MapId), mapPos.Position);
+
+            var ent = Spawn(ev.Prototype, spawnCoords);
+            var direction = ev.Target.ToMapPos(EntityManager, _transformSystem) -
+                            spawnCoords.ToMapPos(EntityManager, _transformSystem);
+            _gunSystem.ShootProjectile(ent, direction, userVelocity, ev.Performer, ev.Performer);
+        }
+    }
+
+    private void OnChangeComponentsSpell(ChangeComponentsSpellEvent ev)
+    {
+        if (ev.Handled)
+            return;
+        ev.Handled = true;
+        Speak(ev);
+
+        foreach (var toRemove in ev.ToRemove)
+        {
+            if (_compFact.TryGetRegistration(toRemove, out var registration))
+                RemComp(ev.Target, registration.Type);
+        }
+
+        foreach (var (name, data) in ev.ToAdd)
+        {
+            if (HasComp(ev.Target, data.Component.GetType()))
+                continue;
+
+            var component = (Component) _compFact.GetComponent(name);
+            component.Owner = ev.Target;
+            var temp = (object) component;
+            _seriMan.CopyTo(data.Component, ref temp);
+            EntityManager.AddComponent(ev.Target, (Component) temp!);
+        }
+    }
+
+    private List<EntityCoordinates> GetSpawnPositions(TransformComponent casterXform, MagicSpawnData data)
+    {
+        switch (data)
+        {
+            case TargetCasterPos:
+                return new List<EntityCoordinates>(1) {casterXform.Coordinates};
+            case TargetInFront:
+            {
+                // This is shit but you get the idea.
+                var directionPos = casterXform.Coordinates.Offset(casterXform.LocalRotation.ToWorldVec().Normalized());
+
+                if (!_mapManager.TryGetGrid(casterXform.GridUid, out var mapGrid))
+                    return new List<EntityCoordinates>();
+
+                if (!directionPos.TryGetTileRef(out var tileReference, EntityManager, _mapManager))
+                    return new List<EntityCoordinates>();
+
+                var tileIndex = tileReference.Value.GridIndices;
+                var coords = mapGrid.GridTileToLocal(tileIndex);
+                EntityCoordinates coordsPlus;
+                EntityCoordinates coordsMinus;
+
+                var dir = casterXform.LocalRotation.GetCardinalDir();
+                switch (dir)
+                {
+                    case Direction.North:
+                    case Direction.South:
+                    {
+                        coordsPlus = mapGrid.GridTileToLocal(tileIndex + (1, 0));
+                        coordsMinus = mapGrid.GridTileToLocal(tileIndex + (-1, 0));
+                        return new List<EntityCoordinates>(3)
+                        {
+                            coords,
+                            coordsPlus,
+                            coordsMinus,
+                        };
+                    }
+                    case Direction.East:
+                    case Direction.West:
+                    {
+                        coordsPlus = mapGrid.GridTileToLocal(tileIndex + (0, 1));
+                        coordsMinus = mapGrid.GridTileToLocal(tileIndex + (0, -1));
+                        return new List<EntityCoordinates>(3)
+                        {
+                            coords,
+                            coordsPlus,
+                            coordsMinus,
+                        };
+                    }
+                }
+
+                return new List<EntityCoordinates>();
+            }
+            default:
+                throw new ArgumentOutOfRangeException();
+        }
+    }
+
+    /// <summary>
+    /// Teleports the user to the clicked location
+    /// </summary>
+    /// <param name="args"></param>
+    private void OnTeleportSpell(TeleportSpellEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        var transform = Transform(args.Performer);
+
+        if (transform.MapID != args.Target.GetMapId(EntityManager)) return;
+
+        _transformSystem.SetCoordinates(args.Performer, args.Target);
+        transform.AttachToGridOrMap();
+        _audio.PlayPvs(args.BlinkSound, args.Performer, AudioParams.Default.WithVolume(args.BlinkVolume));
+        Speak(args);
+        args.Handled = true;
+    }
+
+    /// <summary>
+    /// Opens all doors within range
+    /// </summary>
+    /// <param name="args"></param>
+    private void OnKnockSpell(KnockSpellEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        args.Handled = true;
+        Speak(args);
+
+        //Get the position of the player
+        var transform = Transform(args.Performer);
+        var coords = transform.Coordinates;
+
+        _audio.PlayPvs(args.KnockSound, args.Performer, AudioParams.Default.WithVolume(args.KnockVolume));
+
+        //Look for doors and don't open them if they're already open.
+        foreach (var entity in _lookup.GetEntitiesInRange(coords, args.Range))
+        {
+            if (TryComp<DoorBoltComponent>(entity, out var bolts))
+                _doorSystem.SetBoltsDown((entity, bolts), false);
+
+            if (TryComp<DoorComponent>(entity, out var doorComp) && doorComp.State is not DoorState.Open)
+                _doorSystem.StartOpening(entity);
+        }
+    }
+
+    private void OnSmiteSpell(SmiteSpellEvent ev)
+    {
+        if (ev.Handled)
+            return;
+
+        ev.Handled = true;
+        Speak(ev);
+
+        var direction = Transform(ev.Target).MapPosition.Position - Transform(ev.Performer).MapPosition.Position;
+        var impulseVector = direction * 10000;
+
+        _physics.ApplyLinearImpulse(ev.Target, impulseVector);
+
+        if (!TryComp<BodyComponent>(ev.Target, out var body))
+            return;
+
+        var ents = _bodySystem.GibBody(ev.Target, true, body);
+
+        if (!ev.DeleteNonBrainParts)
+            return;
+
+        foreach (var part in ents)
+        {
+            // just leaves a brain and clothes
+            if (HasComp<BodyComponent>(part) && !HasComp<BrainComponent>(part))
+            {
+                QueueDel(part);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Spawns entity prototypes from a list within range of click.
+    /// </summary>
+    /// <remarks>
+    /// It will offset mobs after the first mob based on the OffsetVector2 property supplied.
+    /// </remarks>
+    /// <param name="args"> The Spawn Spell Event args.</param>
+    private void OnWorldSpawn(WorldSpawnSpellEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        var targetMapCoords = args.Target;
+
+        SpawnSpellHelper(args.Contents, targetMapCoords, args.Lifetime, args.Offset);
+        Speak(args);
+        args.Handled = true;
+    }
+
+    /// <summary>
+    /// Loops through a supplied list of entity prototypes and spawns them
+    /// </summary>
+    /// <remarks>
+    /// If an offset of 0, 0 is supplied then the entities will all spawn on the same tile.
+    /// Any other offset will spawn entities starting from the source Map Coordinates and will increment the supplied
+    /// offset
+    /// </remarks>
+    /// <param name="entityEntries"> The list of Entities to spawn in</param>
+    /// <param name="entityCoords"> Map Coordinates where the entities will spawn</param>
+    /// <param name="lifetime"> Check to see if the entities should self delete</param>
+    /// <param name="offsetVector2"> A Vector2 offset that the entities will spawn in</param>
+    private void SpawnSpellHelper(List<EntitySpawnEntry> entityEntries, EntityCoordinates entityCoords, float? lifetime, Vector2 offsetVector2)
+    {
+        var getProtos = EntitySpawnCollection.GetSpawns(entityEntries, _random);
+
+        var offsetCoords = entityCoords;
+        foreach (var proto in getProtos)
+        {
+            // TODO: Share this code with instant because they're both doing similar things for positioning.
+            var entity = Spawn(proto, offsetCoords);
+            offsetCoords = offsetCoords.Offset(offsetVector2);
+
+            if (lifetime != null)
+            {
+                var comp = EnsureComp<TimedDespawnComponent>(entity);
+                comp.Lifetime = lifetime.Value;
+            }
+        }
+    }
+
+    #endregion
+
+    private void Speak(BaseActionEvent args)
+    {
+        if (args is not ISpeakSpell speak || string.IsNullOrWhiteSpace(speak.Speech))
+            return;
+
+        _chat.TrySendInGameICMessage(args.Performer, Loc.GetString(speak.Speech),
+            InGameICChatType.Speak, false);
     }
 }
diff --git a/Content.Server/MagicMirror/MagicMirrorSystem.cs b/Content.Server/MagicMirror/MagicMirrorSystem.cs
index b11e8ca707c..8d8a6bfa3b4 100644
--- a/Content.Server/MagicMirror/MagicMirrorSystem.cs
+++ b/Content.Server/MagicMirror/MagicMirrorSystem.cs
@@ -59,11 +59,9 @@ private void OnMagicMirrorSelect(EntityUid uid, MagicMirrorComponent component,
         _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, message.Actor, component.SelectSlotTime, doAfter, uid, target: target, used: uid)
         {
             DistanceThreshold = SharedInteractionSystem.InteractionRange,
-            BreakOnTargetMove = true,
             BreakOnDamage = true,
+            BreakOnMove = true,
             BreakOnHandChange = false,
-            BreakOnUserMove = true,
-            BreakOnWeightlessMove = false,
             NeedHand = true
         },
             out var doAfterId);
@@ -116,11 +114,9 @@ private void OnTryMagicMirrorChangeColor(EntityUid uid, MagicMirrorComponent com
 
         _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, message.Actor, component.ChangeSlotTime, doAfter, uid, target: target, used: uid)
         {
-            BreakOnTargetMove = true,
             BreakOnDamage = true,
+            BreakOnMove = true,
             BreakOnHandChange = false,
-            BreakOnUserMove = true,
-            BreakOnWeightlessMove = false,
             NeedHand = true
         },
             out var doAfterId);
@@ -172,11 +168,8 @@ private void OnTryMagicMirrorRemoveSlot(EntityUid uid, MagicMirrorComponent comp
         _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, message.Actor, component.RemoveSlotTime, doAfter, uid, target: target, used: uid)
         {
             DistanceThreshold = SharedInteractionSystem.InteractionRange,
-            BreakOnTargetMove = true,
             BreakOnDamage = true,
             BreakOnHandChange = false,
-            BreakOnUserMove = true,
-            BreakOnWeightlessMove = false,
             NeedHand = true
         },
             out var doAfterId);
@@ -227,11 +220,9 @@ private void OnTryMagicMirrorAddSlot(EntityUid uid, MagicMirrorComponent compone
 
         _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, message.Actor, component.AddSlotTime, doAfter, uid, target: component.Target.Value, used: uid)
         {
-            BreakOnTargetMove = true,
             BreakOnDamage = true,
+            BreakOnMove = true,
             BreakOnHandChange = false,
-            BreakOnUserMove = true,
-            BreakOnWeightlessMove = false,
             NeedHand = true
         },
             out var doAfterId);
diff --git a/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs b/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs
index 194ef532ba2..ae0495fb278 100644
--- a/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs
+++ b/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs
@@ -163,8 +163,7 @@ private void OnInteract(EntityUid uid, MechGrabberComponent component, UserActiv
         component.AudioStream = audio!.Value.Entity;
         var doAfterArgs = new DoAfterArgs(EntityManager, args.User, component.GrabDelay, new GrabberDoAfterEvent(), uid, target: target, used: uid)
         {
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true
+            BreakOnMove = true
         };
 
         _doAfter.TryStartDoAfter(doAfterArgs, out component.DoAfter);
diff --git a/Content.Server/Mech/Systems/MechEquipmentSystem.cs b/Content.Server/Mech/Systems/MechEquipmentSystem.cs
index 5191f53004e..f51c0444e69 100644
--- a/Content.Server/Mech/Systems/MechEquipmentSystem.cs
+++ b/Content.Server/Mech/Systems/MechEquipmentSystem.cs
@@ -47,8 +47,7 @@ private void OnUsed(EntityUid uid, MechEquipmentComponent component, AfterIntera
 
         var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, component.InstallDuration, new InsertEquipmentEvent(), uid, target: mech, used: uid)
         {
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true
+            BreakOnMove = true,
         };
 
         _doAfter.TryStartDoAfter(doAfterEventArgs);
diff --git a/Content.Server/Mech/Systems/MechSystem.cs b/Content.Server/Mech/Systems/MechSystem.cs
index a728ee7de5e..53c6c62cdb8 100644
--- a/Content.Server/Mech/Systems/MechSystem.cs
+++ b/Content.Server/Mech/Systems/MechSystem.cs
@@ -89,10 +89,10 @@ private void OnInteractUsing(EntityUid uid, MechComponent component, InteractUsi
 
         if (TryComp<ToolComponent>(args.Used, out var tool) && tool.Qualities.Contains("Prying") && component.BatterySlot.ContainedEntity != null)
         {
-            var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, component.BatteryRemovalDelay, new RemoveBatteryEvent(), uid, target: uid, used: args.Target)
+            var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, component.BatteryRemovalDelay,
+                new RemoveBatteryEvent(), uid, target: uid, used: args.Target)
             {
-                BreakOnTargetMove = true,
-                BreakOnUserMove = true,
+                BreakOnMove = true
             };
 
             _doAfter.TryStartDoAfter(doAfterEventArgs);
@@ -179,7 +179,7 @@ private void OnAlternativeVerb(EntityUid uid, MechComponent component, GetVerbsE
                 {
                     var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, component.EntryDelay, new MechEntryEvent(), uid, target: uid)
                     {
-                        BreakOnUserMove = true,
+                        BreakOnMove = true,
                     };
 
                     _doAfter.TryStartDoAfter(doAfterEventArgs);
@@ -207,11 +207,8 @@ private void OnAlternativeVerb(EntityUid uid, MechComponent component, GetVerbsE
                         return;
                     }
 
-                    var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, component.ExitDelay, new MechExitEvent(), uid, target: uid)
-                    {
-                        BreakOnUserMove = true,
-                        BreakOnTargetMove = true,
-                    };
+                    var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, component.ExitDelay,
+                        new MechExitEvent(), uid, target: uid);
 
                     _doAfter.TryStartDoAfter(doAfterEventArgs);
                 }
diff --git a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
index ec27c717286..227283c95d0 100644
--- a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
+++ b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
@@ -158,9 +158,8 @@ private void OnAfterInteractUsing(Entity<BiomassReclaimerComponent> reclaimer, r
                 : 1);
             _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, delay, new ReclaimerDoAfterEvent(), reclaimer, target: args.Target, used: args.Used)
             {
-                BreakOnTargetMove = true,
-                BreakOnUserMove = true,
-                NeedHand = true
+                NeedHand = true,
+                BreakOnMove = true
             });
         }
 
diff --git a/Content.Server/Medical/CryoPodSystem.cs b/Content.Server/Medical/CryoPodSystem.cs
index d90e49d2016..db7eef0afa8 100644
--- a/Content.Server/Medical/CryoPodSystem.cs
+++ b/Content.Server/Medical/CryoPodSystem.cs
@@ -144,8 +144,7 @@ private void HandleDragDropOn(Entity<CryoPodComponent> entity, ref DragDropTarge
         var doAfterArgs = new DoAfterArgs(EntityManager, args.User, entity.Comp.EntryDelay, new CryoPodDragFinished(), entity, target: args.Dragged, used: entity)
         {
             BreakOnDamage = true,
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             NeedHand = false,
         };
         _doAfterSystem.TryStartDoAfter(doAfterArgs);
diff --git a/Content.Server/Medical/DefibrillatorSystem.cs b/Content.Server/Medical/DefibrillatorSystem.cs
index 45e31cef5bb..9f145173aca 100644
--- a/Content.Server/Medical/DefibrillatorSystem.cs
+++ b/Content.Server/Medical/DefibrillatorSystem.cs
@@ -142,16 +142,14 @@ public bool TryStartZap(EntityUid uid, EntityUid target, EntityUid user, Defibri
         _audio.PlayPvs(component.ChargeSound, uid);
         return _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, component.DoAfterDuration, new DefibrillatorZapDoAfterEvent(),
             uid, target, uid)
-        {
-            NeedHand = true,
-            BreakOnMove = !component.AllowDoAfterMovement
-        });
+            {
+                BlockDuplicate = true,
+                BreakOnHandChange = true,
+                NeedHand = true
+            });
     }
 
-    /// <summary>
-    ///     Tries to defibrillate the target with the given defibrillator.
-    /// </summary>
-    public void Zap(EntityUid uid, EntityUid target, EntityUid user, DefibrillatorComponent? component = null)
+    public void Zap(EntityUid uid, EntityUid target, EntityUid user, DefibrillatorComponent? component = null, MobStateComponent? mob = null, MobThresholdsComponent? thresholds = null)
     {
         if (!Resolve(uid, ref component))
             return;
diff --git a/Content.Server/Medical/HealingSystem.cs b/Content.Server/Medical/HealingSystem.cs
index c64bb2a485d..8191243356b 100644
--- a/Content.Server/Medical/HealingSystem.cs
+++ b/Content.Server/Medical/HealingSystem.cs
@@ -218,12 +218,11 @@ targetDamage.DamageContainerID is not null &&
         var doAfterEventArgs =
             new DoAfterArgs(EntityManager, user, delay, new HealingDoAfterEvent(), target, target: target, used: uid)
             {
-                //Raise the event on the target if it's not self, otherwise raise it on self.
-                BreakOnUserMove = true,
-                BreakOnTargetMove = true,
                 // Didn't break on damage as they may be trying to prevent it and
                 // not being able to heal your own ticking damage would be frustrating.
                 NeedHand = true,
+                BreakOnMove = true,
+                BreakOnWeightlessMove = false,
             };
 
         _doAfter.TryStartDoAfter(doAfterEventArgs);
diff --git a/Content.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs
index f284a214e65..870788cd4de 100644
--- a/Content.Server/Medical/HealthAnalyzerSystem.cs
+++ b/Content.Server/Medical/HealthAnalyzerSystem.cs
@@ -111,9 +111,8 @@ private void OnAfterInteract(Entity<HealthAnalyzerComponent> uid, ref AfterInter
 
         _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, uid.Comp.ScanDelay, new HealthAnalyzerDoAfterEvent(), uid, target: args.Target, used: uid)
         {
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
-            NeedHand = true
+            NeedHand = true,
+            BreakOnMove = true
         });
     }
 
diff --git a/Content.Server/Medical/Stethoscope/StethoscopeSystem.cs b/Content.Server/Medical/Stethoscope/StethoscopeSystem.cs
index 96bfc7c904c..b8304c562a4 100644
--- a/Content.Server/Medical/Stethoscope/StethoscopeSystem.cs
+++ b/Content.Server/Medical/Stethoscope/StethoscopeSystem.cs
@@ -100,9 +100,8 @@ private void StartListening(EntityUid scope, EntityUid user, EntityUid target, S
         {
             _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, user, comp.Delay, new StethoscopeDoAfterEvent(), scope, target: target, used: scope)
             {
-                BreakOnTargetMove = true,
-                BreakOnUserMove = true,
-                NeedHand = true
+                NeedHand = true,
+                BreakOnMove = true,
             });
         }
 
diff --git a/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs b/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs
index c4b5c6dc2bf..4baf0913cec 100644
--- a/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs
+++ b/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs
@@ -51,9 +51,8 @@ private void OnBeforeInteractHand(Entity<BatteryDrainerComponent> ent, ref Befor
 
         var doAfterArgs = new DoAfterArgs(EntityManager, uid, comp.DrainTime, new DrainDoAfterEvent(), target: target, eventTarget: uid)
         {
-            BreakOnUserMove = true,
-            BreakOnWeightlessMove = true, // prevent a ninja on a pod remotely draining it
             MovementThreshold = 0.5f,
+            BreakOnMove = true,
             CancelDuplicate = false,
             AttemptFrequency = AttemptFrequency.StartAndEnd
         };
diff --git a/Content.Server/Nuke/NukeSystem.cs b/Content.Server/Nuke/NukeSystem.cs
index 9cd24b9af6c..4bca7a1eac6 100644
--- a/Content.Server/Nuke/NukeSystem.cs
+++ b/Content.Server/Nuke/NukeSystem.cs
@@ -591,8 +591,7 @@ private void DisarmBombDoafter(EntityUid uid, EntityUid user, NukeComponent nuke
         var doAfter = new DoAfterArgs(EntityManager, user, nuke.DisarmDoafterLength, new NukeDisarmDoAfterEvent(), uid, target: uid)
         {
             BreakOnDamage = true,
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             NeedHand = true
         };
 
diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
index cd05adc7948..6781d07956b 100644
--- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
@@ -213,9 +213,8 @@ private bool TryDrink(EntityUid user, EntityUid target, DrinkComponent drink, En
             target: target,
             used: item)
         {
-            BreakOnUserMove = forceDrink,
+            BreakOnMove = forceDrink,
             BreakOnDamage = true,
-            BreakOnTargetMove = forceDrink,
             MovementThreshold = 0.01f,
             DistanceThreshold = 1.0f,
             // Mice and the like can eat without hands.
diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
index 84355f03c16..feb7c494841 100644
--- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
@@ -189,9 +189,8 @@ private void OnFeedFood(Entity<FoodComponent> entity, ref AfterInteractEvent arg
             target: target,
             used: food)
         {
-            BreakOnUserMove = forceFeed,
+            BreakOnMove = forceFeed,
             BreakOnDamage = true,
-            BreakOnTargetMove = forceFeed,
             MovementThreshold = 0.01f,
             DistanceThreshold = MaxFeedDistance,
             // Mice and the like can eat without hands.
diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs
index d5bff967b3c..f7650f599b4 100644
--- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs
+++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs
@@ -114,8 +114,7 @@ private void OnVapeInteraction(Entity<VapeComponent> entity, ref AfterInteractEv
                 var vapeDoAfterEvent = new VapeDoAfterEvent(solution, forced);
                 _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, delay, vapeDoAfterEvent, entity.Owner, target: args.Target, used: entity.Owner)
                 {
-                    BreakOnTargetMove = true,
-                    BreakOnUserMove = false,
+                    BreakOnMove = false,
                     BreakOnDamage = true
                 });
             }
diff --git a/Content.Server/Power/Generator/PortableGeneratorSystem.cs b/Content.Server/Power/Generator/PortableGeneratorSystem.cs
index e2996a54d71..f7d259b122a 100644
--- a/Content.Server/Power/Generator/PortableGeneratorSystem.cs
+++ b/Content.Server/Power/Generator/PortableGeneratorSystem.cs
@@ -73,7 +73,7 @@ private void StartGenerator(EntityUid uid, PortableGeneratorComponent component,
 
         _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, component.StartTime, new GeneratorStartedEvent(), uid, uid)
         {
-            BreakOnDamage = true, BreakOnTargetMove = true, BreakOnUserMove = true, RequireCanInteract = true,
+            BreakOnDamage = true, BreakOnMove = true, RequireCanInteract = true,
             NeedHand = true
         });
     }
diff --git a/Content.Server/Resist/EscapeInventorySystem.cs b/Content.Server/Resist/EscapeInventorySystem.cs
index a6eb703ab0f..63e8173117c 100644
--- a/Content.Server/Resist/EscapeInventorySystem.cs
+++ b/Content.Server/Resist/EscapeInventorySystem.cs
@@ -86,8 +86,7 @@ private void OnRelayMovement(EntityUid uid, CanEscapeInventoryComponent componen
 
         var doAfterEventArgs = new DoAfterArgs(EntityManager, user, component.BaseResistTime * multiplier, new EscapeInventoryEvent(), user, target: container)
         {
-            BreakOnTargetMove = false,
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             BreakOnDamage = true,
             NeedHand = false
         };
diff --git a/Content.Server/Resist/ResistLockerSystem.cs b/Content.Server/Resist/ResistLockerSystem.cs
index 7a17a2eba19..2ab277d0f1a 100644
--- a/Content.Server/Resist/ResistLockerSystem.cs
+++ b/Content.Server/Resist/ResistLockerSystem.cs
@@ -47,8 +47,7 @@ private void AttemptResist(EntityUid user, EntityUid target, EntityStorageCompon
 
         var doAfterEventArgs = new DoAfterArgs(EntityManager, user, resistLockerComponent.ResistTime, new ResistLockerDoAfterEvent(), target, target: target)
         {
-            BreakOnTargetMove = false,
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             BreakOnDamage = true,
             NeedHand = false //No hands 'cause we be kickin'
         };
diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
index 0a72e48071e..bf87cf5a600 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
@@ -91,7 +91,7 @@ private void BeginSoulSearchDoAfter(EntityUid uid, EntityUid target, RevenantCom
     {
         var searchDoAfter = new DoAfterArgs(EntityManager, uid, revenant.SoulSearchDuration, new SoulEvent(), uid, target: target)
         {
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             BreakOnDamage = true,
             DistanceThreshold = 2
         };
@@ -152,7 +152,7 @@ private void BeginHarvestDoAfter(EntityUid uid, EntityUid target, RevenantCompon
         var doAfter = new DoAfterArgs(EntityManager, uid, revenant.HarvestDebuffs.X, new HarvestEvent(), uid, target: target)
         {
             DistanceThreshold = 2,
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             BreakOnDamage = true,
             RequireCanInteract = false, // stuns itself
         };
diff --git a/Content.Server/SprayPainter/SprayPainterSystem.cs b/Content.Server/SprayPainter/SprayPainterSystem.cs
index e49c49c1da0..a8024e2d77b 100644
--- a/Content.Server/SprayPainter/SprayPainterSystem.cs
+++ b/Content.Server/SprayPainter/SprayPainterSystem.cs
@@ -55,8 +55,7 @@ private void OnPipeInteract(Entity<AtmosPipeColorComponent> ent, ref InteractUsi
 
         var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, painter.PipeSprayTime, new SprayPainterPipeDoAfterEvent(color), args.Used, target: ent, used: args.Used)
         {
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             BreakOnDamage = true,
             CancelDuplicate = true,
             // multiple pipes can be sprayed at once just not the same one
diff --git a/Content.Server/Sticky/Systems/StickySystem.cs b/Content.Server/Sticky/Systems/StickySystem.cs
index 2d1104e2ceb..effe1b72f71 100644
--- a/Content.Server/Sticky/Systems/StickySystem.cs
+++ b/Content.Server/Sticky/Systems/StickySystem.cs
@@ -93,8 +93,7 @@ private bool StartSticking(EntityUid uid, EntityUid user, EntityUid target, Stic
             // start sticking object to target
             _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, user, delay, new StickyDoAfterEvent(), uid, target: target, used: uid)
             {
-                BreakOnTargetMove = true,
-                BreakOnUserMove = true,
+                BreakOnMove = true,
                 NeedHand = true
             });
         }
@@ -148,8 +147,7 @@ private void StartUnsticking(EntityUid uid, EntityUid user, StickyComponent? com
             // start unsticking object
             _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, user, delay, new StickyDoAfterEvent(), uid, target: uid)
             {
-                BreakOnTargetMove = true,
-                BreakOnUserMove = true,
+                BreakOnMove = true,
                 NeedHand = true
             });
         }
diff --git a/Content.Server/Strip/StrippableSystem.cs b/Content.Server/Strip/StrippableSystem.cs
index 73f2ce17a66..64e96e1467e 100644
--- a/Content.Server/Strip/StrippableSystem.cs
+++ b/Content.Server/Strip/StrippableSystem.cs
@@ -263,8 +263,7 @@ private void StartStripInsertInventory(
                 Hidden = hidden,
                 AttemptFrequency = AttemptFrequency.EveryTick,
                 BreakOnDamage = true,
-                BreakOnTargetMove = true,
-                BreakOnUserMove = true,
+                BreakOnMove = true,
                 NeedHand = true,
                 DuplicateCondition = DuplicateConditions.SameTool
             };
@@ -359,8 +358,7 @@ private void StartStripRemoveInventory(
                 Hidden = hidden,
                 AttemptFrequency = AttemptFrequency.EveryTick,
                 BreakOnDamage = true,
-                BreakOnTargetMove = true,
-                BreakOnUserMove = true,
+                BreakOnMove = true,
                 NeedHand = true,
                 BreakOnHandChange = false, // Allow simultaneously removing multiple items.
                 DuplicateCondition = DuplicateConditions.SameTool
@@ -459,8 +457,7 @@ private void StartStripInsertHand(
                 Hidden = hidden,
                 AttemptFrequency = AttemptFrequency.EveryTick,
                 BreakOnDamage = true,
-                BreakOnTargetMove = true,
-                BreakOnUserMove = true,
+                BreakOnMove = true,
                 NeedHand = true,
                 DuplicateCondition = DuplicateConditions.SameTool
             };
@@ -561,8 +558,7 @@ private void StartStripRemoveHand(
                 Hidden = hidden,
                 AttemptFrequency = AttemptFrequency.EveryTick,
                 BreakOnDamage = true,
-                BreakOnTargetMove = true,
-                BreakOnUserMove = true,
+                BreakOnMove = true,
                 NeedHand = true,
                 BreakOnHandChange = false, // Allow simultaneously removing multiple items.
                 DuplicateCondition = DuplicateConditions.SameTool
diff --git a/Content.Server/Teleportation/HandTeleporterSystem.cs b/Content.Server/Teleportation/HandTeleporterSystem.cs
index 29cde5d741d..3d988b09161 100644
--- a/Content.Server/Teleportation/HandTeleporterSystem.cs
+++ b/Content.Server/Teleportation/HandTeleporterSystem.cs
@@ -58,7 +58,7 @@ private void OnUseInHand(EntityUid uid, HandTeleporterComponent component, UseIn
             var doafterArgs = new DoAfterArgs(EntityManager, args.User, component.PortalCreationDelay, new TeleporterDoAfterEvent(), uid, used: uid)
             {
                 BreakOnDamage = true,
-                BreakOnUserMove = true,
+                BreakOnMove = true,
                 MovementThreshold = 0.5f,
             };
 
diff --git a/Content.Server/Wires/WiresSystem.cs b/Content.Server/Wires/WiresSystem.cs
index 440b1f6dce7..526a14b1ab4 100644
--- a/Content.Server/Wires/WiresSystem.cs
+++ b/Content.Server/Wires/WiresSystem.cs
@@ -703,7 +703,7 @@ private void TryDoWireAction(EntityUid target, EntityUid user, EntityUid toolEnt
             {
                 NeedHand = true,
                 BreakOnDamage = true,
-                BreakOnUserMove = true
+                BreakOnMove = true
             };
 
             _doAfter.TryStartDoAfter(args);
diff --git a/Content.Shared/Burial/BurialSystem.cs b/Content.Shared/Burial/BurialSystem.cs
index 1116c6797b2..45a89f3be97 100644
--- a/Content.Shared/Burial/BurialSystem.cs
+++ b/Content.Shared/Burial/BurialSystem.cs
@@ -45,8 +45,7 @@ private void OnInteractUsing(EntityUid uid, GraveComponent component, InteractUs
         {
             var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, component.DigDelay / shovel.SpeedModifier, new GraveDiggingDoAfterEvent(), uid, target: args.Target, used: uid)
             {
-                BreakOnTargetMove = true,
-                BreakOnUserMove = true,
+                BreakOnMove = true,
                 BreakOnDamage = true,
                 NeedHand = true,
                 BreakOnHandChange = true
@@ -166,8 +165,7 @@ private void OnRelayMovement(EntityUid uid, GraveComponent component, ref Contai
         var doAfterEventArgs = new DoAfterArgs(EntityManager, args.Entity, component.DigDelay / component.DigOutByHandModifier, new GraveDiggingDoAfterEvent(), uid, target: uid)
         {
             NeedHand = false,
-            BreakOnUserMove = true,
-            BreakOnTargetMove = false,
+            BreakOnMove = true,
             BreakOnHandChange = false,
             BreakOnDamage = false
         };
diff --git a/Content.Shared/Climbing/Systems/ClimbSystem.cs b/Content.Shared/Climbing/Systems/ClimbSystem.cs
index 36dc7c059e4..722d97213f5 100644
--- a/Content.Shared/Climbing/Systems/ClimbSystem.cs
+++ b/Content.Shared/Climbing/Systems/ClimbSystem.cs
@@ -226,8 +226,7 @@ public bool TryClimb(
             target: climbable,
             used: entityToMove)
         {
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             BreakOnDamage = true,
             DuplicateCondition = DuplicateConditions.SameTool | DuplicateConditions.SameTarget
         };
diff --git a/Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs
index 4abe7bc876a..4cb127bb102 100644
--- a/Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs
@@ -103,7 +103,7 @@ private void StartDoAfter(EntityUid user, EntityUid item, EntityUid wearer, Togg
         var args = new DoAfterArgs(EntityManager, user, time, new ToggleClothingDoAfterEvent(), item, wearer, item)
         {
             BreakOnDamage = true,
-            BreakOnTargetMove = true,
+            BreakOnMove = true,
             // This should just re-use the BUI range checks & cancel the do after if the BUI closes. But that is all
             // server-side at the moment.
             // TODO BUI REFACTOR.
diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs
index 297fe095f8c..1c8e2ef2b0d 100644
--- a/Content.Shared/Cuffs/SharedCuffableSystem.cs
+++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs
@@ -511,10 +511,11 @@ public bool TryCuffing(EntityUid user, EntityUid target, EntityUid handcuff, Han
 
             var doAfterEventArgs = new DoAfterArgs(EntityManager, user, cuffTime, new AddCuffDoAfterEvent(), handcuff, target, handcuff)
             {
-                BreakOnTargetMove = true,
-                BreakOnUserMove = true,
+                BreakOnMove = true,
+                BreakOnWeightlessMove = false,
                 BreakOnDamage = true,
-                NeedHand = true
+                NeedHand = true,
+                DistanceThreshold = 0.3f
             };
 
             if (!_doAfter.TryStartDoAfter(doAfterEventArgs))
@@ -606,11 +607,12 @@ public void TryUncuff(EntityUid target, EntityUid user, EntityUid? cuffsToRemove
 
             var doAfterEventArgs = new DoAfterArgs(EntityManager, user, uncuffTime, new UnCuffDoAfterEvent(), target, target, cuffsToRemove)
             {
-                BreakOnUserMove = true,
-                BreakOnTargetMove = true,
+                BreakOnMove = true,
+                BreakOnWeightlessMove = false,
                 BreakOnDamage = true,
                 NeedHand = true,
                 RequireCanInteract = false, // Trust in UncuffAttemptEvent
+                DistanceThreshold = 0.3f
             };
 
             if (!_doAfter.TryStartDoAfter(doAfterEventArgs))
diff --git a/Content.Shared/Devour/SharedDevourSystem.cs b/Content.Shared/Devour/SharedDevourSystem.cs
index 124daeffaaa..14047fba7dd 100644
--- a/Content.Shared/Devour/SharedDevourSystem.cs
+++ b/Content.Shared/Devour/SharedDevourSystem.cs
@@ -59,8 +59,7 @@ protected void OnDevourAction(EntityUid uid, DevourerComponent component, Devour
 
                     _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, uid, component.DevourTime, new DevourDoAfterEvent(), uid, target: target, used: uid)
                     {
-                        BreakOnTargetMove = true,
-                        BreakOnUserMove = true,
+                        BreakOnMove = true,
                     });
                     break;
                 default:
@@ -78,8 +77,7 @@ protected void OnDevourAction(EntityUid uid, DevourerComponent component, Devour
 
         _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, uid, component.StructureDevourTime, new DevourDoAfterEvent(), uid, target: target, used: uid)
         {
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
+            BreakOnMove = true,
         });
     }
 }
diff --git a/Content.Shared/DoAfter/DoAfter.cs b/Content.Shared/DoAfter/DoAfter.cs
index d999b370b3f..f77a6dc272e 100644
--- a/Content.Shared/DoAfter/DoAfter.cs
+++ b/Content.Shared/DoAfter/DoAfter.cs
@@ -82,12 +82,6 @@ public DoAfter(ushort index, DoAfterArgs args, TimeSpan startTime)
     {
         Index = index;
 
-        if (args.Target == null)
-        {
-            DebugTools.Assert(!args.BreakOnTargetMove);
-            args.BreakOnTargetMove = false;
-        }
-
         Args = args;
         StartTime = startTime;
     }
diff --git a/Content.Shared/DoAfter/DoAfterArgs.cs b/Content.Shared/DoAfter/DoAfterArgs.cs
index 73334deddbe..d88f72c965f 100644
--- a/Content.Shared/DoAfter/DoAfterArgs.cs
+++ b/Content.Shared/DoAfter/DoAfterArgs.cs
@@ -92,29 +92,23 @@ public sealed partial class DoAfterArgs
     public bool BreakOnHandChange = true;
 
     /// <summary>
-    ///     If do_after stops when the user moves
+    ///     If do_after stops when the user or target moves
     /// </summary>
-    [DataField("breakOnUserMove")]
-    public bool BreakOnUserMove;
-
-    /// <summary>
-    ///     If this is true then any movement, even when weightless, will break the doafter.
-    ///     When there is no gravity, BreakOnUserMove is ignored. If it is false to begin with nothing will change.
-    /// </summary>
-    [DataField("breakOnWeightlessMove")]
-    public bool BreakOnWeightlessMove;
+    [DataField]
+    public bool BreakOnMove;
 
     /// <summary>
-    ///     If do_after stops when the target moves (if there is a target)
+    ///     Whether to break on movement when the user is weightless.
+    ///     This does nothing if <see cref="BreakOnMove"/> is false.
     /// </summary>
-    [DataField("breakOnTargetMove")]
-    public bool BreakOnTargetMove;
+    [DataField]
+    public bool BreakOnWeightlessMove = true;
 
     /// <summary>
     ///     Threshold for user and target movement
     /// </summary>
     [DataField("movementThreshold")]
-    public float MovementThreshold = 0.1f;
+    public float MovementThreshold = 0.3f;
 
     /// <summary>
     ///     Threshold for distance user from the used OR target entities.
@@ -254,9 +248,8 @@ public DoAfterArgs(DoAfterArgs other)
         Broadcast = other.Broadcast;
         NeedHand = other.NeedHand;
         BreakOnHandChange = other.BreakOnHandChange;
-        BreakOnUserMove = other.BreakOnUserMove;
+        BreakOnMove = other.BreakOnMove;
         BreakOnWeightlessMove = other.BreakOnWeightlessMove;
-        BreakOnTargetMove = other.BreakOnTargetMove;
         MovementThreshold = other.MovementThreshold;
         DistanceThreshold = other.DistanceThreshold;
         BreakOnDamage = other.BreakOnDamage;
diff --git a/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs b/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs
index 24b38417596..4f77a271b37 100644
--- a/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs
+++ b/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs
@@ -1,5 +1,7 @@
 using Content.Shared.Gravity;
 using Content.Shared.Hands.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Physics;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.DoAfter;
@@ -8,6 +10,7 @@ public abstract partial class SharedDoAfterSystem : EntitySystem
 {
     [Dependency] private readonly IDynamicTypeFactory _factory = default!;
     [Dependency] private readonly SharedGravitySystem _gravity = default!;
+    [Dependency] private readonly SharedInteractionSystem _interaction = default!;
 
     private DoAfter[] _doAfters = Array.Empty<DoAfter>();
 
@@ -164,24 +167,53 @@ private bool ShouldCancel(DoAfter doAfter,
             return true;
 
         // TODO: Re-use existing xform query for these calculations.
-        // when there is no gravity you will be drifting 99% of the time making many doafters impossible
-        // so this just ignores your movement if you are weightless (unless the doafter sets BreakOnWeightlessMove then moving will still break it)
-        if (args.BreakOnUserMove
-            && !userXform.Coordinates.InRange(EntityManager, _transform, doAfter.UserPosition, args.MovementThreshold)
-            && (args.BreakOnWeightlessMove || !_gravity.IsWeightless(args.User, xform: userXform)))
-            return true;
-
-        if (args.BreakOnTargetMove)
+        if (args.BreakOnMove && !(!args.BreakOnWeightlessMove && _gravity.IsWeightless(args.User, xform: userXform)))
         {
-            DebugTools.Assert(targetXform != null, "Break on move is true, but no target specified?");
-            if (targetXform != null && targetXform.Coordinates.TryDistance(EntityManager, userXform.Coordinates, out var distance))
+            // Whether the user has moved too much from their original position.
+            if (!userXform.Coordinates.InRange(EntityManager, _transform, doAfter.UserPosition, args.MovementThreshold))
+                return true;
+
+            // Whether the distance between the user and target(if any) has changed too much.
+            if (targetXform != null &&
+                targetXform.Coordinates.TryDistance(EntityManager, userXform.Coordinates, out var distance))
             {
-                // once the target moves too far from you the do after breaks
                 if (Math.Abs(distance - doAfter.TargetDistance) > args.MovementThreshold)
                     return true;
             }
         }
 
+        // Whether the user and the target are too far apart.
+        if (args.Target != null)
+        {
+            if (args.DistanceThreshold != null)
+            {
+                if (!_interaction.InRangeUnobstructed(args.User, args.Target.Value, args.DistanceThreshold.Value))
+                    return true;
+            }
+            else
+            {
+                if (!_interaction.InRangeUnobstructed(args.User, args.Target.Value))
+                    return true;
+            }
+        }
+
+        // Whether the distance between the tool and the user has grown too much.
+        if (args.Used != null)
+        {
+            if (args.DistanceThreshold != null)
+            {
+                if (!_interaction.InRangeUnobstructed(args.User,
+                        args.Used.Value,
+                        args.DistanceThreshold.Value))
+                    return true;
+            }
+            else
+            {
+                if (!_interaction.InRangeUnobstructed(args.User,args.Used.Value))
+                    return true;
+            }
+        }
+
         if (args.AttemptFrequency == AttemptFrequency.EveryTick && !TryAttemptEvent(doAfter))
             return true;
 
@@ -200,23 +232,6 @@ private bool ShouldCancel(DoAfter doAfter,
         if (args.RequireCanInteract && !_actionBlocker.CanInteract(args.User, args.Target))
             return true;
 
-        if (args.DistanceThreshold != null)
-        {
-            if (targetXform != null
-                && !args.User.Equals(args.Target)
-                && !userXform.Coordinates.InRange(EntityManager, _transform, targetXform.Coordinates,
-                    args.DistanceThreshold.Value))
-            {
-                return true;
-            }
-
-            if (usedXform != null
-                && !userXform.Coordinates.InRange(EntityManager, _transform, usedXform.Coordinates,
-                    args.DistanceThreshold.Value))
-            {
-                return true;
-            }
-        }
 
         return false;
     }
diff --git a/Content.Shared/DoAfter/SharedDoAfterSystem.cs b/Content.Shared/DoAfter/SharedDoAfterSystem.cs
index 81c8c4f3823..ed8be1ad657 100644
--- a/Content.Shared/DoAfter/SharedDoAfterSystem.cs
+++ b/Content.Shared/DoAfter/SharedDoAfterSystem.cs
@@ -215,12 +215,11 @@ public bool TryStartDoAfter(DoAfterArgs args, [NotNullWhen(true)] out DoAfterId?
         args.NetUser = GetNetEntity(args.User);
         args.NetEventTarget = GetNetEntity(args.EventTarget);
 
-        if (args.BreakOnUserMove || args.BreakOnTargetMove)
+        if (args.BreakOnMove)
             doAfter.UserPosition = Transform(args.User).Coordinates;
 
-        if (args.Target != null && args.BreakOnTargetMove)
+        if (args.Target != null && args.BreakOnMove)
         {
-            // Target should never be null if the bool is set.
             var targetPosition = Transform(args.Target.Value).Coordinates;
             doAfter.UserPosition.TryDistance(EntityManager, targetPosition, out doAfter.TargetDistance);
         }
diff --git a/Content.Shared/Inventory/InventorySystem.Equip.cs b/Content.Shared/Inventory/InventorySystem.Equip.cs
index 12435eba890..f6879bb1a5d 100644
--- a/Content.Shared/Inventory/InventorySystem.Equip.cs
+++ b/Content.Shared/Inventory/InventorySystem.Equip.cs
@@ -169,8 +169,7 @@ public bool TryEquip(EntityUid actor, EntityUid target, EntityUid itemUid, strin
             {
                 BlockDuplicate = true,
                 BreakOnHandChange = true,
-                BreakOnUserMove = true,
-                BreakOnTargetMove = true,
+                BreakOnMove = true,
                 CancelDuplicate = true,
                 RequireCanInteract = true,
                 NeedHand = true
@@ -418,8 +417,7 @@ public bool TryUnequip(
             {
                 BlockDuplicate = true,
                 BreakOnHandChange = true,
-                BreakOnUserMove = true,
-                BreakOnTargetMove = true,
+                BreakOnMove = true,
                 CancelDuplicate = true,
                 RequireCanInteract = true,
                 NeedHand = true
diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs
index bfdfc77bc21..9735d71a519 100644
--- a/Content.Shared/Lock/LockSystem.cs
+++ b/Content.Shared/Lock/LockSystem.cs
@@ -121,7 +121,7 @@ public bool TryLock(EntityUid uid, EntityUid user, LockComponent? lockComp = nul
             return _doAfter.TryStartDoAfter(
                 new DoAfterArgs(EntityManager, user, lockComp.LockTime, new LockDoAfter(), uid, uid)
                 {
-                    BreakOnDamage = true, BreakOnTargetMove = true, BreakOnUserMove = true, RequireCanInteract = true,
+                    BreakOnDamage = true, BreakOnMove = true, RequireCanInteract = true,
                     NeedHand = true
                 });
         }
@@ -197,7 +197,7 @@ public bool TryUnlock(EntityUid uid, EntityUid user, LockComponent? lockComp = n
             return _doAfter.TryStartDoAfter(
                 new DoAfterArgs(EntityManager, user, lockComp.LockTime, new UnlockDoAfter(), uid, uid)
                 {
-                    BreakOnDamage = true, BreakOnTargetMove = true, BreakOnUserMove = true, RequireCanInteract = true,
+                    BreakOnDamage = true, BreakOnMove = true, RequireCanInteract = true,
                     NeedHand = true
                 });
         }
diff --git a/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs b/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs
index 04926c34562..73b7c0847fc 100644
--- a/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs
+++ b/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs
@@ -434,7 +434,7 @@ private void OnDragDrop(EntityUid uid, MechComponent component, ref DragDropTarg
 
         var doAfterEventArgs = new DoAfterArgs(EntityManager, args.Dragged, component.EntryDelay, new MechEntryEvent(), uid, target: uid)
         {
-            BreakOnUserMove = true,
+            BreakOnMove = true,
         };
 
         _doAfter.TryStartDoAfter(doAfterEventArgs);
diff --git a/Content.Shared/Projectiles/SharedProjectileSystem.cs b/Content.Shared/Projectiles/SharedProjectileSystem.cs
index 960dab84611..31a305dba99 100644
--- a/Content.Shared/Projectiles/SharedProjectileSystem.cs
+++ b/Content.Shared/Projectiles/SharedProjectileSystem.cs
@@ -90,8 +90,7 @@ private void OnEmbedActivate(EntityUid uid, EmbeddableProjectileComponent compon
             new RemoveEmbeddedProjectileEvent(), eventTarget: uid, target: uid)
         {
             DistanceThreshold = SharedInteractionSystem.InteractionRange,
-            BreakOnUserMove = true,
-            BreakOnTargetMove = true,
+            BreakOnMove = true,
             NeedHand = true,
         });
     }
diff --git a/Content.Shared/Prying/Systems/PryingSystem.cs b/Content.Shared/Prying/Systems/PryingSystem.cs
index a59c09ca535..ab87585c706 100644
--- a/Content.Shared/Prying/Systems/PryingSystem.cs
+++ b/Content.Shared/Prying/Systems/PryingSystem.cs
@@ -137,8 +137,7 @@ private bool StartPry(EntityUid target, EntityUid user, EntityUid? tool, float t
         var doAfterArgs = new DoAfterArgs(EntityManager, user, TimeSpan.FromSeconds(modEv.BaseTime * modEv.PryTimeModifier / toolModifier), new DoorPryDoAfterEvent(), target, target, tool)
         {
             BreakOnDamage = true,
-            BreakOnUserMove = true,
-            BreakOnWeightlessMove = true,
+            BreakOnMove = true,
         };
 
         if (tool != null)
diff --git a/Content.Shared/RCD/Systems/RCDSystem.cs b/Content.Shared/RCD/Systems/RCDSystem.cs
index bbdfc5d0218..f2c18f43f25 100644
--- a/Content.Shared/RCD/Systems/RCDSystem.cs
+++ b/Content.Shared/RCD/Systems/RCDSystem.cs
@@ -211,8 +211,7 @@ private void OnAfterInteract(EntityUid uid, RCDComponent component, AfterInterac
         {
             BreakOnDamage = true,
             BreakOnHandChange = true,
-            BreakOnUserMove = true,
-            BreakOnTargetMove = args.Target != null,
+            BreakOnMove = true,
             AttemptFrequency = AttemptFrequency.EveryTick,
             CancelDuplicate = false,
             BlockDuplicate = false,
diff --git a/Content.Shared/RatKing/SharedRatKingSystem.cs b/Content.Shared/RatKing/SharedRatKingSystem.cs
index d7a8ee5460d..ea489e332db 100644
--- a/Content.Shared/RatKing/SharedRatKingSystem.cs
+++ b/Content.Shared/RatKing/SharedRatKingSystem.cs
@@ -119,7 +119,7 @@ private void OnGetVerb(EntityUid uid, RatKingRummageableComponent component, Get
                 {
                     BlockDuplicate = true,
                     BreakOnDamage = true,
-                    BreakOnUserMove = true,
+                    BreakOnMove = true,
                     DistanceThreshold = 2f
                 });
             }
diff --git a/Content.Shared/Research/Systems/SharedResearchStealerSystem.cs b/Content.Shared/Research/Systems/SharedResearchStealerSystem.cs
index 1fffa8c0257..070ff40b70d 100644
--- a/Content.Shared/Research/Systems/SharedResearchStealerSystem.cs
+++ b/Content.Shared/Research/Systems/SharedResearchStealerSystem.cs
@@ -46,8 +46,8 @@ private void OnBeforeInteractHand(EntityUid uid, ResearchStealerComponent comp,
         var doAfterArgs = new DoAfterArgs(EntityManager, uid, comp.Delay, new ResearchStealDoAfterEvent(), target: target, used: uid, eventTarget: uid)
         {
             BreakOnDamage = true,
-            BreakOnUserMove = true,
-            MovementThreshold = 0.5f
+            BreakOnMove = true,
+            MovementThreshold = 0.5f,
         };
 
         _doAfter.TryStartDoAfter(doAfterArgs);
diff --git a/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs b/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
index 1ada22876b6..f94558b0b30 100644
--- a/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
+++ b/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
@@ -155,8 +155,7 @@ private void OnFultonInteract(EntityUid uid, FultonComponent component, AfterInt
             {
                 CancelDuplicate = true,
                 MovementThreshold = 0.5f,
-                BreakOnUserMove = true,
-                BreakOnTargetMove = true,
+                BreakOnMove = true,
                 Broadcast = true,
                 NeedHand = true,
             });
diff --git a/Content.Shared/Sericulture/SericultureSystem.cs b/Content.Shared/Sericulture/SericultureSystem.cs
index 514ec79f68e..f7586cc1ec3 100644
--- a/Content.Shared/Sericulture/SericultureSystem.cs
+++ b/Content.Shared/Sericulture/SericultureSystem.cs
@@ -61,7 +61,7 @@ private void OnSericultureStart(EntityUid uid, SericultureComponent comp, Sericu
 
         var doAfter = new DoAfterArgs(EntityManager, uid, comp.ProductionLength, new SericultureDoAfterEvent(), uid)
         { // I'm not sure if more things should be put here, but imo ideally it should probably be set in the component/YAML. Not sure if this is currently possible.
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             BlockDuplicate = true,
             BreakOnDamage = true,
             CancelDuplicate = true,
diff --git a/Content.Shared/Species/Systems/ReformSystem.cs b/Content.Shared/Species/Systems/ReformSystem.cs
index dc2ce3fb900..d2ceecf28e8 100644
--- a/Content.Shared/Species/Systems/ReformSystem.cs
+++ b/Content.Shared/Species/Systems/ReformSystem.cs
@@ -69,7 +69,7 @@ private void OnReform(EntityUid uid, ReformComponent comp, ReformEvent args)
         // Create a doafter & start it
         var doAfter = new DoAfterArgs(EntityManager, uid, comp.ReformTime, new ReformDoAfterEvent(), uid)
         {
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             BlockDuplicate = true,
             BreakOnDamage = true,
             CancelDuplicate = true,
@@ -89,7 +89,7 @@ private void OnDoAfter(EntityUid uid, ReformComponent comp, ReformDoAfterEvent a
             return;
 
         // Spawn a new entity
-        // This is, to an extent, taken from polymorph. I don't use polymorph for various reasons- most notably that this is permanent. 
+        // This is, to an extent, taken from polymorph. I don't use polymorph for various reasons- most notably that this is permanent.
         var child = Spawn(comp.ReformPrototype, Transform(uid).Coordinates);
 
         // This transfers the mind to the new entity
@@ -105,7 +105,7 @@ private void OnZombified(EntityUid uid, ReformComponent comp, ref EntityZombifie
         _actionsSystem.RemoveAction(uid, comp.ActionEntity); // Zombies can't reform
     }
 
-    public sealed partial class ReformEvent : InstantActionEvent { } 
+    public sealed partial class ReformEvent : InstantActionEvent { }
     
     [Serializable, NetSerializable]
     public sealed partial class ReformDoAfterEvent : SimpleDoAfterEvent { }
diff --git a/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs b/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
index fa04a50f8b0..feb1cebb8e1 100644
--- a/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
+++ b/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
@@ -134,8 +134,7 @@ private void OnAirlockInteract(Entity<PaintableAirlockComponent> ent, ref Intera
 
         var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, painter.AirlockSprayTime, new SprayPainterDoorDoAfterEvent(sprite, style.Department), args.Used, target: ent, used: args.Used)
         {
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             BreakOnDamage = true,
             NeedHand = true
         };
diff --git a/Content.Shared/Storage/EntitySystems/DumpableSystem.cs b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
index da7c3aa89a0..91acde47e19 100644
--- a/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
@@ -132,8 +132,7 @@ private void StartDoAfter(EntityUid storageUid, EntityUid targetUid, EntityUid u
 
         _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, userUid, delay, new DumpableDoAfterEvent(), storageUid, target: targetUid, used: storageUid)
         {
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             NeedHand = true
         });
     }
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index 9fd8bdf5e7b..d149ed5e0ab 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -430,7 +430,7 @@ private void AfterInteract(EntityUid uid, StorageComponent storageComp, AfterInt
                 var doAfterArgs = new DoAfterArgs(EntityManager, args.User, delay, new AreaPickupDoAfterEvent(GetNetEntityList(_entList)), uid, target: uid)
                 {
                     BreakOnDamage = true,
-                    BreakOnUserMove = true,
+                    BreakOnMove = true,
                     NeedHand = true
                 };
 
diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.cs b/Content.Shared/Tools/Systems/SharedToolSystem.cs
index 1336fe1527c..a134e03aac6 100644
--- a/Content.Shared/Tools/Systems/SharedToolSystem.cs
+++ b/Content.Shared/Tools/Systems/SharedToolSystem.cs
@@ -141,8 +141,8 @@ public bool UseTool(
         var doAfterArgs = new DoAfterArgs(EntityManager, user, delay / toolComponent.SpeedModifier, toolEvent, tool, target: target, used: tool)
         {
             BreakOnDamage = true,
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
+            BreakOnMove = true,
+            BreakOnWeightlessMove = false,
             NeedHand = tool != user,
             AttemptFrequency = fuel > 0 ? AttemptFrequency.EveryTick : AttemptFrequency.Never
         };
diff --git a/Content.Shared/VendingMachines/SharedVendingMachineSystem.Restock.cs b/Content.Shared/VendingMachines/SharedVendingMachineSystem.Restock.cs
index 87e2f0890a2..6aef4d0949a 100644
--- a/Content.Shared/VendingMachines/SharedVendingMachineSystem.Restock.cs
+++ b/Content.Shared/VendingMachines/SharedVendingMachineSystem.Restock.cs
@@ -70,8 +70,7 @@ private void OnAfterInteract(EntityUid uid, VendingMachineRestockComponent compo
         var doAfterArgs = new DoAfterArgs(EntityManager, args.User, (float) component.RestockDelay.TotalSeconds, new RestockDoAfterEvent(), target,
             target: target, used: uid)
         {
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             BreakOnDamage = true,
             NeedHand = true
         };
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
index 88acd81d5bd..4998b11f082 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
@@ -77,8 +77,7 @@ private void OnBallisticAfterInteract(EntityUid uid, BallisticAmmoProviderCompon
 
         _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, component.FillDelay, new AmmoFillDoAfterEvent(), used: uid, target: args.Target, eventTarget: uid)
         {
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             BreakOnDamage = false,
             NeedHand = true
         });

From d68532a953df9d50a3af48de8eb8990fbce9194e Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 03:25:56 -0400
Subject: [PATCH 031/366] mew

---
 Content.Server/Medical/DefibrillatorSystem.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Medical/DefibrillatorSystem.cs b/Content.Server/Medical/DefibrillatorSystem.cs
index 9f145173aca..3834ae6db9c 100644
--- a/Content.Server/Medical/DefibrillatorSystem.cs
+++ b/Content.Server/Medical/DefibrillatorSystem.cs
@@ -174,10 +174,13 @@ public void Zap(EntityUid uid, EntityUid target, EntityUid user, DefibrillatorCo
         if (targetEvent.Cancelled || !CanZap(uid, target, user, component, true))
             return;
 
-        if (!TryComp<MobStateComponent>(target, out var mob) ||
-            !TryComp<MobThresholdsComponent>(target, out var thresholds))
+        if (!TryComp<MobStateComponent>(target, out var mobState) ||
+            !TryComp<MobThresholdsComponent>(target, out var mobThresholds))
             return;
 
+        mob = mobState;
+        thresholds = mobThresholds;
+
         _audio.PlayPvs(component.ZapSound, uid);
         _electrocution.TryDoElectrocution(target, null, component.ZapDamage, component.WritheDuration, true, ignoreInsulation: true);
         component.NextZapTime = _timing.CurTime + component.ZapDelay;

From 08e15ef5e347a49983acfdb542c788bc6d3f317d Mon Sep 17 00:00:00 2001
From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Date: Tue, 21 May 2024 05:11:49 -0700
Subject: [PATCH 032/366] Add defib event, add fields to be able to disable
 crit defib and do after movement (#28174)

* Add defib event, add fields to be able to disable crit defib and do after movement

* Fix check
---
 Content.Server/Medical/DefibrillatorSystem.cs      | 3 ++-
 Content.Shared/Medical/DefibrillatorComponent.cs   | 6 ++++++
 Content.Shared/Medical/TargetDefibrillatedEvent.cs | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 Content.Shared/Medical/TargetDefibrillatedEvent.cs

diff --git a/Content.Server/Medical/DefibrillatorSystem.cs b/Content.Server/Medical/DefibrillatorSystem.cs
index 3834ae6db9c..264df0e230b 100644
--- a/Content.Server/Medical/DefibrillatorSystem.cs
+++ b/Content.Server/Medical/DefibrillatorSystem.cs
@@ -145,7 +145,8 @@ public bool TryStartZap(EntityUid uid, EntityUid target, EntityUid user, Defibri
             {
                 BlockDuplicate = true,
                 BreakOnHandChange = true,
-                NeedHand = true
+                NeedHand = true,
+                BreakOnMove = !component.AllowDoAfterMovement
             });
     }
 
diff --git a/Content.Shared/Medical/DefibrillatorComponent.cs b/Content.Shared/Medical/DefibrillatorComponent.cs
index 1d6f690bc3b..e4cd8077d26 100644
--- a/Content.Shared/Medical/DefibrillatorComponent.cs
+++ b/Content.Shared/Medical/DefibrillatorComponent.cs
@@ -55,6 +55,12 @@ public sealed partial class DefibrillatorComponent : Component
     [DataField("doAfterDuration"), ViewVariables(VVAccess.ReadWrite)]
     public TimeSpan DoAfterDuration = TimeSpan.FromSeconds(3);
 
+    [DataField]
+    public bool AllowDoAfterMovement = true;
+
+    [DataField]
+    public bool CanDefibCrit = true;
+
     /// <summary>
     /// The sound when someone is zapped.
     /// </summary>
diff --git a/Content.Shared/Medical/TargetDefibrillatedEvent.cs b/Content.Shared/Medical/TargetDefibrillatedEvent.cs
new file mode 100644
index 00000000000..60d1a215845
--- /dev/null
+++ b/Content.Shared/Medical/TargetDefibrillatedEvent.cs
@@ -0,0 +1,4 @@
+namespace Content.Shared.Medical;
+
+[ByRefEvent]
+public readonly record struct TargetDefibrillatedEvent(EntityUid User, Entity<DefibrillatorComponent> Defibrillator);

From 86dcabab12322dec5e959ff36b77739eb044b3bf Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 03:28:52 -0400
Subject: [PATCH 033/366] c

---
 Content.Shared/Medical/DefibrillatorEvents.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Content.Shared/Medical/DefibrillatorEvents.cs b/Content.Shared/Medical/DefibrillatorEvents.cs
index 54a21a40d42..12956d924f7 100644
--- a/Content.Shared/Medical/DefibrillatorEvents.cs
+++ b/Content.Shared/Medical/DefibrillatorEvents.cs
@@ -2,9 +2,6 @@
 
 namespace Content.Shared.Medical;
 
-[ByRefEvent]
-public readonly record struct TargetDefibrillatedEvent(EntityUid User, Entity<DefibrillatorComponent> Defibrillator);
-
 public abstract class BeforeDefibrillatorZapsEvent : CancellableEntityEventArgs, IInventoryRelayEvent
 {
     public SlotFlags TargetSlots { get; } = SlotFlags.WITHOUT_POCKET;

From acf597efa5e69b89bbc6091b33df7beafc811011 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 03:38:01 -0400
Subject: [PATCH 034/366] mew

---
 Content.Server/Language/TranslatorSystem.cs   |   4 +-
 .../EntitySystems/EmergencyLightSystem.cs     |   3 +-
 .../Kitchen/EntitySystems/DeepFryerSystem.cs  |   4 +-
 .../ReverseEngineeringSystem.cs               |   1 +
 .../Paper/PaperRandomStoryComponent.cs        |   4 -
 .../Psionics/Glimmer/GlimmerReactiveSystem.cs |   1 +
 .../Structures/GlimmerStructuresSystem.cs     |   1 +
 Content.Server/Silicons/Laws/SiliconLawEui.cs |   2 +-
 Content.Shared.Database/LogType.cs            |   4 +-
 .../Cabinet/ItemCabinetComponent.cs           |   1 +
 Content.Shared/Clothing/MagbootsSystem.cs     |   2 +-
 .../Interaction/SharedInteractionSystem.cs    |  16 +-
 .../EntitySystems/SharedStorageSystem.cs      | 333 ++++++++++--------
 13 files changed, 206 insertions(+), 170 deletions(-)

diff --git a/Content.Server/Language/TranslatorSystem.cs b/Content.Server/Language/TranslatorSystem.cs
index 5cb5c8cd2e9..133146ec064 100644
--- a/Content.Server/Language/TranslatorSystem.cs
+++ b/Content.Server/Language/TranslatorSystem.cs
@@ -102,7 +102,7 @@ private void OnTranslatorToggle(EntityUid translator, HandheldTranslatorComponen
         var isEnabled = !translatorComp.Enabled && hasPower;
 
         translatorComp.Enabled = isEnabled;
-        _powerCell.SetPowerCellDrawEnabled(translator, isEnabled);
+        _powerCell.SetDrawEnabled(translator, isEnabled);
 
         if (_containers.TryGetContainingContainer(translator, out var holderCont)
             && holderCont.Owner is var holder
@@ -130,7 +130,7 @@ private void OnTranslatorToggle(EntityUid translator, HandheldTranslatorComponen
     private void OnPowerCellSlotEmpty(EntityUid translator, HandheldTranslatorComponent component, PowerCellSlotEmptyEvent args)
     {
         component.Enabled = false;
-        _powerCell.SetPowerCellDrawEnabled(translator, false);
+        _powerCell.SetDrawEnabled(translator, false);
         OnAppearanceChange(translator, component);
 
         if (_containers.TryGetContainingContainer(translator, out var holderCont) && HasComp<LanguageSpeakerComponent>(holderCont.Owner))
diff --git a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
index 154a4081259..498fe3b6f4b 100644
--- a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
@@ -9,7 +9,6 @@
 using Content.Shared.Light;
 using Content.Shared.Light.Components;
 using Content.Shared.Power;
-using Content.Shared.Station.Components;
 using Robust.Server.GameObjects;
 using Color = Robust.Shared.Maths.Color;
 
@@ -236,6 +235,6 @@ private void TurnOn(Entity<EmergencyLightComponent> entity, Color color)
         _pointLight.SetColor(entity.Owner, color);
         _appearance.SetData(entity.Owner, EmergencyLightVisuals.Color, color);
         _appearance.SetData(entity.Owner, EmergencyLightVisuals.On, true);
-        _ambient.SetAmbience(entity.Owner, true); 
+        _ambient.SetAmbience(entity.Owner, true);
     }
 }
diff --git a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs
index 8bfb4aec8cc..1e030a9f3db 100644
--- a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs
+++ b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs
@@ -42,6 +42,7 @@
 using Content.Shared.Nyanotrasen.Kitchen.Components;
 using Content.Shared.Nyanotrasen.Kitchen.UI;
 using Content.Shared.Popups;
+using Content.Shared.Power;
 using Content.Shared.Throwing;
 using Content.Shared.UserInterface;
 using Content.Shared.Whitelist;
@@ -644,8 +645,7 @@ private void OnClearSlagStart(EntityUid uid, DeepFryerComponent component, DeepF
         var doAfterArgs = new DoAfterArgs(EntityManager, user, delay, ev, uid, uid, heldItem)
         {
             BreakOnDamage = true,
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             MovementThreshold = 0.25f,
             NeedHand = true
         };
diff --git a/Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs b/Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs
index 88da3093d74..98ce725f582 100644
--- a/Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs
+++ b/Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs
@@ -7,6 +7,7 @@
 using Content.Server.Power.Components;
 using Content.Server.Construction;
 using Content.Server.Popups;
+using Content.Shared.Power;
 using Content.Shared.UserInterface;
 using Robust.Shared.Containers;
 using Robust.Shared.Random;
diff --git a/Content.Server/Paper/PaperRandomStoryComponent.cs b/Content.Server/Paper/PaperRandomStoryComponent.cs
index e5eb3860024..7c5744f0878 100644
--- a/Content.Server/Paper/PaperRandomStoryComponent.cs
+++ b/Content.Server/Paper/PaperRandomStoryComponent.cs
@@ -1,7 +1,3 @@
-using Content.Shared.Paper;
-using Content.Shared.StoryGen;
-using Robust.Shared.Prototypes;
-
 namespace Content.Server.Paper;
 
 /// <summary>
diff --git a/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs b/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs
index f828874aacb..85aea76bd65 100644
--- a/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs
+++ b/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs
@@ -15,6 +15,7 @@
 using Content.Shared.Destructible;
 using Content.Shared.Construction.Components;
 using Content.Shared.Mind.Components;
+using Content.Shared.Power;
 using Content.Shared.Weapons.Melee.Components;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
diff --git a/Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs b/Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
index 8694147dc0e..c0c11b083ce 100644
--- a/Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
+++ b/Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
@@ -2,6 +2,7 @@
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Anomaly.Components;
+using Content.Shared.Power;
 using Content.Shared.Psionics.Glimmer;
 
 namespace Content.Server.Psionics.Glimmer
diff --git a/Content.Server/Silicons/Laws/SiliconLawEui.cs b/Content.Server/Silicons/Laws/SiliconLawEui.cs
index d5a5c4f4091..1d3c57b7cb7 100644
--- a/Content.Server/Silicons/Laws/SiliconLawEui.cs
+++ b/Content.Server/Silicons/Laws/SiliconLawEui.cs
@@ -59,7 +59,7 @@ public override void HandleMessage(EuiMessageBase msg)
     private bool IsAllowed()
     {
         var adminData = _adminManager.GetAdminData(Player);
-        if (adminData == null || !adminData.HasFlag(AdminFlags.Moderator))
+        if (adminData == null || !adminData.HasFlag(AdminFlags.Admin))
         {
             _sawmill.Warning("Player {0} tried to open / use silicon law UI without permission.", Player.UserId);
             return false;
diff --git a/Content.Shared.Database/LogType.cs b/Content.Shared.Database/LogType.cs
index dad042f9706..fc2dad677a7 100644
--- a/Content.Shared.Database/LogType.cs
+++ b/Content.Shared.Database/LogType.cs
@@ -105,5 +105,7 @@ public enum LogType
     /// <remarks>
     /// This is a default value used by <c>PlayerRateLimitManager</c>, though users can use different log types.
     /// </remarks>
-    RateLimited = 91
+    RateLimited = 91,
+    InteractUsing = 92,
+    Storage = 93
 }
diff --git a/Content.Shared/Cabinet/ItemCabinetComponent.cs b/Content.Shared/Cabinet/ItemCabinetComponent.cs
index 0ea30a8ca54..dcc276e5651 100644
--- a/Content.Shared/Cabinet/ItemCabinetComponent.cs
+++ b/Content.Shared/Cabinet/ItemCabinetComponent.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Containers.ItemSlots;
+using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Cabinet;
diff --git a/Content.Shared/Clothing/MagbootsSystem.cs b/Content.Shared/Clothing/MagbootsSystem.cs
index d41f27fefb0..ef5ac671e42 100644
--- a/Content.Shared/Clothing/MagbootsSystem.cs
+++ b/Content.Shared/Clothing/MagbootsSystem.cs
@@ -76,7 +76,7 @@ private void OnIsWeightless(Entity<MagbootsComponent> ent, ref IsWeightlessEvent
             return;
 
         // do not cancel weightlessness if the person is in off-grid.
-        if (ent.Comp.RequiresGrid && !_gravity.EntityOnGravitySupportingGridOrMap(ent.Owner))
+        if (ent.Comp.RequiresGrid && !_gravity.IsWeightless(ent.Owner))
             return;
 
         args.IsWeightless = false;
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index d325de92c83..97af3982d70 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -979,7 +979,7 @@ public bool InteractUsing(
             bool checkCanUse = true)
         {
             if (IsDeleted(user) || IsDeleted(used) || IsDeleted(target))
-                return;
+                return false;
 
             if (checkCanInteract && !_actionBlockerSystem.CanInteract(user, target))
                 return false;
@@ -1019,10 +1019,16 @@ public bool InteractUsing(
         /// <param name="used"><inheritdoc cref="InteractUsing"/></param>
         /// <param name="target"><inheritdoc cref="InteractUsing"/></param>
         /// <param name="clickLocation"><inheritdoc cref="InteractUsing"/></param>
-        /// <param name="canReach">Whether the <paramref name="user"/> is in range of the <paramref name="target"/>.
-        ///     </param>
+        /// <param name="canReach">Whether the <paramref name="user"/> is in range of the <paramref name="target"/>.</param>
+        /// <param name="checkDeletion">Whether we should check if any entities were deleted.</param>
         /// <returns>True if the interaction was handled. Otherwise, false.</returns>
-        public bool InteractDoAfter(EntityUid user, EntityUid used, EntityUid? target, EntityCoordinates clickLocation, bool canReach)
+        public bool InteractDoAfter(
+            EntityUid user,
+            EntityUid used,
+            EntityUid? target,
+            EntityCoordinates clickLocation,
+            bool canReach,
+            bool checkDeletion = false)
         {
             if (target is { Valid: false })
                 target = null;
@@ -1051,7 +1057,7 @@ public bool InteractDoAfter(EntityUid user, EntityUid used, EntityUid? target, E
             if (canReach)
                 DoContactInteraction(user, target, afterInteractUsingEvent);
             // Contact interactions are currently only used for forensics, so we don't raise used -> target
-            
+
             if (afterInteractUsingEvent.Handled)
                 return true;
             return false;
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index d149ed5e0ab..183420db9d1 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -2,7 +2,9 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Shared.ActionBlocker;
+using Content.Shared.Administration.Logs;
 using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Database;
 using Content.Shared.Destructible;
 using Content.Shared.DoAfter;
 using Content.Shared.Hands.Components;
@@ -14,7 +16,6 @@
 using Content.Shared.Inventory;
 using Content.Shared.Item;
 using Content.Shared.Lock;
-using Content.Shared.Nyanotrasen.Item.PseudoItem;
 using Content.Shared.Materials;
 using Content.Shared.Placeable;
 using Content.Shared.Popups;
@@ -24,6 +25,7 @@
 using Content.Shared.Storage.Events;
 using Content.Shared.Verbs;
 using Content.Shared.Whitelist;
+using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
@@ -39,25 +41,26 @@ namespace Content.Shared.Storage.EntitySystems;
 
 public abstract class SharedStorageSystem : EntitySystem
 {
-    [Dependency] private   readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] protected readonly IRobustRandom Random = default!;
     [Dependency] protected readonly ActionBlockerSystem ActionBlocker = default!;
-    [Dependency] private   readonly EntityLookupSystem _entityLookupSystem = default!;
-    [Dependency] private   readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly EntityLookupSystem _entityLookupSystem = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] protected readonly SharedAudioSystem Audio = default!;
-    [Dependency] private   readonly SharedContainerSystem _containerSystem = default!;
-    [Dependency] private   readonly SharedDoAfterSystem _doAfterSystem = default!;
+    [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
     [Dependency] protected readonly SharedEntityStorageSystem EntityStorage = default!;
-    [Dependency] private   readonly SharedInteractionSystem _interactionSystem = default!;
-    [Dependency] private   readonly InventorySystem _inventory = default!;
+    [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
+    [Dependency] private readonly InventorySystem _inventory = default!;
     [Dependency] protected readonly SharedItemSystem ItemSystem = default!;
-    [Dependency] private   readonly SharedPopupSystem _popupSystem = default!;
-    [Dependency] private   readonly SharedHandsSystem _sharedHandsSystem = default!;
-    [Dependency] private   readonly SharedStackSystem _stack = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly SharedHandsSystem _sharedHandsSystem = default!;
+    [Dependency] private readonly SharedStackSystem _stack = default!;
     [Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
-    [Dependency] private   readonly SharedUserInterfaceSystem _ui = default!;
+    [Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
     [Dependency] protected readonly UseDelaySystem UseDelay = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLog = default!;
 
     private EntityQuery<ItemComponent> _itemQuery;
     private EntityQuery<StackComponent> _stackQuery;
@@ -67,6 +70,9 @@ public abstract class SharedStorageSystem : EntitySystem
     public const string DefaultStorageMaxItemSize = "Normal";
 
     public const float AreaInsertDelayPerItem = 0.075f;
+    private static AudioParams _audioParams = AudioParams.Default
+        .WithMaxDistance(7f)
+        .WithVolume(-2f);
 
     private ItemSizePrototype _defaultStorageMaxItemSize = default!;
 
@@ -98,6 +104,7 @@ public override void Initialize()
             subs.Event<BoundUIClosedEvent>(OnBoundUIClosed);
         });
 
+        SubscribeLocalEvent<StorageComponent, ComponentRemove>(OnRemove);
         SubscribeLocalEvent<StorageComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<StorageComponent, GetVerbsEvent<ActivationVerb>>(AddUiVerb);
         SubscribeLocalEvent<StorageComponent, ComponentGetState>(OnStorageGetState);
@@ -122,7 +129,6 @@ public override void Initialize()
         SubscribeAllEvent<StorageInteractWithItemEvent>(OnInteractWithItem);
         SubscribeAllEvent<StorageSetItemLocationEvent>(OnSetItemLocation);
         SubscribeAllEvent<StorageInsertItemIntoLocationEvent>(OnInsertItemIntoLocation);
-        SubscribeAllEvent<StorageRemoveItemEvent>(OnRemoveItem);
         SubscribeAllEvent<StorageSaveItemLocationEvent>(OnSaveItemLocation);
 
         SubscribeLocalEvent<StorageComponent, GotReclaimedEvent>(OnReclaimed);
@@ -135,6 +141,11 @@ public override void Initialize()
         UpdatePrototypeCache();
     }
 
+    private void OnRemove(Entity<StorageComponent> entity, ref ComponentRemove args)
+    {
+        _ui.CloseUi(entity.Owner, StorageComponent.StorageUiKey.Key);
+    }
+
     private void OnMapInit(Entity<StorageComponent> entity, ref MapInitEvent args)
     {
         UseDelay.SetLength(entity.Owner, entity.Comp.QuickInsertCooldown, QuickInsertUseDelayID);
@@ -155,7 +166,9 @@ private void OnStorageGetState(EntityUid uid, StorageComponent component, ref Co
             Grid = new List<Box2i>(component.Grid),
             MaxItemSize = component.MaxItemSize,
             StoredItems = storedItems,
-            SavedLocations = component.SavedLocations
+            SavedLocations = component.SavedLocations,
+            Whitelist = component.Whitelist,
+            Blacklist = component.Blacklist
         };
     }
 
@@ -167,6 +180,8 @@ private void OnStorageHandleState(EntityUid uid, StorageComponent component, ref
         component.Grid.Clear();
         component.Grid.AddRange(state.Grid);
         component.MaxItemSize = state.MaxItemSize;
+        component.Whitelist = state.Whitelist;
+        component.Blacklist = state.Blacklist;
 
         component.StoredItems.Clear();
 
@@ -348,7 +363,9 @@ private void OnInteractUsing(EntityUid uid, StorageComponent storageComp, Intera
         if (args.Handled || !CanInteract(args.User, (uid, storageComp), storageComp.ClickInsert, false))
             return;
 
-        if (HasComp<PlaceableSurfaceComponent>(uid))
+        var attemptEv = new StorageInteractUsingAttemptEvent();
+        RaiseLocalEvent(uid, ref attemptEv);
+        if (attemptEv.Cancelled)
             return;
 
         PlayerInsertHeldEntity((uid, storageComp), args.User);
@@ -363,14 +380,18 @@ private void OnInteractUsing(EntityUid uid, StorageComponent storageComp, Intera
     /// </summary>
     private void OnActivate(EntityUid uid, StorageComponent storageComp, ActivateInWorldEvent args)
     {
-        if (args.Handled || !CanInteract(args.User, (uid, storageComp), storageComp.ClickInsert))
+        if (args.Handled || !args.Complex || !CanInteract(args.User, (uid, storageComp), storageComp.ClickInsert))
             return;
 
         // Toggle
         if (_ui.IsUiOpen(uid, StorageComponent.StorageUiKey.Key, args.User))
+        {
             _ui.CloseUi(uid, StorageComponent.StorageUiKey.Key, args.User);
+        }
         else
+        {
             OpenStorageUI(uid, args.User, storageComp, false);
+        }
 
         args.Handled = true;
     }
@@ -383,7 +404,13 @@ private void OnImplantActivate(EntityUid uid, StorageComponent storageComp, Open
         if (args.Handled)
             return;
 
-        OpenStorageUI(uid, args.Performer, storageComp, false);
+        var uiOpen = _ui.IsUiOpen(uid, StorageComponent.StorageUiKey.Key, args.Performer);
+
+        if (uiOpen)
+            _ui.CloseUi(uid, StorageComponent.StorageUiKey.Key, args.Performer);
+        else
+            OpenStorageUI(uid, args.Performer, storageComp, false);
+
         args.Handled = true;
     }
 
@@ -425,13 +452,13 @@ private void AfterInteract(EntityUid uid, StorageComponent storageComp, AfterInt
             }
 
             //If there's only one then let's be generous
-            if (_entList.Count > 1)
+            if (_entList.Count >= 1)
             {
                 var doAfterArgs = new DoAfterArgs(EntityManager, args.User, delay, new AreaPickupDoAfterEvent(GetNetEntityList(_entList)), uid, target: uid)
                 {
                     BreakOnDamage = true,
                     BreakOnMove = true,
-                    NeedHand = true
+                    NeedHand = true,
                 };
 
                 _doAfterSystem.TryStartDoAfter(doAfterArgs);
@@ -454,7 +481,7 @@ private void AfterInteract(EntityUid uid, StorageComponent storageComp, AfterInt
                 return;
             }
 
-            if (_xformQuery.TryGetComponent(uid, out var transformOwner) && TryComp<TransformComponent>(target, out var transformEnt))
+            if (TryComp(uid, out TransformComponent? transformOwner) && TryComp(target, out TransformComponent? transformEnt))
             {
                 var parent = transformOwner.ParentUid;
 
@@ -519,7 +546,7 @@ private void OnDoAfter(EntityUid uid, StorageComponent component, AreaPickupDoAf
 
             var angle = targetXform.LocalRotation;
 
-            if (PlayerInsertEntityInWorld((uid, component), args.Args.User, entity))
+            if (PlayerInsertEntityInWorld((uid, component), args.Args.User, entity, playSound: false))
             {
                 successfullyInserted.Add(entity);
                 successfullyInsertedPositions.Add(position);
@@ -530,7 +557,7 @@ private void OnDoAfter(EntityUid uid, StorageComponent component, AreaPickupDoAf
         // If we picked up at least one thing, play a sound and do a cool animation!
         if (successfullyInserted.Count > 0)
         {
-            Audio.PlayPredicted(component.StorageInsertSound, uid, args.User);
+            Audio.PlayPredicted(component.StorageInsertSound, uid, args.User, _audioParams);
             EntityManager.RaiseSharedEvent(new AnimateInsertingEntitiesEvent(
                 GetNetEntity(uid),
                 GetNetEntityList(successfullyInserted),
@@ -561,42 +588,31 @@ private void OnDestroy(EntityUid uid, StorageComponent storageComp, DestructionE
     /// </summary>
     private void OnInteractWithItem(StorageInteractWithItemEvent msg, EntitySessionEventArgs args)
     {
-        if (args.SenderSession.AttachedEntity is not { } player)
-            return;
-
-        var uid = GetEntity(msg.StorageUid);
-        var entity = GetEntity(msg.InteractedItemUid);
-
-        if (!TryComp<StorageComponent>(uid, out var storageComp))
-            return;
-
-        if (!_ui.IsUiOpen(uid, StorageComponent.StorageUiKey.Key, player))
-            return;
-
-        if (!Exists(entity))
-        {
-            Log.Error($"Player {args.SenderSession} interacted with non-existent item {msg.InteractedItemUid} stored in {ToPrettyString(uid)}");
-            return;
-        }
-
-        if (!ActionBlocker.CanInteract(player, entity) || !storageComp.Container.Contains(entity))
-            return;
-
-        // Does the player have hands?
-        if (!TryComp(player, out HandsComponent? hands) || hands.Count == 0)
+        if (!ValidateInput(args, msg.StorageUid, msg.InteractedItemUid, out var player, out var storage, out var item))
             return;
 
         // If the user's active hand is empty, try pick up the item.
-        if (hands.ActiveHandEntity == null)
+        if (player.Comp.ActiveHandEntity == null)
         {
-            if (_sharedHandsSystem.TryPickupAnyHand(player, entity, handsComp: hands)
-                && storageComp.StorageRemoveSound != null)
-                Audio.PlayPredicted(storageComp.StorageRemoveSound, uid, player);
+            _adminLog.Add(
+                LogType.Storage,
+                LogImpact.Low,
+                $"{ToPrettyString(player):player} is attempting to take {ToPrettyString(item):item} out of {ToPrettyString(storage):storage}");
+
+            if (_sharedHandsSystem.TryPickupAnyHand(player, item, handsComp: player.Comp)
+                && storage.Comp.StorageRemoveSound != null)
             {
-                return;
+                Audio.PlayPredicted(storage.Comp.StorageRemoveSound, storage, player, _audioParams);
             }
+
+            return;
         }
 
+        _adminLog.Add(
+            LogType.Storage,
+            LogImpact.Low,
+            $"{ToPrettyString(player):player} is interacting with {ToPrettyString(item):item} while it is stored in {ToPrettyString(storage):storage} using {ToPrettyString(player.Comp.ActiveHandEntity):used}");
+
         // Else, interact using the held item
         if (_interactionSystem.InteractUsing(player,
                 player.Comp.ActiveHandEntity.Value,
@@ -611,109 +627,35 @@ private void OnInteractWithItem(StorageInteractWithItemEvent msg, EntitySessionE
 
     private void OnSetItemLocation(StorageSetItemLocationEvent msg, EntitySessionEventArgs args)
     {
-        if (args.SenderSession.AttachedEntity is not { } player)
-            return;
-
-        var storageEnt = GetEntity(msg.StorageEnt);
-        var itemEnt = GetEntity(msg.ItemEnt);
-
-        if (!TryComp<StorageComponent>(storageEnt, out var storageComp))
-            return;
-
-        if (!_ui.IsUiOpen(storageEnt, StorageComponent.StorageUiKey.Key, player))
-            return;
-
-        if (!Exists(itemEnt))
-        {
-            Log.Error($"Player {args.SenderSession} set location of non-existent item {msg.ItemEnt} stored in {ToPrettyString(storageEnt)}");
-            return;
-        }
-
-        if (!ActionBlocker.CanInteract(player, itemEnt))
-            return;
-
-        TrySetItemStorageLocation((itemEnt, null), (storageEnt, storageComp), msg.Location);
-    }
-
-    private void OnRemoveItem(StorageRemoveItemEvent msg, EntitySessionEventArgs args)
-    {
-        if (args.SenderSession.AttachedEntity is not { } player)
-            return;
-
-        var storageEnt = GetEntity(msg.StorageEnt);
-        var itemEnt = GetEntity(msg.ItemEnt);
-
-        if (!TryComp<StorageComponent>(storageEnt, out var storageComp))
+        if (!ValidateInput(args, msg.StorageEnt, msg.ItemEnt, out var player, out var storage, out var item))
             return;
 
-        if (!_ui.IsUiOpen(storageEnt, StorageComponent.StorageUiKey.Key, player))
-            return;
-
-        if (!Exists(itemEnt))
-        {
-            Log.Error($"Player {args.SenderSession} set location of non-existent item {msg.ItemEnt} stored in {ToPrettyString(storageEnt)}");
-            return;
-        }
-
-        if (!ActionBlocker.CanInteract(player, itemEnt))
-            return;
+        _adminLog.Add(
+            LogType.Storage,
+            LogImpact.Low,
+            $"{ToPrettyString(player):player} is updating the location of {ToPrettyString(item):item} within {ToPrettyString(storage):storage}");
 
-        TransformSystem.DropNextTo(itemEnt, player);
-        Audio.PlayPredicted(storageComp.StorageRemoveSound, storageEnt, player);
+        TrySetItemStorageLocation(item!, storage!, msg.Location);
     }
 
     private void OnInsertItemIntoLocation(StorageInsertItemIntoLocationEvent msg, EntitySessionEventArgs args)
     {
-        if (args.SenderSession.AttachedEntity is not { } player)
-            return;
-
-        var storageEnt = GetEntity(msg.StorageEnt);
-        var itemEnt = GetEntity(msg.ItemEnt);
-
-        if (!TryComp<StorageComponent>(storageEnt, out var storageComp))
-            return;
-
-        if (!_ui.IsUiOpen(storageEnt, StorageComponent.StorageUiKey.Key, player))
+        if (!ValidateInput(args, msg.StorageEnt, msg.ItemEnt, out var player, out var storage, out var item, held: true))
             return;
 
-        if (!Exists(itemEnt))
-        {
-            Log.Error($"Player {args.SenderSession} set location of non-existent item {msg.ItemEnt} stored in {ToPrettyString(storageEnt)}");
-            return;
-        }
-
-        if (!ActionBlocker.CanInteract(player, itemEnt) || !_sharedHandsSystem.IsHolding(player, itemEnt, out _))
-            return;
-
-        InsertAt((storageEnt, storageComp), (itemEnt, null), msg.Location, out _, player, stackAutomatically: false);
+        _adminLog.Add(
+            LogType.Storage,
+            LogImpact.Low,
+            $"{ToPrettyString(player):player} is inserting {ToPrettyString(item):item} into {ToPrettyString(storage):storage}");
+        InsertAt(storage!, item!, msg.Location, out _, player, stackAutomatically: false);
     }
 
-    // TODO: if/when someone cleans up this shitcode please make all these
-    // handlers use a shared helper for checking that the ui is open etc, thanks
     private void OnSaveItemLocation(StorageSaveItemLocationEvent msg, EntitySessionEventArgs args)
     {
-        if (args.SenderSession.AttachedEntity is not {} player)
-            return;
-
-        var storage = GetEntity(msg.Storage);
-        var item = GetEntity(msg.Item);
-
-        if (!HasComp<StorageComponent>(storage))
-            return;
-
-        if (!_ui.IsUiOpen(storage, StorageComponent.StorageUiKey.Key, player))
-            return;
-
-        if (!Exists(item))
-        {
-            Log.Error($"Player {args.SenderSession} saved location of non-existent item {msg.Item} stored in {ToPrettyString(storage)}");
-            return;
-        }
-
-        if (!ActionBlocker.CanInteract(player, item))
+        if (!ValidateInput(args, msg.Storage, msg.Item, out var player, out var storage, out var item))
             return;
 
-        SaveItemLocation(storage, item);
+        SaveItemLocation(storage!, item.Owner);
     }
 
     private void OnBoundUIOpen(EntityUid uid, StorageComponent storageComp, BoundUIOpenedEvent args)
@@ -802,7 +744,11 @@ public void UpdateAppearance(Entity<StorageComponent?, AppearanceComponent?> ent
         _appearance.SetData(uid, StorageVisuals.Capacity, capacity, appearance);
         _appearance.SetData(uid, StorageVisuals.Open, isOpen, appearance);
         _appearance.SetData(uid, SharedBagOpenVisuals.BagState, isOpen ? SharedBagState.Open : SharedBagState.Closed, appearance);
-        _appearance.SetData(uid, StackVisuals.Hide, !isOpen, appearance);
+
+        // HideClosedStackVisuals true sets the StackVisuals.Hide to the open state of the storage.
+        // This is for containers that only show their contents when open. (e.g. donut boxes)
+        if (storage.HideStackVisualsWhenClosed)
+            _appearance.SetData(uid, StackVisuals.Hide, !isOpen, appearance);
     }
 
     /// <summary>
@@ -825,13 +771,10 @@ public void TransferEntities(EntityUid source, EntityUid target, EntityUid? user
 
         foreach (var entity in entities.ToArray())
         {
-            if (HasComp<PseudoItemComponent>(entity)) // Nyanotrasen - They dont transfer properly
-                continue;
-
             Insert(target, entity, out _, user: user, targetComp, playSound: false);
         }
 
-        Audio.PlayPredicted(sourceComp.StorageInsertSound, target, user);
+        Audio.PlayPredicted(sourceComp.StorageInsertSound, target, user, _audioParams);
     }
 
     /// <summary>
@@ -1010,7 +953,7 @@ public bool Insert(
                 return false;
 
             if (playSound)
-                Audio.PlayPredicted(storageComp.StorageInsertSound, uid, user);
+                Audio.PlayPredicted(storageComp.StorageInsertSound, uid, user, _audioParams);
 
             return true;
         }
@@ -1040,7 +983,7 @@ public bool Insert(
         }
 
         if (playSound)
-            Audio.PlayPredicted(storageComp.StorageInsertSound, uid, user);
+            Audio.PlayPredicted(storageComp.StorageInsertSound, uid, user, _audioParams);
 
         return true;
     }
@@ -1083,12 +1026,12 @@ public bool PlayerInsertHeldEntity(Entity<StorageComponent?> ent, Entity<HandsCo
     /// <param name="player">The player to insert an entity with</param>
     /// <param name="toInsert"></param>
     /// <returns>true if inserted, false otherwise</returns>
-    public bool PlayerInsertEntityInWorld(Entity<StorageComponent?> uid, EntityUid player, EntityUid toInsert)
+    public bool PlayerInsertEntityInWorld(Entity<StorageComponent?> uid, EntityUid player, EntityUid toInsert, bool playSound = true)
     {
         if (!Resolve(uid, ref uid.Comp) || !_interactionSystem.InRangeUnobstructed(player, uid.Owner))
             return false;
 
-        if (!Insert(uid, toInsert, out _, user: player, uid.Comp))
+        if (!Insert(uid, toInsert, out _, user: player, uid.Comp, playSound: playSound))
         {
             _popupSystem.PopupClient(Loc.GetString("comp-storage-cant-insert"), uid, player);
             return false;
@@ -1390,7 +1333,12 @@ public ItemSizePrototype GetMaxItemSize(Entity<StorageComponent?> uid)
 
         // If we specify a max item size, use that
         if (uid.Comp.MaxItemSize != null)
-            return _prototype.Index(uid.Comp.MaxItemSize.Value);
+        {
+            if (_prototype.TryIndex(uid.Comp.MaxItemSize.Value, out var proto))
+                return proto;
+
+            Log.Error($"{ToPrettyString(uid.Owner)} tried to get invalid item size prototype: {uid.Comp.MaxItemSize.Value}. Stack trace:\\n{Environment.StackTrace}");
+        }
 
         if (!_itemQuery.TryGetComponent(uid, out var item))
             return _defaultStorageMaxItemSize;
@@ -1428,20 +1376,20 @@ private void OnStackCountChanged(EntityUid uid, MetaDataComponent component, Sta
 
     private void HandleOpenBackpack(ICommonSession? session)
     {
-        HandleOpenSlotUI(session, "back");
+        HandleToggleSlotUI(session, "back");
     }
 
     private void HandleOpenBelt(ICommonSession? session)
     {
-        HandleOpenSlotUI(session, "belt");
+        HandleToggleSlotUI(session, "belt");
     }
 
-    private void HandleOpenSlotUI(ICommonSession? session, string slot)
+    private void HandleToggleSlotUI(ICommonSession? session, string slot)
     {
         if (session is not { } playerSession)
             return;
 
-        if (playerSession.AttachedEntity is not {Valid: true} playerEnt || !Exists(playerEnt))
+        if (playerSession.AttachedEntity is not { Valid: true } playerEnt || !Exists(playerEnt))
             return;
 
         if (!_inventory.TryGetSlotEntity(playerEnt, slot, out var storageEnt))
@@ -1451,9 +1399,13 @@ private void HandleOpenSlotUI(ICommonSession? session, string slot)
             return;
 
         if (!_ui.IsUiOpen(storageEnt.Value, StorageComponent.StorageUiKey.Key, playerEnt))
+        {
             OpenStorageUI(storageEnt.Value, playerEnt, silent: false);
+        }
         else
+        {
             _ui.CloseUi(storageEnt.Value, StorageComponent.StorageUiKey.Key, playerEnt);
+        }
     }
 
     protected void ClearCantFillReasons()
@@ -1483,6 +1435,79 @@ private bool CanInteract(EntityUid user, Entity<StorageComponent> storage, bool
     public abstract void PlayPickupAnimation(EntityUid uid, EntityCoordinates initialCoordinates,
         EntityCoordinates finalCoordinates, Angle initialRotation, EntityUid? user = null);
 
+    private bool ValidateInput(
+        EntitySessionEventArgs args,
+        NetEntity netStorage,
+        out Entity<HandsComponent> player,
+        out Entity<StorageComponent> storage)
+    {
+        player = default;
+        storage = default;
+
+        if (args.SenderSession.AttachedEntity is not { } playerUid)
+            return false;
+
+        if (!TryComp(playerUid, out HandsComponent? hands) || hands.Count == 0)
+            return false;
+
+        if (!TryGetEntity(netStorage, out var storageUid))
+            return false;
+
+        if (!TryComp(storageUid, out StorageComponent? storageComp))
+            return false;
+
+        // TODO STORAGE use BUI events
+        // This would automatically validate that the UI is open & that the user can interact.
+        // However, we still need to manually validate that items being used are in the users hands or in the storage.
+        if (!_ui.IsUiOpen(storageUid.Value, StorageComponent.StorageUiKey.Key, playerUid))
+            return false;
+
+        if (!ActionBlocker.CanInteract(playerUid, storageUid))
+            return false;
+
+        player = new(playerUid, hands);
+        storage = new(storageUid.Value, storageComp);
+        return true;
+    }
+
+    private bool ValidateInput(EntitySessionEventArgs args,
+        NetEntity netStorage,
+        NetEntity netItem,
+        out Entity<HandsComponent> player,
+        out Entity<StorageComponent> storage,
+        out Entity<ItemComponent> item,
+        bool held = false)
+    {
+        item = default!;
+        if (!ValidateInput(args, netStorage, out player, out storage))
+            return false;
+
+        if (!TryGetEntity(netItem, out var itemUid))
+            return false;
+
+        if (held)
+        {
+            if (!_sharedHandsSystem.IsHolding(player, itemUid, out _))
+                return false;
+        }
+        else
+        {
+            if (!storage.Comp.Container.Contains(itemUid.Value))
+                return false;
+
+            DebugTools.Assert(storage.Comp.StoredItems.ContainsKey(itemUid.Value));
+        }
+
+        if (!TryComp(itemUid, out ItemComponent? itemComp))
+            return false;
+
+        if (!ActionBlocker.CanInteract(player, itemUid))
+            return false;
+
+        item = new(itemUid.Value, itemComp);
+        return true;
+    }
+
     [Serializable, NetSerializable]
     protected sealed class StorageComponentState : ComponentState
     {
@@ -1493,5 +1518,9 @@ protected sealed class StorageComponentState : ComponentState
         public List<Box2i> Grid = new();
 
         public ProtoId<ItemSizePrototype>? MaxItemSize;
+
+        public EntityWhitelist? Whitelist;
+
+        public EntityWhitelist? Blacklist;
     }
 }

From 019ea2c8331c95b8008e31444a65e5744324b764 Mon Sep 17 00:00:00 2001
From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Date: Thu, 19 Sep 2024 00:42:49 -0700
Subject: [PATCH 035/366] Move PlaceableSurfaceComponent usages to
 PlaceableSurfaceSystem (#28384)

* Move placeable check to PlaceableSurfaceSystem

This check stops entities from being inserted into a storage entity
when it has a PlaceableSurfaceComponent.

The entity is instead placed on top of the entity like a table.

* Move SetPlaceable to PlaceableSurfaceSystem

* Update to transform system and consolidate code

* Fix interaction with storage that has a placeable component

* deadlock

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
---
 .../Placeable/PlaceableSurfaceSystem.cs       | 50 +++++++++++++------
 .../SharedEntityStorageSystem.cs              |  3 --
 Content.Shared/Storage/StorageComponent.cs    |  3 ++
 3 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/Content.Shared/Placeable/PlaceableSurfaceSystem.cs b/Content.Shared/Placeable/PlaceableSurfaceSystem.cs
index b0031cfa33f..a1c87f0de71 100644
--- a/Content.Shared/Placeable/PlaceableSurfaceSystem.cs
+++ b/Content.Shared/Placeable/PlaceableSurfaceSystem.cs
@@ -1,29 +1,37 @@
 using System.Numerics;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
+using Content.Shared.Storage;
 using Content.Shared.Storage.Components;
 
-namespace Content.Shared.Placeable
+namespace Content.Shared.Placeable;
+
+public sealed class PlaceableSurfaceSystem : EntitySystem
 {
-    public sealed class PlaceableSurfaceSystem : EntitySystem
-    {
-        [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
+    [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
+    [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
 
         public override void Initialize()
         {
             base.Initialize();
 
-            SubscribeLocalEvent<PlaceableSurfaceComponent, AfterInteractUsingEvent>(OnAfterInteractUsing);
-        }
+        SubscribeLocalEvent<PlaceableSurfaceComponent, AfterInteractUsingEvent>(OnAfterInteractUsing);
+        SubscribeLocalEvent<PlaceableSurfaceComponent, StorageInteractUsingAttemptEvent>(OnStorageInteractUsingAttempt);
+        SubscribeLocalEvent<PlaceableSurfaceComponent, StorageAfterOpenEvent>(OnStorageAfterOpen);
+        SubscribeLocalEvent<PlaceableSurfaceComponent, StorageAfterCloseEvent>(OnStorageAfterClose);
+    }
 
         public void SetPlaceable(EntityUid uid, bool isPlaceable, PlaceableSurfaceComponent? surface = null)
         {
             if (!Resolve(uid, ref surface, false))
                 return;
 
-            surface.IsPlaceable = isPlaceable;
-            Dirty(uid, surface);
-        }
+        if (surface.IsPlaceable == isPlaceable)
+            return;
+
+        surface.IsPlaceable = isPlaceable;
+        Dirty(uid, surface);
+    }
 
         public void SetPlaceCentered(EntityUid uid, bool placeCentered, PlaceableSurfaceComponent? surface = null)
         {
@@ -59,12 +67,24 @@ private void OnAfterInteractUsing(EntityUid uid, PlaceableSurfaceComponent surfa
             if (!_handsSystem.TryDrop(args.User, args.Used))
                 return;
 
-            if (surface.PlaceCentered)
-                Transform(args.Used).LocalPosition = Transform(uid).LocalPosition + surface.PositionOffset;
-            else
-                Transform(args.Used).Coordinates = args.ClickLocation;
+        _transformSystem.SetCoordinates(args.Used,
+            surface.PlaceCentered ? Transform(uid).Coordinates.Offset(surface.PositionOffset) : args.ClickLocation);
 
-            args.Handled = true;
-        }
+        args.Handled = true;
+    }
+
+    private void OnStorageInteractUsingAttempt(Entity<PlaceableSurfaceComponent> ent, ref StorageInteractUsingAttemptEvent args)
+    {
+        args.Cancelled = true;
+    }
+
+    private void OnStorageAfterOpen(Entity<PlaceableSurfaceComponent> ent, ref StorageAfterOpenEvent args)
+    {
+        SetPlaceable(ent.Owner, true, ent.Comp);
+    }
+
+    private void OnStorageAfterClose(Entity<PlaceableSurfaceComponent> ent, ref StorageAfterCloseEvent args)
+    {
+        SetPlaceable(ent.Owner, false, ent.Comp);
     }
 }
diff --git a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
index bb49725e047..60ae813e580 100644
--- a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
@@ -487,9 +487,6 @@ private void ModifyComponents(EntityUid uid, SharedEntityStorageComponent? compo
             }
         }
 
-        if (TryComp<PlaceableSurfaceComponent>(uid, out var surface))
-            _placeableSurface.SetPlaceable(uid, component.Open, surface);
-
         _appearance.SetData(uid, StorageVisuals.Open, component.Open);
         _appearance.SetData(uid, StorageVisuals.HasContents, component.Contents.ContainedEntities.Count > 0);
     }
diff --git a/Content.Shared/Storage/StorageComponent.cs b/Content.Shared/Storage/StorageComponent.cs
index 2860f8dacfe..4b5c2158e1c 100644
--- a/Content.Shared/Storage/StorageComponent.cs
+++ b/Content.Shared/Storage/StorageComponent.cs
@@ -230,6 +230,9 @@ public AnimateInsertingEntitiesEvent(NetEntity storage, List<NetEntity> storedEn
     [ByRefEvent]
     public record struct StorageInteractAttemptEvent(bool Silent, bool Cancelled = false);
 
+    [ByRefEvent]
+    public record struct StorageInteractUsingAttemptEvent(bool Cancelled = false);
+
     [NetSerializable]
     [Serializable]
     public enum StorageVisuals : byte

From 56eb2c1083de6e1f6188091285908d7d699cb46a Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Wed, 7 Aug 2024 12:15:41 +1200
Subject: [PATCH 036/366] Add more storage admin logs & fix some interaction
 validation (#30725)

---
 Content.Shared.Database/LogType.cs            |  6 ++++-
 .../EntitySystems/SharedStorageSystem.cs      | 25 +++++++++++--------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/Content.Shared.Database/LogType.cs b/Content.Shared.Database/LogType.cs
index fc2dad677a7..265965af94e 100644
--- a/Content.Shared.Database/LogType.cs
+++ b/Content.Shared.Database/LogType.cs
@@ -107,5 +107,9 @@ public enum LogType
     /// </remarks>
     RateLimited = 91,
     InteractUsing = 92,
-    Storage = 93
+
+    /// <summary>
+    /// Storage & entity-storage related interactions
+    /// </summary>
+    Storage = 93,
 }
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index 183420db9d1..db2337a921a 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -614,15 +614,7 @@ private void OnInteractWithItem(StorageInteractWithItemEvent msg, EntitySessionE
             $"{ToPrettyString(player):player} is interacting with {ToPrettyString(item):item} while it is stored in {ToPrettyString(storage):storage} using {ToPrettyString(player.Comp.ActiveHandEntity):used}");
 
         // Else, interact using the held item
-        if (_interactionSystem.InteractUsing(player,
-                player.Comp.ActiveHandEntity.Value,
-                item,
-                Transform(item).Coordinates,
-                checkCanInteract: false))
-            return;
-
-        var failedEv = new StorageInsertFailedEvent((storage, storage.Comp), (player, player.Comp));
-        RaiseLocalEvent(storage, ref failedEv);
+        _interactionSystem.InteractUsing(player, player.Comp.ActiveHandEntity.Value, item, Transform(item).Coordinates, checkCanInteract: false);
     }
 
     private void OnSetItemLocation(StorageSetItemLocationEvent msg, EntitySessionEventArgs args)
@@ -638,6 +630,19 @@ private void OnSetItemLocation(StorageSetItemLocationEvent msg, EntitySessionEve
         TrySetItemStorageLocation(item!, storage!, msg.Location);
     }
 
+    private void OnRemoveItem(StorageRemoveItemEvent msg, EntitySessionEventArgs args)
+    {
+        if (!ValidateInput(args, msg.StorageEnt, msg.ItemEnt, out var player, out var storage, out var item))
+            return;
+
+        _adminLog.Add(
+            LogType.Storage,
+            LogImpact.Low,
+            $"{ToPrettyString(player):player} is removing {ToPrettyString(item):item} from {ToPrettyString(storage):storage}");
+        TransformSystem.DropNextTo(item.Owner, player.Owner);
+        Audio.PlayPredicted(storage.Comp.StorageRemoveSound, storage, player, _audioParams);
+    }
+
     private void OnInsertItemIntoLocation(StorageInsertItemIntoLocationEvent msg, EntitySessionEventArgs args)
     {
         if (!ValidateInput(args, msg.StorageEnt, msg.ItemEnt, out var player, out var storage, out var item, held: true))
@@ -652,7 +657,7 @@ private void OnInsertItemIntoLocation(StorageInsertItemIntoLocationEvent msg, En
 
     private void OnSaveItemLocation(StorageSaveItemLocationEvent msg, EntitySessionEventArgs args)
     {
-        if (!ValidateInput(args, msg.Storage, msg.Item, out var player, out var storage, out var item))
+        if (!ValidateInput(args, msg.Storage, msg.Item, out var player, out var storage, out var item, held: true))
             return;
 
         SaveItemLocation(storage!, item.Owner);

From 76dbb4cb15bf50910ef7644c5620452d4ecc44ff Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 03:40:34 -0400
Subject: [PATCH 037/366] nice

---
 .../EntitySystems/SharedStorageSystem.cs      | 77 ++++++++-----------
 1 file changed, 34 insertions(+), 43 deletions(-)

diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index db2337a921a..868d26c3aea 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -22,7 +22,6 @@
 using Content.Shared.Stacks;
 using Content.Shared.Storage.Components;
 using Content.Shared.Timing;
-using Content.Shared.Storage.Events;
 using Content.Shared.Verbs;
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
@@ -41,23 +40,23 @@ namespace Content.Shared.Storage.EntitySystems;
 
 public abstract class SharedStorageSystem : EntitySystem
 {
-    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private   readonly IPrototypeManager _prototype = default!;
     [Dependency] protected readonly IRobustRandom Random = default!;
     [Dependency] protected readonly ActionBlockerSystem ActionBlocker = default!;
-    [Dependency] private readonly EntityLookupSystem _entityLookupSystem = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private   readonly EntityLookupSystem _entityLookupSystem = default!;
+    [Dependency] private   readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] protected readonly SharedAudioSystem Audio = default!;
-    [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+    [Dependency] private   readonly SharedContainerSystem _containerSystem = default!;
+    [Dependency] private   readonly SharedDoAfterSystem _doAfterSystem = default!;
     [Dependency] protected readonly SharedEntityStorageSystem EntityStorage = default!;
-    [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
-    [Dependency] private readonly InventorySystem _inventory = default!;
+    [Dependency] private   readonly SharedInteractionSystem _interactionSystem = default!;
+    [Dependency] private   readonly InventorySystem _inventory = default!;
     [Dependency] protected readonly SharedItemSystem ItemSystem = default!;
-    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
-    [Dependency] private readonly SharedHandsSystem _sharedHandsSystem = default!;
-    [Dependency] private readonly SharedStackSystem _stack = default!;
+    [Dependency] private   readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private   readonly SharedHandsSystem _sharedHandsSystem = default!;
+    [Dependency] private   readonly SharedStackSystem _stack = default!;
     [Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
-    [Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
+    [Dependency] private   readonly SharedUserInterfaceSystem _ui = default!;
     [Dependency] protected readonly UseDelaySystem UseDelay = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLog = default!;
@@ -129,6 +128,7 @@ public override void Initialize()
         SubscribeAllEvent<StorageInteractWithItemEvent>(OnInteractWithItem);
         SubscribeAllEvent<StorageSetItemLocationEvent>(OnSetItemLocation);
         SubscribeAllEvent<StorageInsertItemIntoLocationEvent>(OnInsertItemIntoLocation);
+        SubscribeAllEvent<StorageRemoveItemEvent>(OnRemoveItem);
         SubscribeAllEvent<StorageSaveItemLocationEvent>(OnSaveItemLocation);
 
         SubscribeLocalEvent<StorageComponent, GotReclaimedEvent>(OnReclaimed);
@@ -363,12 +363,10 @@ private void OnInteractUsing(EntityUid uid, StorageComponent storageComp, Intera
         if (args.Handled || !CanInteract(args.User, (uid, storageComp), storageComp.ClickInsert, false))
             return;
 
-        var attemptEv = new StorageInteractUsingAttemptEvent();
-        RaiseLocalEvent(uid, ref attemptEv);
-        if (attemptEv.Cancelled)
+        if (HasComp<PlaceableSurfaceComponent>(uid))
             return;
 
-        PlayerInsertHeldEntity((uid, storageComp), args.User);
+        PlayerInsertHeldEntity(uid, args.User, storageComp);
         // Always handle it, even if insertion fails.
         // We don't want to trigger any AfterInteract logic here.
         // Example issue would be placing wires if item doesn't fit in backpack.
@@ -404,13 +402,7 @@ private void OnImplantActivate(EntityUid uid, StorageComponent storageComp, Open
         if (args.Handled)
             return;
 
-        var uiOpen = _ui.IsUiOpen(uid, StorageComponent.StorageUiKey.Key, args.Performer);
-
-        if (uiOpen)
-            _ui.CloseUi(uid, StorageComponent.StorageUiKey.Key, args.Performer);
-        else
-            OpenStorageUI(uid, args.Performer, storageComp, false);
-
+        OpenStorageUI(uid, args.Performer, storageComp, false);
         args.Handled = true;
     }
 
@@ -452,13 +444,13 @@ private void AfterInteract(EntityUid uid, StorageComponent storageComp, AfterInt
             }
 
             //If there's only one then let's be generous
-            if (_entList.Count >= 1)
+            if (_entList.Count > 1)
             {
                 var doAfterArgs = new DoAfterArgs(EntityManager, args.User, delay, new AreaPickupDoAfterEvent(GetNetEntityList(_entList)), uid, target: uid)
                 {
                     BreakOnDamage = true,
                     BreakOnMove = true,
-                    NeedHand = true,
+                    NeedHand = true
                 };
 
                 _doAfterSystem.TryStartDoAfter(doAfterArgs);
@@ -546,7 +538,7 @@ private void OnDoAfter(EntityUid uid, StorageComponent component, AreaPickupDoAf
 
             var angle = targetXform.LocalRotation;
 
-            if (PlayerInsertEntityInWorld((uid, component), args.Args.User, entity, playSound: false))
+            if (PlayerInsertEntityInWorld((uid, component), args.Args.User, entity))
             {
                 successfullyInserted.Add(entity);
                 successfullyInsertedPositions.Add(position);
@@ -996,47 +988,46 @@ public bool Insert(
     /// <summary>
     ///     Inserts an entity into storage from the player's active hand
     /// </summary>
-    /// <param name="ent">The storage entity and component to insert into.</param>
-    /// <param name="player">The player and hands component to insert the held entity from.</param>
-    /// <returns>True if inserted, otherwise false.</returns>
-    public bool PlayerInsertHeldEntity(Entity<StorageComponent?> ent, Entity<HandsComponent?> player)
+    /// <param name="uid"></param>
+    /// <param name="player">The player to insert an entity from</param>
+    /// <param name="storageComp"></param>
+    /// <returns>true if inserted, false otherwise</returns>
+    public bool PlayerInsertHeldEntity(EntityUid uid, EntityUid player, StorageComponent? storageComp = null)
     {
-        if (!Resolve(ent.Owner, ref ent.Comp)
-            || !Resolve(player.Owner, ref player.Comp)
-            || player.Comp.ActiveHandEntity == null)
+        if (!Resolve(uid, ref storageComp) || !TryComp(player, out HandsComponent? hands) || hands.ActiveHandEntity == null)
             return false;
 
-        var toInsert = player.Comp.ActiveHandEntity;
+        var toInsert = hands.ActiveHandEntity;
 
-        if (!CanInsert(ent, toInsert.Value, out var reason, ent.Comp))
+        if (!CanInsert(uid, toInsert.Value, out var reason, storageComp))
         {
-            _popupSystem.PopupClient(Loc.GetString(reason ?? "comp-storage-cant-insert"), ent, player);
+            _popupSystem.PopupClient(Loc.GetString(reason ?? "comp-storage-cant-insert"), uid, player);
             return false;
         }
 
-        if (!_sharedHandsSystem.CanDrop(player, toInsert.Value, player.Comp))
+        if (!_sharedHandsSystem.CanDrop(player, toInsert.Value, hands))
         {
-            _popupSystem.PopupClient(Loc.GetString("comp-storage-cant-drop", ("entity", toInsert.Value)), ent, player);
+            _popupSystem.PopupClient(Loc.GetString("comp-storage-cant-drop", ("entity", toInsert.Value)), uid, player);
             return false;
         }
 
-        return PlayerInsertEntityInWorld((ent, ent.Comp), player, toInsert.Value);
+        return PlayerInsertEntityInWorld((uid, storageComp), player, toInsert.Value);
     }
 
     /// <summary>
     ///     Inserts an Entity (<paramref name="toInsert"/>) in the world into storage, informing <paramref name="player"/> if it fails.
-    ///     <paramref name="toInsert"/> is *NOT* held, see <see cref="PlayerInsertHeldEntity(Entity{StorageComponent?},Entity{HandsComponent?})"/>.
+    ///     <paramref name="toInsert"/> is *NOT* held, see <see cref="PlayerInsertHeldEntity(EntityUid,EntityUid,StorageComponent)"/>.
     /// </summary>
     /// <param name="uid"></param>
     /// <param name="player">The player to insert an entity with</param>
     /// <param name="toInsert"></param>
     /// <returns>true if inserted, false otherwise</returns>
-    public bool PlayerInsertEntityInWorld(Entity<StorageComponent?> uid, EntityUid player, EntityUid toInsert, bool playSound = true)
+    public bool PlayerInsertEntityInWorld(Entity<StorageComponent?> uid, EntityUid player, EntityUid toInsert)
     {
         if (!Resolve(uid, ref uid.Comp) || !_interactionSystem.InRangeUnobstructed(player, uid.Owner))
             return false;
 
-        if (!Insert(uid, toInsert, out _, user: player, uid.Comp, playSound: playSound))
+        if (!Insert(uid, toInsert, out _, user: player, uid.Comp))
         {
             _popupSystem.PopupClient(Loc.GetString("comp-storage-cant-insert"), uid, player);
             return false;
@@ -1394,7 +1385,7 @@ private void HandleToggleSlotUI(ICommonSession? session, string slot)
         if (session is not { } playerSession)
             return;
 
-        if (playerSession.AttachedEntity is not { Valid: true } playerEnt || !Exists(playerEnt))
+        if (playerSession.AttachedEntity is not {Valid: true} playerEnt || !Exists(playerEnt))
             return;
 
         if (!_inventory.TryGetSlotEntity(playerEnt, slot, out var storageEnt))

From 24a649fe035105327972d19ac316acef42aec1d0 Mon Sep 17 00:00:00 2001
From: Crude Oil <124208219+CroilBird@users.noreply.github.com>
Date: Sun, 21 Jul 2024 07:49:48 +0200
Subject: [PATCH 038/366] Add ability to show stack visuals on closed
 containers (#29309)

* add ability to show stack visuals on closed containers

* remove container stack visuals logic from sharedstoragesystem

* improve comments a bit

* move logic for open/closed containers into itemcountersystem

* move behavior to storage component

* remove unused import

* remove old comment

* fix comments

* fix wrong property name

* Update Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs

* Rename variable for clarity

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
---
 Content.Client/Storage/Systems/ItemCounterSystem.cs       | 2 +-
 Content.Shared/Storage/Components/ItemCounterComponent.cs | 2 +-
 Content.Shared/Storage/StorageComponent.cs                | 8 ++++++++
 .../Entities/Objects/Consumable/Drinks/drinks_cans.yml    | 1 +
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Content.Client/Storage/Systems/ItemCounterSystem.cs b/Content.Client/Storage/Systems/ItemCounterSystem.cs
index 605f47d3b8a..fcb1ca17dc6 100644
--- a/Content.Client/Storage/Systems/ItemCounterSystem.cs
+++ b/Content.Client/Storage/Systems/ItemCounterSystem.cs
@@ -31,7 +31,7 @@ private void OnAppearanceChange(EntityUid uid, ItemCounterComponent comp, ref Ap
 
         if (!_appearanceSystem.TryGetData<bool>(uid, StackVisuals.Hide, out var hidden, args.Component))
             hidden = false;
-        
+
         if (comp.IsComposite)
             ProcessCompositeSprite(uid, actual, maxCount, comp.LayerStates, hidden, sprite: args.Sprite);
         else
diff --git a/Content.Shared/Storage/Components/ItemCounterComponent.cs b/Content.Shared/Storage/Components/ItemCounterComponent.cs
index 890bc84e721..6a1444ebf62 100644
--- a/Content.Shared/Storage/Components/ItemCounterComponent.cs
+++ b/Content.Shared/Storage/Components/ItemCounterComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Storage.EntitySystems;
+using Content.Shared.Storage.EntitySystems;
 using Content.Shared.Whitelist;
 
 namespace Content.Shared.Storage.Components
diff --git a/Content.Shared/Storage/StorageComponent.cs b/Content.Shared/Storage/StorageComponent.cs
index 4b5c2158e1c..d2c607e57f7 100644
--- a/Content.Shared/Storage/StorageComponent.cs
+++ b/Content.Shared/Storage/StorageComponent.cs
@@ -123,6 +123,14 @@ public sealed partial class StorageComponent : Component
         [DataField, ViewVariables(VVAccess.ReadWrite)]
         public StorageDefaultOrientation? DefaultStorageOrientation;
 
+        /// <summary>
+        /// If true, sets StackVisuals.Hide to true when the container is closed
+        /// Used in cases where there are sprites that are shown when the container is open but not
+        /// when it is closed
+        /// </summary>
+        [DataField]
+        public bool HideStackVisualsWhenClosed = true;
+
         [Serializable, NetSerializable]
         public enum StorageUiKey : byte
         {
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
index 728ca962f9f..52ffb8dd1cc 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -444,6 +444,7 @@
     whitelist:
       tags:
         - Cola
+    hideStackVisualsWhenClosed: false
   - type: StorageFill
     contents:
       - id: DrinkColaCan

From c8e1e5c5e116b81c26f81f169c7d04c4e83b4013 Mon Sep 17 00:00:00 2001
From: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Date: Sun, 25 Feb 2024 13:07:10 +0200
Subject: [PATCH 039/366] Cleanup ExecutionSystem (#24382)

* Creat Execution Component and add to sharp items

* Kill Server ExecutionSystem. Create ExecutionSystem in shared. Create ActiveExecution Component.
Transferred the Execution system into shared. Heavily re-wrote the system in order to reduce duplication,
and remove gun code from the system.
The melee weapon modifier which was dependant on swing rate was removed.

The ActiveExecutionComponent was created in order to apply the damage modifier to the shot from a gun execution.
It is added just before the gun fires and removed after an attempt is made.

* Fix bugs

The execution completed text will now only show up if the gun fires.

The client also no longer crashes because I forgot to network the component.

* Remove clumsy text

* Make BaseSword abstract

* Add ExecutionComponent to every weapon

* Fix bug

* Remove execution comp from battery weapons

Currently the gun system does not have a way to alter hitscan damage like it does with projectiles.

* Cleanup

* Revert "Remove clumsy text"

This reverts commit a46da6448d5d179a4e936f9213d5622bedb58a16.

* Actually fix the ExecutionSystem

Everything about the shot goes through the gun system now.
The Damage multiplier is only applied when a projectile impacts the target so people that get in the way don't get hit
with 9 times damage for no reason.

In order to make suicides work I needed to create fake EntityCoordinates because the gun system and the projectile
system do not play well with a projectile that has the same start and end position.

* Make launchers able to execute

* Fix prediction bug

The OnAmmoShotEvent is only raised on the server.

* Readd ability for clowns to accidentally shoot themselves while executing

* Cleanup

* Reset melee cooldown to initial value

* Address reviews fix bug

Addressed reviews on overriding messages.
Now I actually mark doafters as handled.
Return normal cooldown to some meleeweapons I forgot on the previous commit.

* Address Reviews

Remove duplication

* Exorcise codebase

Remove evil null coercion that I was sure I removed a while ago

* Address reviews again

* Remove melee weapon attack logic and rely on the system. Remove gun and
melee checks.

* Make system functional again and cleanup

* Remove code I forgot to remove

* Cleanup

* stalled

* Selectively revert gun penetration

The collision layer check doesn't work and I don't have time to fix it.

* Fixes

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
---
 Content.Server/Execution/ExecutionSystem.cs   | 400 ------------------
 .../Projectiles/ProjectileSystem.cs           |  27 +-
 .../Weapons/Ranged/Systems/GunSystem.cs       | 147 ++++++-
 .../Execution/ExecutionComponent.cs           |  26 ++
 Content.Shared/Execution/ExecutionSystem.cs   | 241 +++++++++++
 .../Projectiles/SharedProjectileSystem.cs     |   6 +
 .../Ranged/Events/ShotAttemptedEvent.cs       |   4 +-
 .../Weapons/Ranged/Systems/SharedGunSystem.cs | 102 ++++-
 .../Locale/en-US/execution/execution.ftl      |  10 -
 .../components/butcherable-component.ftl      |   2 +-
 .../Objects/Materials/crystal_shard.yml       |   2 +
 .../Entities/Objects/Materials/shards.yml     |   2 +
 .../Entities/Objects/Misc/broken_bottle.yml   |   2 +
 .../Objects/Weapons/Guns/HMGs/hmgs.yml        |   1 +
 .../Objects/Weapons/Guns/LMGs/lmgs.yml        |   1 +
 .../Weapons/Guns/Launchers/launchers.yml      |   1 +
 .../Objects/Weapons/Guns/Pistols/pistols.yml  |   1 +
 .../Objects/Weapons/Guns/Rifles/rifles.yml    |   1 +
 .../Objects/Weapons/Guns/SMGs/smgs.yml        |   1 +
 .../Weapons/Guns/Shotguns/shotguns.yml        |   2 +
 .../Objects/Weapons/Guns/Snipers/snipers.yml  |   1 +
 .../Objects/Weapons/Guns/flare_gun.yml        |   1 +
 .../Objects/Weapons/Guns/pneumatic_cannon.yml |   1 +
 .../Objects/Weapons/Melee/armblade.yml        |   2 +
 .../Objects/Weapons/Melee/fireaxe.yml         |   2 +
 .../Entities/Objects/Weapons/Melee/knife.yml  |   2 +
 .../Entities/Objects/Weapons/Melee/sword.yml  |  35 +-
 27 files changed, 569 insertions(+), 454 deletions(-)
 delete mode 100644 Content.Server/Execution/ExecutionSystem.cs
 create mode 100644 Content.Shared/Execution/ExecutionComponent.cs
 create mode 100644 Content.Shared/Execution/ExecutionSystem.cs

diff --git a/Content.Server/Execution/ExecutionSystem.cs b/Content.Server/Execution/ExecutionSystem.cs
deleted file mode 100644
index 453a05e8039..00000000000
--- a/Content.Server/Execution/ExecutionSystem.cs
+++ /dev/null
@@ -1,400 +0,0 @@
-using Content.Server.Interaction;
-using Content.Server.Kitchen.Components;
-using Content.Server.Weapons.Ranged.Systems;
-using Content.Shared.ActionBlocker;
-using Content.Shared.Damage;
-using Content.Shared.Database;
-using Content.Shared.DoAfter;
-using Content.Shared.Execution;
-using Content.Shared.Interaction.Components;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Mobs.Systems;
-using Content.Shared.Popups;
-using Content.Shared.Projectiles;
-using Content.Shared.Verbs;
-using Content.Shared.Weapons.Melee;
-using Content.Shared.Weapons.Ranged;
-using Content.Shared.Weapons.Ranged.Components;
-using Content.Shared.Weapons.Ranged.Events;
-using Content.Shared.Weapons.Ranged.Systems;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Execution;
-
-/// <summary>
-///     Verb for violently murdering cuffed creatures.
-/// </summary>
-public sealed class ExecutionSystem : EntitySystem
-{
-    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
-    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
-    [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
-    [Dependency] private readonly InteractionSystem _interactionSystem = default!;
-    [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
-    [Dependency] private readonly DamageableSystem _damageableSystem = default!;
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly IComponentFactory _componentFactory = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
-    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
-    [Dependency] private readonly GunSystem _gunSystem = default!;
-
-    private const float MeleeExecutionTimeModifier = 5.0f;
-    private const float GunExecutionTime = 6.0f;
-    private const float DamageModifier = 9.0f;
-
-    /// <inheritdoc/>
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<SharpComponent, GetVerbsEvent<UtilityVerb>>(OnGetInteractionVerbsMelee);
-        SubscribeLocalEvent<GunComponent, GetVerbsEvent<UtilityVerb>>(OnGetInteractionVerbsGun);
-
-        SubscribeLocalEvent<SharpComponent, ExecutionDoAfterEvent>(OnDoafterMelee);
-        SubscribeLocalEvent<GunComponent, ExecutionDoAfterEvent>(OnDoafterGun);
-    }
-
-    private void OnGetInteractionVerbsMelee(
-        EntityUid uid,
-        SharpComponent component,
-        GetVerbsEvent<UtilityVerb> args)
-    {
-        if (args.Hands == null || args.Using == null || !args.CanAccess || !args.CanInteract)
-            return;
-
-        var attacker = args.User;
-        var weapon = args.Using!.Value;
-        var victim = args.Target;
-
-        if (!CanExecuteWithMelee(weapon, victim, attacker))
-            return;
-
-        UtilityVerb verb = new()
-        {
-            Act = () =>
-            {
-                TryStartMeleeExecutionDoafter(weapon, victim, attacker);
-            },
-            Impact = LogImpact.High,
-            Text = Loc.GetString("execution-verb-name"),
-            Message = Loc.GetString("execution-verb-message"),
-        };
-
-        args.Verbs.Add(verb);
-    }
-
-    private void OnGetInteractionVerbsGun(
-        EntityUid uid,
-        GunComponent component,
-        GetVerbsEvent<UtilityVerb> args)
-    {
-        if (args.Hands == null || args.Using == null || !args.CanAccess || !args.CanInteract)
-            return;
-
-        var attacker = args.User;
-        var weapon = args.Using!.Value;
-        var victim = args.Target;
-
-        if (!CanExecuteWithGun(weapon, victim, attacker))
-            return;
-
-        UtilityVerb verb = new()
-        {
-            Act = () =>
-            {
-                TryStartGunExecutionDoafter(weapon, victim, attacker);
-            },
-            Impact = LogImpact.High,
-            Text = Loc.GetString("execution-verb-name"),
-            Message = Loc.GetString("execution-verb-message"),
-        };
-
-        args.Verbs.Add(verb);
-    }
-
-    private bool CanExecuteWithAny(EntityUid weapon, EntityUid victim, EntityUid attacker)
-    {
-        // No point executing someone if they can't take damage
-        if (!TryComp<DamageableComponent>(victim, out var damage))
-            return false;
-
-        // You can't execute something that cannot die
-        if (!TryComp<MobStateComponent>(victim, out var mobState))
-            return false;
-
-        // You're not allowed to execute dead people (no fun allowed)
-        if (_mobStateSystem.IsDead(victim, mobState))
-            return false;
-
-        // You must be able to attack people to execute
-        if (!_actionBlockerSystem.CanAttack(attacker, victim))
-            return false;
-
-        // The victim must be incapacitated to be executed
-        if (victim != attacker && _actionBlockerSystem.CanInteract(victim, null))
-            return false;
-
-        if (victim == attacker)
-            return false; // DeltaV - Fucking seriously?
-
-        // All checks passed
-        return true;
-    }
-
-    private bool CanExecuteWithMelee(EntityUid weapon, EntityUid victim, EntityUid user)
-    {
-        if (!CanExecuteWithAny(weapon, victim, user)) return false;
-
-        // We must be able to actually hurt people with the weapon
-        if (!TryComp<MeleeWeaponComponent>(weapon, out var melee) && melee!.Damage.GetTotal() > 0.0f)
-            return false;
-
-        return true;
-    }
-
-    private bool CanExecuteWithGun(EntityUid weapon, EntityUid victim, EntityUid user)
-    {
-        if (!CanExecuteWithAny(weapon, victim, user)) return false;
-
-        // We must be able to actually fire the gun
-        if (!TryComp<GunComponent>(weapon, out var gun) && _gunSystem.CanShoot(gun!))
-            return false;
-
-        return true;
-    }
-
-    private void TryStartMeleeExecutionDoafter(EntityUid weapon, EntityUid victim, EntityUid attacker)
-    {
-        if (!CanExecuteWithMelee(weapon, victim, attacker))
-            return;
-
-        var executionTime = (1.0f / Comp<MeleeWeaponComponent>(weapon).AttackRate) * MeleeExecutionTimeModifier;
-
-        if (attacker == victim)
-        {
-            ShowExecutionPopup("suicide-popup-melee-initial-internal", Filter.Entities(attacker), PopupType.Medium, attacker, victim, weapon);
-            ShowExecutionPopup("suicide-popup-melee-initial-external", Filter.PvsExcept(attacker), PopupType.MediumCaution, attacker, victim, weapon);
-        }
-        else
-        {
-            ShowExecutionPopup("execution-popup-melee-initial-internal", Filter.Entities(attacker), PopupType.Medium, attacker, victim, weapon);
-            ShowExecutionPopup("execution-popup-melee-initial-external", Filter.PvsExcept(attacker), PopupType.MediumCaution, attacker, victim, weapon);
-        }
-
-        var doAfter =
-            new DoAfterArgs(EntityManager, attacker, executionTime, new ExecutionDoAfterEvent(), weapon, target: victim, used: weapon)
-            {
-                BreakOnTargetMove = true,
-                BreakOnUserMove = true,
-                BreakOnDamage = true,
-                NeedHand = true
-            };
-
-        _doAfterSystem.TryStartDoAfter(doAfter);
-    }
-
-    private void TryStartGunExecutionDoafter(EntityUid weapon, EntityUid victim, EntityUid attacker)
-    {
-        if (!CanExecuteWithGun(weapon, victim, attacker))
-            return;
-
-        if (attacker == victim)
-        {
-            ShowExecutionPopup("suicide-popup-gun-initial-internal", Filter.Entities(attacker), PopupType.Medium, attacker, victim, weapon);
-            ShowExecutionPopup("suicide-popup-gun-initial-external", Filter.PvsExcept(attacker), PopupType.MediumCaution, attacker, victim, weapon);
-        }
-        else
-        {
-            ShowExecutionPopup("execution-popup-gun-initial-internal", Filter.Entities(attacker), PopupType.Medium, attacker, victim, weapon);
-            ShowExecutionPopup("execution-popup-gun-initial-external", Filter.PvsExcept(attacker), PopupType.MediumCaution, attacker, victim, weapon);
-        }
-
-        var doAfter =
-            new DoAfterArgs(EntityManager, attacker, GunExecutionTime, new ExecutionDoAfterEvent(), weapon, target: victim, used: weapon)
-            {
-                BreakOnTargetMove = true,
-                BreakOnUserMove = true,
-                BreakOnDamage = true,
-                NeedHand = true
-            };
-
-        _doAfterSystem.TryStartDoAfter(doAfter);
-    }
-
-    private bool OnDoafterChecks(EntityUid uid, DoAfterEvent args)
-    {
-        if (args.Handled || args.Cancelled || args.Used == null || args.Target == null)
-            return false;
-
-        if (!CanExecuteWithAny(args.Used.Value, args.Target.Value, uid))
-            return false;
-
-        // All checks passed
-        return true;
-    }
-
-    private void OnDoafterMelee(EntityUid uid, SharpComponent component, DoAfterEvent args)
-    {
-        if (args.Handled || args.Cancelled || args.Used == null || args.Target == null)
-            return;
-
-        var attacker = args.User;
-        var victim = args.Target!.Value;
-        var weapon = args.Used!.Value;
-
-        if (!CanExecuteWithMelee(weapon, victim, attacker)) return;
-
-        if (!TryComp<MeleeWeaponComponent>(weapon, out var melee) && melee!.Damage.GetTotal() > 0.0f)
-            return;
-
-        _damageableSystem.TryChangeDamage(victim, melee.Damage * DamageModifier, true, origin: attacker);
-        _audioSystem.PlayEntity(melee.SoundHit, Filter.Pvs(weapon), weapon, true, AudioParams.Default);
-
-        if (attacker == victim)
-        {
-            ShowExecutionPopup("suicide-popup-melee-complete-internal", Filter.Entities(attacker), PopupType.Medium, attacker, victim, weapon);
-            ShowExecutionPopup("suicide-popup-melee-complete-external", Filter.PvsExcept(attacker), PopupType.MediumCaution, attacker, victim, weapon);
-        }
-        else
-        {
-            ShowExecutionPopup("execution-popup-melee-complete-internal", Filter.Entities(attacker), PopupType.Medium, attacker, victim, weapon);
-            ShowExecutionPopup("execution-popup-melee-complete-external", Filter.PvsExcept(attacker), PopupType.MediumCaution, attacker, victim, weapon);
-        }
-    }
-
-    // TODO: This repeats a lot of the code of the serverside GunSystem, make it not do that
-    private void OnDoafterGun(EntityUid uid, GunComponent component, DoAfterEvent args)
-    {
-        if (args.Handled || args.Cancelled || args.Used == null || args.Target == null)
-            return;
-
-        var attacker = args.User;
-        var weapon = args.Used!.Value;
-        var victim = args.Target!.Value;
-
-        if (!CanExecuteWithGun(weapon, victim, attacker)) return;
-
-        // Check if any systems want to block our shot
-        var prevention = new ShotAttemptedEvent
-        {
-            User = attacker,
-            Used = new Entity<GunComponent>(uid, component)
-        };
-
-        RaiseLocalEvent(weapon, ref prevention);
-        if (prevention.Cancelled)
-            return;
-
-        RaiseLocalEvent(attacker, ref prevention);
-        if (prevention.Cancelled)
-            return;
-
-        // Not sure what this is for but gunsystem uses it so ehhh
-        var attemptEv = new AttemptShootEvent(attacker, null);
-        RaiseLocalEvent(weapon, ref attemptEv);
-
-        if (attemptEv.Cancelled)
-        {
-            if (attemptEv.Message != null)
-            {
-                _popupSystem.PopupClient(attemptEv.Message, weapon, attacker);
-                return;
-            }
-        }
-
-        // Take some ammunition for the shot (one bullet)
-        var fromCoordinates = Transform(attacker).Coordinates;
-        var ev = new TakeAmmoEvent(1, new List<(EntityUid? Entity, IShootable Shootable)>(), fromCoordinates, attacker);
-        RaiseLocalEvent(weapon, ev);
-
-        // Check if there's any ammo left
-        if (ev.Ammo.Count <= 0)
-        {
-            _audioSystem.PlayEntity(component.SoundEmpty, Filter.Pvs(weapon), weapon, true, AudioParams.Default);
-            ShowExecutionPopup("execution-popup-gun-empty", Filter.Pvs(weapon), PopupType.Medium, attacker, victim, weapon);
-            return;
-        }
-
-        // Information about the ammo like damage
-        DamageSpecifier damage = new DamageSpecifier();
-
-        // Get some information from IShootable
-        var ammoUid = ev.Ammo[0].Entity;
-        switch (ev.Ammo[0].Shootable)
-        {
-            case CartridgeAmmoComponent cartridge:
-                // Get the damage value
-                var prototype = _prototypeManager.Index<EntityPrototype>(cartridge.Prototype);
-                prototype.TryGetComponent<ProjectileComponent>(out var projectileA, _componentFactory); // sloth forgive me
-                if (projectileA != null)
-                {
-                    damage = projectileA.Damage * cartridge.Count;
-                }
-
-                // Expend the cartridge
-                cartridge.Spent = true;
-                _appearanceSystem.SetData(ammoUid!.Value, AmmoVisuals.Spent, true);
-                Dirty(ammoUid.Value, cartridge);
-
-                break;
-
-            case AmmoComponent newAmmo:
-                TryComp<ProjectileComponent>(ammoUid, out var projectileB);
-                if (projectileB != null)
-                {
-                    damage = projectileB.Damage;
-                }
-                Del(ammoUid);
-                break;
-
-            case HitscanPrototype hitscan:
-                damage = hitscan.Damage!;
-                break;
-
-            default:
-                throw new ArgumentOutOfRangeException();
-        }
-
-        // Clumsy people have a chance to shoot themselves
-        if (TryComp<ClumsyComponent>(attacker, out var clumsy) && component.ClumsyProof == false)
-        {
-            if (_interactionSystem.TryRollClumsy(attacker, 0.33333333f, clumsy))
-            {
-                ShowExecutionPopup("execution-popup-gun-clumsy-internal", Filter.Entities(attacker), PopupType.Medium, attacker, victim, weapon);
-                ShowExecutionPopup("execution-popup-gun-clumsy-external", Filter.PvsExcept(attacker), PopupType.MediumCaution, attacker, victim, weapon);
-
-                // You shoot yourself with the gun (no damage multiplier)
-                _damageableSystem.TryChangeDamage(attacker, damage, origin: attacker);
-                _audioSystem.PlayEntity(component.SoundGunshot, Filter.Pvs(weapon), weapon, true, AudioParams.Default);
-                return;
-            }
-        }
-
-        // Gun successfully fired, deal damage
-        _damageableSystem.TryChangeDamage(victim, damage * DamageModifier, true, origin: attacker);
-        _audioSystem.PlayEntity(component.SoundGunshot, Filter.Pvs(weapon), weapon, false, AudioParams.Default);
-
-        // Popups
-        if (attacker != victim)
-        {
-            ShowExecutionPopup("execution-popup-gun-complete-internal", Filter.Entities(attacker), PopupType.Medium, attacker, victim, weapon);
-            ShowExecutionPopup("execution-popup-gun-complete-external", Filter.PvsExcept(attacker), PopupType.LargeCaution, attacker, victim, weapon);
-        }
-        else
-        {
-            ShowExecutionPopup("suicide-popup-gun-complete-internal", Filter.Entities(attacker), PopupType.LargeCaution, attacker, victim, weapon);
-            ShowExecutionPopup("suicide-popup-gun-complete-external", Filter.PvsExcept(attacker), PopupType.LargeCaution, attacker, victim, weapon);
-        }
-    }
-
-    private void ShowExecutionPopup(string locString, Filter filter, PopupType type,
-        EntityUid attacker, EntityUid victim, EntityUid weapon)
-    {
-        _popupSystem.PopupEntity(Loc.GetString(
-                locString, ("attacker", attacker), ("victim", victim), ("weapon", weapon)),
-            attacker, filter, true, type);
-    }
-}
diff --git a/Content.Server/Projectiles/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs
index c5ec2d76ad5..b899ae5197a 100644
--- a/Content.Server/Projectiles/ProjectileSystem.cs
+++ b/Content.Server/Projectiles/ProjectileSystem.cs
@@ -31,10 +31,14 @@ private void OnStartCollide(EntityUid uid, ProjectileComponent component, ref St
     {
         // This is so entities that shouldn't get a collision are ignored.
         if (args.OurFixtureId != ProjectileFixture || !args.OtherFixture.Hard
-            || component.DamagedEntity || component is { Weapon: null, OnlyCollideWhenShot: true })
+                                                   || component.DamagedEntity || component is
+                                                       { Weapon: null, OnlyCollideWhenShot: true })
+        {
             return;
+        }
 
         var target = args.OtherEntity;
+
         // it's here so this check is only done once before possible hit
         var attemptEv = new ProjectileReflectAttemptEvent(uid, component, false);
         RaiseLocalEvent(target, ref attemptEv);
@@ -44,11 +48,26 @@ private void OnStartCollide(EntityUid uid, ProjectileComponent component, ref St
             return;
         }
 
+        if (TryHandleProjectile(target, (uid, component)))
+        {
+            var direction = args.OurBody.LinearVelocity.Normalized();
+            _sharedCameraRecoil.KickCamera(target, direction);
+        }
+    }
+
+    /// <summary>
+    /// Tries to handle a projectile interacting with the target.
+    /// </summary>
+    /// <returns>True if the target isn't deleted.</returns>
+    public bool TryHandleProjectile(EntityUid target, Entity<ProjectileComponent> projectile)
+    {
+        var uid = projectile.Owner;
+        var component = projectile.Comp;
+
         var ev = new ProjectileHitEvent(component.Damage, target, component.Shooter);
         RaiseLocalEvent(uid, ref ev);
 
         var otherName = ToPrettyString(target);
-        var direction = args.OurBody.LinearVelocity.Normalized();
         var modifiedDamage = _damageableSystem.TryChangeDamage(target, ev.Damage, component.IgnoreResistances, origin: component.Shooter);
         var deleted = Deleted(target);
 
@@ -67,11 +86,13 @@ private void OnStartCollide(EntityUid uid, ProjectileComponent component, ref St
         if (!deleted)
         {
             _guns.PlayImpactSound(target, modifiedDamage, component.SoundHit, component.ForceSound);
-            _sharedCameraRecoil.KickCamera(target, direction);
         }
 
         component.DamagedEntity = true;
 
+        var afterProjectileHitEvent = new AfterProjectileHitEvent(component.Damage, target);
+        RaiseLocalEvent(uid, ref afterProjectileHitEvent);
+
         if (component.DeleteOnCollide)
             QueueDel(uid);
 
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index e472d146de6..03f10f153d1 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -2,6 +2,8 @@
 using System.Numerics;
 using Content.Server.Cargo.Systems;
 using Content.Server.Power.EntitySystems;
+using Content.Server.Projectiles;
+using Content.Server.Stunnable;
 using Content.Server.Weapons.Ranged.Components;
 using Content.Shared.Contests;
 using Content.Shared.Damage;
@@ -31,6 +33,7 @@ public sealed partial class GunSystem : SharedGunSystem
     [Dependency] private readonly DamageExamineSystem _damageExamine = default!;
     [Dependency] private readonly PricingSystem _pricing = default!;
     [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
+    [Dependency] private readonly ProjectileSystem _projectile = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly StaminaSystem _stamina = default!;
     [Dependency] private readonly ContestsSystem _contests = default!;
@@ -59,6 +62,137 @@ private void OnBallisticPrice(EntityUid uid, BallisticAmmoProviderComponent comp
         args.Price += price * component.UnspawnedCount;
     }
 
+    protected override bool ShootDirect(EntityUid gunUid, GunComponent gun, EntityUid target, List<(EntityUid? Entity, IShootable Shootable)> ammo, EntityUid user)
+    {
+        var result = false;
+
+        // TODO: This is dogshit. I just want to get executions slightly better.
+        // Ideally you'd pull out cartridge + ammo to separate handling functions and re-use it here, then hitscan you need to bypass entirely.
+        // You should also make shooting into a struct of args given how many there are now.
+        var fromCoordinates = Transform(gunUid).Coordinates;
+        var toCoordinates = Transform(target).Coordinates;
+
+        var fromMap = fromCoordinates.ToMap(EntityManager, TransformSystem);
+        var toMap = toCoordinates.ToMapPos(EntityManager, TransformSystem);
+        var mapDirection = toMap - fromMap.Position;
+        var angle = GetRecoilAngle(Timing.CurTime, gun, mapDirection.ToAngle());
+
+        // If applicable, this ensures the projectile is parented to grid on spawn, instead of the map.
+        var fromEnt = MapManager.TryFindGridAt(fromMap, out var gridUid, out _)
+            ? fromCoordinates.WithEntityId(gridUid, EntityManager)
+            : new EntityCoordinates(MapManager.GetMapEntityId(fromMap.MapId), fromMap.Position);
+
+        // I must be high because this was getting tripped even when true.
+        // DebugTools.Assert(direction != Vector2.Zero);
+        var shotProjectiles = new List<EntityUid>(ammo.Count);
+        var cartridgeBullets = new List<EntityUid>();
+
+        foreach (var (ent, shootable) in ammo)
+        {
+            switch (shootable)
+            {
+                // Cartridge shoots something else
+                case CartridgeAmmoComponent cartridge:
+                    if (!cartridge.Spent)
+                    {
+                        for (var i = 0; i < cartridge.Count; i++)
+                        {
+                            var uid = Spawn(cartridge.Prototype, fromEnt);
+                            cartridgeBullets.Add(uid);
+                        }
+
+                        RaiseLocalEvent(ent!.Value, new AmmoShotEvent()
+                        {
+                            FiredProjectiles = cartridgeBullets,
+                        });
+
+                        shotProjectiles.AddRange(cartridgeBullets);
+                        cartridgeBullets.Clear();
+                        SetCartridgeSpent(ent.Value, cartridge, true);
+                        MuzzleFlash(gunUid, cartridge, user);
+                        Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user);
+
+                        if (cartridge.DeleteOnSpawn)
+                            Del(ent.Value);
+                    }
+                    else
+                    {
+                        Audio.PlayPredicted(gun.SoundEmpty, gunUid, user);
+                    }
+
+                    // Something like ballistic might want to leave it in the container still
+                    if (!cartridge.DeleteOnSpawn && !Containers.IsEntityInContainer(ent!.Value))
+                        EjectCartridge(ent.Value, angle);
+
+                    result = true;
+                    Dirty(ent!.Value, cartridge);
+                    break;
+                // Ammo shoots itself
+                case AmmoComponent newAmmo:
+                    result = true;
+                    shotProjectiles.Add(ent!.Value);
+                    MuzzleFlash(gunUid, newAmmo, user);
+                    Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user);
+                    break;
+                case HitscanPrototype hitscan:
+                    result = true;
+                    var hitEntity = target;
+                    if (hitscan.StaminaDamage > 0f)
+                        _stamina.TakeStaminaDamage(hitEntity, hitscan.StaminaDamage, source: user);
+
+                    var dmg = hitscan.Damage;
+
+                    var hitName = ToPrettyString(hitEntity);
+                    if (dmg != null)
+                        dmg = Damageable.TryChangeDamage(hitEntity, dmg, origin: user);
+
+                    // check null again, as TryChangeDamage returns modified damage values
+                    if (dmg != null)
+                    {
+                        if (!Deleted(hitEntity))
+                        {
+                            if (dmg.Any())
+                            {
+                                _color.RaiseEffect(Color.Red, new List<EntityUid>() { hitEntity }, Filter.Pvs(hitEntity, entityManager: EntityManager));
+                            }
+
+                            // TODO get fallback position for playing hit sound.
+                            PlayImpactSound(hitEntity, dmg, hitscan.Sound, hitscan.ForceSound);
+                        }
+
+                        Logs.Add(LogType.HitScanHit,
+                            $"{ToPrettyString(user):user} hit {hitName:target} using hitscan and dealt {dmg.GetTotal():damage} damage");
+                    }
+
+                    Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+        }
+
+        foreach (var ammoUid in shotProjectiles)
+        {
+            // TODO: Handle this shit
+            if (!TryComp(ammoUid, out ProjectileComponent? projectileComponent))
+            {
+                QueueDel(ammoUid);
+                continue;
+            }
+
+            _projectile.TryHandleProjectile(target, (ammoUid, projectileComponent));
+            // Even this deletion handling is mega sussy.
+            Del(ammoUid);
+        }
+
+        RaiseLocalEvent(gunUid, new AmmoShotEvent()
+        {
+            FiredProjectiles = shotProjectiles,
+        });
+
+        return result;
+    }
+
     public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid? Entity, IShootable Shootable)> ammo,
         EntityCoordinates fromCoordinates, EntityCoordinates toCoordinates, out bool userImpulse, EntityUid? user = null, bool throwItems = false)
     {
@@ -75,6 +209,8 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
             }
         }
 
+        // As the above message wasn't obvious stop putting stuff here and use events
+
         var fromMap = fromCoordinates.ToMap(EntityManager, TransformSystem);
         var toMap = toCoordinates.ToMapPos(EntityManager, TransformSystem);
         var mapDirection = toMap - fromMap.Position;
@@ -82,7 +218,7 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
         var angle = GetRecoilAngle(Timing.CurTime, gun, mapDirection.ToAngle(), user);
 
         // If applicable, this ensures the projectile is parented to grid on spawn, instead of the map.
-        var fromEnt = MapManager.TryFindGridAt(fromMap, out var gridUid, out var grid)
+        var fromEnt = MapManager.TryFindGridAt(fromMap, out var gridUid, out _)
             ? fromCoordinates.WithEntityId(gridUid, EntityManager)
             : new EntityCoordinates(MapManager.GetMapEntityId(fromMap.MapId), fromMap.Position);
 
@@ -94,6 +230,7 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
         // I must be high because this was getting tripped even when true.
         // DebugTools.Assert(direction != Vector2.Zero);
         var shotProjectiles = new List<EntityUid>(ammo.Count);
+        var cartridgeBullets = new List<EntityUid>();
 
         foreach (var (ent, shootable) in ammo)
         {
@@ -122,21 +259,23 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
                             {
                                 var uid = Spawn(cartridge.Prototype, fromEnt);
                                 ShootOrThrow(uid, angles[i].ToVec(), gunVelocity, gun, gunUid, user);
-                                shotProjectiles.Add(uid);
+                                cartridgeBullets.Add(uid);
                             }
                         }
                         else
                         {
                             var uid = Spawn(cartridge.Prototype, fromEnt);
                             ShootOrThrow(uid, mapDirection, gunVelocity, gun, gunUid, user);
-                            shotProjectiles.Add(uid);
+                            cartridgeBullets.Add(uid);
                         }
 
                         RaiseLocalEvent(ent!.Value, new AmmoShotEvent()
                         {
-                            FiredProjectiles = shotProjectiles,
+                            FiredProjectiles = cartridgeBullets,
                         });
 
+                        shotProjectiles.AddRange(cartridgeBullets);
+                        cartridgeBullets.Clear();
                         SetCartridgeSpent(ent.Value, cartridge, true);
                         MuzzleFlash(gunUid, cartridge, mapDirection.ToAngle(), user);
                         Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user);
diff --git a/Content.Shared/Execution/ExecutionComponent.cs b/Content.Shared/Execution/ExecutionComponent.cs
new file mode 100644
index 00000000000..f9c5111d63a
--- /dev/null
+++ b/Content.Shared/Execution/ExecutionComponent.cs
@@ -0,0 +1,26 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Execution;
+
+/// <summary>
+/// Added to entities that can be used to execute another target.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ExecutionComponent : Component
+{
+    /// <summary>
+    /// How long the execution duration lasts.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float DoAfterDuration = 5f;
+
+    [DataField, AutoNetworkedField]
+    public float DamageModifier = 9f;
+
+    // Not networked because this is transient inside of a tick.
+    /// <summary>
+    /// True if it is currently executing for handlers.
+    /// </summary>
+    [DataField]
+    public bool Executing = true;
+}
diff --git a/Content.Shared/Execution/ExecutionSystem.cs b/Content.Shared/Execution/ExecutionSystem.cs
new file mode 100644
index 00000000000..de6db205be4
--- /dev/null
+++ b/Content.Shared/Execution/ExecutionSystem.cs
@@ -0,0 +1,241 @@
+using Content.Shared.Weapons.Ranged.Systems;
+using Content.Shared.ActionBlocker;
+using Content.Shared.CombatMode;
+using Content.Shared.Damage;
+using Content.Shared.Database;
+using Content.Shared.DoAfter;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.Popups;
+using Content.Shared.Verbs;
+using Content.Shared.Weapons.Melee;
+using Content.Shared.Weapons.Melee.Events;
+using Content.Shared.Weapons.Ranged.Components;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
+
+namespace Content.Shared.Execution;
+
+/// <summary>
+///     Verb for violently murdering cuffed creatures.
+/// </summary>
+public sealed class ExecutionSystem : EntitySystem
+{
+    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
+    [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
+    [Dependency] private readonly SharedGunSystem _gunSystem = default!;
+    [Dependency] private readonly SharedCombatModeSystem _combatSystem = default!;
+    [Dependency] private readonly SharedMeleeWeaponSystem _meleeSystem = default!;
+
+    // TODO: Still needs more cleaning up.
+    private const string DefaultInternalMeleeExecutionMessage = "execution-popup-melee-initial-internal";
+    private const string DefaultExternalMeleeExecutionMessage = "execution-popup-melee-initial-external";
+    private const string DefaultCompleteInternalMeleeExecutionMessage = "execution-popup-melee-complete-internal";
+    private const string DefaultCompleteExternalMeleeExecutionMessage = "execution-popup-melee-complete-external";
+    private const string DefaultInternalGunExecutionMessage = "execution-popup-gun-initial-internal";
+    private const string DefaultExternalGunExecutionMessage = "execution-popup-gun-initial-external";
+    private const string DefaultCompleteInternalGunExecutionMessage = "execution-popup-gun-complete-internal";
+    private const string DefaultCompleteExternalGunExecutionMessage = "execution-popup-gun-complete-external";
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ExecutionComponent, GetVerbsEvent<UtilityVerb>>(OnGetInteractionsVerbs);
+        SubscribeLocalEvent<ExecutionComponent, ExecutionDoAfterEvent>(OnExecutionDoAfter);
+        SubscribeLocalEvent<ExecutionComponent, GetMeleeDamageEvent>(OnGetMeleeDamage);
+    }
+
+    private void OnGetInteractionsVerbs(EntityUid uid, ExecutionComponent comp, GetVerbsEvent<UtilityVerb> args)
+    {
+        if (args.Hands == null || args.Using == null || !args.CanAccess || !args.CanInteract)
+            return;
+
+        var attacker = args.User;
+        var weapon = args.Using.Value;
+        var victim = args.Target;
+
+        if (!CanExecuteWithAny(victim, attacker))
+            return;
+
+        UtilityVerb verb = new()
+        {
+            Act = () => TryStartExecutionDoAfter(weapon, victim, attacker, comp),
+            Impact = LogImpact.High,
+            Text = Loc.GetString("execution-verb-name"),
+            Message = Loc.GetString("execution-verb-message"),
+        };
+
+        args.Verbs.Add(verb);
+    }
+
+    private void TryStartExecutionDoAfter(EntityUid weapon, EntityUid victim, EntityUid attacker, ExecutionComponent comp)
+    {
+        if (!CanExecuteWithAny(victim, attacker))
+            return;
+
+        // TODO: This should just be on the weapons as a single execution message.
+        var defaultExecutionInternal = DefaultInternalMeleeExecutionMessage;
+        var defaultExecutionExternal = DefaultExternalMeleeExecutionMessage;
+
+        if (HasComp<GunComponent>(weapon))
+        {
+            defaultExecutionExternal = DefaultInternalGunExecutionMessage;
+            defaultExecutionInternal = DefaultExternalGunExecutionMessage;
+        }
+
+        var internalMsg = defaultExecutionInternal;
+        var externalMsg = defaultExecutionExternal;
+        ShowExecutionInternalPopup(internalMsg, attacker, victim, weapon);
+        ShowExecutionExternalPopup(externalMsg, attacker, victim, weapon);
+
+        var doAfter =
+            new DoAfterArgs(EntityManager, attacker, comp.DoAfterDuration, new ExecutionDoAfterEvent(), weapon, target: victim, used: weapon)
+            {
+                BreakOnTargetMove = true,
+                BreakOnUserMove = true,
+                BreakOnDamage = true,
+                NeedHand = true
+            };
+
+        _doAfterSystem.TryStartDoAfter(doAfter);
+
+    }
+
+    private bool CanExecuteWithAny(EntityUid victim, EntityUid attacker)
+    {
+        // Use suicide.
+        if (victim == attacker)
+            return false;
+
+        // No point executing someone if they can't take damage
+        if (!TryComp<DamageableComponent>(victim, out _))
+            return false;
+
+        // You can't execute something that cannot die
+        if (!TryComp<MobStateComponent>(victim, out var mobState))
+            return false;
+
+        // You're not allowed to execute dead people (no fun allowed)
+        if (_mobStateSystem.IsDead(victim, mobState))
+            return false;
+
+        // You must be able to attack people to execute
+        if (!_actionBlockerSystem.CanAttack(attacker, victim))
+            return false;
+
+        // The victim must be incapacitated to be executed
+        if (victim != attacker && _actionBlockerSystem.CanInteract(victim, null))
+            return false;
+
+        // All checks passed
+        return true;
+    }
+
+    private void OnExecutionDoAfter(EntityUid uid, ExecutionComponent component, ExecutionDoAfterEvent args)
+    {
+        if (args.Handled || args.Cancelled || args.Used == null || args.Target == null)
+            return;
+
+        var attacker = args.User;
+        var victim = args.Target.Value;
+        var weapon = args.Used.Value;
+
+        if (!CanExecuteWithAny(victim, attacker))
+            return;
+
+        // This is needed so the melee system does not stop it.
+        var prev = _combatSystem.IsInCombatMode(attacker);
+        _combatSystem.SetInCombatMode(attacker, true);
+        component.Executing = true;
+        string? internalMsg = null;
+        string? externalMsg = null;
+
+        if (TryComp(uid, out MeleeWeaponComponent? melee))
+        {
+            _meleeSystem.AttemptLightAttack(attacker, weapon, melee, victim);
+            internalMsg = DefaultCompleteInternalMeleeExecutionMessage;
+            externalMsg = DefaultCompleteExternalMeleeExecutionMessage;
+        }
+        else if (TryComp(uid, out GunComponent? gun))
+        {
+            var clumsyShot = false;
+
+            // TODO: This should just be an event or something instead to get this.
+            // TODO: Handle clumsy.
+            if (!_gunSystem.AttemptDirectShoot(args.User, uid, args.Target.Value, gun))
+            {
+                internalMsg = null;
+                externalMsg = null;
+            }
+            else
+            {
+                internalMsg = DefaultCompleteInternalGunExecutionMessage;
+                externalMsg = DefaultCompleteExternalGunExecutionMessage;
+            }
+            args.Handled = true;
+        }
+
+        _combatSystem.SetInCombatMode(attacker, prev);
+        component.Executing = false;
+        args.Handled = true;
+
+        if (internalMsg != null && externalMsg != null)
+        {
+            ShowExecutionInternalPopup(internalMsg, attacker, victim, uid);
+            ShowExecutionExternalPopup(externalMsg, attacker, victim, uid);
+        }
+    }
+
+    private void OnGetMeleeDamage(EntityUid uid, ExecutionComponent comp, ref GetMeleeDamageEvent args)
+    {
+        if (!TryComp<MeleeWeaponComponent>(uid, out var melee) ||
+            !TryComp<ExecutionComponent>(uid, out var execComp) ||
+            !execComp.Executing)
+        {
+            return;
+        }
+
+        var bonus = melee.Damage * execComp.DamageModifier - melee.Damage;
+        args.Damage += bonus;
+    }
+
+    private void ShowExecutionInternalPopup(string locString,
+        EntityUid attacker, EntityUid victim, EntityUid weapon, bool predict = true)
+    {
+        if (predict)
+        {
+            _popupSystem.PopupClient(
+                Loc.GetString(locString, ("attacker", attacker), ("victim", victim), ("weapon", weapon)),
+                attacker,
+                attacker,
+                PopupType.Medium
+            );
+        }
+        else
+        {
+            _popupSystem.PopupEntity(
+                Loc.GetString(locString, ("attacker", attacker), ("victim", victim), ("weapon", weapon)),
+                attacker,
+                Filter.Entities(attacker),
+                true,
+                PopupType.Medium
+            );
+        }
+
+    }
+
+    private void ShowExecutionExternalPopup(string locString, EntityUid attacker, EntityUid victim, EntityUid weapon)
+    {
+        _popupSystem.PopupEntity(
+            Loc.GetString(locString, ("attacker", attacker), ("victim", victim), ("weapon", weapon)),
+            attacker,
+            Filter.PvsExcept(attacker),
+            true,
+            PopupType.MediumCaution
+            );
+    }
+}
diff --git a/Content.Shared/Projectiles/SharedProjectileSystem.cs b/Content.Shared/Projectiles/SharedProjectileSystem.cs
index 31a305dba99..81180ac7470 100644
--- a/Content.Shared/Projectiles/SharedProjectileSystem.cs
+++ b/Content.Shared/Projectiles/SharedProjectileSystem.cs
@@ -269,3 +269,9 @@ public record struct ProjectileReflectAttemptEvent(EntityUid ProjUid, Projectile
 /// </summary>
 [ByRefEvent]
 public record struct ProjectileHitEvent(DamageSpecifier Damage, EntityUid Target, EntityUid? Shooter = null);
+
+/// <summary>
+/// Raised after a projectile has dealt it's damage.
+/// </summary>
+[ByRefEvent]
+public record struct AfterProjectileHitEvent(DamageSpecifier Damage, EntityUid Target);
diff --git a/Content.Shared/Weapons/Ranged/Events/ShotAttemptedEvent.cs b/Content.Shared/Weapons/Ranged/Events/ShotAttemptedEvent.cs
index d61862bf1a0..1626c5a63fb 100644
--- a/Content.Shared/Weapons/Ranged/Events/ShotAttemptedEvent.cs
+++ b/Content.Shared/Weapons/Ranged/Events/ShotAttemptedEvent.cs
@@ -21,7 +21,7 @@ public record struct ShotAttemptedEvent
 
     public bool Cancelled { get; private set; }
 
-    /// </summary>
+    /// <summary>
     /// Prevent the gun from shooting
     /// </summary>
     public void Cancel()
@@ -29,7 +29,7 @@ public void Cancel()
         Cancelled = true;
     }
 
-    /// </summary>
+    /// <summary>
     /// Allow the gun to shoot again, only use if you know what you are doing
     /// </summary>
     public void Uncancel()
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index 7afb41239c6..539b756a632 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -23,6 +23,7 @@
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
 using Content.Shared.Whitelist;
+using JetBrains.Annotations;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
@@ -145,7 +146,7 @@ private void OnShootRequest(RequestShootEvent msg, EntitySessionEventArgs args)
 
         gun.ShootCoordinates = GetCoordinates(msg.Coordinates);
         gun.Target = GetEntity(msg.Target);
-        AttemptShoot(user.Value, ent, gun);
+        AttemptShootInternal(user.Value, ent, gun);
     }
 
     private void OnStopShootRequest(RequestStopShootEvent ev, EntitySessionEventArgs args)
@@ -209,6 +210,31 @@ private void StopShooting(EntityUid uid, GunComponent gun)
         Dirty(uid, gun);
     }
 
+    /// <summary>
+    /// Attempts to shoot the specified target directly.
+    /// This may bypass projectiles firing etc.
+    /// </summary>
+    public bool AttemptDirectShoot(EntityUid user, EntityUid gunUid, EntityUid target, GunComponent gun)
+    {
+        // Unique name so people don't think it's "shoot towards" and not "I will teleport a bullet into them".
+        gun.ShootCoordinates = Transform(target).Coordinates;
+
+        if (!TryTakeAmmo(user, gunUid, gun, out _, out _, out var args))
+        {
+            gun.ShootCoordinates = null;
+            return false;
+        }
+
+        var result = ShootDirect(gunUid, gun, target, args.Ammo, user: user);
+        gun.ShootCoordinates = null;
+        return result;
+    }
+
+    protected virtual bool ShootDirect(EntityUid gunUid, GunComponent gun, EntityUid target, List<(EntityUid? Entity, IShootable Shootable)> ammo, EntityUid user)
+    {
+        return false;
+    }
+
     /// <summary>
     /// Sets the targeted entity of the gun. Should be called before attempting to shoot to avoid shooting over the target.
     /// </summary>
@@ -223,7 +249,7 @@ public void SetTarget(GunComponent gun, EntityUid target)
     public void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun, EntityCoordinates toCoordinates)
     {
         gun.ShootCoordinates = toCoordinates;
-        AttemptShoot(user, gunUid, gun);
+        AttemptShootInternal(user, gunUid, gun);
         gun.ShotCounter = 0;
     }
 
@@ -234,20 +260,35 @@ public void AttemptShoot(EntityUid gunUid, GunComponent gun)
     {
         var coordinates = new EntityCoordinates(gunUid, new Vector2(0, -1));
         gun.ShootCoordinates = coordinates;
-        AttemptShoot(gunUid, gunUid, gun);
+        AttemptShootInternal(gunUid, gunUid, gun);
         gun.ShotCounter = 0;
     }
 
-    private void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun)
+    private void AttemptShootInternal(EntityUid user, EntityUid gunUid, GunComponent gun)
     {
-        if (gun.FireRateModified <= 0f ||
-            !_actionBlockerSystem.CanAttack(user))
+        if (!TryTakeAmmo(user, gunUid, gun, out var fromCoordinates, out var toCoordinates, out var args))
             return;
 
-        var toCoordinates = gun.ShootCoordinates;
+        Shoot(gunUid, gun, args.Ammo, fromCoordinates, toCoordinates, out var userImpulse, user: user);
 
-        if (toCoordinates == null)
-            return;
+        if (userImpulse && TryComp<PhysicsComponent>(user, out var userPhysics))
+        {
+            if (_gravity.IsWeightless(user, userPhysics))
+                CauseImpulse(fromCoordinates, toCoordinates, user, userPhysics);
+        }
+    }
+
+    /// <summary>
+    /// Validates if a gun can currently shoot.
+    /// </summary>
+    [Pure]
+    private bool CanShoot(EntityUid user, EntityUid gunUid, GunComponent gun)
+    {
+        if (gun.FireRateModified <= 0f ||
+            !_actionBlockerSystem.CanAttack(user))
+        {
+            return false;
+        }
 
         var curTime = Timing.CurTime;
 
@@ -259,17 +300,42 @@ private void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun)
         };
         RaiseLocalEvent(gunUid, ref prevention);
         if (prevention.Cancelled)
-            return;
+            return false;
 
         RaiseLocalEvent(user, ref prevention);
         if (prevention.Cancelled)
-            return;
+            return false;
 
         // Need to do this to play the clicking sound for empty automatic weapons
         // but not play anything for burst fire.
         if (gun.NextFire > curTime)
-            return;
+            return false;
 
+        return true;
+    }
+
+    /// <summary>
+    /// Tries to return ammo prepped for shooting if a gun is available to shoot.
+    /// </summary>
+    private bool TryTakeAmmo(
+        EntityUid user,
+        EntityUid gunUid, GunComponent gun,
+        out EntityCoordinates fromCoordinates,
+        out EntityCoordinates toCoordinates,
+        [NotNullWhen(true)] out TakeAmmoEvent? args)
+    {
+        toCoordinates = EntityCoordinates.Invalid;
+        fromCoordinates = EntityCoordinates.Invalid;
+        args = null;
+
+        if (!CanShoot(user, gunUid, gun))
+            return false;
+
+        if (gun.ShootCoordinates == null)
+            return false;
+
+        toCoordinates = gun.ShootCoordinates.Value;
+        var curTime = Timing.CurTime;
         var fireRate = TimeSpan.FromSeconds(1f / gun.FireRateModified);
 
         // First shot
@@ -317,10 +383,11 @@ private void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun)
             }
 
             gun.NextFire = TimeSpan.FromSeconds(Math.Max(lastFire.TotalSeconds + SafetyNextFire, gun.NextFire.TotalSeconds));
-            return;
+            return false;
         }
 
-        var fromCoordinates = Transform(user).Coordinates;
+        fromCoordinates = Transform(user).Coordinates;
+
         // Remove ammo
         var ev = new TakeAmmoEvent(shots, new List<(EntityUid? Entity, IShootable Shootable)>(), fromCoordinates, user);
 
@@ -355,14 +422,13 @@ private void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun)
                 // May cause prediction issues? Needs more tweaking
                 gun.NextFire = TimeSpan.FromSeconds(Math.Max(lastFire.TotalSeconds + SafetyNextFire, gun.NextFire.TotalSeconds));
                 Audio.PlayPredicted(gun.SoundEmpty, gunUid, user);
-                return;
+                return false;
             }
 
-            return;
+            return false;
         }
 
         // Shoot confirmed - sounds also played here in case it's invalid (e.g. cartridge already spent).
-        Shoot(gunUid, gun, ev.Ammo, fromCoordinates, toCoordinates.Value, out var userImpulse, user, throwItems: attemptEv.ThrowItems);
         var shotEv = new GunShotEvent(user, ev.Ammo);
         RaiseLocalEvent(gunUid, ref shotEv);
 
@@ -373,6 +439,8 @@ private void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun)
             CauseImpulse(fromCoordinates, toCoordinates.Value, user, userPhysics);
 
         Dirty(gunUid, gun);
+        args = ev;
+        return true;
     }
 
     public void Shoot(
diff --git a/Resources/Locale/en-US/execution/execution.ftl b/Resources/Locale/en-US/execution/execution.ftl
index 8bdf3261666..5bd4613e8c3 100644
--- a/Resources/Locale/en-US/execution/execution.ftl
+++ b/Resources/Locale/en-US/execution/execution.ftl
@@ -14,17 +14,7 @@ execution-popup-gun-clumsy-internal = You miss {$victim}'s head and shoot your f
 execution-popup-gun-clumsy-external = {$attacker} misses {$victim} and shoots {POSS-ADJ($attacker)} foot instead!
 execution-popup-gun-empty = {CAPITALIZE(THE($weapon))} clicks.
 
-suicide-popup-gun-initial-internal = You place the muzzle of {THE($weapon)} in your mouth.
-suicide-popup-gun-initial-external = {$attacker} places the muzzle of {THE($weapon)} in {POSS-ADJ($attacker)} mouth.
-suicide-popup-gun-complete-internal = You shoot yourself in the head!
-suicide-popup-gun-complete-external = {$attacker} shoots {REFLEXIVE($attacker)} in the head!
-
 execution-popup-melee-initial-internal = You ready {THE($weapon)} against {$victim}'s throat.
 execution-popup-melee-initial-external = {$attacker} readies {POSS-ADJ($attacker)} {$weapon} against the throat of {$victim}.
 execution-popup-melee-complete-internal = You slit the throat of {$victim}!
 execution-popup-melee-complete-external = {$attacker} slits the throat of {$victim}!
-
-suicide-popup-melee-initial-internal = You ready {THE($weapon)} against your throat.
-suicide-popup-melee-initial-external = {$attacker} readies {POSS-ADJ($attacker)} {$weapon} against {POSS-ADJ($attacker)} throat.
-suicide-popup-melee-complete-internal = You slit your throat with {THE($weapon)}!
-suicide-popup-melee-complete-external = {$attacker} slits {POSS-ADJ($attacker)} throat with {THE($weapon)}!
\ No newline at end of file
diff --git a/Resources/Locale/en-US/kitchen/components/butcherable-component.ftl b/Resources/Locale/en-US/kitchen/components/butcherable-component.ftl
index ff28cc44db6..4a83cd455d7 100644
--- a/Resources/Locale/en-US/kitchen/components/butcherable-component.ftl
+++ b/Resources/Locale/en-US/kitchen/components/butcherable-component.ftl
@@ -1,4 +1,4 @@
-butcherable-different-tool = You are going to need a different tool to butcher { THE($target) }.
+butcherable-different-tool = You need a different tool to butcher { THE($target) }.
 butcherable-knife-butchered-success = You butcher { THE($target) } with { THE($knife) }.
 butcherable-need-knife = Use a sharp object to butcher { THE($target) }.
 butcherable-not-in-container = { CAPITALIZE(THE($target)) } can't be in a container.
diff --git a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
index 2880bd00ec4..2c818e7c973 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
@@ -6,6 +6,8 @@
   description:  A small piece of crystal.
   components:
   - type: Sharp
+  - type: Execution
+    doAfterDuration: 4.0
   - type: Sprite
     layers:
       - sprite: Objects/Materials/Shards/crystal.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
index e90aafa4142..b328265e212 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -5,6 +5,8 @@
   description: It's a shard of some unknown material.
   components:
   - type: Sharp
+  - type: Execution
+    doAfterDuration: 4.0
   - type: Sprite
     layers:
       - sprite: Objects/Materials/Shards/shard.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
index dc9ee0d09df..e38cb94d202 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
@@ -5,6 +5,8 @@
   description: In Space Glasgow this is called a conversation starter.
   components:
   - type: Sharp
+  - type: Execution
+    doAfterDuration: 4.0
   - type: MeleeWeapon
     attackRate: .71
     range: 1.4
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
index 72df09ac508..cb557e05974 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -19,6 +19,7 @@
       path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg
   - type: StaticPrice
     price: 500
+  - type: Execution
   # No chamber because HMG may want its own
   - type: MeleeWeapon
     attackRate: 1.5
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
index 4b6e21a4922..0a412a5480f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
@@ -62,6 +62,7 @@
     price: 500
   - type: UseDelay
     delay: 1
+  - type: Execution
   - type: MeleeWeapon
     attackRate: 1.4
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
index e95db1c6e9b..0fe74553694 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -33,6 +33,7 @@
       collection: MetalThud
   - type: DamageOtherOnHit
     staminaCost: 14
+  - type: Execution
 
 - type: entity
   name: china lake
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index fefc41ae865..32a0e8b4df4 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -65,6 +65,7 @@
   - type: Appearance
   - type: StaticPrice
     price: 500
+  - type: Execution
   - type: AmmoCounter
   - type: MeleeWeapon
     attackRate: 1.2
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index 0aa281b95c0..e1753ce81e0 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -51,6 +51,7 @@
       gun_chamber: !type:ContainerSlot
   - type: StaticPrice
     price: 500
+  - type: Execution
   - type: MeleeWeapon
     attackRate: 1.3333
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index 8d43953a07b..aa0de1918b6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -54,6 +54,7 @@
       gun_chamber: !type:ContainerSlot
   - type: StaticPrice
     price: 500
+  - type: Execution
   - type: MeleeWeapon
     attackRate: 1.3333
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index 40c85374123..818d3597193 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -43,6 +43,7 @@
         ents: []
   - type: StaticPrice
     price: 500
+  - type: Execution
   - type: MeleeWeapon
     attackRate: 1.4
     damage:
@@ -120,6 +121,7 @@
   - type: Appearance
   - type: StaticPrice
     price: 500
+  - type: Execution
   - type: MeleeWeapon
     attackRate: 1.4
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index 86b90f2bdea..7099ce6eea9 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -39,6 +39,7 @@
         ents: []
   - type: StaticPrice
     price: 500
+  - type: Execution
   - type: MeleeWeapon
     attackRate: 1.3333
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
index 0ad30e9ed6e..53f92eef66b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
@@ -50,3 +50,4 @@
       collection: MetalThud
   - type: DamageOtherOnHit
     staminaCost: 4.5
+  - type: Execution
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
index 2f1527d3592..aef5cfbf8d4 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
@@ -116,6 +116,7 @@
     containers:
       storagebase: !type:Container
         ents: []
+  - type: Execution
 
 # shoots bullets instead of throwing them, no other changes
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
index de22ef22c74..bf61e39f9eb 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
@@ -5,6 +5,8 @@
   description: A grotesque blade made out of bone and flesh that cleaves through people as a hot knife through butter.
   components:
   - type: Sharp
+  - type: Execution
+    doAfterDuration: 4.0
   - type: Sprite
     sprite: Objects/Weapons/Melee/armblade.rsi
     state: icon
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
index df060c2503e..2136cbdcb88 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -8,6 +8,8 @@
     tags:
     - FireAxe
   - type: Sharp
+  - type: Execution
+    doAfterDuration: 4.0
   - type: Sprite
     sprite: Objects/Weapons/Melee/fireaxe.rsi
     state: icon
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index 8d6496e013f..1d9302305c3 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -7,6 +7,8 @@
     tags:
     - Knife
   - type: Sharp
+  - type: Execution
+    doAfterDuration: 4.0
   - type: Utensil
     types:
       - Knife
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
index d36f0704751..2ac023edae4 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -1,10 +1,21 @@
 - type: entity
-  name: captain's sabre
+  name: Sword
   parent: BaseItem
+  id: BaseSword
+  description: A sharp sword.
+  abstract: true
+  components:
+    - type: Sharp
+    - type: Execution
+      doAfterDuration: 4.0
+    - type: DisarmMalus
+
+- type: entity
+  name: captain's sabre
+  parent: BaseSword
   id: CaptainSabre
   description: A ceremonial weapon belonging to the captain of the station.
   components:
-  - type: Sharp
   - type: Sprite
     sprite: Objects/Weapons/Melee/captain_sabre.rsi
     state: icon
@@ -38,15 +49,13 @@
   - type: Tag
     tags:
     - CaptainSabre
-  - type: DisarmMalus
 
 - type: entity
   name: katana
-  parent: BaseItem
+  parent: BaseSword
   id: Katana
   description: Ancient craftwork made with not so ancient plasteel.
   components:
-  - type: Sharp
   - type: Tag
     tags:
     - Katana
@@ -116,11 +125,10 @@
 
 - type: entity
   name: machete
-  parent: BaseItem
+  parent: BaseSword
   id: Machete
   description: A large, vicious looking blade.
   components:
-  - type: Sharp
   - type: Tag
     tags:
     - Machete
@@ -149,15 +157,13 @@
   - type: Item
     size: Normal
     sprite: Objects/Weapons/Melee/machete.rsi
-  - type: DisarmMalus
 
 - type: entity
   name: claymore
-  parent: BaseItem
+  parent: BaseSword
   id: Claymore
   description: An ancient war blade.
   components:
-  - type: Sharp
   - type: Sprite
     sprite: Objects/Weapons/Melee/claymore.rsi
     state: icon
@@ -190,15 +196,13 @@
     sprite: Objects/Weapons/Melee/claymore.rsi
     slots:
     - back
-  - type: DisarmMalus
 
 - type: entity
   name: cutlass
-  parent: BaseItem
+  parent: BaseSword
   id: Cutlass
   description: A wickedly curved blade, often seen in the hands of space pirates.
   components:
-  - type: Sharp
   - type: Tag
     tags:
     - Machete
@@ -228,15 +232,13 @@
   - type: Item
     size: Normal
     sprite: Objects/Weapons/Melee/cutlass.rsi
-  - type: DisarmMalus
 
 - type: entity
   name: The Throngler
-  parent: BaseItem
+  parent: BaseSword
   id: Throngler
   description: Why would someone make this?
   components:
-    - type: Sharp
     - type: Sprite
       sprite: Objects/Weapons/Melee/Throngler2.rsi
       state: icon
@@ -260,4 +262,3 @@
     - type: Item
       size: Ginormous
       sprite: Objects/Weapons/Melee/Throngler-in-hand.rsi
-    - type: DisarmMalus

From 18ee396facf04ff9dee9053f3b5d9eb3e8562890 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 04:02:58 -0400
Subject: [PATCH 040/366] maow

---
 .../Abilities/HealOtherPowerSystem.cs         |  3 +-
 Content.Server/Carrying/CarryingSystem.cs     |  3 +-
 .../Chapel/SacrificialAltarSystem.cs          |  3 +-
 .../EntitySystems/HypospraySystem.cs          |  1 +
 Content.Server/Cluwne/CluwneSystem.cs         |  1 -
 Content.Server/Cocoon/CocoonerSystem.cs       |  6 +-
 Content.Server/Flight/FlightSystem.cs         |  4 +-
 .../EntitySystems/PuddleSystem.Spillable.cs   | 96 +++----------------
 .../Forensics/Systems/ScentTrackerSystem.cs   |  4 +-
 .../LifeDrainer/LifeDrainerSystem.cs          |  4 +-
 Content.Server/Medical/PenLightSystem.cs      |  4 +-
 Content.Server/Paint/PaintSystem.cs           |  4 +-
 .../Power/Systems/BatteryDrinkerSystem.cs     |  4 +-
 .../BlindHealing/BlindHealingSystem.cs        |  2 +-
 .../Supermatter/Systems/SupermatterSystem.cs  |  4 +-
 Content.Server/Vampire/BloodSuckerSystem.cs   |  2 +-
 .../BloodCult/BloodRites/BloodRitesSystem.cs  |  3 +-
 .../Apocalypse/CultRuneApocalypseSystem.cs    |  2 +-
 .../BloodCult/Runes/CultRuneBaseSystem.cs     |  4 +-
 .../Runes/Rending/CultRuneRendingSystem.cs    |  2 +-
 .../BloodCult/Spells/BloodCultSpellsSystem.cs |  2 +-
 .../PsionicHealOtherPowerActionEvent.cs       |  5 +-
 .../SharedCriminalRecordsHackerSystem.cs      |  3 +-
 .../Fluids/SharedPuddleSystem.Spillable.cs    |  2 +-
 .../InteractionVerbPrototype.cs               |  5 +-
 Content.Shared/Magic/SpellbookSystem.cs       |  4 +-
 .../Medical/CPR/Systems/CPRSystem.cs          |  4 +-
 .../Surgery/SharedSurgerySystem.Steps.cs      |  4 +-
 .../Item/PseudoItem/SharedPseudoItemSystem.cs |  4 +-
 Content.Shared/Paint/PaintRemoverSystem.cs    |  8 +-
 .../Plunger/Systems/PlungerSystem.cs          |  2 +-
 .../SharedDeadStartupButtonSystem.cs          |  2 +-
 32 files changed, 58 insertions(+), 143 deletions(-)

diff --git a/Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs b/Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs
index 6a2e90dd88d..0c44a680ff1 100644
--- a/Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs
+++ b/Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs
@@ -88,8 +88,7 @@ private void AttemptDoAfter(EntityUid uid, PsionicComponent component, PsionicHe
         ev.DoRevive = args.DoRevive;
         var doAfterArgs = new DoAfterArgs(EntityManager, uid, args.UseDelay, ev, uid, target: args.Target)
         {
-            BreakOnUserMove = args.BreakOnUserMove,
-            BreakOnTargetMove = args.BreakOnTargetMove,
+            BreakOnMove = args.BreakOnMove,
             Hidden = _glimmer.Glimmer > args.GlimmerDoAfterVisibilityThreshold * args.ModifiedDampening,
         };
 
diff --git a/Content.Server/Carrying/CarryingSystem.cs b/Content.Server/Carrying/CarryingSystem.cs
index ca69d2f9299..9b310aa40aa 100644
--- a/Content.Server/Carrying/CarryingSystem.cs
+++ b/Content.Server/Carrying/CarryingSystem.cs
@@ -250,8 +250,7 @@ private void StartCarryDoAfter(EntityUid carrier, EntityUid carried, CarriableCo
             var ev = new CarryDoAfterEvent();
             var args = new DoAfterArgs(EntityManager, carrier, length, ev, carried, target: carried)
             {
-                BreakOnTargetMove = true,
-                BreakOnUserMove = true,
+                BreakOnMove = true,
                 NeedHand = true
             };
 
diff --git a/Content.Server/Chapel/SacrificialAltarSystem.cs b/Content.Server/Chapel/SacrificialAltarSystem.cs
index e7144e1185b..f674f263f7a 100644
--- a/Content.Server/Chapel/SacrificialAltarSystem.cs
+++ b/Content.Server/Chapel/SacrificialAltarSystem.cs
@@ -119,8 +119,7 @@ protected override void AttemptSacrifice(Entity<SacrificialAltarComponent> ent,
         var args = new DoAfterArgs(EntityManager, user, ent.Comp.SacrificeTime, ev, target: target, eventTarget: ent)
         {
             BreakOnDamage = true,
-            BreakOnUserMove = true,
-            BreakOnTargetMove = true,
+            BreakOnMove = true,
             BreakOnWeightlessMove = true,
             NeedHand = true
         };
diff --git a/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs b/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
index 7f0b797468c..29a03485db4 100644
--- a/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
@@ -18,6 +18,7 @@
 using Robust.Shared.GameStates;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Server.Audio;
 
 namespace Content.Server.Chemistry.EntitySystems;
diff --git a/Content.Server/Cluwne/CluwneSystem.cs b/Content.Server/Cluwne/CluwneSystem.cs
index 0e8669a0314..b91fcabb46f 100644
--- a/Content.Server/Cluwne/CluwneSystem.cs
+++ b/Content.Server/Cluwne/CluwneSystem.cs
@@ -17,7 +17,6 @@
 using Content.Shared.Interaction.Components;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
-using Content.Shared.NameModifier.EntitySystems;
 using Content.Shared.Clumsy;
 
 namespace Content.Server.Cluwne;
diff --git a/Content.Server/Cocoon/CocoonerSystem.cs b/Content.Server/Cocoon/CocoonerSystem.cs
index 676eb9808b2..12fb8b52c24 100644
--- a/Content.Server/Cocoon/CocoonerSystem.cs
+++ b/Content.Server/Cocoon/CocoonerSystem.cs
@@ -135,8 +135,7 @@ private void StartCocooning(EntityUid uid, CocoonerComponent component, EntityUi
 
             var args = new DoAfterArgs(EntityManager, uid, delay, new CocoonDoAfterEvent(), uid, target: target)
             {
-                BreakOnUserMove = true,
-                BreakOnTargetMove = true,
+                BreakOnMove = true
             };
 
             _doAfter.TryStartDoAfter(args);
@@ -151,8 +150,7 @@ private void StartUnCocooning(EntityUid uid, CocoonerComponent component, Entity
 
             var args = new DoAfterArgs(EntityManager, uid, delay, new UnCocoonDoAfterEvent(), uid, target: target)
             {
-                BreakOnUserMove = true,
-                BreakOnTargetMove = true,
+                BreakOnMove = true
             };
 
             _doAfter.TryStartDoAfter(args);
diff --git a/Content.Server/Flight/FlightSystem.cs b/Content.Server/Flight/FlightSystem.cs
index 39321b1e66c..86eed994329 100644
--- a/Content.Server/Flight/FlightSystem.cs
+++ b/Content.Server/Flight/FlightSystem.cs
@@ -67,8 +67,8 @@ private void OnToggleFlight(EntityUid uid, FlightComponent component, ToggleFlig
             new FlightDoAfterEvent(), uid, target: uid)
             {
                 BlockDuplicate = true,
-                BreakOnTargetMove = true,
-                BreakOnUserMove = true,
+                ,
+                BreakOnMove = true,
                 BreakOnDamage = true,
                 NeedHand = true
             };
diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
index e4fd3fb491c..6842349828d 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reaction;
+using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Clothing;
 using Content.Shared.CombatMode.Pacification;
@@ -27,8 +28,6 @@ protected override void InitializeSpillable()
         SubscribeLocalEvent<SpillableComponent, LandEvent>(SpillOnLand);
         // Openable handles the event if it's closed
         SubscribeLocalEvent<SpillableComponent, MeleeHitEvent>(SplashOnMeleeHit, after: [typeof(OpenableSystem)]);
-        SubscribeLocalEvent<SpillableComponent, ClothingGotEquippedEvent>(OnGotEquipped);
-        SubscribeLocalEvent<SpillableComponent, ClothingGotUnequippedEvent>(OnGotUnequipped);
         SubscribeLocalEvent<SpillableComponent, SolutionContainerOverflowEvent>(OnOverflow);
         SubscribeLocalEvent<SpillableComponent, SpillDoAfterEvent>(OnDoAfter);
         SubscribeLocalEvent<SpillableComponent, AttemptPacifiedThrowEvent>(OnAttemptPacifiedThrow);
@@ -72,17 +71,22 @@ private void SplashOnMeleeHit(Entity<SpillableComponent> entity, ref MeleeHitEve
             return;
 
         args.Handled = true;
+
+        // First update the hit count so anything that is not reactive wont count towards the total!
+        foreach (var hit in args.HitEntities)
+        {
+            if (!HasComp<ReactiveComponent>(hit))
+                hitCount -= 1;
+        }
+
         foreach (var hit in args.HitEntities)
         {
             if (!HasComp<ReactiveComponent>(hit))
-            {
-                hitCount -= 1; // so we don't undershoot solution calculation for actual reactive entities
                 continue;
-            }
 
             var splitSolution = _solutionContainerSystem.SplitSolution(soln.Value, totalSplit / hitCount);
 
-            _adminLogger.Add(LogType.MeleeHit, $"{ToPrettyString(args.User)} splashed {SolutionContainerSystem.ToPrettyString(splitSolution):solution} from {ToPrettyString(entity.Owner):entity} onto {ToPrettyString(hit):target}");
+            _adminLogger.Add(LogType.MeleeHit, $"{ToPrettyString(args.User)} splashed {SharedSolutionContainerSystem.ToPrettyString(splitSolution):solution} from {ToPrettyString(entity.Owner):entity} onto {ToPrettyString(hit):target}");
             _reactive.DoEntityReaction(hit, splitSolution, ReactionMethod.Touch);
 
             _popups.PopupEntity(
@@ -97,33 +101,6 @@ private void SplashOnMeleeHit(Entity<SpillableComponent> entity, ref MeleeHitEve
         }
     }
 
-    private void OnGotEquipped(Entity<SpillableComponent> entity, ref ClothingGotEquippedEvent args)
-    {
-        if (!entity.Comp.SpillWorn)
-            return;
-
-        if (!_solutionContainerSystem.TryGetSolution(entity.Owner, entity.Comp.SolutionName, out var soln, out var solution))
-            return;
-
-        // block access to the solution while worn
-        AddComp<BlockSolutionAccessComponent>(entity);
-
-        if (solution.Volume == 0)
-            return;
-
-        // spill all solution on the player
-        var drainedSolution = _solutionContainerSystem.Drain(entity.Owner, soln.Value, solution.Volume);
-        TrySplashSpillAt(entity.Owner, Transform(args.Wearer).Coordinates, drainedSolution, out _);
-    }
-
-    private void OnGotUnequipped(Entity<SpillableComponent> entity, ref ClothingGotUnequippedEvent args)
-    {
-        if (!entity.Comp.SpillWorn)
-            return;
-
-        RemCompDeferred<BlockSolutionAccessComponent>(entity);
-    }
-
     private void SpillOnLand(Entity<SpillableComponent> entity, ref LandEvent args)
     {
         if (!_solutionContainerSystem.TryGetSolution(entity.Owner, entity.Comp.SolutionName, out var soln, out var solution))
@@ -138,7 +115,7 @@ private void SpillOnLand(Entity<SpillableComponent> entity, ref LandEvent args)
         if (args.User != null)
         {
             _adminLogger.Add(LogType.Landed,
-                $"{ToPrettyString(entity.Owner):entity} spilled a solution {SolutionContainerSystem.ToPrettyString(solution):solution} on landing");
+                $"{ToPrettyString(entity.Owner):entity} spilled a solution {SharedSolutionContainerSystem.ToPrettyString(solution):solution} on landing");
         }
 
         var drainedSolution = _solutionContainerSystem.Drain(entity.Owner, soln.Value, solution.Volume);
@@ -161,57 +138,6 @@ private void OnAttemptPacifiedThrow(Entity<SpillableComponent> ent, ref AttemptP
         args.Cancel("pacified-cannot-throw-spill");
     }
 
-    private void AddSpillVerb(Entity<SpillableComponent> entity, ref GetVerbsEvent<Verb> args)
-    {
-        if (!args.CanAccess || !args.CanInteract)
-            return;
-
-        if (!_solutionContainerSystem.TryGetSolution(args.Target, entity.Comp.SolutionName, out var soln, out var solution))
-            return;
-
-        if (_openable.IsClosed(args.Target))
-            return;
-
-        if (solution.Volume == FixedPoint2.Zero)
-            return;
-
-        if (_entityManager.HasComponent<PreventSpillerComponent>(args.User))
-            return;
-
-
-        Verb verb = new()
-        {
-            Text = Loc.GetString("spill-target-verb-get-data-text")
-        };
-
-        // TODO VERB ICONS spill icon? pouring out a glass/beaker?
-        if (entity.Comp.SpillDelay == null)
-        {
-            var target = args.Target;
-            verb.Act = () =>
-            {
-                var puddleSolution = _solutionContainerSystem.SplitSolution(soln.Value, solution.Volume);
-                TrySpillAt(Transform(target).Coordinates, puddleSolution, out _);
-            };
-        }
-        else
-        {
-            var user = args.User;
-            verb.Act = () =>
-            {
-                _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, user, entity.Comp.SpillDelay ?? 0, new SpillDoAfterEvent(), entity.Owner, target: entity.Owner)
-                {
-                    BreakOnDamage = true,
-                    BreakOnMove = true,
-                    NeedHand = true,
-                });
-            };
-        }
-        verb.Impact = LogImpact.Medium; // dangerous reagent reaction are logged separately.
-        verb.DoContactInteraction = true;
-        args.Verbs.Add(verb);
-    }
-
     private void OnDoAfter(Entity<SpillableComponent> entity, ref SpillDoAfterEvent args)
     {
         if (args.Handled || args.Cancelled || args.Args.Target == null)
diff --git a/Content.Server/Forensics/Systems/ScentTrackerSystem.cs b/Content.Server/Forensics/Systems/ScentTrackerSystem.cs
index e3542eaba47..14373856121 100644
--- a/Content.Server/Forensics/Systems/ScentTrackerSystem.cs
+++ b/Content.Server/Forensics/Systems/ScentTrackerSystem.cs
@@ -49,9 +49,9 @@ private void AttemptTrackScent(EntityUid user, EntityUid target, ScentTrackerCom
 
             var doAfterEventArgs = new DoAfterArgs(EntityManager, user, component.SniffDelay, new ScentTrackerDoAfterEvent(), user, target: target)
             {
-                BreakOnUserMove = true,
+                BreakOnMove = true,
                 BreakOnDamage = true,
-                BreakOnTargetMove = true
+                
             };
 
             _popupSystem.PopupEntity(Loc.GetString("start-tracking-scent", ("user", Identity.Name(user, EntityManager)), ("target", Identity.Name(target, EntityManager))), user);
diff --git a/Content.Server/LifeDrainer/LifeDrainerSystem.cs b/Content.Server/LifeDrainer/LifeDrainerSystem.cs
index c5955d78039..12d3bedad99 100644
--- a/Content.Server/LifeDrainer/LifeDrainerSystem.cs
+++ b/Content.Server/LifeDrainer/LifeDrainerSystem.cs
@@ -122,8 +122,8 @@ public bool TryDrain(Entity<LifeDrainerComponent> ent, EntityUid target)
         var ev = new LifeDrainDoAfterEvent();
         var args = new DoAfterArgs(EntityManager, uid, comp.Delay, ev, target: target, eventTarget: uid)
         {
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
+            ,
+            BreakOnMove = true,
             MovementThreshold = 2f,
             NeedHand = false
         };
diff --git a/Content.Server/Medical/PenLightSystem.cs b/Content.Server/Medical/PenLightSystem.cs
index f1df356cab0..6d7157b38c3 100644
--- a/Content.Server/Medical/PenLightSystem.cs
+++ b/Content.Server/Medical/PenLightSystem.cs
@@ -91,8 +91,8 @@ public bool TryStartExam(EntityUid uid, EntityUid target, EntityUid user, PenLig
             uid, target, uid)
         {
             BlockDuplicate = true,
-            BreakOnUserMove = true,
-            BreakOnTargetMove = true,
+            BreakOnMove = true,
+            ,
             BreakOnHandChange = true,
             NeedHand = true
         });
diff --git a/Content.Server/Paint/PaintSystem.cs b/Content.Server/Paint/PaintSystem.cs
index e8ef4d21e12..a03de99e681 100644
--- a/Content.Server/Paint/PaintSystem.cs
+++ b/Content.Server/Paint/PaintSystem.cs
@@ -82,8 +82,8 @@ private void PrepPaint(EntityUid uid, PaintComponent component, EntityUid target
                 target: target,
                 used: uid)
             {
-                BreakOnUserMove = true,
-                BreakOnTargetMove = true,
+                BreakOnMove = true,
+                ,
                 NeedHand = true,
                 BreakOnHandChange = true,
             });
diff --git a/Content.Server/Power/Systems/BatteryDrinkerSystem.cs b/Content.Server/Power/Systems/BatteryDrinkerSystem.cs
index e42783c4d8d..0080e754386 100644
--- a/Content.Server/Power/Systems/BatteryDrinkerSystem.cs
+++ b/Content.Server/Power/Systems/BatteryDrinkerSystem.cs
@@ -72,8 +72,8 @@ private void DrinkBattery(EntityUid target, EntityUid user, BatteryDrinkerCompon
         var args = new DoAfterArgs(EntityManager, user, doAfterTime, new BatteryDrinkerDoAfterEvent(), user, target) // TODO: Make this doafter loop, once we merge Upstream.
         {
             BreakOnDamage = true,
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
+            ,
+            BreakOnMove = true,
             Broadcast = false,
             DistanceThreshold = 1.35f,
             RequireCanInteract = true,
diff --git a/Content.Server/Silicon/BlindHealing/BlindHealingSystem.cs b/Content.Server/Silicon/BlindHealing/BlindHealingSystem.cs
index b9d26b59f7c..e43a690881b 100644
--- a/Content.Server/Silicon/BlindHealing/BlindHealingSystem.cs
+++ b/Content.Server/Silicon/BlindHealing/BlindHealingSystem.cs
@@ -57,7 +57,7 @@ private bool TryHealBlindness(EntityUid uid, EntityUid user, EntityUid target, f
             new DoAfterArgs(EntityManager, user, delay, new HealingDoAfterEvent(), uid, target: target, used: uid)
             {
                 NeedHand = true,
-                BreakOnUserMove = true,
+                BreakOnMove = true,
                 BreakOnWeightlessMove = false,
             };
 
diff --git a/Content.Server/Supermatter/Systems/SupermatterSystem.cs b/Content.Server/Supermatter/Systems/SupermatterSystem.cs
index 3d86f57fb84..019996374b2 100644
--- a/Content.Server/Supermatter/Systems/SupermatterSystem.cs
+++ b/Content.Server/Supermatter/Systems/SupermatterSystem.cs
@@ -176,8 +176,8 @@ private void OnItemInteract(EntityUid uid, SupermatterComponent sm, ref Interact
         {
             BreakOnDamage = true,
             BreakOnHandChange = false,
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
+            ,
+            BreakOnMove = true,
             BreakOnWeightlessMove = false,
             NeedHand = true,
             RequireCanInteract = true,
diff --git a/Content.Server/Vampire/BloodSuckerSystem.cs b/Content.Server/Vampire/BloodSuckerSystem.cs
index 41afe0d666b..b0e966a620c 100644
--- a/Content.Server/Vampire/BloodSuckerSystem.cs
+++ b/Content.Server/Vampire/BloodSuckerSystem.cs
@@ -134,7 +134,7 @@ public void StartSuccDoAfter(EntityUid bloodsucker, EntityUid victim, BloodSucke
 
             var args = new DoAfterArgs(EntityManager, bloodsucker, bloodSuckerComponent.Delay, new BloodSuckDoAfterEvent(), bloodsucker, target: victim)
             {
-                BreakOnTargetMove = true,
+                ,
                 BreakOnUserMove = false,
                 DistanceThreshold = 2f,
                 NeedHand = false
diff --git a/Content.Server/WhiteDream/BloodCult/BloodRites/BloodRitesSystem.cs b/Content.Server/WhiteDream/BloodCult/BloodRites/BloodRitesSystem.cs
index 63b1c08aaca..d22b2ced2e0 100644
--- a/Content.Server/WhiteDream/BloodCult/BloodRites/BloodRitesSystem.cs
+++ b/Content.Server/WhiteDream/BloodCult/BloodRites/BloodRitesSystem.cs
@@ -77,8 +77,7 @@ private void OnAfterInteract(Entity<BloodRitesAuraComponent> rites, ref AfterInt
             var time = rites.Comp.BloodExtractionTime;
             var doAfterArgs = new DoAfterArgs(EntityManager, args.User, time, ev, rites, args.Target)
             {
-                BreakOnUserMove = true,
-                BreakOnTargetMove = true,
+                BreakOnMove = true,
                 BreakOnDamage = true
             };
             if (_doAfter.TryStartDoAfter(doAfterArgs, out var doAfterId))
diff --git a/Content.Server/WhiteDream/BloodCult/Runes/Apocalypse/CultRuneApocalypseSystem.cs b/Content.Server/WhiteDream/BloodCult/Runes/Apocalypse/CultRuneApocalypseSystem.cs
index 745ea042caf..ae72ebf1504 100644
--- a/Content.Server/WhiteDream/BloodCult/Runes/Apocalypse/CultRuneApocalypseSystem.cs
+++ b/Content.Server/WhiteDream/BloodCult/Runes/Apocalypse/CultRuneApocalypseSystem.cs
@@ -40,7 +40,7 @@ private void OnApocalypseRuneInvoked(Entity<CultRuneApocalypseComponent> ent, re
 
         var doAfter = new DoAfterArgs(EntityManager, args.User, ent.Comp.InvokeTime, new ApocalypseRuneDoAfter(), ent)
         {
-            BreakOnUserMove = true
+            BreakOnMove = true
         };
 
         _doAfter.TryStartDoAfter(doAfter);
diff --git a/Content.Server/WhiteDream/BloodCult/Runes/CultRuneBaseSystem.cs b/Content.Server/WhiteDream/BloodCult/Runes/CultRuneBaseSystem.cs
index 013b8df6cdd..cedf021d5f1 100644
--- a/Content.Server/WhiteDream/BloodCult/Runes/CultRuneBaseSystem.cs
+++ b/Content.Server/WhiteDream/BloodCult/Runes/CultRuneBaseSystem.cs
@@ -101,7 +101,7 @@ private void OnRuneSelected(Entity<RuneDrawerComponent> ent, ref RuneDrawerSelec
 
         var argsDoAfterEvent = new DoAfterArgs(EntityManager, args.Actor, timeToDraw, ev, args.Actor)
         {
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             NeedHand = true
         };
 
@@ -147,7 +147,7 @@ private void EraseOnInteractUsing(Entity<CultRuneBaseComponent> rune, ref Intera
         var argsDoAfterEvent =
             new DoAfterArgs(EntityManager, args.User, runeDrawer.EraseTime, new RuneEraseDoAfterEvent(), rune)
             {
-                BreakOnUserMove = true,
+                BreakOnMove = true,
                 BreakOnDamage = true,
                 NeedHand = true
             };
diff --git a/Content.Server/WhiteDream/BloodCult/Runes/Rending/CultRuneRendingSystem.cs b/Content.Server/WhiteDream/BloodCult/Runes/Rending/CultRuneRendingSystem.cs
index 91347bcdd95..6bc69aba58e 100644
--- a/Content.Server/WhiteDream/BloodCult/Runes/Rending/CultRuneRendingSystem.cs
+++ b/Content.Server/WhiteDream/BloodCult/Runes/Rending/CultRuneRendingSystem.cs
@@ -66,7 +66,7 @@ private void OnRendingRuneInvoked(Entity<CultRuneRendingComponent> rune, ref Try
         var ev = new RendingRuneDoAfter();
         var argsDoAfterEvent = new DoAfterArgs(EntityManager, args.User, rune.Comp.SummonTime, ev, rune)
         {
-            BreakOnUserMove = true
+            BreakOnMove = true
         };
 
         if (!_doAfter.TryStartDoAfter(argsDoAfterEvent, out rune.Comp.CurrentDoAfter))
diff --git a/Content.Server/WhiteDream/BloodCult/Spells/BloodCultSpellsSystem.cs b/Content.Server/WhiteDream/BloodCult/Spells/BloodCultSpellsSystem.cs
index c69bf6abd4e..18a04392e09 100644
--- a/Content.Server/WhiteDream/BloodCult/Spells/BloodCultSpellsSystem.cs
+++ b/Content.Server/WhiteDream/BloodCult/Spells/BloodCultSpellsSystem.cs
@@ -148,7 +148,7 @@ private void OnSpellSelected(Entity<BloodCultSpellsHolderComponent> cultist, ref
             createSpellEvent,
             cultist.Owner)
         {
-            BreakOnUserMove = true
+            BreakOnMove = true
         };
 
         if (_doAfter.TryStartDoAfter(doAfter, out var doAfterId))
diff --git a/Content.Shared/Actions/Events/PsionicHealOtherPowerActionEvent.cs b/Content.Shared/Actions/Events/PsionicHealOtherPowerActionEvent.cs
index cdcba6740c2..80ef0b0f6ce 100644
--- a/Content.Shared/Actions/Events/PsionicHealOtherPowerActionEvent.cs
+++ b/Content.Shared/Actions/Events/PsionicHealOtherPowerActionEvent.cs
@@ -35,10 +35,7 @@ public sealed partial class PsionicHealOtherPowerActionEvent : EntityTargetActio
     public bool DoRevive;
 
     [DataField]
-    public bool BreakOnUserMove = true;
-
-    [DataField]
-    public bool BreakOnTargetMove = false;
+    public bool BreakOnMove = true;
 
     [DataField]
     public float UseDelay = 8f;
diff --git a/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsHackerSystem.cs b/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsHackerSystem.cs
index a626db19e5f..10faf3ebe23 100644
--- a/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsHackerSystem.cs
+++ b/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsHackerSystem.cs
@@ -30,8 +30,7 @@ private void OnBeforeInteractHand(Entity<CriminalRecordsHackerComponent> ent, re
         var doAfterArgs = new DoAfterArgs(EntityManager, ent, ent.Comp.Delay, new CriminalRecordsHackDoAfterEvent(), target: target, used: ent, eventTarget: ent)
         {
             BreakOnDamage = true,
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             BreakOnWeightlessMove = true,
             MovementThreshold = 0.5f,
         };
diff --git a/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs b/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
index 767d30389ac..2ce008da262 100644
--- a/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
+++ b/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
@@ -75,7 +75,7 @@ private void AddSpillVerb(Entity<SpillableComponent> entity, ref GetVerbsEvent<V
                 _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, user, entity.Comp.SpillDelay ?? 0, new SpillDoAfterEvent(), entity.Owner, target: entity.Owner)
                 {
                     BreakOnDamage = true,
-                    BreakOnUserMove = true,
+                    BreakOnMove = true,
                     NeedHand = true,
                 });
             };
diff --git a/Content.Shared/InteractionVerbs/InteractionVerbPrototype.cs b/Content.Shared/InteractionVerbs/InteractionVerbPrototype.cs
index 671e8e47184..b656428f405 100644
--- a/Content.Shared/InteractionVerbs/InteractionVerbPrototype.cs
+++ b/Content.Shared/InteractionVerbs/InteractionVerbPrototype.cs
@@ -108,13 +108,12 @@ public sealed partial class InteractionVerbPrototype : IPrototype, IInheritingPr
     ///     The user, target, needHand, event, and other required parameters are set up automatically when the do-after is created.
     /// </summary>
     [DataField]
-    public DoAfterArgs DoAfter = new DoAfterArgs()
+    public DoAfterArgs DoAfter = new()
     {
         User = EntityUid.Invalid,
         NetUser = NetEntity.Invalid,
         BreakOnDamage = true,
-        BreakOnTargetMove = true,
-        BreakOnUserMove = true,
+        BreakOnMove = true,
         BreakOnWeightlessMove = true,
         RequireCanInteract = false,
         // Never used, but must be present because the field is non-nullable and will error during serialization if not set.
diff --git a/Content.Shared/Magic/SpellbookSystem.cs b/Content.Shared/Magic/SpellbookSystem.cs
index a7c82746249..bb774db1c25 100644
--- a/Content.Shared/Magic/SpellbookSystem.cs
+++ b/Content.Shared/Magic/SpellbookSystem.cs
@@ -86,8 +86,8 @@ private void AttemptLearn(Entity<SpellbookComponent> ent, UseInHandEvent args)
     {
         var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, ent.Comp.LearnTime, new SpellbookDoAfterEvent(), ent, target: ent)
         {
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
+            ,
+            BreakOnMove = true,
             BreakOnWeightlessMove = true,
             BreakOnDamage = true,
             NeedHand = true, // What, are you going to read with your eyes only??
diff --git a/Content.Shared/Medical/CPR/Systems/CPRSystem.cs b/Content.Shared/Medical/CPR/Systems/CPRSystem.cs
index e050f1b4e1d..7238fe5a097 100644
--- a/Content.Shared/Medical/CPR/Systems/CPRSystem.cs
+++ b/Content.Shared/Medical/CPR/Systems/CPRSystem.cs
@@ -95,8 +95,8 @@ private void StartCPR(EntityUid performer, EntityUid target, CPRTrainingComponen
 
             _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, performer, cprComponent.DoAfterDuration, new CPRDoAfterEvent(), performer, target, performer)
             {
-                BreakOnTargetMove = true,
-                BreakOnUserMove = true,
+                ,
+                BreakOnMove = true,
                 NeedHand = true,
                 BlockDuplicate = true
             });
diff --git a/Content.Shared/Medical/Surgery/SharedSurgerySystem.Steps.cs b/Content.Shared/Medical/Surgery/SharedSurgerySystem.Steps.cs
index c914c135142..0ab76cb42f7 100644
--- a/Content.Shared/Medical/Surgery/SharedSurgerySystem.Steps.cs
+++ b/Content.Shared/Medical/Surgery/SharedSurgerySystem.Steps.cs
@@ -728,8 +728,8 @@ private void OnSurgeryTargetStepChosen(Entity<SurgeryTargetComponent> ent, ref S
         var duration = GetSurgeryDuration(step, user, body, speed);
         var doAfter = new DoAfterArgs(EntityManager, user, TimeSpan.FromSeconds(duration), ev, body, part)
         {
-            BreakOnUserMove = true,
-            BreakOnTargetMove = true,
+            BreakOnMove = true,
+            ,
             CancelDuplicate = true,
             DuplicateCondition = DuplicateConditions.SameEvent,
             NeedHand = true,
diff --git a/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs b/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs
index 5f4e6184346..227c13c3d2c 100644
--- a/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs
+++ b/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs
@@ -163,8 +163,8 @@ protected void StartInsertDoAfter(EntityUid inserter, EntityUid toInsert, Entity
         var ev = new PseudoItemInsertDoAfterEvent();
         var args = new DoAfterArgs(EntityManager, inserter, 5f, ev, toInsert, toInsert, storageEntity)
         {
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
+            ,
+            BreakOnMove = true,
             NeedHand = true
         };
 
diff --git a/Content.Shared/Paint/PaintRemoverSystem.cs b/Content.Shared/Paint/PaintRemoverSystem.cs
index e2565e0f220..e800a1de656 100644
--- a/Content.Shared/Paint/PaintRemoverSystem.cs
+++ b/Content.Shared/Paint/PaintRemoverSystem.cs
@@ -36,8 +36,8 @@ private void OnInteract(EntityUid uid, PaintRemoverComponent component, AfterInt
 
         _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, component.CleanDelay, new PaintRemoverDoAfterEvent(), uid, args.Target, uid)
         {
-            BreakOnUserMove = true,
-            BreakOnTargetMove = true,
+            BreakOnMove = true,
+            ,
             BreakOnDamage = true,
             MovementThreshold = 1.0f,
         });
@@ -83,8 +83,8 @@ private void OnPaintRemoveVerb(EntityUid uid, PaintRemoverComponent component, G
                         args.Target,
                         uid)
                     {
-                        BreakOnUserMove = true,
-                        BreakOnTargetMove = true,
+                        BreakOnMove = true,
+                        ,
                         BreakOnDamage = true,
                         MovementThreshold = 1.0f,
                     });
diff --git a/Content.Shared/Plunger/Systems/PlungerSystem.cs b/Content.Shared/Plunger/Systems/PlungerSystem.cs
index 6e07657941b..6117636dee9 100644
--- a/Content.Shared/Plunger/Systems/PlungerSystem.cs
+++ b/Content.Shared/Plunger/Systems/PlungerSystem.cs
@@ -45,7 +45,7 @@ private void OnInteract(EntityUid uid, PlungerComponent component, AfterInteract
 
         _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, component.PlungeDuration, new PlungerDoAfterEvent(), uid, target, uid)
         {
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             BreakOnDamage = true,
             MovementThreshold = 1.0f,
         });
diff --git a/Content.Shared/Silicon/DeadStartupButton/SharedDeadStartupButtonSystem.cs b/Content.Shared/Silicon/DeadStartupButton/SharedDeadStartupButtonSystem.cs
index ced89e78608..c021baa86bc 100644
--- a/Content.Shared/Silicon/DeadStartupButton/SharedDeadStartupButtonSystem.cs
+++ b/Content.Shared/Silicon/DeadStartupButton/SharedDeadStartupButtonSystem.cs
@@ -51,7 +51,7 @@ private void TryStartup(EntityUid user, EntityUid target, DeadStartupButtonCompo
         var args = new DoAfterArgs(EntityManager, user, comp.DoAfterInterval, new OnDoAfterButtonPressedEvent(), target, target:target)
         {
             BreakOnDamage = true,
-            BreakOnUserMove = true,
+            BreakOnMove = true,
         };
         _doAfterSystem.TryStartDoAfter(args);
     }

From 59f94a1001c6da312925a350c1242b328d63f3f5 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Fri, 9 Aug 2024 08:14:07 +0200
Subject: [PATCH 041/366] Add tooltips to the agent ID job icons and improve
 status icon prototypes (#28575)

* add tooltips to agentid job icons

* forgot to stage this

* make StatusIconPrototype abstract

* minor visual improvements

* cleanup

* use currentculture to sort job names

* review
---
 .../UI/AgentIDCardBoundUserInterface.cs       |   4 +-
 .../Access/UI/AgentIDCardWindow.xaml          |  11 +-
 .../Access/UI/AgentIDCardWindow.xaml.cs       |  23 ++-
 .../CrewManifest/UI/CrewManifestSection.cs    |   2 +-
 .../CrewMonitoringWindow.xaml.cs              |   2 +-
 .../Overlays/EntityHealthBarOverlay.cs        |   1 +
 .../Overlays/ShowHealthIconsSystem.cs         |   6 +-
 Content.Client/Overlays/ShowJobIconsSystem.cs |   4 +-
 .../Overlays/ShowSyndicateIconsSystem.cs      |   2 +-
 .../Access/Components/AgentIDCardComponent.cs |  20 +-
 .../Access/Systems/AgentIDCardSystem.cs       |   4 +-
 .../Medical/SuitSensors/SuitSensorSystem.cs   |   3 +-
 .../Access/Components/IdCardComponent.cs      |  16 +-
 .../Access/SharedAgentIDCardSystem.cs         |   8 +-
 .../Access/Systems/SharedIdCardSystem.cs      |   2 +-
 .../Damage/Components/DamageableComponent.cs  |   7 +-
 .../Components/MindShieldComponent.cs         |   2 +-
 .../NukeOps/NukeOperativeComponent.cs         |   2 +-
 .../Nutrition/EntitySystems/HungerSystem.cs   |  14 +-
 .../Nutrition/EntitySystems/ThirstSystem.cs   |  14 +-
 .../Overlays/ShowHealthBarsComponent.cs       |   3 +
 .../Components/HeadRevolutionaryComponent.cs  |   2 +-
 .../Components/RevolutionaryComponent.cs      |   2 +-
 Content.Shared/Roles/JobPrototype.cs          |   4 +-
 .../SSDIndicator/SSDIndicatorComponent.cs     |   4 +-
 .../Components/CriminalRecordComponent.cs     |   2 +-
 .../StatusIcon/StatusIconPrototype.cs         | 136 +++++++++++++-
 .../Zombies/InitialInfectedComponent.cs       |   2 +-
 Content.Shared/Zombies/ZombieComponent.cs     |   2 +-
 Resources/Locale/en-US/job/job-names.ftl      |  12 ++
 Resources/Prototypes/StatusEffects/health.yml |  10 +-
 Resources/Prototypes/StatusEffects/hunger.yml |  16 +-
 Resources/Prototypes/StatusEffects/job.yml    | 177 ++++++++++++------
 .../Prototypes/StatusEffects/satiation.yml    |  57 ++++++
 .../Prototypes/StatusEffects/security.yml     |  22 ++-
 Resources/Prototypes/StatusEffects/ssd.yml    |   2 +-
 Resources/Prototypes/StatusIcon/debug.yml     |   6 +-
 .../StatusIcon/{antag.yml => faction.yml}     |  20 +-
 38 files changed, 439 insertions(+), 187 deletions(-)
 create mode 100644 Resources/Prototypes/StatusEffects/satiation.yml
 rename Resources/Prototypes/StatusIcon/{antag.yml => faction.yml} (69%)

diff --git a/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs b/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs
index ee5ed26d2e3..c167ad660a9 100644
--- a/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs
+++ b/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs
@@ -37,7 +37,7 @@ private void OnJobChanged(string newJob)
             SendMessage(new AgentIDCardJobChangedMessage(newJob));
         }
 
-        public void OnJobIconChanged(string newJobIconId)
+        public void OnJobIconChanged(ProtoId<JobIconPrototype> newJobIconId)
         {
             SendMessage(new AgentIDCardJobIconChangedMessage(newJobIconId));
         }
@@ -54,7 +54,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
             _window.SetCurrentName(cast.CurrentName);
             _window.SetCurrentJob(cast.CurrentJob);
-            _window.SetAllowedIcons(cast.Icons, cast.CurrentJobIconId);
+            _window.SetAllowedIcons(cast.CurrentJobIconId);
         }
     }
 }
diff --git a/Content.Client/Access/UI/AgentIDCardWindow.xaml b/Content.Client/Access/UI/AgentIDCardWindow.xaml
index 89de793714d..7d091e4e165 100644
--- a/Content.Client/Access/UI/AgentIDCardWindow.xaml
+++ b/Content.Client/Access/UI/AgentIDCardWindow.xaml
@@ -6,12 +6,9 @@
         <LineEdit Name="NameLineEdit" />
         <Label Name="CurrentJob" Text="{Loc 'agent-id-card-current-job'}" />
         <LineEdit Name="JobLineEdit" />
-        <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc 'agent-id-card-job-icon-label'}"/>
-            <Control HorizontalExpand="True" MinSize="50 0"/>
-            <GridContainer Name="IconGrid" Columns="10">
-                <!-- Job icon buttons are generated in the code -->
-            </GridContainer>
-        </BoxContainer>
+        <Label Text="{Loc 'agent-id-card-job-icon-label'}"/>
+        <GridContainer Name="IconGrid" Columns="10">
+            <!-- Job icon buttons are generated in the code -->
+        </GridContainer>
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
index 91cb8b0ebdb..8ba556ce60c 100644
--- a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
+++ b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
@@ -8,6 +8,7 @@
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
 using System.Numerics;
+using System.Linq;
 
 namespace Content.Client.Access.UI
 {
@@ -23,7 +24,7 @@ public sealed partial class AgentIDCardWindow : DefaultWindow
         public event Action<string>? OnNameChanged;
         public event Action<string>? OnJobChanged;
 
-        public event Action<ProtoId<StatusIconPrototype>>? OnJobIconChanged;
+        public event Action<ProtoId<JobIconPrototype>>? OnJobIconChanged;
 
         public AgentIDCardWindow()
         {
@@ -38,18 +39,18 @@ public AgentIDCardWindow()
             JobLineEdit.OnFocusExit += e => OnJobChanged?.Invoke(e.Text);
         }
 
-        public void SetAllowedIcons(HashSet<string> icons, string currentJobIconId)
+        public void SetAllowedIcons(string currentJobIconId)
         {
             IconGrid.DisposeAllChildren();
 
-            var jobIconGroup = new ButtonGroup();
+            var jobIconButtonGroup = new ButtonGroup();
             var i = 0;
-            foreach (var jobIconId in icons)
+            var icons = _prototypeManager.EnumeratePrototypes<JobIconPrototype>().Where(icon => icon.AllowSelection).ToList();
+            icons.Sort((x, y) => string.Compare(x.LocalizedJobName, y.LocalizedJobName, StringComparison.CurrentCulture));
+            foreach (var jobIcon in icons)
             {
-                if (!_prototypeManager.TryIndex<StatusIconPrototype>(jobIconId, out var jobIcon))
-                {
+                if (!_prototypeManager.TryIndex<JobIconPrototype>(jobIconId, out var jobIcon))
                     continue;
-                }
 
                 String styleBase = StyleBase.ButtonOpenBoth;
                 var modulo = i % JobIconColumnCount;
@@ -64,8 +65,9 @@ public void SetAllowedIcons(HashSet<string> icons, string currentJobIconId)
                     Access = AccessLevel.Public,
                     StyleClasses = { styleBase },
                     MaxSize = new Vector2(42, 28),
-                    Group = jobIconGroup,
-                    Pressed = i == 0,
+                    Group = jobIconButtonGroup,
+                    Pressed = currentJobIconId == jobIcon.ID,
+                    ToolTip = jobIcon.LocalizedJobName
                 };
 
                 // Generate buttons textures
@@ -80,9 +82,6 @@ public void SetAllowedIcons(HashSet<string> icons, string currentJobIconId)
                 jobIconButton.OnPressed += _ => OnJobIconChanged?.Invoke(jobIcon.ID);
                 IconGrid.AddChild(jobIconButton);
 
-                if (jobIconId.Equals(currentJobIconId))
-                    jobIconButton.Pressed = true;
-
                 i++;
             }
         }
diff --git a/Content.Client/CrewManifest/UI/CrewManifestSection.cs b/Content.Client/CrewManifest/UI/CrewManifestSection.cs
index 4b1b02cb755..29cf850e2b9 100644
--- a/Content.Client/CrewManifest/UI/CrewManifestSection.cs
+++ b/Content.Client/CrewManifest/UI/CrewManifestSection.cs
@@ -51,7 +51,7 @@ public CrewManifestSection(
             title.SetMessage(entry.JobTitle);
 
 
-            if (prototypeManager.TryIndex<StatusIconPrototype>(entry.JobIcon, out var jobIcon))
+            if (prototypeManager.TryIndex<JobIconPrototype>(entry.JobIcon, out var jobIcon))
             {
                 var icon = new TextureRect()
                 {
diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
index e861864c144..0709921ae8b 100644
--- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
+++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
@@ -257,7 +257,7 @@ private void PopulateDepartmentList(IEnumerable<SuitSensorStatus> departmentSens
             mainContainer.AddChild(jobContainer);
 
             // Job icon
-            if (_prototypeManager.TryIndex<StatusIconPrototype>(sensor.JobIcon, out var proto))
+            if (_prototypeManager.TryIndex<JobIconPrototype>(sensor.JobIcon, out var proto))
             {
                 var jobIcon = new TextureRect()
                 {
diff --git a/Content.Client/Overlays/EntityHealthBarOverlay.cs b/Content.Client/Overlays/EntityHealthBarOverlay.cs
index c96225c0c65..9182e51ed1f 100644
--- a/Content.Client/Overlays/EntityHealthBarOverlay.cs
+++ b/Content.Client/Overlays/EntityHealthBarOverlay.cs
@@ -26,6 +26,7 @@ public sealed class EntityHealthBarOverlay : Overlay
     private readonly ProgressColorSystem _progressColor;
     public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowFOV;
     public HashSet<string> DamageContainers = new();
+    public ProtoId<HealthIconPrototype>? StatusIcon;
 
     public EntityHealthBarOverlay(IEntityManager entManager)
     {
diff --git a/Content.Client/Overlays/ShowHealthIconsSystem.cs b/Content.Client/Overlays/ShowHealthIconsSystem.cs
index a546cf4d828..f76504d2b2c 100644
--- a/Content.Client/Overlays/ShowHealthIconsSystem.cs
+++ b/Content.Client/Overlays/ShowHealthIconsSystem.cs
@@ -54,17 +54,17 @@ private void OnGetStatusIconsEvent(Entity<DamageableComponent> entity, ref GetSt
         args.StatusIcons.AddRange(healthIcons);
     }
 
-    private IReadOnlyList<StatusIconPrototype> DecideHealthIcons(Entity<DamageableComponent> entity)
+    private IReadOnlyList<HealthIconPrototype> DecideHealthIcons(Entity<DamageableComponent> entity)
     {
         var damageableComponent = entity.Comp;
 
         if (damageableComponent.DamageContainerID == null ||
             !DamageContainers.Contains(damageableComponent.DamageContainerID))
         {
-            return Array.Empty<StatusIconPrototype>();
+            return Array.Empty<HealthIconPrototype>();
         }
 
-        var result = new List<StatusIconPrototype>();
+        var result = new List<HealthIconPrototype>();
 
         // Here you could check health status, diseases, mind status, etc. and pick a good icon, or multiple depending on whatever.
         if (damageableComponent?.DamageContainerID == "Biological")
diff --git a/Content.Client/Overlays/ShowJobIconsSystem.cs b/Content.Client/Overlays/ShowJobIconsSystem.cs
index e24b99f3e87..a2c86413c56 100644
--- a/Content.Client/Overlays/ShowJobIconsSystem.cs
+++ b/Content.Client/Overlays/ShowJobIconsSystem.cs
@@ -13,7 +13,7 @@ public sealed class ShowJobIconsSystem : EquipmentHudSystem<ShowJobIconsComponen
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly AccessReaderSystem _accessReader = default!;
 
-    [ValidatePrototypeId<StatusIconPrototype>]
+    [ValidatePrototypeId<JobIconPrototype>]
     private const string JobIconForNoId = "JobIconNoId";
 
     public override void Initialize()
@@ -52,7 +52,7 @@ private void OnGetStatusIconsEvent(EntityUid uid, StatusIconComponent _, ref Get
             }
         }
 
-        if (_prototype.TryIndex<StatusIconPrototype>(iconId, out var iconPrototype))
+        if (_prototype.TryIndex<JobIconPrototype>(iconId, out var iconPrototype))
             ev.StatusIcons.Add(iconPrototype);
         else
             Log.Error($"Invalid job icon prototype: {iconPrototype}");
diff --git a/Content.Client/Overlays/ShowSyndicateIconsSystem.cs b/Content.Client/Overlays/ShowSyndicateIconsSystem.cs
index 660ef198e14..9ae80045f5e 100644
--- a/Content.Client/Overlays/ShowSyndicateIconsSystem.cs
+++ b/Content.Client/Overlays/ShowSyndicateIconsSystem.cs
@@ -22,7 +22,7 @@ private void OnGetStatusIconsEvent(EntityUid uid, NukeOperativeComponent compone
         if (!IsActive || ev.InContainer)
             return;
 
-        if (_prototype.TryIndex<StatusIconPrototype>(component.SyndStatusIcon, out var iconPrototype))
+        if (_prototype.TryIndex<FactionIconPrototype>(component.SyndStatusIcon, out var iconPrototype))
             ev.StatusIcons.Add(iconPrototype);
     }
 }
diff --git a/Content.Server/Access/Components/AgentIDCardComponent.cs b/Content.Server/Access/Components/AgentIDCardComponent.cs
index 4b92b43ea99..ab1a045ea9d 100644
--- a/Content.Server/Access/Components/AgentIDCardComponent.cs
+++ b/Content.Server/Access/Components/AgentIDCardComponent.cs
@@ -1,15 +1,7 @@
-using Content.Shared.StatusIcon;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
+namespace Content.Server.Access.Components;
 
-namespace Content.Server.Access.Components
-{
-    [RegisterComponent]
-    public sealed partial class AgentIDCardComponent : Component
-    {
-        /// <summary>
-        /// Set of job icons that the agent ID card can show.
-        /// </summary>
-        [DataField("icons", customTypeSerializer: typeof(PrototypeIdHashSetSerializer<StatusIconPrototype>))]
-        public HashSet<string> Icons = new();
-    }
-}
+/// <summary>
+///     Allows an ID card to copy accesses from other IDs and to change the name, job title and job icon via an interface.
+/// </summary>
+[RegisterComponent]
+public sealed partial class AgentIDCardComponent : Component { }
diff --git a/Content.Server/Access/Systems/AgentIDCardSystem.cs b/Content.Server/Access/Systems/AgentIDCardSystem.cs
index d5e9dc357dd..0584c022494 100644
--- a/Content.Server/Access/Systems/AgentIDCardSystem.cs
+++ b/Content.Server/Access/Systems/AgentIDCardSystem.cs
@@ -67,7 +67,7 @@ private void AfterUIOpen(EntityUid uid, AgentIDCardComponent component, AfterAct
             if (!TryComp<IdCardComponent>(uid, out var idCard))
                 return;
 
-            var state = new AgentIDCardBoundUserInterfaceState(idCard.FullName ?? "", idCard.JobTitle ?? "", idCard.JobIcon ?? "", component.Icons);
+            var state = new AgentIDCardBoundUserInterfaceState(idCard.FullName ?? "", idCard.JobTitle ?? "", idCard.JobIcon);
             _uiSystem.SetUiState(uid, AgentIDCardUiKey.Key, state);
         }
 
@@ -105,7 +105,7 @@ private void OnJobIconChanged(EntityUid uid, AgentIDCardComponent comp, AgentIDC
                 _cardSystem.TryChangeJobDepartment(uid, job, idCard);
         }
 
-        private bool TryFindJobProtoFromIcon(StatusIconPrototype jobIcon, [NotNullWhen(true)] out JobPrototype? job)
+        private bool TryFindJobProtoFromIcon(JobIconPrototype jobIcon, [NotNullWhen(true)] out JobPrototype? job)
         {
             foreach (var jobPrototype in _prototypeManager.EnumeratePrototypes<JobPrototype>())
             {
diff --git a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
index bd904a03b0d..2bb6b490d22 100644
--- a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
+++ b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
@@ -328,8 +328,7 @@ public void SetSensor(EntityUid uid, SuitSensorMode mode, EntityUid? userUid = n
                 userName = card.Comp.FullName;
             if (card.Comp.JobTitle != null)
                 userJob = card.Comp.JobTitle;
-            if (card.Comp.JobIcon != null)
-                userJobIcon = card.Comp.JobIcon;
+            userJobIcon = card.Comp.JobIcon;
 
             foreach (var department in card.Comp.JobDepartments)
                 userJobDepartments.Add(Loc.GetString(department));
diff --git a/Content.Shared/Access/Components/IdCardComponent.cs b/Content.Shared/Access/Components/IdCardComponent.cs
index 39d5d9d27f3..884658c7c41 100644
--- a/Content.Shared/Access/Components/IdCardComponent.cs
+++ b/Content.Shared/Access/Components/IdCardComponent.cs
@@ -2,7 +2,7 @@
 using Content.Shared.PDA;
 using Content.Shared.StatusIcon;
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Access.Components;
 
@@ -11,34 +11,34 @@ namespace Content.Shared.Access.Components;
 [Access(typeof(SharedIdCardSystem), typeof(SharedPdaSystem), typeof(SharedAgentIdCardSystem), Other = AccessPermissions.ReadWrite)]
 public sealed partial class IdCardComponent : Component
 {
-    [DataField("fullName"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     [AutoNetworkedField]
     // FIXME Friends
     public string? FullName;
 
-    [DataField("jobTitle")]
+    [DataField]
     [AutoNetworkedField]
-    [Access(typeof(SharedIdCardSystem), typeof(SharedPdaSystem), typeof(SharedAgentIdCardSystem), Other = AccessPermissions.ReadWrite), ViewVariables(VVAccess.ReadWrite)]
+    [Access(typeof(SharedIdCardSystem), typeof(SharedPdaSystem), typeof(SharedAgentIdCardSystem), Other = AccessPermissions.ReadWrite)]
     public string? JobTitle;
 
     /// <summary>
     /// The state of the job icon rsi.
     /// </summary>
-    [DataField("jobIcon", customTypeSerializer: typeof(PrototypeIdSerializer<StatusIconPrototype>))]
+    [DataField]
     [AutoNetworkedField]
-    public string JobIcon = "JobIconUnknown";
+    public ProtoId<JobIconPrototype> JobIcon = "JobIconUnknown";
 
     /// <summary>
     /// The unlocalized names of the departments associated with the job
     /// </summary>
-    [DataField("jobDepartments")]
+    [DataField]
     [AutoNetworkedField]
     public List<LocId> JobDepartments = new();
 
     /// <summary>
     /// Determines if accesses from this card should be logged by <see cref="AccessReaderComponent"/>
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public bool BypassLogging;
 
     [DataField]
diff --git a/Content.Shared/Access/SharedAgentIDCardSystem.cs b/Content.Shared/Access/SharedAgentIDCardSystem.cs
index d027a3937f5..8c78edf74d4 100644
--- a/Content.Shared/Access/SharedAgentIDCardSystem.cs
+++ b/Content.Shared/Access/SharedAgentIDCardSystem.cs
@@ -23,14 +23,12 @@ public enum AgentIDCardUiKey : byte
     [Serializable, NetSerializable]
     public sealed class AgentIDCardBoundUserInterfaceState : BoundUserInterfaceState
     {
-        public readonly HashSet<string> Icons;
         public string CurrentName { get; }
         public string CurrentJob { get; }
         public string CurrentJobIconId { get; }
 
-        public AgentIDCardBoundUserInterfaceState(string currentName, string currentJob, string currentJobIconId, HashSet<string> icons)
+        public AgentIDCardBoundUserInterfaceState(string currentName, string currentJob, string currentJobIconId)
         {
-            Icons = icons;
             CurrentName = currentName;
             CurrentJob = currentJob;
             CurrentJobIconId = currentJobIconId;
@@ -62,9 +60,9 @@ public AgentIDCardJobChangedMessage(string job)
     [Serializable, NetSerializable]
     public sealed class AgentIDCardJobIconChangedMessage : BoundUserInterfaceMessage
     {
-        public string JobIconId { get; }
+        public ProtoId<JobIconPrototype> JobIconId { get; }
 
-        public AgentIDCardJobIconChangedMessage(string jobIconId)
+        public AgentIDCardJobIconChangedMessage(ProtoId<JobIconPrototype> jobIconId)
         {
             JobIconId = jobIconId;
         }
diff --git a/Content.Shared/Access/Systems/SharedIdCardSystem.cs b/Content.Shared/Access/Systems/SharedIdCardSystem.cs
index bfde70f5041..762c146f36f 100644
--- a/Content.Shared/Access/Systems/SharedIdCardSystem.cs
+++ b/Content.Shared/Access/Systems/SharedIdCardSystem.cs
@@ -114,7 +114,7 @@ public bool TryChangeJobTitle(EntityUid uid, string? jobTitle, IdCardComponent?
         return true;
     }
 
-    public bool TryChangeJobIcon(EntityUid uid, StatusIconPrototype jobIcon, IdCardComponent? id = null, EntityUid? player = null)
+    public bool TryChangeJobIcon(EntityUid uid, JobIconPrototype jobIcon, IdCardComponent? id = null, EntityUid? player = null)
     {
         if (!Resolve(uid, ref id))
         {
diff --git a/Content.Shared/Damage/Components/DamageableComponent.cs b/Content.Shared/Damage/Components/DamageableComponent.cs
index 3c3a27c5fac..ed01bd26473 100644
--- a/Content.Shared/Damage/Components/DamageableComponent.cs
+++ b/Content.Shared/Damage/Components/DamageableComponent.cs
@@ -74,7 +74,7 @@ public sealed partial class DamageableComponent : Component
         public List<string> RadiationDamageTypeIDs = new() { "Radiation" };
 
         [DataField]
-        public Dictionary<MobState, ProtoId<StatusIconPrototype>> HealthIcons = new()
+        public Dictionary<MobState, ProtoId<HealthIconPrototype>> HealthIcons = new()
         {
             { MobState.Alive, "HealthIconFine" },
             { MobState.Critical, "HealthIconCritical" },
@@ -82,7 +82,10 @@ public sealed partial class DamageableComponent : Component
         };
 
         [DataField]
-        public ProtoId<StatusIconPrototype> RottingIcon = "HealthIconRotting";
+        public ProtoId<HealthIconPrototype> RottingIcon = "HealthIconRotting";
+
+        [DataField]
+        public FixedPoint2? HealthBarThreshold;
     }
 
     [Serializable, NetSerializable]
diff --git a/Content.Shared/Mindshield/Components/MindShieldComponent.cs b/Content.Shared/Mindshield/Components/MindShieldComponent.cs
index 235862ed02d..77f5497973f 100644
--- a/Content.Shared/Mindshield/Components/MindShieldComponent.cs
+++ b/Content.Shared/Mindshield/Components/MindShieldComponent.cs
@@ -12,5 +12,5 @@ namespace Content.Shared.Mindshield.Components;
 public sealed partial class MindShieldComponent : Component
 {
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public ProtoId<StatusIconPrototype> MindShieldStatusIcon = "MindShieldIcon";
+    public ProtoId<SecurityIconPrototype> MindShieldStatusIcon = "MindShieldIcon";
 }
diff --git a/Content.Shared/NukeOps/NukeOperativeComponent.cs b/Content.Shared/NukeOps/NukeOperativeComponent.cs
index d19f0ae3e9d..80416b8f710 100644
--- a/Content.Shared/NukeOps/NukeOperativeComponent.cs
+++ b/Content.Shared/NukeOps/NukeOperativeComponent.cs
@@ -17,6 +17,6 @@ public sealed partial class NukeOperativeComponent : Component
     /// <summary>
     ///
     /// </summary>
-    [DataField("syndStatusIcon", customTypeSerializer: typeof(PrototypeIdSerializer<StatusIconPrototype>))]
+    [DataField("syndStatusIcon", customTypeSerializer: typeof(PrototypeIdSerializer<FactionIconPrototype>))]
     public string SyndStatusIcon = "SyndicateFaction";
 }
diff --git a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
index 6535390d646..a435f32fca6 100644
--- a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
@@ -30,18 +30,18 @@ public sealed class HungerSystem : EntitySystem
     [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly IConfigurationManager _config = default!;
 
-    [ValidatePrototypeId<StatusIconPrototype>]
+    [ValidatePrototypeId<SatiationIconPrototype>]
     private const string HungerIconOverfedId = "HungerIconOverfed";
 
-    [ValidatePrototypeId<StatusIconPrototype>]
+    [ValidatePrototypeId<SatiationIconPrototype>]
     private const string HungerIconPeckishId = "HungerIconPeckish";
 
-    [ValidatePrototypeId<StatusIconPrototype>]
+    [ValidatePrototypeId<SatiationIconPrototype>]
     private const string HungerIconStarvingId = "HungerIconStarving";
 
-    private StatusIconPrototype? _hungerIconOverfed;
-    private StatusIconPrototype? _hungerIconPeckish;
-    private StatusIconPrototype? _hungerIconStarving;
+    private SatiationIconPrototype? _hungerIconOverfed;
+    private SatiationIconPrototype? _hungerIconPeckish;
+    private SatiationIconPrototype? _hungerIconStarving;
 
     public override void Initialize()
     {
@@ -227,7 +227,7 @@ private bool GetMovementThreshold(HungerThreshold threshold)
         }
     }
 
-    public bool TryGetStatusIconPrototype(HungerComponent component, [NotNullWhen(true)] out StatusIconPrototype? prototype)
+    public bool TryGetStatusIconPrototype(HungerComponent component, [NotNullWhen(true)] out SatiationIconPrototype? prototype)
     {
         switch (component.CurrentThreshold)
         {
diff --git a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
index 4ff49e795c2..152d3ca3492 100644
--- a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
@@ -26,18 +26,18 @@ public sealed class ThirstSystem : EntitySystem
     [Dependency] private readonly SharedJetpackSystem _jetpack = default!;
     [Dependency] private readonly IConfigurationManager _config = default!;
 
-    [ValidatePrototypeId<StatusIconPrototype>]
+    [ValidatePrototypeId<SatiationIconPrototype>]
     private const string ThirstIconOverhydratedId = "ThirstIconOverhydrated";
 
-    [ValidatePrototypeId<StatusIconPrototype>]
+    [ValidatePrototypeId<SatiationIconPrototype>]
     private const string ThirstIconThirstyId = "ThirstIconThirsty";
 
-    [ValidatePrototypeId<StatusIconPrototype>]
+    [ValidatePrototypeId<SatiationIconPrototype>]
     private const string ThirstIconParchedId = "ThirstIconParched";
 
-    private StatusIconPrototype? _thirstIconOverhydrated = null;
-    private StatusIconPrototype? _thirstIconThirsty = null;
-    private StatusIconPrototype? _thirstIconParched = null;
+    private SatiationIconPrototype? _thirstIconOverhydrated = null;
+    private SatiationIconPrototype? _thirstIconThirsty = null;
+    private SatiationIconPrototype? _thirstIconParched = null;
 
     public override void Initialize()
     {
@@ -133,7 +133,7 @@ private bool IsMovementThreshold(ThirstThreshold threshold)
         }
     }
 
-    public bool TryGetStatusIconPrototype(ThirstComponent component, out StatusIconPrototype? prototype)
+    public bool TryGetStatusIconPrototype(ThirstComponent component, out SatiationIconPrototype? prototype)
     {
         switch (component.CurrentThirstThreshold)
         {
diff --git a/Content.Shared/Overlays/ShowHealthBarsComponent.cs b/Content.Shared/Overlays/ShowHealthBarsComponent.cs
index ed9ce4b7653..dfca6ba45f8 100644
--- a/Content.Shared/Overlays/ShowHealthBarsComponent.cs
+++ b/Content.Shared/Overlays/ShowHealthBarsComponent.cs
@@ -15,4 +15,7 @@ public sealed partial class ShowHealthBarsComponent : Component
     /// </summary>
     [DataField("damageContainers", customTypeSerializer: typeof(PrototypeIdListSerializer<DamageContainerPrototype>)), AutoNetworkedField]
     public List<string> DamageContainers = new();
+
+    [DataField]
+    public ProtoId<HealthIconPrototype>? HealthStatusIcon = "HealthIconFine";
 }
diff --git a/Content.Shared/Revolutionary/Components/HeadRevolutionaryComponent.cs b/Content.Shared/Revolutionary/Components/HeadRevolutionaryComponent.cs
index d2c8374fefe..060c4d022f0 100644
--- a/Content.Shared/Revolutionary/Components/HeadRevolutionaryComponent.cs
+++ b/Content.Shared/Revolutionary/Components/HeadRevolutionaryComponent.cs
@@ -15,7 +15,7 @@ public sealed partial class HeadRevolutionaryComponent : Component, IAntagStatus
     /// The status icon corresponding to the head revolutionary.
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public ProtoId<StatusIconPrototype> StatusIcon { get; set; } = "HeadRevolutionaryFaction";
+    public ProtoId<FactionIconPrototype> StatusIcon { get; set; } = "HeadRevolutionaryFaction";
 
     /// <summary>
     /// How long the stun will last after the user is converted.
diff --git a/Content.Shared/Revolutionary/Components/RevolutionaryComponent.cs b/Content.Shared/Revolutionary/Components/RevolutionaryComponent.cs
index 73f533cf690..322645bc0fa 100644
--- a/Content.Shared/Revolutionary/Components/RevolutionaryComponent.cs
+++ b/Content.Shared/Revolutionary/Components/RevolutionaryComponent.cs
@@ -16,7 +16,7 @@ public sealed partial class RevolutionaryComponent : Component, IAntagStatusIcon
     /// The status icon prototype displayed for revolutionaries
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public ProtoId<StatusIconPrototype> StatusIcon { get; set; } = "RevolutionaryFaction";
+    public ProtoId<FactionIconPrototype> StatusIcon { get; set; } = "RevolutionaryFaction";
 
     /// <summary>
     /// Sound that plays when you are chosen as Rev. (Placeholder until I find something cool I guess)
diff --git a/Content.Shared/Roles/JobPrototype.cs b/Content.Shared/Roles/JobPrototype.cs
index 5cf8cf38fb3..2313cc4bd08 100644
--- a/Content.Shared/Roles/JobPrototype.cs
+++ b/Content.Shared/Roles/JobPrototype.cs
@@ -106,8 +106,8 @@ public sealed partial class JobPrototype : IPrototype
         [DataField("jobEntity", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
         public string? JobEntity = null;
 
-        [DataField("icon", customTypeSerializer: typeof(PrototypeIdSerializer<StatusIconPrototype>))]
-        public string Icon { get; private set; } = "JobIconUnknown";
+        [DataField]
+        public ProtoId<JobIconPrototype> Icon { get; private set; } = "JobIconUnknown";
 
         [DataField("special", serverOnly: true)]
         public JobSpecial[] Special { get; private set; } = Array.Empty<JobSpecial>();
diff --git a/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs b/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs
index 66310505a1a..711abdb3bfe 100644
--- a/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs
+++ b/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs
@@ -16,6 +16,6 @@ public sealed partial class SSDIndicatorComponent : Component
     public bool IsSSD = true;
 
     [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("icon", customTypeSerializer: typeof(PrototypeIdSerializer<StatusIconPrototype>))]
-    public string Icon = "SSDIcon";
+    [DataField]
+    public ProtoId<SsdIconPrototype> Icon = "SSDIcon";
 }
diff --git a/Content.Shared/Security/Components/CriminalRecordComponent.cs b/Content.Shared/Security/Components/CriminalRecordComponent.cs
index 25fab3f1350..aa6bd6ad5bd 100644
--- a/Content.Shared/Security/Components/CriminalRecordComponent.cs
+++ b/Content.Shared/Security/Components/CriminalRecordComponent.cs
@@ -11,5 +11,5 @@ public sealed partial class CriminalRecordComponent : Component
     ///     The icon that should be displayed based on the criminal status of the entity.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public ProtoId<StatusIconPrototype> StatusIcon = "SecurityIconWanted";
+    public ProtoId<SecurityIconPrototype> StatusIcon = "SecurityIconWanted";
 }
diff --git a/Content.Shared/StatusIcon/StatusIconPrototype.cs b/Content.Shared/StatusIcon/StatusIconPrototype.cs
index c5a5fd8a2c5..4ba543a2f58 100644
--- a/Content.Shared/StatusIcon/StatusIconPrototype.cs
+++ b/Content.Shared/StatusIcon/StatusIconPrototype.cs
@@ -45,17 +45,32 @@ public int CompareTo(StatusIconData? other)
     /// Sets if the icon should be rendered with or without the effect of lighting.
     /// </summary>
     [DataField]
-    public bool IsShaded;
+    public bool IsShaded = false;
+
+    public int CompareTo(StatusIconData? other)
+    {
+        return Priority.CompareTo(other?.Priority ?? int.MaxValue);
+    }
 }
 
 /// <summary>
 /// <see cref="StatusIconData"/> but in new convenient prototype form!
 /// </summary>
-[Prototype("statusIcon")]
-public sealed partial class StatusIconPrototype : StatusIconData, IPrototype, IInheritingPrototype
+public abstract partial class StatusIconPrototype : StatusIconData, IPrototype
+{
+    /// <inheritdoc/>
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+}
+
+/// <summary>
+/// StatusIcons for showing jobs on the sec HUD
+/// </summary>
+[Prototype]
+public sealed partial class JobIconPrototype : StatusIconPrototype, IInheritingPrototype
 {
     /// <inheritdoc />
-    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<StatusIconPrototype>))]
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<JobIconPrototype>))]
     public string[]? Parents { get; }
 
     /// <inheritdoc />
@@ -63,9 +78,116 @@ public sealed partial class StatusIconPrototype : StatusIconData, IPrototype, II
     [AbstractDataField]
     public bool Abstract { get; }
 
-    /// <inheritdoc/>
-    [IdDataField]
-    public string ID { get; private set; } = default!;
+    /// <summary>
+    /// Name of the icon used for menu tooltips.
+    /// </summary>
+    [DataField]
+    public string JobName { get; private set; } = string.Empty;
+
+    [ViewVariables(VVAccess.ReadOnly)]
+    public string LocalizedJobName => Loc.GetString(JobName);
+
+    /// <summary>
+    /// Should the agent ID or ID card console be able to use this job icon?
+    /// </summary>
+    [DataField]
+    public bool AllowSelection = true;
+}
+
+/// <summary>
+/// StatusIcons for the med HUD
+/// </summary>
+[Prototype]
+public sealed partial class HealthIconPrototype : StatusIconPrototype, IInheritingPrototype
+{
+    /// <inheritdoc />
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<HealthIconPrototype>))]
+    public string[]? Parents { get; }
+
+    /// <inheritdoc />
+    [NeverPushInheritance]
+    [AbstractDataField]
+    public bool Abstract { get; }
+}
+
+/// <summary>
+/// StatusIcons for the beer goggles and fried onion goggles
+/// </summary>
+[Prototype]
+public sealed partial class SatiationIconPrototype : StatusIconPrototype, IInheritingPrototype
+{
+    /// <inheritdoc />
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<SatiationIconPrototype>))]
+    public string[]? Parents { get; }
+
+    /// <inheritdoc />
+    [NeverPushInheritance]
+    [AbstractDataField]
+    public bool Abstract { get; }
+}
+
+/// <summary>
+/// StatusIcons for showing the wanted status on the sec HUD
+/// </summary>
+[Prototype]
+public sealed partial class SecurityIconPrototype : StatusIconPrototype, IInheritingPrototype
+{
+    /// <inheritdoc />
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<SecurityIconPrototype>))]
+    public string[]? Parents { get; }
+
+    /// <inheritdoc />
+    [NeverPushInheritance]
+    [AbstractDataField]
+    public bool Abstract { get; }
+}
+
+/// <summary>
+/// StatusIcons for faction membership
+/// </summary>
+[Prototype]
+public sealed partial class FactionIconPrototype : StatusIconPrototype, IInheritingPrototype
+{
+    /// <inheritdoc />
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<FactionIconPrototype>))]
+    public string[]? Parents { get; }
+
+    /// <inheritdoc />
+    [NeverPushInheritance]
+    [AbstractDataField]
+    public bool Abstract { get; }
+}
+
+/// <summary>
+/// StatusIcons for debugging purposes
+/// </summary>
+[Prototype]
+public sealed partial class DebugIconPrototype : StatusIconPrototype, IInheritingPrototype
+{
+    /// <inheritdoc />
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<DebugIconPrototype>))]
+    public string[]? Parents { get; }
+
+    /// <inheritdoc />
+    [NeverPushInheritance]
+    [AbstractDataField]
+    public bool Abstract { get; }
+}
+
+/// <summary>
+/// StatusIcons for the SSD indicator
+/// </summary>
+[Prototype]
+public sealed partial class SsdIconPrototype : StatusIconPrototype, IInheritingPrototype
+{
+    /// <inheritdoc />
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<SsdIconPrototype>))]
+    public string[]? Parents { get; }
+
+    /// <inheritdoc />
+    [NeverPushInheritance]
+    [AbstractDataField]
+    public bool Abstract { get; }
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/Zombies/InitialInfectedComponent.cs b/Content.Shared/Zombies/InitialInfectedComponent.cs
index 3200dd7f5ee..987f9a09577 100644
--- a/Content.Shared/Zombies/InitialInfectedComponent.cs
+++ b/Content.Shared/Zombies/InitialInfectedComponent.cs
@@ -12,5 +12,5 @@ public sealed partial class InitialInfectedComponent : Component, IAntagStatusIc
     public ProtoId<StatusIconPrototype> StatusIcon { get; set; } = "InitialInfectedFaction";
 
     [DataField]
-    public bool IconVisibleToGhost { get; set; } = true;
+    public ProtoId<FactionIconPrototype> StatusIcon = "InitialInfectedFaction";
 }
diff --git a/Content.Shared/Zombies/ZombieComponent.cs b/Content.Shared/Zombies/ZombieComponent.cs
index 3673a2c51d5..0020ff17da8 100644
--- a/Content.Shared/Zombies/ZombieComponent.cs
+++ b/Content.Shared/Zombies/ZombieComponent.cs
@@ -95,7 +95,7 @@ public sealed partial class ZombieComponent : Component, IAntagStatusIconCompone
     public TimeSpan NextTick;
 
     [DataField("zombieStatusIcon")]
-    public ProtoId<StatusIconPrototype> StatusIcon { get; set; } = "ZombieFaction";
+    public ProtoId<FactionIconPrototype> StatusIcon { get; set; } = "ZombieFaction";
 
     [DataField]
     public bool IconVisibleToGhost { get; set; } = true;
diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl
index 2e66ec56c5a..d65eb5c3d90 100644
--- a/Resources/Locale/en-US/job/job-names.ftl
+++ b/Resources/Locale/en-US/job/job-names.ftl
@@ -52,6 +52,18 @@ job-name-boxer = Boxer
 job-name-zookeeper = Zookeeper
 job-name-visitor = Visitor
 
+# unused jobs
+# these are required for the agent ID job icon tooltips
+# I am keeping them for roleplaying opportunities
+job-name-geneticist = Geneticist
+job-name-no-id = No ID
+job-name-prisoner = Prisoner
+job-name-roboticist = Roboticist
+job-name-syndicate = Syndicate
+job-name-unknown = Unknown
+job-name-virologist = Virologist
+job-name-zombie = Zombie
+
 # Role timers - Make these alphabetical or I cut you
 JobAtmosphericTechnician = Atmospheric Technician
 JobBartender = Bartender
diff --git a/Resources/Prototypes/StatusEffects/health.yml b/Resources/Prototypes/StatusEffects/health.yml
index 073b03a2aeb..de1b6684809 100644
--- a/Resources/Prototypes/StatusEffects/health.yml
+++ b/Resources/Prototypes/StatusEffects/health.yml
@@ -1,32 +1,32 @@
-- type: statusIcon
+- type: healthIcon
   id: HealthIcon
   abstract: true
   priority: 3
   locationPreference: Left
   isShaded: true
 
-- type: statusIcon
+- type: healthIcon
   parent: HealthIcon
   id: HealthIconFine
   icon:
     sprite: /Textures/Interface/Misc/health_icons.rsi
     state: Fine
 
-- type: statusIcon
+- type: healthIcon
   id: HealthIconCritical
   parent: HealthIcon
   icon:
     sprite: /Textures/Interface/Misc/health_icons.rsi
     state: Critical
 
-- type: statusIcon
+- type: healthIcon
   id: HealthIconDead
   parent: HealthIcon
   icon:
     sprite: /Textures/Interface/Misc/health_icons.rsi
     state: Dead
 
-- type: statusIcon
+- type: healthIcon
   id: HealthIconRotting
   parent: HealthIcon
   icon:
diff --git a/Resources/Prototypes/StatusEffects/hunger.yml b/Resources/Prototypes/StatusEffects/hunger.yml
index 9af246e06ee..749d1f88f18 100644
--- a/Resources/Prototypes/StatusEffects/hunger.yml
+++ b/Resources/Prototypes/StatusEffects/hunger.yml
@@ -1,26 +1,26 @@
 #Hunger
-- type: statusIcon
+- type: satiationIcon
   id: HungerIcon
   abstract: true
   priority: 5
   locationPreference: Right
   isShaded: true
 
-- type: statusIcon
+- type: satiationIcon
   id: HungerIconOverfed
   parent: HungerIcon
   icon:
     sprite: /Textures/Interface/Misc/food_icons.rsi
     state: overfed
 
-- type: statusIcon
+- type: satiationIcon
   id: HungerIconPeckish
   parent: HungerIcon
   icon:
     sprite: /Textures/Interface/Misc/food_icons.rsi
     state: peckish
 
-- type: statusIcon
+- type: satiationIcon
   id: HungerIconStarving
   parent: HungerIcon
   icon:
@@ -28,28 +28,28 @@
     state: starving
 
 #Thirst
-- type: statusIcon
+- type: satiationIcon
   id: ThirstIcon
   abstract: true
   priority: 5
   locationPreference: Left
   isShaded: true
 
-- type: statusIcon
+- type: satiationIcon
   id: ThirstIconOverhydrated
   parent: ThirstIcon
   icon:
     sprite: /Textures/Interface/Misc/food_icons.rsi
     state: overhydrated
 
-- type: statusIcon
+- type: satiationIcon
   id: ThirstIconThirsty
   parent: ThirstIcon
   icon:
     sprite: /Textures/Interface/Misc/food_icons.rsi
     state: thirsty
 
-- type: statusIcon
+- type: satiationIcon
   id: ThirstIconParched
   parent: ThirstIcon
   icon:
diff --git a/Resources/Prototypes/StatusEffects/job.yml b/Resources/Prototypes/StatusEffects/job.yml
index 96ad930bd51..bb2ae3b64d0 100644
--- a/Resources/Prototypes/StatusEffects/job.yml
+++ b/Resources/Prototypes/StatusEffects/job.yml
@@ -1,377 +1,446 @@
-- type: statusIcon
+- type: jobIcon
   id: JobIcon
   abstract: true
   priority: 1
   locationPreference: Right
   isShaded: true
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconDetective
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Detective
+  jobName: job-name-detective
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconQuarterMaster
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: QuarterMaster
+  jobName: job-name-qm
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconBorg
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Borg
+  jobName: job-name-borg
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconBotanist
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Botanist
+  jobName: job-name-botanist
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconBoxer
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Boxer
+  jobName: job-name-boxer
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconAtmosphericTechnician
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: AtmosphericTechnician
+  jobName: job-name-atmostech
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconNanotrasen
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Nanotrasen
+  jobName: job-name-centcomoff
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconPrisoner
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Prisoner
+  jobName: job-name-prisoner
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconJanitor
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Janitor
+  jobName: job-name-janitor
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconChemist
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Chemist
+  jobName: job-name-chemist
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconStationEngineer
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: StationEngineer
+  jobName: job-name-engineer
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconSecurityOfficer
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: SecurityOfficer
+  jobName: job-name-security
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconNoId
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: NoId
+  jobName: job-name-no-id
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconChiefMedicalOfficer
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: ChiefMedicalOfficer
+  jobName: job-name-cmo
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconRoboticist
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Roboticist
+  jobName: job-name-roboticist
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconChaplain
   icon:
     sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi # DeltaV - Move Chaplain into Epistemics
     state: Chaplain # DeltaV - Move Chaplain into Epistemics
+  jobName: job-name-chaplain
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconLawyer
   icon:
     sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi # DeltaV - Move Lawyer into Justice
     state: Lawyer # DeltaV - Move Lawyer into Justice
+  jobName: job-name-lawyer
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconUnknown
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Unknown
+  jobName: job-name-unknown
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconLibrarian
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Librarian
+  jobName: job-name-librarian
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconCargoTechnician
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: CargoTechnician
+  jobName: job-name-cargotech
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconScientist
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Scientist
+  jobName: job-name-scientist
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconResearchAssistant
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: ResearchAssistant
+  jobName: job-name-research-assistant
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconGeneticist
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Geneticist
+  jobName: job-name-geneticist
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconClown
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Clown
+  jobName: job-name-clown
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconCaptain
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Captain
+  jobName: job-name-captain
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconHeadOfPersonnel
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: HeadOfPersonnel
+  jobName: job-name-hop
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconVirologist
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Virologist
+  jobName: job-name-virologist
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconShaftMiner
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: ShaftMiner
+  jobName: job-name-salvagespec
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconPassenger
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Passenger
+  jobName: job-name-passenger
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconChiefEngineer
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: ChiefEngineer
+  jobName: job-name-ce
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconBartender
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Bartender
+  jobName: job-name-bartender
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconHeadOfSecurity
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: HeadOfSecurity
+  jobName: job-name-hos
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconBrigmedic
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Brigmedic
+  jobName: job-name-brigmedic
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconMedicalDoctor
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: MedicalDoctor
+  jobName: job-name-doctor
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconParamedic
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Paramedic
+  jobName: job-name-paramedic
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconChef
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Chef
+  jobName: job-name-chef
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconWarden
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Warden
+  jobName: job-name-warden
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconResearchDirector
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: ResearchDirector
+  jobName: job-name-rd
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconMime
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Mime
+  jobName: job-name-mime
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconMusician
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Musician
+  jobName: job-name-musician
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconReporter
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Reporter
+  jobName: job-name-reporter
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconPsychologist
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Psychologist
+  jobName: job-name-psychologist
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconMedicalIntern
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: MedicalIntern
+  jobName: job-name-intern
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconTechnicalAssistant
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: TechnicalAssistant
+  jobName: job-name-technical-assistant
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconServiceWorker
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: ServiceWorker
+  jobName: job-name-serviceworker
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconSecurityCadet
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: SecurityCadet
+  jobName: job-name-cadet
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconZombie # This is a perfectly legitimate profession to pursue
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Zombie
+  jobName: job-name-zombie
 
-- type: statusIcon
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconSyndicate # Just in case you want to make it official which side you are on
+  icon:
+    sprite: /Textures/Interface/Misc/job_icons.rsi
+    state: Syndicate
+  jobName: job-name-syndicate
+
+- type: jobIcon
   parent: JobIcon
   id: JobIconZookeeper
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Zookeeper
+  jobName: job-name-zookeeper
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconSeniorPhysician
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: SeniorPhysician
+  allowSelection: false
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconSeniorOfficer
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: SeniorOfficer
+  allowSelection: false
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconSeniorEngineer
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: SeniorEngineer
+  allowSelection: false
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconSeniorResearcher
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: SeniorResearcher
+  allowSelection: false
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconVisitor
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Visitor
+  jobName: job-name-visitor
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconAdmin
+  icon:
+    sprite: /Textures/Interface/Misc/job_icons.rsi
+    state: Admin
+  allowSelection: false
diff --git a/Resources/Prototypes/StatusEffects/satiation.yml b/Resources/Prototypes/StatusEffects/satiation.yml
new file mode 100644
index 00000000000..749d1f88f18
--- /dev/null
+++ b/Resources/Prototypes/StatusEffects/satiation.yml
@@ -0,0 +1,57 @@
+#Hunger
+- type: satiationIcon
+  id: HungerIcon
+  abstract: true
+  priority: 5
+  locationPreference: Right
+  isShaded: true
+
+- type: satiationIcon
+  id: HungerIconOverfed
+  parent: HungerIcon
+  icon:
+    sprite: /Textures/Interface/Misc/food_icons.rsi
+    state: overfed
+
+- type: satiationIcon
+  id: HungerIconPeckish
+  parent: HungerIcon
+  icon:
+    sprite: /Textures/Interface/Misc/food_icons.rsi
+    state: peckish
+
+- type: satiationIcon
+  id: HungerIconStarving
+  parent: HungerIcon
+  icon:
+    sprite: /Textures/Interface/Misc/food_icons.rsi
+    state: starving
+
+#Thirst
+- type: satiationIcon
+  id: ThirstIcon
+  abstract: true
+  priority: 5
+  locationPreference: Left
+  isShaded: true
+
+- type: satiationIcon
+  id: ThirstIconOverhydrated
+  parent: ThirstIcon
+  icon:
+    sprite: /Textures/Interface/Misc/food_icons.rsi
+    state: overhydrated
+
+- type: satiationIcon
+  id: ThirstIconThirsty
+  parent: ThirstIcon
+  icon:
+    sprite: /Textures/Interface/Misc/food_icons.rsi
+    state: thirsty
+
+- type: satiationIcon
+  id: ThirstIconParched
+  parent: ThirstIcon
+  icon:
+    sprite: /Textures/Interface/Misc/food_icons.rsi
+    state: parched
diff --git a/Resources/Prototypes/StatusEffects/security.yml b/Resources/Prototypes/StatusEffects/security.yml
index 31a22e5df36..e360ec11eb6 100644
--- a/Resources/Prototypes/StatusEffects/security.yml
+++ b/Resources/Prototypes/StatusEffects/security.yml
@@ -1,41 +1,51 @@
-- type: statusIcon
+- type: securityIcon
   id: SecurityIcon
   abstract: true
   offset: 1
   locationPreference: Left
   isShaded: true
 
-- type: statusIcon
+- type: securityIcon
   parent: SecurityIcon
   id: SecurityIconDischarged
   icon:
     sprite: /Textures/Interface/Misc/security_icons.rsi
     state: hud_discharged
 
-- type: statusIcon
+- type: securityIcon
   parent: SecurityIcon
   id: SecurityIconIncarcerated
   icon:
     sprite: /Textures/Interface/Misc/security_icons.rsi
     state: hud_incarcerated
 
-- type: statusIcon
+- type: securityIcon
   parent: SecurityIcon
   id: SecurityIconParoled
   icon:
     sprite: /Textures/Interface/Misc/security_icons.rsi
     state: hud_paroled
 
-- type: statusIcon
+- type: securityIcon
   parent: SecurityIcon
   id: SecurityIconSuspected
   icon:
     sprite: /Textures/Interface/Misc/security_icons.rsi
     state: hud_suspected
 
-- type: statusIcon
+- type: securityIcon
   parent: SecurityIcon
   id: SecurityIconWanted
   icon:
     sprite: /Textures/Interface/Misc/security_icons.rsi
     state: hud_wanted
+
+- type: securityIcon
+  id: MindShieldIcon
+  priority: 2
+  locationPreference: Right
+  layer: Mod
+  isShaded: true
+  icon:
+    sprite: /Textures/Interface/Misc/job_icons.rsi
+    state: MindShield
diff --git a/Resources/Prototypes/StatusEffects/ssd.yml b/Resources/Prototypes/StatusEffects/ssd.yml
index 70253cc6b19..1d04a5349ef 100644
--- a/Resources/Prototypes/StatusEffects/ssd.yml
+++ b/Resources/Prototypes/StatusEffects/ssd.yml
@@ -1,4 +1,4 @@
-- type: statusIcon
+- type: ssdIcon
   id: SSDIcon
   icon:
     sprite: /Textures/Effects/ssd.rsi
diff --git a/Resources/Prototypes/StatusIcon/debug.yml b/Resources/Prototypes/StatusIcon/debug.yml
index 2011c6ceeae..24981746e7e 100644
--- a/Resources/Prototypes/StatusIcon/debug.yml
+++ b/Resources/Prototypes/StatusIcon/debug.yml
@@ -1,17 +1,17 @@
-- type: statusIcon
+- type: debugIcon
   id: DebugStatus
   icon:
     sprite: /Textures/Interface/Misc/research_disciplines.rsi
     state: civilianservices
 
-- type: statusIcon
+- type: debugIcon
   id: DebugStatus2
   priority: 1
   icon:
     sprite: /Textures/Interface/Misc/research_disciplines.rsi
     state: arsenal
 
-- type: statusIcon
+- type: debugIcon
   id: DebugStatus3
   priority: 5
   icon:
diff --git a/Resources/Prototypes/StatusIcon/antag.yml b/Resources/Prototypes/StatusIcon/faction.yml
similarity index 69%
rename from Resources/Prototypes/StatusIcon/antag.yml
rename to Resources/Prototypes/StatusIcon/faction.yml
index 0dbdfce4f97..82f8ac7175e 100644
--- a/Resources/Prototypes/StatusIcon/antag.yml
+++ b/Resources/Prototypes/StatusIcon/faction.yml
@@ -1,42 +1,32 @@
-- type: statusIcon
+- type: factionIcon
   id: ZombieFaction
   priority: 11
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Zombie
 
-- type: statusIcon
+- type: factionIcon
   id: InitialInfectedFaction
   priority: 11
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: InitialInfected
 
-- type: statusIcon
+- type: factionIcon
   id: RevolutionaryFaction
   priority: 11
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Revolutionary
 
-- type: statusIcon
+- type: factionIcon
   id: HeadRevolutionaryFaction
   priority: 11
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: HeadRevolutionary
 
-- type: statusIcon
-  id: MindShieldIcon
-  priority: 2
-  locationPreference: Right
-  layer: Mod
-  isShaded: true
-  icon:
-    sprite: /Textures/Interface/Misc/job_icons.rsi
-    state: MindShield
-
-- type: statusIcon
+- type: factionIcon
   id: SyndicateFaction
   priority: 0
   locationPreference: Left

From 777c6bf72f0473cb2f9be24e47733b09c71067d6 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Fri, 9 Aug 2024 07:24:49 +0200
Subject: [PATCH 042/366] remove UntrackedMapBoundUserInterface (#30752)

---
 .../UI/StationMapBoundUserInterface.cs        |  1 +
 .../UI/UntrackedMapBoundUserInterface.cs      | 28 -------------------
 ...omponent.cs => StationMapUserComponent.cs} |  6 ----
 .../Pinpointer/StationMapComponent.cs         | 11 ++++++++
 .../Prototypes/Entities/Objects/Fun/pai.yml   |  2 +-
 5 files changed, 13 insertions(+), 35 deletions(-)
 delete mode 100644 Content.Client/Pinpointer/UI/UntrackedMapBoundUserInterface.cs
 rename Content.Server/Pinpointer/{StationMapComponent.cs => StationMapUserComponent.cs} (77%)
 create mode 100644 Content.Shared/Pinpointer/StationMapComponent.cs

diff --git a/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs b/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs
index 4421f8ec08e..d662dc91c66 100644
--- a/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs
+++ b/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Pinpointer;
 using Robust.Client.UserInterface;
 
 namespace Content.Client.Pinpointer.UI;
diff --git a/Content.Client/Pinpointer/UI/UntrackedMapBoundUserInterface.cs b/Content.Client/Pinpointer/UI/UntrackedMapBoundUserInterface.cs
deleted file mode 100644
index a3ca6f65da2..00000000000
--- a/Content.Client/Pinpointer/UI/UntrackedMapBoundUserInterface.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Robust.Client.UserInterface;
-
-namespace Content.Client.Pinpointer.UI;
-
-public sealed class UntrackedStationMapBoundUserInterface : BoundUserInterface
-{
-    [ViewVariables]
-    private StationMapWindow? _window;
-
-    public UntrackedStationMapBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
-    {
-    }
-
-    protected override void Open()
-    {
-        base.Open();
-        EntityUid? gridUid = null;
-
-        // TODO: What this just looks like it's been copy-pasted wholesale from StationMapBoundUserInterface?
-        if (EntMan.TryGetComponent<TransformComponent>(Owner, out var xform))
-        {
-            gridUid = xform.GridUid;
-        }
-
-        _window = this.CreateWindow<StationMapWindow>();
-        _window.Set(gridUid, Owner);
-    }
-}
diff --git a/Content.Server/Pinpointer/StationMapComponent.cs b/Content.Server/Pinpointer/StationMapUserComponent.cs
similarity index 77%
rename from Content.Server/Pinpointer/StationMapComponent.cs
rename to Content.Server/Pinpointer/StationMapUserComponent.cs
index 942ea1aba8e..358e26d82e8 100644
--- a/Content.Server/Pinpointer/StationMapComponent.cs
+++ b/Content.Server/Pinpointer/StationMapUserComponent.cs
@@ -1,11 +1,5 @@
 namespace Content.Server.Pinpointer;
 
-[RegisterComponent]
-public sealed partial class StationMapComponent : Component
-{
-
-}
-
 /// <summary>
 /// Added to an entity using station map so when its parent changes we reset it.
 /// </summary>
diff --git a/Content.Shared/Pinpointer/StationMapComponent.cs b/Content.Shared/Pinpointer/StationMapComponent.cs
new file mode 100644
index 00000000000..07cc99605ed
--- /dev/null
+++ b/Content.Shared/Pinpointer/StationMapComponent.cs
@@ -0,0 +1,11 @@
+namespace Content.Shared.Pinpointer;
+
+[RegisterComponent]
+public sealed partial class StationMapComponent : Component
+{
+    /// <summary>
+    /// Whether or not to show the user's location on the map.
+    /// </summary>
+    [DataField]
+    public bool ShowLocation = true;
+}
diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
index 0adbc492308..806470607a0 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
@@ -17,7 +17,7 @@
         type: InstrumentBoundUserInterface
         requireInputValidation: false
       enum.StationMapUiKey.Key:
-        type: UntrackedStationMapBoundUserInterface
+        type: StationMapBoundUserInterface
         requireInputValidation: false
   - type: Sprite
     sprite: Objects/Fun/pai.rsi

From a00b6d04c569411e261c178b1f7d7881a0d52939 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 04:17:51 -0400
Subject: [PATCH 043/366] yeag

---
 Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs | 1 +
 Content.Client/Radio/Ui/IntercomBoundUserInterface.cs     | 1 +
 Content.Shared/Access/SharedAgentIDCardSystem.cs          | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs b/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs
index c167ad660a9..050756fcd14 100644
--- a/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs
+++ b/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Access.Systems;
+using Content.Shared.StatusIcon;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
diff --git a/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs b/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs
index 922715bdadc..401e7edd44a 100644
--- a/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs
+++ b/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Radio;
+using Content.Shared.Radio.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
diff --git a/Content.Shared/Access/SharedAgentIDCardSystem.cs b/Content.Shared/Access/SharedAgentIDCardSystem.cs
index 8c78edf74d4..aefd413de8b 100644
--- a/Content.Shared/Access/SharedAgentIDCardSystem.cs
+++ b/Content.Shared/Access/SharedAgentIDCardSystem.cs
@@ -1,3 +1,5 @@
+using Content.Shared.StatusIcon;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Access.Systems

From 7ea137947594bdd9477f771d71230430a4043c55 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sun, 7 Jul 2024 10:19:10 -0400
Subject: [PATCH 044/366] Intercom buffs and fixes (#29580)

* Intercom buffs and fixes

* remove unused bui state

* mild sec intercom buff

* reinforce sec intercoms
---
 .../Radio/EntitySystems/RadioDeviceSystem.cs  |  23 +++
 .../Radio/Ui/IntercomBoundUserInterface.cs    |   1 +
 Content.Client/Radio/Ui/IntercomMenu.xaml.cs  |  37 +++-
 .../Radio/EntitySystems/RadioDeviceSystem.cs  |  83 ++++----
 .../Radio/EntitySystems/RadioSystem.cs        |   9 +-
 .../Radio/Components/IntercomComponent.cs     |  21 +-
 .../Components/TelecomExemptComponent.cs      |   9 +
 .../EntitySystems/EncryptionKeySystem.cs      |  14 +-
 Content.Shared/Radio/SharedIntercom.cs        |  20 +-
 Content.Shared/Wires/SharedWiresSystem.cs     |   6 +
 .../en-US/radio/components/intercom.ftl       |   3 +-
 Resources/Migrations/migration.yml            |  26 +++
 .../Entities/Objects/Devices/radio.yml        |   3 +-
 .../Structures/Wallmounts/intercom.yml        | 186 +++++++++++++-----
 .../Graphs/utilities/intercom.yml             |  41 +++-
 .../Recipes/Construction/utilities.yml        |   2 +-
 .../Wallmounts/intercom.rsi/panel.png         | Bin 656 -> 316 bytes
 .../Wallmounts/intercom.rsi/speaker.png       | Bin 157 -> 134 bytes
 18 files changed, 357 insertions(+), 127 deletions(-)
 create mode 100644 Content.Client/Radio/EntitySystems/RadioDeviceSystem.cs
 create mode 100644 Content.Shared/Radio/Components/TelecomExemptComponent.cs

diff --git a/Content.Client/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Client/Radio/EntitySystems/RadioDeviceSystem.cs
new file mode 100644
index 00000000000..29d6c635ebc
--- /dev/null
+++ b/Content.Client/Radio/EntitySystems/RadioDeviceSystem.cs
@@ -0,0 +1,23 @@
+using Content.Client.Radio.Ui;
+using Content.Shared.Radio;
+using Content.Shared.Radio.Components;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.Radio.EntitySystems;
+
+public sealed class RadioDeviceSystem : EntitySystem
+{
+    [Dependency] private readonly UserInterfaceSystem _ui = default!;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<IntercomComponent, AfterAutoHandleStateEvent>(OnAfterHandleState);
+    }
+
+    private void OnAfterHandleState(Entity<IntercomComponent> ent, ref AfterAutoHandleStateEvent args)
+    {
+        if (_ui.TryGetOpenUi<IntercomBoundUserInterface>(ent.Owner, IntercomUiKey.Key, out var bui))
+            bui.Update(ent);
+    }
+}
diff --git a/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs b/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs
index 401e7edd44a..cb95d574399 100644
--- a/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs
+++ b/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Radio;
 using Content.Shared.Radio.Components;
+using Content.Shared.Radio.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/Radio/Ui/IntercomMenu.xaml.cs b/Content.Client/Radio/Ui/IntercomMenu.xaml.cs
index ea040d1e44c..e6645acb7ba 100644
--- a/Content.Client/Radio/Ui/IntercomMenu.xaml.cs
+++ b/Content.Client/Radio/Ui/IntercomMenu.xaml.cs
@@ -1,9 +1,10 @@
 using System.Threading.Channels;
 using Content.Client.UserInterface.Controls;
-using Content.Shared.Radio;
+using Content.Shared.Radio.Components;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
 
 namespace Content.Client.Radio.Ui;
 
@@ -18,38 +19,54 @@ public sealed partial class IntercomMenu : FancyWindow
 
     private readonly List<string> _channels = new();
 
-    public IntercomMenu()
+    public IntercomMenu(Entity<IntercomComponent> entity)
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
 
         MicButton.OnPressed += args => OnMicPressed?.Invoke(args.Button.Pressed);
         SpeakerButton.OnPressed += args => OnSpeakerPressed?.Invoke(args.Button.Pressed);
+
+        Update(entity);
     }
 
-    public void Update(IntercomBoundUIState state)
+    public void Update(Entity<IntercomComponent> entity)
     {
-        MicButton.Pressed = state.MicEnabled;
-        SpeakerButton.Pressed = state.SpeakerEnabled;
+        MicButton.Pressed = entity.Comp.MicrophoneEnabled;
+        SpeakerButton.Pressed = entity.Comp.SpeakerEnabled;
+
+        MicButton.Disabled = entity.Comp.SupportedChannels.Count == 0;
+        SpeakerButton.Disabled = entity.Comp.SupportedChannels.Count == 0;
+        ChannelOptions.Disabled = entity.Comp.SupportedChannels.Count == 0;
 
         ChannelOptions.Clear();
         _channels.Clear();
-        for (var i = 0; i < state.AvailableChannels.Count; i++)
+        for (var i = 0; i < entity.Comp.SupportedChannels.Count; i++)
         {
-            var channel = state.AvailableChannels[i];
-            if (!_prototype.TryIndex<RadioChannelPrototype>(channel, out var prototype))
+            var channel = entity.Comp.SupportedChannels[i];
+            if (!_prototype.TryIndex(channel, out var prototype))
                 continue;
 
             _channels.Add(channel);
             ChannelOptions.AddItem(Loc.GetString(prototype.Name), i);
 
-            if (channel == state.SelectedChannel)
+            if (channel == entity.Comp.CurrentChannel)
                 ChannelOptions.Select(i);
         }
+
+        if (entity.Comp.SupportedChannels.Count == 0)
+        {
+            ChannelOptions.AddItem(Loc.GetString("intercom-options-none"), 0);
+            ChannelOptions.Select(0);
+        }
+
         ChannelOptions.OnItemSelected += args =>
         {
+            if (!_channels.TryGetValue(args.Id, out var proto))
+                return;
+
             ChannelOptions.SelectId(args.Id);
-            OnChannelSelected?.Invoke(_channels[args.Id]);
+            OnChannelSelected?.Invoke(proto);
         };
     }
 }
diff --git a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
index 0cb20b3187b..839bb669221 100644
--- a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Server.Chat.Systems;
 using Content.Server.Interaction;
 using Content.Server.Language;
@@ -7,14 +8,11 @@
 using Content.Server.Radio.Components;
 using Content.Server.Speech;
 using Content.Server.Speech.Components;
-using Content.Shared.UserInterface;
-using Content.Shared.Chat;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Power;
 using Content.Shared.Radio;
 using Content.Shared.Radio.Components;
-using Robust.Server.GameObjects;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Radio.EntitySystems;
@@ -50,7 +48,7 @@ public override void Initialize()
         SubscribeLocalEvent<RadioSpeakerComponent, ActivateInWorldEvent>(OnActivateSpeaker);
         SubscribeLocalEvent<RadioSpeakerComponent, RadioReceiveEvent>(OnReceiveRadio);
 
-        SubscribeLocalEvent<IntercomComponent, BeforeActivatableUIOpenEvent>(OnBeforeIntercomUiOpen);
+        SubscribeLocalEvent<IntercomComponent, EncryptionChannelsChangedEvent>(OnIntercomEncryptionChannelsChanged);
         SubscribeLocalEvent<IntercomComponent, ToggleIntercomMicMessage>(OnToggleIntercomMic);
         SubscribeLocalEvent<IntercomComponent, ToggleIntercomSpeakerMessage>(OnToggleIntercomSpeaker);
         SubscribeLocalEvent<IntercomComponent, SelectIntercomChannelMessage>(OnSelectIntercomChannel);
@@ -153,18 +151,18 @@ public void ToggleRadioSpeaker(EntityUid uid, EntityUid user, bool quiet = false
         SetSpeakerEnabled(uid, user, !component.Enabled, quiet, component);
     }
 
-    public void SetSpeakerEnabled(EntityUid uid, EntityUid user, bool enabled, bool quiet = false, RadioSpeakerComponent? component = null)
+    public void SetSpeakerEnabled(EntityUid uid, EntityUid? user, bool enabled, bool quiet = false, RadioSpeakerComponent? component = null)
     {
         if (!Resolve(uid, ref component))
             return;
 
         component.Enabled = enabled;
 
-        if (!quiet)
+        if (!quiet && user != null)
         {
             var state = Loc.GetString(component.Enabled ? "handheld-radio-component-on-state" : "handheld-radio-component-off-state");
             var message = Loc.GetString("handheld-radio-component-on-use", ("radioState", state));
-            _popup.PopupEntity(message, user, user);
+            _popup.PopupEntity(message, user.Value, user.Value);
         }
 
         _appearance.SetData(uid, RadioDeviceVisuals.Speaker, component.Enabled);
@@ -216,7 +214,8 @@ private void OnReceiveRadio(EntityUid uid, RadioSpeakerComponent component, ref
         var nameEv = new TransformSpeakerSpeechEvent(args.MessageSource, Name(args.MessageSource));
         RaiseLocalEvent(args.MessageSource, nameEv);
 
-        var name = Loc.GetString("speech-name-relay", ("speaker", Name(uid)),
+        var name = Loc.GetString("speech-name-relay",
+            ("speaker", Name(uid)),
             ("originalName", nameEv.VoiceName ?? Name(args.MessageSource)));
 
         // log to chat so people can identity the speaker/source, but avoid clogging ghost chat if there are many radios
@@ -224,54 +223,66 @@ private void OnReceiveRadio(EntityUid uid, RadioSpeakerComponent component, ref
         _chat.TrySendInGameICMessage(uid, message, InGameICChatType.Whisper, ChatTransmitRange.GhostRangeLimit, nameOverride: name, checkRadioPrefix: false, languageOverride: args.Language);
     }
 
-    private void OnBeforeIntercomUiOpen(EntityUid uid, IntercomComponent component, BeforeActivatableUIOpenEvent args)
+    private void OnIntercomEncryptionChannelsChanged(Entity<IntercomComponent> ent, ref EncryptionChannelsChangedEvent args)
     {
-        UpdateIntercomUi(uid, component);
+        ent.Comp.SupportedChannels = args.Component.Channels.Select(p => new ProtoId<RadioChannelPrototype>(p)).ToList();
+
+        var channel = args.Component.DefaultChannel;
+        if (ent.Comp.CurrentChannel != null && ent.Comp.SupportedChannels.Contains(ent.Comp.CurrentChannel.Value))
+            channel = ent.Comp.CurrentChannel;
+
+        SetIntercomChannel(ent, channel);
     }
 
-    private void OnToggleIntercomMic(EntityUid uid, IntercomComponent component, ToggleIntercomMicMessage args)
+    private void OnToggleIntercomMic(Entity<IntercomComponent> ent, ref ToggleIntercomMicMessage args)
     {
-        if (component.RequiresPower && !this.IsPowered(uid, EntityManager))
+        if (ent.Comp.RequiresPower && !this.IsPowered(ent, EntityManager))
             return;
 
-        SetMicrophoneEnabled(uid, args.Actor, args.Enabled, true);
-        UpdateIntercomUi(uid, component);
+        SetMicrophoneEnabled(ent, args.Actor, args.Enabled, true);
+        ent.Comp.MicrophoneEnabled = args.Enabled;
+        Dirty(ent);
     }
 
-    private void OnToggleIntercomSpeaker(EntityUid uid, IntercomComponent component, ToggleIntercomSpeakerMessage args)
+    private void OnToggleIntercomSpeaker(Entity<IntercomComponent> ent, ref ToggleIntercomSpeakerMessage args)
     {
-        if (component.RequiresPower && !this.IsPowered(uid, EntityManager))
+        if (ent.Comp.RequiresPower && !this.IsPowered(ent, EntityManager))
             return;
 
-        SetSpeakerEnabled(uid, args.Actor, args.Enabled, true);
-        UpdateIntercomUi(uid, component);
+        SetSpeakerEnabled(ent, args.Actor, args.Enabled, true);
+        ent.Comp.SpeakerEnabled = args.Enabled;
+        Dirty(ent);
     }
 
-    private void OnSelectIntercomChannel(EntityUid uid, IntercomComponent component, SelectIntercomChannelMessage args)
+    private void OnSelectIntercomChannel(Entity<IntercomComponent> ent, ref SelectIntercomChannelMessage args)
     {
-        if (component.RequiresPower && !this.IsPowered(uid, EntityManager))
+        if (ent.Comp.RequiresPower && !this.IsPowered(ent, EntityManager))
             return;
 
-        if (!_protoMan.TryIndex<RadioChannelPrototype>(args.Channel, out _) || !component.SupportedChannels.Contains(args.Channel))
+        if (!_protoMan.HasIndex<RadioChannelPrototype>(args.Channel) || !ent.Comp.SupportedChannels.Contains(args.Channel))
             return;
 
-        if (TryComp<RadioMicrophoneComponent>(uid, out var mic))
-            mic.BroadcastChannel = args.Channel;
-        if (TryComp<RadioSpeakerComponent>(uid, out var speaker))
-            speaker.Channels = new(){ args.Channel };
-        UpdateIntercomUi(uid, component);
+        SetIntercomChannel(ent, args.Channel);
     }
 
-    private void UpdateIntercomUi(EntityUid uid, IntercomComponent component)
+    private void SetIntercomChannel(Entity<IntercomComponent> ent, ProtoId<RadioChannelPrototype>? channel)
     {
-        var micComp = CompOrNull<RadioMicrophoneComponent>(uid);
-        var speakerComp = CompOrNull<RadioSpeakerComponent>(uid);
-
-        var micEnabled = micComp?.Enabled ?? false;
-        var speakerEnabled = speakerComp?.Enabled ?? false;
-        var availableChannels = component.SupportedChannels;
-        var selectedChannel = micComp?.BroadcastChannel ?? SharedChatSystem.CommonChannel;
-        var state = new IntercomBoundUIState(micEnabled, speakerEnabled, availableChannels, selectedChannel);
-        _ui.SetUiState(uid, IntercomUiKey.Key, state);
+        ent.Comp.CurrentChannel = channel;
+
+        if (channel == null)
+        {
+            SetSpeakerEnabled(ent, null, false);
+            SetMicrophoneEnabled(ent, null, false);
+            ent.Comp.MicrophoneEnabled = false;
+            ent.Comp.SpeakerEnabled = false;
+            Dirty(ent);
+            return;
+        }
+
+        if (TryComp<RadioMicrophoneComponent>(ent, out var mic))
+            mic.BroadcastChannel = channel;
+        if (TryComp<RadioSpeakerComponent>(ent, out var speaker))
+            speaker.Channels = new(){ channel };
+        Dirty(ent);
     }
 }
diff --git a/Content.Server/Radio/EntitySystems/RadioSystem.cs b/Content.Server/Radio/EntitySystems/RadioSystem.cs
index 66dadc85b5d..aff4d82d874 100644
--- a/Content.Server/Radio/EntitySystems/RadioSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioSystem.cs
@@ -35,11 +35,15 @@ public sealed class RadioSystem : EntitySystem
     // set used to prevent radio feedback loops.
     private readonly HashSet<string> _messages = new();
 
+    private EntityQuery<TelecomExemptComponent> _exemptQuery;
+
     public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<IntrinsicRadioReceiverComponent, RadioReceiveEvent>(OnIntrinsicReceive);
         SubscribeLocalEvent<IntrinsicRadioTransmitterComponent, EntitySpokeEvent>(OnIntrinsicSpeak);
+
+        _exemptQuery = GetEntityQuery<TelecomExemptComponent>();
     }
 
     private void OnIntrinsicSpeak(EntityUid uid, IntrinsicRadioTransmitterComponent component, EntitySpokeEvent args)
@@ -118,9 +122,8 @@ public void SendRadioMessage(EntityUid messageSource, string message, RadioChann
 
         var sourceMapId = Transform(radioSource).MapID;
         var hasActiveServer = HasActiveServer(sourceMapId, channel.ID);
-        var hasMicro = HasComp<RadioMicrophoneComponent>(radioSource);
+        var sourceServerExempt = _exemptQuery.HasComp(radioSource);
 
-        var speakerQuery = GetEntityQuery<RadioSpeakerComponent>();
         var radioQuery = EntityQueryEnumerator<ActiveRadioComponent, TransformComponent>();
         while (canSend && radioQuery.MoveNext(out var receiver, out var radio, out var transform))
         {
@@ -135,7 +138,7 @@ public void SendRadioMessage(EntityUid messageSource, string message, RadioChann
                 continue;
 
             // don't need telecom server for long range channels or handheld radios and intercoms
-            var needServer = !channel.LongRange && (!hasMicro || !speakerQuery.HasComponent(receiver));
+            var needServer = !channel.LongRange && !sourceServerExempt;
             if (needServer && !hasActiveServer)
                 continue;
 
diff --git a/Content.Shared/Radio/Components/IntercomComponent.cs b/Content.Shared/Radio/Components/IntercomComponent.cs
index be2734ff168..8d7b87597b1 100644
--- a/Content.Shared/Radio/Components/IntercomComponent.cs
+++ b/Content.Shared/Radio/Components/IntercomComponent.cs
@@ -1,23 +1,32 @@
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Radio.Components;
 
 /// <summary>
 /// Handles intercom ui and is authoritative on the channels an intercom can access.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
 public sealed partial class IntercomComponent : Component
 {
     /// <summary>
-    /// Does this intercom require popwer to function
+    /// Does this intercom require power to function
     /// </summary>
-    [DataField("requiresPower"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public bool RequiresPower = true;
 
+    [DataField, AutoNetworkedField]
+    public bool SpeakerEnabled;
+
+    [DataField, AutoNetworkedField]
+    public bool MicrophoneEnabled;
+
+    [DataField, AutoNetworkedField]
+    public ProtoId<RadioChannelPrototype>? CurrentChannel;
+
     /// <summary>
     /// The list of radio channel prototypes this intercom can choose between.
     /// </summary>
-    [DataField("supportedChannels", customTypeSerializer: typeof(PrototypeIdListSerializer<RadioChannelPrototype>))]
-    public List<string> SupportedChannels = new();
+    [DataField, AutoNetworkedField]
+    public List<ProtoId<RadioChannelPrototype>> SupportedChannels = new();
 }
diff --git a/Content.Shared/Radio/Components/TelecomExemptComponent.cs b/Content.Shared/Radio/Components/TelecomExemptComponent.cs
new file mode 100644
index 00000000000..7af5c1c78ca
--- /dev/null
+++ b/Content.Shared/Radio/Components/TelecomExemptComponent.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Radio.Components;
+
+/// <summary>
+/// This is used for a radio that doesn't need a telecom server in order to broadcast.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class TelecomExemptComponent : Component;
diff --git a/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs b/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs
index a15b6f76e90..5a384173d0c 100644
--- a/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs
+++ b/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs
@@ -31,6 +31,7 @@ public sealed partial class EncryptionKeySystem : EntitySystem
     [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly SharedWiresSystem _wires = default!;
 
     public override void Initialize()
     {
@@ -150,7 +151,7 @@ private void TryRemoveKey(EntityUid uid, EncryptionKeyHolderComponent component,
             return;
         }
 
-        if (TryComp<WiresPanelComponent>(uid, out var panel) && !panel.Open)
+        if (!_wires.IsPanelOpen(uid))
         {
             _popup.PopupClient(Loc.GetString("encryption-keys-panel-locked"), uid, args.User);
             return;
@@ -186,8 +187,15 @@ private void OnHolderExamined(EntityUid uid, EncryptionKeyHolderComponent compon
 
         if (component.Channels.Count > 0)
         {
-            args.PushMarkup(Loc.GetString("examine-encryption-channels-prefix"));
-            AddChannelsExamine(component.Channels, component.DefaultChannel, args, _protoManager, "examine-encryption-channel");
+            using (args.PushGroup(nameof(EncryptionKeyComponent)))
+            {
+                args.PushMarkup(Loc.GetString("examine-encryption-channels-prefix"));
+                AddChannelsExamine(component.Channels,
+                    component.DefaultChannel,
+                    args,
+                    _protoManager,
+                    "examine-encryption-channel");
+            }
         }
     }
 
diff --git a/Content.Shared/Radio/SharedIntercom.cs b/Content.Shared/Radio/SharedIntercom.cs
index 410843312fd..f697add8b90 100644
--- a/Content.Shared/Radio/SharedIntercom.cs
+++ b/Content.Shared/Radio/SharedIntercom.cs
@@ -1,4 +1,5 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Radio;
 
@@ -8,23 +9,6 @@ public enum IntercomUiKey
     Key,
 }
 
-[Serializable, NetSerializable]
-public sealed class IntercomBoundUIState : BoundUserInterfaceState
-{
-    public bool MicEnabled;
-    public bool SpeakerEnabled;
-    public List<string> AvailableChannels;
-    public string SelectedChannel;
-
-    public IntercomBoundUIState(bool micEnabled, bool speakerEnabled, List<string> availableChannels, string selectedChannel)
-    {
-        MicEnabled = micEnabled;
-        SpeakerEnabled = speakerEnabled;
-        AvailableChannels = availableChannels;
-        SelectedChannel = selectedChannel;
-    }
-}
-
 [Serializable, NetSerializable]
 public sealed class ToggleIntercomMicMessage : BoundUserInterfaceMessage
 {
diff --git a/Content.Shared/Wires/SharedWiresSystem.cs b/Content.Shared/Wires/SharedWiresSystem.cs
index b4b0768e0f7..24f3ad8e764 100644
--- a/Content.Shared/Wires/SharedWiresSystem.cs
+++ b/Content.Shared/Wires/SharedWiresSystem.cs
@@ -18,11 +18,17 @@ public override void Initialize()
     {
         base.Initialize();
 
+        SubscribeLocalEvent<WiresPanelComponent, ComponentStartup>(OnStartup);
         SubscribeLocalEvent<WiresPanelComponent, WirePanelDoAfterEvent>(OnPanelDoAfter);
         SubscribeLocalEvent<WiresPanelComponent, InteractUsingEvent>(OnInteractUsing);
         SubscribeLocalEvent<WiresPanelComponent, ExaminedEvent>(OnExamine);
     }
 
+    private void OnStartup(Entity<WiresPanelComponent> ent, ref ComponentStartup args)
+    {
+        UpdateAppearance(ent, ent);
+    }
+
     private void OnPanelDoAfter(EntityUid uid, WiresPanelComponent panel, WirePanelDoAfterEvent args)
     {
         if (args.Cancelled)
diff --git a/Resources/Locale/en-US/radio/components/intercom.ftl b/Resources/Locale/en-US/radio/components/intercom.ftl
index e56e3cd0f73..63303999c21 100644
--- a/Resources/Locale/en-US/radio/components/intercom.ftl
+++ b/Resources/Locale/en-US/radio/components/intercom.ftl
@@ -1,5 +1,6 @@
 intercom-menu-title = Intercom
 intercom-channel-label = Channel:
 intercom-button-text-mic = Mic.
-intercom-button-text-speaker = Speak
+intercom-button-text-speaker = Spkr.
+intercom-options-none = No channels
 intercom-flavor-text-left = Keep lines free of chatter
diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml
index 3ac6b353a9b..7b5b87d7865 100644
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@@ -244,3 +244,29 @@ ReinforcementRadioSyndicateMonkeyNukeops: ReinforcementRadioSyndicateAncestorNuk
 
 # 2024-05-01
 DrinkBottleGoldschlager: DrinkBottleGildlager
+
+# 2024-05-14
+soda_dispenser: SodaDispenser
+chem_master: ChemMaster
+
+# 2024-05-21
+CrateJanitorExplosive: ClosetJanitorBombFilled
+
+# 2024-05-27
+DoorRemoteFirefight: null
+
+# 2024-06-03
+AirlockServiceCaptainLocked: AirlockCaptainLocked
+
+# 2024-06-15
+ClothingOuterCoatInspector: ClothingOuterCoatDetectiveLoadout
+
+# 2024-06-23
+FloorTileItemReinforced: PartRodMetal1
+
+
+#2024-06-25
+BookChefGaming: BookHowToCookForFortySpaceman
+
+#2024-06-29
+IntercomAssesmbly: IntercomAssembly
diff --git a/Resources/Prototypes/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/Entities/Objects/Devices/radio.yml
index 43f84fe404e..77b6cac2d37 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/radio.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/radio.yml
@@ -4,6 +4,7 @@
   parent: BaseItem
   id: RadioHandheld
   components:
+  - type: TelecomExempt
   - type: RadioMicrophone
     broadcastChannel: Handheld
   - type: RadioSpeaker
@@ -39,4 +40,4 @@
     sprite: Objects/Devices/securityhandy.rsi
   - type: Item
     sprite: Objects/Devices/securityhandy.rsi
-    heldPrefix: walkietalkie
\ No newline at end of file
+    heldPrefix: walkietalkie
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
index 6c6b8bf57e9..9a244c2c598 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
@@ -1,5 +1,5 @@
 - type: entity
-  id: Intercom
+  id: BaseIntercom
   name: intercom
   description: An intercom. For when the station just needs to know something.
   abstract: true
@@ -9,6 +9,10 @@
   - type: Electrified
     enabled: false
     usesApcPower: true
+  - type: TelecomExempt
+  - type: EncryptionKeyHolder
+    keySlots: 3
+    keysExtractionMethod: Prying
   - type: RadioMicrophone
     powerRequired: true
     unobstructedRequired: true
@@ -27,12 +31,14 @@
   - type: InteractionOutline
   - type: Appearance
   - type: WiresVisuals
+  - type: WiresPanelSecurity
   - type: ContainerFill
     containers:
       board: [ IntercomElectronics ]
   - type: ContainerContainer
     containers:
       board: !type:Container
+      key_slots: !type:Container
   - type: Sprite
     noRot: false
     drawdepth: SmallObjects
@@ -52,7 +58,6 @@
       visible: false
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
-      shader: unshaded
       visible: false
   - type: Transform
     noRot: false
@@ -64,6 +69,7 @@
   - type: ActivatableUIRequiresPower
   - type: ActivatableUI
     key: enum.IntercomUiKey.Key
+    singleUser: true
   - type: UserInterface
     interfaces:
       enum.IntercomUiKey.Key:
@@ -119,7 +125,7 @@
     - Wallmount
 
 - type: entity
-  id: IntercomAssesmbly
+  id: IntercomAssembly
   name: intercom assembly
   description: An intercom. It doesn't seem very helpful right now.
   components:
@@ -129,7 +135,18 @@
   - type: Sprite
     drawdepth: SmallObjects
     sprite: Structures/Wallmounts/intercom.rsi
-    state: build
+    layers:
+    - state: build
+    - state: panel
+      visible: false
+      map: [ "wires" ]
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.ConstructionVisuals.Layer:
+        wires:
+          0: { visible: false }
+          1: { visible: true }
   - type: Construction
     graph: Intercom
     node: assembly
@@ -140,97 +157,176 @@
     snap:
     - Wallmount
 
+# this weird inheritance BS exists for construction shitcode
+- type: entity
+  id: IntercomConstructed
+  parent: BaseIntercom
+  suffix: Empty, Panel Open
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+    - state: unshaded
+      map: ["enum.PowerDeviceVisualLayers.Powered"]
+      shader: unshaded
+    - state: broadcasting
+      map: ["enum.RadioDeviceVisualLayers.Broadcasting"]
+      shader: unshaded
+      visible: false
+    - state: speaker
+      map: ["enum.RadioDeviceVisualLayers.Speaker"]
+      shader: unshaded
+      visible: false
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+      visible: true
+  - type: WiresPanel
+    open: true
+
+- type: entity
+  id: Intercom
+  parent: IntercomConstructed
+  suffix: ""
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+    - state: unshaded
+      map: ["enum.PowerDeviceVisualLayers.Powered"]
+      shader: unshaded
+    - state: broadcasting
+      map: ["enum.RadioDeviceVisualLayers.Broadcasting"]
+      shader: unshaded
+      visible: false
+    - state: speaker
+      map: ["enum.RadioDeviceVisualLayers.Speaker"]
+      shader: unshaded
+      visible: false
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: WiresPanel
+    open: false
+
 - type: entity
   id: IntercomCommon
   parent: Intercom
   suffix: Common
   components:
-  - type: Intercom
-    supportedChannels:
-    - Common
+  - type: ContainerFill
+    containers:
+      board:
+      - IntercomElectronics
+      key_slots:
+      - EncryptionKeyCommon
 
 - type: entity
   id: IntercomCommand
   parent: Intercom
   suffix: Command
   components:
-  - type: Intercom
-    supportedChannels:
-    - Common
-    - Command
+  - type: ContainerFill
+    containers:
+      board:
+      - IntercomElectronics
+      key_slots:
+      - EncryptionKeyCommon
+      - EncryptionKeyCommand
 
 - type: entity
   id: IntercomEngineering
   parent: Intercom
   suffix: Engineering
   components:
-  - type: Intercom
-    supportedChannels:
-    - Common
-    - Engineering
+  - type: ContainerFill
+    containers:
+      board:
+      - IntercomElectronics
+      key_slots:
+      - EncryptionKeyCommon
+      - EncryptionKeyEngineering
 
 - type: entity
   id: IntercomMedical
   parent: Intercom
   suffix: Medical
   components:
-  - type: Intercom
-    supportedChannels:
-    - Common
-    - Medical
+  - type: ContainerFill
+    containers:
+      board:
+      - IntercomElectronics
+      key_slots:
+      - EncryptionKeyCommon
+      - EncryptionKeyMedical
 
 - type: entity
   id: IntercomScience
   parent: Intercom
   suffix: Epistemics # DeltaV - Epistemics Department replacing Science
   components:
-  - type: Intercom
-    supportedChannels:
-    - Common
-    - Science
+  - type: ContainerFill
+    containers:
+      board:
+      - IntercomElectronics
+      key_slots:
+      - EncryptionKeyCommon
+      - EncryptionKeyScience
 
 - type: entity
   id: IntercomSecurity
   parent: Intercom
   suffix: Security
+  description: An intercom. It's been reinforced with metal from security helmets, making it a bitch-and-a-half to open.
   components:
-  - type: Intercom
-    supportedChannels:
-    - Common
-    - Security
+  - type: WiresPanel
+    openDelay: 5
+  - type: WiresPanelSecurity
+    examine: wires-panel-component-on-examine-security-level2
+    wiresAccessible: false
+  - type: Construction
+    node: intercomReinforced
+  - type: ContainerFill
+    containers:
+      board:
+      - IntercomElectronics
+      key_slots:
+      - EncryptionKeyCommon
+      - EncryptionKeySecurity
 
 - type: entity
   id: IntercomService
   parent: Intercom
   suffix: Service
   components:
-  - type: Intercom
-    supportedChannels:
-    - Common
-    - Service
+  - type: ContainerFill
+    containers:
+      board:
+      - IntercomElectronics
+      key_slots:
+      - EncryptionKeyCommon
+      - EncryptionKeyService
 
 - type: entity
   id: IntercomSupply
   parent: Intercom
   suffix: Supply
   components:
-  - type: Intercom
-    supportedChannels:
-    - Common
-    - Supply
+  - type: ContainerFill
+    containers:
+      board:
+      - IntercomElectronics
+      key_slots:
+      - EncryptionKeyCommon
+      - EncryptionKeyCargo
 
 - type: entity
   id: IntercomAll
   parent: Intercom
   suffix: All
   components:
-  - type: Intercom
-    supportedChannels:
-    - Common
-    - Command
-    - Engineering
-    - Medical
-    - Science
-    - Security
-    - Service
-    - Supply
+  - type: ContainerFill
+    containers:
+      board:
+      - IntercomElectronics
+      key_slots:
+      - EncryptionKeyCommon
+      - EncryptionKeyStationMaster
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/intercom.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/intercom.yml
index 2247860f892..ba29d72539a 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/intercom.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/intercom.yml
@@ -11,13 +11,17 @@
         doAfter: 2.0
 
   - node: assembly
-    entity: IntercomAssesmbly
+    entity: IntercomAssembly
     edges:
     - to: wired
       steps:
       - material: Cable
         amount: 2
         doAfter: 1
+      completed:
+      - !type:VisualizerDataInt
+        key: "enum.ConstructionVisuals.Layer"
+        data: 1
     - to: start
       completed:
       - !type:GivePrototype
@@ -29,7 +33,7 @@
         doAfter: 2
 
   - node: wired
-    entity: IntercomAssesmbly
+    entity: IntercomAssembly
     edges:
     - to: electronics
       steps:
@@ -45,6 +49,9 @@
       - !type:GivePrototype
         prototype: CableApcStack1
         amount: 2
+      - !type:VisualizerDataInt
+        key: "enum.ConstructionVisuals.Layer"
+        data: 0
       steps:
       - tool: Cutting
         doAfter: 1
@@ -57,7 +64,11 @@
         doAfter: 2
 
   - node: intercom
-    entity: IntercomCommon #TODO: make this work with encryption keys
+    entity: IntercomConstructed
+    doNotReplaceInheritingEntities: true
+    actions:
+    - !type:SetWiresPanelSecurity
+      wiresAccessible: true
     edges:
     - to: wired
       conditions:
@@ -72,3 +83,27 @@
       steps:
       - tool: Prying
         doAfter: 1
+    - to: intercomReinforced
+      conditions:
+      - !type:WirePanel
+      steps:
+      - material: Steel
+        amount: 1
+      - tool: Welding
+        doAfter: 1
+
+  - node: intercomReinforced
+    actions:
+    - !type:SetWiresPanelSecurity
+      examine: wires-panel-component-on-examine-security-level2
+      wiresAccessible: false
+    edges:
+    - to: intercom
+      conditions:
+      - !type:WirePanel
+      completed:
+      - !type:GivePrototype
+        prototype: SheetSteel1
+      steps:
+      - tool: Welding
+        doAfter: 5
diff --git a/Resources/Prototypes/Recipes/Construction/utilities.yml b/Resources/Prototypes/Recipes/Construction/utilities.yml
index 19f2fee1837..82c16de7b6a 100644
--- a/Resources/Prototypes/Recipes/Construction/utilities.yml
+++ b/Resources/Prototypes/Recipes/Construction/utilities.yml
@@ -790,7 +790,7 @@
 # INTERCOM
 - type: construction
   name: intercom
-  id: IntercomAssesmbly
+  id: IntercomAssembly
   graph: Intercom
   startNode: start
   targetNode: intercom
diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png
index 3bfeb8df5844cecfc419ac23d668a8a800cdf8fa..68f4cd1240b80165a5489ef7287b8bc3b48dc143 100644
GIT binary patch
delta 290
zcmV+-0p0$P1-t@~BYyw^b5ch_0Itp)=>Px#_DMuRRCt{2+OZOXFbsg<=;^2qjx0Ql
z@BapLaq`rIJb(_aa$Z`}9QOYf1_~FrmTMA30002crcHDJ7Jc8pevL^fnVxBzA5IKa
zmGfl~Rh1znQB_I9=a^%4FJNgbf&6gl(`hU^|IIEpm<WgCNq@Son>~LOk^AFmy6389
zfQMDh0G&p;?dL<zSpoonmYKGV9$V39=8e$O*;usZcY-Vd%V3XeESf17@W{rZHUAAT
z%>c47000000DwPGT*39M6xXOiFH#fqY?gR8Vwx|CvII&l7V&MC)M&&M|0LzvEUD3m
oY5p5fJOezNB^xwi0040H2AB(}cg~IGwEzGB07*qoM6N<$f(<}`Bme*a

delta 632
zcmV-;0*C#)0+0oeBYy%{Nkl<Zc-rlnF>BjE6vzK^Tgi*28w$-(*@ohRaW*gM61hvi
zKqik`0$Q{OLczNhL%%@3gO<kK+Y+z{*i)4(g+M*s;>d){U?gN=MYeH3I=$cY^ai1K
zdjETO?+zdcf*|&1U>JgeFEO>M56I2~z!(#k!=V@$hG<z<{C~_C6D`Zaz%b(H%i&Ny
zc|^et3_~P?&+->N9%Y{lX!q-A{CWeAb3A9yt`?Zj=ZaJkI6m%fWe4|*HJ?-&003GC
zXkLeys%oYUpzs;6*T-$E?V<-y5Cl<*N$Mph-C9|K{}_hQIxAn6z0b<C@EKs5r(*W#
zqy4IjcYgx}y?-UN{~t2#@%X1ARR&BZJ{oW9m`waNU!E<^006+}?s;s_t`@Kz2Oj4e
z{nG9}qb+!P_nG!fU$)XsmrA$fDn9^~|N8_%5ClOG1VIolM$~9vj0w{`m9FWK+dyQD
z3EOe-!~cfheu0OZmA^9Qe(4POr0Y^;LGE8nHyy_BIe#8*<jH_qUhpl;g2y?6-V#A?
z8B3suB<HDvHA#~%E3yP4nVy^-iIcOVtuJXQ+spwY*TolIFSG<0V?yfy=AFLg|9*R`
z>@0z#?nkZ*+i^-Ef#!9Hf6WFw&f#&6=-S?M%~K_B@@rWZMy?BBb@?g${RdN3Eo24&
zK)YWDuyHy~8o6%#odd%Vo3cTgDv*|d$2n}r!Pkq6-6fEuOjRH$0o!rn%sproDC#08
zs|w^Do=CHtJ!lmuE1Rl79<OB@fT^lNd-T!n*W)TsDU$P)wAb|sf*=TjI2cbVqKV4A
SJG(Ie0000<MNUMnLSTZXgeoZj

diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png
index eb09c52fc3a078a9f0995ffac3b3d44ebaee7244..4bcd29d7f4bedbfe0efad7a738265da1ea9ca702 100644
GIT binary patch
delta 92
zcmbQs*v2@)Fx0`*#WAE}&fA-gybKBg%m-IFn0zuQ$#~%Cu|tyeui0z{28NoXv@2e(
uzVb0JG{o&O1PU-PEZ91Gqe}-P1A|{~;sxG=%)BBMAYo5eKbLh*2~7ayCLXf@

delta 115
zcmZo;oXa@DFelv8#WAE}&f8mooCgeeTrVDX2`Lfvb?4nG#&!Dz({m1v@8&9;3=9k(
z+?8kA=FWR}<J#qC9<NxKfkF%nZ&uVX?3~B9<MO>1K;E~hzhr(peRbtwc(8&sGll0<
T#mz~RK*~H_{an^LB{Ts5O_nYE


From 535d91575552f4cb7cbd881b3555582e67e47944 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 04:51:05 -0400
Subject: [PATCH 045/366] use BreakOnMove

---
 Content.Client/Radio/Ui/IntercomMenu.xaml.cs              | 5 +----
 Content.Server/Flight/FlightSystem.cs                     | 3 +--
 Content.Server/LifeDrainer/LifeDrainerSystem.cs           | 1 -
 Content.Server/Medical/PenLightSystem.cs                  | 1 -
 Content.Server/Paint/PaintSystem.cs                       | 1 -
 Content.Server/Power/Generator/PortableGeneratorSystem.cs | 4 +++-
 Content.Server/Power/Systems/BatteryDrinkerSystem.cs      | 1 -
 Content.Server/Supermatter/Systems/SupermatterSystem.cs   | 1 -
 Content.Shared/Lock/LockSystem.cs                         | 8 ++++++--
 Content.Shared/Magic/SpellbookSystem.cs                   | 1 -
 Content.Shared/Medical/CPR/Systems/CPRSystem.cs           | 1 -
 .../Medical/Surgery/SharedSurgerySystem.Steps.cs          | 1 -
 .../Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs | 1 -
 Content.Shared/Paint/PaintRemoverSystem.cs                | 2 --
 14 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/Content.Client/Radio/Ui/IntercomMenu.xaml.cs b/Content.Client/Radio/Ui/IntercomMenu.xaml.cs
index e6645acb7ba..de659a07039 100644
--- a/Content.Client/Radio/Ui/IntercomMenu.xaml.cs
+++ b/Content.Client/Radio/Ui/IntercomMenu.xaml.cs
@@ -19,15 +19,13 @@ public sealed partial class IntercomMenu : FancyWindow
 
     private readonly List<string> _channels = new();
 
-    public IntercomMenu(Entity<IntercomComponent> entity)
+    public IntercomMenu()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
 
         MicButton.OnPressed += args => OnMicPressed?.Invoke(args.Button.Pressed);
         SpeakerButton.OnPressed += args => OnSpeakerPressed?.Invoke(args.Button.Pressed);
-
-        Update(entity);
     }
 
     public void Update(Entity<IntercomComponent> entity)
@@ -70,4 +68,3 @@ public void Update(Entity<IntercomComponent> entity)
         };
     }
 }
-
diff --git a/Content.Server/Flight/FlightSystem.cs b/Content.Server/Flight/FlightSystem.cs
index 86eed994329..4493967fe9e 100644
--- a/Content.Server/Flight/FlightSystem.cs
+++ b/Content.Server/Flight/FlightSystem.cs
@@ -67,7 +67,6 @@ private void OnToggleFlight(EntityUid uid, FlightComponent component, ToggleFlig
             new FlightDoAfterEvent(), uid, target: uid)
             {
                 BlockDuplicate = true,
-                ,
                 BreakOnMove = true,
                 BreakOnDamage = true,
                 NeedHand = true
@@ -173,4 +172,4 @@ private void OnSleep(EntityUid uid, FlightComponent component, ref SleepStateCha
         Dirty(uid, stamina);
     }
     #endregion
-}
\ No newline at end of file
+}
diff --git a/Content.Server/LifeDrainer/LifeDrainerSystem.cs b/Content.Server/LifeDrainer/LifeDrainerSystem.cs
index 12d3bedad99..2a9c5bb4583 100644
--- a/Content.Server/LifeDrainer/LifeDrainerSystem.cs
+++ b/Content.Server/LifeDrainer/LifeDrainerSystem.cs
@@ -122,7 +122,6 @@ public bool TryDrain(Entity<LifeDrainerComponent> ent, EntityUid target)
         var ev = new LifeDrainDoAfterEvent();
         var args = new DoAfterArgs(EntityManager, uid, comp.Delay, ev, target: target, eventTarget: uid)
         {
-            ,
             BreakOnMove = true,
             MovementThreshold = 2f,
             NeedHand = false
diff --git a/Content.Server/Medical/PenLightSystem.cs b/Content.Server/Medical/PenLightSystem.cs
index 6d7157b38c3..c092b4c5902 100644
--- a/Content.Server/Medical/PenLightSystem.cs
+++ b/Content.Server/Medical/PenLightSystem.cs
@@ -92,7 +92,6 @@ public bool TryStartExam(EntityUid uid, EntityUid target, EntityUid user, PenLig
         {
             BlockDuplicate = true,
             BreakOnMove = true,
-            ,
             BreakOnHandChange = true,
             NeedHand = true
         });
diff --git a/Content.Server/Paint/PaintSystem.cs b/Content.Server/Paint/PaintSystem.cs
index a03de99e681..9d7158baab0 100644
--- a/Content.Server/Paint/PaintSystem.cs
+++ b/Content.Server/Paint/PaintSystem.cs
@@ -83,7 +83,6 @@ private void PrepPaint(EntityUid uid, PaintComponent component, EntityUid target
                 used: uid)
             {
                 BreakOnMove = true,
-                ,
                 NeedHand = true,
                 BreakOnHandChange = true,
             });
diff --git a/Content.Server/Power/Generator/PortableGeneratorSystem.cs b/Content.Server/Power/Generator/PortableGeneratorSystem.cs
index f7d259b122a..33033daa054 100644
--- a/Content.Server/Power/Generator/PortableGeneratorSystem.cs
+++ b/Content.Server/Power/Generator/PortableGeneratorSystem.cs
@@ -73,7 +73,9 @@ private void StartGenerator(EntityUid uid, PortableGeneratorComponent component,
 
         _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, component.StartTime, new GeneratorStartedEvent(), uid, uid)
         {
-            BreakOnDamage = true, BreakOnMove = true, RequireCanInteract = true,
+            BreakOnDamage = true,
+            BreakOnMove = true,
+            RequireCanInteract = true,
             NeedHand = true
         });
     }
diff --git a/Content.Server/Power/Systems/BatteryDrinkerSystem.cs b/Content.Server/Power/Systems/BatteryDrinkerSystem.cs
index 0080e754386..4f2ddf0bbad 100644
--- a/Content.Server/Power/Systems/BatteryDrinkerSystem.cs
+++ b/Content.Server/Power/Systems/BatteryDrinkerSystem.cs
@@ -72,7 +72,6 @@ private void DrinkBattery(EntityUid target, EntityUid user, BatteryDrinkerCompon
         var args = new DoAfterArgs(EntityManager, user, doAfterTime, new BatteryDrinkerDoAfterEvent(), user, target) // TODO: Make this doafter loop, once we merge Upstream.
         {
             BreakOnDamage = true,
-            ,
             BreakOnMove = true,
             Broadcast = false,
             DistanceThreshold = 1.35f,
diff --git a/Content.Server/Supermatter/Systems/SupermatterSystem.cs b/Content.Server/Supermatter/Systems/SupermatterSystem.cs
index 019996374b2..24039a50c2b 100644
--- a/Content.Server/Supermatter/Systems/SupermatterSystem.cs
+++ b/Content.Server/Supermatter/Systems/SupermatterSystem.cs
@@ -176,7 +176,6 @@ private void OnItemInteract(EntityUid uid, SupermatterComponent sm, ref Interact
         {
             BreakOnDamage = true,
             BreakOnHandChange = false,
-            ,
             BreakOnMove = true,
             BreakOnWeightlessMove = false,
             NeedHand = true,
diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs
index 9735d71a519..9c1d1a1c789 100644
--- a/Content.Shared/Lock/LockSystem.cs
+++ b/Content.Shared/Lock/LockSystem.cs
@@ -121,7 +121,9 @@ public bool TryLock(EntityUid uid, EntityUid user, LockComponent? lockComp = nul
             return _doAfter.TryStartDoAfter(
                 new DoAfterArgs(EntityManager, user, lockComp.LockTime, new LockDoAfter(), uid, uid)
                 {
-                    BreakOnDamage = true, BreakOnMove = true, RequireCanInteract = true,
+                    BreakOnDamage = true,
+                    BreakOnMove = true,
+                    RequireCanInteract = true,
                     NeedHand = true
                 });
         }
@@ -197,7 +199,9 @@ public bool TryUnlock(EntityUid uid, EntityUid user, LockComponent? lockComp = n
             return _doAfter.TryStartDoAfter(
                 new DoAfterArgs(EntityManager, user, lockComp.LockTime, new UnlockDoAfter(), uid, uid)
                 {
-                    BreakOnDamage = true, BreakOnMove = true, RequireCanInteract = true,
+                    BreakOnDamage = true,
+                    BreakOnMove = true,
+                    RequireCanInteract = true,
                     NeedHand = true
                 });
         }
diff --git a/Content.Shared/Magic/SpellbookSystem.cs b/Content.Shared/Magic/SpellbookSystem.cs
index bb774db1c25..139c6a1a125 100644
--- a/Content.Shared/Magic/SpellbookSystem.cs
+++ b/Content.Shared/Magic/SpellbookSystem.cs
@@ -86,7 +86,6 @@ private void AttemptLearn(Entity<SpellbookComponent> ent, UseInHandEvent args)
     {
         var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, ent.Comp.LearnTime, new SpellbookDoAfterEvent(), ent, target: ent)
         {
-            ,
             BreakOnMove = true,
             BreakOnWeightlessMove = true,
             BreakOnDamage = true,
diff --git a/Content.Shared/Medical/CPR/Systems/CPRSystem.cs b/Content.Shared/Medical/CPR/Systems/CPRSystem.cs
index 7238fe5a097..d82a7ee202b 100644
--- a/Content.Shared/Medical/CPR/Systems/CPRSystem.cs
+++ b/Content.Shared/Medical/CPR/Systems/CPRSystem.cs
@@ -95,7 +95,6 @@ private void StartCPR(EntityUid performer, EntityUid target, CPRTrainingComponen
 
             _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, performer, cprComponent.DoAfterDuration, new CPRDoAfterEvent(), performer, target, performer)
             {
-                ,
                 BreakOnMove = true,
                 NeedHand = true,
                 BlockDuplicate = true
diff --git a/Content.Shared/Medical/Surgery/SharedSurgerySystem.Steps.cs b/Content.Shared/Medical/Surgery/SharedSurgerySystem.Steps.cs
index 0ab76cb42f7..b5d717eaa47 100644
--- a/Content.Shared/Medical/Surgery/SharedSurgerySystem.Steps.cs
+++ b/Content.Shared/Medical/Surgery/SharedSurgerySystem.Steps.cs
@@ -729,7 +729,6 @@ private void OnSurgeryTargetStepChosen(Entity<SurgeryTargetComponent> ent, ref S
         var doAfter = new DoAfterArgs(EntityManager, user, TimeSpan.FromSeconds(duration), ev, body, part)
         {
             BreakOnMove = true,
-            ,
             CancelDuplicate = true,
             DuplicateCondition = DuplicateConditions.SameEvent,
             NeedHand = true,
diff --git a/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs b/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs
index 227c13c3d2c..7dc85781170 100644
--- a/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs
+++ b/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs
@@ -163,7 +163,6 @@ protected void StartInsertDoAfter(EntityUid inserter, EntityUid toInsert, Entity
         var ev = new PseudoItemInsertDoAfterEvent();
         var args = new DoAfterArgs(EntityManager, inserter, 5f, ev, toInsert, toInsert, storageEntity)
         {
-            ,
             BreakOnMove = true,
             NeedHand = true
         };
diff --git a/Content.Shared/Paint/PaintRemoverSystem.cs b/Content.Shared/Paint/PaintRemoverSystem.cs
index e800a1de656..b67ef156fa7 100644
--- a/Content.Shared/Paint/PaintRemoverSystem.cs
+++ b/Content.Shared/Paint/PaintRemoverSystem.cs
@@ -37,7 +37,6 @@ private void OnInteract(EntityUid uid, PaintRemoverComponent component, AfterInt
         _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, component.CleanDelay, new PaintRemoverDoAfterEvent(), uid, args.Target, uid)
         {
             BreakOnMove = true,
-            ,
             BreakOnDamage = true,
             MovementThreshold = 1.0f,
         });
@@ -84,7 +83,6 @@ private void OnPaintRemoveVerb(EntityUid uid, PaintRemoverComponent component, G
                         uid)
                     {
                         BreakOnMove = true,
-                        ,
                         BreakOnDamage = true,
                         MovementThreshold = 1.0f,
                     });

From 32470987aa7f3762e1a1b66ded3facb5027999fa Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 06:01:14 -0400
Subject: [PATCH 046/366] hum

---
 Content.Client/Access/UI/AgentIDCardWindow.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
index 8ba556ce60c..9bc255ec1d0 100644
--- a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
+++ b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
@@ -47,7 +47,7 @@ public void SetAllowedIcons(string currentJobIconId)
             var i = 0;
             var icons = _prototypeManager.EnumeratePrototypes<JobIconPrototype>().Where(icon => icon.AllowSelection).ToList();
             icons.Sort((x, y) => string.Compare(x.LocalizedJobName, y.LocalizedJobName, StringComparison.CurrentCulture));
-            foreach (var jobIcon in icons)
+            foreach (var jobIconId in icons)
             {
                 if (!_prototypeManager.TryIndex<JobIconPrototype>(jobIconId, out var jobIcon))
                     continue;

From 21fe24f8b49c37fbe58c36196fa4bb6f3f03ba2a Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Wed, 19 Jun 2024 11:04:30 -0400
Subject: [PATCH 047/366] Add prediction for Tech Disks, cleanup (#29061)

* Add prediction for Tech Disks, cleanup

* Remove IsServer check in OnMapInit

* Use HashSet for techs, remove LINQ
---
 .../Systems/ResearchSystem.Technology.cs      | 19 ----
 .../Components/TechnologyDiskComponent.cs     | 20 ----
 .../Systems/TechnologyDiskSystem.cs           | 92 ------------------
 .../Research/Systems/SharedResearchSystem.cs  | 19 ++++
 .../Components/TechnologyDiskComponent.cs     | 24 +++++
 .../Systems/TechnologyDiskSystem.cs           | 94 +++++++++++++++++++
 6 files changed, 137 insertions(+), 131 deletions(-)
 delete mode 100644 Content.Server/Research/TechnologyDisk/Components/TechnologyDiskComponent.cs
 delete mode 100644 Content.Server/Research/TechnologyDisk/Systems/TechnologyDiskSystem.cs
 create mode 100644 Content.Shared/Research/TechnologyDisk/Components/TechnologyDiskComponent.cs
 create mode 100644 Content.Shared/Research/TechnologyDisk/Systems/TechnologyDiskSystem.cs

diff --git a/Content.Server/Research/Systems/ResearchSystem.Technology.cs b/Content.Server/Research/Systems/ResearchSystem.Technology.cs
index 9bd71cf7c6e..7578d316c5e 100644
--- a/Content.Server/Research/Systems/ResearchSystem.Technology.cs
+++ b/Content.Server/Research/Systems/ResearchSystem.Technology.cs
@@ -131,25 +131,6 @@ public void AddTechnology(EntityUid uid, TechnologyPrototype technology, Technol
         RaiseLocalEvent(uid, ref ev);
     }
 
-    /// <summary>
-    /// Adds a lathe recipe to the specified technology database
-    /// without checking if it can be unlocked.
-    /// </summary>
-    public void AddLatheRecipe(EntityUid uid, string recipe, TechnologyDatabaseComponent? component = null)
-    {
-        if (!Resolve(uid, ref component))
-            return;
-
-        if (component.UnlockedRecipes.Contains(recipe))
-            return;
-
-        component.UnlockedRecipes.Add(recipe);
-        Dirty(uid, component);
-
-        var ev = new TechnologyDatabaseModifiedEvent();
-        RaiseLocalEvent(uid, ref ev);
-    }
-
     /// <summary>
     ///     Returns whether a technology can be unlocked on this database,
     ///     taking parent technologies into account.
diff --git a/Content.Server/Research/TechnologyDisk/Components/TechnologyDiskComponent.cs b/Content.Server/Research/TechnologyDisk/Components/TechnologyDiskComponent.cs
deleted file mode 100644
index eb5a0623a08..00000000000
--- a/Content.Server/Research/TechnologyDisk/Components/TechnologyDiskComponent.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Shared.Random;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.Research.TechnologyDisk.Components;
-
-[RegisterComponent]
-public sealed partial class TechnologyDiskComponent : Component
-{
-    /// <summary>
-    /// The recipe that will be added. If null, one will be randomly generated
-    /// </summary>
-    [DataField("recipes")]
-    public List<string>? Recipes;
-
-    /// <summary>
-    /// A weighted random prototype for how rare each tier should be.
-    /// </summary>
-    [DataField("tierWeightPrototype", customTypeSerializer: typeof(PrototypeIdSerializer<WeightedRandomPrototype>))]
-    public string TierWeightPrototype = "TechDiskTierWeights";
-}
diff --git a/Content.Server/Research/TechnologyDisk/Systems/TechnologyDiskSystem.cs b/Content.Server/Research/TechnologyDisk/Systems/TechnologyDiskSystem.cs
deleted file mode 100644
index 176b2b68bc9..00000000000
--- a/Content.Server/Research/TechnologyDisk/Systems/TechnologyDiskSystem.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using System.Linq;
-using Content.Server.Popups;
-using Content.Server.Research.Systems;
-using Content.Server.Research.TechnologyDisk.Components;
-using Content.Shared.Examine;
-using Content.Shared.Interaction;
-using Content.Shared.Random;
-using Content.Shared.Random.Helpers;
-using Content.Shared.Research.Components;
-using Content.Shared.Research.Prototypes;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Server.Research.TechnologyDisk.Systems;
-
-public sealed class TechnologyDiskSystem : EntitySystem
-{
-    [Dependency] private readonly PopupSystem _popup = default!;
-    [Dependency] private readonly ResearchSystem _research = default!;
-    [Dependency] private readonly IPrototypeManager _prototype = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-
-    /// <inheritdoc/>
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<TechnologyDiskComponent, AfterInteractEvent>(OnAfterInteract);
-        SubscribeLocalEvent<TechnologyDiskComponent, ExaminedEvent>(OnExamine);
-        SubscribeLocalEvent<TechnologyDiskComponent, MapInitEvent>(OnMapInit);
-    }
-
-    private void OnAfterInteract(EntityUid uid, TechnologyDiskComponent component, AfterInteractEvent args)
-    {
-        if (args.Handled || !args.CanReach || args.Target is not { } target)
-            return;
-
-        if (!HasComp<ResearchServerComponent>(target) || !TryComp<TechnologyDatabaseComponent>(target, out var database))
-            return;
-
-        if (component.Recipes != null)
-        {
-            foreach (var recipe in component.Recipes)
-            {
-                _research.AddLatheRecipe(target, recipe, database);
-            }
-        }
-        _popup.PopupEntity(Loc.GetString("tech-disk-inserted"), target, args.User);
-        QueueDel(uid);
-        args.Handled = true;
-    }
-
-    private void OnExamine(EntityUid uid, TechnologyDiskComponent component, ExaminedEvent args)
-    {
-        var message = Loc.GetString("tech-disk-examine-none");
-        if (component.Recipes != null && component.Recipes.Any())
-        {
-            var prototype = _prototype.Index<LatheRecipePrototype>(component.Recipes[0]);
-            var resultPrototype = _prototype.Index<EntityPrototype>(prototype.Result);
-            message = Loc.GetString("tech-disk-examine", ("result", resultPrototype.Name));
-
-            if (component.Recipes.Count > 1) //idk how to do this well. sue me.
-                message += " " + Loc.GetString("tech-disk-examine-more");
-        }
-        args.PushMarkup(message);
-    }
-
-    private void OnMapInit(EntityUid uid, TechnologyDiskComponent component, MapInitEvent args)
-    {
-        if (component.Recipes != null)
-            return;
-
-        var weightedRandom = _prototype.Index<WeightedRandomPrototype>(component.TierWeightPrototype);
-        var tier = int.Parse(weightedRandom.Pick(_random));
-
-        //get a list of every distinct recipe in all the technologies.
-        var techs = new List<ProtoId<LatheRecipePrototype>>();
-        foreach (var tech in _prototype.EnumeratePrototypes<TechnologyPrototype>())
-        {
-            if (tech.Tier != tier)
-                continue;
-
-            techs.AddRange(tech.RecipeUnlocks);
-        }
-        techs = techs.Distinct().ToList();
-
-        if (!techs.Any())
-            return;
-
-        //pick one
-        component.Recipes = new();
-        component.Recipes.Add(_random.Pick(techs));
-    }
-}
diff --git a/Content.Shared/Research/Systems/SharedResearchSystem.cs b/Content.Shared/Research/Systems/SharedResearchSystem.cs
index 9819e949b8b..81c6950f283 100644
--- a/Content.Shared/Research/Systems/SharedResearchSystem.cs
+++ b/Content.Shared/Research/Systems/SharedResearchSystem.cs
@@ -280,4 +280,23 @@ public void ClearTechs(EntityUid uid, TechnologyDatabaseComponent? comp = null)
         comp.UnlockedTechnologies.Clear();
         Dirty(uid, comp);
     }
+
+    /// <summary>
+    /// Adds a lathe recipe to the specified technology database
+    /// without checking if it can be unlocked.
+    /// </summary>
+    public void AddLatheRecipe(EntityUid uid, string recipe, TechnologyDatabaseComponent? component = null)
+    {
+        if (!Resolve(uid, ref component))
+            return;
+
+        if (component.UnlockedRecipes.Contains(recipe))
+            return;
+
+        component.UnlockedRecipes.Add(recipe);
+        Dirty(uid, component);
+
+        var ev = new TechnologyDatabaseModifiedEvent();
+        RaiseLocalEvent(uid, ref ev);
+    }
 }
diff --git a/Content.Shared/Research/TechnologyDisk/Components/TechnologyDiskComponent.cs b/Content.Shared/Research/TechnologyDisk/Components/TechnologyDiskComponent.cs
new file mode 100644
index 00000000000..ce8a138bdbd
--- /dev/null
+++ b/Content.Shared/Research/TechnologyDisk/Components/TechnologyDiskComponent.cs
@@ -0,0 +1,24 @@
+using Content.Shared.Random;
+using Content.Shared.Research.Prototypes;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Research.TechnologyDisk.Components;
+
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState]
+public sealed partial class TechnologyDiskComponent : Component
+{
+    /// <summary>
+    /// The recipe that will be added. If null, one will be randomly generated
+    /// </summary>
+    [DataField]
+    [AutoNetworkedField]
+    public List<ProtoId<LatheRecipePrototype>>? Recipes;
+
+    /// <summary>
+    /// A weighted random prototype for how rare each tier should be.
+    /// </summary>
+    [DataField]
+    public ProtoId<WeightedRandomPrototype> TierWeightPrototype = "TechDiskTierWeights";
+}
diff --git a/Content.Shared/Research/TechnologyDisk/Systems/TechnologyDiskSystem.cs b/Content.Shared/Research/TechnologyDisk/Systems/TechnologyDiskSystem.cs
new file mode 100644
index 00000000000..b0d615fcb3b
--- /dev/null
+++ b/Content.Shared/Research/TechnologyDisk/Systems/TechnologyDiskSystem.cs
@@ -0,0 +1,94 @@
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Popups;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Research.Components;
+using Content.Shared.Research.Prototypes;
+using Content.Shared.Research.Systems;
+using Content.Shared.Research.TechnologyDisk.Components;
+using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Shared.Research.TechnologyDisk.Systems;
+
+public sealed class TechnologyDiskSystem : EntitySystem
+{
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly IPrototypeManager _protoMan = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedResearchSystem _research = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TechnologyDiskComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<TechnologyDiskComponent, AfterInteractEvent>(OnAfterInteract);
+        SubscribeLocalEvent<TechnologyDiskComponent, ExaminedEvent>(OnExamine);
+    }
+
+    private void OnMapInit(Entity<TechnologyDiskComponent> ent, ref MapInitEvent args)
+    {
+        if (ent.Comp.Recipes != null)
+            return;
+
+        var weightedRandom = _protoMan.Index(ent.Comp.TierWeightPrototype);
+        var tier = int.Parse(weightedRandom.Pick(_random));
+
+        //get a list of every distinct recipe in all the technologies.
+        var techs = new HashSet<ProtoId<LatheRecipePrototype>>();
+        foreach (var tech in _protoMan.EnumeratePrototypes<TechnologyPrototype>())
+        {
+            if (tech.Tier != tier)
+                continue;
+
+            techs.UnionWith(tech.RecipeUnlocks);
+        }
+
+        if (techs.Count == 0)
+            return;
+
+        //pick one
+        ent.Comp.Recipes = [];
+        ent.Comp.Recipes.Add(_random.Pick(techs));
+        Dirty(ent);
+    }
+
+    private void OnAfterInteract(Entity<TechnologyDiskComponent> ent, ref AfterInteractEvent args)
+    {
+        if (args.Handled || !args.CanReach || args.Target is not { } target)
+            return;
+
+        if (!HasComp<ResearchServerComponent>(target) || !TryComp<TechnologyDatabaseComponent>(target, out var database))
+            return;
+
+        if (ent.Comp.Recipes != null)
+        {
+            foreach (var recipe in ent.Comp.Recipes)
+            {
+                _research.AddLatheRecipe(target, recipe, database);
+            }
+        }
+        _popup.PopupClient(Loc.GetString("tech-disk-inserted"), target, args.User);
+        if (_net.IsServer)
+            QueueDel(ent);
+        args.Handled = true;
+    }
+
+    private void OnExamine(Entity<TechnologyDiskComponent> ent, ref ExaminedEvent args)
+    {
+        var message = Loc.GetString("tech-disk-examine-none");
+        if (ent.Comp.Recipes != null && ent.Comp.Recipes.Count > 0)
+        {
+            var prototype = _protoMan.Index(ent.Comp.Recipes[0]);
+            var resultPrototype = _protoMan.Index<EntityPrototype>(prototype.Result);
+            message = Loc.GetString("tech-disk-examine", ("result", resultPrototype.Name));
+
+            if (ent.Comp.Recipes.Count > 1) //idk how to do this well. sue me.
+                message += " " + Loc.GetString("tech-disk-examine-more");
+        }
+        args.PushMarkup(message);
+    }
+}

From f4e41bf9e6878fad31b5e85b678bf9a63cb10f8f Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Thu, 1 Aug 2024 00:15:05 -0400
Subject: [PATCH 048/366] Add support for printing reagents in lathes (#30476)

* Add support for reagents in lathes

* missing locale
---
 Content.Client/Lathe/UI/LatheMenu.xaml        |  9 +-
 Content.Client/Lathe/UI/LatheMenu.xaml.cs     | 65 +++++++++-----
 Content.Client/Lathe/UI/RecipeControl.xaml    |  4 +-
 Content.Client/Lathe/UI/RecipeControl.xaml.cs |  8 +-
 .../Tests/MaterialArbitrageTest.cs            |  6 +-
 Content.Server/Cargo/Systems/PricingSystem.cs | 21 +++++
 Content.Server/Lathe/LatheSystem.cs           | 50 +++++++++--
 .../UserInterface/StatValuesCommand.cs        |  7 +-
 .../Construction/MachinePartSystem.cs         |  8 +-
 Content.Shared/Lathe/LatheComponent.cs        |  3 +
 Content.Shared/Lathe/SharedLatheSystem.cs     | 70 ++++++++++++++-
 .../Prototypes/LatheRecipePrototype.cs        | 89 +++++--------------
 .../Research/Systems/SharedResearchSystem.cs  |  4 +-
 .../Systems/TechnologyDiskSystem.cs           |  5 +-
 Resources/Locale/en-US/lathe/recipes.ftl      |  8 ++
 .../Locale/en-US/lathe/ui/lathe-menu.ftl      |  3 +
 .../Prototypes/Recipes/Lathes/medical.yml     | 16 ++--
 17 files changed, 243 insertions(+), 133 deletions(-)
 create mode 100644 Resources/Locale/en-US/lathe/recipes.ftl

diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml b/Content.Client/Lathe/UI/LatheMenu.xaml
index 6f484d8c7be..7e978c1ae56 100644
--- a/Content.Client/Lathe/UI/LatheMenu.xaml
+++ b/Content.Client/Lathe/UI/LatheMenu.xaml
@@ -100,12 +100,9 @@
                             Margin="5 0 0 0"
                             Text="{Loc 'lathe-menu-fabricating-message'}">
                         </Label>
-                        <TextureRect
-                            Name="Icon"
-                            HorizontalExpand="True"
-                            SizeFlagsStretchRatio="2"
-                            Margin="100 0 0 0">
-                        </TextureRect>
+                        <BoxContainer Name="FabricatingDisplayContainer"
+                                      HorizontalAlignment="Left"
+                                      Margin="100 0 0 0"/>
                         <Label
                             Name="NameLabel"
                             RectClipContent="True"
diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml.cs b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
index 649c8acc859..0b42ea69db7 100644
--- a/Content.Client/Lathe/UI/LatheMenu.xaml.cs
+++ b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
@@ -1,18 +1,15 @@
-using System.Buffers;
 using System.Linq;
 using System.Text;
 using Content.Client.Materials;
 using Content.Shared.Lathe;
 using Content.Shared.Lathe.Prototypes;
-using Content.Shared.Materials;
 using Content.Shared.Research.Prototypes;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Client.ResourceManagement;
-using Robust.Client.Graphics;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.Lathe.UI;
@@ -96,7 +93,7 @@ public void PopulateRecipes()
 
             if (SearchBar.Text.Trim().Length != 0)
             {
-                if (proto.Name.ToLowerInvariant().Contains(SearchBar.Text.Trim().ToLowerInvariant()))
+                if (_lathe.GetRecipeName(recipe).ToLowerInvariant().Contains(SearchBar.Text.Trim().ToLowerInvariant()))
                     recipesToShow.Add(proto);
             }
             else
@@ -108,19 +105,15 @@ public void PopulateRecipes()
         if (!int.TryParse(AmountLineEdit.Text, out var quantity) || quantity <= 0)
             quantity = 1;
 
-        var sortedRecipesToShow = recipesToShow.OrderBy(p => p.Name);
+        var sortedRecipesToShow = recipesToShow.OrderBy(_lathe.GetRecipeName);
         RecipeList.Children.Clear();
         _entityManager.TryGetComponent(Entity, out LatheComponent? lathe);
 
         foreach (var prototype in sortedRecipesToShow)
         {
-            EntityPrototype? recipeProto = null;
-            if (_prototypeManager.TryIndex(prototype.Result, out EntityPrototype? entityProto))
-                recipeProto = entityProto;
-
             var canProduce = _lathe.CanProduce(Entity, prototype, quantity, component: lathe);
 
-            var control = new RecipeControl(prototype, () => GenerateTooltipText(prototype), canProduce, textures);
+            var control = new RecipeControl(_lathe, prototype, () => GenerateTooltipText(prototype), canProduce, GetRecipeDisplayControl(prototype));
             control.OnButtonPressed += s =>
             {
                 if (!int.TryParse(AmountLineEdit.Text, out var amount) || amount <= 0)
@@ -136,9 +129,9 @@ private string GenerateTooltipText(LatheRecipePrototype prototype)
         StringBuilder sb = new();
         var multiplier = _entityManager.GetComponent<LatheComponent>(Entity).MaterialUseMultiplier;
 
-        foreach (var (id, amount) in prototype.RequiredMaterials)
+        foreach (var (id, amount) in prototype.Materials)
         {
-            if (!_prototypeManager.TryIndex<MaterialPrototype>(id, out var proto))
+            if (!_prototypeManager.TryIndex(id, out var proto))
                 continue;
 
             var adjustedAmount = SharedLatheSystem.AdjustMaterial(amount, prototype.ApplyMaterialDiscount, multiplier);
@@ -167,8 +160,9 @@ private string GenerateTooltipText(LatheRecipePrototype prototype)
             sb.AppendLine(tooltipText);
         }
 
-        if (!string.IsNullOrWhiteSpace(prototype.Description))
-            sb.AppendLine(Loc.GetString("lathe-menu-description-display", ("description", prototype.Description)));
+        var desc = _lathe.GetRecipeDescription(prototype);
+        if (!string.IsNullOrWhiteSpace(desc))
+            sb.AppendLine(Loc.GetString("lathe-menu-description-display", ("description", desc)));
 
         // Remove last newline
         if (sb.Length > 0)
@@ -222,10 +216,15 @@ public void PopulateQueueList(List<LatheRecipePrototype> queue)
         var idx = 1;
         foreach (var recipe in queue)
         {
-            var icon = recipe.Icon == null
-                ? _spriteSystem.GetPrototypeIcon(recipe.Result).Default
-                : _spriteSystem.Frame0(recipe.Icon);
-            QueueList.AddItem($"{idx}. {recipe.Name}", icon);
+            var queuedRecipeBox = new BoxContainer();
+            queuedRecipeBox.Orientation = BoxContainer.LayoutOrientation.Horizontal;
+
+            queuedRecipeBox.AddChild(GetRecipeDisplayControl(recipe));
+
+            var queuedRecipeLabel = new Label();
+            queuedRecipeLabel.Text = $"{idx}. {_lathe.GetRecipeName(recipe)}";
+            queuedRecipeBox.AddChild(queuedRecipeLabel);
+            QueueList.AddChild(queuedRecipeBox);
             idx++;
         }
     }
@@ -235,10 +234,30 @@ public void SetQueueInfo(LatheRecipePrototype? recipe)
         FabricatingContainer.Visible = recipe != null;
         if (recipe == null)
             return;
-        Icon.Texture = recipe.Icon == null
-            ? _spriteSystem.GetPrototypeIcon(recipe.Result).Default
-            : _spriteSystem.Frame0(recipe.Icon);
-        NameLabel.Text = $"{recipe.Name}";
+
+        FabricatingDisplayContainer.Children.Clear();
+        FabricatingDisplayContainer.AddChild(GetRecipeDisplayControl(recipe));
+
+        NameLabel.Text = _lathe.GetRecipeName(recipe);
+    }
+
+    public Control GetRecipeDisplayControl(LatheRecipePrototype recipe)
+    {
+        if (recipe.Icon != null)
+        {
+            var textRect = new TextureRect();
+            textRect.Texture = _spriteSystem.Frame0(recipe.Icon);
+            return textRect;
+        }
+
+        if (recipe.Result is { } result)
+        {
+            var entProtoView = new EntityPrototypeView();
+            entProtoView.SetPrototype(result);
+            return entProtoView;
+        }
+
+        return new Control();
     }
 
     private void OnItemSelected(OptionButton.ItemSelectedEventArgs obj)
diff --git a/Content.Client/Lathe/UI/RecipeControl.xaml b/Content.Client/Lathe/UI/RecipeControl.xaml
index d1371a026a2..d5901da53aa 100644
--- a/Content.Client/Lathe/UI/RecipeControl.xaml
+++ b/Content.Client/Lathe/UI/RecipeControl.xaml
@@ -5,8 +5,8 @@
         Margin="0"
         StyleClasses="ButtonSquare">
         <BoxContainer Orientation="Horizontal">
-            <LayeredTextureRect
-                Name="RecipeTextures"
+            <BoxContainer
+                Name="RecipeDisplayContainer"
                 Margin="0 0 4 0"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
diff --git a/Content.Client/Lathe/UI/RecipeControl.xaml.cs b/Content.Client/Lathe/UI/RecipeControl.xaml.cs
index 47b6b5932c4..4f438c8a8e5 100644
--- a/Content.Client/Lathe/UI/RecipeControl.xaml.cs
+++ b/Content.Client/Lathe/UI/RecipeControl.xaml.cs
@@ -1,8 +1,6 @@
 using Content.Shared.Research.Prototypes;
 using Robust.Client.AutoGenerated;
-using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
 namespace Content.Client.Lathe.UI;
@@ -13,12 +11,12 @@ public sealed partial class RecipeControl : Control
     public Action<string>? OnButtonPressed;
     public Func<string> TooltipTextSupplier;
 
-    public RecipeControl(LatheRecipePrototype recipe, Func<string> tooltipTextSupplier, bool canProduce, List<Texture> textures)
+    public RecipeControl(LatheSystem latheSystem, LatheRecipePrototype recipe, Func<string> tooltipTextSupplier, bool canProduce, Control displayControl)
     {
         RobustXamlLoader.Load(this);
 
-        RecipeName.Text = recipe.Name;
-        RecipeTextures.Textures = textures;
+        RecipeName.Text = latheSystem.GetRecipeName(recipe);
+        RecipeDisplayContainer.AddChild(displayControl);
         Button.Disabled = !canProduce;
         TooltipTextSupplier = tooltipTextSupplier;
         Button.TooltipSupplier = SupplyTooltip;
diff --git a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
index 12b395f86d3..54b394f67b8 100644
--- a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
+++ b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
@@ -192,7 +192,7 @@ public async Task NoMaterialArbitrage()
                 {
                     foreach (var recipe in recipes)
                     {
-                        foreach (var (matId, amount) in recipe.RequiredMaterials)
+                        foreach (var (matId, amount) in recipe.Materials)
                         {
                             var actualAmount = SharedLatheSystem.AdjustMaterial(amount, recipe.ApplyMaterialDiscount, multiplier);
                             if (spawnedMats.TryGetValue(matId, out var numSpawned))
@@ -272,7 +272,7 @@ public async Task NoMaterialArbitrage()
                 {
                     foreach (var recipe in recipes)
                     {
-                        foreach (var (matId, amount) in recipe.RequiredMaterials)
+                        foreach (var (matId, amount) in recipe.Materials)
                         {
                             var actualAmount = SharedLatheSystem.AdjustMaterial(amount, recipe.ApplyMaterialDiscount, multiplier);
                             if (deconstructedMats.TryGetValue(matId, out var numSpawned))
@@ -327,7 +327,7 @@ public async Task NoMaterialArbitrage()
                 {
                     foreach (var recipe in recipes)
                     {
-                        foreach (var (matId, amount) in recipe.RequiredMaterials)
+                        foreach (var (matId, amount) in recipe.Materials)
                         {
                             var actualAmount = SharedLatheSystem.AdjustMaterial(amount, recipe.ApplyMaterialDiscount, multiplier);
                             if (compositionComponent.MaterialComposition.TryGetValue(matId, out var numSpawned))
diff --git a/Content.Server/Cargo/Systems/PricingSystem.cs b/Content.Server/Cargo/Systems/PricingSystem.cs
index f878eeee75c..d936451d524 100644
--- a/Content.Server/Cargo/Systems/PricingSystem.cs
+++ b/Content.Server/Cargo/Systems/PricingSystem.cs
@@ -16,6 +16,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 using System.Linq;
+using Content.Shared.Research.Prototypes;
 
 namespace Content.Server.Cargo.Systems;
 
@@ -158,6 +159,26 @@ private double GetMaterialPrice(PhysicalCompositionComponent component)
         return price;
     }
 
+    public double GetLatheRecipePrice(LatheRecipePrototype recipe)
+    {
+        var price = 0.0;
+
+        if (recipe.Result is { } result)
+        {
+            price += GetEstimatedPrice(_prototypeManager.Index(result));
+        }
+
+        if (recipe.ResultReagents is { } resultReagents)
+        {
+            foreach (var (reagent, amount) in resultReagents)
+            {
+                price += (_prototypeManager.Index(reagent).PricePerUnit * amount).Double();
+            }
+        }
+
+        return price;
+    }
+
     /// <summary>
     /// Get a rough price for an entityprototype. Does not consider contained entities.
     /// </summary>
diff --git a/Content.Server/Lathe/LatheSystem.cs b/Content.Server/Lathe/LatheSystem.cs
index c41909ac7c9..74eed70d040 100644
--- a/Content.Server/Lathe/LatheSystem.cs
+++ b/Content.Server/Lathe/LatheSystem.cs
@@ -1,17 +1,22 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Administration.Logs;
-using Content.Server.Atmos;
 using Content.Server.Atmos.EntitySystems;
+using Content.Server.Fluids.EntitySystems;
 using Content.Server.Lathe.Components;
 using Content.Server.Materials;
+using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Stack;
 using Content.Shared.Atmos;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.UserInterface;
 using Content.Shared.Database;
 using Content.Shared.Emag.Components;
+using Content.Shared.Examine;
 using Content.Shared.Lathe;
 using Content.Shared.Materials;
 using Content.Shared.Power;
@@ -19,6 +24,7 @@
 using Content.Shared.Research.Components;
 using Content.Shared.Research.Prototypes;
 using JetBrains.Annotations;
+using Robust.Server.Containers;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Prototypes;
@@ -35,9 +41,13 @@ public sealed class LatheSystem : SharedLatheSystem
         [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
+        [Dependency] private readonly ContainerSystem _container = default!;
         [Dependency] private readonly UserInterfaceSystem _uiSys = default!;
         [Dependency] private readonly MaterialStorageSystem _materialStorage = default!;
+        [Dependency] private readonly PopupSystem _popup = default!;
+        [Dependency] private readonly PuddleSystem _puddle = default!;
         [Dependency] private readonly ReagentSpeedSystem _reagentSpeed = default!;
+        [Dependency] private readonly SharedSolutionContainerSystem _solution = default!;
         [Dependency] private readonly StackSystem _stack = default!;
         [Dependency] private readonly TransformSystem _transform = default!;
 
@@ -64,7 +74,6 @@ public override void Initialize()
             SubscribeLocalEvent<EmagLatheRecipesComponent, LatheGetRecipesEvent>(GetEmagLatheRecipes);
             SubscribeLocalEvent<LatheHeatProducingComponent, LatheStartPrintingEvent>(OnHeatStartPrinting);
         }
-
         public override void Update(float frameTime)
         {
             var query = EntityQueryEnumerator<LatheProducingComponent, LatheComponent>();
@@ -120,7 +129,7 @@ private void OnGetWhitelist(EntityUid uid, LatheComponent component, ref GetMate
             {
                 if (!_proto.TryIndex(id, out var proto))
                     continue;
-                foreach (var (mat, _) in proto.RequiredMaterials)
+                foreach (var (mat, _) in proto.Materials)
                 {
                     if (!materialWhitelist.Contains(mat))
                     {
@@ -166,7 +175,7 @@ public bool TryAddToQueue(EntityUid uid, LatheRecipePrototype recipe, LatheCompo
             if (!CanProduce(uid, recipe, 1, component))
                 return false;
 
-            foreach (var (mat, amount) in recipe.RequiredMaterials)
+            foreach (var (mat, amount) in recipe.Materials)
             {
                 var adjustedAmount = recipe.ApplyMaterialDiscount
                     ? (int) (-amount * component.MaterialUseMultiplier)
@@ -212,8 +221,31 @@ public void FinishProducing(EntityUid uid, LatheComponent? comp = null, LathePro
 
             if (comp.CurrentRecipe != null)
             {
-                var result = Spawn(comp.CurrentRecipe.Result, Transform(uid).Coordinates);
-                _stack.TryMergeToContacts(result);
+                if (comp.CurrentRecipe.Result is { } resultProto)
+                {
+                    var result = Spawn(resultProto, Transform(uid).Coordinates);
+                    _stack.TryMergeToContacts(result);
+                }
+
+                if (comp.CurrentRecipe.ResultReagents is { } resultReagents &&
+                    comp.ReagentOutputSlotId is { } slotId)
+                {
+                    var toAdd = new Solution(
+                        resultReagents.Select(p => new ReagentQuantity(p.Key.Id, p.Value, null)));
+
+                    // dispense it in the container if we have it and dump it if we don't
+                    if (_container.TryGetContainer(uid, slotId, out var container) &&
+                        container.ContainedEntities.Count == 1 &&
+                        _solution.TryGetFitsInDispenser(container.ContainedEntities.First(), out var solution, out _))
+                    {
+                        _solution.AddSolution(solution.Value, toAdd);
+                    }
+                    else
+                    {
+                        _popup.PopupEntity(Loc.GetString("lathe-reagent-dispense-no-container", ("name", uid)), uid);
+                        _puddle.TrySpillAt(uid, toAdd, out _);
+                    }
+                }
             }
 
             comp.CurrentRecipe = null;
@@ -328,6 +360,7 @@ protected override bool HasRecipe(EntityUid uid, LatheRecipePrototype recipe, La
         {
             return GetAvailableRecipes(uid, component).Contains(recipe.ID);
         }
+
         #region UI Messages
 
         private void OnLatheQueueRecipeMessage(EntityUid uid, LatheComponent component, LatheQueueRecipeMessage args)
@@ -344,8 +377,9 @@ private void OnLatheQueueRecipeMessage(EntityUid uid, LatheComponent component,
                 }
                 if (count > 0)
                 {
-                    _adminLogger.Add(LogType.Action, LogImpact.Low,
-                        $"{ToPrettyString(args.Actor):player} queued {count} {recipe.Name} at {ToPrettyString(uid):lathe}");
+                    _adminLogger.Add(LogType.Action,
+                        LogImpact.Low,
+                        $"{ToPrettyString(args.Actor):player} queued {count} {GetRecipeName(recipe)} at {ToPrettyString(uid):lathe}");
                 }
             }
             TryStartProducing(uid, component);
diff --git a/Content.Server/UserInterface/StatValuesCommand.cs b/Content.Server/UserInterface/StatValuesCommand.cs
index f0c4f531d01..bbfbb3909ca 100644
--- a/Content.Server/UserInterface/StatValuesCommand.cs
+++ b/Content.Server/UserInterface/StatValuesCommand.cs
@@ -6,7 +6,6 @@
 using Content.Server.Item;
 using Content.Shared.Administration;
 using Content.Shared.Item;
-using Content.Shared.Materials;
 using Content.Shared.Research.Prototypes;
 using Content.Shared.UserInterface;
 using Content.Shared.Weapons.Melee;
@@ -220,13 +219,13 @@ private StatValuesEuiMessage GetLatheMessage()
         {
             var cost = 0.0;
 
-            foreach (var (material, count) in proto.RequiredMaterials)
+            foreach (var (material, count) in proto.Materials)
             {
-                var materialPrice = _proto.Index<MaterialPrototype>(material).Price;
+                var materialPrice = _proto.Index(material).Price;
                 cost += materialPrice * count;
             }
 
-            var sell = priceSystem.GetEstimatedPrice(_proto.Index<EntityPrototype>(proto.Result));
+            var sell = priceSystem.GetLatheRecipePrice(proto);
 
             values.Add(new[]
             {
diff --git a/Content.Shared/Construction/MachinePartSystem.cs b/Content.Shared/Construction/MachinePartSystem.cs
index 01db7fbade3..25b61cf434e 100644
--- a/Content.Shared/Construction/MachinePartSystem.cs
+++ b/Content.Shared/Construction/MachinePartSystem.cs
@@ -116,9 +116,9 @@ public Dictionary<string, int> GetMachineBoardMaterialCost(Entity<MachineBoardCo
                 {
                     var partRecipe = recipes[0];
                     if (recipes.Count > 1)
-                        partRecipe = recipes.MinBy(p => p.RequiredMaterials.Values.Sum());
+                        partRecipe = recipes.MinBy(p => p.Materials.Values.Sum());
 
-                    foreach (var (mat, matAmount) in partRecipe!.RequiredMaterials)
+                    foreach (var (mat, matAmount) in partRecipe!.Materials)
                     {
                         materials.TryAdd(mat, 0);
                         materials[mat] += matAmount * amount * coefficient;
@@ -136,9 +136,9 @@ public Dictionary<string, int> GetMachineBoardMaterialCost(Entity<MachineBoardCo
                 {
                     var partRecipe = recipes[0];
                     if (recipes.Count > 1)
-                        partRecipe = recipes.MinBy(p => p.RequiredMaterials.Values.Sum());
+                        partRecipe = recipes.MinBy(p => p.Materials.Values.Sum());
 
-                    foreach (var (mat, matAmount) in partRecipe!.RequiredMaterials)
+                    foreach (var (mat, matAmount) in partRecipe!.Materials)
                     {
                         materials.TryAdd(mat, 0);
                         materials[mat] += matAmount * amount * coefficient;
diff --git a/Content.Shared/Lathe/LatheComponent.cs b/Content.Shared/Lathe/LatheComponent.cs
index d4bf18b0507..505ceb69569 100644
--- a/Content.Shared/Lathe/LatheComponent.cs
+++ b/Content.Shared/Lathe/LatheComponent.cs
@@ -33,6 +33,9 @@ public sealed partial class LatheComponent : Component
         [DataField]
         public SoundSpecifier? ProducingSound;
 
+        [DataField]
+        public string? ReagentOutputSlotId;
+
         #region Visualizer info
         [DataField]
         public string? IdleState;
diff --git a/Content.Shared/Lathe/SharedLatheSystem.cs b/Content.Shared/Lathe/SharedLatheSystem.cs
index b41a91f9c34..e240571f315 100644
--- a/Content.Shared/Lathe/SharedLatheSystem.cs
+++ b/Content.Shared/Lathe/SharedLatheSystem.cs
@@ -1,5 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using Content.Shared.Emag.Systems;
+using Content.Shared.Examine;
+using Content.Shared.Localizations;
 using Content.Shared.Materials;
 using Content.Shared.Research.Prototypes;
 using JetBrains.Annotations;
@@ -23,10 +26,21 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<EmagLatheRecipesComponent, GotEmaggedEvent>(OnEmagged);
+        SubscribeLocalEvent<LatheComponent, ExaminedEvent>(OnExamined);
         SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypesReloaded);
+
         BuildInverseRecipeDictionary();
     }
 
+    private void OnExamined(Entity<LatheComponent> ent, ref ExaminedEvent args)
+    {
+        if (!args.IsInDetailsRange)
+            return;
+
+        if (ent.Comp.ReagentOutputSlotId != null)
+            args.PushMarkup(Loc.GetString("lathe-menu-reagent-slot-examine"));
+    }
+
     [PublicAPI]
     public bool CanProduce(EntityUid uid, string recipe, int amount = 1, LatheComponent? component = null)
     {
@@ -40,7 +54,7 @@ public bool CanProduce(EntityUid uid, LatheRecipePrototype recipe, int amount =
         if (!HasRecipe(uid, recipe, component))
             return false;
 
-        foreach (var (material, needed) in recipe.RequiredMaterials)
+        foreach (var (material, needed) in recipe.Materials)
         {
             var adjustedAmount = AdjustMaterial(needed, recipe.ApplyMaterialDiscount, component.MaterialUseMultiplier);
 
@@ -72,6 +86,9 @@ private void BuildInverseRecipeDictionary()
         _inverseRecipeDictionary.Clear();
         foreach (var latheRecipe in _proto.EnumeratePrototypes<LatheRecipePrototype>())
         {
+            if (latheRecipe.Result == null)
+                continue;
+
             _inverseRecipeDictionary.GetOrNew(latheRecipe.Result).Add(latheRecipe);
         }
     }
@@ -83,4 +100,55 @@ public bool TryGetRecipesFromEntity(string prototype, [NotNullWhen(true)] out Li
             recipes.AddRange(r);
         return recipes.Count != 0;
     }
+
+    public string GetRecipeName(ProtoId<LatheRecipePrototype> proto)
+    {
+        return GetRecipeName(_proto.Index(proto));
+    }
+
+    public string GetRecipeName(LatheRecipePrototype proto)
+    {
+        if (!string.IsNullOrWhiteSpace(proto.Name))
+            return Loc.GetString(proto.Name);
+
+        if (proto.Result is { } result)
+        {
+            return _proto.Index(result).Name;
+        }
+
+        if (proto.ResultReagents is { } resultReagents)
+        {
+            return ContentLocalizationManager.FormatList(resultReagents
+                .Select(p => Loc.GetString("lathe-menu-result-reagent-display", ("reagent", _proto.Index(p.Key).LocalizedName), ("amount", p.Value)))
+                .ToList());
+        }
+
+        return string.Empty;
+    }
+
+    [PublicAPI]
+    public string GetRecipeDescription(ProtoId<LatheRecipePrototype> proto)
+    {
+        return GetRecipeDescription(_proto.Index(proto));
+    }
+
+    public string GetRecipeDescription(LatheRecipePrototype proto)
+    {
+        if (!string.IsNullOrWhiteSpace(proto.Description))
+            return Loc.GetString(proto.Description);
+
+        if (proto.Result is { } result)
+        {
+            return _proto.Index(result).Description;
+        }
+
+        if (proto.ResultReagents is { } resultReagents)
+        {
+            // We only use the first one for the description since these descriptions don't combine very well.
+            var reagent = resultReagents.First().Key;
+            return _proto.Index(reagent).LocalizedDescription;
+        }
+
+        return string.Empty;
+    }
 }
diff --git a/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs b/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs
index 8b0c866cbe3..40c20df3437 100644
--- a/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs
+++ b/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs
@@ -1,101 +1,58 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.FixedPoint;
 using Content.Shared.Lathe.Prototypes;
 using Content.Shared.Materials;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Research.Prototypes
 {
-    [NetSerializable, Serializable, Prototype("latheRecipe")]
+    [NetSerializable, Serializable, Prototype]
     public sealed partial class LatheRecipePrototype : IPrototype
     {
         [ViewVariables]
         [IdDataField]
         public string ID { get; private set; } = default!;
 
-        [DataField("name")]
-        private string _name = string.Empty;
+        /// <summary>
+        ///     Name displayed in the lathe GUI.
+        /// </summary>
+        [DataField]
+        public LocId? Name;
 
-        [DataField("description")]
-        private string _description = string.Empty;
+        /// <summary>
+        ///     Short description displayed in the lathe GUI.
+        /// </summary>
+        [DataField]
+        public LocId? Description;
 
         /// <summary>
         ///     The prototype name of the resulting entity when the recipe is printed.
         /// </summary>
-        [DataField("result", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string Result = string.Empty;
+        [DataField]
+        public EntProtoId? Result;
+
+        [DataField]
+        public Dictionary<ProtoId<ReagentPrototype>, FixedPoint2>? ResultReagents;
 
         /// <summary>
         ///     An entity whose sprite is displayed in the ui in place of the actual recipe result.
         /// </summary>
-        [DataField("icon")]
+        [DataField]
         public SpriteSpecifier? Icon;
 
         [DataField("completetime")]
-        private TimeSpan _completeTime = TimeSpan.FromSeconds(5);
-
-        [DataField("materials", customTypeSerializer: typeof(PrototypeIdDictionarySerializer<int, MaterialPrototype>))]
-        private Dictionary<string, int> _requiredMaterials = new();
-
-        //todo make these function calls because we're eating tons of resolves here.
-        /// <summary>
-        ///     Name displayed in the lathe GUI.
-        /// </summary>
-        [ViewVariables]
-        public string Name
-        {
-            get
-            {
-                if (_name.Trim().Length != 0)
-                    return _name;
-                var protoMan = IoCManager.Resolve<IPrototypeManager>();
-                protoMan.TryIndex(Result, out EntityPrototype? prototype);
-                if (prototype?.Name != null)
-                    _name = prototype.Name;
-                return _name;
-            }
-        }
-
-        /// <summary>
-        ///     Short description displayed in the lathe GUI.
-        /// </summary>
-        [ViewVariables]
-        public string Description
-        {
-            get
-            {
-                if (_description.Trim().Length != 0)
-                    return _description;
-                var protoMan = IoCManager.Resolve<IPrototypeManager>();
-                protoMan.TryIndex(Result, out EntityPrototype? prototype);
-                if (prototype?.Description != null)
-                    _description = prototype.Description;
-                return _description;
-            }
-        }
+        public TimeSpan CompleteTime = TimeSpan.FromSeconds(5);
 
         /// <summary>
         ///     The materials required to produce this recipe.
         ///     Takes a material ID as string.
         /// </summary>
-        [ViewVariables]
-        public Dictionary<string, int> RequiredMaterials
-        {
-            get => _requiredMaterials;
-            private set => _requiredMaterials = value;
-        }
-
-
-        /// <summary>
-        ///     How many milliseconds it'll take for the lathe to finish this recipe.
-        ///     Might lower depending on the lathe's upgrade level.
-        /// </summary>
-        [ViewVariables]
-        public TimeSpan CompleteTime => _completeTime;
+        [DataField]
+        public Dictionary<ProtoId<MaterialPrototype>, int> Materials = new();
 
-        [DataField("applyMaterialDiscount")]
+        [DataField]
         public bool ApplyMaterialDiscount = true;
 
         /// <summary>
diff --git a/Content.Shared/Research/Systems/SharedResearchSystem.cs b/Content.Shared/Research/Systems/SharedResearchSystem.cs
index 81c6950f283..d8ce0634d3e 100644
--- a/Content.Shared/Research/Systems/SharedResearchSystem.cs
+++ b/Content.Shared/Research/Systems/SharedResearchSystem.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Shared.Lathe;
 using Content.Shared.Research.Components;
 using Content.Shared.Research.Prototypes;
 using JetBrains.Annotations;
@@ -12,6 +13,7 @@ public abstract class SharedResearchSystem : EntitySystem
 {
     [Dependency] protected readonly IPrototypeManager PrototypeManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedLatheSystem _lathe = default!;
 
     public override void Initialize()
     {
@@ -185,7 +187,7 @@ public FormattedMessage GetTechnologyDescription(
             var recipeProto = PrototypeManager.Index(recipe);
             description.PushNewline();
             description.AddMarkup(Loc.GetString("research-console-unlocks-list-entry",
-                ("name",recipeProto.Name)));
+                ("name", _lathe.GetRecipeName(recipeProto))));
         }
         foreach (var generic in technology.GenericUnlocks)
         {
diff --git a/Content.Shared/Research/TechnologyDisk/Systems/TechnologyDiskSystem.cs b/Content.Shared/Research/TechnologyDisk/Systems/TechnologyDiskSystem.cs
index b0d615fcb3b..93c7c22471c 100644
--- a/Content.Shared/Research/TechnologyDisk/Systems/TechnologyDiskSystem.cs
+++ b/Content.Shared/Research/TechnologyDisk/Systems/TechnologyDiskSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
+using Content.Shared.Lathe;
 using Content.Shared.Popups;
 using Content.Shared.Random.Helpers;
 using Content.Shared.Research.Components;
@@ -19,6 +20,7 @@ public sealed class TechnologyDiskSystem : EntitySystem
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedResearchSystem _research = default!;
+    [Dependency] private readonly SharedLatheSystem _lathe = default!;
 
     public override void Initialize()
     {
@@ -83,8 +85,7 @@ private void OnExamine(Entity<TechnologyDiskComponent> ent, ref ExaminedEvent ar
         if (ent.Comp.Recipes != null && ent.Comp.Recipes.Count > 0)
         {
             var prototype = _protoMan.Index(ent.Comp.Recipes[0]);
-            var resultPrototype = _protoMan.Index<EntityPrototype>(prototype.Result);
-            message = Loc.GetString("tech-disk-examine", ("result", resultPrototype.Name));
+            message = Loc.GetString("tech-disk-examine", ("result", _lathe.GetRecipeName(prototype)));
 
             if (ent.Comp.Recipes.Count > 1) //idk how to do this well. sue me.
                 message += " " + Loc.GetString("tech-disk-examine-more");
diff --git a/Resources/Locale/en-US/lathe/recipes.ftl b/Resources/Locale/en-US/lathe/recipes.ftl
new file mode 100644
index 00000000000..99186c5b659
--- /dev/null
+++ b/Resources/Locale/en-US/lathe/recipes.ftl
@@ -0,0 +1,8 @@
+lathe-recipe-Medkit-name = first aid kit (empty)
+lathe-recipe-MedkitBurn-name = burn treatment kit (empty)
+lathe-recipe-MedkitToxin-name = toxin treatment kit (empty)
+lathe-recipe-MedkitO2-name = oxygen deprivation treatment kit (empty)
+lathe-recipe-MedkitBrute-name = brute trauma treatment kit (empty)
+lathe-recipe-MedkitAdvanced-name = advanced first aid kit (empty)
+lathe-recipe-MedkitRadiation-name = radiation treatment kit (empty)
+lathe-recipe-MedkitCombat-name = combat medical kit (empty)
diff --git a/Resources/Locale/en-US/lathe/ui/lathe-menu.ftl b/Resources/Locale/en-US/lathe/ui/lathe-menu.ftl
index 71dd50d4091..16b67022ad5 100644
--- a/Resources/Locale/en-US/lathe/ui/lathe-menu.ftl
+++ b/Resources/Locale/en-US/lathe/ui/lathe-menu.ftl
@@ -6,6 +6,9 @@ lathe-menu-search-designs = Search designs
 lathe-menu-category-all = All
 lathe-menu-search-filter = Filter:
 lathe-menu-amount = Amount:
+lathe-menu-reagent-slot-examine = It has a slot for a beaker on the side.
+lathe-reagent-dispense-no-container = Liquid pours out of {THE($name)} onto the floor!
+lathe-menu-result-reagent-display = {$reagent} ({$amount}u)
 lathe-menu-material-display = {$material} ({$amount})
 lathe-menu-tooltip-display = {$amount} of {$material}
 lathe-menu-description-display = [italic]{$description}[/italic]
diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml
index 3867fa7fd18..1e86ace92ce 100644
--- a/Resources/Prototypes/Recipes/Lathes/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/medical.yml
@@ -152,7 +152,7 @@
 - type: latheRecipe
   id: Medkit
   result: Medkit
-  name: first aid kit (empty)
+  name: lathe-recipe-Medkit-name
   completetime: 2
   materials:
     Plastic: 300
@@ -160,7 +160,7 @@
 - type: latheRecipe
   id: MedkitBurn
   result: MedkitBurn
-  name: burn treatment kit (empty)
+  name: lathe-recipe-MedkitBurn-name
   completetime: 2
   materials:
     Plastic: 300
@@ -168,7 +168,7 @@
 - type: latheRecipe
   id: MedkitToxin
   result: MedkitToxin
-  name: toxin treatment kit (empty)
+  name: lathe-recipe-MedkitToxin-name
   completetime: 2
   materials:
     Plastic: 300
@@ -176,7 +176,7 @@
 - type: latheRecipe
   id: MedkitO2
   result: MedkitO2
-  name: oxygen deprivation treatment kit (empty)
+  name: lathe-recipe-MedkitO2-name
   completetime: 2
   materials:
     Plastic: 300
@@ -184,7 +184,7 @@
 - type: latheRecipe
   id: MedkitBrute
   result: MedkitBrute
-  name: brute trauma treatment kit (empty)
+  name: lathe-recipe-MedkitBrute-name
   completetime: 2
   materials:
     Plastic: 300
@@ -192,7 +192,7 @@
 - type: latheRecipe
   id: MedkitAdvanced
   result: MedkitAdvanced
-  name: advanced first aid kit (empty)
+  name: lathe-recipe-MedkitAdvanced-name
   completetime: 2
   materials:
     Plastic: 300
@@ -200,7 +200,7 @@
 - type: latheRecipe
   id: MedkitRadiation
   result: MedkitRadiation
-  name: radiation treatment kit (empty)
+  name: lathe-recipe-MedkitRadiation-name
   completetime: 2
   materials:
     Plastic: 300
@@ -208,7 +208,7 @@
 - type: latheRecipe
   id: MedkitCombat
   result: MedkitCombat
-  name: combat medical kit (empty)
+  name: lathe-recipe-MedkitCombat-name
   completetime: 2
   materials:
     Plastic: 300

From 47229f73adb9cfe9320b2d4ee177c714cb06c379 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sat, 1 Jun 2024 11:29:17 -0400
Subject: [PATCH 049/366] Clean up store system (#28463)

---
 .../Store/Ui/StoreBoundUserInterface.cs       | 20 +------
 Content.Client/Store/Ui/StoreMenu.xaml.cs     |  5 +-
 .../GameTicking/Rules/NukeopsRuleSystem.cs    |  6 +-
 .../Implants/SubdermalImplantSystem.cs        |  1 +
 Content.Server/PDA/PdaSystem.cs               |  8 ++-
 Content.Server/PDA/Ringer/RingerSystem.cs     |  1 +
 .../Revenant/EntitySystems/RevenantSystem.cs  |  1 +
 .../Store/Conditions/BuyBeforeCondition.cs    |  1 +
 .../Store/Systems/StoreSystem.Command.cs      |  4 +-
 .../Store/Systems/StoreSystem.Listings.cs     | 11 +++-
 .../Store/Systems/StoreSystem.Refund.cs       |  1 +
 .../Store/Systems/StoreSystem.Ui.cs           |  9 +--
 Content.Server/Store/Systems/StoreSystem.cs   |  5 +-
 .../SurplusBundle/SurplusBundleComponent.cs   | 13 +----
 .../SurplusBundle/SurplusBundleSystem.cs      | 57 ++++++++-----------
 .../Traitor/Uplink/UplinkComponent.cs         |  7 +++
 .../Store/Components/StoreComponent.cs        | 34 +++++------
 Content.Shared/Store/StoreUi.cs               | 14 -----
 Resources/Locale/en-US/store/store.ftl        |  3 +
 .../Catalog/Fills/Crates/syndicate.yml        |  4 +-
 .../Entities/Objects/Devices/pda.yml          |  2 +-
 .../Entities/Objects/Magic/books.yml          |  6 +-
 .../Objects/Misc/subdermal_implants.yml       |  3 +-
 .../Entities/Objects/Specific/syndicate.yml   | 19 +++++--
 Resources/Prototypes/Store/presets.yml        | 25 ++++----
 25 files changed, 115 insertions(+), 145 deletions(-)
 create mode 100644 Content.Server/Traitor/Uplink/UplinkComponent.cs
 rename {Content.Server => Content.Shared}/Store/Components/StoreComponent.cs (72%)

diff --git a/Content.Client/Store/Ui/StoreBoundUserInterface.cs b/Content.Client/Store/Ui/StoreBoundUserInterface.cs
index 5eb5507f678..8f59269ef39 100644
--- a/Content.Client/Store/Ui/StoreBoundUserInterface.cs
+++ b/Content.Client/Store/Ui/StoreBoundUserInterface.cs
@@ -2,7 +2,6 @@
 using JetBrains.Annotations;
 using System.Linq;
 using Content.Shared.Store.Components;
-using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.Store.Ui;
@@ -15,9 +14,6 @@ public sealed class StoreBoundUserInterface : BoundUserInterface
     [ViewVariables]
     private StoreMenu? _menu;
 
-    [ViewVariables]
-    private string _windowName = Loc.GetString("store-ui-default-title");
-
     [ViewVariables]
     private string _search = string.Empty;
 
@@ -65,25 +61,15 @@ protected override void UpdateState(BoundUserInterfaceState state)
     {
         base.UpdateState(state);
 
-        if (_menu == null)
-            return;
-
         switch (state)
         {
             case StoreUpdateState msg:
                 _listings = msg.Listings;
 
-                _menu.UpdateBalance(msg.Balance);
+                _menu?.UpdateBalance(msg.Balance);
                 UpdateListingsWithSearchFilter();
-                _menu.SetFooterVisibility(msg.ShowFooter);
-                _menu.UpdateRefund(msg.AllowRefund);
-                break;
-            case StoreInitializeState msg:
-                _windowName = msg.Name;
-                if (_menu != null && _menu.Window != null)
-                {
-                    _menu.Window.Title = msg.Name;
-                }
+                _menu?.SetFooterVisibility(msg.ShowFooter);
+                _menu?.UpdateRefund(msg.AllowRefund);
                 break;
         }
     }
diff --git a/Content.Client/Store/Ui/StoreMenu.xaml.cs b/Content.Client/Store/Ui/StoreMenu.xaml.cs
index 7eb597f2f39..f3719646db3 100644
--- a/Content.Client/Store/Ui/StoreMenu.xaml.cs
+++ b/Content.Client/Store/Ui/StoreMenu.xaml.cs
@@ -33,7 +33,7 @@ public sealed partial class StoreMenu : DefaultWindow
 
     private List<ListingData> _cachedListings = new();
 
-    public StoreMenu(string name)
+    public StoreMenu()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
@@ -41,9 +41,6 @@ public StoreMenu(string name)
         WithdrawButton.OnButtonDown += OnWithdrawButtonDown;
         RefundButton.OnButtonDown += OnRefundButtonDown;
         SearchBar.OnTextChanged += _ => SearchTextUpdated?.Invoke(this, SearchBar.Text);
-
-        if (Window != null)
-            Window.Title = name;
     }
 
     public void UpdateBalance(Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> balance)
diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
index 3190a50701c..6dedf20880f 100644
--- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -22,10 +22,8 @@
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 using System.Linq;
-using Content.Server.NPC.Components;
-using Content.Server.NPC.Systems;
-using Content.Shared.GameTicking.Components;
-
+using Content.Server.GameTicking.Components;
+using Content.Shared.Store.Components;
 
 namespace Content.Server.GameTicking.Rules;
 
diff --git a/Content.Server/Implants/SubdermalImplantSystem.cs b/Content.Server/Implants/SubdermalImplantSystem.cs
index e8af08b2ebb..88c5fb94592 100644
--- a/Content.Server/Implants/SubdermalImplantSystem.cs
+++ b/Content.Server/Implants/SubdermalImplantSystem.cs
@@ -20,6 +20,7 @@
 using System.Numerics;
 using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Movement.Pulling.Systems;
+using Content.Shared.Store.Components;
 using Robust.Shared.Collections;
 using Robust.Shared.Map.Components;
 
diff --git a/Content.Server/PDA/PdaSystem.cs b/Content.Server/PDA/PdaSystem.cs
index f75fd9920f3..691d024ecd7 100644
--- a/Content.Server/PDA/PdaSystem.cs
+++ b/Content.Server/PDA/PdaSystem.cs
@@ -8,6 +8,7 @@
 using Content.Server.Station.Systems;
 using Content.Server.Store.Components;
 using Content.Server.Store.Systems;
+using Content.Server.Traitor.Uplink;
 using Content.Shared.Access.Components;
 using Content.Shared.CartridgeLoader;
 using Content.Shared.Chat;
@@ -15,6 +16,7 @@
 using Content.Shared.Light.Components;
 using Content.Shared.Light.EntitySystems;
 using Content.Shared.PDA;
+using Content.Shared.Store.Components;
 using Robust.Server.Containers;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
@@ -152,7 +154,7 @@ public void UpdatePdaUi(EntityUid uid, PdaComponent? pda = null)
 
             var address = GetDeviceNetAddress(uid);
             var hasInstrument = HasComp<InstrumentComponent>(uid);
-            var showUplink = HasComp<StoreComponent>(uid) && IsUnlocked(uid);
+            var showUplink = HasComp<UplinkComponent>(uid) && IsUnlocked(uid);
 
             UpdateStationName(uid, pda);
             UpdateAlertLevel(uid, pda);
@@ -237,8 +239,8 @@ private void OnUiMessage(EntityUid uid, PdaComponent pda, PdaShowUplinkMessage m
                 return;
 
             // check if its locked again to prevent malicious clients opening locked uplinks
-            if (TryComp<StoreComponent>(uid, out var store) && IsUnlocked(uid))
-                _store.ToggleUi(msg.Actor, uid, store);
+            if (HasComp<UplinkComponent>(uid) && IsUnlocked(uid))
+                _store.ToggleUi(msg.Actor, uid);
         }
 
         private void OnUiMessage(EntityUid uid, PdaComponent pda, PdaLockUplinkMessage msg)
diff --git a/Content.Server/PDA/Ringer/RingerSystem.cs b/Content.Server/PDA/Ringer/RingerSystem.cs
index a10544d6966..2ea48510557 100644
--- a/Content.Server/PDA/Ringer/RingerSystem.cs
+++ b/Content.Server/PDA/Ringer/RingerSystem.cs
@@ -6,6 +6,7 @@
 using Content.Shared.PDA.Ringer;
 using Content.Shared.Popups;
 using Content.Shared.Store;
+using Content.Shared.Store.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Network;
diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
index 595de100e86..fa4f6db240c 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
@@ -17,6 +17,7 @@
 using Content.Shared.Revenant;
 using Content.Shared.Revenant.Components;
 using Content.Shared.StatusEffect;
+using Content.Shared.Store.Components;
 using Content.Shared.Stunnable;
 using Content.Shared.Tag;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Store/Conditions/BuyBeforeCondition.cs b/Content.Server/Store/Conditions/BuyBeforeCondition.cs
index 132f3534391..3f0c2de2e18 100644
--- a/Content.Server/Store/Conditions/BuyBeforeCondition.cs
+++ b/Content.Server/Store/Conditions/BuyBeforeCondition.cs
@@ -1,6 +1,7 @@
 using Content.Server.Store.Components;
 using Content.Server.Store.Systems;
 using Content.Shared.Store;
+using Content.Shared.Store.Components;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Store.Conditions;
diff --git a/Content.Server/Store/Systems/StoreSystem.Command.cs b/Content.Server/Store/Systems/StoreSystem.Command.cs
index d259da2c95e..5ad361eb427 100644
--- a/Content.Server/Store/Systems/StoreSystem.Command.cs
+++ b/Content.Server/Store/Systems/StoreSystem.Command.cs
@@ -1,7 +1,9 @@
+using System.Linq;
 using Content.Server.Store.Components;
 using Content.Shared.FixedPoint;
 using Content.Server.Administration;
 using Content.Shared.Administration;
+using Content.Shared.Store.Components;
 using Robust.Shared.Console;
 
 namespace Content.Server.Store.Systems;
@@ -58,7 +60,7 @@ private CompletionResult AddCurrencyCommandCompletions(IConsoleShell shell, stri
         if (args.Length == 2 && NetEntity.TryParse(args[0], out var uidNet) && TryGetEntity(uidNet, out var uid))
         {
             if (TryComp<StoreComponent>(uid, out var store))
-                return CompletionResult.FromHintOptions(store.CurrencyWhitelist, "<currency prototype>");
+                return CompletionResult.FromHintOptions(store.CurrencyWhitelist.Select(p => p.ToString()), "<currency prototype>");
         }
 
         return CompletionResult.Empty;
diff --git a/Content.Server/Store/Systems/StoreSystem.Listings.cs b/Content.Server/Store/Systems/StoreSystem.Listings.cs
index a56d9640d37..10b53a7c94b 100644
--- a/Content.Server/Store/Systems/StoreSystem.Listings.cs
+++ b/Content.Server/Store/Systems/StoreSystem.Listings.cs
@@ -1,5 +1,6 @@
-using Content.Server.Store.Components;
 using Content.Shared.Store;
+using Content.Shared.Store.Components;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Store.Systems;
 
@@ -80,7 +81,11 @@ public IEnumerable<ListingData> GetAvailableListings(EntityUid buyer, EntityUid
     /// <param name="categories">What categories to filter by.</param>
     /// <param name="storeEntity">The physial entity of the store. Can be null.</param>
     /// <returns>The available listings.</returns>
-    public IEnumerable<ListingData> GetAvailableListings(EntityUid buyer, HashSet<ListingData>? listings, HashSet<string> categories, EntityUid? storeEntity = null)
+    public IEnumerable<ListingData> GetAvailableListings(
+        EntityUid buyer,
+        HashSet<ListingData>? listings,
+        HashSet<ProtoId<StoreCategoryPrototype>> categories,
+        EntityUid? storeEntity = null)
     {
         listings ??= GetAllListings();
 
@@ -117,7 +122,7 @@ public IEnumerable<ListingData> GetAvailableListings(EntityUid buyer, HashSet<Li
     /// <param name="listing">The listing itself.</param>
     /// <param name="categories">The categories to check through.</param>
     /// <returns>If the listing was present in one of the categories.</returns>
-    public bool ListingHasCategory(ListingData listing, HashSet<string> categories)
+    public bool ListingHasCategory(ListingData listing, HashSet<ProtoId<StoreCategoryPrototype>> categories)
     {
         foreach (var cat in categories)
         {
diff --git a/Content.Server/Store/Systems/StoreSystem.Refund.cs b/Content.Server/Store/Systems/StoreSystem.Refund.cs
index 5a8be4be2bb..4e823582e6e 100644
--- a/Content.Server/Store/Systems/StoreSystem.Refund.cs
+++ b/Content.Server/Store/Systems/StoreSystem.Refund.cs
@@ -1,4 +1,5 @@
 using Content.Server.Store.Components;
+using Content.Shared.Store.Components;
 using Robust.Shared.Containers;
 
 namespace Content.Server.Store.Systems;
diff --git a/Content.Server/Store/Systems/StoreSystem.Ui.cs b/Content.Server/Store/Systems/StoreSystem.Ui.cs
index 0d2f3af91b3..9d3004cd8af 100644
--- a/Content.Server/Store/Systems/StoreSystem.Ui.cs
+++ b/Content.Server/Store/Systems/StoreSystem.Ui.cs
@@ -10,6 +10,7 @@
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Mind;
 using Content.Shared.Store;
+using Content.Shared.Store.Components;
 using Content.Shared.UserInterface;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
@@ -82,16 +83,11 @@ public void CloseUi(EntityUid uid, StoreComponent? component = null)
     /// <param name="user">The person who if opening the store ui. Listings are filtered based on this.</param>
     /// <param name="store">The store entity itself</param>
     /// <param name="component">The store component being refreshed.</param>
-    /// <param name="ui"></param>
     public void UpdateUserInterface(EntityUid? user, EntityUid store, StoreComponent? component = null)
     {
         if (!Resolve(store, ref component))
             return;
 
-        // TODO: Why is the state not being set unless this?
-        if (!_ui.HasUi(store, StoreUiKey.Key))
-            return;
-
         //this is the person who will be passed into logic for all listing filtering.
         if (user != null) //if we have no "buyer" for this update, then don't update the listings
         {
@@ -259,7 +255,8 @@ private void OnBuyRequest(EntityUid uid, StoreComponent component, StoreBuyListi
         }
 
         //log dat shit.
-        _admin.Add(LogType.StorePurchase, LogImpact.Low,
+        _admin.Add(LogType.StorePurchase,
+            LogImpact.Low,
             $"{ToPrettyString(buyer):player} purchased listing \"{ListingLocalisationHelpers.GetLocalisedNameOrEntityName(listing, _prototypeManager)}\" from {ToPrettyString(uid)}");
 
         listing.PurchaseAmount++; //track how many times something has been purchased
diff --git a/Content.Server/Store/Systems/StoreSystem.cs b/Content.Server/Store/Systems/StoreSystem.cs
index 978d98ac0cf..6715cc3d33d 100644
--- a/Content.Server/Store/Systems/StoreSystem.cs
+++ b/Content.Server/Store/Systems/StoreSystem.cs
@@ -5,11 +5,10 @@
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Stacks;
-using Content.Shared.Store;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects;
 using Robust.Shared.Prototypes;
 using System.Linq;
+using Content.Shared.Store.Components;
 using Content.Server.StoreDiscount;
 using Robust.Shared.Utility;
 
@@ -46,7 +45,6 @@ public override void Initialize()
     private void OnMapInit(EntityUid uid, StoreComponent component, MapInitEvent args)
     {
         RefreshAllListings(component);
-        InitializeFromPreset(component.Preset, uid, component);
         component.StartingMap = Transform(uid).MapUid;
     }
 
@@ -56,7 +54,6 @@ private void OnStartup(EntityUid uid, StoreComponent component, ComponentStartup
         if (MetaData(uid).EntityLifeStage == EntityLifeStage.MapInitialized)
         {
             RefreshAllListings(component);
-            InitializeFromPreset(component.Preset, uid, component);
         }
 
         var ev = new StoreAddedEvent();
diff --git a/Content.Server/Traitor/Uplink/SurplusBundle/SurplusBundleComponent.cs b/Content.Server/Traitor/Uplink/SurplusBundle/SurplusBundleComponent.cs
index 47ce68625a1..120581cf82d 100644
--- a/Content.Server/Traitor/Uplink/SurplusBundle/SurplusBundleComponent.cs
+++ b/Content.Server/Traitor/Uplink/SurplusBundle/SurplusBundleComponent.cs
@@ -1,6 +1,3 @@
-using Content.Shared.Store;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
 namespace Content.Server.Traitor.Uplink.SurplusBundle;
 
 /// <summary>
@@ -12,14 +9,6 @@ public sealed partial class SurplusBundleComponent : Component
     /// <summary>
     ///     Total price of all content inside bundle.
     /// </summary>
-    [ViewVariables(VVAccess.ReadOnly)]
-    [DataField("totalPrice")]
+    [DataField]
     public int TotalPrice = 20;
-
-    /// <summary>
-    ///     The preset that will be used to get all the listings.
-    ///     Currently just defaults to the basic uplink.
-    /// </summary>
-    [DataField("storePreset", customTypeSerializer: typeof(PrototypeIdSerializer<StorePresetPrototype>))]
-    public string StorePreset = "StorePresetUplink";
 }
diff --git a/Content.Server/Traitor/Uplink/SurplusBundle/SurplusBundleSystem.cs b/Content.Server/Traitor/Uplink/SurplusBundle/SurplusBundleSystem.cs
index 5c0a56d346c..759cad5deda 100644
--- a/Content.Server/Traitor/Uplink/SurplusBundle/SurplusBundleSystem.cs
+++ b/Content.Server/Traitor/Uplink/SurplusBundle/SurplusBundleSystem.cs
@@ -3,76 +3,67 @@
 using Content.Server.Store.Systems;
 using Content.Shared.FixedPoint;
 using Content.Shared.Store;
-using Robust.Shared.Prototypes;
+using Content.Shared.Store.Components;
 using Robust.Shared.Random;
 
 namespace Content.Server.Traitor.Uplink.SurplusBundle;
 
 public sealed class SurplusBundleSystem : EntitySystem
 {
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly EntityStorageSystem _entityStorage = default!;
     [Dependency] private readonly StoreSystem _store = default!;
 
-    private ListingData[] _listings = default!;
-
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<SurplusBundleComponent, MapInitEvent>(OnMapInit);
-
-        SubscribeLocalEvent<SurplusBundleComponent, ComponentInit>(OnInit);
-    }
 
-    private void OnInit(EntityUid uid, SurplusBundleComponent component, ComponentInit args)
-    {
-        var storePreset = _prototypeManager.Index<StorePresetPrototype>(component.StorePreset);
-
-        _listings = _store.GetAvailableListings(uid, null, storePreset.Categories).ToArray();
-
-        Array.Sort(_listings, (a, b) => (int) (b.Cost.Values.Sum() - a.Cost.Values.Sum())); //this might get weird with multicurrency but don't think about it
+        SubscribeLocalEvent<SurplusBundleComponent, MapInitEvent>(OnMapInit);
     }
 
     private void OnMapInit(EntityUid uid, SurplusBundleComponent component, MapInitEvent args)
     {
-        FillStorage(uid, component);
-    }
-
-    private void FillStorage(EntityUid uid, SurplusBundleComponent? component = null)
-    {
-        if (!Resolve(uid, ref component))
+        if (!TryComp<StoreComponent>(uid, out var store))
             return;
 
-        var cords = Transform(uid).Coordinates;
+        FillStorage((uid, component, store));
+    }
 
-        var content = GetRandomContent(component.TotalPrice);
+    private void FillStorage(Entity<SurplusBundleComponent, StoreComponent> ent)
+    {
+        var cords = Transform(ent).Coordinates;
+        var content = GetRandomContent(ent);
         foreach (var item in content)
         {
-            var ent = EntityManager.SpawnEntity(item.ProductEntity, cords);
-            _entityStorage.Insert(ent, uid);
+            var dode = Spawn(item.ProductEntity, cords);
+            _entityStorage.Insert(dode, ent);
         }
     }
 
     // wow, is this leetcode reference?
-    private List<ListingData> GetRandomContent(FixedPoint2 targetCost)
+    private List<ListingData> GetRandomContent(Entity<SurplusBundleComponent, StoreComponent> ent)
     {
         var ret = new List<ListingData>();
-        if (_listings.Length == 0)
+
+        var listings = _store.GetAvailableListings(ent, null, ent.Comp2.Categories)
+            .OrderBy(p => p.Cost.Values.Sum())
+            .ToList();
+
+        if (listings.Count == 0)
             return ret;
 
         var totalCost = FixedPoint2.Zero;
         var index = 0;
-        while (totalCost < targetCost)
+        while (totalCost < ent.Comp1.TotalPrice)
         {
             // All data is sorted in price descending order
             // Find new item with the lowest acceptable price
             // All expansive items will be before index, all acceptable after
-            var remainingBudget = targetCost - totalCost;
-            while (_listings[index].Cost.Values.Sum() > remainingBudget)
+            var remainingBudget = ent.Comp1.TotalPrice - totalCost;
+            while (listings[index].Cost.Values.Sum() > remainingBudget)
             {
                 index++;
-                if (index >= _listings.Length)
+                if (index >= listings.Count)
                 {
                     // Looks like no cheap items left
                     // It shouldn't be case for ss14 content
@@ -82,8 +73,8 @@ private List<ListingData> GetRandomContent(FixedPoint2 targetCost)
             }
 
             // Select random listing and add into crate
-            var randomIndex = _random.Next(index, _listings.Length);
-            var randomItem = _listings[randomIndex];
+            var randomIndex = _random.Next(index, listings.Count);
+            var randomItem = listings[randomIndex];
             ret.Add(randomItem);
             totalCost += randomItem.Cost.Values.Sum();
         }
diff --git a/Content.Server/Traitor/Uplink/UplinkComponent.cs b/Content.Server/Traitor/Uplink/UplinkComponent.cs
new file mode 100644
index 00000000000..35f11ce9ef7
--- /dev/null
+++ b/Content.Server/Traitor/Uplink/UplinkComponent.cs
@@ -0,0 +1,7 @@
+namespace Content.Server.Traitor.Uplink;
+
+/// <summary>
+/// This is used for identifying something as a hidden uplink and showing the UI.
+/// </summary>
+[RegisterComponent]
+public sealed partial class UplinkComponent : Component;
diff --git a/Content.Server/Store/Components/StoreComponent.cs b/Content.Shared/Store/Components/StoreComponent.cs
similarity index 72%
rename from Content.Server/Store/Components/StoreComponent.cs
rename to Content.Shared/Store/Components/StoreComponent.cs
index 0b7dbbea094..223f5079717 100644
--- a/Content.Server/Store/Components/StoreComponent.cs
+++ b/Content.Shared/Store/Components/StoreComponent.cs
@@ -1,46 +1,41 @@
 using Content.Shared.FixedPoint;
-using Content.Shared.Store;
 using Robust.Shared.Audio;
-using Robust.Shared.Map;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
 
-namespace Content.Server.Store.Components;
+namespace Content.Shared.Store.Components;
 
 /// <summary>
 /// This component manages a store which players can use to purchase different listings
 /// through the ui. The currency, listings, and categories are defined in yaml.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent]
 public sealed partial class StoreComponent : Component
 {
-    /// <summary>
-    /// The default preset for the store. Is overriden by default values specified on the component.
-    /// </summary>
-    [DataField("preset", customTypeSerializer: typeof(PrototypeIdSerializer<StorePresetPrototype>))]
-    public string? Preset;
+    [DataField]
+    public LocId Name = "store-ui-default-title";
 
     /// <summary>
     /// All the listing categories that are available on this store.
     /// The available listings are partially based on the categories.
     /// </summary>
-    [DataField("categories", customTypeSerializer: typeof(PrototypeIdHashSetSerializer<StoreCategoryPrototype>))]
-    public HashSet<string> Categories = new();
+    [DataField]
+    public HashSet<ProtoId<StoreCategoryPrototype>> Categories = new();
 
     /// <summary>
     /// The total amount of currency that can be used in the store.
     /// The string represents the ID of te currency prototype, where the
     /// float is that amount.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("balance", customTypeSerializer: typeof(PrototypeIdDictionarySerializer<FixedPoint2, CurrencyPrototype>))]
-    public Dictionary<string, FixedPoint2> Balance = new();
+    [DataField]
+    public Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> Balance = new();
 
     /// <summary>
     /// The list of currencies that can be inserted into this store.
     /// </summary>
-    [ViewVariables(VVAccess.ReadOnly), DataField("currencyWhitelist", customTypeSerializer: typeof(PrototypeIdHashSetSerializer<CurrencyPrototype>))]
-    public HashSet<string> CurrencyWhitelist = new();
+    [DataField]
+    public HashSet<ProtoId<CurrencyPrototype>> CurrencyWhitelist = new();
 
     /// <summary>
     /// The person who "owns" the store/account. Used if you want the listings to be fixed
@@ -52,6 +47,7 @@ public sealed partial class StoreComponent : Component
     /// <summary>
     /// All listings, including those that aren't available to the buyer
     /// </summary>
+    [DataField]
     public HashSet<ListingData> Listings = new();
 
     /// <summary>
@@ -70,7 +66,7 @@ public sealed partial class StoreComponent : Component
     ///     The total balance spent in this store. Used for refunds.
     /// </summary>
     [ViewVariables, DataField]
-    public Dictionary<string, FixedPoint2> BalanceSpent = new();
+    public Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> BalanceSpent = new();
 
     /// <summary>
     ///     Controls if the store allows refunds
@@ -95,7 +91,7 @@ public sealed partial class StoreComponent : Component
     /// <summary>
     /// The sound played to the buyer when a purchase is succesfully made.
     /// </summary>
-    [DataField("buySuccessSound")]
+    [DataField]
     public SoundSpecifier BuySuccessSound = new SoundPathSpecifier("/Audio/Effects/kaching.ogg");
     #endregion
 }
diff --git a/Content.Shared/Store/StoreUi.cs b/Content.Shared/Store/StoreUi.cs
index ee4da6991f6..59cf1bbbc81 100644
--- a/Content.Shared/Store/StoreUi.cs
+++ b/Content.Shared/Store/StoreUi.cs
@@ -30,20 +30,6 @@ public StoreUpdateState(HashSet<ListingData> listings, Dictionary<ProtoId<Curren
     }
 }
 
-/// <summary>
-/// initializes miscellaneous data about the store.
-/// </summary>
-[Serializable, NetSerializable]
-public sealed class StoreInitializeState : BoundUserInterfaceState
-{
-    public readonly string Name;
-
-    public StoreInitializeState(string name)
-    {
-        Name = name;
-    }
-}
-
 [Serializable, NetSerializable]
 public sealed class StoreRequestUpdateInterfaceMessage : BoundUserInterfaceMessage
 {
diff --git a/Resources/Locale/en-US/store/store.ftl b/Resources/Locale/en-US/store/store.ftl
index 997afedfc06..5c1a46339e7 100644
--- a/Resources/Locale/en-US/store/store.ftl
+++ b/Resources/Locale/en-US/store/store.ftl
@@ -8,3 +8,6 @@ store-ui-traitor-warning = Operatives must lock their uplinks after use to avoid
 store-withdraw-button-ui = Withdraw {$currency}
 store-ui-button-out-of-stock = {""} (Out of Stock)
 store-not-account-owner = This {$store} is not bound to you!
+
+store-preset-name-uplink = Uplink
+store-preset-name-spellbook = Spellbook
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml
index 3f9e909c809..ba97af39250 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: CrateSyndicateSurplusBundle
-  parent: CrateSyndicate
+  parent: [ CrateSyndicate, StorePresetUplink ]
   name: Syndicate surplus crate
   description: Contains 50 telecrystals worth of completely random Syndicate items. It can be useless junk or really good.
   components:
@@ -24,7 +24,7 @@
 
 - type: entity
   id: CrateSyndicateSuperSurplusBundle
-  parent: CrateSyndicate
+  parent: [ CrateSyndicate, StorePresetUplink ]
   name: Syndicate super surplus crate
   description: Contains 125 telecrystals worth of completely random Syndicate items.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 00df4e02cbe..2166f554470 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: BaseItem
+  parent: [ BaseItem, StorePresetUplink ] #PDA's have uplinks so they have to inherit the data.
   id: BasePDA
   name: PDA
   description: Personal Data Assistant.
diff --git a/Resources/Prototypes/Entities/Objects/Magic/books.yml b/Resources/Prototypes/Entities/Objects/Magic/books.yml
index 7697e46b32a..b1845ee358c 100644
--- a/Resources/Prototypes/Entities/Objects/Magic/books.yml
+++ b/Resources/Prototypes/Entities/Objects/Magic/books.yml
@@ -31,7 +31,7 @@
   id: WizardsGrimoire
   name: wizards grimoire
   suffix: Wizard
-  parent: BaseItem
+  parent: [ BaseItem, StorePresetSpellbook ]
   components:
     - type: Sprite
       sprite: Objects/Misc/books.rsi
@@ -52,7 +52,6 @@
     - type: Store
       refundAllowed: true
       ownerOnly: true # get your own tome!
-      preset: StorePresetSpellbook
       balance:
         WizCoin: 10 # prices are balanced around this 10 point maximum and how strong the spells are
 
@@ -61,12 +60,11 @@
   id: WizardsGrimoireNoRefund
   name: wizards grimoire
   suffix: Wizard, No Refund
-  parent: WizardsGrimoire
+  parent: [ WizardsGrimoire, StorePresetSpellbook ]
   components:
     - type: Store
       refundAllowed: false
       ownerOnly: true # get your own tome!
-      preset: StorePresetSpellbook
       balance:
         WizCoin: 10 # prices are balanced around this 10 point maximum and how strong the spells are
 
diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
index 36b1970f3e5..82d900db57a 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
@@ -143,7 +143,7 @@
         - Cuffable # useless if you cant be cuffed
 
 - type: entity
-  parent: BaseSubdermalImplant
+  parent: [ BaseSubdermalImplant, StorePresetUplink ]
   id: UplinkImplant
   name: uplink implant
   description: This implant lets the user access a hidden Syndicate uplink at will.
@@ -155,7 +155,6 @@
       components:
       - Hands # prevent mouse buying grenade penguin since its not telepathic
   - type: Store
-    preset: StorePresetUplink
     balance:
       Telecrystal: 0
   - type: UserInterface
diff --git a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml
index 4f760066843..d3dc41a74a7 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml
@@ -48,7 +48,7 @@
 
 # Uplinks
 - type: entity
-  parent: BaseItem
+  parent: [ BaseItem, StorePresetUplink ]
   id: BaseUplinkRadio
   name: syndicate uplink
   description: Suspiciously looking old radio...
@@ -68,7 +68,6 @@
   - type: ActivatableUI
     key: enum.StoreUiKey.Key
   - type: Store
-    preset: StorePresetUplink
     balance:
       Telecrystal: 0
 
@@ -78,7 +77,6 @@
   suffix: 20 TC
   components:
   - type: Store
-    preset: StorePresetUplink
     balance:
       Telecrystal: 20
 
@@ -88,7 +86,6 @@
   suffix: 25 TC
   components:
   - type: Store
-    preset: StorePresetUplink
     balance:
       Telecrystal: 25
 
@@ -99,19 +96,29 @@
   suffix: 40 TC, NukeOps
   components:
   - type: Store
-    preset: StorePresetUplink
     balance:
       Telecrystal: 40
   - type: Tag
     tags:
     - NukeOpsUplink
 
+- type: entity
+  parent: BaseUplinkRadio
+  id: BaseUplinkRadio60TC
+  suffix: 60 TC, LoneOps
+  components:
+  - type: Store
+    balance:
+      Telecrystal: 60
+  - type: Tag
+    tags:
+    - NukeOpsUplink
+
 - type: entity
   parent: BaseUplinkRadio
   id: BaseUplinkRadioDebug
   suffix: DEBUG
   components:
   - type: Store
-    preset: StorePresetUplink
     balance:
       Telecrystal: 99999
diff --git a/Resources/Prototypes/Store/presets.yml b/Resources/Prototypes/Store/presets.yml
index 47768b68ec3..a3290a80031 100644
--- a/Resources/Prototypes/Store/presets.yml
+++ b/Resources/Prototypes/Store/presets.yml
@@ -1,4 +1,4 @@
-- type: storePreset
+- type: entity
   id: StorePresetUplink
   storeName: Uplink
   categories:
@@ -16,6 +16,8 @@
   - UplinkSales
   currencyWhitelist:
   - Telecrystal
+  balance:
+    Telecrystal: 0
   sales:
     enabled: true
     minMultiplier: 0.2
@@ -24,14 +26,17 @@
     maxItems: 8
     salesCategory: UplinkSales
 
-- type: storePreset
+- type: entity
   id: StorePresetSpellbook
-  storeName: Spellbook
-  categories:
-  - SpellbookOffensive    #Fireball, Rod Form
-  - SpellbookDefensive    #Magic Missile, Wall of Force
-  - SpellbookUtility      #Body Swap, Lich, Teleport, Knock, Polymorph
-  - SpellbookEquipment    #Battlemage Robes, Staff of Locker
-  - SpellbookEvents       #Summon Weapons, Summon Ghosts
-  currencyWhitelist:
+  abstract: true
+  components:
+  - type: Store
+    name: store-preset-name-spellbook
+    categories:
+    - SpellbookOffensive    #Fireball, Rod Form
+    - SpellbookDefensive    #Magic Missile, Wall of Force
+    - SpellbookUtility      #Body Swap, Lich, Teleport, Knock, Polymorph
+    - SpellbookEquipment    #Battlemage Robes, Staff of Locker
+    - SpellbookEvents       #Summon Weapons, Summon Ghosts
+    currencyWhitelist:
     - WizCoin

From 5fae112f7acc9908c264734f4feb53546b4d6061 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 06:11:22 -0400
Subject: [PATCH 050/366] Yeag

---
 Content.Client/Lathe/UI/LatheMenu.xaml.cs            | 7 ++-----
 Content.Client/Overlays/EntityHealthBarOverlay.cs    | 1 +
 Content.Shared/SSDIndicator/SSDIndicatorComponent.cs | 1 +
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml.cs b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
index 0b42ea69db7..630ef41e9fb 100644
--- a/Content.Client/Lathe/UI/LatheMenu.xaml.cs
+++ b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
@@ -19,7 +19,6 @@ public sealed partial class LatheMenu : DefaultWindow
 {
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly IResourceCache _resources = default!;
 
     private readonly SpriteSystem _spriteSystem;
     private readonly LatheSystem _lathe;
@@ -79,9 +78,6 @@ public void SetEntity(EntityUid uid)
     /// </summary>
     public void PopulateRecipes()
     {
-        if (!_entityManager.TryGetComponent<LatheComponent>(_owner, out var component))
-            return;
-
         var recipesToShow = new List<LatheRecipePrototype>();
         foreach (var recipe in Recipes)
         {
@@ -212,7 +208,8 @@ public void UpdateCategories()
     /// <param name="queue"></param>
     public void PopulateQueueList(List<LatheRecipePrototype> queue)
     {
-        QueueList.Clear();
+        QueueList.DisposeAllChildren();
+
         var idx = 1;
         foreach (var recipe in queue)
         {
diff --git a/Content.Client/Overlays/EntityHealthBarOverlay.cs b/Content.Client/Overlays/EntityHealthBarOverlay.cs
index 9182e51ed1f..dfc3e8da0c5 100644
--- a/Content.Client/Overlays/EntityHealthBarOverlay.cs
+++ b/Content.Client/Overlays/EntityHealthBarOverlay.cs
@@ -9,6 +9,7 @@
 using System.Numerics;
 using Content.Shared.StatusIcon.Components;
 using Content.Client.UserInterface.Systems;
+using Content.Shared.StatusIcon;
 using Robust.Shared.Prototypes;
 using static Robust.Shared.Maths.Color;
 
diff --git a/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs b/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs
index 711abdb3bfe..634dfc397b3 100644
--- a/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs
+++ b/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs
@@ -1,5 +1,6 @@
 using Content.Shared.StatusIcon;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.SSDIndicator;

From 9e5bb28de9cff20a2a047475e90d1e2ed90866c5 Mon Sep 17 00:00:00 2001
From: Plykiya <58439124+Plykiya@users.noreply.github.com>
Date: Tue, 18 Jun 2024 20:18:45 -0700
Subject: [PATCH 051/366] Fix some lathe recipe textures showing up blank
 (#28683)

* Update lathes to use entity prototype

* ScrollContainer my hero

* gets rid of excess newlines

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
---
 Content.Client/Lathe/UI/LatheMenu.xaml        | 15 +++++++++------
 Content.Client/Lathe/UI/LatheMenu.xaml.cs     |  2 ++
 Content.Client/Lathe/UI/RecipeControl.xaml    |  2 --
 Content.Client/Lathe/UI/RecipeControl.xaml.cs |  1 +
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml b/Content.Client/Lathe/UI/LatheMenu.xaml
index 7e978c1ae56..5b21f0bae66 100644
--- a/Content.Client/Lathe/UI/LatheMenu.xaml
+++ b/Content.Client/Lathe/UI/LatheMenu.xaml
@@ -111,12 +111,15 @@
                         </Label>
                     </PanelContainer>
                 </BoxContainer>
-                <ItemList
-                    Name="QueueList"
-                    VerticalExpand="True"
-                    SizeFlagsStretchRatio="3"
-                    SelectMode="None">
-                </ItemList>
+                <ScrollContainer VerticalExpand="True" HScrollEnabled="False">
+                    <BoxContainer
+                        Name="QueueList"
+                        Orientation="Vertical"
+                        HorizontalExpand="True"
+                        VerticalExpand="True"
+                        RectClipContent="True">
+                    </BoxContainer>
+                </ScrollContainer>
             </BoxContainer>
             <BoxContainer
             VerticalExpand="True"
diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml.cs b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
index 630ef41e9fb..4d21b81b2e3 100644
--- a/Content.Client/Lathe/UI/LatheMenu.xaml.cs
+++ b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
@@ -210,6 +210,8 @@ public void PopulateQueueList(List<LatheRecipePrototype> queue)
     {
         QueueList.DisposeAllChildren();
 
+        QueueList.DisposeAllChildren();
+
         var idx = 1;
         foreach (var recipe in queue)
         {
diff --git a/Content.Client/Lathe/UI/RecipeControl.xaml b/Content.Client/Lathe/UI/RecipeControl.xaml
index d5901da53aa..1105ab478ff 100644
--- a/Content.Client/Lathe/UI/RecipeControl.xaml
+++ b/Content.Client/Lathe/UI/RecipeControl.xaml
@@ -10,9 +10,7 @@
                 Margin="0 0 4 0"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
-                Stretch="KeepAspectCentered"
                 MinSize="32 32"
-                CanShrink="true"
                 />
             <Label Name="RecipeName" HorizontalExpand="True" />
         </BoxContainer>
diff --git a/Content.Client/Lathe/UI/RecipeControl.xaml.cs b/Content.Client/Lathe/UI/RecipeControl.xaml.cs
index 4f438c8a8e5..e9108e88315 100644
--- a/Content.Client/Lathe/UI/RecipeControl.xaml.cs
+++ b/Content.Client/Lathe/UI/RecipeControl.xaml.cs
@@ -2,6 +2,7 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Lathe.UI;
 

From 3168741ca5003b6a07036c7903c46d782a786abf Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 06:17:39 -0400
Subject: [PATCH 052/366] Yeaaaaaag!!!

---
 .../Store/Ui/StoreBoundUserInterface.cs       |   1 +
 .../Systems/Atmos/GasTank/GasTankWindow.cs    | 191 +++++++++---------
 Content.Client/Zombies/ZombieSystem.cs        |  48 ++---
 .../Zombies/InitialInfectedComponent.cs       |   5 +-
 4 files changed, 118 insertions(+), 127 deletions(-)

diff --git a/Content.Client/Store/Ui/StoreBoundUserInterface.cs b/Content.Client/Store/Ui/StoreBoundUserInterface.cs
index 8f59269ef39..7ed67f7b5dd 100644
--- a/Content.Client/Store/Ui/StoreBoundUserInterface.cs
+++ b/Content.Client/Store/Ui/StoreBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using JetBrains.Annotations;
 using System.Linq;
 using Content.Shared.Store.Components;
+using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.Store.Ui;
diff --git a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs
index bf0e93b36c8..fd5624ad8a7 100644
--- a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs
+++ b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs
@@ -35,7 +35,7 @@ public GasTankWindow()
         var rootContainer = new LayoutContainer { Name = "GasTankRoot" };
         AddChild(rootContainer);
 
-            MouseFilter = MouseFilterMode.Stop;
+        MouseFilter = MouseFilterMode.Stop;
 
         var panelTex = _cache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png");
         var back = new StyleBoxTexture
@@ -44,45 +44,45 @@ public GasTankWindow()
             Modulate = Color.FromHex("#25252A"),
         };
 
-            back.SetPatchMargin(StyleBox.Margin.All, 10);
+        back.SetPatchMargin(StyleBox.Margin.All, 10);
 
-            var topPanel = new PanelContainer
-            {
-                PanelOverride = back,
-                MouseFilter = MouseFilterMode.Pass
-            };
+        var topPanel = new PanelContainer
+        {
+            PanelOverride = back,
+            MouseFilter = MouseFilterMode.Pass
+        };
 
-            var bottomWrap = new LayoutContainer
-            {
-                Name = "BottomWrap"
-            };
+        var bottomWrap = new LayoutContainer
+        {
+            Name = "BottomWrap"
+        };
 
-            rootContainer.AddChild(topPanel);
-            rootContainer.AddChild(bottomWrap);
+        rootContainer.AddChild(topPanel);
+        rootContainer.AddChild(bottomWrap);
 
-            LayoutContainer.SetAnchorPreset(topPanel, LayoutContainer.LayoutPreset.Wide);
-            LayoutContainer.SetMarginBottom(topPanel, -85);
+        LayoutContainer.SetAnchorPreset(topPanel, LayoutContainer.LayoutPreset.Wide);
+        LayoutContainer.SetMarginBottom(topPanel, -85);
 
-            LayoutContainer.SetAnchorPreset(bottomWrap, LayoutContainer.LayoutPreset.VerticalCenterWide);
-            LayoutContainer.SetGrowHorizontal(bottomWrap, LayoutContainer.GrowDirection.Both);
+        LayoutContainer.SetAnchorPreset(bottomWrap, LayoutContainer.LayoutPreset.VerticalCenterWide);
+        LayoutContainer.SetGrowHorizontal(bottomWrap, LayoutContainer.GrowDirection.Both);
 
 
-            var topContainerWrap = new BoxContainer
+        var topContainerWrap = new BoxContainer
+        {
+            Orientation = LayoutOrientation.Vertical,
+            Children =
             {
-                Orientation = LayoutOrientation.Vertical,
-                Children =
+                (topContainer = new BoxContainer
                 {
-                    (_topContainer = new BoxContainer
-                    {
-                        Orientation = LayoutOrientation.Vertical
-                    }),
-                    new Control {MinSize = new Vector2(0, 110)}
-                }
-            };
+                    Orientation = LayoutOrientation.Vertical
+                }),
+                new Control {MinSize = new Vector2(0, 110)}
+            }
+        };
 
-            rootContainer.AddChild(topContainerWrap);
+        rootContainer.AddChild(topContainerWrap);
 
-            LayoutContainer.SetAnchorPreset(topContainerWrap, LayoutContainer.LayoutPreset.Wide);
+        LayoutContainer.SetAnchorPreset(topContainerWrap, LayoutContainer.LayoutPreset.Wide);
 
         var font = _cache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13);
 
@@ -111,66 +111,66 @@ public GasTankWindow()
             }
         };
 
-            var middle = new PanelContainer
+        var middle = new PanelContainer
+        {
+            PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex("#202025") },
+            Children =
             {
-                PanelOverride = new StyleBoxFlat {BackgroundColor = Color.FromHex("#202025")},
-                Children =
+                (contentContainer = new BoxContainer
                 {
-                    (_contentContainer = new BoxContainer
-                    {
-                        Orientation = LayoutOrientation.Vertical,
-                        Margin = new Thickness(8, 4),
-                    })
-                }
-            };
-
-            _topContainer.AddChild(topRow);
-            _topContainer.AddChild(new PanelContainer
-            {
-                MinSize = new Vector2(0, 2),
-                PanelOverride = new StyleBoxFlat {BackgroundColor = Color.FromHex("#525252ff")}
-            });
-            _topContainer.AddChild(middle);
-            _topContainer.AddChild(new PanelContainer
-            {
-                MinSize = new Vector2(0, 2),
-                PanelOverride = new StyleBoxFlat {BackgroundColor = Color.FromHex("#525252ff")}
-            });
+                    Orientation = LayoutOrientation.Vertical,
+                    Margin = new Thickness(8, 4),
+                })
+            }
+        };
 
+        topContainer.AddChild(topRow);
+        topContainer.AddChild(new PanelContainer
+        {
+            MinSize = new Vector2(0, 2),
+            PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex("#525252ff") }
+        });
+        topContainer.AddChild(middle);
+        topContainer.AddChild(new PanelContainer
+        {
+            MinSize = new Vector2(0, 2),
+            PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex("#525252ff") }
+        });
 
-            _lblPressure = new RichTextLabel();
-            _contentContainer.AddChild(_lblPressure);
 
-            //internals
-            _lblInternals = new RichTextLabel
-                {MinSize = new Vector2(200, 0), VerticalAlignment = VAlignment.Center};
-            _btnInternals = new Button {Text = Loc.GetString("gas-tank-window-internals-toggle-button") };
+        _lblPressure = new RichTextLabel();
+        contentContainer.AddChild(_lblPressure);
 
-            _contentContainer.AddChild(
-                new BoxContainer
-                {
-                    Orientation = LayoutOrientation.Horizontal,
-                    Margin = new Thickness(0, 7, 0, 0),
-                    Children = {_lblInternals, _btnInternals}
-                });
+        //internals
+        _lblInternals = new RichTextLabel
+            { MinSize = new Vector2(200, 0), VerticalAlignment = VAlignment.Center };
+        _btnInternals = new Button { Text = Loc.GetString("gas-tank-window-internals-toggle-button") };
 
-            // Separator
-            _contentContainer.AddChild(new Control
+        contentContainer.AddChild(
+            new BoxContainer
             {
-                MinSize = new Vector2(0, 10)
+                Orientation = LayoutOrientation.Horizontal,
+                Margin = new Thickness(0, 7, 0, 0),
+                Children = { _lblInternals, _btnInternals }
             });
 
-            _contentContainer.AddChild(new Label
-            {
-                Text = Loc.GetString("gas-tank-window-output-pressure-label"),
-                Align = Label.AlignMode.Center
-            });
-            _spbPressure = new FloatSpinBox
-            {
-                IsValid = f => f >= 0 || f <= 3000,
-                Margin = new Thickness(25, 0, 25, 7)
-            };
-            _contentContainer.AddChild(_spbPressure);
+        // Separator
+        contentContainer.AddChild(new Control
+        {
+            MinSize = new Vector2(0, 10)
+        });
+
+        contentContainer.AddChild(new Label
+        {
+            Text = Loc.GetString("gas-tank-window-output-pressure-label"),
+            Align = Label.AlignMode.Center
+        });
+        _spbPressure = new FloatSpinBox
+        {
+            IsValid = f => f >= 0 || f <= 3000,
+            Margin = new Thickness(25, 0, 25, 7)
+        };
+        contentContainer.AddChild(_spbPressure);
 
         // Handlers
         _spbPressure.OnValueChanged += args =>
@@ -191,26 +191,25 @@ public void SetTitle(string name)
         _topLabel.Text = name;
     }
 
-        public void UpdateState(GasTankBoundUserInterfaceState state)
+    public void UpdateState(GasTankBoundUserInterfaceState state)
+    {
+        _lblPressure.SetMarkup(Loc.GetString("gas-tank-window-tank-pressure-text", ("tankPressure", $"{state.TankPressure:0.##}")));
+        _btnInternals.Disabled = !state.CanConnectInternals;
+        _lblInternals.SetMarkup(Loc.GetString("gas-tank-window-internal-text",
+            ("status", Loc.GetString(state.InternalsConnected ? "gas-tank-window-internal-connected" : "gas-tank-window-internal-disconnected"))));
+        if (state.OutputPressure.HasValue)
         {
-            _lblPressure.SetMarkup(Loc.GetString("gas-tank-window-tank-pressure-text", ("tankPressure", $"{state.TankPressure:0.##}")));
-            _btnInternals.Disabled = !state.CanConnectInternals;
-            _lblInternals.SetMarkup(Loc.GetString("gas-tank-window-internal-text",
-                ("status", Loc.GetString(state.InternalsConnected ? "gas-tank-window-internal-connected" : "gas-tank-window-internal-disconnected"))));
-            if (state.OutputPressure.HasValue)
-            {
-                _spbPressure.Value = state.OutputPressure.Value;
-            }
+            _spbPressure.Value = state.OutputPressure.Value;
         }
+    }
 
-        protected override DragMode GetDragModeFor(Vector2 relativeMousePos)
-        {
-            return DragMode.Move;
-        }
+    protected override DragMode GetDragModeFor(Vector2 relativeMousePos)
+    {
+        return DragMode.Move;
+    }
 
-        protected override bool HasPoint(Vector2 point)
-        {
-            return false;
-        }
+    protected override bool HasPoint(Vector2 point)
+    {
+        return false;
     }
 }
diff --git a/Content.Client/Zombies/ZombieSystem.cs b/Content.Client/Zombies/ZombieSystem.cs
index 49b5d6aec18..d250e418504 100644
--- a/Content.Client/Zombies/ZombieSystem.cs
+++ b/Content.Client/Zombies/ZombieSystem.cs
@@ -1,59 +1,53 @@
 using System.Linq;
 using Content.Shared.Ghost;
 using Content.Shared.Humanoid;
+using Content.Shared.StatusIcon;
 using Content.Shared.StatusIcon.Components;
 using Content.Shared.Zombies;
 using Robust.Client.GameObjects;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Zombies;
 
-public sealed class ZombieSystem : EntitySystem
+public sealed class ZombieSystem : SharedZombieSystem
 {
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<ZombieComponent, ComponentStartup>(OnStartup);
-        SubscribeLocalEvent<ZombieComponent, CanDisplayStatusIconsEvent>(OnCanDisplayStatusIcons);
-        SubscribeLocalEvent<InitialInfectedComponent, CanDisplayStatusIconsEvent>(OnCanDisplayStatusIcons);
+        SubscribeLocalEvent<ZombieComponent, GetStatusIconsEvent>(GetZombieIcon);
+        SubscribeLocalEvent<InitialInfectedComponent, GetStatusIconsEvent>(GetInitialInfectedIcon);
     }
 
-    private void OnStartup(EntityUid uid, ZombieComponent component, ComponentStartup args)
+    private void GetZombieIcon(Entity<ZombieComponent> ent, ref GetStatusIconsEvent args)
     {
-        if (HasComp<HumanoidAppearanceComponent>(uid))
-            return;
-
-        if (!TryComp<SpriteComponent>(uid, out var sprite))
-            return;
-
-        for (var i = 0; i < sprite.AllLayers.Count(); i++)
-        {
-            sprite.LayerSetColor(i, component.SkinColor);
-        }
+        var iconPrototype = _prototype.Index(ent.Comp.StatusIcon);
+        args.StatusIcons.Add(iconPrototype);
     }
 
-    /// <summary>
-    /// Determines whether a player should be able to see the StatusIcon for zombies.
-    /// </summary>
-    private void OnCanDisplayStatusIcons(EntityUid uid, ZombieComponent component, ref CanDisplayStatusIconsEvent args)
+    private void GetInitialInfectedIcon(Entity<InitialInfectedComponent> ent, ref GetStatusIconsEvent args)
     {
-        if (HasComp<ZombieComponent>(args.User) || HasComp<InitialInfectedComponent>(args.User) || HasComp<ShowZombieIconsComponent>(args.User))
-            return;
-
-        if (component.IconVisibleToGhost && HasComp<GhostComponent>(args.User))
+        if (HasComp<ZombieComponent>(ent))
             return;
 
-        args.Cancelled = true;
+        var iconPrototype = _prototype.Index(ent.Comp.StatusIcon);
+        args.StatusIcons.Add(iconPrototype);
     }
 
-    private void OnCanDisplayStatusIcons(EntityUid uid, InitialInfectedComponent component, ref CanDisplayStatusIconsEvent args)
+    private void OnStartup(EntityUid uid, ZombieComponent component, ComponentStartup args)
     {
-        if (HasComp<InitialInfectedComponent>(args.User) && !HasComp<ZombieComponent>(args.User))
+        if (HasComp<HumanoidAppearanceComponent>(uid))
             return;
 
-        if (component.IconVisibleToGhost && HasComp<GhostComponent>(args.User))
+        if (!TryComp<SpriteComponent>(uid, out var sprite))
             return;
 
-        args.Cancelled = true;
+        for (var i = 0; i < sprite.AllLayers.Count(); i++)
+        {
+            sprite.LayerSetColor(i, component.SkinColor);
+        }
     }
 }
diff --git a/Content.Shared/Zombies/InitialInfectedComponent.cs b/Content.Shared/Zombies/InitialInfectedComponent.cs
index 987f9a09577..bde89c1bb41 100644
--- a/Content.Shared/Zombies/InitialInfectedComponent.cs
+++ b/Content.Shared/Zombies/InitialInfectedComponent.cs
@@ -6,11 +6,8 @@
 namespace Content.Shared.Zombies;
 
 [RegisterComponent, NetworkedComponent]
-public sealed partial class InitialInfectedComponent : Component, IAntagStatusIconComponent
+public sealed partial class InitialInfectedComponent : Component
 {
-    [DataField("initialInfectedStatusIcon")]
-    public ProtoId<StatusIconPrototype> StatusIcon { get; set; } = "InitialInfectedFaction";
-
     [DataField]
     public ProtoId<FactionIconPrototype> StatusIcon = "InitialInfectedFaction";
 }

From 19f653410620173fa0331d1fb2d8f67fc8d2722b Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Mon, 17 Jun 2024 03:30:10 +0000
Subject: [PATCH 053/366] remove robotics console emag checking, make it a bit
 fairer (#27876)

---
 .../Robotics/UI/RoboticsConsoleWindow.xaml.cs |  1 +
 .../Components/AutomatedTimerComponent.cs     |  2 +-
 .../EntitySystems/TriggerSystem.OnUse.cs      | 25 +--------
 .../Explosion/EntitySystems/TriggerSystem.cs  | 12 ++++
 .../Silicons/Borgs/BorgSystem.Transponder.cs  | 56 ++++++++++++++-----
 Content.Server/Silicons/Borgs/BorgSystem.cs   |  2 +-
 .../Components/RoboticsConsoleComponent.cs    |  2 +-
 Content.Shared/Robotics/RoboticsConsoleUi.cs  | 10 +++-
 .../Components/BorgTransponderComponent.cs    | 39 ++++++++++++-
 Resources/Locale/en-US/borg/borg.ftl          |  2 +
 .../research/components/robotics-console.ftl  |  2 +-
 .../Mobs/Cyborgs/base_borg_chassis.yml        | 11 ++++
 12 files changed, 123 insertions(+), 41 deletions(-)

diff --git a/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs b/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs
index 87d7e62c392..40fca408885 100644
--- a/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs
+++ b/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs
@@ -138,6 +138,7 @@ private void PopulateData()
 
         // how the turntables
         DisableButton.Disabled = !(data.HasBrain && data.CanDisable);
+        DestroyButton.Disabled = _timing.CurTime < _console.Comp1.NextDestroy;
     }
 
     protected override void FrameUpdate(FrameEventArgs args)
diff --git a/Content.Server/Explosion/Components/AutomatedTimerComponent.cs b/Content.Server/Explosion/Components/AutomatedTimerComponent.cs
index 7019c08d43d..c01aeb91e55 100644
--- a/Content.Server/Explosion/Components/AutomatedTimerComponent.cs
+++ b/Content.Server/Explosion/Components/AutomatedTimerComponent.cs
@@ -1,7 +1,7 @@
 namespace Content.Server.Explosion.Components;
 
 /// <summary>
-///     Disallows starting the timer by hand, must be stuck or triggered by a system.
+///     Disallows starting the timer by hand, must be stuck or triggered by a system using <c>StartTimer</c>.
 /// </summary>
 [RegisterComponent]
 public sealed partial class AutomatedTimerComponent : Component
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
index 786d29d94a9..12614dc6367 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
@@ -26,13 +26,7 @@ private void OnStuck(EntityUid uid, OnUseTimerTriggerComponent component, Entity
         if (!component.StartOnStick)
             return;
 
-        HandleTimerTrigger(
-            uid,
-            args.User,
-            component.Delay,
-            component.BeepInterval,
-            component.InitialBeepDelay,
-            component.BeepSound);
+        StartTimer((uid, component), args.User);
     }
 
     private void OnExamined(EntityUid uid, OnUseTimerTriggerComponent component, ExaminedEvent args)
@@ -54,14 +48,7 @@ private void OnGetAltVerbs(EntityUid uid, OnUseTimerTriggerComponent component,
             args.Verbs.Add(new AlternativeVerb()
             {
                 Text = Loc.GetString("verb-start-detonation"),
-                Act = () => HandleTimerTrigger(
-                    uid,
-                    args.User,
-                    component.Delay,
-                    component.BeepInterval,
-                    component.InitialBeepDelay,
-                    component.BeepSound
-                ),
+                Act = () => StartTimer((uid, component), args.User),
                 Priority = 2
             });
         }
@@ -173,13 +160,7 @@ private void OnTimerUse(EntityUid uid, OnUseTimerTriggerComponent component, Use
 
         _popupSystem.PopupEntity(Loc.GetString("trigger-activated", ("device", uid)), args.User, args.User);
 
-        HandleTimerTrigger(
-            uid,
-            args.User,
-            component.Delay,
-            component.BeepInterval,
-            component.InitialBeepDelay,
-            component.BeepSound);
+        StartTimer((uid, component), args.User);
 
         args.Handled = true;
     }
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
index 999a85da5aa..b3c071206e3 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
@@ -265,6 +265,18 @@ public void TryDelay(EntityUid uid, float amount, ActiveTimerTriggerComponent? c
             comp.TimeRemaining += amount;
         }
 
+        /// <summary>
+        /// Start the timer for triggering the device.
+        /// </summary>
+        public void StartTimer(Entity<OnUseTimerTriggerComponent?> ent, EntityUid? user)
+        {
+            if (!Resolve(ent, ref ent.Comp, false))
+                return;
+
+            var comp = ent.Comp;
+            HandleTimerTrigger(ent, user, comp.Delay, comp.BeepInterval, comp.InitialBeepDelay, comp.BeepSound);
+        }
+
         public void HandleTimerTrigger(EntityUid uid, EntityUid? user, float delay, float beepInterval, float? initialBeepDelay, SoundSpecifier? beepSound)
         {
             if (delay <= 0)
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs b/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs
index 1c10cbe667e..781f847be35 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs
@@ -1,5 +1,6 @@
 using Content.Shared.DeviceNetwork;
 using Content.Shared.Emag.Components;
+using Content.Shared.Movement.Components;
 using Content.Shared.Popups;
 using Content.Shared.Robotics;
 using Content.Shared.Silicons.Borgs.Components;
@@ -26,6 +27,9 @@ public override void Update(float frameTime)
         var query = EntityQueryEnumerator<BorgTransponderComponent, BorgChassisComponent, DeviceNetworkComponent, MetaDataComponent>();
         while (query.MoveNext(out var uid, out var comp, out var chassis, out var device, out var meta))
         {
+            if (comp.NextDisable is {} nextDisable && now >= nextDisable)
+                DoDisable((uid, comp, chassis, meta));
+
             if (now < comp.NextBroadcast)
                 continue;
 
@@ -33,13 +37,16 @@ public override void Update(float frameTime)
             if (_powerCell.TryGetBatteryFromSlot(uid, out var battery))
                 charge = battery.CurrentCharge / battery.MaxCharge;
 
+            var hasBrain = chassis.BrainEntity != null && !comp.FakeDisabled;
+            var canDisable = comp.NextDisable == null && !comp.FakeDisabling;
             var data = new CyborgControlData(
                 comp.Sprite,
                 comp.Name,
                 meta.EntityName,
                 charge,
                 chassis.ModuleCount,
-                chassis.BrainEntity != null);
+                hasBrain,
+                canDisable);
 
             var payload = new NetworkPayload()
             {
@@ -52,6 +59,24 @@ public override void Update(float frameTime)
         }
     }
 
+    private void DoDisable(Entity<BorgTransponderComponent, BorgChassisComponent, MetaDataComponent> ent)
+    {
+        ent.Comp1.NextDisable = null;
+        if (ent.Comp1.FakeDisabling)
+        {
+            ent.Comp1.FakeDisabled = true;
+            ent.Comp1.FakeDisabling = false;
+            return;
+        }
+
+        if (ent.Comp2.BrainEntity is not {} brain)
+            return;
+
+        var message = Loc.GetString(ent.Comp1.DisabledPopup, ("name", Name(ent, ent.Comp3)));
+        Popup.PopupEntity(message, ent);
+        _container.Remove(brain, ent.Comp2.BrainContainer);
+    }
+
     private void OnPacketReceived(Entity<BorgTransponderComponent> ent, ref DeviceNetworkPacketEvent args)
     {
         var payload = args.Data;
@@ -61,28 +86,28 @@ private void OnPacketReceived(Entity<BorgTransponderComponent> ent, ref DeviceNe
         if (command == RoboticsConsoleConstants.NET_DISABLE_COMMAND)
             Disable(ent);
         else if (command == RoboticsConsoleConstants.NET_DESTROY_COMMAND)
-            Destroy(ent.Owner);
+            Destroy(ent);
     }
 
     private void Disable(Entity<BorgTransponderComponent, BorgChassisComponent?> ent)
     {
-        if (!Resolve(ent, ref ent.Comp2) || ent.Comp2.BrainEntity is not {} brain)
+        if (!Resolve(ent, ref ent.Comp2) || ent.Comp2.BrainEntity == null || ent.Comp1.NextDisable != null)
             return;
 
-        // this won't exactly be stealthy but if you are malf its better than actually disabling you
+        // update ui immediately
+        ent.Comp1.NextBroadcast = _timing.CurTime;
+
+        // pretend the borg is being disabled forever now
         if (CheckEmagged(ent, "disabled"))
-            return;
+            ent.Comp1.FakeDisabling = true;
+        else
+            Popup.PopupEntity(Loc.GetString(ent.Comp1.DisablingPopup), ent);
 
-        var message = Loc.GetString(ent.Comp1.DisabledPopup, ("name", Name(ent)));
-        Popup.PopupEntity(message, ent);
-        _container.Remove(brain, ent.Comp2.BrainContainer);
+        ent.Comp1.NextDisable = _timing.CurTime + ent.Comp1.DisableDelay;
     }
 
-    private void Destroy(Entity<ExplosiveComponent?> ent)
+    private void Destroy(Entity<BorgTransponderComponent> ent)
     {
-        if (!Resolve(ent, ref ent.Comp))
-            return;
-
         // this is stealthy until someone realises you havent exploded
         if (CheckEmagged(ent, "destroyed"))
         {
@@ -91,7 +116,12 @@ private void Destroy(Entity<ExplosiveComponent?> ent)
             return;
         }
 
-        _explosion.TriggerExplosive(ent, ent.Comp, delete: false);
+        var message = Loc.GetString(ent.Comp.DestroyingPopup, ("name", Name(ent)));
+        Popup.PopupEntity(message, ent);
+        _trigger.StartTimer(ent.Owner, user: null);
+
+        // prevent a shitter borg running into people
+        RemComp<InputMoverComponent>(ent);
     }
 
     private bool CheckEmagged(EntityUid uid, string name)
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.cs b/Content.Server/Silicons/Borgs/BorgSystem.cs
index b8546f30e7d..4e1c4c33818 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.cs
@@ -45,8 +45,8 @@ public sealed partial class BorgSystem : SharedBorgSystem
     [Dependency] private readonly ActionsSystem _actions = default!;
     [Dependency] private readonly AlertsSystem _alerts = default!;
     [Dependency] private readonly DeviceNetworkSystem _deviceNetwork = default!;
-    [Dependency] private readonly ExplosionSystem _explosion = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly TriggerSystem _trigger = default!;
     [Dependency] private readonly HandsSystem _hands = default!;
     [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly SharedMindSystem _mind = default!;
diff --git a/Content.Shared/Robotics/Components/RoboticsConsoleComponent.cs b/Content.Shared/Robotics/Components/RoboticsConsoleComponent.cs
index 4329e437a29..9e4b51866f3 100644
--- a/Content.Shared/Robotics/Components/RoboticsConsoleComponent.cs
+++ b/Content.Shared/Robotics/Components/RoboticsConsoleComponent.cs
@@ -36,7 +36,7 @@ public sealed partial class RoboticsConsoleComponent : Component
     /// Radio message sent when destroying a borg.
     /// </summary>
     [DataField]
-    public LocId DestroyMessage = "robotics-console-cyborg-destroyed";
+    public LocId DestroyMessage = "robotics-console-cyborg-destroying";
 
     /// <summary>
     /// Cooldown on destroying borgs to prevent complete abuse.
diff --git a/Content.Shared/Robotics/RoboticsConsoleUi.cs b/Content.Shared/Robotics/RoboticsConsoleUi.cs
index 1be89beff0b..996c65cb0e6 100644
--- a/Content.Shared/Robotics/RoboticsConsoleUi.cs
+++ b/Content.Shared/Robotics/RoboticsConsoleUi.cs
@@ -97,6 +97,13 @@ public record struct CyborgControlData
     [DataField]
     public bool HasBrain;
 
+    /// <summary>
+    /// Whether the borg can currently be disabled if the brain is installed,
+    /// if on cooldown then can't queue up multiple disables.
+    /// </summary>
+    [DataField]
+    public bool CanDisable;
+
     /// <summary>
     /// When this cyborg's data will be deleted.
     /// Set by the console when receiving the packet.
@@ -104,7 +111,7 @@ public record struct CyborgControlData
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
     public TimeSpan Timeout = TimeSpan.Zero;
 
-    public CyborgControlData(SpriteSpecifier? chassisSprite, string chassisName, string name, float charge, int moduleCount, bool hasBrain)
+    public CyborgControlData(SpriteSpecifier? chassisSprite, string chassisName, string name, float charge, int moduleCount, bool hasBrain, bool canDisable)
     {
         ChassisSprite = chassisSprite;
         ChassisName = chassisName;
@@ -112,6 +119,7 @@ public CyborgControlData(SpriteSpecifier? chassisSprite, string chassisName, str
         Charge = charge;
         ModuleCount = moduleCount;
         HasBrain = hasBrain;
+        CanDisable = canDisable;
     }
 }
 
diff --git a/Content.Shared/Silicons/Borgs/Components/BorgTransponderComponent.cs b/Content.Shared/Silicons/Borgs/Components/BorgTransponderComponent.cs
index 8c15e20d5d0..577056bb46d 100644
--- a/Content.Shared/Silicons/Borgs/Components/BorgTransponderComponent.cs
+++ b/Content.Shared/Silicons/Borgs/Components/BorgTransponderComponent.cs
@@ -23,12 +23,25 @@ public sealed partial class BorgTransponderComponent : Component
     public string Name = string.Empty;
 
     /// <summary>
-    /// Popup shown to everyone when a borg is disabled.
+    /// Popup shown to everyone after a borg is disabled.
     /// Gets passed a string "name".
     /// </summary>
     [DataField]
     public LocId DisabledPopup = "borg-transponder-disabled-popup";
 
+    /// <summary>
+    /// Popup shown to the borg when it is being disabled.
+    /// </summary>
+    [DataField]
+    public LocId DisablingPopup = "borg-transponder-disabling-popup";
+
+    /// <summary>
+    /// Popup shown to everyone when a borg is being destroyed.
+    /// Gets passed a string "name".
+    /// </summary>
+    [DataField]
+    public LocId DestroyingPopup = "borg-transponder-destroying-popup";
+
     /// <summary>
     /// How long to wait between each broadcast.
     /// </summary>
@@ -40,4 +53,28 @@ public sealed partial class BorgTransponderComponent : Component
     /// </summary>
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
     public TimeSpan NextBroadcast = TimeSpan.Zero;
+
+    /// <summary>
+    /// When to next disable the borg.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    public TimeSpan? NextDisable;
+
+    /// <summary>
+    /// How long to wait to disable the borg after RD has ordered it.
+    /// </summary>
+    [DataField]
+    public TimeSpan DisableDelay = TimeSpan.FromSeconds(5);
+
+    /// <summary>
+    /// Pretend that the borg cannot be disabled due to being on delay.
+    /// </summary>
+    [DataField]
+    public bool FakeDisabling;
+
+    /// <summary>
+    /// Pretend that the borg has no brain inserted.
+    /// </summary>
+    [DataField]
+    public bool FakeDisabled;
 }
diff --git a/Resources/Locale/en-US/borg/borg.ftl b/Resources/Locale/en-US/borg/borg.ftl
index c9005eb7961..6f31ca781f9 100644
--- a/Resources/Locale/en-US/borg/borg.ftl
+++ b/Resources/Locale/en-US/borg/borg.ftl
@@ -20,5 +20,7 @@ borg-ui-module-counter = {$actual}/{$max}
 
 # Transponder
 borg-transponder-disabled-popup = A brain shoots out the top of {$name}!
+borg-transponder-disabling-popup = Your transponder begins to lock you out of the chassis!
+borg-transponder-destroying-popup = The self destruct of {$name} starts beeping!
 borg-transponder-emagged-disabled-popup = Your transponder's lights go out!
 borg-transponder-emagged-destroyed-popup = Your transponder's fuse blows!
diff --git a/Resources/Locale/en-US/research/components/robotics-console.ftl b/Resources/Locale/en-US/research/components/robotics-console.ftl
index 978fa9a43c0..a4c82bd0322 100644
--- a/Resources/Locale/en-US/research/components/robotics-console.ftl
+++ b/Resources/Locale/en-US/research/components/robotics-console.ftl
@@ -16,4 +16,4 @@ robotics-console-locked-message = Controls locked, swipe ID.
 robotics-console-disable = Disable
 robotics-console-destroy = Destroy
 
-robotics-console-cyborg-destroyed = The cyborg {$name} has been remotely destroyed.
+robotics-console-cyborg-destroying = {$name} is being remotely detonated!
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 2989c40ff77..c24ca2c1dec 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -246,9 +246,20 @@
     deviceNetId: Wireless
     receiveFrequencyId: CyborgControl
     transmitFrequencyId: RoboticsConsole
+  - type: OnUseTimerTrigger
+    delay: 10
+    examinable: false
+    beepSound:
+      path: /Audio/Effects/Cargo/buzz_two.ogg
+      params:
+        volume: -4
+  # prevent any funnies if someone makes a cyborg item...
+  - type: AutomatedTimer
+  - type: ExplodeOnTrigger
   # explosion does most of its damage in the center and less at the edges
   - type: Explosive
     explosionType: Minibomb
+    deleteAfterExplosion: false # let damage threshold gib the borg
     totalIntensity: 30
     intensitySlope: 20
     maxIntensity: 20

From d6fdbb9370efe0697b7f9f212a2a30e3aee0386e Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 06:23:06 -0400
Subject: [PATCH 054/366] meow

---
 .../Robotics/UI/RoboticsConsoleWindow.xaml.cs     |  1 -
 .../Access/Systems/AgentIDCardSystem.cs           |  2 +-
 .../Access/Systems/IdCardConsoleSystem.cs         |  2 +-
 .../Access/Systems/PresetIdCardSystem.cs          |  2 +-
 .../DeltaV/RoundEnd/RoundEndSystem.Pacified.cs    |  1 +
 .../Rules/Components/TraitorRuleComponent.cs      |  1 -
 .../GameTicking/Rules/NukeopsRuleSystem.cs        |  4 +++-
 Content.Server/Magic/MagicSystem.cs               | 15 +++++++++++++++
 8 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs b/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs
index 40fca408885..87d7e62c392 100644
--- a/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs
+++ b/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs
@@ -138,7 +138,6 @@ private void PopulateData()
 
         // how the turntables
         DisableButton.Disabled = !(data.HasBrain && data.CanDisable);
-        DestroyButton.Disabled = _timing.CurTime < _console.Comp1.NextDestroy;
     }
 
     protected override void FrameUpdate(FrameEventArgs args)
diff --git a/Content.Server/Access/Systems/AgentIDCardSystem.cs b/Content.Server/Access/Systems/AgentIDCardSystem.cs
index 0584c022494..1348e68762f 100644
--- a/Content.Server/Access/Systems/AgentIDCardSystem.cs
+++ b/Content.Server/Access/Systems/AgentIDCardSystem.cs
@@ -94,7 +94,7 @@ private void OnJobIconChanged(EntityUid uid, AgentIDCardComponent comp, AgentIDC
                 return;
             }
 
-            if (!_prototypeManager.TryIndex<StatusIconPrototype>(args.JobIconId, out var jobIcon))
+            if (!_prototypeManager.TryIndex(args.JobIconId, out var jobIcon))
             {
                 return;
             }
diff --git a/Content.Server/Access/Systems/IdCardConsoleSystem.cs b/Content.Server/Access/Systems/IdCardConsoleSystem.cs
index e680b0c6f40..95ffe81bcef 100644
--- a/Content.Server/Access/Systems/IdCardConsoleSystem.cs
+++ b/Content.Server/Access/Systems/IdCardConsoleSystem.cs
@@ -129,7 +129,7 @@ private void TryWriteToTargetId(EntityUid uid,
         _idCard.TryChangeJobTitle(targetId, newJobTitle, player: player);
 
         if (_prototype.TryIndex<JobPrototype>(newJobProto, out var job)
-            && _prototype.TryIndex<StatusIconPrototype>(job.Icon, out var jobIcon))
+            && _prototype.TryIndex(job.Icon, out var jobIcon))
         {
             _idCard.TryChangeJobIcon(targetId, jobIcon, player: player);
             _idCard.TryChangeJobDepartment(targetId, job);
diff --git a/Content.Server/Access/Systems/PresetIdCardSystem.cs b/Content.Server/Access/Systems/PresetIdCardSystem.cs
index 696b7a1dcfd..10bfcc3f7cd 100644
--- a/Content.Server/Access/Systems/PresetIdCardSystem.cs
+++ b/Content.Server/Access/Systems/PresetIdCardSystem.cs
@@ -82,7 +82,7 @@ private void SetupIdAccess(EntityUid uid, PresetIdCardComponent id, bool extende
         _cardSystem.TryChangeJobTitle(uid, job.LocalizedName);
         _cardSystem.TryChangeJobDepartment(uid, job);
 
-        if (_prototypeManager.TryIndex<StatusIconPrototype>(job.Icon, out var jobIcon))
+        if (_prototypeManager.TryIndex(job.Icon, out var jobIcon))
         {
             _cardSystem.TryChangeJobIcon(uid, jobIcon);
         }
diff --git a/Content.Server/DeltaV/RoundEnd/RoundEndSystem.Pacified.cs b/Content.Server/DeltaV/RoundEnd/RoundEndSystem.Pacified.cs
index aa268ccf74a..e4bc631a1dc 100644
--- a/Content.Server/DeltaV/RoundEnd/RoundEndSystem.Pacified.cs
+++ b/Content.Server/DeltaV/RoundEnd/RoundEndSystem.Pacified.cs
@@ -10,6 +10,7 @@
 using Content.Shared.Explosion.Components;
 using Content.Shared.FixedPoint;
 using Content.Shared.Flash.Components;
+using Content.Shared.Store.Components;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
 
diff --git a/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs
index 23de66ae35b..f98b97f8425 100644
--- a/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs
@@ -1,7 +1,6 @@
 using Content.Server.NPC.Components;
 using Content.Shared.Dataset;
 using Content.Shared.FixedPoint;
-using Content.Shared.NPC.Prototypes;
 using Content.Shared.Random;
 using Content.Shared.Roles;
 using Robust.Shared.Audio;
diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
index 6dedf20880f..e390fb9c08d 100644
--- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -22,7 +22,9 @@
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 using System.Linq;
-using Content.Server.GameTicking.Components;
+using Content.Server.NPC.Components;
+using Content.Server.NPC.Systems;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Store.Components;
 
 namespace Content.Server.GameTicking.Rules;
diff --git a/Content.Server/Magic/MagicSystem.cs b/Content.Server/Magic/MagicSystem.cs
index 30c01063b0e..9623be7a920 100644
--- a/Content.Server/Magic/MagicSystem.cs
+++ b/Content.Server/Magic/MagicSystem.cs
@@ -1,7 +1,22 @@
+using System.Numerics;
+using Content.Server.Body.Components;
 using Content.Server.Chat.Systems;
+using Content.Shared.Actions;
+using Content.Shared.Body.Components;
 using Content.Shared.Chat;
+using Content.Shared.DoAfter;
+using Content.Shared.Doors.Components;
+using Content.Shared.Interaction.Events;
 using Content.Shared.Magic;
+using Content.Shared.Magic.Components;
 using Content.Shared.Magic.Events;
+using Content.Shared.Maps;
+using Content.Shared.Physics;
+using Content.Shared.Storage;
+using Robust.Shared.Audio;
+using Robust.Shared.Map;
+using Robust.Shared.Spawners;
+
 
 namespace Content.Server.Magic;
 

From b559e1b06ad262dbb3edf164a51dc55ce1c2a28d Mon Sep 17 00:00:00 2001
From: keronshb <54602815+keronshb@users.noreply.github.com>
Date: Sat, 11 May 2024 19:06:49 -0400
Subject: [PATCH 055/366] Magic Refactor + Wizard Grimoire (#22568)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Brings over changes from the original magic refactor PR

* Adds Master Spellbook, spellbook categories, WizCoin currency, and locale

* Wiz€oin™

* Adds currency whitelist to Spellbook preset, grants contained actions on action added.

* Adds grant contained action and remove provided action.

* adds a way for actions to be upgraded to the store

* Adds Fireball 3 and fixes action upgrade logic so that it checks if the action can level or if the action can upgrade separately

* Fixes upgrade logic in ActionUpgradeSystem to allow for level ups without an actual upgrade. Fixed action upgrade logic in store system as well

* Removes current action entity from the bought entities list and adds new or old action entity

* Removes Current Entity

* Removes old comments, fixes TransferAllActionsWithNewAttached

* Removes TODO

* Removes Product Action Upgrade Event

* reverts changes to immovablerodrule

* Removes stale event reference

* fixes mind action grant logic

* reverts shared gun system change to projectile anomaly system

* forgor to remove the using

* Reverts unintended changes to action container

* Adds refund button to the store

* Refreshes store back to origin.

* Refund with correct currency

* Init refund

* Check for terminating and update interface

* Disables refund button

* Removes preset allow refund

* dont refund if map changed

* adds refunds to stores

* Adds method to check for starting map

* comments, datafields, some requested changes

* turns event into ref event

* Adds datafields

* Switches to entity terminating event

* Changes store entity to be nullable and checks if store is terminating to remove reference.

* Tryadd instead of containskey

* Adds a refund disable method, disables refund on bought ent container changes if not an action

* Removes duplicate refundcomp

* Removes unintended merges

* Removed another unintended change from merge

* removes extra using statement

* readds using statement

* might as well just remove both usings since it won't leave the PR

* Fixes Action upgrades from stores

* Changes to non obsolete method uses

* Shares spawn code between instant and world

* Adds action entity to action event, adds beforecastspellevent, adds spell requirements to magic component

* puts prereq check in spell methods, sets up template code for before cast event

* checks for required wizard clothes

* Networks Magic Comp and Wizard Clothes Comp. Renames MagicSpawnData to MagicInstantSpawnData.

* Removes posdata from projectiles

* Speech > RequiresSpeech

* Fixes ActionOnInteract

* checks for muted

* popup for missing reqs

* Validate click loc for blink spell

* Checks if doors are in range and not obstructed before opening

* Check ents by map coords

* Adds speak event

* Comments spellbooks

* Removes comments

* Unobsoletes smite spell

* Invert if

* Requirements loc

* Fixes spell reqs

* Inverts an if

* Comment updates

* Starts doafter work

* Removes doafter references

* Balances fireball upgrades to be more reasonable

* Enables refund on master spellbooks

* Spells to do

* update spellbook doafter

* knock toggles bolts

* Touch Spell comments

* Comments for pending spells

* more comments

* adds spider polymorph to spellbook

* TODOs for spells

* reorganizes spellbook categories and adds wands

* fixes spacing and adds limited conditions

* commented owner only for future store PR

* reenables owner only for the grimoire

* fixes grimoire sprite

* Adds wizard rod polymorph

* summon ghosts event

* Moves rod form to offensive category

* Adds charge spell and loc for rod polymorph

* Oops forgor the actual chages

* Item Recall comment

* Fixes UI

* removes extra field for wizard rod

* Cleanup

* New Condition (INCOMPLETE)

* Fix linter

* Fix linter (for real)

* fixed some descriptions

* adds regions to magic

* Adds a non-refund wizard grimoire, fixes blink to deselect after teleporting, reduces force wall despawn time to 12 seconds

* removes limited upgrade condition

---------

Co-authored-by: AJCM <AJCM@tutanota.com>
---
 Content.Server/Magic/MagicSystem.cs           | 312 +-----------------
 .../Magic/Events/ChargeSpellEvent.cs          |   3 -
 .../Magic/Events/KnockSpellEvent.cs           |   1 -
 .../Magic/Events/ProjectileSpellEvent.cs      |   3 -
 .../Magic/Events/SpeakSpellEvent.cs           |   2 +-
 .../Magic/Events/TeleportSpellEvent.cs        |   3 -
 Content.Shared/Magic/SharedMagicSystem.cs     |   4 +-
 Content.Shared/Magic/SpellbookSystem.cs       |   3 +-
 .../Entities/Objects/Magic/books.yml          |  45 +++
 Resources/Prototypes/Store/presets.yml        |   2 +-
 10 files changed, 51 insertions(+), 327 deletions(-)

diff --git a/Content.Server/Magic/MagicSystem.cs b/Content.Server/Magic/MagicSystem.cs
index 9623be7a920..50c55f95fb3 100644
--- a/Content.Server/Magic/MagicSystem.cs
+++ b/Content.Server/Magic/MagicSystem.cs
@@ -1,22 +1,7 @@
-using System.Numerics;
-using Content.Server.Body.Components;
 using Content.Server.Chat.Systems;
-using Content.Shared.Actions;
-using Content.Shared.Body.Components;
-using Content.Shared.Chat;
-using Content.Shared.DoAfter;
-using Content.Shared.Doors.Components;
-using Content.Shared.Interaction.Events;
 using Content.Shared.Magic;
 using Content.Shared.Magic.Components;
 using Content.Shared.Magic.Events;
-using Content.Shared.Maps;
-using Content.Shared.Physics;
-using Content.Shared.Storage;
-using Robust.Shared.Audio;
-using Robust.Shared.Map;
-using Robust.Shared.Spawners;
-
 
 namespace Content.Server.Magic;
 
@@ -33,301 +18,6 @@ public override void Initialize()
 
     private void OnSpellSpoken(ref SpeakSpellEvent args)
     {
-        if (args.Handled)
-            return;
-
-        AttemptLearn(uid, component, args);
-
-        args.Handled = true;
-    }
-
-    private void AttemptLearn(EntityUid uid, SpellbookComponent component, UseInHandEvent args)
-    {
-        var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, component.LearnTime, new SpellbookDoAfterEvent(), uid, target: uid)
-        {
-            BreakOnDamage = true,
-            BreakOnMove = true,
-            NeedHand = true //What, are you going to read with your eyes only??
-        };
-
-        _doAfter.TryStartDoAfter(doAfterEventArgs);
-    }
-
-    #region Spells
-
-    /// <summary>
-    /// Handles the instant action (i.e. on the caster) attempting to spawn an entity.
-    /// </summary>
-    private void OnInstantSpawn(InstantSpawnSpellEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        var transform = Transform(args.Performer);
-
-        foreach (var position in GetSpawnPositions(transform, args.Pos))
-        {
-            var ent = Spawn(args.Prototype, position.SnapToGrid(EntityManager, _mapManager));
-
-            if (args.PreventCollideWithCaster)
-            {
-                var comp = EnsureComp<PreventCollideComponent>(ent);
-                comp.Uid = args.Performer;
-            }
-        }
-
-        Speak(args);
-        args.Handled = true;
-    }
-
-    private void OnProjectileSpell(ProjectileSpellEvent ev)
-    {
-        if (ev.Handled)
-            return;
-
-        ev.Handled = true;
-        Speak(ev);
-
-        var xform = Transform(ev.Performer);
-        var userVelocity = _physics.GetMapLinearVelocity(ev.Performer);
-
-        foreach (var pos in GetSpawnPositions(xform, ev.Pos))
-        {
-            // If applicable, this ensures the projectile is parented to grid on spawn, instead of the map.
-            var mapPos = pos.ToMap(EntityManager);
-            var spawnCoords = _mapManager.TryFindGridAt(mapPos, out var gridUid, out _)
-                ? pos.WithEntityId(gridUid, EntityManager)
-                : new(_mapManager.GetMapEntityId(mapPos.MapId), mapPos.Position);
-
-            var ent = Spawn(ev.Prototype, spawnCoords);
-            var direction = ev.Target.ToMapPos(EntityManager, _transformSystem) -
-                            spawnCoords.ToMapPos(EntityManager, _transformSystem);
-            _gunSystem.ShootProjectile(ent, direction, userVelocity, ev.Performer, ev.Performer);
-        }
-    }
-
-    private void OnChangeComponentsSpell(ChangeComponentsSpellEvent ev)
-    {
-        if (ev.Handled)
-            return;
-        ev.Handled = true;
-        Speak(ev);
-
-        foreach (var toRemove in ev.ToRemove)
-        {
-            if (_compFact.TryGetRegistration(toRemove, out var registration))
-                RemComp(ev.Target, registration.Type);
-        }
-
-        foreach (var (name, data) in ev.ToAdd)
-        {
-            if (HasComp(ev.Target, data.Component.GetType()))
-                continue;
-
-            var component = (Component) _compFact.GetComponent(name);
-            component.Owner = ev.Target;
-            var temp = (object) component;
-            _seriMan.CopyTo(data.Component, ref temp);
-            EntityManager.AddComponent(ev.Target, (Component) temp!);
-        }
-    }
-
-    private List<EntityCoordinates> GetSpawnPositions(TransformComponent casterXform, MagicSpawnData data)
-    {
-        switch (data)
-        {
-            case TargetCasterPos:
-                return new List<EntityCoordinates>(1) {casterXform.Coordinates};
-            case TargetInFront:
-            {
-                // This is shit but you get the idea.
-                var directionPos = casterXform.Coordinates.Offset(casterXform.LocalRotation.ToWorldVec().Normalized());
-
-                if (!_mapManager.TryGetGrid(casterXform.GridUid, out var mapGrid))
-                    return new List<EntityCoordinates>();
-
-                if (!directionPos.TryGetTileRef(out var tileReference, EntityManager, _mapManager))
-                    return new List<EntityCoordinates>();
-
-                var tileIndex = tileReference.Value.GridIndices;
-                var coords = mapGrid.GridTileToLocal(tileIndex);
-                EntityCoordinates coordsPlus;
-                EntityCoordinates coordsMinus;
-
-                var dir = casterXform.LocalRotation.GetCardinalDir();
-                switch (dir)
-                {
-                    case Direction.North:
-                    case Direction.South:
-                    {
-                        coordsPlus = mapGrid.GridTileToLocal(tileIndex + (1, 0));
-                        coordsMinus = mapGrid.GridTileToLocal(tileIndex + (-1, 0));
-                        return new List<EntityCoordinates>(3)
-                        {
-                            coords,
-                            coordsPlus,
-                            coordsMinus,
-                        };
-                    }
-                    case Direction.East:
-                    case Direction.West:
-                    {
-                        coordsPlus = mapGrid.GridTileToLocal(tileIndex + (0, 1));
-                        coordsMinus = mapGrid.GridTileToLocal(tileIndex + (0, -1));
-                        return new List<EntityCoordinates>(3)
-                        {
-                            coords,
-                            coordsPlus,
-                            coordsMinus,
-                        };
-                    }
-                }
-
-                return new List<EntityCoordinates>();
-            }
-            default:
-                throw new ArgumentOutOfRangeException();
-        }
-    }
-
-    /// <summary>
-    /// Teleports the user to the clicked location
-    /// </summary>
-    /// <param name="args"></param>
-    private void OnTeleportSpell(TeleportSpellEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        var transform = Transform(args.Performer);
-
-        if (transform.MapID != args.Target.GetMapId(EntityManager)) return;
-
-        _transformSystem.SetCoordinates(args.Performer, args.Target);
-        transform.AttachToGridOrMap();
-        _audio.PlayPvs(args.BlinkSound, args.Performer, AudioParams.Default.WithVolume(args.BlinkVolume));
-        Speak(args);
-        args.Handled = true;
-    }
-
-    /// <summary>
-    /// Opens all doors within range
-    /// </summary>
-    /// <param name="args"></param>
-    private void OnKnockSpell(KnockSpellEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        args.Handled = true;
-        Speak(args);
-
-        //Get the position of the player
-        var transform = Transform(args.Performer);
-        var coords = transform.Coordinates;
-
-        _audio.PlayPvs(args.KnockSound, args.Performer, AudioParams.Default.WithVolume(args.KnockVolume));
-
-        //Look for doors and don't open them if they're already open.
-        foreach (var entity in _lookup.GetEntitiesInRange(coords, args.Range))
-        {
-            if (TryComp<DoorBoltComponent>(entity, out var bolts))
-                _doorSystem.SetBoltsDown((entity, bolts), false);
-
-            if (TryComp<DoorComponent>(entity, out var doorComp) && doorComp.State is not DoorState.Open)
-                _doorSystem.StartOpening(entity);
-        }
-    }
-
-    private void OnSmiteSpell(SmiteSpellEvent ev)
-    {
-        if (ev.Handled)
-            return;
-
-        ev.Handled = true;
-        Speak(ev);
-
-        var direction = Transform(ev.Target).MapPosition.Position - Transform(ev.Performer).MapPosition.Position;
-        var impulseVector = direction * 10000;
-
-        _physics.ApplyLinearImpulse(ev.Target, impulseVector);
-
-        if (!TryComp<BodyComponent>(ev.Target, out var body))
-            return;
-
-        var ents = _bodySystem.GibBody(ev.Target, true, body);
-
-        if (!ev.DeleteNonBrainParts)
-            return;
-
-        foreach (var part in ents)
-        {
-            // just leaves a brain and clothes
-            if (HasComp<BodyComponent>(part) && !HasComp<BrainComponent>(part))
-            {
-                QueueDel(part);
-            }
-        }
-    }
-
-    /// <summary>
-    /// Spawns entity prototypes from a list within range of click.
-    /// </summary>
-    /// <remarks>
-    /// It will offset mobs after the first mob based on the OffsetVector2 property supplied.
-    /// </remarks>
-    /// <param name="args"> The Spawn Spell Event args.</param>
-    private void OnWorldSpawn(WorldSpawnSpellEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        var targetMapCoords = args.Target;
-
-        SpawnSpellHelper(args.Contents, targetMapCoords, args.Lifetime, args.Offset);
-        Speak(args);
-        args.Handled = true;
-    }
-
-    /// <summary>
-    /// Loops through a supplied list of entity prototypes and spawns them
-    /// </summary>
-    /// <remarks>
-    /// If an offset of 0, 0 is supplied then the entities will all spawn on the same tile.
-    /// Any other offset will spawn entities starting from the source Map Coordinates and will increment the supplied
-    /// offset
-    /// </remarks>
-    /// <param name="entityEntries"> The list of Entities to spawn in</param>
-    /// <param name="entityCoords"> Map Coordinates where the entities will spawn</param>
-    /// <param name="lifetime"> Check to see if the entities should self delete</param>
-    /// <param name="offsetVector2"> A Vector2 offset that the entities will spawn in</param>
-    private void SpawnSpellHelper(List<EntitySpawnEntry> entityEntries, EntityCoordinates entityCoords, float? lifetime, Vector2 offsetVector2)
-    {
-        var getProtos = EntitySpawnCollection.GetSpawns(entityEntries, _random);
-
-        var offsetCoords = entityCoords;
-        foreach (var proto in getProtos)
-        {
-            // TODO: Share this code with instant because they're both doing similar things for positioning.
-            var entity = Spawn(proto, offsetCoords);
-            offsetCoords = offsetCoords.Offset(offsetVector2);
-
-            if (lifetime != null)
-            {
-                var comp = EnsureComp<TimedDespawnComponent>(entity);
-                comp.Lifetime = lifetime.Value;
-            }
-        }
-    }
-
-    #endregion
-
-    private void Speak(BaseActionEvent args)
-    {
-        if (args is not ISpeakSpell speak || string.IsNullOrWhiteSpace(speak.Speech))
-            return;
-
-        _chat.TrySendInGameICMessage(args.Performer, Loc.GetString(speak.Speech),
-            InGameICChatType.Speak, false);
+        _chat.TrySendInGameICMessage(args.Performer, Loc.GetString(args.Speech), InGameICChatType.Speak, false);
     }
 }
diff --git a/Content.Shared/Magic/Events/ChargeSpellEvent.cs b/Content.Shared/Magic/Events/ChargeSpellEvent.cs
index 57e1eb880dd..8898761ec2a 100644
--- a/Content.Shared/Magic/Events/ChargeSpellEvent.cs
+++ b/Content.Shared/Magic/Events/ChargeSpellEvent.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Actions;
-using Content.Shared.Chat;
 
 namespace Content.Shared.Magic.Events;
 
@@ -16,6 +15,4 @@ public sealed partial class ChargeSpellEvent : InstantActionEvent, ISpeakSpell
 
     [DataField]
     public string? Speech { get; private set; }
-
-    public InGameICChatType ChatType { get; } = InGameICChatType.Speak;
 }
diff --git a/Content.Shared/Magic/Events/KnockSpellEvent.cs b/Content.Shared/Magic/Events/KnockSpellEvent.cs
index 6775a679ab8..ef742e843e7 100644
--- a/Content.Shared/Magic/Events/KnockSpellEvent.cs
+++ b/Content.Shared/Magic/Events/KnockSpellEvent.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Actions;
-using Content.Shared.Chat;
 
 namespace Content.Shared.Magic.Events;
 
diff --git a/Content.Shared/Magic/Events/ProjectileSpellEvent.cs b/Content.Shared/Magic/Events/ProjectileSpellEvent.cs
index 439b09e7afb..cf338a6bb43 100644
--- a/Content.Shared/Magic/Events/ProjectileSpellEvent.cs
+++ b/Content.Shared/Magic/Events/ProjectileSpellEvent.cs
@@ -12,9 +12,6 @@ public sealed partial class ProjectileSpellEvent : WorldTargetActionEvent, ISpea
     [DataField(required: true)]
     public EntProtoId Prototype;
 
-    [DataField]
-    public float ProjectileSpeed = 20;
-
     [DataField]
     public string? Speech { get; private set; }
 
diff --git a/Content.Shared/Magic/Events/SpeakSpellEvent.cs b/Content.Shared/Magic/Events/SpeakSpellEvent.cs
index d04daf139d8..023fda0efc4 100644
--- a/Content.Shared/Magic/Events/SpeakSpellEvent.cs
+++ b/Content.Shared/Magic/Events/SpeakSpellEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chat;
+using Content.Shared.Chat;
 
 namespace Content.Shared.Magic.Events;
 
diff --git a/Content.Shared/Magic/Events/TeleportSpellEvent.cs b/Content.Shared/Magic/Events/TeleportSpellEvent.cs
index 2f07cab2016..525c1e51052 100644
--- a/Content.Shared/Magic/Events/TeleportSpellEvent.cs
+++ b/Content.Shared/Magic/Events/TeleportSpellEvent.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Actions;
-using Content.Shared.Chat;
 
 namespace Content.Shared.Magic.Events;
 
@@ -9,8 +8,6 @@ public sealed partial class TeleportSpellEvent : WorldTargetActionEvent, ISpeakS
     [DataField]
     public string? Speech { get; private set; }
 
-    public InGameICChatType ChatType { get; } = InGameICChatType.Speak;
-
     // TODO: Move to magic component
     // TODO: Maybe not since sound specifier is a thing
     // Keep here to remind what the volume was set as
diff --git a/Content.Shared/Magic/SharedMagicSystem.cs b/Content.Shared/Magic/SharedMagicSystem.cs
index cae581298a6..cc7a297aa40 100644
--- a/Content.Shared/Magic/SharedMagicSystem.cs
+++ b/Content.Shared/Magic/SharedMagicSystem.cs
@@ -344,7 +344,7 @@ private void OnProjectileSpell(ProjectileSpellEvent ev)
         var ent = Spawn(ev.Prototype, spawnCoords);
         var direction = toCoords.ToMapPos(EntityManager, _transform) -
                         spawnCoords.ToMapPos(EntityManager, _transform);
-        _gunSystem.ShootProjectile(ent, direction, userVelocity, ev.Performer, ev.Performer, ev.ProjectileSpeed);
+        _gunSystem.ShootProjectile(ent, direction, userVelocity, ev.Performer, ev.Performer);
     }
     // End Projectile Spells
     #endregion
@@ -513,7 +513,7 @@ private void Speak(BaseActionEvent args)
         if (args is not ISpeakSpell speak || string.IsNullOrWhiteSpace(speak.Speech))
             return;
 
-        var ev = new SpeakSpellEvent(args.Performer, speak.Speech, speak.ChatType);
+        var ev = new SpeakSpellEvent(args.Performer, speak.Speech);
         RaiseLocalEvent(ref ev);
     }
 }
diff --git a/Content.Shared/Magic/SpellbookSystem.cs b/Content.Shared/Magic/SpellbookSystem.cs
index 139c6a1a125..84b2b232980 100644
--- a/Content.Shared/Magic/SpellbookSystem.cs
+++ b/Content.Shared/Magic/SpellbookSystem.cs
@@ -87,9 +87,8 @@ private void AttemptLearn(Entity<SpellbookComponent> ent, UseInHandEvent args)
         var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, ent.Comp.LearnTime, new SpellbookDoAfterEvent(), ent, target: ent)
         {
             BreakOnMove = true,
-            BreakOnWeightlessMove = true,
             BreakOnDamage = true,
-            NeedHand = true, // What, are you going to read with your eyes only??
+            NeedHand = true //What, are you going to read with your eyes only??
         };
 
         _doAfter.TryStartDoAfter(doAfterEventArgs);
diff --git a/Resources/Prototypes/Entities/Objects/Magic/books.yml b/Resources/Prototypes/Entities/Objects/Magic/books.yml
index b1845ee358c..5bb841cfc5d 100644
--- a/Resources/Prototypes/Entities/Objects/Magic/books.yml
+++ b/Resources/Prototypes/Entities/Objects/Magic/books.yml
@@ -68,6 +68,51 @@
       balance:
         WizCoin: 10 # prices are balanced around this 10 point maximum and how strong the spells are
 
+# For the Wizard Antag
+# Do not add discounts or price inflation
+- type: entity
+  id: WizardsGrimoire
+  name: wizards grimoire
+  suffix: Wizard
+  parent: BaseItem
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper_blood
+      - state: cover_strong
+        color: "#645a5a"
+      - state: decor_wingette_flat
+        color: "#4d0303"
+      - state: icon_pentagramm
+        color: "#f7e19f"
+    - type: UserInterface
+      interfaces:
+        enum.StoreUiKey.Key:
+          type: StoreBoundUserInterface
+    - type: ActivatableUI
+      key: enum.StoreUiKey.Key
+    - type: Store
+      refundAllowed: true
+      ownerOnly: true # get your own tome!
+      preset: StorePresetSpellbook
+      balance:
+        WizCoin: 10 # prices are balanced around this 10 point maximum and how strong the spells are
+
+# Not meant for wizard antag but meant for spawning, so people can't abuse refund if they were given a tome
+- type: entity
+  id: WizardsGrimoireNoRefund
+  name: wizards grimoire
+  suffix: Wizard, No Refund
+  parent: WizardsGrimoire
+  components:
+    - type: Store
+      refundAllowed: false
+      ownerOnly: true # get your own tome!
+      preset: StorePresetSpellbook
+      balance:
+        WizCoin: 10 # prices are balanced around this 10 point maximum and how strong the spells are
+
 - type: entity
   id: SpawnSpellbook
   name: spawn spellbook
diff --git a/Resources/Prototypes/Store/presets.yml b/Resources/Prototypes/Store/presets.yml
index a3290a80031..1f0f6acdce7 100644
--- a/Resources/Prototypes/Store/presets.yml
+++ b/Resources/Prototypes/Store/presets.yml
@@ -39,4 +39,4 @@
     - SpellbookEquipment    #Battlemage Robes, Staff of Locker
     - SpellbookEvents       #Summon Weapons, Summon Ghosts
     currencyWhitelist:
-    - WizCoin
+    - WizCoin
\ No newline at end of file

From 5155205c16c6c27db92d3f4f1785ab72e2ff6454 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 06:34:10 -0400
Subject: [PATCH 056/366] Maow

---
 Content.Client/Antag/AntagStatusIconSystem.cs | 68 -------------------
 1 file changed, 68 deletions(-)
 delete mode 100644 Content.Client/Antag/AntagStatusIconSystem.cs

diff --git a/Content.Client/Antag/AntagStatusIconSystem.cs b/Content.Client/Antag/AntagStatusIconSystem.cs
deleted file mode 100644
index 3f0f391e48e..00000000000
--- a/Content.Client/Antag/AntagStatusIconSystem.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using Content.Shared.Antag;
-using Content.Shared.Revolutionary.Components;
-using Content.Shared.StatusIcon;
-using Content.Shared.StatusIcon.Components;
-using Content.Shared.WhiteDream.BloodCult.BloodCultist;
-using Content.Shared.WhiteDream.BloodCult.Components;
-using Content.Shared.WhiteDream.BloodCult.Constructs;
-using Content.Shared.Zombies;
-using Robust.Client.Player;
-using Robust.Shared.Prototypes;
-
-namespace Content.Client.Antag;
-
-/// <summary>
-/// Used for assigning specified icons for antags.
-/// </summary>
-public sealed class AntagStatusIconSystem : SharedStatusIconSystem
-{
-    [Dependency] private readonly IPrototypeManager _prototype = default!;
-    [Dependency] private readonly IPlayerManager _player = default!;
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<RevolutionaryComponent, GetStatusIconsEvent>(GetRevIcon);
-        SubscribeLocalEvent<ZombieComponent, GetStatusIconsEvent>(GetIcon);
-        SubscribeLocalEvent<HeadRevolutionaryComponent, GetStatusIconsEvent>(GetIcon);
-        SubscribeLocalEvent<InitialInfectedComponent, GetStatusIconsEvent>(GetIcon);
-
-        SubscribeLocalEvent<ConstructComponent, GetStatusIconsEvent>(GetIcon);
-        SubscribeLocalEvent<BloodCultistComponent, GetStatusIconsEvent>(GetBloodCultIcon);
-        SubscribeLocalEvent<BloodCultLeaderComponent, GetStatusIconsEvent>(GetIcon);
-    }
-
-    /// <summary>
-    /// Adds a Status Icon on an entity if the player is supposed to see it.
-    /// </summary>
-    private void GetIcon<T>(EntityUid uid, T comp, ref GetStatusIconsEvent ev) where T: IAntagStatusIconComponent
-    {
-        var ent = _player.LocalSession?.AttachedEntity;
-
-        var canEv = new CanDisplayStatusIconsEvent(ent);
-        RaiseLocalEvent(uid, ref canEv);
-
-        if (!canEv.Cancelled)
-            ev.StatusIcons.Add(_prototype.Index(comp.StatusIcon));
-    }
-
-    /// <summary>
-    /// Adds the Rev Icon on an entity if the player is supposed to see it. This additional function is needed to deal
-    /// with a special case where if someone is a head rev we only want to display the headrev icon.
-    /// </summary>
-    private void GetRevIcon(EntityUid uid, RevolutionaryComponent comp, ref GetStatusIconsEvent ev)
-    {
-        if (HasComp<HeadRevolutionaryComponent>(uid))
-            return;
-
-        GetIcon(uid, comp, ref ev);
-    }
-
-    private void GetBloodCultIcon(EntityUid uid, BloodCultistComponent comp, ref GetStatusIconsEvent ev)
-    {
-        if (HasComp<BloodCultLeaderComponent>(uid))
-            return;
-
-        GetIcon(uid, comp, ref ev);
-    }
-}

From 4529756b04d841302ae040fa3fec31d0b9596900 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 06:34:15 -0400
Subject: [PATCH 057/366] Hm

---
 Content.Server/Magic/MagicSystem.cs           |  2 +-
 .../Projectiles/ProjectileSystem.cs           | 52 +++----------------
 2 files changed, 7 insertions(+), 47 deletions(-)

diff --git a/Content.Server/Magic/MagicSystem.cs b/Content.Server/Magic/MagicSystem.cs
index 50c55f95fb3..c25aada3a07 100644
--- a/Content.Server/Magic/MagicSystem.cs
+++ b/Content.Server/Magic/MagicSystem.cs
@@ -1,6 +1,6 @@
 using Content.Server.Chat.Systems;
+using Content.Shared.Chat;
 using Content.Shared.Magic;
-using Content.Shared.Magic.Components;
 using Content.Shared.Magic.Events;
 
 namespace Content.Server.Magic;
diff --git a/Content.Server/Projectiles/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs
index b899ae5197a..5cbc56b8fbc 100644
--- a/Content.Server/Projectiles/ProjectileSystem.cs
+++ b/Content.Server/Projectiles/ProjectileSystem.cs
@@ -1,4 +1,3 @@
-using Content.Shared.Damage.Events;
 using Content.Server.Administration.Logs;
 using Content.Server.Effects;
 using Content.Server.Weapons.Ranged.Systems;
@@ -8,7 +7,6 @@
 using Content.Shared.Projectiles;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Player;
-using Robust.Shared.Utility;
 
 namespace Content.Server.Projectiles;
 
@@ -24,21 +22,16 @@ public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<ProjectileComponent, StartCollideEvent>(OnStartCollide);
-        SubscribeLocalEvent<EmbeddableProjectileComponent, DamageExamineEvent>(OnDamageExamine);
     }
 
     private void OnStartCollide(EntityUid uid, ProjectileComponent component, ref StartCollideEvent args)
     {
         // This is so entities that shouldn't get a collision are ignored.
         if (args.OurFixtureId != ProjectileFixture || !args.OtherFixture.Hard
-                                                   || component.DamagedEntity || component is
-                                                       { Weapon: null, OnlyCollideWhenShot: true })
-        {
+            || component.DamagedEntity || component is { Weapon: null, OnlyCollideWhenShot: true })
             return;
-        }
 
         var target = args.OtherEntity;
-
         // it's here so this check is only done once before possible hit
         var attemptEv = new ProjectileReflectAttemptEvent(uid, component, false);
         RaiseLocalEvent(target, ref attemptEv);
@@ -48,22 +41,6 @@ private void OnStartCollide(EntityUid uid, ProjectileComponent component, ref St
             return;
         }
 
-        if (TryHandleProjectile(target, (uid, component)))
-        {
-            var direction = args.OurBody.LinearVelocity.Normalized();
-            _sharedCameraRecoil.KickCamera(target, direction);
-        }
-    }
-
-    /// <summary>
-    /// Tries to handle a projectile interacting with the target.
-    /// </summary>
-    /// <returns>True if the target isn't deleted.</returns>
-    public bool TryHandleProjectile(EntityUid target, Entity<ProjectileComponent> projectile)
-    {
-        var uid = projectile.Owner;
-        var component = projectile.Comp;
-
         var ev = new ProjectileHitEvent(component.Damage, target, component.Shooter);
         RaiseLocalEvent(uid, ref ev);
 
@@ -73,7 +50,7 @@ public bool TryHandleProjectile(EntityUid target, Entity<ProjectileComponent> pr
 
         if (modifiedDamage is not null && EntityManager.EntityExists(component.Shooter))
         {
-            if (modifiedDamage.Any() && !deleted)
+            if (modifiedDamage.AnyPositive() && !deleted)
             {
                 _color.RaiseEffect(Color.Red, new List<EntityUid> { target }, Filter.Pvs(target, entityManager: EntityManager));
             }
@@ -86,36 +63,19 @@ public bool TryHandleProjectile(EntityUid target, Entity<ProjectileComponent> pr
         if (!deleted)
         {
             _guns.PlayImpactSound(target, modifiedDamage, component.SoundHit, component.ForceSound);
+
+            if (!args.OurBody.LinearVelocity.IsLengthZero())
+                _sharedCameraRecoil.KickCamera(target, args.OurBody.LinearVelocity.Normalized());
         }
 
         component.DamagedEntity = true;
 
-        var afterProjectileHitEvent = new AfterProjectileHitEvent(component.Damage, target);
-        RaiseLocalEvent(uid, ref afterProjectileHitEvent);
-
         if (component.DeleteOnCollide)
             QueueDel(uid);
 
-        if (component.ImpactEffect != null && TryComp<TransformComponent>(uid, out var xform))
+        if (component.ImpactEffect != null && TryComp(uid, out TransformComponent? xform))
         {
             RaiseNetworkEvent(new ImpactEffectEvent(component.ImpactEffect, GetNetCoordinates(xform.Coordinates)), Filter.Pvs(xform.Coordinates, entityMan: EntityManager));
         }
     }
-
-    private void OnDamageExamine(EntityUid uid, EmbeddableProjectileComponent component, ref DamageExamineEvent args)
-    {
-        if (!component.EmbedOnThrow)
-            return;
-
-        if (!args.Message.IsEmpty)
-            args.Message.PushNewline();
-
-        var isHarmful = TryComp<EmbedPassiveDamageComponent>(uid, out var passiveDamage) && passiveDamage.Damage.Any();
-        var loc = isHarmful
-            ? "damage-examine-embeddable-harmful"
-            : "damage-examine-embeddable";
-
-        var staminaCostMarkup = FormattedMessage.FromMarkupOrThrow(Loc.GetString(loc));
-        args.Message.AddMessage(staminaCostMarkup);
-    }
 }

From f8e5e9c08eac4ef1ec84fb2f6b50e5035614a693 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Fri, 31 May 2024 14:28:11 +1200
Subject: [PATCH 058/366] Only auto-enable internals when necessary (#28248)

* Only auto-enable internals when necessary

* Add toxic gas check

* Rename Any -> AnyPositive
---
 .../AtmosphereSystem.ExcitedGroup.cs          |   2 +-
 .../Body/Systems/InternalsSystem.cs           |  25 +++-
 Content.Server/Body/Systems/LungSystem.cs     |  28 ++--
 .../Body/Systems/RespiratorSystem.cs          | 121 +++++++++++++++++-
 .../ReagentEffectConditions/OrganType.cs      |  12 +-
 .../Damage/Systems/DamageOnLandSystem.cs      |   2 +-
 .../Electrocution/ElectrocutionSystem.cs      |   4 +-
 .../ExplosionSystem.Processing.cs             |   2 +-
 .../Station/Systems/StationSpawningSystem.cs  |   2 +-
 .../EntitySystems/BluespaceLockerSystem.cs    |   4 +-
 .../Weapons/Ranged/Systems/GunSystem.cs       |   2 +-
 Content.Shared/Atmos/GasMixture.cs            |  12 +-
 Content.Shared/Damage/DamageSpecifier.cs      |   4 +-
 .../Station/SharedStationSpawningSystem.cs    |   2 +-
 .../Weapons/Melee/SharedMeleeWeaponSystem.cs  |   2 +-
 15 files changed, 189 insertions(+), 35 deletions(-)

diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.ExcitedGroup.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.ExcitedGroup.cs
index c1b58f7a772..0d622f3067a 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.ExcitedGroup.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.ExcitedGroup.cs
@@ -106,7 +106,7 @@ private void ExcitedGroupSelfBreakdown(
                 if (tile?.Air == null)
                     continue;
 
-                tile.Air.CopyFromMutable(combined);
+                tile.Air.CopyFrom(combined);
                 InvalidateVisuals(ent, tile);
             }
 
diff --git a/Content.Server/Body/Systems/InternalsSystem.cs b/Content.Server/Body/Systems/InternalsSystem.cs
index c1e1de2baad..b79e083bd46 100644
--- a/Content.Server/Body/Systems/InternalsSystem.cs
+++ b/Content.Server/Body/Systems/InternalsSystem.cs
@@ -23,6 +23,7 @@ public sealed class InternalsSystem : EntitySystem
     [Dependency] private readonly GasTankSystem _gasTank = default!;
     [Dependency] private readonly InventorySystem _inventory = default!;
     [Dependency] private readonly PopupSystem _popupSystem = default!;
+    [Dependency] private readonly RespiratorSystem _respirator = default!;
 
     private EntityQuery<InternalsComponent> _internalsQuery;
 
@@ -38,15 +39,30 @@ public override void Initialize()
         SubscribeLocalEvent<InternalsComponent, GetVerbsEvent<InteractionVerb>>(OnGetInteractionVerbs);
         SubscribeLocalEvent<InternalsComponent, InternalsDoAfterEvent>(OnDoAfter);
 
-        SubscribeLocalEvent<StartingGearEquippedEvent>(OnStartingGear);
+        SubscribeLocalEvent<InternalsComponent, StartingGearEquippedEvent>(OnStartingGear);
     }
 
-    private void OnStartingGear(ref StartingGearEquippedEvent ev)
+    private void OnStartingGear(EntityUid uid, InternalsComponent component, ref StartingGearEquippedEvent args)
     {
-        if (!_internalsQuery.TryComp(ev.Entity, out var internals) || internals.BreathToolEntity == null)
+        if (component.BreathToolEntity == null)
             return;
 
-        ToggleInternals(ev.Entity, ev.Entity, force: false, internals);
+        if (component.GasTankEntity != null)
+            return; // already connected
+
+        // Can the entity breathe the air it is currently exposed to?
+        if (_respirator.CanMetabolizeInhaledAir(uid))
+            return;
+
+        var tank = FindBestGasTank(uid);
+        if (tank == null)
+            return;
+
+        // Could the entity metabolise the air in the linked gas tank?
+        if (!_respirator.CanMetabolizeGas(uid, tank.Value.Comp.Air))
+            return;
+
+        ToggleInternals(uid, uid, force: false, component);
     }
 
     private void OnGetInteractionVerbs(
@@ -243,6 +259,7 @@ private short GetSeverity(InternalsComponent component)
     public Entity<GasTankComponent>? FindBestGasTank(
         Entity<HandsComponent?, InventoryComponent?, ContainerManagerComponent?> user)
     {
+        // TODO use _respirator.CanMetabolizeGas() to prioritize metabolizable gasses
         // Prioritise
         // 1. back equipped tanks
         // 2. exo-slot tanks
diff --git a/Content.Server/Body/Systems/LungSystem.cs b/Content.Server/Body/Systems/LungSystem.cs
index e83d3c32a25..7e58c24f7e4 100644
--- a/Content.Server/Body/Systems/LungSystem.cs
+++ b/Content.Server/Body/Systems/LungSystem.cs
@@ -3,6 +3,7 @@
 using Content.Server.Body.Components;
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Shared.Atmos;
+using Content.Shared.Chemistry.Components;
 using Content.Shared.Clothing;
 using Content.Shared.Inventory.Events;
 
@@ -77,23 +78,32 @@ public void GasToReagent(EntityUid uid, LungComponent lung)
         if (!_solutionContainerSystem.ResolveSolution(uid, lung.SolutionName, ref lung.Solution, out var solution))
             return;
 
-        foreach (var gas in Enum.GetValues<Gas>())
+        GasToReagent(lung.Air, solution);
+        _solutionContainerSystem.UpdateChemicals(lung.Solution.Value);
+    }
+
+    private void GasToReagent(GasMixture gas, Solution solution)
+    {
+        foreach (var gasId in Enum.GetValues<Gas>())
         {
-            var i = (int) gas;
-            var moles = lung.Air[i];
+            var i = (int) gasId;
+            var moles = gas[i];
             if (moles <= 0)
                 continue;
+
             var reagent = _atmosphereSystem.GasReagents[i];
-            if (reagent is null) continue;
+            if (reagent is null)
+                continue;
 
             var amount = moles * Atmospherics.BreathMolesToReagentMultiplier;
             solution.AddReagent(reagent, amount);
-
-            // We don't remove the gas from the lung mix,
-            // that's the responsibility of whatever gas is being metabolized.
-            // Most things will just want to exhale again.
         }
+    }
 
-        _solutionContainerSystem.UpdateChemicals(lung.Solution.Value);
+    public Solution GasToReagent(GasMixture gas)
+    {
+        var solution = new Solution();
+        GasToReagent(gas, solution);
+        return solution;
     }
 }
diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
index 943847e560d..04f106ef2c7 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -1,18 +1,21 @@
 using Content.Server.Administration.Logs;
-using Content.Server.Atmos;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Components;
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Popups;
+using Content.Server.Chemistry.ReagentEffectConditions;
+using Content.Server.Chemistry.ReagentEffects;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
 using Content.Shared.Body.Components;
-using Content.Shared.Body.Organ;
+using Content.Shared.Body.Prototypes;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
 using Content.Shared.Database;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Mood;
 using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
 namespace Content.Server.Body.Systems;
@@ -29,7 +32,11 @@ public sealed class RespiratorSystem : EntitySystem
     [Dependency] private readonly LungSystem _lungSystem = default!;
     [Dependency] private readonly PopupSystem _popupSystem = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly IPrototypeManager _protoMan = default!;
     [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
+    [Dependency] private readonly ChatSystem _chat = default!;
+
+    private static readonly ProtoId<MetabolismGroupPrototype> GasId = new("Gas");
 
     public override void Initialize()
     {
@@ -114,7 +121,7 @@ public void Inhale(EntityUid uid, BodyComponent? body = null)
 
         // Inhale gas
         var ev = new InhaleLocationEvent();
-        RaiseLocalEvent(uid, ref ev, broadcast: false);
+        RaiseLocalEvent(uid, ref ev);
 
         ev.Gas ??= _atmosSys.GetContainingMixture(uid, excite: true);
 
@@ -169,6 +176,112 @@ public void Exhale(EntityUid uid, BodyComponent? body = null)
         _atmosSys.Merge(ev.Gas, outGas);
     }
 
+    /// <summary>
+    /// Check whether or not an entity can metabolize inhaled air without suffocating or taking damage (i.e., no toxic
+    /// gasses).
+    /// </summary>
+    public bool CanMetabolizeInhaledAir(Entity<RespiratorComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return false;
+
+        var ev = new InhaleLocationEvent();
+        RaiseLocalEvent(ent, ref ev);
+
+        var gas = ev.Gas ?? _atmosSys.GetContainingMixture(ent.Owner);
+        if (gas == null)
+            return false;
+
+        return CanMetabolizeGas(ent, gas);
+    }
+
+    /// <summary>
+    /// Check whether or not an entity can metabolize the given gas mixture without suffocating or taking damage
+    /// (i.e., no toxic gasses).
+    /// </summary>
+    public bool CanMetabolizeGas(Entity<RespiratorComponent?> ent, GasMixture gas)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return false;
+
+        var organs = _bodySystem.GetBodyOrganComponents<LungComponent>(ent);
+        if (organs.Count == 0)
+            return false;
+
+        gas = new GasMixture(gas);
+        var lungRatio = 1.0f / organs.Count;
+        gas.Multiply(MathF.Min(lungRatio * gas.Volume/Atmospherics.BreathVolume, lungRatio));
+        var solution = _lungSystem.GasToReagent(gas);
+
+        float saturation = 0;
+        foreach (var organ in organs)
+        {
+            saturation += GetSaturation(solution, organ.Comp.Owner, out var toxic);
+            if (toxic)
+                return false;
+        }
+
+        return saturation > ent.Comp.UpdateInterval.TotalSeconds;
+    }
+
+    /// <summary>
+    /// Get the amount of saturation that would be generated if the lung were to metabolize the given solution.
+    /// </summary>
+    /// <remarks>
+    /// This assumes the metabolism rate is unbounded, which generally should be the case for lungs, otherwise we get
+    /// back to the old pulmonary edema bug.
+    /// </remarks>
+    /// <param name="solution">The reagents to metabolize</param>
+    /// <param name="lung">The entity doing the metabolizing</param>
+    /// <param name="toxic">Whether or not any of the reagents would deal damage to the entity</param>
+    private float GetSaturation(Solution solution, Entity<MetabolizerComponent?> lung, out bool toxic)
+    {
+        toxic = false;
+        if (!Resolve(lung, ref lung.Comp))
+            return 0;
+
+        if (lung.Comp.MetabolismGroups == null)
+            return 0;
+
+        float saturation = 0;
+        foreach (var (id, quantity) in solution.Contents)
+        {
+            var reagent = _protoMan.Index<ReagentPrototype>(id.Prototype);
+            if (reagent.Metabolisms == null)
+                continue;
+
+            if (!reagent.Metabolisms.TryGetValue(GasId, out var entry))
+                continue;
+
+            foreach (var effect in entry.Effects)
+            {
+                if (effect is HealthChange health)
+                    toxic |= CanMetabolize(health) && health.Damage.AnyPositive();
+                else if (effect is Oxygenate oxy && CanMetabolize(oxy))
+                    saturation += oxy.Factor * quantity.Float();
+            }
+        }
+
+        // TODO generalize condition checks
+        // this is pretty janky, but I just want to bodge a method that checks if an entity can breathe a gas mixture
+        // Applying actual reaction effects require a full ReagentEffectArgs struct.
+        bool CanMetabolize(ReagentEffect effect)
+        {
+            if (effect.Conditions == null)
+                return true;
+
+            foreach (var cond in effect.Conditions)
+            {
+                if (cond is OrganType organ && !organ.Condition(lung, EntityManager))
+                    return false;
+            }
+
+            return true;
+        }
+
+        return saturation;
+    }
+
     private void TakeSuffocationDamage(Entity<RespiratorComponent> ent)
     {
         if (ent.Comp.SuffocationCycles == 2)
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/OrganType.cs b/Content.Server/Chemistry/ReagentEffectConditions/OrganType.cs
index 4ae13b6a6e4..986c3d79c8d 100644
--- a/Content.Server/Chemistry/ReagentEffectConditions/OrganType.cs
+++ b/Content.Server/Chemistry/ReagentEffectConditions/OrganType.cs
@@ -25,9 +25,15 @@ public override bool Condition(ReagentEffectArgs args)
             if (args.OrganEntity == null)
                 return false;
 
-            if (args.EntityManager.TryGetComponent<MetabolizerComponent>(args.OrganEntity.Value, out var metabolizer)
-                && metabolizer.MetabolizerTypes != null
-                && metabolizer.MetabolizerTypes.Contains(Type))
+            return Condition(args.OrganEntity.Value, args.EntityManager);
+        }
+
+        public bool Condition(Entity<MetabolizerComponent?> metabolizer, IEntityManager entMan)
+        {
+            metabolizer.Comp ??= entMan.GetComponentOrNull<MetabolizerComponent>(metabolizer.Owner);
+            if (metabolizer.Comp != null
+                && metabolizer.Comp.MetabolizerTypes != null
+                && metabolizer.Comp.MetabolizerTypes.Contains(Type))
                 return ShouldHave;
             return !ShouldHave;
         }
diff --git a/Content.Server/Damage/Systems/DamageOnLandSystem.cs b/Content.Server/Damage/Systems/DamageOnLandSystem.cs
index 8f01e791ead..2e72e76e6d8 100644
--- a/Content.Server/Damage/Systems/DamageOnLandSystem.cs
+++ b/Content.Server/Damage/Systems/DamageOnLandSystem.cs
@@ -22,7 +22,7 @@ public override void Initialize()
         private void OnAttemptPacifiedThrow(Entity<DamageOnLandComponent> ent, ref AttemptPacifiedThrowEvent args)
         {
             // Allow healing projectiles, forbid any that do damage:
-            if (ent.Comp.Damage.Any())
+            if (ent.Comp.Damage.AnyPositive())
             {
                 args.Cancel("pacified-cannot-throw");
             }
diff --git a/Content.Server/Electrocution/ElectrocutionSystem.cs b/Content.Server/Electrocution/ElectrocutionSystem.cs
index 4db815a3944..ee1965a91b7 100644
--- a/Content.Server/Electrocution/ElectrocutionSystem.cs
+++ b/Content.Server/Electrocution/ElectrocutionSystem.cs
@@ -168,7 +168,7 @@ private void OnElectrifiedAttacked(EntityUid uid, ElectrifiedComponent electrifi
         if (!electrified.OnAttacked)
             return;
 
-        if (!_meleeWeapon.GetDamage(args.Used, args.User).Any())
+        if (_meleeWeapon.GetDamage(args.Used, args.User).Empty)
             return;
 
         TryDoElectrifiedAct(uid, args.User, 1, electrified);
@@ -185,7 +185,7 @@ private void OnLightAttacked(EntityUid uid, PoweredLightComponent component, Att
         if (!component.CurrentLit || args.Used != args.User)
             return;
 
-        if (!_meleeWeapon.GetDamage(args.Used, args.User).Any())
+        if (_meleeWeapon.GetDamage(args.Used, args.User).Empty)
             return;
 
         DoCommonElectrocution(args.User, uid, component.UnarmedHitShock, component.UnarmedHitStun, false);
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
index 19f33e3fdde..086ab7dd316 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
@@ -392,7 +392,7 @@ private void GetEntitiesToDamage(EntityUid uid, DamageSpecifier originalDamage,
 
         // don't raise BeforeExplodeEvent if the entity is completely immune to explosions
         var thisDamage = GetDamage(uid, prototype, originalDamage);
-        if (!thisDamage.Any())
+        if (thisDamage.Empty)
             return;
 
         _toDamage.Add((uid, thisDamage));
diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs
index 85be5f740d5..bed3fb3027b 100644
--- a/Content.Server/Station/Systems/StationSpawningSystem.cs
+++ b/Content.Server/Station/Systems/StationSpawningSystem.cs
@@ -181,7 +181,7 @@ public EntityUid SpawnPlayerMob(
         }
 
         var gearEquippedEv = new StartingGearEquippedEvent(entity.Value);
-        RaiseLocalEvent(entity.Value, ref gearEquippedEv, true);
+        RaiseLocalEvent(entity.Value, ref gearEquippedEv);
 
         if (profile != null)
         {
diff --git a/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs b/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
index 838311c1aac..9da7606bcc5 100644
--- a/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
+++ b/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
@@ -109,7 +109,7 @@ private void PreOpen(EntityUid uid, BluespaceLockerComponent component, ref Stor
             // Move contained air
             if (component.BehaviorProperties.TransportGas)
             {
-                entityStorageComponent.Air.CopyFromMutable(target.Value.storageComponent.Air);
+                entityStorageComponent.Air.CopyFrom(target.Value.storageComponent.Air);
                 target.Value.storageComponent.Air.Clear();
             }
 
@@ -326,7 +326,7 @@ private void PostClose(EntityUid uid, BluespaceLockerComponent component, bool d
         // Move contained air
         if (component.BehaviorProperties.TransportGas)
         {
-            target.Value.storageComponent.Air.CopyFromMutable(entityStorageComponent.Air);
+            target.Value.storageComponent.Air.CopyFrom(entityStorageComponent.Air);
             entityStorageComponent.Air.Clear();
         }
 
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index 03f10f153d1..f59a6df7aa3 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -360,7 +360,7 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
                         {
                             if (!Deleted(hitEntity))
                             {
-                                if (dmg.Any())
+                                if (dmg.AnyPositive())
                                 {
                                     _color.RaiseEffect(Color.Red, new List<EntityUid>() { hitEntity }, Filter.Pvs(hitEntity, entityManager: EntityManager));
                                 }
diff --git a/Content.Shared/Atmos/GasMixture.cs b/Content.Shared/Atmos/GasMixture.cs
index a676ed67204..0f1efba9766 100644
--- a/Content.Shared/Atmos/GasMixture.cs
+++ b/Content.Shared/Atmos/GasMixture.cs
@@ -96,6 +96,11 @@ public GasMixture(float[] moles, float temp, float volume = Atmospherics.CellVol
             Volume = volume;
         }
 
+        public GasMixture(GasMixture toClone)
+        {
+            CopyFrom(toClone);
+        }
+
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void MarkImmutable()
         {
@@ -197,9 +202,12 @@ public GasMixture RemoveVolume(float vol)
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void CopyFromMutable(GasMixture sample)
+        public void CopyFrom(GasMixture sample)
         {
-            if (Immutable) return;
+            if (Immutable)
+                return;
+
+            Volume = sample.Volume;
             sample.Moles.CopyTo(Moles, 0);
             Temperature = sample.Temperature;
         }
diff --git a/Content.Shared/Damage/DamageSpecifier.cs b/Content.Shared/Damage/DamageSpecifier.cs
index 8ab9116a975..7f505b807f7 100644
--- a/Content.Shared/Damage/DamageSpecifier.cs
+++ b/Content.Shared/Damage/DamageSpecifier.cs
@@ -43,7 +43,7 @@ public sealed partial class DamageSpecifier : IEquatable<DamageSpecifier>
         /// </summary>
         /// <remarks>
         ///     Note that this being zero does not mean this damage has no effect. Healing in one type may cancel damage
-        ///     in another. Consider using <see cref="Any()"/> or <see cref="Empty"/> instead.
+        ///     in another. Consider using <see cref="AnyPositive"/> or <see cref="Empty"/> instead.
         /// </remarks>
         public FixedPoint2 GetTotal()
         {
@@ -60,7 +60,7 @@ public FixedPoint2 GetTotal()
         /// Differs from <see cref="Empty"/> as a damage specifier might contain entries with zeroes.
         /// This also returns false if the specifier only contains negative values.
         /// </summary>
-        public bool Any()
+        public bool AnyPositive()
         {
             foreach (var value in DamageDict.Values)
             {
diff --git a/Content.Shared/Station/SharedStationSpawningSystem.cs b/Content.Shared/Station/SharedStationSpawningSystem.cs
index e889b5c9746..4a2ad625af9 100644
--- a/Content.Shared/Station/SharedStationSpawningSystem.cs
+++ b/Content.Shared/Station/SharedStationSpawningSystem.cs
@@ -115,7 +115,7 @@ public void EquipStartingGear(EntityUid entity, StartingGearPrototype? startingG
         if (raiseEvent)
         {
             var ev = new StartingGearEquippedEvent(entity);
-            RaiseLocalEvent(entity, ref ev, true);
+            RaiseLocalEvent(entity, ref ev);
         }
     }
 }
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index eefd6bb0535..3dbb7991bd6 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -482,7 +482,7 @@ protected virtual void DoLightAttack(EntityUid user, LightAttackEvent ev, Entity
         var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage + attackedEvent.BonusDamage, hitEvent.ModifiersList);
         var damageResult = Damageable.TryChangeDamage(target, modifiedDamage, origin: user, partMultiplier: component.ClickPartDamageMultiplier);
 
-        if (damageResult != null && damageResult.Any())
+        if (damageResult is {Empty: false})
         {
             // If the target has stamina and is taking blunt damage, they should also take stamina damage based on their blunt to stamina factor
             if (damageResult.DamageDict.TryGetValue("Blunt", out var bluntDamage))

From 91ca42b112ca68733056cff56c49f982b6c401bb Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 06:47:02 -0400
Subject: [PATCH 059/366] hm

---
 .../ReverseEngineeringSystem.cs               |   5 +-
 .../Projectiles/ProjectileSystem.cs           |  11 +-
 .../Radio/EntitySystems/RadioDeviceSystem.cs  |   2 +
 .../Research/Oracle/OracleComponent.cs        |   2 +-
 .../Research/Oracle/OracleSystem.cs           |   6 +-
 .../Station/Systems/StationSpawningSystem.cs  |   9 +-
 Content.Server/Store/Systems/StoreSystem.cs   | 105 ++++++------------
 Content.Server/Traitor/Uplink/UplinkSystem.cs |   1 +
 .../ReverseEngineeringComponent.cs            |   3 +-
 9 files changed, 57 insertions(+), 87 deletions(-)

diff --git a/Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs b/Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs
index 98ce725f582..15df39eed8c 100644
--- a/Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs
+++ b/Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs
@@ -8,6 +8,8 @@
 using Content.Server.Construction;
 using Content.Server.Popups;
 using Content.Shared.Power;
+using Content.Shared.Research.Prototypes;
+using Content.Shared.Research.TechnologyDisk.Components;
 using Content.Shared.UserInterface;
 using Robust.Shared.Containers;
 using Robust.Shared.Random;
@@ -15,6 +17,7 @@
 using Robust.Shared.Timing;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.ReverseEngineering;
 
@@ -325,7 +328,7 @@ private void FinishProbe(EntityUid uid, ReverseEngineeringMachineComponent? comp
         UpdateUserInterface(uid, component);
     }
 
-    private void CreateDisk(EntityUid uid, string diskPrototype, List<string>? recipes)
+    private void CreateDisk(EntityUid uid, string diskPrototype, List<ProtoId<LatheRecipePrototype>>? recipes)
     {
         var disk = Spawn(diskPrototype, Transform(uid).Coordinates);
 
diff --git a/Content.Server/Projectiles/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs
index 5cbc56b8fbc..436221103d2 100644
--- a/Content.Server/Projectiles/ProjectileSystem.cs
+++ b/Content.Server/Projectiles/ProjectileSystem.cs
@@ -28,7 +28,7 @@ private void OnStartCollide(EntityUid uid, ProjectileComponent component, ref St
     {
         // This is so entities that shouldn't get a collision are ignored.
         if (args.OurFixtureId != ProjectileFixture || !args.OtherFixture.Hard
-            || component.DamagedEntity || component is { Weapon: null, OnlyCollideWhenShot: true })
+            || component.DamagedEntity || component is { Weapon: null, OnlyCollideWhenShot: true, })
             return;
 
         var target = args.OtherEntity;
@@ -51,11 +51,10 @@ private void OnStartCollide(EntityUid uid, ProjectileComponent component, ref St
         if (modifiedDamage is not null && EntityManager.EntityExists(component.Shooter))
         {
             if (modifiedDamage.AnyPositive() && !deleted)
-            {
-                _color.RaiseEffect(Color.Red, new List<EntityUid> { target }, Filter.Pvs(target, entityManager: EntityManager));
-            }
+                _color.RaiseEffect(Color.Red, [ target, ], Filter.Pvs(target, entityManager: EntityManager));
 
-            _adminLogger.Add(LogType.BulletHit,
+            _adminLogger.Add(
+                LogType.BulletHit,
                 HasComp<ActorComponent>(target) ? LogImpact.Extreme : LogImpact.High,
                 $"Projectile {ToPrettyString(uid):projectile} shot by {ToPrettyString(component.Shooter!.Value):user} hit {otherName:target} and dealt {modifiedDamage.GetTotal():damage} damage");
         }
@@ -74,8 +73,6 @@ private void OnStartCollide(EntityUid uid, ProjectileComponent component, ref St
             QueueDel(uid);
 
         if (component.ImpactEffect != null && TryComp(uid, out TransformComponent? xform))
-        {
             RaiseNetworkEvent(new ImpactEffectEvent(component.ImpactEffect, GetNetCoordinates(xform.Coordinates)), Filter.Pvs(xform.Coordinates, entityMan: EntityManager));
-        }
     }
 }
diff --git a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
index 839bb669221..0f079fdb24b 100644
--- a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
@@ -8,11 +8,13 @@
 using Content.Server.Radio.Components;
 using Content.Server.Speech;
 using Content.Server.Speech.Components;
+using Content.Shared.Chat;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Power;
 using Content.Shared.Radio;
 using Content.Shared.Radio.Components;
+using Robust.Server.GameObjects;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Radio.EntitySystems;
diff --git a/Content.Server/Research/Oracle/OracleComponent.cs b/Content.Server/Research/Oracle/OracleComponent.cs
index 6196ce95060..e9f8b272889 100644
--- a/Content.Server/Research/Oracle/OracleComponent.cs
+++ b/Content.Server/Research/Oracle/OracleComponent.cs
@@ -12,7 +12,7 @@ public sealed partial class OracleComponent : Component
     public ProtoId<WeightedRandomPrototype> DemandTypes;
 
     [DataField]
-    public List<ProtoId<EntityPrototype>> BlacklistedDemands = new();
+    public List<EntProtoId> BlacklistedDemands = new();
 
     [DataField(required: true)]
     public List<ProtoId<WeightedRandomEntityPrototype>> RewardEntities;
diff --git a/Content.Server/Research/Oracle/OracleSystem.cs b/Content.Server/Research/Oracle/OracleSystem.cs
index 15f0a474470..511a18f3795 100644
--- a/Content.Server/Research/Oracle/OracleSystem.cs
+++ b/Content.Server/Research/Oracle/OracleSystem.cs
@@ -271,6 +271,10 @@ private bool GetRandomTechProto(Entity<OracleComponent> oracle, [NotNullWhen(tru
         }
 
         proto = _random.Pick(techs);
+
+        if (proto == null)
+            return false;
+
         return true;
     }
 
@@ -291,7 +295,7 @@ private bool GetRandomPlantProto(Entity<OracleComponent> oracle, [NotNullWhen(tr
         return true;
     }
 
-    private bool IsDemandValid(Entity<OracleComponent> oracle, ProtoId<EntityPrototype>? id)
+    private bool IsDemandValid(Entity<OracleComponent> oracle, EntProtoId? id)
     {
         if (id == null || oracle.Comp.BlacklistedDemands.Contains(id.Value))
             return false;
diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs
index bed3fb3027b..94cedad74f5 100644
--- a/Content.Server/Station/Systems/StationSpawningSystem.cs
+++ b/Content.Server/Station/Systems/StationSpawningSystem.cs
@@ -188,9 +188,7 @@ public EntityUid SpawnPlayerMob(
             _humanoidSystem.LoadProfile(entity.Value, profile);
             _metaSystem.SetEntityName(entity.Value, profile.Name);
             if (profile.FlavorText != "" && _configurationManager.GetCVar(CCVars.FlavorText))
-            {
                 AddComp<DetailExaminableComponent>(entity.Value).Content = profile.FlavorText;
-            }
         }
 
         DoJobSpecials(job, entity.Value);
@@ -204,9 +202,7 @@ private void DoJobSpecials(JobComponent? job, EntityUid entity)
             return;
 
         foreach (var jobSpecial in prototype.Special)
-        {
             jobSpecial.AfterEquip(entity);
-        }
     }
 
     /// <summary>
@@ -231,10 +227,9 @@ public void EquipIdCard(EntityUid entity, string characterName, JobPrototype job
         _cardSystem.TryChangeFullName(cardId, characterName, card);
         _cardSystem.TryChangeJobTitle(cardId, jobPrototype.LocalizedName, card);
 
-        if (_prototypeManager.TryIndex<StatusIconPrototype>(jobPrototype.Icon, out var jobIcon))
-        {
+        if (_prototypeManager.TryIndex(jobPrototype.Icon, out var jobIcon))
             _cardSystem.TryChangeJobIcon(cardId, jobIcon, card);
-        }
+
 
         var extendedAccess = false;
         if (station != null)
diff --git a/Content.Server/Store/Systems/StoreSystem.cs b/Content.Server/Store/Systems/StoreSystem.cs
index 6715cc3d33d..7bdf550301e 100644
--- a/Content.Server/Store/Systems/StoreSystem.cs
+++ b/Content.Server/Store/Systems/StoreSystem.cs
@@ -5,12 +5,11 @@
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Stacks;
+using Content.Shared.Store.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
-using System.Linq;
-using Content.Shared.Store.Components;
-using Content.Server.StoreDiscount;
 using Robust.Shared.Utility;
+using System.Linq;
 
 namespace Content.Server.Store.Systems;
 
@@ -22,7 +21,6 @@ public sealed partial class StoreSystem : EntitySystem
 {
     [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly StoreDiscountSystem _storeDiscount = default!;
 
     public override void Initialize()
     {
@@ -94,14 +92,12 @@ private void OnAfterInteract(EntityUid uid, CurrencyComponent component, AfterIn
         if (ev.Cancelled)
             return;
 
-        args.Handled = TryAddCurrency(GetCurrencyValue(uid, component), args.Target.Value, store);
+        if (!TryAddCurrency((uid, component), (args.Target.Value, store)))
+            return;
 
-        if (args.Handled)
-        {
-            var msg = Loc.GetString("store-currency-inserted", ("used", args.Used), ("target", args.Target));
-            _popup.PopupEntity(msg, args.Target.Value, args.User);
-            QueueDel(args.Used);
-        }
+        args.Handled = true;
+        var msg = Loc.GetString("store-currency-inserted", ("used", args.Used), ("target", args.Target));
+        _popup.PopupEntity(msg, args.Target.Value, args.User);
     }
 
     private void OnImplantActivate(EntityUid uid, StoreComponent component, OpenUplinkImplantEvent args)
@@ -113,6 +109,10 @@ private void OnImplantActivate(EntityUid uid, StoreComponent component, OpenUpli
     /// Gets the value from an entity's currency component.
     /// Scales with stacks.
     /// </summary>
+    /// <remarks>
+    /// If this result is intended to be used with <see cref="TryAddCurrency(Robust.Shared.GameObjects.Entity{Content.Server.Store.Components.CurrencyComponent?},Robust.Shared.GameObjects.Entity{Content.Shared.Store.Components.StoreComponent?})"/>,
+    /// consider using <see cref="TryAddCurrency(Robust.Shared.GameObjects.Entity{Content.Server.Store.Components.CurrencyComponent?},Robust.Shared.GameObjects.Entity{Content.Shared.Store.Components.StoreComponent?})"/> instead to ensure that the currency is consumed in the process.
+    /// </remarks>
     /// <param name="uid"></param>
     /// <param name="component"></param>
     /// <returns>The value of the currency</returns>
@@ -123,19 +123,34 @@ public Dictionary<string, FixedPoint2> GetCurrencyValue(EntityUid uid, CurrencyC
     }
 
     /// <summary>
-    /// Tries to add a currency to a store's balance.
+    /// Tries to add a currency to a store's balance. Note that if successful, this will consume the currency in the process.
     /// </summary>
-    /// <param name="currencyEnt"></param>
-    /// <param name="storeEnt"></param>
-    /// <param name="currency">The currency to add</param>
-    /// <param name="store">The store to add it to</param>
-    /// <returns>Whether or not the currency was succesfully added</returns>
-    [PublicAPI]
-    public bool TryAddCurrency(EntityUid currencyEnt, EntityUid storeEnt, StoreComponent? store = null, CurrencyComponent? currency = null)
+    public bool TryAddCurrency(Entity<CurrencyComponent?> currency, Entity<StoreComponent?> store)
     {
-        if (!Resolve(currencyEnt, ref currency) || !Resolve(storeEnt, ref store))
+        if (!Resolve(currency.Owner, ref currency.Comp))
+            return false;
+
+        if (!Resolve(store.Owner, ref store.Comp))
             return false;
-        return TryAddCurrency(GetCurrencyValue(currencyEnt, currency), storeEnt, store);
+
+        var value = currency.Comp.Price;
+        if (TryComp(currency.Owner, out StackComponent? stack) && stack.Count != 1)
+        {
+            value = currency.Comp.Price
+                .ToDictionary(v => v.Key, p => p.Value * stack.Count);
+        }
+
+        if (!TryAddCurrency(value, store, store.Comp))
+            return false;
+
+        // Avoid having the currency accidentally be re-used. E.g., if multiple clients try to use the currency in the
+        // same tick
+        currency.Comp.Price.Clear();
+        if (stack != null)
+            _stack.SetCount(currency.Owner, 0, stack);
+
+        QueueDel(currency);
+        return true;
     }
 
     /// <summary>
@@ -166,43 +181,6 @@ public bool TryAddCurrency(Dictionary<string, FixedPoint2> currency, EntityUid u
         UpdateUserInterface(null, uid, store);
         return true;
     }
-
-    /// <summary>
-    /// Initializes a store based on a preset ID
-    /// </summary>
-    /// <param name="preset">The ID of a store preset prototype</param>
-    /// <param name="uid"></param>
-    /// <param name="component">The store being initialized</param>
-    public void InitializeFromPreset(string? preset, EntityUid uid, StoreComponent component)
-    {
-        if (preset == null)
-            return;
-
-        if (!_proto.TryIndex<StorePresetPrototype>(preset, out var proto))
-            return;
-
-        InitializeFromPreset(proto, uid, component);
-    }
-
-    /// <summary>
-    /// Initializes a store based on a given preset
-    /// </summary>
-    /// <param name="preset">The StorePresetPrototype</param>
-    /// <param name="uid"></param>
-    /// <param name="component">The store being initialized</param>
-    public void InitializeFromPreset(StorePresetPrototype preset, EntityUid uid, StoreComponent component)
-    {
-        component.Preset = preset.ID;
-        component.CurrencyWhitelist.UnionWith(preset.CurrencyWhitelist);
-        component.Categories.UnionWith(preset.Categories);
-        if (component.Balance == new Dictionary<string, FixedPoint2>() && preset.InitialBalance != null) //if we don't have a value stored, use the preset
-            TryAddCurrency(preset.InitialBalance, uid, component);
-
-        _storeDiscount.ApplyDiscounts(component.Listings, preset);
-
-        if (_ui.HasUi(uid, StoreUiKey.Key))
-            _ui.SetUiState(uid, StoreUiKey.Key, new StoreInitializeState(preset.StoreName));
-    }
 }
 
 public sealed class CurrencyInsertAttemptEvent : CancellableEntityEventArgs
@@ -220,14 +198,3 @@ public CurrencyInsertAttemptEvent(EntityUid user, EntityUid target, EntityUid us
         Store = store;
     }
 }
-
-
-/// <summary>
-/// Nyano/DeltaV Code. For penguin bombs and what not.
-/// Raised on an item when it is purchased.
-/// An item may need to set it upself up for its purchaser.
-/// For example, to make sure it isn't hostile to them or
-/// to make sure it fits their apperance.
-/// </summary>
-[ByRefEvent]
-public readonly record struct ItemPurchasedEvent(EntityUid Purchaser);
diff --git a/Content.Server/Traitor/Uplink/UplinkSystem.cs b/Content.Server/Traitor/Uplink/UplinkSystem.cs
index 0e726f2a2b2..4c0a990b148 100644
--- a/Content.Server/Traitor/Uplink/UplinkSystem.cs
+++ b/Content.Server/Traitor/Uplink/UplinkSystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Server.Store.Systems;
 using Content.Server.StoreDiscount.Systems;
 using Content.Shared.FixedPoint;
diff --git a/Content.Shared/Nyanotrasen/ReverseEngineering/ReverseEngineeringComponent.cs b/Content.Shared/Nyanotrasen/ReverseEngineering/ReverseEngineeringComponent.cs
index e928180e0ac..ac03cc7b36b 100644
--- a/Content.Shared/Nyanotrasen/ReverseEngineering/ReverseEngineeringComponent.cs
+++ b/Content.Shared/Nyanotrasen/ReverseEngineering/ReverseEngineeringComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Research.Prototypes;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
@@ -14,7 +15,7 @@ public sealed partial class ReverseEngineeringComponent : Component
     /// Does not neccesarily line up with lathe recipes.
     /// </summary>
     [DataField("recipes")]
-    public List<string>? Recipes;
+    public List<ProtoId<LatheRecipePrototype>>? Recipes;
 
     /// <summary>
     /// Difficulty score 1-5 how hard this is to reverse engineer.

From c92ff641e6237ce75ae67afc831e33e10d024ecb Mon Sep 17 00:00:00 2001
From: Fildrance <fildrance@gmail.com>
Date: Thu, 5 Sep 2024 15:12:39 +0300
Subject: [PATCH 060/366] feat: #26107 uplink discounts for traitors (no nukies
 for now) (#26297)

* feat: #26107 uplink discounts for traitors and nukies

* refactor: #26107 extracted discount label from price of StoreListingControl

* refactor: minor renaming

* refactor: parametrized adding discounts to uplink store

* fix: #26107 prevent exception on empty discountOptions

* feat: uplink now have 'Discounted' category which contains all discounted items on this session.

* after merge fixups

* rename discount categories according to common sense

* refactor: DiscountOptions is now optional (nullable) on ListingData

* add nullability check ignore for already checked listingData.DiscountOptions

* fix after merge store menu ui

* remove unused using

* final fix after merge conflicts

* [refactor]: #26107 fix variables naming in UplinkSystem

* fix: #26107 fix after merge

* refactor: #26107 now supports discountDownUntil on ListingItem, instead of % of discount

* feat: #26107 support multiple currency discount in store on side of discount message label

* refactor: #26107 extracted discounts initialization to separate system. StoreDiscountData are spread as array and not list now

* refactor: #26107 move more code from storesystem to StoreDiscountComponent

* refactor: #26107 separated StoreSystem and StoreDiscountSystem using events

* fix: #26107 placed not-nullable variable initialization in ListingData for tests

* refactor: #26107 minor renaming, xml-docs

* fix: #26107 changed most of discounts to be down to half price for balance purposes

* ids used in with discounts are now ProtoIds, dicountCategories are now prototypes, code with weights simplified

* decoupled storesystem and store discount system

* xml-docs

* refactor:  #26107 xml-doc for StoreDiscountSystem

* is now a thing (tmp)

* fix: compilation errors + StoreDiscountData.DiscountCategoryId

* refactor: rename ListingDataWithCostModifiers, fix all cost related code, enpittyfy performance, uglify uplink_catalog

* refactor: removed unused code, more StoreDiscountSystem docs, simplify code

* refactor: moved discount category logic to respective system, now creating ListingData c-tor clones all mutable fields as expected

* refactor: rename back (its not prototype)

* refactor: move ListingItemsInitializingEvent to file with handling logic

* refactor: comments for StoreBuyFinishedEvent handling, more logging

* refactor: moved StoreInitializedEvent, xml-doc

* refactor: simplify StoreDiscountSystem code  (reduce nesting) + xml-doc

* refactor: restore old listing data cost field name

* refactor: fix linter in uplink_catalog.yml

* refactor: xml-doc for ListingDataWithCostModifiers

* refactor: limit usage of ListingData in favour of ListingDataWithCostModifiers

* refactor: purged linq, removed custom datafield names, minor cleanup

* refactor: removed double-allocation on getting available listings

* refactor: StoreSystem.OnBuyRequest now uses component.FullListingsCatalog as reference point (as it was in original code)

* fix: minor discount categories on uplink items changes following design overview

* refactor: StoreBuyListingMessage now uses protoId and not whole object

* refactor: store refund and discount integration test, RefreshAllListings now translates previous cost modifiers to refreshed list, if state previous to refresh had any listing items

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
---
 .../Store/Ui/StoreBoundUserInterface.cs       |   7 +-
 .../Store/Ui/StoreListingControl.xaml         |   2 +
 .../Store/Ui/StoreListingControl.xaml.cs      |   7 +-
 Content.Client/Store/Ui/StoreMenu.xaml.cs     |  97 +-
 Content.IntegrationTests/Tests/StoreTests.cs  | 160 ++++
 .../GameTicking/Rules/TraitorRuleSystem.cs    |  24 +-
 .../Store/Conditions/BuyBeforeCondition.cs    |   4 +-
 .../Store/Systems/StoreSystem.Listings.cs     |  70 +-
 .../Store/Systems/StoreSystem.Refund.cs       |   2 +-
 .../Store/Systems/StoreSystem.Ui.cs           |  40 +-
 .../Systems/StoreDiscountSystem.cs            | 397 +++++++++
 .../Uplink/Commands/AddUplinkCommand.cs       |  15 +-
 Content.Server/Traitor/Uplink/UplinkSystem.cs |  87 +-
 .../Store/Components/StoreComponent.cs        |   7 +-
 Content.Shared/Store/ListingPrototype.cs      | 331 ++++++-
 Content.Shared/Store/StoreUi.cs               |  13 +-
 .../Components/StoreDiscountComponent.cs      |  51 ++
 .../commands/add-uplink-command.ftl           |   1 +
 Resources/Locale/en-US/store/categories.ftl   |   2 +-
 Resources/Locale/en-US/store/store.ftl        |   2 +
 .../Catalog/discount_categories.yml           |  13 +
 .../Prototypes/Catalog/uplink_catalog.yml     | 843 +++++++++++++++---
 Resources/Prototypes/Store/categories.yml     |   4 +
 23 files changed, 1892 insertions(+), 287 deletions(-)
 create mode 100644 Content.IntegrationTests/Tests/StoreTests.cs
 create mode 100644 Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs
 create mode 100644 Content.Shared/StoreDiscount/Components/StoreDiscountComponent.cs
 create mode 100644 Resources/Prototypes/Catalog/discount_categories.yml

diff --git a/Content.Client/Store/Ui/StoreBoundUserInterface.cs b/Content.Client/Store/Ui/StoreBoundUserInterface.cs
index 7ed67f7b5dd..8c48258de00 100644
--- a/Content.Client/Store/Ui/StoreBoundUserInterface.cs
+++ b/Content.Client/Store/Ui/StoreBoundUserInterface.cs
@@ -19,7 +19,7 @@ public sealed class StoreBoundUserInterface : BoundUserInterface
     private string _search = string.Empty;
 
     [ViewVariables]
-    private HashSet<ListingData> _listings = new();
+    private HashSet<ListingDataWithCostModifiers> _listings = new();
 
     public StoreBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
     {
@@ -33,7 +33,7 @@ protected override void Open()
 
         _menu.OnListingButtonPressed += (_, listing) =>
         {
-            SendMessage(new StoreBuyListingMessage(listing));
+            SendMessage(new StoreBuyListingMessage(listing.ID));
         };
 
         _menu.OnCategoryButtonPressed += (_, category) =>
@@ -68,6 +68,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
                 _listings = msg.Listings;
 
                 _menu?.UpdateBalance(msg.Balance);
+
                 UpdateListingsWithSearchFilter();
                 _menu?.SetFooterVisibility(msg.ShowFooter);
                 _menu?.UpdateRefund(msg.AllowRefund);
@@ -80,7 +81,7 @@ private void UpdateListingsWithSearchFilter()
         if (_menu == null)
             return;
 
-        var filteredListings = new HashSet<ListingData>(_listings);
+        var filteredListings = new HashSet<ListingDataWithCostModifiers>(_listings);
         if (!string.IsNullOrEmpty(_search))
         {
             filteredListings.RemoveWhere(listingData => !ListingLocalisationHelpers.GetLocalisedNameOrEntityName(listingData, _prototypeManager).Trim().ToLowerInvariant().Contains(_search) &&
diff --git a/Content.Client/Store/Ui/StoreListingControl.xaml b/Content.Client/Store/Ui/StoreListingControl.xaml
index 12b4d7b5b30..3142f1cb061 100644
--- a/Content.Client/Store/Ui/StoreListingControl.xaml
+++ b/Content.Client/Store/Ui/StoreListingControl.xaml
@@ -2,6 +2,8 @@
     <BoxContainer Margin="8,8,8,8" Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
             <Label Name="StoreItemName" HorizontalExpand="True" />
+            <Label Name="DiscountSubText"
+                   HorizontalAlignment="Right"/>
             <Button
                 Name="StoreItemBuyButton"
                 MinWidth="64"
diff --git a/Content.Client/Store/Ui/StoreListingControl.xaml.cs b/Content.Client/Store/Ui/StoreListingControl.xaml.cs
index 030f07dc7ca..20629104acc 100644
--- a/Content.Client/Store/Ui/StoreListingControl.xaml.cs
+++ b/Content.Client/Store/Ui/StoreListingControl.xaml.cs
@@ -17,11 +17,12 @@ public sealed partial class StoreListingControl : Control
     [Dependency] private readonly IGameTiming _timing = default!;
     private readonly ClientGameTicker _ticker;
 
-    private readonly ListingData _data;
+    private readonly ListingDataWithCostModifiers _data;
 
     private readonly bool _hasBalance;
     private readonly string _price;
-    public StoreListingControl(ListingData data, string price, bool hasBalance, Texture? texture = null)
+    private readonly string _discount;
+    public StoreListingControl(ListingDataWithCostModifiers data, string price, string discount, bool hasBalance, Texture? texture = null)
     {
         IoCManager.InjectDependencies(this);
         RobustXamlLoader.Load(this);
@@ -31,6 +32,7 @@ public StoreListingControl(ListingData data, string price, bool hasBalance, Text
         _data = data;
         _hasBalance = hasBalance;
         _price = price;
+        _discount = discount;
 
         StoreItemName.Text = ListingLocalisationHelpers.GetLocalisedNameOrEntityName(_data, _prototype);
         StoreItemDescription.SetMessage(ListingLocalisationHelpers.GetLocalisedDescriptionOrEntityDescription(_data, _prototype));
@@ -63,6 +65,7 @@ private void UpdateBuyButtonText()
         }
         else
         {
+            DiscountSubText.Text = _discount;
             StoreItemBuyButton.Text = _price;
         }
     }
diff --git a/Content.Client/Store/Ui/StoreMenu.xaml.cs b/Content.Client/Store/Ui/StoreMenu.xaml.cs
index f3719646db3..58aebaddc67 100644
--- a/Content.Client/Store/Ui/StoreMenu.xaml.cs
+++ b/Content.Client/Store/Ui/StoreMenu.xaml.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using System.Text;
 using Content.Client.Actions;
 using Content.Client.Message;
 using Content.Shared.FixedPoint;
@@ -23,7 +24,7 @@ public sealed partial class StoreMenu : DefaultWindow
     private StoreWithdrawWindow? _withdrawWindow;
 
     public event EventHandler<string>? SearchTextUpdated;
-    public event Action<BaseButton.ButtonEventArgs, ListingData>? OnListingButtonPressed;
+    public event Action<BaseButton.ButtonEventArgs, ListingDataWithCostModifiers>? OnListingButtonPressed;
     public event Action<BaseButton.ButtonEventArgs, string>? OnCategoryButtonPressed;
     public event Action<BaseButton.ButtonEventArgs, string, int>? OnWithdrawAttempt;
     public event Action<BaseButton.ButtonEventArgs>? OnRefundAttempt;
@@ -31,7 +32,7 @@ public sealed partial class StoreMenu : DefaultWindow
     public Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> Balance = new();
     public string CurrentCategory = string.Empty;
 
-    private List<ListingData> _cachedListings = new();
+    private List<ListingDataWithCostModifiers> _cachedListings = new();
 
     public StoreMenu()
     {
@@ -69,15 +70,17 @@ public void UpdateBalance(Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> ba
         WithdrawButton.Disabled = disabled;
     }
 
-    public void UpdateListing(List<ListingData> listings)
+    public void UpdateListing(List<ListingDataWithCostModifiers> listings)
     {
         _cachedListings = listings;
+
         UpdateListing();
     }
 
     public void UpdateListing()
     {
-        var sorted = _cachedListings.OrderBy(l => l.Priority).ThenBy(l => l.Cost.Values.Sum());
+        var sorted = _cachedListings.OrderBy(l => l.Priority)
+                                    .ThenBy(l => l.Cost.Values.Sum());
 
         // should probably chunk these out instead. to-do if this clogs the internet tubes.
         // maybe read clients prototypes instead?
@@ -115,13 +118,12 @@ private void OnRefundButtonDown(BaseButton.ButtonEventArgs args)
         OnRefundAttempt?.Invoke(args);
     }
 
-    private void AddListingGui(ListingData listing)
+    private void AddListingGui(ListingDataWithCostModifiers listing)
     {
         if (!listing.Categories.Contains(CurrentCategory))
             return;
 
-        var listingPrice = listing.Cost;
-        var hasBalance = HasListingPrice(Balance, listingPrice);
+        var hasBalance = listing.CanBuyWith(Balance);
 
         var spriteSys = _entityManager.EntitySysManager.GetEntitySystem<SpriteSystem>();
 
@@ -144,33 +146,20 @@ private void AddListingGui(ListingData listing)
             }
         }
 
-        var newListing = new StoreListingControl(listing, GetListingPriceString(listing), hasBalance, texture);
-
-        if (listing.DiscountValue > 0)
-            newListing.StoreItemBuyButton.AddStyleClass(StyleNano.ButtonColorDangerDefault.ToString());
+        var listingInStock = GetListingPriceString(listing);
+        var discount = GetDiscountString(listing);
 
+        var newListing = new StoreListingControl(listing, listingInStock, discount, hasBalance, texture);
         newListing.StoreItemBuyButton.OnButtonDown += args
             => OnListingButtonPressed?.Invoke(args, listing);
 
         StoreListingsContainer.AddChild(newListing);
     }
 
-    public bool HasListingPrice(Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> currency, Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> price)
-    {
-        foreach (var type in price)
-        {
-            if (!currency.ContainsKey(type.Key))
-                return false;
-
-            if (currency[type.Key] < type.Value)
-                return false;
-        }
-        return true;
-    }
-
-    public string GetListingPriceString(ListingData listing)
+    private string GetListingPriceString(ListingDataWithCostModifiers listing)
     {
         var text = string.Empty;
+
         if (listing.Cost.Count < 1)
             text = Loc.GetString("store-currency-free");
         else
@@ -178,20 +167,72 @@ public string GetListingPriceString(ListingData listing)
             foreach (var (type, amount) in listing.Cost)
             {
                 var currency = _prototypeManager.Index(type);
-                text += Loc.GetString("store-ui-price-display", ("amount", amount),
-                    ("currency", Loc.GetString(currency.DisplayName, ("amount", amount))));
+
+                text += Loc.GetString(
+                    "store-ui-price-display",
+                    ("amount", amount),
+                    ("currency", Loc.GetString(currency.DisplayName, ("amount", amount)))
+                );
             }
         }
 
         return text.TrimEnd();
     }
 
+    private string GetDiscountString(ListingDataWithCostModifiers listingDataWithCostModifiers)
+    {
+        string discountMessage;
+
+        if (!listingDataWithCostModifiers.IsCostModified)
+        {
+            return string.Empty;
+        }
+
+        var relativeModifiersSummary = listingDataWithCostModifiers.GetModifiersSummaryRelative();
+        if (relativeModifiersSummary.Count > 1)
+        {
+            var sb = new StringBuilder();
+            sb.Append('(');
+            foreach (var (currency, amount) in relativeModifiersSummary)
+            {
+                var currencyPrototype = _prototypeManager.Index(currency);
+                if (sb.Length != 0)
+                {
+                    sb.Append(", ");
+                }
+                var currentDiscountMessage = Loc.GetString(
+                    "store-ui-discount-display-with-currency",
+                    ("amount", amount.ToString("P0")),
+                    ("currency", Loc.GetString(currencyPrototype.DisplayName))
+                );
+                sb.Append(currentDiscountMessage);
+            }
+
+            sb.Append(')');
+            discountMessage = sb.ToString();
+        }
+        else
+        {
+            // if cost was modified - it should have diff relatively to original cost in 1 or more currency
+            // ReSharper disable once GenericEnumeratorNotDisposed Dictionary enumerator doesn't require dispose
+            var enumerator = relativeModifiersSummary.GetEnumerator();
+            enumerator.MoveNext();
+            var amount = enumerator.Current.Value;
+            discountMessage = Loc.GetString(
+                "store-ui-discount-display",
+                ("amount", (amount.ToString("P0")))
+            );
+        }
+
+        return discountMessage;
+    }
+
     private void ClearListings()
     {
         StoreListingsContainer.Children.Clear();
     }
 
-    public void PopulateStoreCategoryButtons(HashSet<ListingData> listings)
+    public void PopulateStoreCategoryButtons(HashSet<ListingDataWithCostModifiers> listings)
     {
         var allCategories = new List<StoreCategoryPrototype>();
         foreach (var listing in listings)
diff --git a/Content.IntegrationTests/Tests/StoreTests.cs b/Content.IntegrationTests/Tests/StoreTests.cs
new file mode 100644
index 00000000000..877db1d9a02
--- /dev/null
+++ b/Content.IntegrationTests/Tests/StoreTests.cs
@@ -0,0 +1,160 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Content.Server.Store.Systems;
+using Content.Server.Traitor.Uplink;
+using Content.Shared.FixedPoint;
+using Content.Shared.Inventory;
+using Content.Shared.Store;
+using Content.Shared.Store.Components;
+using Content.Shared.StoreDiscount.Components;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.IntegrationTests.Tests;
+
+[TestFixture]
+public sealed class StoreTests
+{
+
+    [TestPrototypes]
+    private const string Prototypes = @"
+- type: entity
+  name: InventoryPdaDummy
+  id: InventoryPdaDummy
+  parent: BasePDA
+  components:
+  - type: Clothing
+    QuickEquip: false
+    slots:
+    - idcard
+  - type: Pda
+";
+    [Test]
+    public async Task StoreDiscountAndRefund()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var server = pair.Server;
+
+        var testMap = await pair.CreateTestMap();
+        await server.WaitIdleAsync();
+
+        var serverRandom = server.ResolveDependency<IRobustRandom>();
+        serverRandom.SetSeed(534);
+
+        var entManager = server.ResolveDependency<IEntityManager>();
+
+        var mapSystem = server.System<SharedMapSystem>();
+        var prototypeManager = server.ProtoMan;
+
+        Assert.That(mapSystem.IsInitialized(testMap.MapId));
+
+
+        EntityUid human = default;
+        EntityUid uniform = default;
+        EntityUid pda = default;
+
+        var uplinkSystem = entManager.System<UplinkSystem>();
+
+        var listingPrototypes = prototypeManager.EnumeratePrototypes<ListingPrototype>()
+                                                .ToArray();
+
+        var coordinates = testMap.GridCoords;
+        await server.WaitAssertion(() =>
+        {
+            var invSystem = entManager.System<InventorySystem>();
+
+            human = entManager.SpawnEntity("HumanUniformDummy", coordinates);
+            uniform = entManager.SpawnEntity("UniformDummy", coordinates);
+            pda = entManager.SpawnEntity("InventoryPdaDummy", coordinates);
+
+            Assert.That(invSystem.TryEquip(human, uniform, "jumpsuit"));
+            Assert.That(invSystem.TryEquip(human, pda, "id"));
+
+            FixedPoint2 originalBalance = 20;
+            uplinkSystem.AddUplink(human, originalBalance, null, true);
+
+            var storeComponent = entManager.GetComponent<StoreComponent>(pda);
+            var discountComponent = entManager.GetComponent<StoreDiscountComponent>(pda);
+            Assert.That(
+                discountComponent.Discounts,
+                Has.Exactly(3).Items,
+                $"After applying discount total discounted items count was expected to be '3' "
+                + $"but was actually {discountComponent.Discounts.Count}- this can be due to discount "
+                + $"categories settings (maxItems, weight) not being realistically set, or default "
+                + $"discounted count being changed from '3' in StoreDiscountSystem.InitializeDiscounts."
+            );
+            var discountedListingItems = storeComponent.FullListingsCatalog
+                                                       .Where(x => x.IsCostModified)
+                                                       .OrderBy(x => x.ID)
+                                                       .ToArray();
+            Assert.That(discountComponent.Discounts
+                                         .Select(x => x.ListingId.Id),
+                Is.EquivalentTo(discountedListingItems.Select(x => x.ID)),
+                $"{nameof(StoreComponent)}.{nameof(StoreComponent.FullListingsCatalog)} does not contain all "
+                + $"items that are marked as discounted, or they don't have flag '{nameof(ListingDataWithCostModifiers.IsCostModified)}'"
+                + $"flag as 'true'. This marks the fact that cost modifier of discount is not applied properly!"
+            );
+
+            // Refund action requests re-generation of listing items so we will be re-acquiring items from component a lot of times.
+            var itemIds = discountedListingItems.Select(x => x.ID);
+            foreach (var itemId in itemIds)
+            {
+                Assert.Multiple(() =>
+                {
+                    storeComponent.RefundAllowed = true;
+
+                    var discountedListingItem = storeComponent.FullListingsCatalog.First(x => x.ID == itemId);
+                    var plainDiscountedCost = discountedListingItem.Cost[UplinkSystem.TelecrystalCurrencyPrototype];
+
+                    var prototype = listingPrototypes.First(x => x.ID == discountedListingItem.ID);
+
+                    var prototypeCost = prototype.Cost[UplinkSystem.TelecrystalCurrencyPrototype];
+                    var discountDownTo = prototype.DiscountDownTo[UplinkSystem.TelecrystalCurrencyPrototype];
+                    Assert.That(plainDiscountedCost.Value, Is.GreaterThanOrEqualTo(discountDownTo.Value), "Expected discounted cost to be greater then DiscountDownTo value.");
+                    Assert.That(plainDiscountedCost.Value, Is.LessThan(prototypeCost.Value), "Expected discounted cost to be lower then prototype cost.");
+
+
+                    var buyMsg = new StoreBuyListingMessage(discountedListingItem.ID){Actor = human};
+                    server.EntMan.EventBus.RaiseComponentEvent(pda, storeComponent, buyMsg);
+
+                    var newBalance = storeComponent.Balance[UplinkSystem.TelecrystalCurrencyPrototype];
+                    Assert.That(newBalance.Value, Is.EqualTo((originalBalance - plainDiscountedCost).Value), "Expected to have balance reduced by discounted cost");
+                    Assert.That(
+                        discountedListingItem.IsCostModified,
+                        Is.False,
+                        $"Expected item cost to not be modified after Buying discounted item."
+                    );
+                    var costAfterBuy = discountedListingItem.Cost[UplinkSystem.TelecrystalCurrencyPrototype];
+                    Assert.That(costAfterBuy.Value, Is.EqualTo(prototypeCost.Value), "Expected cost after discount refund to be equal to prototype cost.");
+
+                    var refundMsg = new StoreRequestRefundMessage { Actor = human };
+                    server.EntMan.EventBus.RaiseComponentEvent(pda, storeComponent, refundMsg);
+
+                    // get refreshed item after refund re-generated items
+                    discountedListingItem = storeComponent.FullListingsCatalog.First(x => x.ID == itemId);
+
+                    var afterRefundBalance = storeComponent.Balance[UplinkSystem.TelecrystalCurrencyPrototype];
+                    Assert.That(afterRefundBalance.Value, Is.EqualTo(originalBalance.Value), "Expected refund to return all discounted cost value.");
+                    Assert.That(
+                        discountComponent.Discounts.First(x => x.ListingId == discountedListingItem.ID).Count,
+                        Is.EqualTo(0),
+                        "Discounted count should still be zero even after refund."
+                    );
+
+                    Assert.That(
+                        discountedListingItem.IsCostModified,
+                        Is.False,
+                        $"Expected item cost to not be modified after Buying discounted item (even after refund was done)."
+                    );
+                    var costAfterRefund = discountedListingItem.Cost[UplinkSystem.TelecrystalCurrencyPrototype];
+                    Assert.That(costAfterRefund.Value, Is.EqualTo(prototypeCost.Value), "Expected cost after discount refund to be equal to prototype cost.");
+                });
+            }
+
+        });
+
+        await pair.CleanReturnAsync();
+    }
+}
diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
index 42ea278c742..40827e71cdb 100644
--- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
@@ -84,7 +84,7 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component)
         {
             // Calculate the amount of currency on the uplink.
             var startingBalance = component.StartingBalance;
-            if (_jobs.MindTryGetJob(mindId, out var prototype, out var job))
+            if (_jobs.MindTryGetJob(mindId, out _, out var prototype))
             {
                 if (startingBalance < job.AntagAdvantage) // Can't use Math functions on FixedPoint2
                     startingBalance = 0;
@@ -92,18 +92,22 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component)
                     startingBalance = startingBalance - job.AntagAdvantage;
             }
 
-            // Choose and generate an Uplink, and return the uplink code if applicable
-            var uplinkParams = RequestUplink(traitor, startingBalance, briefing);
-            code = uplinkParams.Item1;
-            briefing = uplinkParams.Item2;
+            // creadth: we need to create uplink for the antag.
+            // PDA should be in place already
+            var pda = _uplink.FindUplinkTarget(traitor);
+            if (pda == null || !_uplink.AddUplink(traitor, startingBalance, giveDiscounts: true))
+                return false;
+
+            // Give traitors their codewords and uplink code to keep in their character info menu
+            code = EnsureComp<RingerUplinkComponent>(pda.Value).Code;
+
+            // If giveUplink is false the uplink code part is omitted
+            briefing = string.Format("{0}\n{1}", briefing,
+                Loc.GetString("traitor-role-uplink-code-short", ("code", string.Join("-", code).Replace("sharp", "#"))));
         }
 
-        string[]? codewords = null;
-        if (component.GiveCodewords)
-            codewords = component.Codewords;
+        _antag.SendBriefing(traitor, GenerateBriefing(component.Codewords, code, issuer), null, component.GreetSoundNotification);
 
-        if (component.GiveBriefing)
-            _antag.SendBriefing(traitor, GenerateBriefing(codewords, code, issuer), null, component.GreetSoundNotification);
 
         component.TraitorMinds.Add(mindId);
 
diff --git a/Content.Server/Store/Conditions/BuyBeforeCondition.cs b/Content.Server/Store/Conditions/BuyBeforeCondition.cs
index 3f0c2de2e18..fcfb5f92c9d 100644
--- a/Content.Server/Store/Conditions/BuyBeforeCondition.cs
+++ b/Content.Server/Store/Conditions/BuyBeforeCondition.cs
@@ -1,5 +1,3 @@
-using Content.Server.Store.Components;
-using Content.Server.Store.Systems;
 using Content.Shared.Store;
 using Content.Shared.Store.Components;
 using Robust.Shared.Prototypes;
@@ -24,7 +22,7 @@ public override bool Condition(ListingConditionArgs args)
         if (!args.EntityManager.TryGetComponent<StoreComponent>(args.StoreEntity, out var storeComp))
             return false;
 
-        var allListings = storeComp.Listings;
+        var allListings = storeComp.FullListingsCatalog;
 
         var purchasesFound = false;
 
diff --git a/Content.Server/Store/Systems/StoreSystem.Listings.cs b/Content.Server/Store/Systems/StoreSystem.Listings.cs
index 10b53a7c94b..4699ec7b669 100644
--- a/Content.Server/Store/Systems/StoreSystem.Listings.cs
+++ b/Content.Server/Store/Systems/StoreSystem.Listings.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Store;
 using Content.Shared.Store.Components;
 using Robust.Shared.Prototypes;
@@ -13,25 +14,43 @@ public sealed partial class StoreSystem
     /// <param name="component">The store to refresh</param>
     public void RefreshAllListings(StoreComponent component)
     {
-        component.Listings = GetAllListings();
+        var previousState = component.FullListingsCatalog;
+        var newState = GetAllListings();
+        // if we refresh list with existing cost modifiers - they will be removed,
+        // need to restore them
+        if (previousState.Count != 0)
+        {
+            foreach (var previousStateListingItem in previousState)
+            {
+                if (!previousStateListingItem.IsCostModified
+                    || !TryGetListing(newState, previousStateListingItem.ID, out var found))
+                {
+                    continue;
+                }
+
+                foreach (var (modifierSourceId, costModifier) in previousStateListingItem.CostModifiersBySourceId)
+                {
+                    found.AddCostModifier(modifierSourceId, costModifier);
+                }
+            }
+        }
+
+        component.FullListingsCatalog = newState;
     }
 
     /// <summary>
     /// Gets all listings from a prototype.
     /// </summary>
     /// <returns>All the listings</returns>
-    public HashSet<ListingData> GetAllListings()
+    public HashSet<ListingDataWithCostModifiers> GetAllListings()
     {
-        var allListings = _proto.EnumeratePrototypes<ListingPrototype>();
-
-        var allData = new HashSet<ListingData>();
-
-        foreach (var listing in allListings)
+        var clones = new HashSet<ListingDataWithCostModifiers>();
+        foreach (var prototype in _proto.EnumeratePrototypes<ListingPrototype>())
         {
-            allData.Add((ListingData) listing.Clone());
+            clones.Add(new ListingDataWithCostModifiers(prototype));
         }
 
-        return allData;
+        return clones;
     }
 
     /// <summary>
@@ -39,7 +58,7 @@ public HashSet<ListingData> GetAllListings()
     /// </summary>
     /// <param name="component">The store to add the listing to</param>
     /// <param name="listingId">The id of the listing</param>
-    /// <returns>Whetehr or not the listing was added successfully</returns>
+    /// <returns>Whether or not the listing was added successfully</returns>
     public bool TryAddListing(StoreComponent component, string listingId)
     {
         if (!_proto.TryIndex<ListingPrototype>(listingId, out var proto))
@@ -47,6 +66,7 @@ public bool TryAddListing(StoreComponent component, string listingId)
             Log.Error("Attempted to add invalid listing.");
             return false;
         }
+
         return TryAddListing(component, proto);
     }
 
@@ -56,9 +76,9 @@ public bool TryAddListing(StoreComponent component, string listingId)
     /// <param name="component">The store to add the listing to</param>
     /// <param name="listing">The listing</param>
     /// <returns>Whether or not the listing was add successfully</returns>
-    public bool TryAddListing(StoreComponent component, ListingData listing)
+    public bool TryAddListing(StoreComponent component, ListingPrototype listing)
     {
-        return component.Listings.Add(listing);
+        return component.FullListingsCatalog.Add(new ListingDataWithCostModifiers(listing));
     }
 
     /// <summary>
@@ -68,9 +88,9 @@ public bool TryAddListing(StoreComponent component, ListingData listing)
     /// <param name="store"></param>
     /// <param name="component">The store the listings are coming from.</param>
     /// <returns>The available listings.</returns>
-    public IEnumerable<ListingData> GetAvailableListings(EntityUid buyer, EntityUid store, StoreComponent component)
+    public IEnumerable<ListingDataWithCostModifiers> GetAvailableListings(EntityUid buyer, EntityUid store, StoreComponent component)
     {
-        return GetAvailableListings(buyer, component.Listings, component.Categories, store);
+        return GetAvailableListings(buyer, component.FullListingsCatalog, component.Categories, store);
     }
 
     /// <summary>
@@ -81,11 +101,12 @@ public IEnumerable<ListingData> GetAvailableListings(EntityUid buyer, EntityUid
     /// <param name="categories">What categories to filter by.</param>
     /// <param name="storeEntity">The physial entity of the store. Can be null.</param>
     /// <returns>The available listings.</returns>
-    public IEnumerable<ListingData> GetAvailableListings(
+    public IEnumerable<ListingDataWithCostModifiers> GetAvailableListings(
         EntityUid buyer,
-        HashSet<ListingData>? listings,
+        IReadOnlyCollection<ListingDataWithCostModifiers>? listings,
         HashSet<ProtoId<StoreCategoryPrototype>> categories,
-        EntityUid? storeEntity = null)
+        EntityUid? storeEntity = null
+    )
     {
         listings ??= GetAllListings();
 
@@ -131,4 +152,19 @@ public bool ListingHasCategory(ListingData listing, HashSet<ProtoId<StoreCategor
         }
         return false;
     }
+
+    private bool TryGetListing(IReadOnlyCollection<ListingDataWithCostModifiers> collection, string listingId, [MaybeNullWhen(false)] out ListingDataWithCostModifiers found)
+    {
+        foreach(var current in collection)
+        {
+            if (current.ID == listingId)
+            {
+                found = current;
+                return true;
+            }
+        }
+
+        found = null!;
+        return false;
+    }
 }
diff --git a/Content.Server/Store/Systems/StoreSystem.Refund.cs b/Content.Server/Store/Systems/StoreSystem.Refund.cs
index 4e823582e6e..04bd585ffcf 100644
--- a/Content.Server/Store/Systems/StoreSystem.Refund.cs
+++ b/Content.Server/Store/Systems/StoreSystem.Refund.cs
@@ -16,7 +16,7 @@ private void InitializeRefund()
 
     private void OnEntityRemoved(EntityUid uid, StoreRefundComponent component, EntRemovedFromContainerMessage args)
     {
-        if (component.StoreEntity == null || _actions.TryGetActionData(uid, out _) || !TryComp<StoreComponent>(component.StoreEntity.Value, out var storeComp))
+        if (component.StoreEntity == null || _actions.TryGetActionData(uid, out _, false) || !TryComp<StoreComponent>(component.StoreEntity.Value, out var storeComp))
             return;
 
         DisableRefund(component.StoreEntity.Value, storeComp);
diff --git a/Content.Server/Store/Systems/StoreSystem.Ui.cs b/Content.Server/Store/Systems/StoreSystem.Ui.cs
index 9d3004cd8af..247055c2a7f 100644
--- a/Content.Server/Store/Systems/StoreSystem.Ui.cs
+++ b/Content.Server/Store/Systems/StoreSystem.Ui.cs
@@ -91,7 +91,8 @@ public void UpdateUserInterface(EntityUid? user, EntityUid store, StoreComponent
         //this is the person who will be passed into logic for all listing filtering.
         if (user != null) //if we have no "buyer" for this update, then don't update the listings
         {
-            component.LastAvailableListings = GetAvailableListings(component.AccountOwner ?? user.Value, store, component).ToHashSet();
+            component.LastAvailableListings = GetAvailableListings(component.AccountOwner ?? user.Value, store, component)
+                .ToHashSet();
         }
 
         //dictionary for all currencies, including 0 values for currencies on the whitelist
@@ -109,6 +110,7 @@ public void UpdateUserInterface(EntityUid? user, EntityUid store, StoreComponent
 
         // only tell operatives to lock their uplink if it can be locked
         var showFooter = HasComp<RingerUplinkComponent>(store);
+
         var state = new StoreUpdateState(component.LastAvailableListings, allCurrency, showFooter, component.RefundAllowed);
         _ui.SetUiState(store, StoreUiKey.Key, state);
     }
@@ -128,7 +130,7 @@ private void BeforeActivatableUiOpen(EntityUid uid, StoreComponent component, Be
     /// </summary>
     private void OnBuyRequest(EntityUid uid, StoreComponent component, StoreBuyListingMessage msg)
     {
-        var listing = component.Listings.FirstOrDefault(x => x.Equals(msg.Listing));
+        var listing = component.FullListingsCatalog.FirstOrDefault(x => x.ID.Equals(msg.Listing.Id));
 
         if (listing == null) //make sure this listing actually exists
         {
@@ -153,9 +155,10 @@ private void OnBuyRequest(EntityUid uid, StoreComponent component, StoreBuyListi
         }
 
         //check that we have enough money
-        foreach (var currency in listing.Cost)
+        var cost = listing.Cost;
+        foreach (var (currency, amount) in cost)
         {
-            if (!component.Balance.TryGetValue(currency.Key, out var balance) || balance < currency.Value)
+            if (!component.Balance.TryGetValue(currency, out var balance) || balance < amount)
             {
                 return;
             }
@@ -165,13 +168,13 @@ private void OnBuyRequest(EntityUid uid, StoreComponent component, StoreBuyListi
             component.RefundAllowed = false;
 
         //subtract the cash
-        foreach (var (currency, value) in listing.Cost)
+        foreach (var (currency, amount) in cost)
         {
-            component.Balance[currency] -= value;
+            component.Balance[currency] -= amount;
 
             component.BalanceSpent.TryAdd(currency, FixedPoint2.Zero);
 
-            component.BalanceSpent[currency] += value;
+            component.BalanceSpent[currency] += amount;
         }
 
         //spawn entity
@@ -213,7 +216,7 @@ private void OnBuyRequest(EntityUid uid, StoreComponent component, StoreBuyListi
 
                 if (listing.ProductUpgradeId != null)
                 {
-                    foreach (var upgradeListing in component.Listings)
+                    foreach (var upgradeListing in component.FullListingsCatalog)
                     {
                         if (upgradeListing.ID == listing.ProductUpgradeId)
                         {
@@ -262,11 +265,12 @@ private void OnBuyRequest(EntityUid uid, StoreComponent component, StoreBuyListi
         listing.PurchaseAmount++; //track how many times something has been purchased
         _audio.PlayEntity(component.BuySuccessSound, msg.Actor, uid); //cha-ching!
 
-        if (listing.SaleLimit != 0 && listing.DiscountValue > 0 && listing.PurchaseAmount >= listing.SaleLimit)
+        var buyFinished = new StoreBuyFinishedEvent
         {
-            listing.DiscountValue = 0;
-            listing.Cost = listing.OldCost;
-        }
+            PurchasedItem = listing,
+            StoreUid = uid
+        };
+        RaiseLocalEvent(ref buyFinished);
 
         UpdateUserInterface(buyer, uid, component);
     }
@@ -352,6 +356,7 @@ private void OnRequestRefund(EntityUid uid, StoreComponent component, StoreReque
         {
             component.Balance[currency] += value;
         }
+
         // Reset store back to its original state
         RefreshAllListings(component);
         component.BalanceSpent = new();
@@ -382,3 +387,14 @@ public void DisableRefund(EntityUid store, StoreComponent? component = null)
         component.RefundAllowed = false;
     }
 }
+
+/// <summary>
+/// Event of successfully finishing purchase in store (<see cref="StoreSystem"/>.
+/// </summary>
+/// <param name="StoreUid">EntityUid on which store is placed.</param>
+/// <param name="PurchasedItem">ListingItem that was purchased.</param>
+[ByRefEvent]
+public readonly record struct StoreBuyFinishedEvent(
+    EntityUid StoreUid,
+    ListingDataWithCostModifiers PurchasedItem
+);
diff --git a/Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs b/Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs
new file mode 100644
index 00000000000..9b4a0481aa2
--- /dev/null
+++ b/Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs
@@ -0,0 +1,397 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using Content.Server.Store.Systems;
+using Content.Shared.FixedPoint;
+using Content.Shared.Store;
+using Content.Shared.StoreDiscount.Components;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.StoreDiscount.Systems;
+
+/// <summary>
+/// Discount system that is part of <see cref="StoreSystem"/>.
+/// </summary>
+public sealed class StoreDiscountSystem : EntitySystem
+{
+    [ValidatePrototypeId<StoreCategoryPrototype>]
+    private const string DiscountedStoreCategoryPrototypeKey = "DiscountedItems";
+
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+    /// <inheritdoc />
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<StoreInitializedEvent>(OnStoreInitialized);
+        SubscribeLocalEvent<StoreBuyFinishedEvent>(OnBuyFinished);
+    }
+
+    /// <summary> Decrements discounted item count, removes discount modifier and category, if counter reaches zero. </summary>
+    private void OnBuyFinished(ref StoreBuyFinishedEvent ev)
+    {
+        var (storeId, purchasedItem) = ev;
+        if (!TryComp<StoreDiscountComponent>(storeId, out var discountsComponent))
+        {
+            return;
+        }
+
+        // find and decrement discount count for item, if there is one.
+        if (!TryGetDiscountData(discountsComponent.Discounts, purchasedItem, out var discountData) || discountData.Count == 0)
+        {
+            return;
+        }
+
+        discountData.Count--;
+        if (discountData.Count > 0)
+        {
+            return;
+        }
+
+        // if there were discounts, but they are all bought up now - restore state: remove modifier and remove store category
+        purchasedItem.RemoveCostModifier(discountData.DiscountCategory);
+        purchasedItem.Categories.Remove(DiscountedStoreCategoryPrototypeKey);
+    }
+
+    /// <summary> Initialized discounts if required. </summary>
+    private void OnStoreInitialized(ref StoreInitializedEvent ev)
+    {
+        if (!ev.UseDiscounts)
+        {
+            return;
+        }
+
+        var discountComponent = EnsureComp<StoreDiscountComponent>(ev.Store);
+        var discounts = InitializeDiscounts(ev.Listings);
+        ApplyDiscounts(ev.Listings, discounts);
+        discountComponent.Discounts = discounts;
+    }
+
+    private IReadOnlyList<StoreDiscountData> InitializeDiscounts(
+        IReadOnlyCollection<ListingDataWithCostModifiers> listings,
+        int totalAvailableDiscounts = 3
+    )
+    {
+        // Get list of categories with cumulative weights.
+        // for example if we have categories with weights 2, 18 and 80
+        // list of cumulative ones will be 2,20,100 (with 100 being total).
+        // Then roll amount of unique listing items to be discounted under
+        // each category, and after that - roll exact items in categories
+        // and their cost
+
+        var prototypes = _prototypeManager.EnumeratePrototypes<DiscountCategoryPrototype>();
+        var categoriesWithCumulativeWeight = new CategoriesWithCumulativeWeightMap(prototypes);
+        var uniqueListingItemCountByCategory = PickCategoriesToRoll(totalAvailableDiscounts, categoriesWithCumulativeWeight);
+
+        return RollItems(listings, uniqueListingItemCountByCategory);
+    }
+
+    /// <summary>
+    /// Roll <b>how many</b> unique listing items which discount categories going to have. This will be used later to then pick listing items
+    /// to actually set discounts.
+    /// </summary>
+    /// <remarks>
+    /// Not every discount category have equal chance to be rolled, and not every discount category even can be rolled.
+    /// This step is important to distribute discounts properly (weighted) and with respect of
+    /// category maxItems, and more importantly - to not roll same item multiple times on next step.
+    /// </remarks>
+    /// <param name="totalAvailableDiscounts">
+    /// Total amount of different listing items to be discounted. Depending on <see cref="DiscountCategoryPrototype.MaxItems"/>
+    /// there might be less discounts then <see cref="totalAvailableDiscounts"/>, but never more.
+    /// </param>
+    /// <param name="categoriesWithCumulativeWeightMap">
+    /// Map of discount category cumulative weights by respective protoId of discount category.
+    /// </param>
+    /// <returns>Map: <b>count</b> of different listing items to be discounted, by discount category.</returns>
+    private Dictionary<ProtoId<DiscountCategoryPrototype>, int> PickCategoriesToRoll(
+        int totalAvailableDiscounts,
+        CategoriesWithCumulativeWeightMap categoriesWithCumulativeWeightMap
+    )
+    {
+        var chosenDiscounts = new Dictionary<ProtoId<DiscountCategoryPrototype>, int>();
+        for (var i = 0; i < totalAvailableDiscounts; i++)
+        {
+            var discountCategory = categoriesWithCumulativeWeightMap.RollCategory(_random);
+            if (discountCategory == null)
+            {
+                break;
+            }
+
+            // * if category was not previously picked - we mark it as picked 1 time
+            // * if category was previously picked - we increment its 'picked' marker
+            // * if category 'picked' marker going to exceed limit on category - we need to remove IT from further rolls
+            int newDiscountCount;
+            if (!chosenDiscounts.TryGetValue(discountCategory.ID, out var alreadySelectedCount))
+            {
+                newDiscountCount = 1;
+            }
+            else
+            {
+                newDiscountCount = alreadySelectedCount + 1;
+            }
+            chosenDiscounts[discountCategory.ID] = newDiscountCount;
+
+            if (newDiscountCount >= discountCategory.MaxItems)
+            {
+                categoriesWithCumulativeWeightMap.Remove(discountCategory);
+            }
+        }
+
+        return chosenDiscounts;
+    }
+
+    /// <summary>
+    /// Rolls list of exact <see cref="ListingData"/> items to be discounted, and amount of currency to be discounted.
+    /// </summary>
+    /// <param name="listings">List of all available listing items from which discounted ones could be selected.</param>
+    /// <param name="chosenDiscounts"></param>
+    /// <returns>Collection of containers with rolled discount data.</returns>
+    private IReadOnlyList<StoreDiscountData> RollItems(IEnumerable<ListingDataWithCostModifiers> listings, Dictionary<ProtoId<DiscountCategoryPrototype>, int> chosenDiscounts)
+    {
+        // To roll for discounts on items we: pick listing items that have values inside 'DiscountDownTo'.
+        // then we iterate over discount categories that were chosen on previous step and pick unique set
+        // of items from that exact category. Then we roll for their cost:
+        // cost could be anything between DiscountDownTo value and actual item cost.
+
+        var listingsByDiscountCategory = GroupDiscountableListingsByDiscountCategory(listings);
+
+        var list = new List<StoreDiscountData>();
+        foreach (var (discountCategory, itemsCount) in chosenDiscounts)
+        {
+            if (!listingsByDiscountCategory.TryGetValue(discountCategory, out var itemsForDiscount))
+            {
+                continue;
+            }
+
+            var chosen = _random.GetItems(itemsForDiscount, itemsCount, allowDuplicates: false);
+            foreach (var listingData in chosen)
+            {
+                var cost = listingData.OriginalCost;
+                var discountAmountByCurrencyId = RollItemCost(cost, listingData);
+
+                var discountData = new StoreDiscountData
+                {
+                    ListingId = listingData.ID,
+                    Count = 1,
+                    DiscountCategory = listingData.DiscountCategory!.Value,
+                    DiscountAmountByCurrency = discountAmountByCurrencyId
+                };
+                list.Add(discountData);
+            }
+        }
+
+        return list;
+    }
+
+    /// <summary> Roll amount of each currency by which item cost should be reduced. </summary>
+    /// <remarks>
+    /// No point in confusing user with a fractional number, so we remove numbers after dot that were rolled.
+    /// </remarks>
+    private Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> RollItemCost(
+        IReadOnlyDictionary<ProtoId<CurrencyPrototype>, FixedPoint2> originalCost,
+        ListingDataWithCostModifiers listingData
+    )
+    {
+        var discountAmountByCurrencyId = new Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2>(originalCost.Count);
+        foreach (var (currency, amount) in originalCost)
+        {
+            if (!listingData.DiscountDownTo.TryGetValue(currency, out var discountUntilValue))
+            {
+                continue;
+            }
+
+            var discountUntilRolledValue = _random.NextDouble(discountUntilValue.Double(), amount.Double());
+            var discountedCost = amount - Math.Floor(discountUntilRolledValue);
+
+            // discount is negative modifier for cost
+            discountAmountByCurrencyId.Add(currency.Id, -discountedCost);
+        }
+
+        return discountAmountByCurrencyId;
+    }
+
+    private void ApplyDiscounts(IReadOnlyList<ListingDataWithCostModifiers> listings, IReadOnlyCollection<StoreDiscountData> discounts)
+    {
+        foreach (var discountData in discounts)
+        {
+            if (discountData.Count <= 0)
+            {
+                continue;
+            }
+
+            ListingDataWithCostModifiers? found = null;
+            for (var i = 0; i < listings.Count; i++)
+            {
+                var current = listings[i];
+                if (current.ID == discountData.ListingId)
+                {
+                    found = current;
+                    break;
+                }
+            }
+
+            if (found == null)
+            {
+                Log.Warning($"Attempted to apply discount to listing item with {discountData.ListingId}, but found no such listing item.");
+                return;
+            }
+
+            found.AddCostModifier(discountData.DiscountCategory, discountData.DiscountAmountByCurrency);
+            found.Categories.Add(DiscountedStoreCategoryPrototypeKey);
+        }
+    }
+
+    private static Dictionary<ProtoId<DiscountCategoryPrototype>, List<ListingDataWithCostModifiers>> GroupDiscountableListingsByDiscountCategory(
+        IEnumerable<ListingDataWithCostModifiers> listings
+    )
+    {
+        var listingsByDiscountCategory = new Dictionary<ProtoId<DiscountCategoryPrototype>, List<ListingDataWithCostModifiers>>();
+        foreach (var listing in listings)
+        {
+            var category = listing.DiscountCategory;
+            if (category == null || listing.DiscountDownTo.Count == 0)
+            {
+                continue;
+            }
+
+            if (!listingsByDiscountCategory.TryGetValue(category.Value, out var list))
+            {
+                list = new List<ListingDataWithCostModifiers>();
+                listingsByDiscountCategory[category.Value] = list;
+            }
+
+            list.Add(listing);
+        }
+
+        return listingsByDiscountCategory;
+    }
+
+    private static bool TryGetDiscountData(
+        IReadOnlyList<StoreDiscountData> discounts,
+        ListingDataWithCostModifiers purchasedItem,
+        [MaybeNullWhen(false)] out StoreDiscountData discountData
+    )
+    {
+        for (var i = 0; i < discounts.Count; i++)
+        {
+            var current = discounts[i];
+            if (current.ListingId == purchasedItem.ID)
+            {
+                discountData = current;
+                return true;
+            }
+        }
+
+        discountData = null!;
+        return false;
+    }
+
+    /// <summary> Map for holding discount categories with their calculated cumulative weight.  </summary>
+    private sealed record CategoriesWithCumulativeWeightMap
+    {
+        private readonly List<DiscountCategoryPrototype> _categories;
+        private readonly List<int> _weights;
+        private int _totalWeight;
+
+        /// <summary>
+        /// Creates map, filtering out categories that could not be picked (no weight, no max items).
+        /// Calculates cumulative weights by summing each next category weight with sum of all previous ones.
+        /// </summary>
+        public CategoriesWithCumulativeWeightMap(IEnumerable<DiscountCategoryPrototype> prototypes)
+        {
+            var asArray = prototypes.ToArray();
+            _weights = new (asArray.Length);
+            _categories = new(asArray.Length);
+
+            var currentIndex = 0;
+            _totalWeight = 0;
+            for (var i = 0; i < asArray.Length; i++)
+            {
+                var category = asArray[i];
+                if (category.MaxItems <= 0 || category.Weight <= 0)
+                {
+                    continue;
+                }
+
+                _categories.Add(category);
+
+                if (currentIndex == 0)
+                {
+                    _totalWeight = category.Weight;
+                }
+                else
+                {
+                    // cumulative weight of last discount category is total weight of all categories
+                    _totalWeight += category.Weight;
+                }
+                _weights.Add(_totalWeight);
+
+                currentIndex++;
+            }
+        }
+
+        /// <summary>
+        /// Removes category and all of its effects on other items in map:
+        /// decreases cumulativeWeight of every category that is following current one, and then
+        /// reduces total cumulative count by that category weight, so it won't affect next rolls in any way.
+        /// </summary>
+        public void Remove(DiscountCategoryPrototype discountCategory)
+        {
+            var indexToRemove = _categories.IndexOf(discountCategory);
+            if (indexToRemove == -1)
+            {
+                return;
+            }
+
+            for (var i = indexToRemove + 1; i < _categories.Count; i++)
+            {
+                _weights[i]-= discountCategory.Weight;
+            }
+
+            _totalWeight -= discountCategory.Weight;
+            _categories.RemoveAt(indexToRemove);
+            _weights.RemoveAt(indexToRemove);
+        }
+
+        /// <summary>
+        /// Roll category respecting categories weight.
+        /// </summary>
+        /// <remarks>
+        /// We rolled random point inside range of 0 and 'total weight' to pick category respecting category weights
+        /// now we find index of category we rolled. If category cumulative weight is less than roll -
+        /// we rolled other category, skip and try next.
+        /// </remarks>
+        /// <param name="random">Random number generator.</param>
+        /// <returns>Rolled category, or null if no category could be picked based on current map state.</returns>
+        public DiscountCategoryPrototype? RollCategory(IRobustRandom random)
+        {
+            var roll = random.Next(_totalWeight);
+            for (int i = 0; i < _weights.Count; i++)
+            {
+                if (roll < _weights[i])
+                {
+                    return _categories[i];
+                }
+            }
+
+            return null;
+        }
+    }
+}
+
+/// <summary>
+/// Event of store being initialized.
+/// </summary>
+/// <param name="TargetUser">EntityUid of store entity owner.</param>
+/// <param name="Store">EntityUid of store entity.</param>
+/// <param name="UseDiscounts">Marker, if store should have discounts.</param>
+/// <param name="Listings">List of available listings items.</param>
+[ByRefEvent]
+public record struct StoreInitializedEvent(
+    EntityUid TargetUser,
+    EntityUid Store,
+    bool UseDiscounts,
+    IReadOnlyList<ListingDataWithCostModifiers> Listings
+);
diff --git a/Content.Server/Traitor/Uplink/Commands/AddUplinkCommand.cs b/Content.Server/Traitor/Uplink/Commands/AddUplinkCommand.cs
index 63be36b360a..f5fde87c11f 100644
--- a/Content.Server/Traitor/Uplink/Commands/AddUplinkCommand.cs
+++ b/Content.Server/Traitor/Uplink/Commands/AddUplinkCommand.cs
@@ -28,13 +28,14 @@ public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
             {
                 1 => CompletionResult.FromHintOptions(CompletionHelper.SessionNames(), Loc.GetString("add-uplink-command-completion-1")),
                 2 => CompletionResult.FromHint(Loc.GetString("add-uplink-command-completion-2")),
+                3 => CompletionResult.FromHint(Loc.GetString("add-uplink-command-completion-3")),
                 _ => CompletionResult.Empty
             };
         }
 
         public void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            if (args.Length > 2)
+            if (args.Length > 3)
             {
                 shell.WriteError(Loc.GetString("shell-wrong-arguments-number"));
                 return;
@@ -82,9 +83,19 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
                 uplinkEntity = eUid;
             }
 
+            bool isDiscounted = false;
+            if (args.Length >= 3)
+            {
+                if (!bool.TryParse(args[2], out isDiscounted))
+                {
+                    shell.WriteLine(Loc.GetString("shell-invalid-bool"));
+                    return;
+                }
+            }
+
             // Finally add uplink
             var uplinkSys = _entManager.System<UplinkSystem>();
-            if (!uplinkSys.AddUplink(user, 20, uplinkEntity: uplinkEntity))
+            if (!uplinkSys.AddUplink(user, 20, uplinkEntity: uplinkEntity, giveDiscounts: isDiscounted))
             {
                 shell.WriteLine(Loc.GetString("add-uplink-command-error-2"));
             }
diff --git a/Content.Server/Traitor/Uplink/UplinkSystem.cs b/Content.Server/Traitor/Uplink/UplinkSystem.cs
index 4c0a990b148..7937d37773c 100644
--- a/Content.Server/Traitor/Uplink/UplinkSystem.cs
+++ b/Content.Server/Traitor/Uplink/UplinkSystem.cs
@@ -1,11 +1,11 @@
 using System.Linq;
 using Content.Server.Store.Systems;
 using Content.Server.StoreDiscount.Systems;
-using Content.Shared.FixedPoint;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Implants;
 using Content.Shared.Inventory;
 using Content.Shared.PDA;
+using Content.Shared.FixedPoint;
 using Content.Shared.Store;
 using Content.Shared.Store.Components;
 using Robust.Shared.Prototypes;
@@ -25,33 +25,48 @@ public sealed class UplinkSystem : EntitySystem
     private const string FallbackUplinkImplant = "UplinkImplant";
     private const string FallbackUplinkCatalog = "UplinkUplinkImplanter";
 
-    /// <summary>
-    /// Adds an uplink to the target
-    /// </summary>
-    /// <param name="user">The person who is getting the uplink</param>
-    /// <param name="balance">The amount of currency on the uplink. If null, will just use the amount specified in the preset.</param>
-    /// <param name="uplinkEntity">The entity that will actually have the uplink functionality. Defaults to the PDA if null.</param>
-    /// <param name="giveDiscounts">Marker that enables discounts for uplink items.</param>
-    /// <returns>Whether or not the uplink was added successfully</returns>
-    public bool AddUplink(
-        EntityUid user,
-        FixedPoint2 balance,
-        EntityUid? uplinkEntity = null,
-        bool giveDiscounts = false)
-    {
-        // Try to find target item if none passed
-
-        uplinkEntity ??= FindUplinkTarget(user);
-
-        if (uplinkEntity == null)
-            return ImplantUplink(user, balance, giveDiscounts);
+        /// <summary>
+        /// Adds an uplink to the target
+        /// </summary>
+        /// <param name="user">The person who is getting the uplink</param>
+        /// <param name="balance">The amount of currency on the uplink. If null, will just use the amount specified in the preset.</param>
+        /// <param name="uplinkEntity">The entity that will actually have the uplink functionality. Defaults to the PDA if null.</param>
+        /// <param name="giveDiscounts">Marker that enables discounts for uplink items.</param>
+        /// <returns>Whether or not the uplink was added successfully</returns>
+        public bool AddUplink(
+            EntityUid user,
+            FixedPoint2? balance,
+            EntityUid? uplinkEntity = null,
+            bool giveDiscounts = false
+        )
+        {
+            // Try to find target item if none passed
+            uplinkEntity ??= FindUplinkTarget(user);
+            if (uplinkEntity == null)
+            {
+                return false;
+            }
 
-        EnsureComp<UplinkComponent>(uplinkEntity.Value);
+            EnsureComp<UplinkComponent>(uplinkEntity.Value);
+            var store = EnsureComp<StoreComponent>(uplinkEntity.Value);
 
-        SetUplink(user, uplinkEntity.Value, balance, giveDiscounts);
+            store.AccountOwner = user;
+            store.Balance.Clear();
+            if (balance != null)
+            {
+                store.Balance.Clear();
+                _store.TryAddCurrency(new Dictionary<string, FixedPoint2> { { TelecrystalCurrencyPrototype, balance.Value } }, uplinkEntity.Value, store);
+            }
 
-        // TODO add BUI. Currently can't be done outside of yaml -_-
-        // ^ What does this even mean?
+            var uplinkInitializedEvent = new StoreInitializedEvent(
+                TargetUser: user,
+                Store: uplinkEntity.Value,
+                UseDiscounts: giveDiscounts,
+                Listings: _store.GetAvailableListings(user, uplinkEntity.Value, store)
+                                .ToArray()
+            );
+            RaiseLocalEvent(ref uplinkInitializedEvent);
+            // TODO add BUI. Currently can't be done outside of yaml -_-
 
         return true;
     }
@@ -105,19 +120,19 @@ private bool ImplantUplink(EntityUid user, FixedPoint2 balance, bool giveDiscoun
         return true;
     }
 
-    /// <summary>
-    /// Finds the entity that can hold an uplink for a user.
-    /// Usually this is a pda in their pda slot, but can also be in their hands. (but not pockets or inside bag, etc.)
-    /// </summary>
-    public EntityUid? FindUplinkTarget(EntityUid user)
-    {
-        // Try to find PDA in inventory
-        if (_inventorySystem.TryGetContainerSlotEnumerator(user, out var containerSlotEnumerator))
+        /// <summary>
+        /// Finds the entity that can hold an uplink for a user.
+        /// Usually this is a pda in their pda slot, but can also be in their hands. (but not pockets or inside bag, etc.)
+        /// </summary>
+        public EntityUid? FindUplinkTarget(EntityUid user)
         {
-            while (containerSlotEnumerator.MoveNext(out var pdaUid))
+            // Try to find PDA in inventory
+            if (_inventorySystem.TryGetContainerSlotEnumerator(user, out var containerSlotEnumerator))
             {
-                if (!pdaUid.ContainedEntity.HasValue)
-                    continue;
+                while (containerSlotEnumerator.MoveNext(out var pdaUid))
+                {
+                    if (!pdaUid.ContainedEntity.HasValue)
+                        continue;
 
                 if (HasComp<PdaComponent>(pdaUid.ContainedEntity.Value) || HasComp<StoreComponent>(pdaUid.ContainedEntity.Value))
                     return pdaUid.ContainedEntity.Value;
diff --git a/Content.Shared/Store/Components/StoreComponent.cs b/Content.Shared/Store/Components/StoreComponent.cs
index 223f5079717..e5171dec418 100644
--- a/Content.Shared/Store/Components/StoreComponent.cs
+++ b/Content.Shared/Store/Components/StoreComponent.cs
@@ -2,7 +2,6 @@
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.Store.Components;
 
@@ -45,16 +44,16 @@ public sealed partial class StoreComponent : Component
     public EntityUid? AccountOwner = null;
 
     /// <summary>
-    /// All listings, including those that aren't available to the buyer
+    /// Cached list of listings items with modifiers.
     /// </summary>
     [DataField]
-    public HashSet<ListingData> Listings = new();
+    public HashSet<ListingDataWithCostModifiers> FullListingsCatalog = new();
 
     /// <summary>
     /// All available listings from the last time that it was checked.
     /// </summary>
     [ViewVariables]
-    public HashSet<ListingData> LastAvailableListings = new();
+    public HashSet<ListingDataWithCostModifiers> LastAvailableListings = new();
 
     /// <summary>
     ///     All current entities bought from this shop. Useful for keeping track of refunds and upgrades.
diff --git a/Content.Shared/Store/ListingPrototype.cs b/Content.Shared/Store/ListingPrototype.cs
index 445b5742dd1..05ac5cc4cd5 100644
--- a/Content.Shared/Store/ListingPrototype.cs
+++ b/Content.Shared/Store/ListingPrototype.cs
@@ -1,5 +1,7 @@
 using System.Linq;
 using Content.Shared.FixedPoint;
+using Content.Shared.Store.Components;
+using Content.Shared.StoreDiscount.Components;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
@@ -13,8 +15,77 @@ namespace Content.Shared.Store;
 /// </summary>
 [Serializable, NetSerializable]
 [Virtual, DataDefinition]
-public partial class ListingData : IEquatable<ListingData>, ICloneable
+public partial class ListingData : IEquatable<ListingData>
 {
+    public ListingData()
+    {
+    }
+
+    public ListingData(ListingData other) : this(
+        other.Name,
+        other.DiscountCategory,
+        other.Description,
+        other.Conditions,
+        other.Icon,
+        other.Priority,
+        other.ProductEntity,
+        other.ProductAction,
+        other.ProductUpgradeId,
+        other.ProductActionEntity,
+        other.ProductEvent,
+        other.RaiseProductEventOnUser,
+        other.PurchaseAmount,
+        other.ID,
+        other.Categories,
+        other.OriginalCost,
+        other.RestockTime,
+        other.DiscountDownTo
+    )
+    {
+
+    }
+
+    public ListingData(
+        string? name,
+        ProtoId<DiscountCategoryPrototype>? discountCategory,
+        string? description,
+        List<ListingCondition>? conditions,
+        SpriteSpecifier? icon,
+        int priority,
+        EntProtoId? productEntity,
+        EntProtoId? productAction,
+        ProtoId<ListingPrototype>? productUpgradeId,
+        EntityUid? productActionEntity,
+        object? productEvent,
+        bool raiseProductEventOnUser,
+        int purchaseAmount,
+        string id,
+        HashSet<ProtoId<StoreCategoryPrototype>> categories,
+        IReadOnlyDictionary<ProtoId<CurrencyPrototype>, FixedPoint2> originalCost,
+        TimeSpan restockTime,
+        Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> dataDiscountDownTo
+    )
+    {
+        Name = name;
+        DiscountCategory = discountCategory;
+        Description = description;
+        Conditions = conditions?.ToList();
+        Icon = icon;
+        Priority = priority;
+        ProductEntity = productEntity;
+        ProductAction = productAction;
+        ProductUpgradeId = productUpgradeId;
+        ProductActionEntity = productActionEntity;
+        ProductEvent = productEvent;
+        RaiseProductEventOnUser = raiseProductEventOnUser;
+        PurchaseAmount = purchaseAmount;
+        ID = id;
+        Categories = categories.ToHashSet();
+        OriginalCost = originalCost;
+        RestockTime = restockTime;
+        DiscountDownTo = new Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2>(dataDiscountDownTo);
+    }
+
     [ViewVariables]
     [IdDataField]
     public string ID { get; private set; } = default!;
@@ -25,6 +96,12 @@ public partial class ListingData : IEquatable<ListingData>, ICloneable
     [DataField]
     public string? Name;
 
+    /// <summary>
+    /// Discount category for listing item. This marker describes chance of how often will item be discounted.
+    /// </summary>
+    [DataField]
+    public ProtoId<DiscountCategoryPrototype>? DiscountCategory;
+
     /// <summary>
     /// The description of the listing. If empty, uses the entity's description (if present)
     /// </summary>
@@ -35,13 +112,15 @@ public partial class ListingData : IEquatable<ListingData>, ICloneable
     /// The categories that this listing applies to. Used for filtering a listing for a store.
     /// </summary>
     [DataField]
-    public List<ProtoId<StoreCategoryPrototype>> Categories = new();
+    public HashSet<ProtoId<StoreCategoryPrototype>> Categories = new();
 
     /// <summary>
-    /// The cost of the listing. String represents the currency type while the FixedPoint2 represents the amount of that currency.
+    /// The original cost of the listing. FixedPoint2 represents the amount of that currency.
+    /// This fields should not be used for getting actual cost of item, as there could be
+    /// cost modifiers (due to discounts or surplus). Use Cost property on derived class instead.
     /// </summary>
     [DataField]
-    public Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> Cost = new();
+    public IReadOnlyDictionary<ProtoId<CurrencyPrototype>, FixedPoint2> OriginalCost = new Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2>();
 
     /// <summary>
     /// Specific customizable conditions that determine whether or not the listing can be purchased.
@@ -109,18 +188,11 @@ public partial class ListingData : IEquatable<ListingData>, ICloneable
     [DataField]
     public TimeSpan RestockTime = TimeSpan.Zero;
 
+    /// <summary>
+    /// Options for discount - from max amount down to how much item costs can be cut by discount, absolute value.
+    /// </summary>
     [DataField]
-    public int SaleLimit = 3;
-
-    [DataField]
-    public bool SaleBlacklist;
-
-    public int DiscountValue;
-
-    public Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> OldCost = new();
-
-    [DataField]
-    public List<string> Components = new();
+    public Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> DiscountDownTo = new();
 
     public bool Equals(ListingData? listing)
     {
@@ -145,7 +217,7 @@ public bool Equals(ListingData? listing)
         if (!Categories.OrderBy(x => x).SequenceEqual(listing.Categories.OrderBy(x => x)))
             return false;
 
-        if (!Cost.OrderBy(x => x).SequenceEqual(listing.Cost.OrderBy(x => x)))
+        if (!OriginalCost.OrderBy(x => x).SequenceEqual(listing.OriginalCost.OrderBy(x => x)))
             return false;
 
         if ((Conditions != null && listing.Conditions != null) &&
@@ -155,43 +227,208 @@ public bool Equals(ListingData? listing)
         return true;
     }
 
+}
+
+/// <summary>
+///     Defines a set item listing that is available in a store
+/// </summary>
+[Prototype("listing")]
+[Serializable, NetSerializable]
+[DataDefinition]
+public sealed partial class ListingPrototype : ListingData, IPrototype
+{
+    /// <summary> Setter/getter for item cost from prototype. </summary>
+    [DataField]
+    public IReadOnlyDictionary<ProtoId<CurrencyPrototype>, FixedPoint2> Cost
+    {
+        get => OriginalCost;
+        set => OriginalCost = value;
+    }
+}
+
+/// <summary> Wrapper around <see cref="ListingData"/> that enables controller and centralized cost modification. </summary>
+/// <remarks>
+/// Server lifecycle of those objects is bound to <see cref="StoreComponent.FullListingsCatalog"/>, which is their local cache. To fix
+/// cost changes after server side change (for example, when all items with set discount are bought up) <see cref="ApplyAllModifiers"/> is called
+/// on changes.
+/// Client side lifecycle is possible due to modifiers and original cost being transferred fields and cost being calculated when needed. Modifiers changes
+/// should not (are not expected) be happening on client.
+/// </remarks>
+[Serializable, NetSerializable, DataDefinition]
+public sealed partial class ListingDataWithCostModifiers : ListingData
+{
+    private IReadOnlyDictionary<ProtoId<CurrencyPrototype>, FixedPoint2>? _costModified;
+
+    /// <summary>
+    /// Map of values, by which calculated cost should be modified, with modification sourceId.
+    /// Instead of modifying this field - use <see cref="RemoveCostModifier"/> and <see cref="AddCostModifier"/>
+    /// when possible.
+    /// </summary>
+    [DataField]
+    public Dictionary<string, Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2>> CostModifiersBySourceId = new();
+
+    /// <inheritdoc />
+    public ListingDataWithCostModifiers(ListingData listingData)
+        : base(
+            listingData.Name,
+            listingData.DiscountCategory,
+            listingData.Description,
+            listingData.Conditions,
+            listingData.Icon,
+            listingData.Priority,
+            listingData.ProductEntity,
+            listingData.ProductAction,
+            listingData.ProductUpgradeId,
+            listingData.ProductActionEntity,
+            listingData.ProductEvent,
+            listingData.RaiseProductEventOnUser,
+            listingData.PurchaseAmount,
+            listingData.ID,
+            listingData.Categories,
+            listingData.OriginalCost,
+            listingData.RestockTime,
+            listingData.DiscountDownTo
+        )
+    {
+    }
+
+    /// <summary> Marker, if cost of listing item have any modifiers. </summary>
+    public bool IsCostModified => CostModifiersBySourceId.Count > 0;
+
+    /// <summary> Cost of listing item after applying all available modifiers. </summary>
+    public IReadOnlyDictionary<ProtoId<CurrencyPrototype>, FixedPoint2> Cost
+    {
+        get
+        {
+            return _costModified ??= CostModifiersBySourceId.Count == 0
+                ? new Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2>(OriginalCost)
+                : ApplyAllModifiers();
+        }
+    }
+
+    /// <summary> Add map with currencies and value by which cost should be modified when final value is calculated. </summary>
+    /// <param name="modifierSourceId">Id of modifier source. Can be used for removing modifier later.</param>
+    /// <param name="modifiers">Values for cost modification.</param>
+    public void AddCostModifier(string modifierSourceId, Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> modifiers)
+    {
+        CostModifiersBySourceId.Add(modifierSourceId, modifiers);
+        if (_costModified != null)
+        {
+            _costModified = ApplyAllModifiers();
+        }
+    }
+
+    /// <summary> Remove cost modifier with passed sourceId. </summary>
+    public void RemoveCostModifier(string modifierSourceId)
+    {
+        CostModifiersBySourceId.Remove(modifierSourceId);
+        if (_costModified != null)
+        {
+            _costModified = ApplyAllModifiers();
+        }
+    }
+
+    /// <summary> Check if listing item can be bought with passed balance. </summary>
+    public bool CanBuyWith(Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> balance)
+    {
+        foreach (var (currency, amount) in Cost)
+        {
+            if (!balance.ContainsKey(currency))
+                return false;
+
+            if (balance[currency] < amount)
+                return false;
+        }
+
+        return true;
+    }
+
     /// <summary>
-    /// Creates a unique instance of a listing. ALWAWYS USE THIS WHEN ENUMERATING LISTING PROTOTYPES
-    /// DON'T BE DUMB AND MODIFY THE PROTOTYPES
+    /// Gets percent of reduced/increased cost that modifiers give respective to <see cref="ListingData.OriginalCost"/>.
+    /// Percent values are numbers between 0 and 1.
     /// </summary>
-    /// <returns>A unique copy of the listing data.</returns>
-    public object Clone()
+    public IReadOnlyDictionary<ProtoId<CurrencyPrototype>, float> GetModifiersSummaryRelative()
     {
-        return new ListingData
+        var modifiersSummaryAbsoluteValues = CostModifiersBySourceId.Aggregate(
+            new Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2>(),
+            (accumulator, x) =>
+            {
+                foreach (var (currency, amount) in x.Value)
+                {
+                    accumulator.TryGetValue(currency, out var accumulatedAmount);
+                    accumulator[currency] = accumulatedAmount + amount;
+                }
+
+                return accumulator;
+            }
+        );
+        var relativeModifiedPercent = new Dictionary<ProtoId<CurrencyPrototype>, float>();
+        foreach (var (currency, discountAmount) in modifiersSummaryAbsoluteValues)
         {
-            ID = ID,
-            Name = Name,
-            Description = Description,
-            Categories = Categories,
-            Cost = Cost,
-            Conditions = Conditions,
-            Icon = Icon,
-            Priority = Priority,
-            ProductEntity = ProductEntity,
-            ProductAction = ProductAction,
-            ProductUpgradeId = ProductUpgradeId,
-            ProductActionEntity = ProductActionEntity,
-            ProductEvent = ProductEvent,
-            PurchaseAmount = PurchaseAmount,
-            RestockTime = RestockTime,
-            SaleLimit = SaleLimit,
-            SaleBlacklist = SaleBlacklist,
-            DiscountValue = DiscountValue,
-            OldCost = OldCost,
-            Components = Components,
-        };
+            if (OriginalCost.TryGetValue(currency, out var originalAmount))
+            {
+                var discountPercent = (float)discountAmount.Value / originalAmount.Value;
+                relativeModifiedPercent.Add(currency, discountPercent);
+            }
+        }
+
+        return relativeModifiedPercent;
+
+    }
+
+    private Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> ApplyAllModifiers()
+    {
+        var dictionary = new Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2>(OriginalCost);
+        foreach (var (_, modifier) in CostModifiersBySourceId)
+        {
+            ApplyModifier(dictionary, modifier);
+        }
+
+        return dictionary;
+    }
+
+    private void ApplyModifier(
+        Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> applyTo,
+        IReadOnlyDictionary<ProtoId<CurrencyPrototype>, FixedPoint2> modifier
+    )
+    {
+        foreach (var (currency, modifyBy) in modifier)
+        {
+            if (applyTo.TryGetValue(currency, out var currentAmount))
+            {
+                var modifiedAmount = currentAmount + modifyBy;
+                if (modifiedAmount < 0)
+                {
+                    modifiedAmount = 0;
+                    // no negative cost allowed
+                }
+                applyTo[currency] = modifiedAmount;
+            }
+        }
     }
 }
 
 /// <summary>
-///     Defines a set item listing that is available in a store
+///     Defines set of rules for category of discounts -
+///     how <see cref="StoreDiscountComponent"/> will be filled by respective system.
 /// </summary>
-[Prototype("listing")]
-[Serializable, NetSerializable]
-[DataDefinition]
-public sealed partial class ListingPrototype : ListingData, IPrototype;
+[Prototype("discountCategory")]
+[DataDefinition, Serializable, NetSerializable]
+public sealed partial class DiscountCategoryPrototype : IPrototype
+{
+    [ViewVariables]
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    /// <summary>
+    /// Weight that sets chance to roll discount of that category.
+    /// </summary>
+    [DataField]
+    public int Weight { get; private set; }
+
+    /// <summary>
+    /// Maximum amount of items that are allowed to be picked from this category.
+    /// </summary>
+    [DataField]
+    public int? MaxItems { get; private set; }
+}
diff --git a/Content.Shared/Store/StoreUi.cs b/Content.Shared/Store/StoreUi.cs
index 59cf1bbbc81..d8cb9e6ca88 100644
--- a/Content.Shared/Store/StoreUi.cs
+++ b/Content.Shared/Store/StoreUi.cs
@@ -13,7 +13,7 @@ public enum StoreUiKey : byte
 [Serializable, NetSerializable]
 public sealed class StoreUpdateState : BoundUserInterfaceState
 {
-    public readonly HashSet<ListingData> Listings;
+    public readonly HashSet<ListingDataWithCostModifiers> Listings;
 
     public readonly Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> Balance;
 
@@ -21,7 +21,7 @@ public sealed class StoreUpdateState : BoundUserInterfaceState
 
     public readonly bool AllowRefund;
 
-    public StoreUpdateState(HashSet<ListingData> listings, Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> balance, bool showFooter, bool allowRefund)
+    public StoreUpdateState(HashSet<ListingDataWithCostModifiers> listings, Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> balance, bool showFooter, bool allowRefund)
     {
         Listings = listings;
         Balance = balance;
@@ -37,14 +37,9 @@ public sealed class StoreRequestUpdateInterfaceMessage : BoundUserInterfaceMessa
 }
 
 [Serializable, NetSerializable]
-public sealed class StoreBuyListingMessage : BoundUserInterfaceMessage
+public sealed class StoreBuyListingMessage(ProtoId<ListingPrototype> listing) : BoundUserInterfaceMessage
 {
-    public ListingData Listing;
-
-    public StoreBuyListingMessage(ListingData listing)
-    {
-        Listing = listing;
-    }
+    public ProtoId<ListingPrototype> Listing = listing;
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/StoreDiscount/Components/StoreDiscountComponent.cs b/Content.Shared/StoreDiscount/Components/StoreDiscountComponent.cs
new file mode 100644
index 00000000000..3736b4d4234
--- /dev/null
+++ b/Content.Shared/StoreDiscount/Components/StoreDiscountComponent.cs
@@ -0,0 +1,51 @@
+using Content.Shared.FixedPoint;
+using Content.Shared.Store;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.StoreDiscount.Components;
+
+/// <summary>
+/// Partner-component for adding discounts functionality to StoreSystem using StoreDiscountSystem.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class StoreDiscountComponent : Component
+{
+    /// <summary>
+    /// Discounts for items in <see cref="ListingData"/>.
+    /// </summary>
+    [ViewVariables, DataField]
+    public IReadOnlyList<StoreDiscountData> Discounts = Array.Empty<StoreDiscountData>();
+}
+
+/// <summary>
+/// Container for listing item discount state.
+/// </summary>
+[Serializable, NetSerializable, DataDefinition]
+public sealed partial class StoreDiscountData
+{
+    /// <summary>
+    /// Id of listing item to be discounted.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<ListingPrototype> ListingId;
+
+    /// <summary>
+    /// Amount of discounted items. Each buy will decrement this counter.
+    /// </summary>
+    [DataField]
+    public int Count;
+
+    /// <summary>
+    /// Discount category that provided this discount.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<DiscountCategoryPrototype> DiscountCategory;
+
+    /// <summary>
+    /// Map of currencies to flat amount of discount.
+    /// </summary>
+    [DataField]
+    public Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> DiscountAmountByCurrency = new();
+}
diff --git a/Resources/Locale/en-US/administration/commands/add-uplink-command.ftl b/Resources/Locale/en-US/administration/commands/add-uplink-command.ftl
index 068f88dc5be..1a721c93f36 100644
--- a/Resources/Locale/en-US/administration/commands/add-uplink-command.ftl
+++ b/Resources/Locale/en-US/administration/commands/add-uplink-command.ftl
@@ -3,5 +3,6 @@ add-uplink-command-help = Usage: adduplink [username] [item-id]
 
 add-uplink-command-completion-1 = Username (defaults to self)
 add-uplink-command-completion-2 = Uplink uid (default to PDA)
+add-uplink-command-completion-3 = Is uplink discount enabled
 add-uplink-command-error-1 = Selected player doesn't control any entity
 add-uplink-command-error-2 = Failed to add uplink to the player
\ No newline at end of file
diff --git a/Resources/Locale/en-US/store/categories.ftl b/Resources/Locale/en-US/store/categories.ftl
index 0d0dc4aecc0..cca23d58cf7 100644
--- a/Resources/Locale/en-US/store/categories.ftl
+++ b/Resources/Locale/en-US/store/categories.ftl
@@ -12,7 +12,7 @@ store-category-implants = Implants
 store-category-job = Job
 store-category-armor = Armor
 store-category-pointless = Pointless
-store-category-deception = Deception
+store-discounted-items = Discounts
 
 # Revenant
 store-category-abilities = Abilities
diff --git a/Resources/Locale/en-US/store/store.ftl b/Resources/Locale/en-US/store/store.ftl
index 5c1a46339e7..a0b349e6a2a 100644
--- a/Resources/Locale/en-US/store/store.ftl
+++ b/Resources/Locale/en-US/store/store.ftl
@@ -2,6 +2,8 @@ store-ui-default-title = Store
 store-ui-default-withdraw-text = Withdraw
 store-ui-balance-display = {$currency}: {$amount}
 store-ui-price-display = {$amount} {$currency}
+store-ui-discount-display-with-currency =  {$amount} off on {$currency}
+store-ui-discount-display =  ({$amount} off!)
 store-ui-traitor-flavor = Copyright (C) NT -30643
 store-ui-traitor-warning = Operatives must lock their uplinks after use to avoid detection.
 
diff --git a/Resources/Prototypes/Catalog/discount_categories.yml b/Resources/Prototypes/Catalog/discount_categories.yml
new file mode 100644
index 00000000000..5c512e9009b
--- /dev/null
+++ b/Resources/Prototypes/Catalog/discount_categories.yml
@@ -0,0 +1,13 @@
+- type: discountCategory
+  id: rareDiscounts # Dirty-cheap items that are rarely used and can be discounted to 0-ish cost to encourage usage.
+  weight: 18
+  maxItems: 2
+
+- type: discountCategory
+  id: usualDiscounts # Cheap items that are used not very often.
+  weight: 80
+
+- type: discountCategory
+  id: veryRareDiscounts # Casually used items that are widely used but can be (rarely) discounted for epic lulz.
+  weight: 2
+  maxItems: 1
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index fdfb4ed33a5..22910b60b17 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -6,6 +6,9 @@
   name: uplink-pistol-viper-name
   description: uplink-pistol-viper-desc
   productEntity: WeaponPistolViper
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 2
   cost:
     Telecrystal: 3
   categories:
@@ -17,6 +20,9 @@
   name: uplink-revolver-python-name
   description: uplink-revolver-python-desc
   productEntity: WeaponRevolverPythonAP
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 4
   cost:
     Telecrystal: 8 # Originally was 13 TC but was not used due to high cost
   categories:
@@ -29,6 +35,9 @@
   name: uplink-pistol-cobra-name
   description: uplink-pistol-cobra-desc
   productEntity: WeaponPistolCobra
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 2
   cost:
     Telecrystal: 4
   categories:
@@ -52,6 +61,9 @@
   name: uplink-esword-name
   description: uplink-esword-desc
   icon: { sprite: /Textures/Objects/Weapons/Melee/e_sword.rsi, state: icon }
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 4
   productEntity: EnergySword
   cost:
     Telecrystal: 8
@@ -65,6 +77,9 @@
   description: uplink-edagger-desc
   icon: { sprite: /Textures/Objects/Weapons/Melee/e_dagger.rsi, state: icon }
   productEntity: EnergyDaggerBox
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 1
   cost:
     Telecrystal: 2
   categories:
@@ -77,6 +92,9 @@
   description: uplink-knives-kit-desc
   icon: { sprite: /Textures/Objects/Storage/boxicons.rsi, state: throwing_knives }
   productEntity: ThrowingKnivesKit
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 3
   cost:
     Telecrystal: 6
   categories:
@@ -87,6 +105,9 @@
   name: uplink-gloves-north-star-name
   description: uplink-gloves-north-star-desc
   productEntity: ClothingHandsGlovesNorthStar
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 4
   cost:
     Telecrystal: 8
   categories:
@@ -98,6 +119,9 @@
   name: uplink-disposable-turret-name
   description: uplink-disposable-turret-desc
   productEntity: ToolboxElectricalTurretFilled
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 3
   cost:
     Telecrystal: 6
   categories:
@@ -110,17 +134,93 @@
   saleLimit: 2
 
 - type: listing
-  id: BaseBallBatHomeRun
-  name: uplink-home-run-bat-name
-  description: uplink-home-run-bat-desc
-  productEntity: BaseBallBatHomeRun
-  icon:
-    entity: BaseBallBatHomeRun
+  id: UplinkEshield
+  name: uplink-eshield-name
+  description: uplink-eshield-desc
+  icon: { sprite: /Textures/Objects/Weapons/Melee/e_shield.rsi, state: eshield-on }
+  productEntity: EnergyShield
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 4
   cost:
     Telecrystal: 16
   categories:
-  - UplinkWeapons
-  saleLimit: 1
+  - UplinkWeaponry
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - NukeOpsUplink
+
+- type: listing
+  id: UplinkSniperBundle
+  name: uplink-sniper-bundle-name
+  description: uplink-sniper-bundle-desc
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi, state: base }
+  productEntity: BriefcaseSyndieSniperBundleFilled
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 6
+  cost:
+    Telecrystal: 12
+  categories:
+  - UplinkWeaponry
+
+- type: listing
+  id: UplinkC20RBundle
+  name: uplink-c20r-bundle-name
+  description: uplink-c20r-bundle-desc
+  icon: { sprite: /Textures/Objects/Weapons/Guns/SMGs/c20r.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateFilledSMG
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 10
+  cost:
+    Telecrystal: 17
+  categories:
+  - UplinkWeaponry
+
+- type: listing
+  id: UplinkBulldogBundle
+  name: uplink-buldog-bundle-name
+  description: uplink-buldog-bundle-desc
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateFilledShotgun
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 12
+  cost:
+    Telecrystal: 20
+  categories:
+  - UplinkWeaponry
+
+- type: listing
+  id: UplinkGrenadeLauncherBundle
+  name: uplink-grenade-launcher-bundle-name
+  description: uplink-grenade-launcher-bundle-desc
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 20
+  cost:
+    Telecrystal: 25
+  categories:
+  - UplinkWeaponry
+
+- type: listing
+  id: UplinkL6SawBundle
+  name: uplink-l6-saw-bundle-name
+  description: uplink-l6-saw-bundle-desc
+  icon: { sprite: /Textures/Objects/Weapons/Guns/LMGs/l6.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateFilledLMG
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 24
+  cost:
+    Telecrystal: 30
+  categories:
+  - UplinkWeaponry
 
 # Explosives
 
@@ -129,6 +229,9 @@
   name: uplink-explosive-grenade-name
   description: uplink-explosive-grenade-desc
   productEntity: ExGrenade
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 2
   cost:
     Telecrystal: 4
   categories:
@@ -159,6 +262,9 @@
   name: uplink-mini-bomb-name
   description: uplink-mini-bomb-desc
   productEntity: SyndieMiniBomb
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 3
   cost:
     Telecrystal: 6
   categories:
@@ -169,6 +275,9 @@
   name: uplink-supermatter-grenade-name
   description: uplink-supermatter-grenade-desc
   productEntity: SupermatterGrenade
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 3
   cost:
     Telecrystal: 6
   categories:
@@ -179,6 +288,9 @@
   name: uplink-whitehole-grenade-name
   description: uplink-whitehole-grenade-desc
   productEntity: WhiteholeGrenade
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 1
   cost:
     Telecrystal: 3
   categories:
@@ -189,6 +301,9 @@
   name: uplink-penguin-grenade-name
   description: uplink-penguin-grenade-desc
   productEntity: MobGrenadePenguin
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 3
   cost:
     Telecrystal: 5
   categories:
@@ -204,6 +319,9 @@
   name: uplink-c4-name
   description: uplink-c4-desc
   productEntity: C4
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 1
   cost:
     Telecrystal: 2
   categories:
@@ -214,6 +332,9 @@
   name: uplink-grenadier-rig-name
   description: uplink-grenadier-rig-desc
   productEntity: ClothingBeltMilitaryWebbingGrenadeFilled
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 6
   cost:
     Telecrystal: 12
   categories:
@@ -230,8 +351,11 @@
   name: uplink-c4-bundle-name
   description: uplink-c4-bundle-desc
   productEntity: ClothingBackpackDuffelSyndicateC4tBundle
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 8
   cost:
-    Telecrystal: 12 #you're buying bulk so its a 25% discount
+    Telecrystal: 12 #you're buying bulk so its a 25% discount, so no additional random discount over it
   categories:
   - UplinkExplosives
   saleLimit: 1
@@ -241,6 +365,9 @@
   name: uplink-emp-grenade-name
   description: uplink-emp-grenade-desc
   productEntity: EmpGrenade
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 1
   cost:
     Telecrystal: 2
   categories:
@@ -252,6 +379,9 @@
   description: uplink-exploding-pen-desc
   icon: { sprite: /Textures/Objects/Misc/bureaucracy.rsi, state: pen }
   productEntity: PenExplodingBox
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 2
   cost:
     Telecrystal: 4
   categories:
@@ -295,6 +425,9 @@
   name: uplink-cluster-grenade-name
   description: uplink-cluster-grenade-desc
   productEntity: ClusterGrenade
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 5
   cost:
     Telecrystal: 8
   categories:
@@ -305,6 +438,9 @@
   name: uplink-shrapnel-grenade-name
   description: uplink-shrapnel-grenade-desc
   productEntity: GrenadeShrapnel
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 2
   cost:
     Telecrystal: 4
   categories:
@@ -315,11 +451,27 @@
   name: uplink-incendiary-grenade-name
   description: uplink-incendiary-grenade-desc
   productEntity: GrenadeIncendiary
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 2
   cost:
     Telecrystal: 4
   categories:
   - UplinkExplosives
 
+- type: listing
+  id: UplinkEmpKit
+  name: uplink-emp-kit-name
+  description: uplink-emp-kit-desc
+  productEntity: ElectricalDisruptionKit
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 4
+  cost:
+    Telecrystal: 6
+  categories:
+    - UplinkExplosives
+
 # Ammo
 
 - type: listing
@@ -391,7 +543,68 @@
   categories:
   - UplinkAmmo
 
-#Utility
+- type: listing
+  id: UplinkAmmoBundle
+  name: uplink-ammo-bundle-name
+  description: uplink-ammo-bundle-desc
+  productEntity: ClothingBackpackDuffelSyndicateAmmoFilled
+  cost:
+    Telecrystal: 15
+  categories:
+  - UplinkAmmo
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - NukeOpsUplink
+    - !type:BuyerWhitelistCondition
+      blacklist:
+        components:
+          - SurplusBundle
+
+#Chemicals
+
+- type: listing
+  id: UplinkHypopen
+  name: uplink-hypopen-name
+  description: uplink-hypopen-desc
+  icon: { sprite: /Textures/Objects/Misc/pens.rsi, state: pen }
+  productEntity: HypopenBox
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 4
+  cost:
+    Telecrystal: 6
+  categories:
+  - UplinkChemicals
+
+- type: listing
+  id: UplinkHypoDart
+  name: uplink-hypodart-name
+  description: uplink-hypodart-desc
+  icon: { sprite: /Textures/Objects/Fun/Darts/dart_red.rsi, state: icon }
+  productEntity: HypoDartBox
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 1
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkChemicals
+
+- type: listing
+  id: UplinkChemistryKitBundle
+  name: uplink-chemistry-kit-name
+  description: uplink-chemistry-kit-desc
+  icon: { sprite: /Textures/Objects/Storage/boxicons.rsi, state: vials }
+  productEntity: ChemicalSynthesisKit
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 3
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkChemicals
 
 - type: listing
   id: UplinkZombieBundle
@@ -419,6 +632,9 @@
   name: uplink-nocturine-chemistry-bottle-name
   description: uplink-nocturine-chemistry-bottle-desc
   productEntity: NocturineChemistryBottle
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 3
   cost:
     Telecrystal: 6
   categories:
@@ -430,6 +646,9 @@
   name: uplink-combat-medkit-name
   description: uplink-combat-medkit-desc
   productEntity: MedkitCombatFilled
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 2
   cost:
     Telecrystal: 5
   categories:
@@ -441,6 +660,9 @@
   name: uplink-combat-medipen-name
   description: uplink-combat-medipen-desc
   productEntity: CombatMedipen
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 2
   cost:
     Telecrystal: 4
   categories:
@@ -452,6 +674,9 @@
   name: uplink-stimpack-name
   description: uplink-stimpack-desc
   productEntity: Stimpack
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 2
   cost:
     Telecrystal: 4
   categories:
@@ -463,6 +688,9 @@
   name: uplink-stimkit-name
   description: uplink-stimkit-desc
   productEntity: StimkitFilled
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 8
   cost:
     Telecrystal: 12
   categories:
@@ -474,6 +702,9 @@
   name: uplink-cigarettes-name
   description: uplink-cigarettes-desc
   productEntity: CigPackSyndicate
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 1
   cost:
     Telecrystal: 2
   categories:
@@ -484,6 +715,9 @@
   name: uplink-meds-bundle-name
   description: uplink-meds-bundle-desc
   productEntity: ClothingBackpackDuffelSyndicateMedicalBundleFilled
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 12
   cost:
     Telecrystal: 20
   categories:
@@ -506,6 +740,9 @@
   name: uplink-agent-id-card-name
   description: uplink-agent-id-card-desc
   productEntity: AgentIDCard
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 1
   cost:
     Telecrystal: 3
   categories:
@@ -516,6 +753,9 @@
   name: uplink-stealth-box-name
   description: uplink-stealth-box-desc
   productEntity: StealthBox
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 2
   cost:
     Telecrystal: 5
   categories:
@@ -526,10 +766,38 @@
   name: uplink-chameleon-projector-name
   description: uplink-chameleon-projector-desc
   productEntity: ChameleonProjector
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 4
   cost:
     Telecrystal: 7
   categories:
-  - UplinkUtility
+  - UplinkDeception
+
+- type: listing
+  id: UplinkHeadsetEncryptionKey
+  name: uplink-encryption-key-name
+  description: uplink-encryption-key-desc
+  icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: synd_label }
+  productEntity: BoxEncryptionKeySyndie # Two for the price of one
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 1
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkDeception
+
+- type: listing
+  id: UplinkBinaryTranslatorKey
+  name: uplink-binary-translator-key-name
+  description: uplink-binary-translator-key-desc
+  icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: rd_label }
+  productEntity: EncryptionKeyBinary
+  cost:
+    Telecrystal: 1
+  categories:
+  - UplinkDeception
 
 - type: listing
   id: UplinkCyberpen
@@ -556,6 +824,9 @@
   name: uplink-ultrabright-lantern-name
   description: uplink-ultrabright-lantern-desc
   productEntity: LanternFlash
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 1
   cost:
     Telecrystal: 2
   categories:
@@ -566,6 +837,9 @@
   name: uplink-bribe-name
   description: uplink-bribe-desc
   productEntity: BriefcaseSyndieLobbyingBundleFilled
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 2
   cost:
     Telecrystal: 4
   categories:
@@ -582,52 +856,248 @@
 #   - UplinkUtility
 
 - type: listing
-  id: UplinkHolster
-  name: uplink-holster-name
-  description: uplink-holster-desc
-  productEntity: ClothingBeltSyndieHolster
+  id: UplinkDecoyKit
+  name: uplink-decoy-kit-name
+  description: uplink-decoy-kit-desc
+  icon: { sprite: /Textures/Objects/Tools/Decoys/operative_decoy.rsi, state: folded }
+  productEntity: ClothingBackpackDuffelSyndicateDecoyKitFilled
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 3
   cost:
     Telecrystal: 1
   categories:
-  - UplinkUtility
+  - UplinkDeception
+
+- type: listing
+  id: UplinkSyndicateBombFake
+  name: uplink-exploding-syndicate-bomb-fake-name
+  description: uplink-exploding-syndicate-bomb-fake-desc
+  productEntity: SyndicateBombFake
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 1
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkDeception
+
+# Disruption
 
 - type: listing
   id: UplinkEmag
   name: uplink-emag-name
   description: uplink-emag-desc
   productEntity: Emag
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 5
+  cost:
+    Telecrystal: 8
+  categories:
+  - UplinkDisruption
+
+- type: listing
+  id: UplinkRadioJammer
+  name: uplink-radio-jammer-name
+  description: uplink-radio-jammer-desc
+  productEntity: RadioJammer
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 2
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkDisruption
+
+- type: listing
+  id: UplinkSyndicateWeaponModule
+  name: uplink-syndicate-weapon-module-name
+  description: uplink-syndicate-weapon-module-desc
+  productEntity: BorgModuleSyndicateWeapon
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 3
+  cost:
+    Telecrystal: 5
+  categories:
+  - UplinkDisruption
+
+- type: listing
+  id: UplinkSyndicateMartyrModule
+  name: uplink-syndicate-martyr-module-name
+  description: uplink-syndicate-martyr-module-desc
+  productEntity: BorgModuleMartyr
+  icon: { sprite: /Textures/Objects/Specific/Robotics/borgmodule.rsi, state: syndicateborgbomb }
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 2
+  cost:
+    Telecrystal: 4
+  categories:
+    - UplinkDisruption
+
+- type: listing
+  id: UplinkSoapSyndie
+  name: uplink-soap-name
+  description: uplink-soap-desc
+  productEntity: SoapSyndie
+  cost:
+    Telecrystal: 1
+  categories:
+  - UplinkDisruption
+
+- type: listing
+  id: UplinkSlipocalypseClusterSoap
+  name: uplink-slipocalypse-clustersoap-name
+  description: uplink-slipocalypse-clustersoap-desc
+  productEntity: SlipocalypseClusterSoap
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 1
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkDisruption
+
+- type: listing
+  id: UplinkToolbox
+  name: uplink-toolbox-name
+  description: uplink-toolbox-desc
+  productEntity: ToolboxSyndicateFilled
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 1
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkDisruption
+
+- type: listing
+  id: UplinkSyndicateJawsOfLife
+  name: uplink-syndicate-jaws-of-life-name
+  description: uplink-syndicate-jaws-of-life-desc
+  productEntity: SyndicateJawsOfLife
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 1
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkDisruption
+
+- type: listing
+  id: UplinkDuffelSurgery
+  name: uplink-duffel-surgery-name
+  description: uplink-duffel-surgery-desc
+  productEntity: ClothingBackpackDuffelSyndicateFilledMedical
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 2
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkDisruption
+
+- type: listing
+  id: UplinkPowerSink
+  name: uplink-power-sink-name
+  description: uplink-power-sink-desc
+  productEntity: PowerSink
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 4
+  cost:
+    Telecrystal: 8
+  categories:
+  - UplinkDisruption
+  conditions:
+    - !type:BuyerWhitelistCondition
+      blacklist:
+        components:
+          - SurplusBundle
+
+- type: listing
+  id: UplinkSurplusBundle
+  name: uplink-surplus-bundle-name
+  description: uplink-surplus-bundle-desc
+  productEntity: CrateSyndicateSurplusBundle
+  cost:
+    Telecrystal: 20
+  categories:
+  - UplinkDisruption
+  conditions:
+  - !type:StoreWhitelistCondition
+    blacklist:
+      tags:
+      - NukeOpsUplink
+  - !type:BuyerWhitelistCondition
+    blacklist:
+      components:
+      - SurplusBundle
+
+- type: listing
+  id: UplinkSuperSurplusBundle
+  name: uplink-super-surplus-bundle-name
+  description: uplink-super-surplus-bundle-desc
+  productEntity: CrateSyndicateSuperSurplusBundle
   cost:
-    Telecrystal: 8
+    Telecrystal: 40
   categories:
-  - UplinkUtility
+  - UplinkDisruption
+  conditions:
+  - !type:StoreWhitelistCondition
+    blacklist:
+      tags:
+      - NukeOpsUplink
+  - !type:BuyerWhitelistCondition
+    blacklist:
+      components:
+      - SurplusBundle
 
 - type: listing
-  id: UplinkSyndicateMartyrModule
-  name: uplink-syndicate-martyr-module-name
-  description: uplink-syndicate-martyr-module-desc
-  productEntity: BorgModuleMartyr
-  icon: { sprite: /Textures/Objects/Specific/Robotics/borgmodule.rsi, state: syndicateborgbomb }
-  cost:
+  id: UplinkSingarityBeacon
+  name: uplink-singularity-beacon-name
+  description: uplink-singularity-beacon-desc
+  productEntity: SingularityBeacon
+  discountCategory: usualDiscounts
+  discountDownTo:
     Telecrystal: 4
+  cost:
+    Telecrystal: 12
   categories:
     - UplinkDisruption
 
+# Allies
+
 - type: listing
-  id: UplinkJetpack
-  name: uplink-black-jetpack-name
-  description: uplink-black-jetpack-desc
-  productEntity: JetpackBlackFilled
+  id: UplinkHoloparaKit
+  name: uplink-holopara-kit-name
+  description: uplink-holopara-kit-desc
+  icon: { sprite: /Textures/Objects/Misc/guardian_info.rsi, state: icon }
+  productEntity: BoxHoloparasite
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 8
   cost:
-    Telecrystal: 2
+    Telecrystal: 14
   categories:
-  - UplinkUtility
+  - UplinkAllies
+  conditions:
+  - !type:StoreWhitelistCondition
+    blacklist:
+      tags:
+      - NukeOpsUplink
 
 - type: listing
   id: UplinkReinforcementRadioSyndicate
   name: uplink-reinforcement-radio-name
   description: uplink-reinforcement-radio-desc
   productEntity: ReinforcementRadioSyndicate
-  icon: { sprite: Objects/Devices/communication.rsi, state: radio }
+  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-urist }
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 7
   cost:
     Telecrystal: 16
   categories:
@@ -678,7 +1148,10 @@
   name: uplink-reinforcement-radio-ancestor-name
   description: uplink-reinforcement-radio-ancestor-desc
   productEntity: ReinforcementRadioSyndicateAncestor
-  icon: { sprite: Objects/Devices/communication.rsi, state: radio }
+  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-ancestor }
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 4
   cost:
     Telecrystal: 8
   categories:
@@ -694,7 +1167,10 @@
   name: uplink-reinforcement-radio-ancestor-name
   description: uplink-reinforcement-radio-ancestor-desc
   productEntity: ReinforcementRadioSyndicateAncestorNukeops
-  icon: { sprite: Objects/Devices/communication.rsi, state: radio }
+  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-ancestor }
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 4
   cost:
     Telecrystal: 6
   categories:
@@ -707,33 +1183,27 @@
   saleLimit: 1
 
 - type: listing
-  id: UplinkHeadsetEncryptionKey
-  name: uplink-encryption-key-name
-  description: uplink-encryption-key-desc
-  icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: synd_label }
-  productEntity: BoxEncryptionKeySyndie # Two for the price of one
+  id: UplinkCarpDehydrated
+  name: uplink-carp-dehydrated-name
+  description: uplink-carp-dehydrated-desc
+  productEntity: DehydratedSpaceCarp
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 1
   cost:
     Telecrystal: 2
   categories:
   - UplinkUtility
 
 - type: listing
-  id: UplinkBinaryTranslatorKey
-  name: uplink-binary-translator-key-name
-  description: uplink-binary-translator-key-desc
-  icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: rd_label }
-  productEntity: EncryptionKeyBinary
-  cost:
-    Telecrystal: 1
-  categories:
-  - UplinkUtility
-
-- type: listing
-  id: UplinkHypopen
-  name: uplink-hypopen-name
-  description: uplink-hypopen-desc
-  icon: { sprite: /Textures/Objects/Misc/bureaucracy.rsi, state: pen }
-  productEntity: HypopenBox
+  id: UplinkMobCatMicrobomb
+  name: uplink-mobcat-microbomb-name
+  description: uplink-mobcat-microbomb-desc
+  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-syndicat }
+  productEntity: ReinforcementRadioSyndicateSyndiCat
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 3
   cost:
     Telecrystal: 6
   categories:
@@ -797,6 +1267,9 @@
   description: uplink-storage-implanter-desc
   icon: { sprite: /Textures/Clothing/Back/Backpacks/backpack.rsi, state: icon }
   productEntity: StorageImplanter
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 4
   cost:
     Telecrystal: 8
   categories:
@@ -813,6 +1286,9 @@
   description: uplink-freedom-implanter-desc
   icon: { sprite: /Textures/Actions/Implants/implants.rsi, state: freedom }
   productEntity: FreedomImplanter
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 3
   cost:
     Telecrystal: 5
   categories:
@@ -824,6 +1300,9 @@
   description: uplink-scram-implanter-desc
   icon: { sprite: /Textures/Structures/Specific/anomaly.rsi, state: anom4 }
   productEntity: ScramImplanter
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 4
   cost:
     Telecrystal: 6 # it's a gamble that may kill you easily so 6 TC per 2 uses, second one more of a backup
   categories:
@@ -835,6 +1314,9 @@
   description: uplink-dna-scrambler-implanter-desc
   icon: { sprite: /Textures/Mobs/Species/Human/parts.rsi, state: full }
   productEntity: DnaScramblerImplanter
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 2
   cost:
     Telecrystal: 5
   categories:
@@ -846,6 +1328,9 @@
   description: uplink-emp-implanter-desc
   icon: { sprite: /Textures/Objects/Magic/magicactions.rsi, state: shield }
   productEntity: EmpImplanter
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 1
   cost:
     Telecrystal: 2
   categories:
@@ -913,6 +1398,9 @@
   description: uplink-uplink-implanter-desc
   icon: { sprite: /Textures/Objects/Devices/communication.rsi, state: radio }
   productEntity: UplinkImplanter
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 1
   cost:
     Telecrystal: 2
   categories:
@@ -946,21 +1434,26 @@
 # Bundles
 
 - type: listing
-  id: Observationkit
-  name: uplink-observation-kit-name
-  description: uplink-observation-kit-desc
-  icon: { sprite: /Textures/Objects/Storage/boxicons.rsi, state: tracks }
-  productEntity: Observationskit
+  id: UplinkJetpack
+  name: uplink-black-jetpack-name
+  description: uplink-black-jetpack-desc
+  productEntity: JetpackBlackFilled
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 1
   cost:
     Telecrystal: 4
   categories:
   - UplinkBundles
 
 - type: listing
-  id: UplinkEmpKit
-  name: uplink-emp-kit-name
-  description: uplink-emp-kit-desc
-  productEntity: ElectricalDisruptionKit
+  id: UplinkVoiceMask
+  name: uplink-voice-mask-name
+  description: uplink-voice-mask-desc
+  productEntity: ClothingMaskGasVoiceChameleon
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 1
   cost:
     Telecrystal: 6
   categories:
@@ -999,34 +1492,53 @@
   saleLimit: 1
 
 - type: listing
-  id: UplinkChemistryKitBundle
-  name: uplink-chemistry-kit-name
-  description: uplink-chemistry-kit-desc
-  icon: { sprite: /Textures/Objects/Storage/boxicons.rsi, state: vials }
-  productEntity: ChemicalSynthesisKit
+  id: UplinkChameleon
+  name: uplink-chameleon-name
+  description: uplink-chameleon-desc
+  productEntity: ClothingBackpackChameleonFill
+  icon: { sprite: /Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi, state: icon }
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 2
   cost:
     Telecrystal: 4
   categories:
   - UplinkBundles
 
 - type: listing
-  id: UplinkDecoyKit
-  name: uplink-decoy-kit-name
-  description: uplink-decoy-kit-desc
-  icon: { sprite: /Textures/Objects/Tools/Decoys/operative_decoy.rsi, state: folded }
-  productEntity: ClothingBackpackDuffelSyndicateDecoyKitFilled
+  id: UplinkClothingNoSlipsShoes
+  name: uplink-clothing-no-slips-shoes-name
+  description: uplink-clothing-no-slips-shoes-desc
+  productEntity: ClothingShoesChameleonNoSlips
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 1
   cost:
     Telecrystal: 6
   categories:
-  - UplinkBundles
+  - UplinkWearables
 
+- type: listing
+  id: UplinkgClothingThievingGloves
+  name: uplink-clothing-thieving-gloves-name
+  description: uplink-clothing-thieving-gloves-desc
+  productEntity: ThievingGloves
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 2
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkWearables
 
 - type: listing
-  id: UplinkSniperBundle
-  name: uplink-sniper-bundle-name
-  description: uplink-sniper-bundle-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi, state: base }
-  productEntity: BriefcaseSyndieSniperBundleFilled
+  id: UplinkClothingOuterVestWeb
+  name: uplink-clothing-outer-vest-web-name
+  description: uplink-clothing-outer-vest-web-desc
+  productEntity: ClothingOuterVestWeb
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 1
   cost:
     Telecrystal: 12
   categories:
@@ -1034,11 +1546,13 @@
   saleLimit: 1
 
 - type: listing
-  id: UplinkC20RBundle
-  name: uplink-c20r-bundle-name
-  description: uplink-c20r-bundle-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/SMGs/c20r.rsi, state: icon }
-  productEntity: ClothingBackpackDuffelSyndicateFilledSMG
+  id: UplinkClothingShoesBootsMagSyndie
+  name: uplink-clothing-shoes-boots-mag-syndie-name
+  description: uplink-clothing-shoes-boots-mag-syndie-desc
+  productEntity: ClothingShoesBootsMagSyndie
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 2
   cost:
     Telecrystal: 17
   categories:
@@ -1046,11 +1560,14 @@
   saleLimit: 1
 
 - type: listing
-  id: UplinkBulldogBundle
-  name: uplink-buldog-bundle-name
-  description: uplink-buldog-bundle-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi, state: icon }
-  productEntity: ClothingBackpackDuffelSyndicateFilledShotgun
+  id: UplinkEVASyndie
+  name: uplink-eva-syndie-name
+  description: uplink-eva-syndie-desc
+  icon: { sprite: /Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateEVABundle
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 1
   cost:
     Telecrystal: 20
   categories:
@@ -1058,11 +1575,14 @@
   saleLimit: 1
 
 - type: listing
-  id: UplinkGrenadeLauncherBundle
-  name: uplink-grenade-launcher-bundle-name
-  description: uplink-grenade-launcher-bundle-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi, state: icon }
-  productEntity: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher
+  id: UplinkHardsuitCarp
+  name: uplink-hardsuit-carp-name
+  description: uplink-hardsuit-carp-desc
+  icon: { sprite: /Textures/Clothing/OuterClothing/Suits/carpsuit.rsi, state: icon }
+  productEntity: ClothingOuterHardsuitCarp
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 2
   cost:
     Telecrystal: 25
   categories:
@@ -1070,11 +1590,14 @@
   saleLimit: 1
 
 - type: listing
-  id: UplinkL6SawBundle
-  name: uplink-l6-saw-bundle-name
-  description: uplink-l6-saw-bundle-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/LMGs/l6.rsi, state: icon }
-  productEntity: ClothingBackpackDuffelSyndicateFilledLMG
+  id: UplinkHardsuitSyndie
+  name: uplink-hardsuit-syndie-name
+  description: uplink-hardsuit-syndie-desc
+  icon: { sprite: /Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateHardsuitBundle
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 4
   cost:
     Telecrystal: 30
   categories:
@@ -1102,14 +1625,42 @@
   saleBlacklist: true
 
 - type: listing
-  id: UplinkSuperSurplusBundle
-  name: uplink-super-surplus-bundle-name
-  description: uplink-super-surplus-bundle-desc
-  productEntity: CrateSyndicateSuperSurplusBundle
+  id: UplinkHardsuitSyndieElite
+  name: uplink-hardsuit-syndieelite-name
+  description: uplink-hardsuit-syndieelite-desc
+  icon: { sprite: /Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateEliteHardsuitBundle
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 7
   cost:
     Telecrystal: 40
   categories:
-  - UplinkBundles
+  - UplinkWearables
+
+- type: listing
+  id: UplinkClothingOuterHardsuitJuggernaut
+  name: uplink-clothing-outer-hardsuit-juggernaut-name
+  description: uplink-clothing-outer-hardsuit-juggernaut-desc
+  icon: { sprite: /Textures/Structures/Storage/Crates/syndicate.rsi, state: icon }
+  productEntity: CrateCybersunJuggernautBundle
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 8
+  cost:
+    Telecrystal: 12
+  categories:
+  - UplinkWearables
+
+- type: listing
+  id: UplinkClothingEyesHudSyndicate
+  name: uplink-clothing-eyes-hud-syndicate-name
+  description: uplink-clothing-eyes-hud-syndicate-desc
+  productEntity: ClothingEyesHudSyndicate
+  cost:
+    Telecrystal: 2
+  categories:
+    - UplinkWearables
   conditions:
   - !type:StoreWhitelistCondition
     blacklist:
@@ -1144,20 +1695,46 @@
   - UplinkTools
 
 - type: listing
-  id: UplinkDuffelSurgery
-  name: uplink-duffel-surgery-name
-  description: uplink-duffel-surgery-desc
-  productEntity: ClothingBackpackDuffelSyndicateFilledMedical
+  id: UplinkBarberScissors
+  name: uplink-barber-scissors-name
+  description: uplink-barber-scissors-desc
+  productEntity: BarberScissors
+  cost:
+    Telecrystal: 1
+  categories:
+  - UplinkPointless
+
+- type: listing
+  id: UplinkSnackBox
+  name: uplink-snack-box-name
+  description: uplink-snack-box-desc
+  productEntity: HappyHonkNukieSnacks
+  cost:
+    Telecrystal: 1
+  categories:
+  - UplinkPointless
+
+- type: listing
+  id: UplinkRevolverCapGun
+  name: uplink-revolver-cap-gun-name
+  description: uplink-revolver-cap-gun-desc
+  productEntity: RevolverCapGun
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 2
   cost:
     Telecrystal: 4
   categories:
   - UplinkTools
 
 - type: listing
-  id: UplinkPowerSink
-  name: uplink-power-sink-name
-  description: uplink-power-sink-desc
-  productEntity: PowerSink
+  id: UplinkSyndicateStamp
+  name: uplink-syndicate-stamp-name
+  description: uplink-syndicate-stamp-desc
+  productEntity: RubberStampSyndicate
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 1
   cost:
     Telecrystal: 8
   categories:
@@ -1190,6 +1767,9 @@
   name: uplink-gatfruit-seeds-name
   description: uplink-gatfruit-seeds-desc
   productEntity: GatfruitSeeds
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 3
   cost:
     Telecrystal: 6
   categories:
@@ -1204,6 +1784,9 @@
   name: uplink-rigged-boxing-gloves-name
   description: uplink-rigged-boxing-gloves-desc
   productEntity: ClothingHandsGlovesBoxingRigged
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 3
   cost:
     Telecrystal: 6
   categories:
@@ -1218,6 +1801,9 @@
   name: uplink-rigged-boxing-gloves-name
   description: uplink-rigged-boxing-gloves-desc
   productEntity: ClothingHandsGlovesBoxingRigged
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 2
   cost:
     Telecrystal: 4
   categories:
@@ -1232,6 +1818,9 @@
   name: uplink-necronomicon-name
   description: uplink-necronomicon-desc
   productEntity: BibleNecronomicon
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 2
   cost:
     Telecrystal: 4
   categories:
@@ -1250,6 +1839,9 @@
   name: uplink-holy-hand-grenade-name
   description: uplink-holy-hand-grenade-desc
   productEntity: HolyHandGrenade
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 14
   cost:
     Telecrystal: 20
   categories:
@@ -1265,6 +1857,9 @@
   name: uplink-revolver-cap-gun-fake-name
   description: uplink-revolver-cap-gun-fake-desc
   productEntity: RevolverCapGunFake
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 5
   cost:
     Telecrystal: 9
   categories:
@@ -1282,6 +1877,9 @@
   description: uplink-banana-peel-explosive-desc
   icon: { sprite: Objects/Specific/Hydroponics/banana.rsi, state: peel }
   productEntity: TrashBananaPeelExplosiveUnarmed
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 1
   cost:
     Telecrystal: 2
   categories:
@@ -1296,6 +1894,9 @@
   name: uplink-cluster-banana-peel-name
   description: uplink-cluster-banana-peel-desc
   productEntity: ClusterBananaPeel
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 3
   cost:
     Telecrystal: 6
   categories:
@@ -1311,6 +1912,9 @@
   description: uplink-holoclown-kit-desc
   icon: { sprite: /Textures/Objects/Fun/figurines.rsi, state: holoclown }
   productEntity: BoxHoloclown
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 6
   cost:
     Telecrystal: 12
   categories:
@@ -1325,6 +1929,9 @@
   id: uplinkHotPotato
   name: uplink-hot-potato-name
   description: uplink-hot-potato-desc
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 2
   productEntity: HotPotato
   cost:
     Telecrystal: 4
@@ -1343,6 +1950,9 @@
   name: uplink-chimp-upgrade-kit-name
   description: uplink-chimp-upgrade-kit-desc
   productEntity: WeaponPistolCHIMPUpgradeKit
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 2
   cost:
     Telecrystal: 4
   categories:
@@ -1357,6 +1967,9 @@
   name: uplink-proximity-mine-name
   description: uplink-proximity-mine-desc
   productEntity: WetFloorSignMineExplosive
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 2
   cost:
     Telecrystal: 5 # was 4, with my buff made it 5 to be closer to minibomb -panzer
   categories:
@@ -1375,6 +1988,9 @@
   name: uplink-syndicate-sponge-box-name
   description: uplink-syndicate-sponge-box-desc
   icon: { sprite:  Objects/Misc/monkeycube.rsi, state: box}
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 4
   productEntity: SyndicateSpongeBox
   cost:
     Telecrystal: 7
@@ -1395,6 +2011,9 @@
   description: uplink-cane-blade-desc
   icon: { sprite:  Objects/Weapons/Melee/cane.rsi, state: cane}
   productEntity: CaneSheathFilled
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 2
   cost:
     Telecrystal: 5
   categories:
diff --git a/Resources/Prototypes/Store/categories.yml b/Resources/Prototypes/Store/categories.yml
index 489145813e2..425244a0fac 100644
--- a/Resources/Prototypes/Store/categories.yml
+++ b/Resources/Prototypes/Store/categories.yml
@@ -114,3 +114,7 @@
   id: RevenantAbilities
   name: store-category-abilities
 
+- type: storeCategory
+  id: DiscountedItems
+  name: store-discounted-items
+  priority: 200

From 21cca1dcf5d514b85e51d0b574f29060f9f99e04 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 07:04:19 -0400
Subject: [PATCH 061/366] hm

---
 .../Body/Systems/RespiratorSystem.cs          |   3 +
 Content.Server/Vampire/BloodSuckerSystem.cs   |   3 +-
 .../Weapons/Ranged/Systems/GunSystem.cs       | 236 +++++-------------
 3 files changed, 66 insertions(+), 176 deletions(-)

diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
index 04f106ef2c7..53bb1ff80c7 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -1,12 +1,15 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Components;
+using Content.Server.Chat.Systems;
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Chemistry.ReagentEffectConditions;
 using Content.Server.Chemistry.ReagentEffects;
+using Content.Server.Popups;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
 using Content.Shared.Body.Components;
+using Content.Shared.Body.Organ;
 using Content.Shared.Body.Prototypes;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
diff --git a/Content.Server/Vampire/BloodSuckerSystem.cs b/Content.Server/Vampire/BloodSuckerSystem.cs
index b0e966a620c..77fae73bd44 100644
--- a/Content.Server/Vampire/BloodSuckerSystem.cs
+++ b/Content.Server/Vampire/BloodSuckerSystem.cs
@@ -134,8 +134,7 @@ public void StartSuccDoAfter(EntityUid bloodsucker, EntityUid victim, BloodSucke
 
             var args = new DoAfterArgs(EntityManager, bloodsucker, bloodSuckerComponent.Delay, new BloodSuckDoAfterEvent(), bloodsucker, target: victim)
             {
-                ,
-                BreakOnUserMove = false,
+                BreakOnMove = false,
                 DistanceThreshold = 2f,
                 NeedHand = false
             };
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index f59a6df7aa3..d22b5ec2af7 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -2,10 +2,7 @@
 using System.Numerics;
 using Content.Server.Cargo.Systems;
 using Content.Server.Power.EntitySystems;
-using Content.Server.Projectiles;
-using Content.Server.Stunnable;
 using Content.Server.Weapons.Ranged.Components;
-using Content.Shared.Contests;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
@@ -17,12 +14,14 @@
 using Content.Shared.Weapons.Ranged.Events;
 using Content.Shared.Weapons.Ranged.Systems;
 using Content.Shared.Weapons.Reflect;
+using Content.Shared.Damage.Components;
 using Robust.Shared.Audio;
 using Robust.Shared.Map;
 using Robust.Shared.Physics;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
+using Robust.Shared.Containers;
 
 namespace Content.Server.Weapons.Ranged.Systems;
 
@@ -33,10 +32,9 @@ public sealed partial class GunSystem : SharedGunSystem
     [Dependency] private readonly DamageExamineSystem _damageExamine = default!;
     [Dependency] private readonly PricingSystem _pricing = default!;
     [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
-    [Dependency] private readonly ProjectileSystem _projectile = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly StaminaSystem _stamina = default!;
-    [Dependency] private readonly ContestsSystem _contests = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
 
     private const float DamagePitchVariation = 0.05f;
 
@@ -62,137 +60,6 @@ private void OnBallisticPrice(EntityUid uid, BallisticAmmoProviderComponent comp
         args.Price += price * component.UnspawnedCount;
     }
 
-    protected override bool ShootDirect(EntityUid gunUid, GunComponent gun, EntityUid target, List<(EntityUid? Entity, IShootable Shootable)> ammo, EntityUid user)
-    {
-        var result = false;
-
-        // TODO: This is dogshit. I just want to get executions slightly better.
-        // Ideally you'd pull out cartridge + ammo to separate handling functions and re-use it here, then hitscan you need to bypass entirely.
-        // You should also make shooting into a struct of args given how many there are now.
-        var fromCoordinates = Transform(gunUid).Coordinates;
-        var toCoordinates = Transform(target).Coordinates;
-
-        var fromMap = fromCoordinates.ToMap(EntityManager, TransformSystem);
-        var toMap = toCoordinates.ToMapPos(EntityManager, TransformSystem);
-        var mapDirection = toMap - fromMap.Position;
-        var angle = GetRecoilAngle(Timing.CurTime, gun, mapDirection.ToAngle());
-
-        // If applicable, this ensures the projectile is parented to grid on spawn, instead of the map.
-        var fromEnt = MapManager.TryFindGridAt(fromMap, out var gridUid, out _)
-            ? fromCoordinates.WithEntityId(gridUid, EntityManager)
-            : new EntityCoordinates(MapManager.GetMapEntityId(fromMap.MapId), fromMap.Position);
-
-        // I must be high because this was getting tripped even when true.
-        // DebugTools.Assert(direction != Vector2.Zero);
-        var shotProjectiles = new List<EntityUid>(ammo.Count);
-        var cartridgeBullets = new List<EntityUid>();
-
-        foreach (var (ent, shootable) in ammo)
-        {
-            switch (shootable)
-            {
-                // Cartridge shoots something else
-                case CartridgeAmmoComponent cartridge:
-                    if (!cartridge.Spent)
-                    {
-                        for (var i = 0; i < cartridge.Count; i++)
-                        {
-                            var uid = Spawn(cartridge.Prototype, fromEnt);
-                            cartridgeBullets.Add(uid);
-                        }
-
-                        RaiseLocalEvent(ent!.Value, new AmmoShotEvent()
-                        {
-                            FiredProjectiles = cartridgeBullets,
-                        });
-
-                        shotProjectiles.AddRange(cartridgeBullets);
-                        cartridgeBullets.Clear();
-                        SetCartridgeSpent(ent.Value, cartridge, true);
-                        MuzzleFlash(gunUid, cartridge, user);
-                        Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user);
-
-                        if (cartridge.DeleteOnSpawn)
-                            Del(ent.Value);
-                    }
-                    else
-                    {
-                        Audio.PlayPredicted(gun.SoundEmpty, gunUid, user);
-                    }
-
-                    // Something like ballistic might want to leave it in the container still
-                    if (!cartridge.DeleteOnSpawn && !Containers.IsEntityInContainer(ent!.Value))
-                        EjectCartridge(ent.Value, angle);
-
-                    result = true;
-                    Dirty(ent!.Value, cartridge);
-                    break;
-                // Ammo shoots itself
-                case AmmoComponent newAmmo:
-                    result = true;
-                    shotProjectiles.Add(ent!.Value);
-                    MuzzleFlash(gunUid, newAmmo, user);
-                    Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user);
-                    break;
-                case HitscanPrototype hitscan:
-                    result = true;
-                    var hitEntity = target;
-                    if (hitscan.StaminaDamage > 0f)
-                        _stamina.TakeStaminaDamage(hitEntity, hitscan.StaminaDamage, source: user);
-
-                    var dmg = hitscan.Damage;
-
-                    var hitName = ToPrettyString(hitEntity);
-                    if (dmg != null)
-                        dmg = Damageable.TryChangeDamage(hitEntity, dmg, origin: user);
-
-                    // check null again, as TryChangeDamage returns modified damage values
-                    if (dmg != null)
-                    {
-                        if (!Deleted(hitEntity))
-                        {
-                            if (dmg.Any())
-                            {
-                                _color.RaiseEffect(Color.Red, new List<EntityUid>() { hitEntity }, Filter.Pvs(hitEntity, entityManager: EntityManager));
-                            }
-
-                            // TODO get fallback position for playing hit sound.
-                            PlayImpactSound(hitEntity, dmg, hitscan.Sound, hitscan.ForceSound);
-                        }
-
-                        Logs.Add(LogType.HitScanHit,
-                            $"{ToPrettyString(user):user} hit {hitName:target} using hitscan and dealt {dmg.GetTotal():damage} damage");
-                    }
-
-                    Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user);
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException();
-            }
-        }
-
-        foreach (var ammoUid in shotProjectiles)
-        {
-            // TODO: Handle this shit
-            if (!TryComp(ammoUid, out ProjectileComponent? projectileComponent))
-            {
-                QueueDel(ammoUid);
-                continue;
-            }
-
-            _projectile.TryHandleProjectile(target, (ammoUid, projectileComponent));
-            // Even this deletion handling is mega sussy.
-            Del(ammoUid);
-        }
-
-        RaiseLocalEvent(gunUid, new AmmoShotEvent()
-        {
-            FiredProjectiles = shotProjectiles,
-        });
-
-        return result;
-    }
-
     public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid? Entity, IShootable Shootable)> ammo,
         EntityCoordinates fromCoordinates, EntityCoordinates toCoordinates, out bool userImpulse, EntityUid? user = null, bool throwItems = false)
     {
@@ -209,16 +76,14 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
             }
         }
 
-        // As the above message wasn't obvious stop putting stuff here and use events
-
         var fromMap = fromCoordinates.ToMap(EntityManager, TransformSystem);
         var toMap = toCoordinates.ToMapPos(EntityManager, TransformSystem);
         var mapDirection = toMap - fromMap.Position;
         var mapAngle = mapDirection.ToAngle();
-        var angle = GetRecoilAngle(Timing.CurTime, gun, mapDirection.ToAngle(), user);
+        var angle = GetRecoilAngle(Timing.CurTime, gun, mapDirection.ToAngle());
 
         // If applicable, this ensures the projectile is parented to grid on spawn, instead of the map.
-        var fromEnt = MapManager.TryFindGridAt(fromMap, out var gridUid, out _)
+        var fromEnt = MapManager.TryFindGridAt(fromMap, out var gridUid, out var grid)
             ? fromCoordinates.WithEntityId(gridUid, EntityManager)
             : new EntityCoordinates(MapManager.GetMapEntityId(fromMap.MapId), fromMap.Position);
 
@@ -230,7 +95,6 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
         // I must be high because this was getting tripped even when true.
         // DebugTools.Assert(direction != Vector2.Zero);
         var shotProjectiles = new List<EntityUid>(ammo.Count);
-        var cartridgeBullets = new List<EntityUid>();
 
         foreach (var (ent, shootable) in ammo)
         {
@@ -247,38 +111,15 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
                 case CartridgeAmmoComponent cartridge:
                     if (!cartridge.Spent)
                     {
-                        if (cartridge.Count > 1)
-                        {
-                            var ev = new GunGetAmmoSpreadEvent(cartridge.Spread);
-                            RaiseLocalEvent(gunUid, ref ev);
-
-                            var angles = LinearSpread(mapAngle - ev.Spread / 2,
-                                mapAngle + ev.Spread / 2, cartridge.Count);
-
-                            for (var i = 0; i < cartridge.Count; i++)
-                            {
-                                var uid = Spawn(cartridge.Prototype, fromEnt);
-                                ShootOrThrow(uid, angles[i].ToVec(), gunVelocity, gun, gunUid, user);
-                                cartridgeBullets.Add(uid);
-                            }
-                        }
-                        else
-                        {
-                            var uid = Spawn(cartridge.Prototype, fromEnt);
-                            ShootOrThrow(uid, mapDirection, gunVelocity, gun, gunUid, user);
-                            cartridgeBullets.Add(uid);
-                        }
+                        var uid = Spawn(cartridge.Prototype, fromEnt);
+                        CreateAndFireProjectiles(uid, cartridge);
 
                         RaiseLocalEvent(ent!.Value, new AmmoShotEvent()
                         {
-                            FiredProjectiles = cartridgeBullets,
+                            FiredProjectiles = shotProjectiles,
                         });
 
-                        shotProjectiles.AddRange(cartridgeBullets);
-                        cartridgeBullets.Clear();
                         SetCartridgeSpent(ent.Value, cartridge, true);
-                        MuzzleFlash(gunUid, cartridge, mapDirection.ToAngle(), user);
-                        Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user);
 
                         if (cartridge.DeleteOnSpawn)
                             Del(ent.Value);
@@ -297,10 +138,10 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
                     break;
                 // Ammo shoots itself
                 case AmmoComponent newAmmo:
-                    shotProjectiles.Add(ent!.Value);
-                    MuzzleFlash(gunUid, newAmmo, mapDirection.ToAngle(), user);
-                    Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user);
-                    ShootOrThrow(ent.Value, mapDirection, gunVelocity, gun, gunUid, user);
+                    if (ent == null)
+                        break;
+                    CreateAndFireProjectiles(ent.Value, newAmmo);
+
                     break;
                 case HitscanPrototype hitscan:
 
@@ -325,6 +166,24 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
                                 break;
 
                             var result = rayCastResults[0];
+
+                            // Check if laser is shot from in a container
+                            if (!_container.IsEntityOrParentInContainer(lastUser))
+                            {
+                                // Checks if the laser should pass over unless targeted by its user
+                                foreach (var collide in rayCastResults)
+                                {
+                                    if (collide.HitEntity != gun.Target &&
+                                        CompOrNull<RequireProjectileTargetComponent>(collide.HitEntity)?.Active == true)
+                                    {
+                                        continue;
+                                    }
+
+                                    result = collide;
+                                    break;
+                                }
+                            }
+
                             var hit = result.HitEntity;
                             lastHit = hit;
 
@@ -397,6 +256,36 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
         {
             FiredProjectiles = shotProjectiles,
         });
+
+        void CreateAndFireProjectiles(EntityUid ammoEnt, AmmoComponent ammoComp)
+        {
+            if (TryComp<ProjectileSpreadComponent>(ammoEnt, out var ammoSpreadComp))
+            {
+                var spreadEvent = new GunGetAmmoSpreadEvent(ammoSpreadComp.Spread);
+                RaiseLocalEvent(gunUid, ref spreadEvent);
+
+                var angles = LinearSpread(mapAngle - spreadEvent.Spread / 2,
+                    mapAngle + spreadEvent.Spread / 2, ammoSpreadComp.Count);
+
+                ShootOrThrow(ammoEnt, angles[0].ToVec(), gunVelocity, gun, gunUid, user);
+                shotProjectiles.Add(ammoEnt);
+
+                for (var i = 1; i < ammoSpreadComp.Count; i++)
+                {
+                    var newuid = Spawn(ammoSpreadComp.Proto, fromEnt);
+                    ShootOrThrow(newuid, angles[i].ToVec(), gunVelocity, gun, gunUid, user);
+                    shotProjectiles.Add(newuid);
+                }
+            }
+            else
+            {
+                ShootOrThrow(ammoEnt, mapDirection, gunVelocity, gun, gunUid, user);
+                shotProjectiles.Add(ammoEnt);
+            }
+
+            MuzzleFlash(gunUid, ammoComp, mapDirection.ToAngle(), user);
+            Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user);
+        }
     }
 
     private void ShootOrThrow(EntityUid uid, Vector2 mapDirection, Vector2 gunVelocity, GunComponent gun, EntityUid gunUid, EntityUid? user)
@@ -439,7 +328,7 @@ private Angle[] LinearSpread(Angle start, Angle end, int intervals)
         return angles;
     }
 
-    private Angle GetRecoilAngle(TimeSpan curTime, GunComponent component, Angle direction, EntityUid? shooter)
+    private Angle GetRecoilAngle(TimeSpan curTime, GunComponent component, Angle direction)
     {
         var timeSinceLastFire = (curTime - component.LastFire).TotalSeconds;
         var newTheta = MathHelper.Clamp(component.CurrentAngle.Theta + component.AngleIncreaseModified.Theta - component.AngleDecayModified.Theta * timeSinceLastFire, component.MinAngleModified.Theta, component.MaxAngleModified.Theta);
@@ -447,8 +336,7 @@ private Angle GetRecoilAngle(TimeSpan curTime, GunComponent component, Angle dir
         component.LastFire = component.NextFire;
 
         // Convert it so angle can go either side.
-
-        var random = Random.NextFloat(-0.5f, 0.5f) / _contests.MassContest(shooter);
+        var random = Random.NextFloat(-0.5f, 0.5f);
         var spread = component.CurrentAngle.Theta * random;
         var angle = new Angle(direction.Theta + component.CurrentAngle.Theta * random);
         DebugTools.Assert(spread <= component.MaxAngleModified.Theta);

From 47b32584a8efc824fa34157a6d634ecdf3ed7d2c Mon Sep 17 00:00:00 2001
From: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com>
Date: Sat, 3 Aug 2024 09:26:32 -0400
Subject: [PATCH 062/366] Shotgun spread refactor (#27773)

* Moves spread data to new component

* Refactors shotgun spread code

* Makes shotgun cartridges and projectiles use new component

* Attempts to fix nullable build error

* Fixes hitscan weapons that I broke :(

* Saviour commit?

---------

Co-authored-by: EmoGarbage404 <retron404@gmail.com>
---
 .../Weapons/Ranged/Systems/GunSystem.cs       |  5 +-
 .../Projectiles/ProjectileSpreadComponent.cs  | 32 +++++++++
 .../Ranged/Components/AmmoComponent.cs        | 12 ----
 .../Guns/Ammunition/Cartridges/shotgun.yml    | 21 ++----
 .../Guns/Ammunition/Projectiles/shotgun.yml   | 69 +++++++++++++++++++
 .../Weapons/Guns/Ammunition/explosives.yml    |  8 +--
 6 files changed, 112 insertions(+), 35 deletions(-)
 create mode 100644 Content.Shared/Projectiles/ProjectileSpreadComponent.cs

diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index d22b5ec2af7..e334e60dd48 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -110,6 +110,9 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
                 // Cartridge shoots something else
                 case CartridgeAmmoComponent cartridge:
                     if (!cartridge.Spent)
+                    {
+                        var uid = Spawn(cartridge.Prototype, fromEnt);
+                        CreateAndFireProjectiles(uid, cartridge);
                     {
                         var uid = Spawn(cartridge.Prototype, fromEnt);
                         CreateAndFireProjectiles(uid, cartridge);
@@ -274,7 +277,7 @@ void CreateAndFireProjectiles(EntityUid ammoEnt, AmmoComponent ammoComp)
                 {
                     var newuid = Spawn(ammoSpreadComp.Proto, fromEnt);
                     ShootOrThrow(newuid, angles[i].ToVec(), gunVelocity, gun, gunUid, user);
-                    shotProjectiles.Add(newuid);
+                    shotProjectiles.Add(ammoEnt);
                 }
             }
             else
diff --git a/Content.Shared/Projectiles/ProjectileSpreadComponent.cs b/Content.Shared/Projectiles/ProjectileSpreadComponent.cs
new file mode 100644
index 00000000000..1edffe3ba56
--- /dev/null
+++ b/Content.Shared/Projectiles/ProjectileSpreadComponent.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Weapons.Ranged.Systems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Projectiles;
+
+/// <summary>
+/// Spawns a spread of the projectiles when fired
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedGunSystem))]
+public sealed partial class ProjectileSpreadComponent : Component
+{
+    /// <summary>
+    /// The entity prototype that will be fired by the rest of the spread.
+    /// Will generally be the same entity prototype as the first projectile being fired.
+    /// Needed for ammo components that do not specify a fired prototype, unlike cartridges.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId Proto;
+
+    /// <summary>
+    /// How much the ammo spreads when shot, in degrees. Does nothing if count is 0.
+    /// </summary>
+    [DataField]
+    public Angle Spread = Angle.FromDegrees(5);
+
+    /// <summary>
+    /// How many prototypes are spawned when shot.
+    /// </summary>
+    [DataField]
+    public int Count = 1;
+}
diff --git a/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs b/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs
index 62af124252b..3e1111a97d1 100644
--- a/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs
@@ -30,18 +30,6 @@ public sealed partial class CartridgeAmmoComponent : AmmoComponent
     [AutoNetworkedField]
     public bool Spent = false;
 
-    /// <summary>
-    /// How much the ammo spreads when shot, in degrees. Does nothing if count is 0.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("spread")]
-    public Angle Spread = Angle.FromDegrees(5);
-
-    /// <summary>
-    /// How many prototypes are spawned when shot.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("count")]
-    public int Count = 1;
-
     /// <summary>
     /// Caseless ammunition.
     /// </summary>
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
index e26c4e95404..f5c79a858ef 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
@@ -9,8 +9,6 @@
     - Cartridge
     - ShellShotgun
   - type: CartridgeAmmo
-    count: 6
-    spread: 15
     soundEject:
       collection: ShellEject
   - type: Sprite
@@ -32,7 +30,6 @@
         map: [ "enum.AmmoVisualLayers.Base" ]
   - type: CartridgeAmmo
     proto: PelletShotgunBeanbag
-    count: 1
   - type: SpentAmmoVisuals
     state: "beanbag"
 
@@ -47,8 +44,6 @@
         map: [ "enum.AmmoVisualLayers.Base" ]
   - type: CartridgeAmmo
     proto: PelletShotgunSlug
-    count: 1
-    spread: 0
   - type: SpentAmmoVisuals
     state: "slug"
 
@@ -63,7 +58,6 @@
         map: [ "enum.AmmoVisualLayers.Base" ]
   - type: CartridgeAmmo
     proto: PelletShotgunFlare
-    count: 1
   - type: SpentAmmoVisuals
     state: "flare"
 
@@ -77,7 +71,7 @@
       - state: base
         map: [ "enum.AmmoVisualLayers.Base" ]
   - type: CartridgeAmmo
-    proto: PelletShotgun
+    proto: PelletShotgunSpread
 
 - type: entity
   id: ShellShotgunIncendiary
@@ -89,7 +83,7 @@
       - state: incendiary
         map: [ "enum.AmmoVisualLayers.Base" ]
   - type: CartridgeAmmo
-    proto: PelletShotgunIncendiary
+    proto: PelletShotgunIncendiarySpread
   - type: SpentAmmoVisuals
     state: "incendiary"
 
@@ -103,7 +97,7 @@
       - state: practice
         map: [ "enum.AmmoVisualLayers.Base" ]
   - type: CartridgeAmmo
-    proto: PelletShotgunPractice
+    proto: PelletShotgunPracticeSpread
   - type: SpentAmmoVisuals
     state: "practice"
 
@@ -118,7 +112,6 @@
         map: [ "enum.AmmoVisualLayers.Base" ]
   - type: CartridgeAmmo
     proto: PelletShotgunTranquilizer
-    count: 1
   - type: ChemicalAmmo
   - type: SolutionContainerManager
     solutions:
@@ -145,9 +138,7 @@
     graph: ImprovisedShotgunShellGraph
     node: shell
   - type: CartridgeAmmo
-    count: 10
-    spread: 45 
-    proto: PelletShotgunImprovised
+    proto: PelletShotgunImprovisedSpread
   - type: SpentAmmoVisuals
     state: "improvised"
 
@@ -161,8 +152,6 @@
         - state: depleted-uranium
           map: [ "enum.AmmoVisualLayers.Base" ]
     - type: CartridgeAmmo
-      count: 5
-      spread: 6
-      proto: PelletShotgunUranium
+      proto: PelletShotgunUraniumSpread
     - type: SpentAmmoVisuals
       state: "depleted-uranium"
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
index 6e4570e1a16..ce79b6f4174 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -42,6 +42,16 @@
       types:
         Piercing: 10
 
+- type: entity
+  id: PelletShotgunSpread
+  noSpawn: true
+  parent: PelletShotgun
+  components:
+  - type: ProjectileSpread
+    proto: PelletShotgun
+    count: 6
+    spread: 15
+
 - type: entity
   id: PelletShotgunIncendiary
   name: pellet (.50 incendiary)
@@ -59,6 +69,16 @@
   - type: IgnitionSource
     ignited: true
 
+- type: entity
+  id: PelletShotgunIncendiarySpread
+  noSpawn: true
+  parent: PelletShotgunIncendiary
+  components:
+  - type: ProjectileSpread
+    proto: PelletShotgunIncendiary
+    count: 6
+    spread: 15
+
 - type: entity
   id: PelletShotgunPractice
   name: pellet (.50 practice)
@@ -73,6 +93,16 @@
       types:
         Blunt: 1
 
+- type: entity
+  id: PelletShotgunPracticeSpread
+  noSpawn: true
+  parent: PelletShotgunPractice
+  components:
+  - type: ProjectileSpread
+    proto: PelletShotgunPractice
+    count: 6
+    spread: 15
+
 - type: entity
   id: PelletShotgunImprovised
   name: improvised pellet
@@ -88,6 +118,15 @@
         Piercing: 3
         Slash: 3
 
+- type: entity
+  id: PelletShotgunImprovisedSpread
+  noSpawn: true
+  parent: PelletShotgunImprovised
+  components:
+  - type: ProjectileSpread
+    proto: PelletShotgunImprovised
+    count: 10
+    spread: 45
 
 - type: entity
   id: PelletShotgunTranquilizer
@@ -178,6 +217,16 @@
         Radiation: 5
         Piercing: 5
 
+- type: entity
+  id: PelletShotgunUraniumSpread
+  noSpawn: true
+  parent: PelletShotgunUranium
+  components:
+  - type: ProjectileSpread
+    proto: PelletShotgunUranium
+    count: 5
+    spread: 6
+
 - type: entity
   id: PelletGrapeshot #tally fucking ho
   name: grapeshot pellet
@@ -196,6 +245,16 @@
         Piercing: 25
         Structural: 5
 
+- type: entity
+  id: PelletGrapeshotSpread
+  noSpawn: true
+  parent: PelletGrapeshot
+  components:
+  - type: ProjectileSpread
+    proto: PelletGrapeshot
+    count: 5
+    spread: 40
+
 - type: entity
   id: PelletGlass
   name: glass shard
@@ -215,3 +274,13 @@
     damage:
       types:
         Slash: 25
+
+- type: entity
+  id: PelletGlassSpread
+  parent: PelletGlass
+  noSpawn: true
+  components:
+  - type: ProjectileSpread
+    proto: PelletGlass
+    count: 5
+    spread: 10
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
index 152de7e92f2..04d405e8815 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
@@ -175,9 +175,7 @@
   parent: BaseCannonBall
   components:
   - type: CartridgeAmmo
-    proto: PelletGrapeshot
-    count: 5
-    spread: 40
+    proto: PelletGrapeshotSpread
     deleteOnSpawn: true
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
@@ -190,9 +188,7 @@
   parent: BaseCannonBall
   components:
   - type: CartridgeAmmo
-    proto: PelletGlass
-    count: 5
-    spread: 10
+    proto: PelletGlassSpread
     deleteOnSpawn: true
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi

From 4f9498fc5d63cf3bdd324e0dd357ce964745b361 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 07:05:43 -0400
Subject: [PATCH 063/366] SIlly duplicates

---
 Content.Server/Weapons/Ranged/Systems/GunSystem.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index e334e60dd48..d22b5ec2af7 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -110,9 +110,6 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
                 // Cartridge shoots something else
                 case CartridgeAmmoComponent cartridge:
                     if (!cartridge.Spent)
-                    {
-                        var uid = Spawn(cartridge.Prototype, fromEnt);
-                        CreateAndFireProjectiles(uid, cartridge);
                     {
                         var uid = Spawn(cartridge.Prototype, fromEnt);
                         CreateAndFireProjectiles(uid, cartridge);
@@ -277,7 +274,7 @@ void CreateAndFireProjectiles(EntityUid ammoEnt, AmmoComponent ammoComp)
                 {
                     var newuid = Spawn(ammoSpreadComp.Proto, fromEnt);
                     ShootOrThrow(newuid, angles[i].ToVec(), gunVelocity, gun, gunUid, user);
-                    shotProjectiles.Add(ammoEnt);
+                    shotProjectiles.Add(newuid);
                 }
             }
             else

From 95c0da91e7c11f4baf67699eb0d42a40d5c58e46 Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Sun, 16 Jun 2024 15:38:53 -0400
Subject: [PATCH 064/366] Add a system for modifying entity names without
 causing conflicts (#27863)

---
 .../TransformableContainerComponent.cs        |   8 -
 .../TransformableContainerSystem.cs           |  27 ++--
 Content.Server/Cluwne/CluwneSystem.cs         |  23 ++-
 Content.Server/Fax/FaxSystem.cs               |   8 +-
 Content.Server/Glue/GlueSystem.cs             |  24 +--
 Content.Server/Labels/Label/LabelSystem.cs    |  27 +---
 Content.Server/Lube/LubedSystem.cs            |  16 +-
 .../EntitySystems/AnimalHusbandrySystem.cs    |  25 +--
 .../Zombies/ZombieSystem.Transform.cs         |   4 +-
 Content.Server/Zombies/ZombieSystem.cs        |   5 +-
 Content.Shared/Glue/GluedComponent.cs         |   5 -
 .../Inventory/InventorySystem.Relay.cs        |   1 +
 .../Labels/Components/LabelComponent.cs       |   7 -
 .../Labels/EntitySystems/SharedLabelSystem.cs |   8 +
 Content.Shared/Lube/LubedComponent.cs         |   6 -
 .../Components/ModifyWearerNameComponent.cs   |  25 +++
 .../Components/NameModifierComponent.cs       |  20 +++
 .../EntitySystems/ModifyWearerNameSystem.cs   |  34 +++++
 .../EntitySystems/NameModifierSystem.cs       | 143 ++++++++++++++++++
 .../AnimalHusbandry/InfantComponent.cs        |   6 -
 Content.Shared/Zombies/SharedZombieSystem.cs  |   7 +
 Content.Shared/Zombies/ZombieComponent.cs     |   6 -
 .../transformable-container-component.ftl     |   2 +-
 Resources/Locale/en-US/cluwne/cluwne.ftl      |   2 +-
 Resources/Locale/en-US/glue/glue.ftl          |   2 +-
 .../Locale/en-US/label/label-component.ftl    |   1 +
 Resources/Locale/en-US/lube/lube.ftl          |   2 +-
 .../nutrition/components/animal-husbandry.ftl |   2 +-
 Resources/Locale/en-US/zombies/zombie.ftl     |   2 +-
 .../Objects/Specific/chemical-containers.yml  |   1 -
 30 files changed, 329 insertions(+), 120 deletions(-)
 create mode 100644 Content.Shared/NameModifier/Components/ModifyWearerNameComponent.cs
 create mode 100644 Content.Shared/NameModifier/Components/NameModifierComponent.cs
 create mode 100644 Content.Shared/NameModifier/EntitySystems/ModifyWearerNameSystem.cs
 create mode 100644 Content.Shared/NameModifier/EntitySystems/NameModifierSystem.cs
 create mode 100644 Resources/Locale/en-US/label/label-component.ftl

diff --git a/Content.Server/Chemistry/Components/TransformableContainerComponent.cs b/Content.Server/Chemistry/Components/TransformableContainerComponent.cs
index 5ea9a244878..db6c9c53976 100644
--- a/Content.Server/Chemistry/Components/TransformableContainerComponent.cs
+++ b/Content.Server/Chemistry/Components/TransformableContainerComponent.cs
@@ -14,14 +14,6 @@ namespace Content.Server.Chemistry.Components;
 [RegisterComponent, Access(typeof(TransformableContainerSystem))]
 public sealed partial class TransformableContainerComponent : Component
 {
-    /// <summary>
-    /// This is the initial metadata name for the container.
-    /// It will revert to this when emptied.
-    /// It defaults to the name of the parent entity unless overwritten.
-    /// </summary>
-    [DataField("initialName")]
-    public string? InitialName;
-
     /// <summary>
     /// This is the initial metadata description for the container.
     /// It will revert to this when emptied.
diff --git a/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs b/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs
index c375d97b8c3..32bd912b220 100644
--- a/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs
@@ -2,6 +2,7 @@
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.NameModifier.EntitySystems;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Chemistry.EntitySystems;
@@ -11,6 +12,7 @@ public sealed class TransformableContainerSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly SolutionContainerSystem _solutionsSystem = default!;
     [Dependency] private readonly MetaDataSystem _metadataSystem = default!;
+    [Dependency] private readonly NameModifierSystem _nameMod = default!;
 
     public override void Initialize()
     {
@@ -18,15 +20,12 @@ public override void Initialize()
 
         SubscribeLocalEvent<TransformableContainerComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<TransformableContainerComponent, SolutionContainerChangedEvent>(OnSolutionChange);
+        SubscribeLocalEvent<TransformableContainerComponent, RefreshNameModifiersEvent>(OnRefreshNameModifiers);
     }
 
-    private void OnMapInit(Entity<TransformableContainerComponent> entity, ref MapInitEvent args) 
+    private void OnMapInit(Entity<TransformableContainerComponent> entity, ref MapInitEvent args)
     {
         var meta = MetaData(entity.Owner);
-        if (string.IsNullOrEmpty(entity.Comp.InitialName))
-        {
-            entity.Comp.InitialName = meta.EntityName;
-        }
         if (string.IsNullOrEmpty(entity.Comp.InitialDescription))
         {
             entity.Comp.InitialDescription = meta.EntityDescription;
@@ -58,12 +57,20 @@ private void OnSolutionChange(Entity<TransformableContainerComponent> entity, re
             && _prototypeManager.TryIndex(reagentId.Value.Prototype, out ReagentPrototype? proto))
         {
             var metadata = MetaData(entity.Owner);
-            var val = Loc.GetString("transformable-container-component-glass", ("name", proto.LocalizedName));
-            _metadataSystem.SetEntityName(entity.Owner, val, metadata);
             _metadataSystem.SetEntityDescription(entity.Owner, proto.LocalizedDescription, metadata);
             entity.Comp.CurrentReagent = proto;
             entity.Comp.Transformed = true;
         }
+
+        _nameMod.RefreshNameModifiers(entity.Owner);
+    }
+
+    private void OnRefreshNameModifiers(Entity<TransformableContainerComponent> entity, ref RefreshNameModifiersEvent args)
+    {
+        if (entity.Comp.CurrentReagent is { } currentReagent)
+        {
+            args.AddModifier("transformable-container-component-glass", priority: -1, ("reagent", currentReagent.LocalizedName));
+        }
     }
 
     private void CancelTransformation(Entity<TransformableContainerComponent> entity)
@@ -73,10 +80,8 @@ private void CancelTransformation(Entity<TransformableContainerComponent> entity
 
         var metadata = MetaData(entity);
 
-        if (!string.IsNullOrEmpty(entity.Comp.InitialName))
-        {
-            _metadataSystem.SetEntityName(entity.Owner, entity.Comp.InitialName, metadata);
-        }
+        _nameMod.RefreshNameModifiers(entity.Owner);
+
         if (!string.IsNullOrEmpty(entity.Comp.InitialDescription))
         {
             _metadataSystem.SetEntityDescription(entity.Owner, entity.Comp.InitialDescription, metadata);
diff --git a/Content.Server/Cluwne/CluwneSystem.cs b/Content.Server/Cluwne/CluwneSystem.cs
index b91fcabb46f..ab280e1cd73 100644
--- a/Content.Server/Cluwne/CluwneSystem.cs
+++ b/Content.Server/Cluwne/CluwneSystem.cs
@@ -15,8 +15,8 @@
 using Content.Shared.Chat;
 using Content.Shared.Cluwne;
 using Content.Shared.Interaction.Components;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
+using Content.Shared.NameModifier.EntitySystems;
 using Content.Shared.Clumsy;
 
 namespace Content.Server.Cluwne;
@@ -32,6 +32,7 @@ public sealed class CluwneSystem : EntitySystem
     [Dependency] private readonly ChatSystem _chat = default!;
     [Dependency] private readonly AutoEmoteSystem _autoEmote = default!;
     [Dependency] private readonly MetaDataSystem _metaData = default!;
+    [Dependency] private readonly NameModifierSystem _nameMod = default!;
 
     public override void Initialize()
     {
@@ -41,6 +42,7 @@ public override void Initialize()
         SubscribeLocalEvent<CluwneComponent, MobStateChangedEvent>(OnMobState);
         SubscribeLocalEvent<CluwneComponent, EmoteEvent>(OnEmote, before:
         new[] { typeof(VocalSystem), typeof(BodyEmotesSystem) });
+        SubscribeLocalEvent<CluwneComponent, RefreshNameModifiersEvent>(OnRefreshNameModifiers);
     }
 
     /// <summary>
@@ -49,19 +51,19 @@ public override void Initialize()
     private void OnMobState(EntityUid uid, CluwneComponent component, MobStateChangedEvent args)
     {
         if (args.NewMobState == MobState.Dead)
-		{
+        {
             RemComp<CluwneComponent>(uid);
             RemComp<ClumsyComponent>(uid);
             RemComp<AutoEmoteComponent>(uid);
             var damageSpec = new DamageSpecifier(_prototypeManager.Index<DamageGroupPrototype>("Genetic"), 300);
             _damageableSystem.TryChangeDamage(uid, damageSpec);
-		}
+        }
     }
 
     public EmoteSoundsPrototype? EmoteSounds;
 
     /// <summary>
-    /// OnStartup gives the cluwne outfit, ensures clumsy, gives name prefix and makes sure emote sounds are laugh.
+    /// OnStartup gives the cluwne outfit, ensures clumsy, and makes sure emote sounds are laugh.
     /// </summary>
     private void OnComponentStartup(EntityUid uid, CluwneComponent component, ComponentStartup args)
     {
@@ -69,9 +71,6 @@ private void OnComponentStartup(EntityUid uid, CluwneComponent component, Compon
             return;
         _prototypeManager.TryIndex(component.EmoteSoundsId, out EmoteSounds);
 
-        var meta = MetaData(uid);
-        var name = meta.EntityName;
-
         EnsureComp<AutoEmoteComponent>(uid);
         _autoEmote.AddEmote(uid, "CluwneGiggle");
         EnsureComp<ClumsyComponent>(uid);
@@ -79,7 +78,7 @@ private void OnComponentStartup(EntityUid uid, CluwneComponent component, Compon
         _popupSystem.PopupEntity(Loc.GetString("cluwne-transform", ("target", uid)), uid, PopupType.LargeCaution);
         _audio.PlayPvs(component.SpawnSound, uid);
 
-        _metaData.SetEntityName(uid, Loc.GetString("cluwne-name-prefix", ("target", name)), meta);
+        _nameMod.RefreshNameModifiers(uid);
 
         SetOutfitCommand.SetOutfit(uid, "CluwneGear", EntityManager);
     }
@@ -106,4 +105,12 @@ private void OnEmote(EntityUid uid, CluwneComponent component, ref EmoteEvent ar
             _chat.TrySendInGameICMessage(uid, "spasms", InGameICChatType.Emote, ChatTransmitRange.Normal);
         }
     }
+
+    /// <summary>
+    /// Applies "Cluwnified" prefix
+    /// </summary>
+    private void OnRefreshNameModifiers(Entity<CluwneComponent> entity, ref RefreshNameModifiersEvent args)
+    {
+        args.AddModifier("cluwne-name-prefix");
+    }
 }
diff --git a/Content.Server/Fax/FaxSystem.cs b/Content.Server/Fax/FaxSystem.cs
index cc21b21b55b..229054dce94 100644
--- a/Content.Server/Fax/FaxSystem.cs
+++ b/Content.Server/Fax/FaxSystem.cs
@@ -30,6 +30,7 @@
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Content.Shared.Power;
+using Content.Shared.NameModifier.Components;
 
 namespace Content.Server.Fax;
 
@@ -465,10 +466,11 @@ public void Copy(EntityUid uid, FaxMachineComponent? component, FaxCopyMessage a
             return;
 
         TryComp<LabelComponent>(sendEntity, out var labelComponent);
+        TryComp<NameModifierComponent>(sendEntity, out var nameMod);
 
         // TODO: See comment in 'Send()' about not being able to copy whole entities
         var printout = new FaxPrintout(paper.Content,
-                                       labelComponent?.OriginalName ?? metadata.EntityName,
+                                       nameMod?.BaseName ?? metadata.EntityName,
                                        labelComponent?.CurrentLabel,
                                        metadata.EntityPrototype?.ID ?? DefaultPaperPrototypeId,
                                        paper.StampState,
@@ -511,12 +513,14 @@ public void Send(EntityUid uid, FaxMachineComponent? component, FaxSendMessage a
            !TryComp<PaperComponent>(sendEntity, out var paper))
             return;
 
+        TryComp<NameModifierComponent>(sendEntity, out var nameMod);
+
         TryComp<LabelComponent>(sendEntity, out var labelComponent);
 
         var payload = new NetworkPayload()
         {
             { DeviceNetworkConstants.Command, FaxConstants.FaxPrintCommand },
-            { FaxConstants.FaxPaperNameData, labelComponent?.OriginalName ?? metadata.EntityName },
+            { FaxConstants.FaxPaperNameData, nameMod?.BaseName ?? metadata.EntityName },
             { FaxConstants.FaxPaperLabelData, labelComponent?.CurrentLabel },
             { FaxConstants.FaxPaperContentData, paper.Content },
         };
diff --git a/Content.Server/Glue/GlueSystem.cs b/Content.Server/Glue/GlueSystem.cs
index ff53ef91cac..79249f5bd96 100644
--- a/Content.Server/Glue/GlueSystem.cs
+++ b/Content.Server/Glue/GlueSystem.cs
@@ -6,6 +6,7 @@
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Components;
 using Content.Shared.Item;
+using Content.Shared.NameModifier.EntitySystems;
 using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Popups;
 using Content.Shared.Verbs;
@@ -20,9 +21,9 @@ public sealed class GlueSystem : SharedGlueSystem
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
     [Dependency] private readonly OpenableSystem _openable = default!;
+    [Dependency] private readonly NameModifierSystem _nameMod = default!;
 
     public override void Initialize()
     {
@@ -32,6 +33,7 @@ public override void Initialize()
         SubscribeLocalEvent<GluedComponent, ComponentInit>(OnGluedInit);
         SubscribeLocalEvent<GlueComponent, GetVerbsEvent<UtilityVerb>>(OnUtilityVerb);
         SubscribeLocalEvent<GluedComponent, GotEquippedHandEvent>(OnHandPickUp);
+        SubscribeLocalEvent<GluedComponent, RefreshNameModifiersEvent>(OnRefreshNameModifiers);
     }
 
     // When glue bottle is used on item it will apply the glued and unremoveable components.
@@ -95,27 +97,22 @@ public override void Update(float frameTime)
     {
         base.Update(frameTime);
 
-        var query = EntityQueryEnumerator<GluedComponent, UnremoveableComponent, MetaDataComponent>();
-        while (query.MoveNext(out var uid, out var glue, out var _, out var meta))
+        var query = EntityQueryEnumerator<GluedComponent, UnremoveableComponent>();
+        while (query.MoveNext(out var uid, out var glue, out var _))
         {
             if (_timing.CurTime < glue.Until)
                 continue;
 
-            // Instead of string matching, just reconstruct the expected name and compare
-            if (meta.EntityName == Loc.GetString("glued-name-prefix", ("target", glue.BeforeGluedEntityName)))
-                _metaData.SetEntityName(uid, glue.BeforeGluedEntityName);
-
             RemComp<UnremoveableComponent>(uid);
             RemComp<GluedComponent>(uid);
+
+            _nameMod.RefreshNameModifiers(uid);
         }
     }
 
     private void OnGluedInit(Entity<GluedComponent> entity, ref ComponentInit args)
     {
-        var meta = MetaData(entity);
-        var name = meta.EntityName;
-        entity.Comp.BeforeGluedEntityName = meta.EntityName;
-        _metaData.SetEntityName(entity.Owner, Loc.GetString("glued-name-prefix", ("target", name)));
+        _nameMod.RefreshNameModifiers(entity.Owner);
     }
 
     private void OnHandPickUp(Entity<GluedComponent> entity, ref GotEquippedHandEvent args)
@@ -124,4 +121,9 @@ private void OnHandPickUp(Entity<GluedComponent> entity, ref GotEquippedHandEven
         comp.DeleteOnDrop = false;
         entity.Comp.Until = _timing.CurTime + entity.Comp.Duration;
     }
+
+    private void OnRefreshNameModifiers(Entity<GluedComponent> entity, ref RefreshNameModifiersEvent args)
+    {
+        args.AddModifier("glued-name-prefix");
+    }
 }
diff --git a/Content.Server/Labels/Label/LabelSystem.cs b/Content.Server/Labels/Label/LabelSystem.cs
index 9d235b488b8..1737c2cdcd8 100644
--- a/Content.Server/Labels/Label/LabelSystem.cs
+++ b/Content.Server/Labels/Label/LabelSystem.cs
@@ -5,6 +5,7 @@
 using Content.Shared.Labels;
 using Content.Shared.Labels.Components;
 using Content.Shared.Labels.EntitySystems;
+using Content.Shared.NameModifier.EntitySystems;
 using Content.Shared.Tag;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
@@ -19,8 +20,7 @@ public sealed class LabelSystem : SharedLabelSystem
     {
         [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-        [Dependency] private readonly MetaDataSystem _metaData = default!;
-        [Dependency] private readonly TagSystem _tagSystem = default!;
+        [Dependency] private readonly NameModifierSystem _nameMod = default!;
 
         public const string ContainerName = "paper_label";
         [ValidatePrototypeId<TagPrototype>]
@@ -45,6 +45,8 @@ private void OnLabelCompMapInit(EntityUid uid, LabelComponent component, MapInit
                 component.CurrentLabel = Loc.GetString(component.CurrentLabel);
                 Dirty(uid, component);
             }
+
+            _nameMod.RefreshNameModifiers(uid);
         }
 
         /// <summary>
@@ -58,30 +60,15 @@ public override void Label(EntityUid uid, string? text, MetaDataComponent? metad
         {
             if (!Resolve(uid, ref metadata))
                 return;
+
             if (_tagSystem.HasTag(uid, PreventTag)) // DeltaV - Prevent labels on certain items
                 return;
+
             if (!Resolve(uid, ref label, false))
                 label = EnsureComp<LabelComponent>(uid);
 
-            if (string.IsNullOrEmpty(text))
-            {
-                if (label.OriginalName is null)
-                    return;
-
-                // Remove label
-                _metaData.SetEntityName(uid, label.OriginalName, metadata);
-                label.CurrentLabel = null;
-                label.OriginalName = null;
-
-                Dirty(uid, label);
-
-                return;
-            }
-
-            // Update label
-            label.OriginalName ??= metadata.EntityName;
             label.CurrentLabel = text;
-            _metaData.SetEntityName(uid, $"{label.OriginalName} ({text})", metadata);
+            _nameMod.RefreshNameModifiers(uid);
 
             Dirty(uid, label);
         }
diff --git a/Content.Server/Lube/LubedSystem.cs b/Content.Server/Lube/LubedSystem.cs
index f786c5f91af..c2d15c8a284 100644
--- a/Content.Server/Lube/LubedSystem.cs
+++ b/Content.Server/Lube/LubedSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.IdentityManagement;
 using Content.Shared.Lube;
+using Content.Shared.NameModifier.EntitySystems;
 using Content.Shared.Popups;
 using Content.Shared.Throwing;
 using Robust.Shared.Containers;
@@ -9,11 +10,11 @@ namespace Content.Server.Lube;
 
 public sealed class LubedSystem : EntitySystem
 {
-    [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly ThrowingSystem _throwing = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly NameModifierSystem _nameMod = default!;
 
     public override void Initialize()
     {
@@ -21,14 +22,12 @@ public override void Initialize()
 
         SubscribeLocalEvent<LubedComponent, ComponentInit>(OnInit);
         SubscribeLocalEvent<LubedComponent, ContainerGettingInsertedAttemptEvent>(OnHandPickUp);
+        SubscribeLocalEvent<LubedComponent, RefreshNameModifiersEvent>(OnRefreshNameModifiers);
     }
 
     private void OnInit(EntityUid uid, LubedComponent component, ComponentInit args)
     {
-        var meta = MetaData(uid);
-        var name = meta.EntityName;
-        component.BeforeLubedEntityName = meta.EntityName;
-        _metaData.SetEntityName(uid, Loc.GetString("lubed-name-prefix", ("target", name)));
+        _nameMod.RefreshNameModifiers(uid);
     }
 
     private void OnHandPickUp(EntityUid uid, LubedComponent component, ContainerGettingInsertedAttemptEvent args)
@@ -36,7 +35,7 @@ private void OnHandPickUp(EntityUid uid, LubedComponent component, ContainerGett
         if (component.SlipsLeft <= 0)
         {
             RemComp<LubedComponent>(uid);
-            _metaData.SetEntityName(uid, component.BeforeLubedEntityName);
+            _nameMod.RefreshNameModifiers(uid);
             return;
         }
         component.SlipsLeft--;
@@ -47,4 +46,9 @@ private void OnHandPickUp(EntityUid uid, LubedComponent component, ContainerGett
         _throwing.TryThrow(uid, _random.NextVector2(), strength: component.SlipStrength);
         _popup.PopupEntity(Loc.GetString("lube-slip", ("target", Identity.Entity(uid, EntityManager))), user, user, PopupType.MediumCaution);
     }
+
+    private void OnRefreshNameModifiers(Entity<LubedComponent> entity, ref RefreshNameModifiersEvent args)
+    {
+        args.AddModifier("lubed-name-prefix");
+    }
 }
diff --git a/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs b/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs
index d0fcd113595..054ad1b67d4 100644
--- a/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs
@@ -5,10 +5,12 @@
 using Content.Shared.IdentityManagement;
 using Content.Shared.Mind.Components;
 using Content.Shared.Mobs.Systems;
+using Content.Shared.NameModifier.EntitySystems;
 using Content.Shared.Nutrition.AnimalHusbandry;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Storage;
+using Content.Shared.Whitelist;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
@@ -28,11 +30,12 @@ public sealed class AnimalHusbandrySystem : EntitySystem
     [Dependency] private readonly IAdminLogManager _adminLog = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+    [Dependency] private readonly NameModifierSystem _nameMod = default!;
 
     private readonly HashSet<EntityUid> _failedAttempts = new();
     private readonly HashSet<EntityUid> _birthQueue = new();
@@ -41,8 +44,7 @@ public sealed class AnimalHusbandrySystem : EntitySystem
     public override void Initialize()
     {
         SubscribeLocalEvent<ReproductiveComponent, MindAddedMessage>(OnMindAdded);
-        SubscribeLocalEvent<InfantComponent, ComponentStartup>(OnInfantStartup);
-        SubscribeLocalEvent<InfantComponent, ComponentShutdown>(OnInfantShutdown);
+        SubscribeLocalEvent<InfantComponent, RefreshNameModifiersEvent>(OnRefreshNameModifiers);
     }
 
     // we express EZ-pass terminate the pregnancy if a player takes the role
@@ -52,16 +54,11 @@ private void OnMindAdded(EntityUid uid, ReproductiveComponent component, MindAdd
         component.GestationEndTime = null;
     }
 
-    private void OnInfantStartup(EntityUid uid, InfantComponent component, ComponentStartup args)
+    private void OnRefreshNameModifiers(Entity<InfantComponent> entity, ref RefreshNameModifiersEvent args)
     {
-        var meta = MetaData(uid);
-        component.OriginalName = meta.EntityName;
-        _metaData.SetEntityName(uid, Loc.GetString("infant-name-prefix", ("name", meta.EntityName)), meta);
-    }
-
-    private void OnInfantShutdown(EntityUid uid, InfantComponent component, ComponentShutdown args)
-    {
-        _metaData.SetEntityName(uid, component.OriginalName);
+        // This check may seem redundant, but it makes sure that the prefix is removed before the component is removed
+        if (_timing.CurTime < entity.Comp.InfantEndTime)
+            args.AddModifier("infant-name-prefix");
     }
 
     /// <summary>
@@ -200,6 +197,8 @@ public void Birth(EntityUid uid, ReproductiveComponent? component = null)
             {
                 var infant = AddComp<InfantComponent>(offspring);
                 infant.InfantEndTime = _timing.CurTime + infant.InfantDuration;
+                // Make sure the name prefix is applied
+                _nameMod.RefreshNameModifiers(offspring);
             }
             _adminLog.Add(LogType.Action, $"{ToPrettyString(uid)} gave birth to {ToPrettyString(offspring)}.");
         }
@@ -247,6 +246,8 @@ public override void Update(float frameTime)
             if (_timing.CurTime < infant.InfantEndTime)
                 continue;
             RemCompDeferred(uid, infant);
+            // Make sure the name prefix gets removed
+            _nameMod.RefreshNameModifiers(uid);
         }
     }
 }
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index 9e294c6aa58..99ca5be7343 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -232,9 +232,7 @@ public void ZombifyEntity(EntityUid target, MobStateComponent? mobState = null)
             _faction.AddFaction(target, "Zombie");
 
             //gives it the funny "Zombie ___" name.
-            var meta = MetaData(target);
-            zombiecomp.BeforeZombifiedEntityName = meta.EntityName;
-            _metaData.SetEntityName(target, Loc.GetString("zombie-name-prefix", ("target", meta.EntityName)), meta);
+            _nameMod.RefreshNameModifiers(target);
 
             _identity.QueueIdentityUpdate(target);
 
diff --git a/Content.Server/Zombies/ZombieSystem.cs b/Content.Server/Zombies/ZombieSystem.cs
index 552fd2781c0..371c6f1222a 100644
--- a/Content.Server/Zombies/ZombieSystem.cs
+++ b/Content.Server/Zombies/ZombieSystem.cs
@@ -14,6 +14,7 @@
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
+using Content.Shared.NameModifier.EntitySystems;
 using Content.Shared.Popups;
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.Zombies;
@@ -34,9 +35,9 @@ public sealed partial class ZombieSystem : SharedZombieSystem
         [Dependency] private readonly ActionsSystem _actions = default!;
         [Dependency] private readonly AutoEmoteSystem _autoEmote = default!;
         [Dependency] private readonly EmoteOnDamageSystem _emoteOnDamage = default!;
-        [Dependency] private readonly MetaDataSystem _metaData = default!;
         [Dependency] private readonly MobStateSystem _mobState = default!;
         [Dependency] private readonly SharedPopupSystem _popup = default!;
+        [Dependency] private readonly NameModifierSystem _nameMod = default!;
 
         public const SlotFlags ProtectiveSlots =
             SlotFlags.FEET |
@@ -281,7 +282,7 @@ public bool UnZombify(EntityUid source, EntityUid target, ZombieComponent? zombi
             _humanoidAppearance.SetSkinColor(target, zombiecomp.BeforeZombifiedSkinColor, false);
             _bloodstream.ChangeBloodReagent(target, zombiecomp.BeforeZombifiedBloodReagent);
 
-            _metaData.SetEntityName(target, zombiecomp.BeforeZombifiedEntityName);
+            _nameMod.RefreshNameModifiers(target);
             return true;
         }
 
diff --git a/Content.Shared/Glue/GluedComponent.cs b/Content.Shared/Glue/GluedComponent.cs
index fd7a52fdb13..4b46f0aa5b0 100644
--- a/Content.Shared/Glue/GluedComponent.cs
+++ b/Content.Shared/Glue/GluedComponent.cs
@@ -6,11 +6,6 @@ namespace Content.Shared.Glue;
 [Access(typeof(SharedGlueSystem))]
 public sealed partial class GluedComponent : Component
 {
-    /// <summary>
-    /// Reverts name to before prefix event (essentially removes prefix).
-    /// </summary>
-    [DataField("beforeGluedEntityName"), ViewVariables(VVAccess.ReadOnly)]
-    public string BeforeGluedEntityName = string.Empty;
 
     [DataField("until", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
     public TimeSpan Until;
diff --git a/Content.Shared/Inventory/InventorySystem.Relay.cs b/Content.Shared/Inventory/InventorySystem.Relay.cs
index 6cd05437424..6edd1cf1db8 100644
--- a/Content.Shared/Inventory/InventorySystem.Relay.cs
+++ b/Content.Shared/Inventory/InventorySystem.Relay.cs
@@ -11,6 +11,7 @@
 using Content.Shared.IdentityManagement.Components;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Movement.Systems;
+using Content.Shared.NameModifier.EntitySystems;
 using Content.Shared.Overlays;
 using Content.Shared.Radio;
 using Content.Shared.Slippery;
diff --git a/Content.Shared/Labels/Components/LabelComponent.cs b/Content.Shared/Labels/Components/LabelComponent.cs
index c0dccd34815..d57023c8ab1 100644
--- a/Content.Shared/Labels/Components/LabelComponent.cs
+++ b/Content.Shared/Labels/Components/LabelComponent.cs
@@ -14,11 +14,4 @@ public sealed partial class LabelComponent : Component
     /// </summary>
     [DataField, AutoNetworkedField]
     public string? CurrentLabel { get; set; }
-
-    /// <summary>
-    ///  The original name of the entity
-    ///  Used for reverting the modified entity name when the label is removed
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public string? OriginalName { get; set; }
 }
diff --git a/Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs b/Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
index 1189bb46d04..f1998e524d9 100644
--- a/Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
+++ b/Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Examine;
 using Content.Shared.Labels.Components;
+using Content.Shared.NameModifier.EntitySystems;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Labels.EntitySystems;
@@ -11,6 +12,7 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<LabelComponent, ExaminedEvent>(OnExamine);
+        SubscribeLocalEvent<LabelComponent, RefreshNameModifiersEvent>(OnRefreshNameModifiers);
     }
 
     public virtual void Label(EntityUid uid, string? text, MetaDataComponent? metadata = null, LabelComponent? label = null){}
@@ -27,4 +29,10 @@ private void OnExamine(EntityUid uid, LabelComponent? label, ExaminedEvent args)
         message.AddText(Loc.GetString("hand-labeler-has-label", ("label", label.CurrentLabel)));
         args.PushMessage(message);
     }
+
+    private void OnRefreshNameModifiers(Entity<LabelComponent> entity, ref RefreshNameModifiersEvent args)
+    {
+        if (!string.IsNullOrEmpty(entity.Comp.CurrentLabel))
+            args.AddModifier("comp-label-format", extraArgs: ("label", entity.Comp.CurrentLabel));
+    }
 }
diff --git a/Content.Shared/Lube/LubedComponent.cs b/Content.Shared/Lube/LubedComponent.cs
index fe1946ddb15..9d032a077ec 100644
--- a/Content.Shared/Lube/LubedComponent.cs
+++ b/Content.Shared/Lube/LubedComponent.cs
@@ -3,12 +3,6 @@ namespace Content.Shared.Lube;
 [RegisterComponent]
 public sealed partial class LubedComponent : Component
 {
-    /// <summary>
-    /// Reverts name to before prefix event (essentially removes prefix).
-    /// </summary>
-    [DataField("beforeLubedEntityName")]
-    public string BeforeLubedEntityName = string.Empty;
-
     [DataField("slipsLeft"), ViewVariables(VVAccess.ReadWrite)]
     public int SlipsLeft;
 
diff --git a/Content.Shared/NameModifier/Components/ModifyWearerNameComponent.cs b/Content.Shared/NameModifier/Components/ModifyWearerNameComponent.cs
new file mode 100644
index 00000000000..781ed3daae1
--- /dev/null
+++ b/Content.Shared/NameModifier/Components/ModifyWearerNameComponent.cs
@@ -0,0 +1,25 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.NameModifier.Components;
+
+/// <summary>
+/// Adds a modifier to the wearer's name when this item is equipped,
+/// and removes it when it is unequipped.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState]
+public sealed partial class ModifyWearerNameComponent : Component
+{
+    /// <summary>
+    /// The localization ID of the text to be used as the modifier.
+    /// The base name will be passed in as <c>$baseName</c>
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId LocId = string.Empty;
+
+    /// <summary>
+    /// Priority of the modifier. See <see cref="EntitySystems.RefreshNameModifiersEvent"/> for more information.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int Priority;
+}
diff --git a/Content.Shared/NameModifier/Components/NameModifierComponent.cs b/Content.Shared/NameModifier/Components/NameModifierComponent.cs
new file mode 100644
index 00000000000..3a9dd9712b6
--- /dev/null
+++ b/Content.Shared/NameModifier/Components/NameModifierComponent.cs
@@ -0,0 +1,20 @@
+using Content.Shared.NameModifier.EntitySystems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.NameModifier.Components;
+
+/// <summary>
+/// Used to manage modifiers on an entity's name and handle renaming in a way
+/// that survives being renamed by multiple systems.
+/// </summary>
+[RegisterComponent]
+[NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(NameModifierSystem))]
+public sealed partial class NameModifierComponent : Component
+{
+    /// <summary>
+    /// The entity's name without any modifiers applied.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string BaseName = string.Empty;
+}
diff --git a/Content.Shared/NameModifier/EntitySystems/ModifyWearerNameSystem.cs b/Content.Shared/NameModifier/EntitySystems/ModifyWearerNameSystem.cs
new file mode 100644
index 00000000000..e728e6cdb51
--- /dev/null
+++ b/Content.Shared/NameModifier/EntitySystems/ModifyWearerNameSystem.cs
@@ -0,0 +1,34 @@
+using Content.Shared.Clothing;
+using Content.Shared.Inventory;
+using Content.Shared.NameModifier.Components;
+
+namespace Content.Shared.NameModifier.EntitySystems;
+
+public sealed partial class ModifyWearerNameSystem : EntitySystem
+{
+    [Dependency] private readonly NameModifierSystem _nameMod = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ModifyWearerNameComponent, InventoryRelayedEvent<RefreshNameModifiersEvent>>(OnRefreshNameModifiers);
+        SubscribeLocalEvent<ModifyWearerNameComponent, ClothingGotEquippedEvent>(OnGotEquipped);
+        SubscribeLocalEvent<ModifyWearerNameComponent, ClothingGotUnequippedEvent>(OnGotUnequipped);
+    }
+
+    private void OnGotEquipped(Entity<ModifyWearerNameComponent> entity, ref ClothingGotEquippedEvent args)
+    {
+        _nameMod.RefreshNameModifiers(args.Wearer);
+    }
+
+    private void OnGotUnequipped(Entity<ModifyWearerNameComponent> entity, ref ClothingGotUnequippedEvent args)
+    {
+        _nameMod.RefreshNameModifiers(args.Wearer);
+    }
+
+    private void OnRefreshNameModifiers(Entity<ModifyWearerNameComponent> entity, ref InventoryRelayedEvent<RefreshNameModifiersEvent> args)
+    {
+        args.Args.AddModifier(entity.Comp.LocId, entity.Comp.Priority);
+    }
+}
diff --git a/Content.Shared/NameModifier/EntitySystems/NameModifierSystem.cs b/Content.Shared/NameModifier/EntitySystems/NameModifierSystem.cs
new file mode 100644
index 00000000000..4dffb51805c
--- /dev/null
+++ b/Content.Shared/NameModifier/EntitySystems/NameModifierSystem.cs
@@ -0,0 +1,143 @@
+using System.Linq;
+using Content.Shared.Inventory;
+using Content.Shared.NameModifier.Components;
+
+namespace Content.Shared.NameModifier.EntitySystems;
+
+/// <inheritdoc cref="NameModifierComponent"/>
+public sealed partial class NameModifierSystem : EntitySystem
+{
+    [Dependency] private readonly MetaDataSystem _metaData = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<NameModifierComponent, EntityRenamedEvent>(OnEntityRenamed);
+    }
+
+    private void OnEntityRenamed(Entity<NameModifierComponent> entity, ref EntityRenamedEvent args)
+    {
+        SetBaseName((entity, entity.Comp), args.NewName);
+        RefreshNameModifiers((entity, entity.Comp));
+    }
+
+    private void SetBaseName(Entity<NameModifierComponent> entity, string name)
+    {
+        if (name == entity.Comp.BaseName)
+            return;
+
+        // Set the base name to the new name
+        entity.Comp.BaseName = name;
+        Dirty(entity);
+    }
+
+    /// <summary>
+    /// Raises a <see cref="RefreshNameModifiersEvent"/> to gather modifiers and
+    /// updates the entity's name to its base name with modifiers applied.
+    /// This will add a <see cref="NameModifierComponent"/> if any modifiers are added.
+    /// </summary>
+    /// <remarks>
+    /// Call this to update the entity's name when adding or removing a modifier.
+    /// </remarks>
+    public void RefreshNameModifiers(Entity<NameModifierComponent?> entity)
+    {
+        var meta = MetaData(entity);
+        var baseName = meta.EntityName;
+        if (Resolve(entity, ref entity.Comp, logMissing: false))
+            baseName = entity.Comp.BaseName;
+
+        // Raise an event to get any modifiers
+        // If the entity already has the component, use its BaseName, otherwise use the entity's name from metadata
+        var modifierEvent = new RefreshNameModifiersEvent(baseName);
+        RaiseLocalEvent(entity, ref modifierEvent);
+
+        // Nothing added a modifier, so we can just use the base name
+        if (modifierEvent.ModifierCount == 0)
+        {
+            // If the entity doesn't have the component, we're done
+            if (entity.Comp == null)
+                return;
+
+            // Restore the base name
+            _metaData.SetEntityName(entity, entity.Comp.BaseName, meta, raiseEvents: false);
+            // The component isn't doing anything anymore, so remove it
+            RemComp<NameModifierComponent>(entity);
+            return;
+        }
+        // We have at least one modifier, so we need to apply it to the entity.
+
+        // Get the final name with modifiers applied
+        var modifiedName = modifierEvent.GetModifiedName();
+
+        // Add the component if needed, and initialize it with the base name
+        if (!EnsureComp<NameModifierComponent>(entity, out var comp))
+            SetBaseName((entity, comp), meta.EntityName);
+
+        // Set the entity's name with modifiers applied
+        _metaData.SetEntityName(entity, modifiedName, meta, raiseEvents: false);
+    }
+}
+
+/// <summary>
+/// Raised on an entity when <see cref="NameModifierSystem.RefreshNameModifiers"/> is called.
+/// Subscribe to this event and use its methods to add modifiers to the entity's name.
+/// </summary>
+[ByRefEvent]
+public sealed class RefreshNameModifiersEvent : IInventoryRelayEvent
+{
+    /// <summary>
+    /// The entity's name without any modifiers applied.
+    /// If you want to base a modifier on the entity's name, use
+    /// this so you don't include other modifiers.
+    /// </summary>
+    public readonly string BaseName;
+
+    private readonly List<(LocId LocId, int Priority, (string, object)[] ExtraArgs)> _modifiers = [];
+
+    /// <inheritdoc/>
+    public SlotFlags TargetSlots => ~SlotFlags.POCKET;
+
+    /// <summary>
+    /// How many modifiers have been added to this event.
+    /// </summary>
+    public int ModifierCount => _modifiers.Count;
+
+    public RefreshNameModifiersEvent(string baseName)
+    {
+        BaseName = baseName;
+    }
+
+    /// <summary>
+    /// Adds a modifier to the entity's name.
+    /// The original name will be passed to Fluent as <c>$baseName</c> along with any <paramref name="extraArgs"/>.
+    /// Modifiers with a higher <paramref name="priority"/> will be applied later.
+    /// </summary>
+    public void AddModifier(LocId locId, int priority = 0, params (string, object)[] extraArgs)
+    {
+        _modifiers.Add((locId, priority, extraArgs));
+    }
+
+    /// <summary>
+    /// Returns the final name with all modifiers applied.
+    /// </summary>
+    public string GetModifiedName()
+    {
+        // Start out with the entity's name name
+        var name = BaseName;
+
+        // Iterate through all the modifiers in priority order
+        foreach (var modifier in _modifiers.OrderBy(n => n.Priority))
+        {
+            // Grab any extra args needed by the Loc string
+            var args = modifier.ExtraArgs;
+            // Add the current version of the entity name as an arg
+            Array.Resize(ref args, args.Length + 1);
+            args[^1] = ("baseName", name);
+            // Resolve the Loc string and use the result as the base in the next iteration.
+            name = Loc.GetString(modifier.LocId, args);
+        }
+
+        return name;
+    }
+}
diff --git a/Content.Shared/Nutrition/AnimalHusbandry/InfantComponent.cs b/Content.Shared/Nutrition/AnimalHusbandry/InfantComponent.cs
index 2708c823d2c..06c533e6460 100644
--- a/Content.Shared/Nutrition/AnimalHusbandry/InfantComponent.cs
+++ b/Content.Shared/Nutrition/AnimalHusbandry/InfantComponent.cs
@@ -35,10 +35,4 @@ public sealed partial class InfantComponent : Component
     [DataField("infantEndTime", customTypeSerializer: typeof(TimeOffsetSerializer))]
     [AutoPausedField]
     public TimeSpan InfantEndTime;
-
-    /// <summary>
-    /// The entity's name before the "baby" prefix is added.
-    /// </summary>
-    [DataField("originalName")]
-    public string OriginalName = string.Empty;
 }
diff --git a/Content.Shared/Zombies/SharedZombieSystem.cs b/Content.Shared/Zombies/SharedZombieSystem.cs
index 6d9103639f6..0388450a8c4 100644
--- a/Content.Shared/Zombies/SharedZombieSystem.cs
+++ b/Content.Shared/Zombies/SharedZombieSystem.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Movement.Systems;
+using Content.Shared.NameModifier.EntitySystems;
 
 namespace Content.Shared.Zombies;
 
@@ -10,6 +11,7 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<ZombieComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshSpeed);
+        SubscribeLocalEvent<ZombieComponent, RefreshNameModifiersEvent>(OnRefreshNameModifiers);
     }
 
     private void OnRefreshSpeed(EntityUid uid, ZombieComponent component, RefreshMovementSpeedModifiersEvent args)
@@ -17,4 +19,9 @@ private void OnRefreshSpeed(EntityUid uid, ZombieComponent component, RefreshMov
         var mod = component.ZombieMovementSpeedDebuff;
         args.ModifySpeed(mod, mod);
     }
+
+    private void OnRefreshNameModifiers(Entity<ZombieComponent> entity, ref RefreshNameModifiersEvent args)
+    {
+        args.AddModifier("zombie-name-prefix");
+    }
 }
diff --git a/Content.Shared/Zombies/ZombieComponent.cs b/Content.Shared/Zombies/ZombieComponent.cs
index 0020ff17da8..663f6cd444f 100644
--- a/Content.Shared/Zombies/ZombieComponent.cs
+++ b/Content.Shared/Zombies/ZombieComponent.cs
@@ -62,12 +62,6 @@ public sealed partial class ZombieComponent : Component, IAntagStatusIconCompone
     [DataField("zombieRoleId", customTypeSerializer: typeof(PrototypeIdSerializer<AntagPrototype>))]
     public string ZombieRoleId = "Zombie";
 
-    /// <summary>
-    /// The EntityName of the humanoid to restore in case of cloning
-    /// </summary>
-    [DataField("beforeZombifiedEntityName"), ViewVariables(VVAccess.ReadOnly)]
-    public string BeforeZombifiedEntityName = string.Empty;
-
     /// <summary>
     /// The CustomBaseLayers of the humanoid to restore in case of cloning
     /// </summary>
diff --git a/Resources/Locale/en-US/chemistry/components/transformable-container-component.ftl b/Resources/Locale/en-US/chemistry/components/transformable-container-component.ftl
index 21f096273d1..ce43bd714ad 100644
--- a/Resources/Locale/en-US/chemistry/components/transformable-container-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/transformable-container-component.ftl
@@ -1 +1 @@
-transformable-container-component-glass = {$name} glass
+transformable-container-component-glass = {$reagent} glass
diff --git a/Resources/Locale/en-US/cluwne/cluwne.ftl b/Resources/Locale/en-US/cluwne/cluwne.ftl
index 206df8657dd..0ffd3f32dfb 100644
--- a/Resources/Locale/en-US/cluwne/cluwne.ftl
+++ b/Resources/Locale/en-US/cluwne/cluwne.ftl
@@ -1,2 +1,2 @@
 cluwne-transform = {CAPITALIZE(THE($target))} turned into a cluwne!
-cluwne-name-prefix = Cluwnified {$target}
+cluwne-name-prefix = cluwnified {$baseName}
diff --git a/Resources/Locale/en-US/glue/glue.ftl b/Resources/Locale/en-US/glue/glue.ftl
index 1a711d51c21..158ebc9ed85 100644
--- a/Resources/Locale/en-US/glue/glue.ftl
+++ b/Resources/Locale/en-US/glue/glue.ftl
@@ -1,5 +1,5 @@
 glue-success = {THE($target)} has been covered in glue!
-glued-name-prefix = Glued {$target}
+glued-name-prefix = glued {$baseName}
 glue-failure = Can't cover {THE($target)} in glue!
 glue-verb-text = Apply Glue
 glue-verb-message = Glue an object
diff --git a/Resources/Locale/en-US/label/label-component.ftl b/Resources/Locale/en-US/label/label-component.ftl
new file mode 100644
index 00000000000..ff3a250c7b8
--- /dev/null
+++ b/Resources/Locale/en-US/label/label-component.ftl
@@ -0,0 +1 @@
+comp-label-format = {$baseName} ({$label})
diff --git a/Resources/Locale/en-US/lube/lube.ftl b/Resources/Locale/en-US/lube/lube.ftl
index 92dd2802ec7..1b5b66e069f 100644
--- a/Resources/Locale/en-US/lube/lube.ftl
+++ b/Resources/Locale/en-US/lube/lube.ftl
@@ -1,5 +1,5 @@
 lube-success = {THE($target)} has been covered in lube!
-lubed-name-prefix = Lubed {$target}
+lubed-name-prefix = lubed {$baseName}
 lube-failure = Can't cover {THE($target)} in lube!
 lube-slip = {THE($target)} slips out of your hands!
 lube-verb-text = Apply Lube
diff --git a/Resources/Locale/en-US/nutrition/components/animal-husbandry.ftl b/Resources/Locale/en-US/nutrition/components/animal-husbandry.ftl
index 6ca108b653a..cf7bf2d03ac 100644
--- a/Resources/Locale/en-US/nutrition/components/animal-husbandry.ftl
+++ b/Resources/Locale/en-US/nutrition/components/animal-husbandry.ftl
@@ -1,3 +1,3 @@
-infant-name-prefix = baby {$name}
+infant-name-prefix = baby {$baseName}
 reproductive-birth-popup = {CAPITALIZE(THE($parent))} gave birth!
 reproductive-laid-egg-popup = {CAPITALIZE(THE($parent))} lays an egg!
diff --git a/Resources/Locale/en-US/zombies/zombie.ftl b/Resources/Locale/en-US/zombies/zombie.ftl
index a391a95b0da..d45943e825d 100644
--- a/Resources/Locale/en-US/zombies/zombie.ftl
+++ b/Resources/Locale/en-US/zombies/zombie.ftl
@@ -2,7 +2,7 @@ zombie-transform = {CAPITALIZE(THE($target))} turned into a zombie!
 zombie-infection-greeting = You have become a zombie. Your goal is to seek out the living and to try to infect them.  Work together with the other zombies to overtake the station.
 
 zombie-generic = zombie
-zombie-name-prefix = Zombified {$target}
+zombie-name-prefix = zombified {$baseName}
 zombie-role-desc =  A malevolent creature of the dead.
 zombie-role-rules = You are an antagonist. Search out the living and bite them in order to infect them and turn them into zombies. Work together with the other zombies to overtake the station.
 
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
index d6855d630c6..a09bd42e435 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
@@ -79,7 +79,6 @@
         - !type:DoActsBehavior
           acts: [ "Destruction" ]
     - type: Label
-      originalName: jug
     - type: Tag
       tags:
       - ChemDispensable

From a5d8cc95ea4e2c508fbb816699ffeaa8cd494dfb Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 07:10:18 -0400
Subject: [PATCH 065/366] Updates

---
 Content.Shared/Construction/MachinePartSystem.cs | 4 ++--
 Content.Shared/Execution/ExecutionSystem.cs      | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Content.Shared/Construction/MachinePartSystem.cs b/Content.Shared/Construction/MachinePartSystem.cs
index 25b61cf434e..603542ee26c 100644
--- a/Content.Shared/Construction/MachinePartSystem.cs
+++ b/Content.Shared/Construction/MachinePartSystem.cs
@@ -90,9 +90,9 @@ public Dictionary<string, int> GetMachineBoardMaterialCost(Entity<MachineBoardCo
 
                 var partRecipe = recipes[0];
                 if (recipes.Count > 1)
-                    partRecipe = recipes.MinBy(p => p.RequiredMaterials.Values.Sum());
+                    partRecipe = recipes.MinBy(p => p.Materials.Values.Sum());
 
-                foreach (var (mat, matAmount) in partRecipe!.RequiredMaterials)
+                foreach (var (mat, matAmount) in partRecipe!.Materials)
                 {
                     materials.TryAdd(mat, 0);
                     materials[mat] += matAmount * amount * coefficient;
diff --git a/Content.Shared/Execution/ExecutionSystem.cs b/Content.Shared/Execution/ExecutionSystem.cs
index de6db205be4..278001a5d21 100644
--- a/Content.Shared/Execution/ExecutionSystem.cs
+++ b/Content.Shared/Execution/ExecutionSystem.cs
@@ -95,8 +95,7 @@ private void TryStartExecutionDoAfter(EntityUid weapon, EntityUid victim, Entity
         var doAfter =
             new DoAfterArgs(EntityManager, attacker, comp.DoAfterDuration, new ExecutionDoAfterEvent(), weapon, target: victim, used: weapon)
             {
-                BreakOnTargetMove = true,
-                BreakOnUserMove = true,
+                BreakOnMove = true,
                 BreakOnDamage = true,
                 NeedHand = true
             };

From 90e2a0e4be198d8a6aae793dd38b4e7679a0e259 Mon Sep 17 00:00:00 2001
From: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Date: Thu, 26 Sep 2024 09:55:59 -0700
Subject: [PATCH 066/366] Voice Mask refactor (#30798)

* First commit

* Added base.Initialize()

* Voice wire fix (Electricty name)

* Various minor cleanups

* Localized default voice mask name

* Added VoiceOverride stuff

* Removed unused stuff

* Typo

* Better localized stuff

* Typo / spelling stuff / comments

* Blessed
---
 .../VoiceMask/VoiceMaskBoundUserInterface.cs  |  1 +
 .../VoiceMaskNameChangeWindow.xaml.cs         |  4 +-
 Content.Server/Chat/Systems/ChatSystem.cs     |  1 -
 .../Radio/EntitySystems/RadioDeviceSystem.cs  | 13 +--
 .../Radio/EntitySystems/RadioSystem.cs        | 90 +++++++------------
 .../Components/VoiceOverrideComponent.cs      |  2 +-
 .../EntitySystems/VoiceOverrideSystem.cs      |  6 +-
 .../SurveillanceCameraSpeakerSystem.cs        |  6 +-
 Content.Server/VoiceMask/VoiceMaskSystem.cs   | 18 +---
 Content.Shared/Chat/SharedChatEvents.cs       |  8 +-
 .../Inventory/InventorySystem.Relay.cs        |  1 +
 .../Entities/Clothing/Masks/specific.yml      | 47 ++++++++--
 12 files changed, 93 insertions(+), 104 deletions(-)

diff --git a/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs b/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
index 891804674d3..e76ca1cf8f7 100644
--- a/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
+++ b/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
@@ -22,6 +22,7 @@ protected override void Open()
 
         _window = this.CreateWindow<VoiceMaskNameChangeWindow>();
         _window.ReloadVerbs(_protomanager);
+        _window.AddVerbs();
 
         _window.OnNameChange += OnNameSelected;
         _window.OnVerbChange += verb => SendMessage(new VoiceMaskChangeVerbMessage(verb));
diff --git a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
index 0dc41f807ab..7ca4dd4b957 100644
--- a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
+++ b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
@@ -31,8 +31,6 @@ public VoiceMaskNameChangeWindow()
             OnVerbChange?.Invoke((string?) args.Button.GetItemMetadata(args.Id));
             SpeechVerbSelector.SelectId(args.Id);
         };
-
-        AddVerbs();
     }
 
     public void ReloadVerbs(IPrototypeManager proto)
@@ -44,7 +42,7 @@ public void ReloadVerbs(IPrototypeManager proto)
         _verbs.Sort((a, b) => a.Item1.CompareTo(b.Item1));
     }
 
-    private void AddVerbs()
+    public void AddVerbs()
     {
         SpeechVerbSelector.Clear();
 
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index f3de9a4f95a..be995eb43fc 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -24,7 +24,6 @@
 using Content.Shared.Players;
 using Content.Shared.Players.RateLimiting;
 using Content.Shared.Radio;
-using Content.Shared.Speech;
 using Content.Shared.Whitelist;
 using Robust.Server.Player;
 using Robust.Shared.Audio;
diff --git a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
index 0f079fdb24b..c8867744a40 100644
--- a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
@@ -1,20 +1,18 @@
 using System.Linq;
 using Content.Server.Chat.Systems;
 using Content.Server.Interaction;
-using Content.Server.Language;
 using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Radio.Components;
 using Content.Server.Speech;
 using Content.Server.Speech.Components;
-using Content.Shared.Chat;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Power;
 using Content.Shared.Radio;
+using Content.Shared.Chat;
 using Content.Shared.Radio.Components;
-using Robust.Server.GameObjects;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Radio.EntitySystems;
@@ -30,8 +28,6 @@ public sealed class RadioDeviceSystem : EntitySystem
     [Dependency] private readonly RadioSystem _radio = default!;
     [Dependency] private readonly InteractionSystem _interaction = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly UserInterfaceSystem _ui = default!;
-    [Dependency] private readonly LanguageSystem _language = default!;
 
     // Used to prevent a shitter from using a bunch of radios to spam chat.
     private HashSet<(string, EntityUid)> _recentlySent = new();
@@ -213,16 +209,15 @@ private void OnReceiveRadio(EntityUid uid, RadioSpeakerComponent component, ref
         if (uid == args.RadioSource)
             return;
 
-        var nameEv = new TransformSpeakerSpeechEvent(args.MessageSource, Name(args.MessageSource));
+        var nameEv = new TransformSpeakerNameEvent(args.MessageSource, Name(args.MessageSource));
         RaiseLocalEvent(args.MessageSource, nameEv);
 
         var name = Loc.GetString("speech-name-relay",
             ("speaker", Name(uid)),
-            ("originalName", nameEv.VoiceName ?? Name(args.MessageSource)));
+            ("originalName", nameEv.VoiceName));
 
         // log to chat so people can identity the speaker/source, but avoid clogging ghost chat if there are many radios
-        var message = args.OriginalChatMsg.Message; // The chat system will handle the rest and re-obfuscate if needed.
-        _chat.TrySendInGameICMessage(uid, message, InGameICChatType.Whisper, ChatTransmitRange.GhostRangeLimit, nameOverride: name, checkRadioPrefix: false, languageOverride: args.Language);
+        _chat.TrySendInGameICMessage(uid, args.Message, InGameICChatType.Whisper, ChatTransmitRange.GhostRangeLimit, nameOverride: name, checkRadioPrefix: false);
     }
 
     private void OnIntercomEncryptionChannelsChanged(Entity<IntercomComponent> ent, ref EncryptionChannelsChangedEvent args)
diff --git a/Content.Server/Radio/EntitySystems/RadioSystem.cs b/Content.Server/Radio/EntitySystems/RadioSystem.cs
index aff4d82d874..bdc368fa932 100644
--- a/Content.Server/Radio/EntitySystems/RadioSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioSystem.cs
@@ -1,11 +1,9 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Chat.Systems;
-using Content.Server.Language;
 using Content.Server.Power.Components;
 using Content.Server.Radio.Components;
 using Content.Shared.Chat;
 using Content.Shared.Database;
-using Content.Shared.Language;
 using Content.Shared.Radio;
 using Content.Shared.Radio.Components;
 using Content.Shared.Speech;
@@ -30,7 +28,6 @@ public sealed class RadioSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ChatSystem _chat = default!;
-    [Dependency] private readonly LanguageSystem _language = default!;
 
     // set used to prevent radio feedback loops.
     private readonly HashSet<string> _messages = new();
@@ -50,7 +47,7 @@ private void OnIntrinsicSpeak(EntityUid uid, IntrinsicRadioTransmitterComponent
     {
         if (args.Channel != null && component.Channels.Contains(args.Channel.ID))
         {
-            SendRadioMessage(uid, args.Message, args.Channel, uid, args.Language);
+            SendRadioMessage(uid, args.Message, args.Channel, uid);
             args.Channel = null; // prevent duplicate messages from other listeners.
         }
     }
@@ -58,23 +55,15 @@ private void OnIntrinsicSpeak(EntityUid uid, IntrinsicRadioTransmitterComponent
     private void OnIntrinsicReceive(EntityUid uid, IntrinsicRadioReceiverComponent component, ref RadioReceiveEvent args)
     {
         if (TryComp(uid, out ActorComponent? actor))
-        {
-            // Einstein-Engines - languages mechanic
-            var listener = component.Owner;
-            var msg = args.OriginalChatMsg;
-            if (listener != null && !_language.CanUnderstand(listener, args.Language.ID))
-                msg = args.LanguageObfuscatedChatMsg;
-
-            _netMan.ServerSendMessage(new MsgChatMessage { Message = msg}, actor.PlayerSession.Channel);
-        }
+            _netMan.ServerSendMessage(args.ChatMsg, actor.PlayerSession.Channel);
     }
 
     /// <summary>
     /// Send radio message to all active radio listeners
     /// </summary>
-    public void SendRadioMessage(EntityUid messageSource, string message, ProtoId<RadioChannelPrototype> channel, EntityUid radioSource, LanguagePrototype? language = null, bool escapeMarkup = true)
+    public void SendRadioMessage(EntityUid messageSource, string message, ProtoId<RadioChannelPrototype> channel, EntityUid radioSource, bool escapeMarkup = true)
     {
-        SendRadioMessage(messageSource, message, _prototype.Index(channel), radioSource, escapeMarkup: escapeMarkup, language: language);
+        SendRadioMessage(messageSource, message, _prototype.Index(channel), radioSource, escapeMarkup: escapeMarkup);
     }
 
     /// <summary>
@@ -82,38 +71,46 @@ public void SendRadioMessage(EntityUid messageSource, string message, ProtoId<Ra
     /// </summary>
     /// <param name="messageSource">Entity that spoke the message</param>
     /// <param name="radioSource">Entity that picked up the message and will send it, e.g. headset</param>
-    public void SendRadioMessage(EntityUid messageSource, string message, RadioChannelPrototype channel, EntityUid radioSource, LanguagePrototype? language = null, bool escapeMarkup = true)
+    public void SendRadioMessage(EntityUid messageSource, string message, RadioChannelPrototype channel, EntityUid radioSource, bool escapeMarkup = true)
     {
-        if (language == null)
-            language = _language.GetLanguage(messageSource);
-
-        if (!language.SpeechOverride.AllowRadio)
-            return;
-
         // TODO if radios ever garble / modify messages, feedback-prevention needs to be handled better than this.
         if (!_messages.Add(message))
             return;
 
-        var evt = new TransformSpeakerSpeechEvent(messageSource, Name(messageSource));
+        var evt = new TransformSpeakerNameEvent(messageSource, MetaData(messageSource).EntityName);
         RaiseLocalEvent(messageSource, evt);
-        var name = evt.VoiceName ?? Name(messageSource);
 
+        var name = evt.VoiceName;
         name = FormattedMessage.EscapeText(name);
 
-        // most radios are relayed to chat, so lets parse the chat message beforehand
+        SpeechVerbPrototype speech;
+        if (evt.SpeechVerb != null && _prototype.TryIndex(evt.SpeechVerb, out var evntProto))
+            speech = evntProto;
+        else
+            speech = _chat.GetSpeechVerb(messageSource, message);
+
         var content = escapeMarkup
             ? FormattedMessage.EscapeText(message)
             : message;
 
-        var wrappedMessage = WrapRadioMessage(messageSource, channel, name, content, language);
-        var msg = new ChatMessage(ChatChannel.Radio, content, wrappedMessage, NetEntity.Invalid, null);
-
-        // ... you guess it
-        var obfuscated = _language.ObfuscateSpeech(content, language);
-        var obfuscatedWrapped = WrapRadioMessage(messageSource, channel, name, obfuscated, language);
-        var notUdsMsg = new ChatMessage(ChatChannel.Radio, obfuscated, obfuscatedWrapped, NetEntity.Invalid, null);
+        var wrappedMessage = Loc.GetString(speech.Bold ? "chat-radio-message-wrap-bold" : "chat-radio-message-wrap",
+            ("color", channel.Color),
+            ("fontType", speech.FontId),
+            ("fontSize", speech.FontSize),
+            ("verb", Loc.GetString(_random.Pick(speech.SpeechVerbStrings))),
+            ("channel", $"\\[{channel.LocalizedName}\\]"),
+            ("name", name),
+            ("message", content));
 
-        var ev = new RadioReceiveEvent(messageSource, channel, msg, notUdsMsg, language, radioSource);
+        // most radios are relayed to chat, so lets parse the chat message beforehand
+        var chat = new ChatMessage(
+            ChatChannel.Radio,
+            message,
+            wrappedMessage,
+            NetEntity.Invalid,
+            null);
+        var chatMsg = new MsgChatMessage { Message = chat };
+        var ev = new RadioReceiveEvent(message, messageSource, channel, radioSource, chatMsg);
 
         var sendAttemptEv = new RadioSendAttemptEvent(channel, radioSource);
         RaiseLocalEvent(ref sendAttemptEv);
@@ -158,35 +155,10 @@ public void SendRadioMessage(EntityUid messageSource, string message, RadioChann
         else
             _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Radio message from {ToPrettyString(messageSource):user} on {channel.LocalizedName}: {message}");
 
-        _replay.RecordServerMessage(msg);
+        _replay.RecordServerMessage(chat);
         _messages.Remove(message);
     }
 
-    private string WrapRadioMessage(EntityUid source, RadioChannelPrototype channel, string name, string message, LanguagePrototype language)
-    {
-        // TODO: code duplication with ChatSystem.WrapMessage
-        var speech = _chat.GetSpeechVerb(source, message);
-        var languageColor = channel.Color;
-        if (language.SpeechOverride.Color is { } colorOverride)
-            languageColor = Color.InterpolateBetween(languageColor, colorOverride, colorOverride.A);
-        var languageDisplay = language.IsVisibleLanguage
-            ? Loc.GetString("chat-manager-language-prefix", ("language", language.ChatName))
-            : "";
-        var messageColor = language.IsVisibleLanguage ? languageColor : channel.Color;
-
-        return Loc.GetString(speech.Bold ? "chat-radio-message-wrap-bold" : "chat-radio-message-wrap",
-            ("color", channel.Color),
-            ("languageColor", languageColor),
-            ("messageColor", messageColor),
-            ("fontType", language.SpeechOverride.FontId ?? speech.FontId),
-            ("fontSize", language.SpeechOverride.FontSize ?? speech.FontSize),
-            ("verb", Loc.GetString(_random.Pick(speech.SpeechVerbStrings))),
-            ("channel", $"\\[{channel.LocalizedName}\\]"),
-            ("name", name),
-            ("message", message),
-            ("language", languageDisplay));
-    }
-
     /// <inheritdoc cref="TelecomServerComponent"/>
     private bool HasActiveServer(MapId mapId, string channelId)
     {
diff --git a/Content.Server/Speech/Components/VoiceOverrideComponent.cs b/Content.Server/Speech/Components/VoiceOverrideComponent.cs
index 70deba5ba55..349babc948c 100644
--- a/Content.Server/Speech/Components/VoiceOverrideComponent.cs
+++ b/Content.Server/Speech/Components/VoiceOverrideComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Speech;
+using Content.Shared.Speech;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Speech.Components;
diff --git a/Content.Server/Speech/EntitySystems/VoiceOverrideSystem.cs b/Content.Server/Speech/EntitySystems/VoiceOverrideSystem.cs
index 97510966f55..daaad099d65 100644
--- a/Content.Server/Speech/EntitySystems/VoiceOverrideSystem.cs
+++ b/Content.Server/Speech/EntitySystems/VoiceOverrideSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chat;
+using Content.Shared.Chat;
 using Content.Server.Speech.Components;
 
 namespace Content.Server.Speech.EntitySystems;
@@ -8,10 +8,10 @@ public sealed partial class VoiceOverrideSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<VoiceOverrideComponent, TransformSpeakerSpeechEvent>(OnTransformSpeakerName);
+        SubscribeLocalEvent<VoiceOverrideComponent, TransformSpeakerNameEvent>(OnTransformSpeakerName);
     }
 
-    private void OnTransformSpeakerName(Entity<VoiceOverrideComponent> entity, ref TransformSpeakerSpeechEvent args)
+    private void OnTransformSpeakerName(Entity<VoiceOverrideComponent> entity, ref TransformSpeakerNameEvent args)
     {
         if (!entity.Comp.Enabled)
             return;
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSpeakerSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSpeakerSystem.cs
index 22af959fbd2..581ac197197 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSpeakerSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSpeakerSystem.cs
@@ -1,7 +1,7 @@
 using Content.Server.Chat.Systems;
 using Content.Server.Speech;
-using Content.Shared.Chat;
 using Content.Shared.Speech;
+using Content.Shared.Chat;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Timing;
 
@@ -45,11 +45,11 @@ private void OnSpeechSent(EntityUid uid, SurveillanceCameraSpeakerComponent comp
             component.LastSoundPlayed = time;
         }
 
-        var nameEv = new TransformSpeakerSpeechEvent(args.Speaker, Name(args.Speaker));
+        var nameEv = new TransformSpeakerNameEvent(args.Speaker, Name(args.Speaker));
         RaiseLocalEvent(args.Speaker, nameEv);
 
         var name = Loc.GetString("speech-name-relay", ("speaker", Name(uid)),
-            ("originalName", nameEv.VoiceName ?? Name(uid)));
+            ("originalName", nameEv.VoiceName));
 
         // log to chat so people can identity the speaker/source, but avoid clogging ghost chat if there are many radios
         _chatSystem.TrySendInGameICMessage(uid, args.Message, InGameICChatType.Speak, ChatTransmitRange.GhostRangeLimit, nameOverride: name);
diff --git a/Content.Server/VoiceMask/VoiceMaskSystem.cs b/Content.Server/VoiceMask/VoiceMaskSystem.cs
index 98f6b18f537..47ea98d2ccf 100644
--- a/Content.Server/VoiceMask/VoiceMaskSystem.cs
+++ b/Content.Server/VoiceMask/VoiceMaskSystem.cs
@@ -3,7 +3,6 @@
 using Content.Shared.Chat;
 using Content.Shared.Clothing;
 using Content.Shared.Database;
-using Content.Shared.Implants;
 using Content.Shared.Inventory;
 using Content.Shared.Popups;
 using Content.Shared.Preferences;
@@ -24,26 +23,19 @@ public sealed partial class VoiceMaskSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<VoiceMaskComponent, InventoryRelayedEvent<TransformSpeakerSpeechEvent>>(OnTransformSpeakerName);
-        SubscribeLocalEvent<VoiceMaskComponent, ImplantRelayEvent<TransformSpeakerSpeechEvent>>(OnTransformSpeakerNameImplant);
+        SubscribeLocalEvent<VoiceMaskComponent, InventoryRelayedEvent<TransformSpeakerNameEvent>>(OnTransformSpeakerName);
         SubscribeLocalEvent<VoiceMaskComponent, VoiceMaskChangeNameMessage>(OnChangeName);
         SubscribeLocalEvent<VoiceMaskComponent, VoiceMaskChangeVerbMessage>(OnChangeVerb);
         SubscribeLocalEvent<VoiceMaskComponent, ClothingGotEquippedEvent>(OnEquip);
         SubscribeLocalEvent<VoiceMaskSetNameEvent>(OpenUI);
     }
 
-    private void OnTransformSpeakerName(Entity<VoiceMaskComponent> entity, ref InventoryRelayedEvent<TransformSpeakerSpeechEvent> args)
+    private void OnTransformSpeakerName(Entity<VoiceMaskComponent> entity, ref InventoryRelayedEvent<TransformSpeakerNameEvent> args)
     {
         args.Args.VoiceName = GetCurrentVoiceName(entity);
         args.Args.SpeechVerb = entity.Comp.VoiceMaskSpeechVerb ?? args.Args.SpeechVerb;
     }
 
-    private void OnTransformSpeakerNameImplant(Entity<VoiceMaskComponent> entity, ref ImplantRelayEvent<TransformSpeakerSpeechEvent> args)
-    {
-        args.Event.VoiceName = GetCurrentVoiceName(entity);
-        args.Event.SpeechVerb = entity.Comp.VoiceMaskSpeechVerb ?? args.Event.SpeechVerb;
-    }
-
     #region User inputs from UI
     private void OnChangeVerb(Entity<VoiceMaskComponent> entity, ref VoiceMaskChangeVerbMessage msg)
     {
@@ -83,11 +75,7 @@ private void OnEquip(EntityUid uid, VoiceMaskComponent component, ClothingGotEqu
 
     private void OpenUI(VoiceMaskSetNameEvent ev)
     {
-        // If this ever becomes an entity remove this!
-        if (!TryComp<InstantActionComponent>(ev.Action, out var actionComp))
-            return;
-
-        var maskEntity = actionComp.Container;
+        var maskEntity = ev.Action.Comp.Container;
 
         if (!TryComp<VoiceMaskComponent>(maskEntity, out var voiceMaskComp))
             return;
diff --git a/Content.Shared/Chat/SharedChatEvents.cs b/Content.Shared/Chat/SharedChatEvents.cs
index 6d5c435e055..c187fd59a8d 100644
--- a/Content.Shared/Chat/SharedChatEvents.cs
+++ b/Content.Shared/Chat/SharedChatEvents.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Speech;
+using Content.Shared.Speech;
 using Robust.Shared.Prototypes;
 using Content.Shared.Inventory;
 
@@ -8,14 +8,14 @@ namespace Content.Shared.Chat;
 ///     This event should be sent everytime an entity talks (Radio, local chat, etc...).
 ///     The event is sent to both the entity itself, and all clothing (For stuff like voice masks).
 /// </summary>
-public sealed class TransformSpeakerSpeechEvent : EntityEventArgs, IInventoryRelayEvent
+public sealed class TransformSpeakerNameEvent : EntityEventArgs, IInventoryRelayEvent
 {
     public SlotFlags TargetSlots { get; } = SlotFlags.WITHOUT_POCKET;
     public EntityUid Sender;
-    public string? VoiceName;
+    public string VoiceName;
     public ProtoId<SpeechVerbPrototype>? SpeechVerb;
 
-    public TransformSpeakerSpeechEvent(EntityUid sender, string? name = null)
+    public TransformSpeakerNameEvent(EntityUid sender, string name)
     {
         Sender = sender;
         VoiceName = name;
diff --git a/Content.Shared/Inventory/InventorySystem.Relay.cs b/Content.Shared/Inventory/InventorySystem.Relay.cs
index 6edd1cf1db8..8b133778719 100644
--- a/Content.Shared/Inventory/InventorySystem.Relay.cs
+++ b/Content.Shared/Inventory/InventorySystem.Relay.cs
@@ -19,6 +19,7 @@
 using Content.Shared.Temperature;
 using Content.Shared.Verbs;
 using Content.Shared.Weapons.Ranged.Events;
+using Content.Shared.Chat;
 
 namespace Content.Shared.Inventory;
 
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml
index 35b2806f6e7..90c648c9d88 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml
@@ -30,16 +30,13 @@
   suffix: Voice Mask, Chameleon
   components:
     - type: VoiceMask
+    - type: HideLayerClothing
+      slots:
+      - Snout
     - type: UserInterface
       interfaces:
         enum.VoiceMaskUIKey.Key:
           type: VoiceMaskBoundUserInterface
-    - type: Tag
-      tags:
-      - IPCMaskWearable
-    - type: HideLayerClothing
-      slots:
-      - Snout
 
 - type: entity
   parent: ClothingMaskBase
@@ -69,3 +66,41 @@
   - type: HideLayerClothing
     slots:
     - Snout
+
+- type: entity
+  parent: ClothingMaskBase
+  id: ClothingMaskGoldenCursed
+  name: golden mask
+  description: Previously used in strange pantomimes, after one of the actors went mad on stage these masks have avoided use. You swear its face contorts when you're not looking.
+  components:
+  - type: Sprite
+    sprite: Clothing/Mask/goldenmask.rsi
+    layers:
+    - state: icon
+      map: [ "mask" ]
+  - type: Clothing
+    sprite: Clothing/Mask/goldenmask.rsi
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.CursedMaskVisuals.State:
+        mask:
+          Neutral: { state: icon }
+          Despair: { state: icon-despair }
+          Joy: { state: icon-joy }
+          Anger: { state: icon-anger }
+  - type: Tag
+    tags: [] # ignore "WhitelistChameleon" tag
+  - type: SelfEquipOnly
+  - type: CursedMask
+    despairDamageModifier:
+      coefficients:
+        Blunt: 0.6
+        Slash: 0.6
+        Piercing: 0.4
+  - type: HideLayerClothing
+    slots:
+    - Snout
+  - type: IngestionBlocker
+  - type: StaticPrice
+    price: 5000

From ec4213de8a3bc08e57d7b8d78f02e96b631ff9a7 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Date: Thu, 21 Nov 2024 18:56:05 -0800
Subject: [PATCH 067/366] Fix admin ghosts not being able to see items in
 pockets or interact with them (#31076)

* Fix admin ghosts not being able to see items in pouches or interact with them

* fix

* oops

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 .../Inventory/StrippableBoundUserInterface.cs      | 14 +++++++++++---
 .../Interaction/SharedInteractionSystem.cs         |  4 +++-
 Content.Shared/Inventory/InventorySystem.Equip.cs  |  3 +++
 Content.Shared/Inventory/InventorySystem.Relay.cs  |  2 +-
 .../Inventory/InventoryTemplatePrototype.cs        |  5 +++++
 Content.Shared/Strip/SharedStrippableSystem.cs     |  7 +++++++
 6 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs
index 468c325822d..9a365124477 100644
--- a/Content.Client/Inventory/StrippableBoundUserInterface.cs
+++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs
@@ -17,6 +17,7 @@
 using Content.Shared.Strip.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.Player;
@@ -31,11 +32,13 @@ namespace Content.Client.Inventory
     [UsedImplicitly]
     public sealed class StrippableBoundUserInterface : BoundUserInterface
     {
+        [Dependency] private readonly IPlayerManager _player = default!;
         [Dependency] private readonly IUserInterfaceManager _ui = default!;
-        [Dependency] private readonly IPlayerManager _playerManager = default!;
+
         private readonly ExamineSystem _examine;
         private readonly InventorySystem _inv;
         private readonly SharedCuffableSystem _cuffable;
+        private readonly StrippableSystem _strippable;
 
         [ViewVariables]
         private const int ButtonSeparation = 4;
@@ -54,6 +57,8 @@ public StrippableBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, u
             _examine = EntMan.System<ExamineSystem>();
             _inv = EntMan.System<InventorySystem>();
             _cuffable = EntMan.System<SharedCuffableSystem>();
+            _strippable = EntMan.System<StrippableSystem>();
+
             _virtualHiddenEntity = EntMan.SpawnEntity(HiddenPocketEntityId, MapCoordinates.Nullspace);
         }
 
@@ -201,8 +206,11 @@ private void AddInventoryButton(EntityUid invUid, string slotId, InventoryCompon
             var entity = container.ContainedEntity;
 
             // If this is a full pocket, obscure the real entity
-            if (entity != null && slotDef.StripHidden
-                && !(EntMan.TryGetComponent<ThievingComponent>(_playerManager.LocalEntity, out var thiefcomponent) && thiefcomponent.IgnoreStripHidden))
+            // this does not work for modified clients because they are still sent the real entity
+            if (entity != null 
+                && _strippable.IsStripHidden(slotDef, _player.LocalEntity)
+                && !(EntMan.TryGetComponent<ThievingComponent>(_playerManager.LocalEntity, out var thiefComponent) 
+                && thiefComponent.IgnoreStripHidden))
                 entity = _virtualHiddenEntity;
 
             var button = new SlotButton(new SlotData(slotDef, container));
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 97af3982d70..759d59ae7fe 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -21,6 +21,7 @@
 using Content.Shared.Players.RateLimiting;
 using Content.Shared.Popups;
 using Content.Shared.Storage;
+using Content.Shared.Strip;
 using Content.Shared.Tag;
 using Content.Shared.Timing;
 using Content.Shared.UserInterface;
@@ -67,6 +68,7 @@ public abstract partial class SharedInteractionSystem : EntitySystem
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly TagSystem _tagSystem = default!;
         [Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
+        [Dependency] private readonly SharedStrippableSystem _strippable = default!;
         [Dependency] private readonly SharedPlayerRateLimitManager _rateLimit = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly ISharedChatManager _chat = default!;
@@ -1291,7 +1293,7 @@ public bool CanAccessEquipment(EntityUid user, EntityUid target)
             if (wearer == user)
                 return true;
 
-            if (slotDef.StripHidden)
+            if (_strippable.IsStripHidden(slotDef, user))
                 return false;
 
             return InRangeUnobstructed(user, wearer) && _containerSystem.IsInSameOrParentContainer(user, wearer);
diff --git a/Content.Shared/Inventory/InventorySystem.Equip.cs b/Content.Shared/Inventory/InventorySystem.Equip.cs
index f6879bb1a5d..e6ad8bfeab3 100644
--- a/Content.Shared/Inventory/InventorySystem.Equip.cs
+++ b/Content.Shared/Inventory/InventorySystem.Equip.cs
@@ -10,6 +10,7 @@
 using Content.Shared.Item;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Popups;
+using Content.Shared.Strip;
 using Content.Shared.Strip.Components;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
@@ -30,6 +31,8 @@ public abstract partial class InventorySystem
     [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
     [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+    [Dependency] private readonly SharedStrippableSystem _strippable = default!;
 
     [ValidatePrototypeId<ItemSizePrototype>]
     private const string PocketableItemSize = "Small";
diff --git a/Content.Shared/Inventory/InventorySystem.Relay.cs b/Content.Shared/Inventory/InventorySystem.Relay.cs
index 8b133778719..f4b8077d47b 100644
--- a/Content.Shared/Inventory/InventorySystem.Relay.cs
+++ b/Content.Shared/Inventory/InventorySystem.Relay.cs
@@ -113,7 +113,7 @@ private void OnGetEquipmentVerbs(EntityUid uid, InventoryComponent component, Ge
         var enumerator = new InventorySlotEnumerator(component);
         while (enumerator.NextItem(out var item, out var slotDef))
         {
-            if (!slotDef.StripHidden || args.User == uid)
+            if (!_strippable.IsStripHidden(slotDef, args.User) || args.User == uid)
                 RaiseLocalEvent(item, ev);
         }
     }
diff --git a/Content.Shared/Inventory/InventoryTemplatePrototype.cs b/Content.Shared/Inventory/InventoryTemplatePrototype.cs
index 0d900688fcc..0fcbd770419 100644
--- a/Content.Shared/Inventory/InventoryTemplatePrototype.cs
+++ b/Content.Shared/Inventory/InventoryTemplatePrototype.cs
@@ -1,4 +1,5 @@
 using System.Numerics;
+using Content.Shared.Strip;
 using Content.Shared.Whitelist;
 using Robust.Shared.Prototypes;
 
@@ -39,6 +40,10 @@ public sealed partial class SlotDefinition
     [DataField("displayName", required: true)]
     public string DisplayName { get; private set; } = string.Empty;
 
+    /// <summary>
+    ///     Whether or not this slot will have its item hidden in the strip menu, and block interactions.
+    ///     <seealso cref="SharedStrippableSystem.IsStripHidden"/>
+    /// </summary>
     [DataField("stripHidden")] public bool StripHidden { get; private set; }
 
     /// <summary>
diff --git a/Content.Shared/Strip/SharedStrippableSystem.cs b/Content.Shared/Strip/SharedStrippableSystem.cs
index a801e5ee467..c14d003b785 100644
--- a/Content.Shared/Strip/SharedStrippableSystem.cs
+++ b/Content.Shared/Strip/SharedStrippableSystem.cs
@@ -1,5 +1,12 @@
 using Content.Shared.DragDrop;
 using Content.Shared.Hands.Components;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Components;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Inventory;
+using Content.Shared.Inventory.VirtualItem;
 using Content.Shared.Popups;
 using Content.Shared.Strip.Components;
 

From 97cebb376fd8830756db5a66516208c173be10c7 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Sun, 25 Aug 2024 22:43:31 +1000
Subject: [PATCH 068/366] Action stuff (#31305)

* Action stuff

- Cleanup some event stuff
- Avoid dirtying entity unnecessarily
- Add ActionGrant as an easy way to apply / remove actions via compregistry.

* Fix merge
---
 Content.Client/Actions/ActionsSystem.cs       |  6 --
 .../Systems/Actions/ActionUIController.cs     | 43 ++++++++++--
 .../Actions/ActionOnInteractSystem.cs         | 33 ++++++---
 .../NPC/Systems/NPCUseActionOnTargetSystem.cs | 66 ++++++++++++++++++
 Content.Shared/Actions/ActionEvents.cs        |  7 +-
 .../Actions/ActionGrantComponent.cs           | 17 +++++
 Content.Shared/Actions/ActionGrantSystem.cs   | 48 +++++++++++++
 .../Events/ActionComponentChangeEvent.cs      | 27 ++++++++
 .../Actions/ItemActionGrantComponent.cs       | 14 ++++
 Content.Shared/Actions/SharedActionsSystem.cs | 69 +++++++++++++++----
 10 files changed, 296 insertions(+), 34 deletions(-)
 create mode 100644 Content.Server/NPC/Systems/NPCUseActionOnTargetSystem.cs
 create mode 100644 Content.Shared/Actions/ActionGrantComponent.cs
 create mode 100644 Content.Shared/Actions/ActionGrantSystem.cs
 create mode 100644 Content.Shared/Actions/Events/ActionComponentChangeEvent.cs
 create mode 100644 Content.Shared/Actions/ItemActionGrantComponent.cs

diff --git a/Content.Client/Actions/ActionsSystem.cs b/Content.Client/Actions/ActionsSystem.cs
index 0bc65eb9358..2f5b344d82e 100644
--- a/Content.Client/Actions/ActionsSystem.cs
+++ b/Content.Client/Actions/ActionsSystem.cs
@@ -248,12 +248,6 @@ public void TriggerAction(EntityUid actionId, BaseActionComponent action)
 
             if (action.ClientExclusive)
             {
-                if (instantAction.Event != null)
-                {
-                    instantAction.Event.Performer = user;
-                    instantAction.Event.Action = actionId;
-                }
-
                 PerformAction(user, actions, actionId, instantAction, instantAction.Event, GameTiming.CurTime);
             }
             else
diff --git a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
index 69ac3ab0230..cf5223fa00f 100644
--- a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
+++ b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
@@ -216,8 +216,6 @@ private bool TryTargetWorld(in PointerInputCmdArgs args, EntityUid actionId, Wor
             if (action.Event != null)
             {
                 action.Event.Target = coords;
-                action.Event.Performer = user;
-                action.Event.Action = actionId;
             }
 
             _actionsSystem.PerformAction(user, actionComp, actionId, action, action.Event, _timing.CurTime);
@@ -251,8 +249,6 @@ private bool TryTargetEntity(in PointerInputCmdArgs args, EntityUid actionId, En
             if (action.Event != null)
             {
                 action.Event.Target = entity;
-                action.Event.Performer = user;
-                action.Event.Action = actionId;
             }
 
             _actionsSystem.PerformAction(user, actionComp, actionId, action, action.Event, _timing.CurTime);
@@ -266,6 +262,45 @@ private bool TryTargetEntity(in PointerInputCmdArgs args, EntityUid actionId, En
         return true;
     }
 
+    private bool TryTargetEntityWorld(in PointerInputCmdArgs args,
+        EntityUid actionId,
+        EntityWorldTargetActionComponent action,
+        EntityUid user,
+        ActionsComponent actionComp)
+    {
+        if (_actionsSystem == null)
+            return false;
+
+        var entity = args.EntityUid;
+        var coords = args.Coordinates;
+
+        if (!_actionsSystem.ValidateEntityWorldTarget(user, entity, coords, (actionId, action)))
+        {
+            if (action.DeselectOnMiss)
+                StopTargeting();
+
+            return false;
+        }
+
+        if (action.ClientExclusive)
+        {
+            if (action.Event != null)
+            {
+                action.Event.Entity = entity;
+                action.Event.Coords = coords;
+            }
+
+            _actionsSystem.PerformAction(user, actionComp, actionId, action, action.Event, _timing.CurTime);
+        }
+        else
+            EntityManager.RaisePredictiveEvent(new RequestPerformActionEvent(EntityManager.GetNetEntity(actionId), EntityManager.GetNetEntity(args.EntityUid), EntityManager.GetNetCoordinates(coords)));
+
+        if (!action.Repeat)
+            StopTargeting();
+
+        return true;
+    }
+
     public void UnloadButton()
     {
         if (ActionButton == null)
diff --git a/Content.Server/Actions/ActionOnInteractSystem.cs b/Content.Server/Actions/ActionOnInteractSystem.cs
index 28685858592..23d74b04b89 100644
--- a/Content.Server/Actions/ActionOnInteractSystem.cs
+++ b/Content.Server/Actions/ActionOnInteractSystem.cs
@@ -55,12 +55,6 @@ private void OnActivate(EntityUid uid, ActionOnInteractComponent component, Acti
             return;
 
         var (actId, act) = _random.Pick(options);
-        if (act.Event != null)
-        {
-            act.Event.Performer = args.User;
-            act.Event.Action = actId;
-        }
-
         _actions.PerformAction(args.User, null, actId, act, act.Event, _timing.CurTime, false);
         args.Handled = true;
     }
@@ -94,8 +88,6 @@ private void OnAfterInteract(EntityUid uid, ActionOnInteractComponent component,
                 var (entActId, entAct) = _random.Pick(entOptions);
                 if (entAct.Event != null)
                 {
-                    entAct.Event.Performer = args.User;
-                    entAct.Event.Action = entActId;
                     entAct.Event.Target = args.Target.Value;
                 }
 
@@ -105,6 +97,29 @@ private void OnAfterInteract(EntityUid uid, ActionOnInteractComponent component,
             }
         }
 
+        // Then EntityWorld target actions
+        var entWorldOptions = GetValidActions<EntityWorldTargetActionComponent>(actionEnts, args.CanReach);
+        for (var i = entWorldOptions.Count - 1; i >= 0; i--)
+        {
+            var action = entWorldOptions[i];
+            if (!_actions.ValidateEntityWorldTarget(args.User, args.Target, args.ClickLocation, action))
+                entWorldOptions.RemoveAt(i);
+        }
+
+        if (entWorldOptions.Count > 0)
+        {
+            var (entActId, entAct) = _random.Pick(entWorldOptions);
+            if (entAct.Event != null)
+            {
+                entAct.Event.Entity = args.Target;
+                entAct.Event.Coords = args.ClickLocation;
+            }
+
+            _actions.PerformAction(args.User, null, entActId, entAct, entAct.Event, _timing.CurTime, false);
+            args.Handled = true;
+            return;
+        }
+
         // else: try world target actions
         var options = GetValidActions<WorldTargetActionComponent>(component.ActionEntities, args.CanReach);
         for (var i = options.Count - 1; i >= 0; i--)
@@ -120,8 +135,6 @@ private void OnAfterInteract(EntityUid uid, ActionOnInteractComponent component,
         var (actId, act) = _random.Pick(options);
         if (act.Event != null)
         {
-            act.Event.Performer = args.User;
-            act.Event.Action = actId;
             act.Event.Target = args.ClickLocation;
         }
 
diff --git a/Content.Server/NPC/Systems/NPCUseActionOnTargetSystem.cs b/Content.Server/NPC/Systems/NPCUseActionOnTargetSystem.cs
new file mode 100644
index 00000000000..33bc8f9074c
--- /dev/null
+++ b/Content.Server/NPC/Systems/NPCUseActionOnTargetSystem.cs
@@ -0,0 +1,66 @@
+using Content.Server.NPC.Components;
+using Content.Server.NPC.HTN;
+using Content.Shared.Actions;
+using Robust.Shared.Timing;
+
+namespace Content.Server.NPC.Systems;
+
+public sealed class NPCUseActionOnTargetSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedActionsSystem _actions = default!;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<NPCUseActionOnTargetComponent, MapInitEvent>(OnMapInit);
+    }
+
+    private void OnMapInit(Entity<NPCUseActionOnTargetComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.ActionEnt = _actions.AddAction(ent, ent.Comp.ActionId);
+    }
+
+    public bool TryUseTentacleAttack(Entity<NPCUseActionOnTargetComponent?> user, EntityUid target)
+    {
+        if (!Resolve(user, ref user.Comp, false))
+            return false;
+
+        if (!TryComp<EntityWorldTargetActionComponent>(user.Comp.ActionEnt, out var action))
+            return false;
+
+        if (!_actions.ValidAction(action))
+            return false;
+
+        if (action.Event != null)
+        {
+            action.Event.Coords = Transform(target).Coordinates;
+        }
+
+        _actions.PerformAction(user,
+            null,
+            user.Comp.ActionEnt.Value,
+            action,
+            action.BaseEvent,
+            _timing.CurTime,
+            false);
+        return true;
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        // Tries to use the attack on the current target.
+        var query = EntityQueryEnumerator<NPCUseActionOnTargetComponent, HTNComponent>();
+        while (query.MoveNext(out var uid, out var comp, out var htn))
+        {
+            if (!htn.Blackboard.TryGetValue<EntityUid>(comp.TargetKey, out var target, EntityManager))
+                continue;
+
+            TryUseTentacleAttack((uid, comp), target);
+        }
+    }
+}
diff --git a/Content.Shared/Actions/ActionEvents.cs b/Content.Shared/Actions/ActionEvents.cs
index 6cc50bc21b4..8e83e25f7ed 100644
--- a/Content.Shared/Actions/ActionEvents.cs
+++ b/Content.Shared/Actions/ActionEvents.cs
@@ -159,5 +159,10 @@ public abstract partial class BaseActionEvent : HandledEntityEventArgs
     /// <summary>
     ///     The action the event belongs to.
     /// </summary>
-    public EntityUid Action;
+    public Entity<BaseActionComponent> Action;
+
+    /// <summary>
+    /// Should we toggle the action entity?
+    /// </summary>
+    public bool Toggle;
 }
diff --git a/Content.Shared/Actions/ActionGrantComponent.cs b/Content.Shared/Actions/ActionGrantComponent.cs
new file mode 100644
index 00000000000..94c3a0bbd1d
--- /dev/null
+++ b/Content.Shared/Actions/ActionGrantComponent.cs
@@ -0,0 +1,17 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Actions;
+
+/// <summary>
+/// Grants actions on MapInit and removes them on shutdown
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(ActionGrantSystem))]
+public sealed partial class ActionGrantComponent : Component
+{
+    [DataField(required: true), AutoNetworkedField, AlwaysPushInheritance]
+    public List<EntProtoId> Actions = new();
+
+    [DataField, AutoNetworkedField]
+    public List<EntityUid> ActionEntities = new();
+}
diff --git a/Content.Shared/Actions/ActionGrantSystem.cs b/Content.Shared/Actions/ActionGrantSystem.cs
new file mode 100644
index 00000000000..f73ecf8a460
--- /dev/null
+++ b/Content.Shared/Actions/ActionGrantSystem.cs
@@ -0,0 +1,48 @@
+namespace Content.Shared.Actions;
+
+/// <summary>
+/// <see cref="ActionGrantComponent"/>
+/// </summary>
+public sealed class ActionGrantSystem : EntitySystem
+{
+    [Dependency] private readonly SharedActionsSystem _actions = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<ActionGrantComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ActionGrantComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<ItemActionGrantComponent, GetItemActionsEvent>(OnItemGet);
+    }
+
+    private void OnItemGet(Entity<ItemActionGrantComponent> ent, ref GetItemActionsEvent args)
+    {
+        if (!TryComp(ent.Owner, out ActionGrantComponent? grant))
+            return;
+
+        foreach (var action in grant.ActionEntities)
+        {
+            args.AddAction(action);
+        }
+    }
+
+    private void OnMapInit(Entity<ActionGrantComponent> ent, ref MapInitEvent args)
+    {
+        foreach (var action in ent.Comp.Actions)
+        {
+            EntityUid? actionEnt = null;
+            _actions.AddAction(ent.Owner, ref actionEnt, action);
+
+            if (actionEnt != null)
+                ent.Comp.ActionEntities.Add(actionEnt.Value);
+        }
+    }
+
+    private void OnShutdown(Entity<ActionGrantComponent> ent, ref ComponentShutdown args)
+    {
+        foreach (var actionEnt in ent.Comp.ActionEntities)
+        {
+            _actions.RemoveAction(ent.Owner, actionEnt);
+        }
+    }
+}
diff --git a/Content.Shared/Actions/Events/ActionComponentChangeEvent.cs b/Content.Shared/Actions/Events/ActionComponentChangeEvent.cs
new file mode 100644
index 00000000000..c9c4db145da
--- /dev/null
+++ b/Content.Shared/Actions/Events/ActionComponentChangeEvent.cs
@@ -0,0 +1,27 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Actions.Events;
+
+/// <summary>
+/// Adds / removes the component upon action.
+/// </summary>
+[Virtual]
+public partial class ActionComponentChangeEvent : InstantActionEvent
+{
+    [DataField(required: true)]
+    public ComponentRegistry Components = new();
+}
+
+/// <summary>
+/// Similar to <see cref="ActionComponentChangeEvent"/> except raises an event to attempt to relay it.
+/// </summary>
+public sealed partial class RelayedActionComponentChangeEvent : ActionComponentChangeEvent
+{
+
+}
+
+[ByRefEvent]
+public record struct AttemptRelayActionComponentChangeEvent
+{
+    public EntityUid? Target;
+}
diff --git a/Content.Shared/Actions/ItemActionGrantComponent.cs b/Content.Shared/Actions/ItemActionGrantComponent.cs
new file mode 100644
index 00000000000..d1769b51a2f
--- /dev/null
+++ b/Content.Shared/Actions/ItemActionGrantComponent.cs
@@ -0,0 +1,14 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Actions;
+
+/// <summary>
+/// Works in tandem with <see cref="ActionGrantComponent"/> by granting those actions to the equipper entity.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(ActionGrantSystem))]
+public sealed partial class ItemActionGrantComponent : Component
+{
+    [DataField(required: true), AutoNetworkedField, AlwaysPushInheritance]
+    public List<EntProtoId> Actions = new();
+}
diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs
index 785a4478d56..ec6eab58f71 100644
--- a/Content.Shared/Actions/SharedActionsSystem.cs
+++ b/Content.Shared/Actions/SharedActionsSystem.cs
@@ -10,7 +10,6 @@
 using Content.Shared.Mind;
 using Content.Shared.Rejuvenate;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Map;
 using Robust.Shared.Timing;
@@ -42,6 +41,8 @@ public override void Initialize()
         SubscribeLocalEvent<EntityTargetActionComponent, ComponentShutdown>(OnActionShutdown);
         SubscribeLocalEvent<WorldTargetActionComponent, ComponentShutdown>(OnActionShutdown);
 
+        SubscribeLocalEvent<ActionsComponent, ActionComponentChangeEvent>(OnActionCompChange);
+        SubscribeLocalEvent<ActionsComponent, RelayedActionComponentChangeEvent>(OnRelayActionCompChange);
         SubscribeLocalEvent<ActionsComponent, DidEquipEvent>(OnDidEquip);
         SubscribeLocalEvent<ActionsComponent, DidEquipHandEvent>(OnHandEquipped);
         SubscribeLocalEvent<ActionsComponent, DidUnequipEvent>(OnDidUnequip);
@@ -452,12 +453,6 @@ private void OnActionRequest(RequestPerformActionEvent ev, EntitySessionEventArg
                 break;
         }
 
-        if (performEvent != null)
-        {
-            performEvent.Performer = user;
-            performEvent.Action = actionEnt;
-        }
-
         // All checks passed. Perform the action!
         PerformAction(user, component, actionEnt, action, performEvent, curTime);
     }
@@ -558,6 +553,8 @@ public void PerformAction(EntityUid performer, ActionsComponent? component, Enti
             // This here is required because of client-side prediction (RaisePredictiveEvent results in event re-use).
             actionEvent.Handled = false;
             var target = performer;
+            actionEvent.Performer = performer;
+            actionEvent.Action = (actionId, action);
 
             if (!action.RaiseOnUser && action.Container != null && !HasComp<MindComponent>(action.Container))
                 target = action.Container.Value;
@@ -570,10 +567,14 @@ public void PerformAction(EntityUid performer, ActionsComponent? component, Enti
             return; // no interaction occurred.
 
         // play sound, reduce charges, start cooldown, and mark as dirty (if required).
+        if (actionEvent?.Toggle == true)
+        {
+            action.Toggled = !action.Toggled;
+        }
 
-        _audio.PlayPredicted(action.Sound, performer,predicted ? performer : null);
+        _audio.PlayPredicted(action.Sound, performer, predicted ? performer : null);
 
-        var dirty = toggledBefore == action.Toggled;
+        var dirty = toggledBefore != action.Toggled;
 
         if (action.Charges != null)
         {
@@ -594,10 +595,11 @@ public void PerformAction(EntityUid performer, ActionsComponent? component, Enti
             action.Cooldown = (curTime, curTime + action.UseDelay.Value);
         }
 
-        Dirty(actionId, action);
-
-        if (dirty && component != null)
-            Dirty(performer, component);
+        if (dirty)
+        {
+            Dirty(actionId, action);
+            UpdateAction(actionId, action);
+        }
 
         var ev = new ActionPerformedEvent(performer);
         RaiseLocalEvent(actionId, ref ev);
@@ -881,6 +883,47 @@ protected virtual void ActionRemoved(EntityUid performer, EntityUid actionId, Ac
 
     #endregion
 
+    private void OnRelayActionCompChange(Entity<ActionsComponent> ent, ref RelayedActionComponentChangeEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        var ev = new AttemptRelayActionComponentChangeEvent();
+        RaiseLocalEvent(ent.Owner, ref ev);
+        var target = ev.Target ?? ent.Owner;
+
+        args.Handled = true;
+        args.Toggle = true;
+
+        if (!args.Action.Comp.Toggled)
+        {
+            EntityManager.AddComponents(target, args.Components);
+        }
+        else
+        {
+            EntityManager.RemoveComponents(target, args.Components);
+        }
+    }
+
+    private void OnActionCompChange(Entity<ActionsComponent> ent, ref ActionComponentChangeEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        args.Handled = true;
+        args.Toggle = true;
+        var target = ent.Owner;
+
+        if (!args.Action.Comp.Toggled)
+        {
+            EntityManager.AddComponents(target, args.Components);
+        }
+        else
+        {
+            EntityManager.RemoveComponents(target, args.Components);
+        }
+    }
+
     #region EquipHandlers
     private void OnDidEquip(EntityUid uid, ActionsComponent component, DidEquipEvent args)
     {

From 90a8273e9cc1171d7b87af6c1bf678ae7216dc05 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 07:34:27 -0400
Subject: [PATCH 069/366] hm

---
 Content.Shared/Chat/SharedChatSystem.cs       | 16 ++++--------
 .../Inventory/InventorySystem.Equip.cs        |  1 +
 .../Strip/SharedStrippableSystem.cs           | 25 +++++++++++++++----
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/Content.Shared/Chat/SharedChatSystem.cs b/Content.Shared/Chat/SharedChatSystem.cs
index 14cb37d18bb..8b4dfb377fd 100644
--- a/Content.Shared/Chat/SharedChatSystem.cs
+++ b/Content.Shared/Chat/SharedChatSystem.cs
@@ -70,25 +70,19 @@ public SpeechVerbPrototype GetSpeechVerb(EntityUid source, string message, Speec
         if (!Resolve(source, ref speech, false))
             return _prototypeManager.Index<SpeechVerbPrototype>(DefaultSpeechVerb);
 
-        var evt = new TransformSpeakerSpeechEvent(source);
-        RaiseLocalEvent(source, evt);
-
-        SpeechVerbPrototype? speechProto = null;
-        if (evt.SpeechVerb != null && _prototypeManager.TryIndex(evt.SpeechVerb, out var evntProto))
-            speechProto = evntProto;
-
         // check for a suffix-applicable speech verb
+        SpeechVerbPrototype? current = null;
         foreach (var (str, id) in speech.SuffixSpeechVerbs)
         {
-            var proto = _prototypeManager.Index<SpeechVerbPrototype>(id);
-            if (message.EndsWith(Loc.GetString(str)) && proto.Priority >= (speechProto?.Priority ?? 0))
+            var proto = _prototypeManager.Index(id);
+            if (message.EndsWith(Loc.GetString(str)) && proto.Priority >= (current?.Priority ?? 0))
             {
-                speechProto = proto;
+                current = proto;
             }
         }
 
         // if no applicable suffix verb return the normal one used by the entity
-        return speechProto ?? _prototypeManager.Index<SpeechVerbPrototype>(speech.SpeechVerb);
+        return current ?? _prototypeManager.Index(speech.SpeechVerb);
     }
 
     /// <summary>
diff --git a/Content.Shared/Inventory/InventorySystem.Equip.cs b/Content.Shared/Inventory/InventorySystem.Equip.cs
index e6ad8bfeab3..d3c0deeae87 100644
--- a/Content.Shared/Inventory/InventorySystem.Equip.cs
+++ b/Content.Shared/Inventory/InventorySystem.Equip.cs
@@ -12,6 +12,7 @@
 using Content.Shared.Popups;
 using Content.Shared.Strip;
 using Content.Shared.Strip.Components;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Timing;
diff --git a/Content.Shared/Strip/SharedStrippableSystem.cs b/Content.Shared/Strip/SharedStrippableSystem.cs
index c14d003b785..dd0b2355858 100644
--- a/Content.Shared/Strip/SharedStrippableSystem.cs
+++ b/Content.Shared/Strip/SharedStrippableSystem.cs
@@ -73,10 +73,25 @@ public void StripPopup(string messageId, ThievingStealth stealth, EntityUid targ
         PopupType? popupSize = _thieving.GetPopupTypeFromStealth(stealth);
 
         if (popupSize.HasValue) // We should always have a value if we're not hidden
-            _popup.PopupEntity(Loc.GetString(messageId,
-            ("user", subtle ? Loc.GetString("thieving-component-user") : user ?? EntityUid.Invalid),
-            ("item", subtle ? Loc.GetString("thieving-component-item") : item ?? EntityUid.Invalid),
-            ("slot", slot)),
-            target, target, popupSize.Value);
+            _popup.PopupEntity(
+                Loc.GetString(
+                    messageId,
+                ("user", subtle ? Loc.GetString("thieving-component-user") : user ?? EntityUid.Invalid),
+                ("item", subtle ? Loc.GetString("thieving-component-item") : item ?? EntityUid.Invalid),
+                ("slot", slot)),
+            target,
+            target,
+            popupSize.Value);
+    }
+
+    public bool IsStripHidden(SlotDefinition definition, EntityUid? viewer)
+    {
+        if (!definition.StripHidden)
+            return false;
+
+        if (viewer == null)
+            return true;
+
+        return !(HasComp<BypassInteractionChecksComponent>(viewer) || HasComp<ThievingComponent>(viewer));
     }
 }

From 6a63ee51bfa793e2ff23b018b8d170033677ccd5 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sun, 18 Aug 2024 12:22:36 -0400
Subject: [PATCH 070/366] Goliath mob (#30839)

* Goliath mob

* Update asteroid.yml

* mcfuck yourself

* add cloak

* fixes

* Update materials.yml
---
 .../Actions/ActionOnInteractSystem.cs         |  17 +-
 .../NPCUseActionOnTargetComponent.cs          |  27 +++
 Content.Server/NPC/NPCBlackboard.cs           |  12 +-
 .../NPC/Systems/NPCUtilitySystem.cs           |   8 +-
 .../Goliath/GoliathSummonTentacleAction.cs    |  31 +++
 .../Goliath/GoliathTentacleSystem.cs          |  69 +++++++
 Content.Shared/Actions/SharedActionsSystem.cs |  15 ++
 Content.Shared/Stunnable/SharedStunSystem.cs  |  33 +++-
 .../Stunnable/StunOnContactComponent.cs       |  23 +++
 Resources/Locale/en-US/abilities/goliath.ftl  |   1 +
 .../Entities/Mobs/NPCs/asteroid.yml           | 182 ++++++++++++++++++
 .../Entities/Objects/Materials/materials.yml  |  59 +++++-
 Resources/Prototypes/NPCs/goliath.yml         |  75 ++++++++
 .../Prototypes/Stacks/Materials/materials.yml |  15 +-
 Resources/Prototypes/tags.yml                 |   3 +
 .../Aliens/Asteroid/goliath.rsi/goliath.png   | Bin 0 -> 2975 bytes
 .../Asteroid/goliath.rsi/goliath_alert.png    | Bin 0 -> 4327 bytes
 .../Asteroid/goliath.rsi/goliath_dead.png     | Bin 0 -> 968 bytes
 .../goliath.rsi/goliath_preattack.png         | Bin 0 -> 4249 bytes
 .../goliath.rsi/goliath_tentacle_retract.png  | Bin 0 -> 1926 bytes
 .../goliath.rsi/goliath_tentacle_spawn.png    | Bin 0 -> 1944 bytes
 .../goliath.rsi/goliath_tentacle_wiggle.png   | Bin 0 -> 2913 bytes
 .../Aliens/Asteroid/goliath.rsi/meta.json     | 111 +++++++++++
 .../Materials/hide.rsi/goliath_hide.png       | Bin 0 -> 353 bytes
 .../Materials/hide.rsi/goliath_hide_2.png     | Bin 0 -> 479 bytes
 .../Materials/hide.rsi/goliath_hide_3.png     | Bin 0 -> 554 bytes
 .../Objects/Materials/hide.rsi/meta.json      |  20 ++
 27 files changed, 675 insertions(+), 26 deletions(-)
 create mode 100644 Content.Server/NPC/Components/NPCUseActionOnTargetComponent.cs
 create mode 100644 Content.Shared/Abilities/Goliath/GoliathSummonTentacleAction.cs
 create mode 100644 Content.Shared/Abilities/Goliath/GoliathTentacleSystem.cs
 create mode 100644 Content.Shared/Stunnable/StunOnContactComponent.cs
 create mode 100644 Resources/Locale/en-US/abilities/goliath.ftl
 create mode 100644 Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
 create mode 100644 Resources/Prototypes/NPCs/goliath.yml
 create mode 100644 Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/goliath.png
 create mode 100644 Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/goliath_alert.png
 create mode 100644 Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/goliath_dead.png
 create mode 100644 Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/goliath_preattack.png
 create mode 100644 Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/goliath_tentacle_retract.png
 create mode 100644 Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/goliath_tentacle_spawn.png
 create mode 100644 Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/goliath_tentacle_wiggle.png
 create mode 100644 Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Materials/hide.rsi/goliath_hide.png
 create mode 100644 Resources/Textures/Objects/Materials/hide.rsi/goliath_hide_2.png
 create mode 100644 Resources/Textures/Objects/Materials/hide.rsi/goliath_hide_3.png
 create mode 100644 Resources/Textures/Objects/Materials/hide.rsi/meta.json

diff --git a/Content.Server/Actions/ActionOnInteractSystem.cs b/Content.Server/Actions/ActionOnInteractSystem.cs
index 23d74b04b89..af9b0b1ddbd 100644
--- a/Content.Server/Actions/ActionOnInteractSystem.cs
+++ b/Content.Server/Actions/ActionOnInteractSystem.cs
@@ -142,21 +142,6 @@ private void OnAfterInteract(EntityUid uid, ActionOnInteractComponent component,
         args.Handled = true;
     }
 
-    private bool ValidAction(BaseActionComponent action, bool canReach = true)
-    {
-        if (!action.Enabled)
-            return false;
-
-        if (action.Charges.HasValue && action.Charges <= 0)
-            return false;
-
-        var curTime = _timing.CurTime;
-        if (action.Cooldown.HasValue && action.Cooldown.Value.End > curTime)
-            return false;
-
-        return canReach || action is BaseTargetActionComponent { CheckCanAccess: false };
-    }
-
     private List<(EntityUid Id, T Comp)> GetValidActions<T>(List<EntityUid>? actions, bool canReach = true) where T : BaseActionComponent
     {
         var valid = new List<(EntityUid Id, T Comp)>();
@@ -168,7 +153,7 @@ private bool ValidAction(BaseActionComponent action, bool canReach = true)
         {
             if (!_actions.TryGetActionData(id, out var baseAction) ||
                 baseAction as T is not { } action ||
-                !ValidAction(action, canReach))
+                !_actions.ValidAction(action, canReach))
             {
                 continue;
             }
diff --git a/Content.Server/NPC/Components/NPCUseActionOnTargetComponent.cs b/Content.Server/NPC/Components/NPCUseActionOnTargetComponent.cs
new file mode 100644
index 00000000000..f022a45eccb
--- /dev/null
+++ b/Content.Server/NPC/Components/NPCUseActionOnTargetComponent.cs
@@ -0,0 +1,27 @@
+using Content.Server.NPC.Systems;
+using Content.Shared.Actions;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.NPC.Components;
+
+/// <summary>
+/// This is used for an NPC that constantly tries to use an action on a given target.
+/// </summary>
+[RegisterComponent, Access(typeof(NPCUseActionOnTargetSystem))]
+public sealed partial class NPCUseActionOnTargetComponent : Component
+{
+    /// <summary>
+    /// HTN blackboard key for the target entity
+    /// </summary>
+    [DataField]
+    public string TargetKey = "Target";
+
+    /// <summary>
+    /// Action that's going to attempt to be used.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId<EntityWorldTargetActionComponent> ActionId;
+
+    [DataField]
+    public EntityUid? ActionEnt;
+}
diff --git a/Content.Server/NPC/NPCBlackboard.cs b/Content.Server/NPC/NPCBlackboard.cs
index 322ff0f85be..ffdb55045d3 100644
--- a/Content.Server/NPC/NPCBlackboard.cs
+++ b/Content.Server/NPC/NPCBlackboard.cs
@@ -34,6 +34,7 @@ public sealed partial class NPCBlackboard : IEnumerable<KeyValuePair<string, obj
         {"RangedRange", 10f},
         {"RotateSpeed", float.MaxValue},
         {"VisionRadius", 10f},
+        {"AggroVisionRadius", 10f},
     };
 
     /// <summary>
@@ -269,6 +270,13 @@ public bool Remove<T>(string key)
         return _blackboard.Remove(key);
     }
 
+    public string GetVisionRadiusKey(IEntityManager entMan)
+    {
+        return TryGetValue<EntityUid>("Target", out _, entMan)
+            ? AggroVisionRadius
+            : VisionRadius;
+    }
+
     // I Ummd and Ahhd about using strings vs enums and decided on tags because
     // if a fork wants to do their own thing they don't need to touch the enum.
 
@@ -317,9 +325,11 @@ public bool Remove<T>(string key)
     public const string PathfindKey = "MovementPathfind";
 
     public const string RotateSpeed = "RotateSpeed";
-    public const string VisionRadius = "VisionRadius";
     public const string UtilityTarget = "UtilityTarget";
 
+    private const string VisionRadius = "VisionRadius";
+    private const string AggroVisionRadius = "AggroVisionRadius";
+
     /// <summary>
     /// A configurable "order" enum that can be given to an NPC from an external source.
     /// </summary>
diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
index 5075e037eac..e0bcb68c1e2 100644
--- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs
+++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
@@ -259,7 +259,7 @@ private float GetScore(NPCBlackboard blackboard, EntityUid targetUid, UtilityCon
             }
             case TargetDistanceCon:
             {
-                var radius = blackboard.GetValueOrDefault<float>(NPCBlackboard.VisionRadius, EntityManager);
+                var radius = blackboard.GetValueOrDefault<float>(blackboard.GetVisionRadiusKey(EntityManager), EntityManager);
 
                 if (!TryComp<TransformComponent>(targetUid, out var targetXform) ||
                     !TryComp<TransformComponent>(owner, out var xform))
@@ -298,13 +298,13 @@ private float GetScore(NPCBlackboard blackboard, EntityUid targetUid, UtilityCon
             }
             case TargetInLOSCon:
             {
-                var radius = blackboard.GetValueOrDefault<float>(NPCBlackboard.VisionRadius, EntityManager);
+                var radius = blackboard.GetValueOrDefault<float>(blackboard.GetVisionRadiusKey(EntityManager), EntityManager);
 
                 return _examine.InRangeUnOccluded(owner, targetUid, radius + 0.5f, null) ? 1f : 0f;
             }
             case TargetInLOSOrCurrentCon:
             {
-                var radius = blackboard.GetValueOrDefault<float>(NPCBlackboard.VisionRadius, EntityManager);
+                var radius = blackboard.GetValueOrDefault<float>(blackboard.GetVisionRadiusKey(EntityManager), EntityManager);
                 const float bufferRange = 0.5f;
 
                 if (blackboard.TryGetValue<EntityUid>("Target", out var currentTarget, EntityManager) &&
@@ -364,7 +364,7 @@ private float GetAdjustedScore(float score, int considerations)
     private void Add(NPCBlackboard blackboard, HashSet<EntityUid> entities, UtilityQuery query)
     {
         var owner = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
-        var vision = blackboard.GetValueOrDefault<float>(NPCBlackboard.VisionRadius, EntityManager);
+        var vision = blackboard.GetValueOrDefault<float>(blackboard.GetVisionRadiusKey(EntityManager), EntityManager);
 
         switch (query)
         {
diff --git a/Content.Shared/Abilities/Goliath/GoliathSummonTentacleAction.cs b/Content.Shared/Abilities/Goliath/GoliathSummonTentacleAction.cs
new file mode 100644
index 00000000000..abdb0d5e108
--- /dev/null
+++ b/Content.Shared/Abilities/Goliath/GoliathSummonTentacleAction.cs
@@ -0,0 +1,31 @@
+using Content.Shared.Actions;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Abilities.Goliath;
+
+public sealed partial class GoliathSummonTentacleAction : EntityWorldTargetActionEvent
+{
+    /// <summary>
+    /// The ID of the entity that is spawned.
+    /// </summary>
+    [DataField]
+    public EntProtoId EntityId = "EffectGoliathTentacleSpawn";
+
+    /// <summary>
+    /// Directions determining where the entities will spawn.
+    /// </summary>
+    [DataField]
+    public List<Direction> OffsetDirections = new()
+    {
+        Direction.North,
+        Direction.South,
+        Direction.East,
+        Direction.West,
+    };
+
+    /// <summary>
+    /// How many entities will spawn beyond the original one at the target location?
+    /// </summary>
+    [DataField]
+    public int ExtraSpawns = 3;
+};
diff --git a/Content.Shared/Abilities/Goliath/GoliathTentacleSystem.cs b/Content.Shared/Abilities/Goliath/GoliathTentacleSystem.cs
new file mode 100644
index 00000000000..98dbc5e18a4
--- /dev/null
+++ b/Content.Shared/Abilities/Goliath/GoliathTentacleSystem.cs
@@ -0,0 +1,69 @@
+using Content.Shared.Directions;
+using Content.Shared.Maps;
+using Content.Shared.Physics;
+using Content.Shared.Popups;
+using Content.Shared.Stunnable;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Network;
+using Robust.Shared.Random;
+
+namespace Content.Shared.Abilities.Goliath;
+
+public sealed class GoliathTentacleSystem : EntitySystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly SharedMapSystem _map = default!;
+    [Dependency] private readonly SharedStunSystem _stun = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly TurfSystem _turf = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<GoliathSummonTentacleAction>(OnSummonAction);
+    }
+
+    private void OnSummonAction(GoliathSummonTentacleAction args)
+    {
+        if (args.Handled || args.Coords is not { } coords)
+            return;
+
+        // TODO: animation
+
+        _popup.PopupPredicted(Loc.GetString("tentacle-ability-use-popup", ("entity", args.Performer)), args.Performer, args.Performer, type: PopupType.SmallCaution);
+        _stun.TryStun(args.Performer, TimeSpan.FromSeconds(0.8f), false);
+
+        List<EntityCoordinates> spawnPos = new();
+        spawnPos.Add(coords);
+
+        var dirs = new List<Direction>();
+        dirs.AddRange(args.OffsetDirections);
+
+        for (var i = 0; i < 3; i++)
+        {
+            var dir = _random.PickAndTake(dirs);
+            spawnPos.Add(coords.Offset(dir));
+        }
+
+        if (_transform.GetGrid(coords) is not { } grid || !TryComp<MapGridComponent>(grid, out var gridComp))
+            return;
+
+        foreach (var pos in spawnPos)
+        {
+            if (!_map.TryGetTileRef(grid, gridComp, pos, out var tileRef) ||
+                tileRef.IsSpace() ||
+                _turf.IsTileBlocked(tileRef, CollisionGroup.Impassable))
+            {
+                continue;
+            }
+
+            if (_net.IsServer)
+                Spawn(args.EntityId, pos);
+        }
+
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs
index ec6eab58f71..127699e0637 100644
--- a/Content.Shared/Actions/SharedActionsSystem.cs
+++ b/Content.Shared/Actions/SharedActionsSystem.cs
@@ -881,6 +881,21 @@ protected virtual void ActionRemoved(EntityUid performer, EntityUid actionId, Ac
         // See client-side system for UI code.
     }
 
+    public bool ValidAction(BaseActionComponent action, bool canReach = true)
+    {
+        if (!action.Enabled)
+            return false;
+
+        if (action.Charges.HasValue && action.Charges <= 0)
+            return false;
+
+        var curTime = GameTiming.CurTime;
+        if (action.Cooldown.HasValue && action.Cooldown.Value.End > curTime)
+            return false;
+
+        return canReach || action is BaseTargetActionComponent { CheckCanAccess: false };
+    }
+
     #endregion
 
     private void OnRelayActionCompChange(Entity<ActionsComponent> ent, ref RelayedActionComponentChangeEvent args)
diff --git a/Content.Shared/Stunnable/SharedStunSystem.cs b/Content.Shared/Stunnable/SharedStunSystem.cs
index 989af647dc8..23fd87ae860 100644
--- a/Content.Shared/Stunnable/SharedStunSystem.cs
+++ b/Content.Shared/Stunnable/SharedStunSystem.cs
@@ -14,10 +14,11 @@
 using Content.Shared.Standing;
 using Content.Shared.StatusEffect;
 using Content.Shared.Throwing;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Containers;
-using Robust.Shared.GameStates;
-using Robust.Shared.Player;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Events;
+using Robust.Shared.Physics.Systems;
 
 namespace Content.Shared.Stunnable;
 
@@ -26,9 +27,11 @@ public abstract class SharedStunSystem : EntitySystem
     [Dependency] private readonly IComponentFactory _componentFactory = default!;
 
     [Dependency] private readonly ActionBlockerSystem _blocker = default!;
+    [Dependency] private readonly SharedBroadphaseSystem _broadphase = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly EntityWhitelistSystem _entityWhitelist = default!;
     [Dependency] private readonly StandingStateSystem _standingState = default!;
     [Dependency] private readonly StatusEffectsSystem _statusEffect = default!;
     [Dependency] private readonly SharedLayingDownSystem _layingDown = default!;
@@ -52,6 +55,9 @@ public override void Initialize()
         SubscribeLocalEvent<StunnedComponent, ComponentStartup>(UpdateCanMove);
         SubscribeLocalEvent<StunnedComponent, ComponentShutdown>(UpdateCanMove);
 
+        SubscribeLocalEvent<StunOnContactComponent, ComponentStartup>(OnStunOnContactStartup);
+        SubscribeLocalEvent<StunOnContactComponent, StartCollideEvent>(OnStunOnContactCollide);
+
         // helping people up if they're knocked down
         SubscribeLocalEvent<KnockedDownComponent, InteractHandEvent>(OnInteractHand);
         SubscribeLocalEvent<SlowedDownComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovespeed);
@@ -105,6 +111,27 @@ private void UpdateCanMove(EntityUid uid, StunnedComponent component, EntityEven
         _blocker.UpdateCanMove(uid);
     }
 
+    private void OnStunOnContactStartup(Entity<StunOnContactComponent> ent, ref ComponentStartup args)
+    {
+        if (TryComp<PhysicsComponent>(ent, out var body))
+            _broadphase.RegenerateContacts(ent, body);
+    }
+
+    private void OnStunOnContactCollide(Entity<StunOnContactComponent> ent, ref StartCollideEvent args)
+    {
+        if (args.OurFixtureId != ent.Comp.FixtureId)
+            return;
+
+        if (_entityWhitelist.IsBlacklistPass(ent.Comp.Blacklist, args.OtherEntity))
+            return;
+
+        if (!TryComp<StatusEffectsComponent>(args.OtherEntity, out var status))
+            return;
+
+        TryStun(args.OtherEntity, ent.Comp.Duration, true, status);
+        TryKnockdown(args.OtherEntity, ent.Comp.Duration, true, status);
+    }
+
     private void OnKnockInit(EntityUid uid, KnockedDownComponent component, ComponentInit args)
     {
         RaiseNetworkEvent(new CheckAutoGetUpEvent(GetNetEntity(uid)));
diff --git a/Content.Shared/Stunnable/StunOnContactComponent.cs b/Content.Shared/Stunnable/StunOnContactComponent.cs
new file mode 100644
index 00000000000..cc4af53b3b3
--- /dev/null
+++ b/Content.Shared/Stunnable/StunOnContactComponent.cs
@@ -0,0 +1,23 @@
+using Content.Shared.Whitelist;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Stunnable;
+
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedStunSystem))]
+public sealed partial class StunOnContactComponent : Component
+{
+    /// <summary>
+    /// The fixture the entity must collide with to be stunned
+    /// </summary>
+    [DataField]
+    public string FixtureId = "fix";
+
+    /// <summary>
+    /// The duration of the stun.
+    /// </summary>
+    [DataField]
+    public TimeSpan Duration = TimeSpan.FromSeconds(5);
+
+    [DataField]
+    public EntityWhitelist Blacklist = new();
+}
diff --git a/Resources/Locale/en-US/abilities/goliath.ftl b/Resources/Locale/en-US/abilities/goliath.ftl
new file mode 100644
index 00000000000..953d32a5c6c
--- /dev/null
+++ b/Resources/Locale/en-US/abilities/goliath.ftl
@@ -0,0 +1 @@
+tentacle-ability-use-popup = {CAPITALIZE(THE($entity))} digs its tentacles under the ground!
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
new file mode 100644
index 00000000000..8cbd40b5cc7
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
@@ -0,0 +1,182 @@
+- type: entity
+  id: BaseMobAsteroid
+  parent:
+  - BaseMob
+  - MobDamageable
+  - MobAtmosExposed
+  - MobCombat
+  abstract: true
+  components:
+  - type: Reactive
+    groups:
+      Flammable: [Touch]
+      Extinguish: [Touch]
+      Acidic: [Touch, Ingestion]
+  - type: Body
+    prototype: Animal
+  - type: Climbing
+  - type: NameIdentifier
+    group: GenericNumber
+  - type: StatusEffects
+    allowed:
+    - SlowedDown
+    - Stutter
+    - Stun
+    - Electrocution
+    - TemporaryBlindness
+    - RadiationProtection
+    - Drowsiness
+  - type: StandingState
+  - type: Tag
+    tags:
+    - DoorBumpOpener
+
+- type: entity
+  id: MobGoliath
+  parent: BaseMobAsteroid
+  name: goliath
+  description: A massive beast that uses long tentacles to ensnare its prey, threatening them is not advised under any conditions.
+  components:
+  - type: Sprite
+    sprite: Mobs/Aliens/Asteroid/goliath.rsi
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: goliath
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: goliath
+      Dead:
+        Base: goliath_dead
+  - type: MovementSpeedModifier
+    baseWalkSpeed : 2.50
+    baseSprintSpeed : 2.50
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      300: Dead
+  - type: MeleeWeapon
+    soundHit:
+      path: "/Audio/Weapons/smash.ogg"
+    angle: 0
+    attackRate: 0.75
+    animation: WeaponArcPunch
+    damage:
+      types:
+        Slash: 15
+        Piercing: 10
+  - type: NpcFactionMember
+    factions:
+    - SimpleHostile
+  - type: HTN
+    rootTask:
+      task: GoliathCompound
+    blackboard:
+      VisionRadius: !type:Single
+        6
+      AggroVisionRadius: !type:Single
+        10
+  - type: NPCUseActionOnTarget
+    actionId: ActionGoliathTentacle
+  - type: Tag
+    tags:
+    - CannotSuicide
+    - Goliath
+    - FootstepSound
+  - type: NoSlip
+  - type: Butcherable
+    spawned:
+    - id: FoodMeatGoliath
+      amount: 3
+    - id: MaterialGoliathHide1
+
+- type: entity
+  id: ActionGoliathTentacle
+  name: "[color=red]Tentacle Slam[/color]"
+  description: Use your tentacles to grab and stun a target player!
+  components:
+  - type: EntityWorldTargetAction
+    raiseOnUser: true
+    icon:
+      sprite: Mobs/Aliens/Asteroid/goliath.rsi
+      state: goliath_tentacle_spawn
+    iconOn:
+      sprite: Mobs/Aliens/Asteroid/goliath.rsi
+      state: goliath_tentacle_wiggle
+    sound:
+      path: "/Audio/Weapons/slash.ogg"
+    event: !type:GoliathSummonTentacleAction
+    useDelay: 8
+    range: 10
+
+- type: entity
+  id: GoliathTentacle
+  name: tentacle
+  components:
+  - type: Transform
+    anchored: True
+  - type: Physics
+    bodyType: Static
+    canCollide: true
+  - type: InteractionOutline
+  - type: Sprite
+    sprite: Mobs/Aliens/Asteroid/goliath.rsi
+    layers:
+    - state: goliath_tentacle_wiggle
+  - type: StunOnContact
+    blacklist:
+      tags:
+      - Goliath
+  - type: Fixtures
+    fixtures:
+      fix:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.45,-0.45,0.45,0.45"
+        mask:
+        - Impassable
+        layer:
+        - Impassable
+        hard: false
+  - type: TimedDespawn #do this shit by hand because of fucking course.
+    lifetime: 0.4
+  - type: SpawnOnDespawn
+    prototype: EffectGoliathTentacleRetract
+
+- type: entity
+  id: BaseEffectGoliathTentacleSpawn
+  categories: [ HideSpawnMenu ]
+  name: tentacle
+  abstract: true
+  components:
+  - type: Transform
+    anchored: True
+  - type: Physics
+    bodyType: Static
+    canCollide: false
+  - type: Sprite
+    sprite: Mobs/Aliens/Asteroid/goliath.rsi
+  - type: InteractionOutline
+  - type: TimedDespawn
+    lifetime: 0.7
+
+- type: entity
+  id: EffectGoliathTentacleSpawn
+  parent: BaseEffectGoliathTentacleSpawn
+  categories: [ HideSpawnMenu ]
+  name: tentacle
+  components:
+    - type: Sprite
+      state: goliath_tentacle_spawn
+    - type: SpawnOnDespawn
+      prototype: GoliathTentacle
+
+- type: entity
+  id: EffectGoliathTentacleRetract
+  parent: BaseEffectGoliathTentacleSpawn
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    state: goliath_tentacle_retract
+  - type: EffectVisuals
+  - type: AnimationPlayer
diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index fde9aa692d6..228dc05d58e 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -500,7 +500,8 @@
     flavors:
       - banana
   - type: Food
-    trash: TrashBananiumPeel
+    trash:
+    - TrashBananiumPeel
   - type: BadFood
   - type: SolutionContainerManager
     solutions:
@@ -624,3 +625,59 @@
   components:
   - type: Stack
     count: 1
+
+- type: entity
+  parent: MaterialBase
+  id: MaterialGunpowder
+  name: gunpowder
+  description: An explosive compound.
+  components:
+  - type: Stack
+    stackType: Gunpowder
+    count: 1
+  - type: Sprite
+    sprite: Objects/Misc/reagent_fillings.rsi
+    state: powderpile
+    color: darkgray
+  - type: PhysicalComposition
+    materialComposition:
+      Gunpowder: 100
+  - type: Item
+    size: Tiny
+
+- type: entity
+  parent: MaterialBase
+  id: MaterialGoliathHide
+  name: goliath hide plates
+  description: Pieces of a goliath's rocky hide, these might be able to make your suit a bit more durable to attack from the local fauna.
+  suffix: Full
+  components:
+  - type: Sprite
+    sprite: Objects/Materials/hide.rsi
+    layers:
+    - state: goliath_hide
+      map: [ "base" ]
+  - type: StaticPrice
+    price: 0
+  - type: StackPrice
+    price: 1500
+  - type: Appearance
+  - type: Stack
+    stackType: GoliathHide
+    baseLayer: base
+    layerStates:
+    - goliath_hide
+    - goliath_hide_2
+    - goliath_hide_3
+  - type: Item
+    size: Large
+    shape:
+    - 0,0,2,2
+
+- type: entity
+  parent: MaterialGoliathHide
+  id: MaterialGoliathHide1
+  suffix: 1
+  components:
+  - type: Stack
+    count: 1
diff --git a/Resources/Prototypes/NPCs/goliath.yml b/Resources/Prototypes/NPCs/goliath.yml
new file mode 100644
index 00000000000..0befc5d581f
--- /dev/null
+++ b/Resources/Prototypes/NPCs/goliath.yml
@@ -0,0 +1,75 @@
+- type: htnCompound
+  id: GoliathCompound
+  branches:
+    - tasks:
+        - !type:HTNCompoundTask
+          task: GoliathMeleeCombatPrecondition
+    - tasks:
+        - !type:HTNCompoundTask
+          task: IdleCompound
+
+- type: htnCompound
+  id: GoliathMeleeCombatPrecondition
+  branches:
+    - preconditions:
+        - !type:BuckledPrecondition
+          isBuckled: true
+      tasks:
+        - !type:HTNPrimitiveTask
+          operator: !type:UnbuckleOperator
+            shutdownState: TaskFinished
+
+    - preconditions:
+        - !type:InContainerPrecondition
+          isInContainer: true
+      tasks:
+        - !type:HTNCompoundTask
+          task: EscapeCompound
+
+    - preconditions:
+        - !type:PulledPrecondition
+          isPulled: true
+      tasks:
+        - !type:HTNPrimitiveTask
+          operator: !type:UnPullOperator
+            shutdownState: TaskFinished
+
+    - tasks:
+        - !type:HTNPrimitiveTask
+          operator: !type:UtilityOperator
+            proto: NearbyMeleeTargets
+        - !type:HTNCompoundTask
+          task: GoliathAttackTargetCompound
+
+- type: htnCompound
+  id: GoliathAttackTargetCompound
+  branches:
+    - preconditions:
+        - !type:KeyExistsPrecondition
+          key: Target
+      tasks:
+        - !type:HTNPrimitiveTask
+          operator: !type:MoveToOperator
+            shutdownState: PlanFinished
+            pathfindInPlanning: true
+            removeKeyOnFinish: false
+            targetKey: TargetCoordinates
+            pathfindKey: TargetPathfind
+            rangeKey: MeleeRange
+        - !type:HTNPrimitiveTask
+          operator: !type:JukeOperator
+            jukeType: AdjacentTile
+        - !type:HTNPrimitiveTask
+          operator: !type:MeleeOperator
+            targetKey: Target
+          preconditions:
+            - !type:KeyExistsPrecondition
+              key: Target
+            - !type:TargetInRangePrecondition
+              targetKey: Target
+              rangeKey: MeleeRange
+          services:
+            - !type:UtilityService
+              id: MeleeService
+              proto: NearbyMeleeTargets
+              key: Target
diff --git a/Resources/Prototypes/Stacks/Materials/materials.yml b/Resources/Prototypes/Stacks/Materials/materials.yml
index 0a05a899648..e671152f67a 100644
--- a/Resources/Prototypes/Stacks/Materials/materials.yml
+++ b/Resources/Prototypes/Stacks/Materials/materials.yml
@@ -92,4 +92,17 @@
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: bones}
   spawn: MaterialBones1
   maxCount: 30
-  itemSize: 1
+
+- type: stack
+  id: Gunpowder
+  name: gunpowder
+  icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile }
+  spawn: MaterialGunpowder
+  maxCount: 60
+
+- type: stack
+  id: GoliathHide
+  name: goliath hide
+  icon: { sprite: /Textures/Objects/Materials/hide.rsi, state: goliath_hide }
+  spawn: MaterialGoliathHide1
+  maxCount: 30
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 415f9369dc7..58976f79c96 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -651,6 +651,9 @@
 - type: Tag
   id: Goat
 
+- type: Tag
+  id: Goliath
+
 - type: Tag
   id: GPS
 
diff --git a/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/goliath.png b/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/goliath.png
new file mode 100644
index 0000000000000000000000000000000000000000..5839a357960cffc8870d4fccf9ff8523d89093ac
GIT binary patch
literal 2975
zcmV;Q3t;q#P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000ie
z000ie0hKEb8vp<cQAtEWRCt`Vo6oCVR~5&1@-9(ArH>{c87P(qElA4ak*Whhf*@!o
zLOQZ^Sa9OF;C~<)cO(v_9W~%23W5}&l-54NBSDCGiM$R<At^6dLX2sy_j~U7oclfN
ztbOiz&GQT4-goXkd;MN}?Y&oKWdmM1Qx@fzxcR7@Dkp^hH~p#tobbgnrQCW{%CBC!
zRNlI|Uk)FSPa2v2DhkQy3*td|^TvK}{I^?4#M^P`rwU*K1it>Dq(p_IFPB4Kez}y7
zKQ7x_r#dFY5brbJR7KS2U){UZ6IhA?mtVY8-n+ejZ2GAJGy%jmSzAIMwPU3WR{}x^
zFfv668GZgnNQ9T*{@mx7LVuuuXHS;}?)2{8hZfJUEzj5*$|aA1aks{p5}*%lw|W#3
z;T;J6%Gqi3dkPTozuq_~Kib=^x;qwbtZr^!gP10NY*K>g!>knW;eSebH4&cqreG8O
zP5}si<;s<E{`sBe+1)$yweS*Hv0m13@4~xs9Ex9ARD{QvMtE7wJx}j>tZx!tmOl>t
zSrk4B-odOL1$E_QZ~?G_1L1%0we>SuUyw`lJ}W_ltn9f!<DBLg{muhico=#0yO+99
z7<Kg|6x<_Z1<mPJh+%-`vA)JbU+-gC7skEAmB6y8cl7QU{YC-q@(6!!Ykb+;w%=0a
zEXT+*eB6btVIo8Lh;!{&gcuV(3k!bp_cQu4+>gP+y)Re)GO+ArF|Sx73rlbxCznRK
zSV&gTc#nAr4sBoC$K1MB4|vGb=yxH|#QoV7ad-VpP+#_H$uEwBiCDl0(0j$`yQMNO
za6vu(`L54fA=hN|XPxjZWC5@#xph@wS(l<?P^cYd3D$t?Bgos!&)2NNi^>xiAL{~*
zMRCrbdq($IaY%N&hf9X!=Jj@iwgkq?ibKyEc!%cp=ai~|f(80w9HD;Oj*%C{RY1R!
z3$pB=$rkB%Y%suuaN(VSF4kKGxiI{8w3n~d@&b7rD*!pj>AU-*2#@PqBQ=F9!Nb6X
z)@QE}%HpyHUq@X*Fr;}<j)%|BmkRvDQgBurhttniiHyF+QRHNnkMoHBf7|bA2=K$@
zG7X;b;~YY>S|~>>KO-}Z67I|w_n-93VU{z5+r$ez=(EWIrSx1KUb2-$o+tXFsmtpF
zz5K>AtLIrY7eh$z#?_(8=B*dBdyc_jM|6KaBYi#Vye$as$P%ai{{7!p^k=OV7HEq#
zIdfIv;hp{R_2-B2cVVmlK66NURC2P?^-x?z`u=YDY~G9iDfERH5?)F2{Wm|{ZT{|g
z0J|_13?C-(`nxYyRzTahAjGwP>o>B#S-SbXtL&C@Q+j9gh3~h**XUEsh=)ku;q>)R
z^oB+O%7}i9^l4j(UAuOz+Z|r~Y~C^9As_}c9_DMw)R(M?jDE8j3iZ9yCj_K~NI!bb
z82v#GU@}3%qXc)O_iwM`9YyHV-B4cSB~L9zYxFY#c=o>S@o!b=$B@eCOP)pnXdex+
zYw`+_nACGIuy>|EDHfoP|J3#p3JEV;$pf16{(PR&uPuvH>4Vq5w>zLu+5OQsch(*d
zGkdlk%L_g@*e~BWT^a`P6ph6Kl(NbV=a;`J{;uwAKE26SmZzaFJowg5Is3`5^v08w
zX9ks^fcC|>1n`q0dBv}HSIpk9(p3;~T=S!&qg04mp_9?a?fE3RPNDA=;28a04)Fc;
zMRPG%f<W!g`t0xWyObpj-?LMmcfKg6e(}sY*?EZh*}v2Gd0h!(^x-?w2jnw-_7orn
z_4%FIib)EM7iN7Wh;ia5f_L8B-d>i2>tzi_MWZ<fsO$<g?%z+=bBW1+E(Q9><F)Ie
zgc^OlL)c{}+x}js05%6=P7HW4@vt2emB3c>@Ns|A$XJYR(ei^BXI}W=VNO5R1;?cy
zizA_{16=rjJuau@1!6*#+Va_gqDM-Qd&eT_dTUYY`(+Gvw=rb-cn%o%0?m7m`t*GV
z2d*yj%M|(&_}tbyH$-gQ3pk`0y&%T!CRHK{63f<Zl%f()4i;~%)P*3BSNw8+zo9P$
zP2t(SNS`qW37rC>^?i^(gSggjghd&y6cU`qxH7OLmU8cND-nhfQ-wDrcd|H*b_>3k
zB`>5zvS*zOFSoY-JPQ#iMB{H(&h}68N_}izFS+FrC)ytXF{-<h5~>z9$Kk2=_p$l|
zYJb-l`>K5cnSh&wuJO3(YJRjo0C=&X<-^a{i0>(<!c)9rs&yk>mNm{Uqk(F)tNj5?
z?A0O562!^cC?!Kw%$O1~;m7(DSnoZt#mbPsYxDHjg8_FZ4j!3AMA@#^E-NzuToIWP
zqVSs<GXxjb&k|9D8?yC`K{)i5K_+u>V#~x-W0_`k2>RqFKWn}}_m@BQ=9wBQHNijs
z@lTu2(|`WspcRM1T#mtGWe7Yk4Eh5c6cBD<dTs=^yAhlO*RIMWL{to5zS<Z)%jV`i
zc8%G#8d<W_sNR7{ciCXKEF2|4#6u#(*fqMW_xaL8YD$ps8dGX_jU#i5-|MzP@*{Sa
z<#Orw3-v_tJ2qX9aSMY6y*3y8($c?2p%B>b3Tg^+A#2`HqZ^YThSNbwt(mH)01h6|
z7#F1^lt{Rlv{hQxOHfmSz{LdL{WspJf$eU0iF$iKRY=xP5O0lV-k5~27q*6Zfc-Tu
zH_urKMy|7n-O}D6Hb-Uc#>v4m#zb$3c+Y6NXS$oa49Il3tdHL$`;07)YiJ<n>v1Uo
z9uoRJCd8Pm;tjJ7Lv*gNySqBC=j`6;jJ4bdG2F81)cKN3Ivk08h8;<ciM&4`!jGtG
zEvvp1Mz}I{sB&;{u;6>fv_o@dtAMXeexjWL+5Cuq<_Dm$KcL2pU!ulK(wgv@+t*MV
z8|RKq57{z@(q(;)>d7A(KkF(dyWEWHs9$|gX;Spe?FwqP$e*m@TpsL}M;PBm`@5QR
zEHT2jd#HOS7cLs}mYo=PI*i(jl^b2+e#Y;L!fLfO{%)l=pf)xGbGwJQ%Of-m6ezH^
zw-M6*fav<!otm$wej=1H@0Nra4oLKj{$MUscqc>e^r^k{@SY-)dh}xG$50uq%w22I
z^?fgJzHA2Bzt$+_%j1--HShRdK=4qAyVnfW{(!jOpRzjxn-X5F4tSb59nsrRLcF6G
zoC<Tnh#Pr<LF~tFtE{oQ#;|*V*8XA#mfSUD*3S-GId?p4-|-F=R<s!R{66Rvj`#Df
zB}eV@GP{7Rffb<k+f<0AE<Yo(Iv|s!x*hiZ0M}}STR%G@^KntIyKRSvdJlw}^|P>Z
zI?6rn1rE1#l*cjJA0T)Wq9d-?{{4ZC8H?MjO(tS0onl^y99|x~Y{=Z(4o~S10Jxqk
zs0M_H<E;5pk$H&1K;2$aWUUuK$eJvWb<iIW*Gad$yFJ2Z`2%Q-HaRg2vOG|8e_C`h
zi1w0)#Whm`ii#c^y#b8&2f#>Vj@aFVDK36eb7YEg-d(2APEo<{=VKj!RcjgB6BlD6
zWVxjuE#~uilZkhBb`~{Ha=|iV2=YYz#<n^ueQS4(sTk_PsqL<Wj0tak&f;H8sqolz
z@lop?h)vdUp0OoVvPh;3vl>HaOcU#S><<u>bo}l=TE7NaJbhM4V(tb0{~Do9QpVey
zXF5(Y1vLL-q~?15g1$4Ma2T?DT(1$H6+)I5<8E2ppYJGzF}$NWl<7U3vO5M}C8EGJ
z>vzkbD?#7s1<;GQoc9cfIo$vYdaudqR+V-C1FdD0HJ4t2`zE|A!G*`8^pE*m=`48-
zfAh|BIv!)!i=Zq1cv<>X{Q+V)D@VQf@t%OJCC1^udrtBCA3*n6YrD_x95-E${|_^V
VIA3;@Jre)`002ovPDHLkV1lqB+eQEY

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/goliath_alert.png b/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/goliath_alert.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4c0b8efbeb55c660cb2f91d3d731dc828986e46
GIT binary patch
literal 4327
zcmW+)c{o(vA0PX^CMwIMY}qPFmKbZ+%!rwhea)80z7B;H!W&b`GTE}v$eu9PCW)b9
zUL$+LYn>U(7=z#V{c-Mjp7Wgh+|Rk+?`OI91;pBvkNW~Q007`KH#5G+m=jM2Cp+WX
zr{_Mzn7D$??uP;Z{Qakc38};{4gd(|nHw9}MHOrm;?pH?XK{|O%N+A_Y=f)@${wP^
zoNDRz4}r`EKCaB<D?K=URV^MekQEirt@VzYo8lCv!Q`pj_}rv-F5AFB<E<bU%$U=}
zrXw#1oDkb}M1w}+ts)7&RUAX#_p)dm@1iNy|Alu}-(JhUh4+@9Obc1QA0a1hCY<1e
z7zK#LEjhiOj(_cqjSmGKZjZP}oJ7YK!&bxfvinibwk`m8E^hzL86b(b3WyU%5O2N3
zT&D0+$7|Q7jvhSb<#ri)v)|a!1?*Rh1AA<fv^t*eM)CpJ;)27mF_@6spspM6WK87_
zDIh&`&&W;oqFot2b@a=YlIM0a0v0T>yn9l7P-8YryTv;<{-z;kXlV?T@Tp!CF)4WH
zKfAVDZx1uB`?z7WO<ntz9d{J6aUC(K&U}1w=@<3^An{~(&t{KO6MHkV@2b60>eakQ
zu6)S^%D?iilCTXpAysf8=#mj><Ld7&_~mm+SacXkiRB`lw!1bta4RC+Q($x0Ulr)u
z1}j1iL?bvmirAm*@rd$WoBl^$`uKyIj4RgZ=5t8nHT49^)rDozM?LgQ%{lN6L}L@=
zW~L-AWGuaWlp9K<8hsUv!yF03llF*#=!7LEk>in}bkD7$Fl>m4i}yhQd~xpjk)T_O
zf^FSsdynd|T*H;wfRm~Im{i7gcffxkoY>$9t@TljqCUNFioe9|X93r=Az8tz>m_#^
zehdIDgt3G8c?1>zd07l2aMDUGjq20G%a+v5Zzt_<x8qN8ph!<Q7FcCpfgl#6F#Am|
zZi>ln%(b1op*!VpQq846ETr(%w@V?O6uYB*I9o1PTIibx=Co6d7+W!1>;JJ57pLq`
zI-b5^CKzd{;<AbJw(g;clsA+mQeh%FIDEg5-}*T=O#vk1xqTpuTd<v2g11V$b<fQA
zUCq}`NEscz#%g82vG{CJ64D~&Q+aP-F;($=Na$;fH)aSf;B&AirpNB;ok4^93!+ne
z*~avWr{7;vNM<iV&TC0tsP5)=C#^Fz3M`PIx4YC-Kr%Jk&3sussFGu?ATm)F941l4
z-aF6st@v?$bRylu<q7tC&pN5PcBmDH4Dy!jBD8=9_q}`(!$Lj1=-r=}ef^q#l!z6m
zh%_5z8NP^Z%rTuE?<+PULxn-#gEq8Rs3L49G~~czJa-*WU+3o!eN49^8k>66{!VL8
zy4xNn^>6)IE<al|8bW3L77ER-*ynHD>Kx0s;;QY4MS1IU8J7UCdpSqzAN*#8L8{ol
zOm4ag0H!2-;od@4mKe+|pj7;l#3H=F6Jx7frzrq8R`Oc8L0Tm9u;^z&Dum)4?-cX%
z^H*2c!jH9Tav@@@vcbAYf$#@z@ohLA6qQ7MsR!Um0$9tg+_{KCG(QZg<aD`eF319_
zRmmoV?#hrVmc-cg*Gf~itNw|&#2u;LYABJ)49Ac2l(VTlyQ}o9TlS-T^@iZLIQ4v4
zgfRlm=KEyER>^+e$24_v-}M_en{QRyYtg9UxP|1F)dji)5om4cpVOb!7i7#V{ZKym
zGWTenV*R(-4VBzZ=b64WrsbVdM;uOdw8nk`w@9D?lsQwJgv3fM^ff25DZ@K1MX3!z
zc;|_}H*attL_y)flG4yfreuZO@echR(;Rchv4X2pfBixhrCqp9NHD_Up=>bzWnrQ6
z)FkFhxt&PHf>s;FPMK7(3}^37Wzjs?+IkJ+jCOGGM7s4dCst=bzwhby{CJ`80+{7G
zz+hO`^5l7Y>0JFXf5dvS0fz$9zDJVCEz5L|xWmoDK1K1APA46KOoANZHX_T9mFI~^
z8&jHYaEaae`_Tr&ESbXxIGJO0x)Zo^clB-z?-nVIq~vaQ2kF7VL5RYmH*)Gv-^C7-
zhzGJBS8ee-e_UkGNkpV~H?jbSWMG(`WUWP_^zsLWv%vJn6C8=xXkHa6t8vXA$%|(a
zqPhYA#q=<~D?~r5=htt1Q->kq76kB-eBDFf<&$JV{(32bnmyOo4+o?dAbzYn;5*od
z)x2)RkaNGA^UlLpKos@ob^v>~I~!2tQqCV;ju8(2c&~9fwIB7`^*ms{{#+safzLl-
zJ%Q&!kf*CfC?&dNbO`HOQg``^ts>aXn<(lhA^t-iq(@rZ4ybakzwH3bb$?Z2ZTh44
zmo}7(-!YBrIheMDlSfD(tlQ3xD7#As2IEyo1v9{Jj3Y(SJ>mg@p@6>~YLbpEpOB+b
zcFr(I#wl=%Vp56dzs`eTxFx9;Vn96J)^*u>*P@!s0L|!IO@Oli5A7#?7cT5h{#!_i
z(NP^}wsX2+Z&aAa!09USpgXbC==WE{6NpRY>Y&J7jqMneh)Vuhn-pP?)T}d5e_G(|
zSj5t!p|>z3<W?D^qlE$TIE?;<1}OF$63M*$STc#XXlXJe8+Ghzb5EAEND^OT8D+Mi
zHrG09g848e;<@AU7lr@qdbuCCFc5=>g2I^V4(Drz!MN+z1|z)o18Z$_Cs|$F6h^5W
z5T5Y>?$EKOqbFfY6-Kp|Kg>jDPmX=kbC>$Fh9U_Zi5<?pP<2pY4{IARAB8SCSZ%|t
zm7n%iaD3u|d-98`wp`%`klw!)jx{N@@BUx9q&1c(w(Wl_$QgNkybmhw)ml=B3T-7>
zKzW4K>20I+WkCq-rK8rp3kR#bu`{%uj>6d6mh|WJIU1m-_7#dhnoN5XalH0GSVl+2
zcR5OfQAI}r$NQ;yB{ATCIViM{0uu86GGkSV#VwV&*FAYdy;3;vV6`@57+evo(93c5
zv`JT3OZ5L#euOyf>_<OI$Pw{U6#53n=@$H%+lX75enWjs-Q<==>F!c~ZnTAs)5F9I
zwsXOBzXLSKC_OCxsqw)awGEEYP81taosv`15G|tqq=fPt_&zR2+F9m8+>ltU+sYyo
zHK?wQ(w7?NQubHW#|NL#*2S=1Z;RTUl%Wg)cVz}yXoZU~U{2SJi;Pc{9(Y|N4Tdq=
zlElF%wtMkT1yt!Bb&(8r0d^mP%GTwg$uB^B*zkBj8oT(lxX}ae4E5c~=IWrBumvzq
z04>nXJejU6cUi9{2-@qSge3PXPAnUl(O0RTbO)dMg%?Db4G4P8En49DqLCldlJ%0s
z@_<C+kf}A)nn5pA(-WC??Se_0L(!wgiRC27`KPmTwv<n^?{8)V)?jP+SvdXOokH1}
z*C^e!!LxzmMh&XitesCmk_g{`gHZu@Uxe$&{c*WuyFvC>-n~`EtTmS8vNfK)3^%i5
zZ8i1T0Dj`$`ONz#4mNRn8K8%*4q>;wm`lEVkfxda)SD?=5u0h@*|(=dy%hA;R>wPs
zdA?L83<ESti4(Y&86=R-MQ&wc>AlsKY4ipM6G`~;mxWk0joD)w2`e@Anzr12P00Pt
zh{lw(p6g$$oCVF;5|vdeTFtWHom)30@-b=}pq;e|{<)TMkk8c|+Z4buJ;b3XF!Yz~
ze8-0UzXH9R`kBMr*IeU+g06}u%^pZ+^!w;GcebJiTE?-8?|vo|_b`Mj7EShRF+^fi
z9j}J2rna_rPwlw$L7<xKtT@|4&!bS$l?_*5gR=chGr9B52V(!!kZ8z-1D6~1b-VZ)
z5zj$z>(3m&z%X6sbP)}w8A`eEB%yKP98GOtLjLkLR2W<6dXq_m+5567#DY-2be&s8
zS-qbW@d<K14fv|+pk-rrf<|Z;3sadWkJ9qi#yUmTZs$Ujymb2cc*7`VKl=rudje|`
z0<6qYX7>rDA6L@vx7P1-$!@jU`=64%R-ilj&t5b|(deaWWZCkW|NHY>x33?oo=Hva
z`F`$u&)m<fEBlN4I)CBNV4SjpNuO{+48o>k7@Qh~e`hq9?!xS0_Ad+6oS}kufcpEG
z6UZ|;*e_bg6^od{mtH+;*IBhRHGOmQsXxi-wl0YFOx?~&dF?VtqJur$v41%G3`h#w
zKF)qo&o8<=u_KgI`FXJw5`7&b{{onLD&KM3CN@L1twwDGgiSD?s6xY|uK^rq7)CIm
zy~1nPwNDhpY><;x(HI$qd)|=|WN1!=ghdVaUCSTVoS0_jn!+j4;P>_5JO&-7J?hzC
zhMOo#If;Sxh(LvB?@dv575%78RH}$agrZv%K1yvLlj=qvJp6RXRz7@pV{>yt4aR^7
z5(vNKmO?AC(BI5=`5+l9JR+qCj9Ez%XvZ>?kC6jNMX}>7R)msRVyXVRt3Xe@35L8|
zZnz$ITj8vy9QS@hf)}x?KMRL($O+%Wm_FhD;Ja<GU%UU>*qq)*pTPBq<PX6@?^{ba
z=v;{`@)oyT$igu!Fd(Nr22(5%5gvFSY|fx9AIr+;ODTm7Wn4T34G)K$<!|Yca7)X3
zC4yhipiNEfuYdX&hq0+chcNsBs|MiNDy{Dg!-y-ExPSklmbAHIG9T~*=U16f%C%Ch
zse}*U`utj@^-3RURPDpVH-?+R$SSZWd8#4y!`%Kq($r6)U(!;^QyrllS$TCc9T88B
zitnoUK+mTGEdq4{cQMh4ElsLsj+-FBEpH~z5s&eQ@M&UgP(>w%cfj>#Yl81_J3|r1
zSfl)gVTRGGEoTfZjeAQU1$R_s3~U`Pp+3;W*t^etgg*wiNoY-5!y@!*4gU+#oF1GS
zckuib@1=}@Tc7yVGQJWt6RaA|h)ymy!F6%oLAKMp&H^rZl+4hF6=DCdX3ffZQa(>;
zX{+pBeY7|ea>1|(m>9^v9wMV5%r=&Gaal5SX7#CWAtyA3uA29Bt8QliKiBjNWSZG#
zE$QE=hXKD=f=`~WgS|aO>)c28?t57wP|Yu0c4(h92saDgmWYa9co1C6y>{60`$xtG
z+}FP8WgNy_lW!OA7q9$%<QCyr-w~I+k%o3Fu7O{hXCl-`rZoiZ{)seSz~CZv^}o`n
zN)R6C8>5wJ@;RmV(&pl&E-B!=cR~4GKkZH=Y?DUC{|s2&<PSGf7c0b<)XbYjqcRPy
zG<mI6yRdd0k-@e{0mW{TX*)vV>CY;a7PiZ>#4YKXbO(v|cWDt;m2VZzWZxcI@0Z%<
z3Nx5-j(q{;(NmJRTNPr*jB6vZZjM>O&{5t~l11?ST!!o1{H^$e^Sk-JoJ`Cj1k<;u
z%gN}i12#3Uc$X=g;k#FLl>Ji_{rxm%r!5#6X4#o5Ii4~a9-*iseWB>r??_IdsT{%y
z5md2wU*Y$tsjI|UQ3+y=ln2ltCP(xXfTG$TMD_!bhI{s-hd~>K63>P0ezoXKT&R;_
z1gHv*mHfrcE7d{@eELl$J;IDsA;e|e;;Ue8!!yAQ%}#zE8dtlTB4rdifBKYCO*tXr
zBCl~U)eRXa-V3OmL<hcNh)K;<S^-I4-motFaRBt`q7C}a6N;4&yTq0*TbPH}0&ZT+
zWQ<QJ5&k!~uk(FH)zHiOq!L&~ryURPeW225`hp6@DVk`)3%Y@IU|g9*hzRm6^tIzB
z*>I>6h5gD%vDW}2)nb|@Xu*brf-&lilt;_sv5o#7rD8KpIO5-4d4}Gcu*k=rzi#`s
ST!HcD0$^@pZHzW_d-^}}$decV

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/goliath_dead.png b/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/goliath_dead.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6978b2890974525713217db0b5b381024fee83b
GIT binary patch
literal 968
zcmV;(12_DMP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<UdPzh<RCt`NS3zqNK@@&zmQ+f`Kzqq0SOf)0DPcixrDrcfJbCx%
zx!_;$?9sa?1730#L8QVGN{Y}!i1bo~1}YY*rFPwKcfZ-UlbIx~`5+{joq6wj-+S|B
zHjo+EtVt}_#Na|I^Un1W(2iR*k%J47mz$xy8ANh)Io+sDdKw`o0UDsg-tTODw;#zo
z0KsNZtfxH}5hno{c-;=o@0)<@Kms5Uo5TcxJ4+Hb^U?R;=8M<|D8@jv8k$6j0Gxm7
z@5^?3Yi_w`;p1Us>c>UG5TNr;rz7hd_tLSG(eS?spnjkz95Wpnf$e-zjy1502&zyb
z0BGlrm$R{F55t9|0xH0!R)J|q324dbe61=As{^7@&1ym;fc*UPWF`9^|II$v1#<1%
zwtIiX1joh(6-)}!ysu=A7bU%m1W4+d2#oU_kp3oU2D9fN)kju=n`LMitj@8g0nv$1
zW)zr9IoQ_YY}F+KbnY{P`as@DM3d0bPpbm}DnRj4BeL@{4fa0P;{fcq2s}*!_>ef}
zjw4E$Lxel?@$g1Ul{D<Fmy#F_<DXY~AMio<2N-^_nvJ_uuv18>HIT+$u0nq1!~s|&
z&tfv?31~}2oR1>8wK3V#8`bi9+5ic3LO9=f5K7OguaW{_4+Cfzdyag)J<C*Jv`hn?
zqkrHTt6oK#K1V930$YDd02QgPQO9`~>~_26bZq??8WK7MAc6TL?<;0Rk2Uu5i5j3W
z0M1E*G6J6ui+qy^z8k8EK}B5wuAO5DFnTiNsili3O-G^v#zCN6D;uQ(JVTDvS%Q>s
zC+IqW%|IK_2JNi_K!q>+k=$OAlmL~&Tq>}ZpLnQ^_2e1y&uf`i0b3&G2@7FB-;|)r
ztF4S|KVQT7aL()3*V9v{!-?Zq|DhomX(@>{34oVP-uLucJ_p%HNy^5{#rV53sXSjT
ziXFj}2w(!f?*`c<w$=MVnFJQX35(JW0&8~bb&+~#`T~i<2WpO|q9MS;0S|v&6)FJd
z`5c=BUs&K!ld*}}I{?0T5i)&1JO6$u6{r9b=#<G=%%%epkk@Wfy*#44v&z9BGH*lN
zW%fJ4%(FlP#IOLwP8?m51<J^LN3!?D#ExDs(qs6YvL6=CNJf)l55XMQ-GNF?)PQzk
qld#8V1V^hLccln~Fn?ej*Z%;r8ZGkqCs+Ld0000<MNUMnLSTZ5*0pc|

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/goliath_preattack.png b/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/goliath_preattack.png
new file mode 100644
index 0000000000000000000000000000000000000000..743e9f35be44fdff9f8b43dec365af9a5646111c
GIT binary patch
literal 4249
zcmV;K5N7X*P)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il00009a7bBm000ie
z000ie0hKEb8vp<hOG!jQRCt{2ozIIL#}&t0-bN0>!2$__4i+(j1cJ;WgzZBh=<G{C
zJ|*}V$R%e({)6DNPa#JWpR$mP&c<MjZ5FXe7#uPv$OjXUKq5jYitNpNd-~h+?bomR
z$4qzE>{1WJ%=VA^ylTC9RrR`FRi1Uo8)viQY@pnEo}I}?lEj~uA2a|3Up<>;cb{k3
zAKtj0eR$_EyZ@rSP^<JN4<zyD;kyRF0tmeIbanjw+lP&7AAP@Oo!?t=py1_veLu_V
z`yht!J&D1`b2y3hcMSjqd~of0^<9M(<tM-EIlT``K&VKchtS6FD^u{bepd83@b9tt
zL!@v08wT*|OWE<|^61~bURj)0+<w~cdOa+b6;W$!dk7wXQyG)5|GD;<J`;UbC!zi|
z0|5Nf+eg{2uI<;{4J)LT)5_alh93Lmo5QO8>Uszv{x&ie-~PhwckhQWCVx}u;#USh
z_|2O)vx~1^DULn3x2U;%TY1m&wP}E${endUOn2l-h`+6j$@h%h9-orGiFEOE3%6j;
z)q5`AyPkqxEQMC6(#9V{#^8JHf9OBnUc1ZnuRMUl-+p;@?A>2nuUwH=S<m%ZPXK`x
zqD-|y>jt~{+sL+jul;Wm>m7Ev{)GXk%OU*2-g?*(YWur7g!Y$kX>ZjgS?S`BC5hkU
z=Wsv#<DGM>&xhZy{!zSPpXU<M)^PY?ulwS^Syed(HeiK1%n9-Pit?>&!?%4P75zbY
z^&f-ZS2n4C)dUpn&bbv>U61Y5v2ywVLc>6N97;e*ZIinAW6C!CP!kwB=N;e0`sWqA
z6u2HrSKFuOFUx>3^g!V1?mHcv5PyhV&bzOfg3r3f;!`%|SGOTxz~14*ubVLdg@oJ;
zIv8rX^aLndk26%M65^{2<!jlS^3}sxzBTkI_$pJ>zfyy6EkrAb_6h9<714*FmEpON
z_kb0`;@JacAH?IUg!ug1@<TF&uXTvQpQHXcZ}QqDPjnoq2EyS5%JCHV^|AtgUxL}=
zRoRqpkB`mwnzA|ho{Y_}IU-otjedFrEsa*Hy<j`^D3rLjIDY&?JsdhFUnTLw{MN36
zj!#kW?_OCQ_pH#mFx+c@L2zTYN-Hd5-mSgNZTU8$miSG6URvQXEr)NQJXZyIcJDCz
z(d*5a@}<4{{VW4YAQA=mjh|o7ZkhHi@#FGq9st&Z0uV6x!f7x5@?>R&v^KgS!ZCiu
zIrcim(u(tNMYKYOJ`+DKzc2vw2z46KcV!gn;NYNoJ9YKni%JP~K~MtMQ~6M52G)mr
zyz_}4kKgD6urLVVRDx~<^4T}*_J)e!^O6KHV8z-3c|BK85`SKPVF0u~S_t17X(ys^
zM@uWjaVT)@Y`sugAY<6HVhCIkd!pJ7q0GmNMdC-~=URXk=)JXq6@GqnnEm*rtWbcK
zifd_s7s@wIXqzrB&!PR{w4^pk{5bqZBoM-O0ym-nov8w={Nw&g+1uqkydH2)Kl<{~
zBNymZEb-&<YkdF~ghH;0i%}&YoNUPXW_mBrL)o{MF6-gT>*F6k$<F-dm33#wj#CqV
zetyjWZ~;Dlny)TmSn+3hT?yO>2s<UV61eC6^XIed{Pk*FN=3ma-h(@D#S(vheq{iB
zIe?S@`C)B^kZ0vJRtY970I14X#cU50ES-pw`0@Bv96;g!dXb%h6+#I_s+Px&8FYXW
za4$AUajUc_#<%a@Ijpi#*vqx^;COA~$K&^yMz9hnh8v*R11Czw4hk(R^h&aCc1+^W
z!_W1ETA$ve$M7AW7{3xmWmGA4aBz+H?%KWyOZ+(eMjt>SRtbBos>HoTO<~VPK_Og!
z$9Y|u`0@DDtPikQ40dseABR6^eE<lfPj=dp&R3f%KR)rt=MP#RKtqal8WUp7j51A?
zAD{T+^Lwukz`qG09AG`JWv~*EZS&(3e;R&peE>#~)aopRa1V@N#5Vcyi9Zj&u|5DV
zh62bWdDnsSg+m`1njfF|^YUx!1K<-Dqw~t_ERrs`4MPsek5Byh`PKRW_<UR59Kre^
za4Gth$`e?bwnZAphV;pgPy9IiT51?9kJblen53xFk+d+iPE~@#mSO_p(|-B+i64ib
z6K;hwOIS!7+;dAjr}u~Q;}bs~zgQnY+Z=#7uT005ZEhtr9#xmsmLH$^@%V)YpsRUD
z^3&B)JS$X?wm<xi&%36r3+2Zrems674nWt#g8sVv{H;Woym{xm-i}LgEfv=c)=+0A
z@#p6khZ!(n?+`b#&_9<KYI-t7lMTGyCq>I<MO2~0kH>e{2T=DzMYLVH+cKtACDaWm
z6rXMR@rgelzp*|*XxcJ`<49b`AcJRlwjAWA|4)=uN&I;H#`*xXKoou>YZuN_!)MV3
zW%UV&1bIDKSiYAZpZN3g8=XMwe)wtg({YSbkTU~T@j5Q}`=hV?{P@J5m)}?)fWllf
zZGRwL`RNerk~EUV?|=H`DrGtG<MQ400U&Rca23r@XD|Wo$L6Q2Xns2G@p`F=ACDhg
zAE0;{VdBeFLR}D)u=(lMY9T}O;}d@#esFyNuK*tVOx`hbn8EB+igjsT8wFSN@sq@l
z$q%j%5E_>B%}=Mi_vU^hKb>LEFMqOZ=bkJQKO#T4K7c1f^3x$tU%Qf>`?i?`$qotH
zIi5}YIQ-W20qA!4$;F5I<fm%{N+lHNNc=eb$^h7*fN&ULI}NHtTYfq#WAoD~9E$Ko
zMdHWfH#&hR5IJfr6c_z-S>Qh;1(`~O^3!n-CpmaKUwQW>ejL8LLdfUO{QPt~E*+Ym
zZi5q^@`*n$-}L~RpRR9^C?7m})GI$7zzcipw#kZ(g(v>}{G3A&T3l%*)e<EXSmo~z
z4-3V-OjS?Rit%aJsDUJYTz;;rQ>c}2nG!2~;WFd30xF|?1$xYNaS}fc-(4SIOtIx^
z$di>%{CNCP*9TBoDE(<@MH7Eo{^0ciyuU-rZj&dU`19~v*9V|zumQsdonOXCQ=eU{
z`ld%G{(Su4`T#7Dy~tuR;`91eCG53QDNn3oeI7#M&&SX0Nfu12<HSQMh9Co9S9)&9
ztBh47^bk%mKeUPDuGc@;gM_Pa#wrzIG>UMwytZA$yIj>6{5F}JubXH?x;B`MRex6<
z1`yQ3xaJH5*5`rkuHjbN&W*wEBYp1Mgdf^kKJ-Hvo8MRLeYFW8RkDF(nQ$r*!RnGc
z>G}`$j9^UuCNehPYYy7>8ID>1T2XxWjDOg^wCH%q1VoKZL-duVeZ5K1|M0e5xToR|
zk+JyR4(n~ZuE(r@%>X#@fY!&2jPW-+APOwnqf+U%-LCC}fOv@!Q}I2Sn(ytfuE%zz
z{<$tpMA)UhW;?|9%baOa9A{6oC7nrs^&G<JriN4VRi@^Le%;yu+_n1W>}7JQ5a66&
zPRp}xj=ChAw;c=nAnXq0*sK8a)%W-JvnlwU4`Cuc>#6O%eHOb`|Eg$C6KdPPUZ*J0
zVy)|GYvZ*t*!1A&=;#=;R>$PG$((#|6tIi+&sm_ie|^ZZV0kyn?;4qE6K^kD$Z6zz
z&A_hKKd(}ZB|qIxPo}le^>i&#*l>9-)=FgGE{bF5%M@FmOu$!3{C0kAR<MeV96>2v
z!<NS=w6M?+$J^yXWh{P3=H}bBe^={Y>t4{cSeN4El<E9(-Lb+`LamVP5H~Q;&67?O
zKjZ~>t^TbsC4D1hU6011FJ|4s-Y1m2-(snWKQF(rJ^<&D+xN{wh8kV&NY5vJTz<_1
zFu{;xQw=?`?a_9JK?R5fdP=AjVjQ}Z<K<Yi@|B4{Kffs6=BGovcg>;XMK1v{B<z8z
zBz`=8qYt3_*MBHO6Dw+c-V`Oh&PK9enHYi`92_*tP5gQJwb#L#pRQw1Z}y1}DHNa<
z*3}kqGvvgN$FFX+0f<jpUN9i<90ChsC{v|t%<D<w$Kh87Kset*QPlF(?GWy@Uld$}
z1&XX2^4h_~kHfFE4mtys-@P`(Yr8z5i|Z?iKR>?_34~~Vx*dnoszTF}v=hQ>t-xxR
zc6_`rJ6tCI{Cu|<tU+U4k%|Y`#gD!A2Z|x+(I?d@@#o{`A%&Qo3K+gKp3MF0AsB!1
ze(rujX>(Iou3V{QtR{Xueje&XzzX#{m4Mtgy-YjyB%D1|zVy%+A9R0-AD7>V1mZjQ
zst1^^MfbEvf!Mzug8PbI<!ft&*!g%+D#lC{?q&bjw0(&mk6*PWo9thY0u@Zr;Dhd2
z?=6Xv_;LBIuY)Nzm#yZqoH(?0Qtmv@wwA=7j_(?P*CuuKUPC$T>e{lNlKAuS8wSvK
zMG8A*NfQ=0W!aXyNp5`NPs`8kMIn$UT#t^hVsc~oU87oE<s^PQeq{g_-bZ1D>0UQf
zM8lY+Wd_~RN#SeK$7!g4qY3D$I4jR<3A>T4w<*K%&@!fMmqPAv$keAP`EA)fbMX7f
z82nrdW5q-HZQeQF$IMo5UOT~|(599%RHovGQrk{j{c9eeEv*aEmirIDEm^>rvsg9T
zRkt?l+bQZRWATUP_K(fqR5s-|ngB1Y*-9uc-F8A~iAZ?V4UV^!srY^W^G{R#3j<(`
z*sHiFT#lS>Co4N2Rv~pcobKf9YOOKqJ~9=*E2sZ7*1z%qoIj>nByBFQnx|HNvbU*j
zhOP&n%z4K-wo|%Dg2!)@srg;&9G#Z>7q@Y5ISnD&2Vk26yBvv)L_xG7$a%+{ce)^2
zCqk7Tzf0!edn<kM8Jw2-=g1M)sY7kn=k*D6<tjU))e3XpbtlUqd{3t2_gUNMq}SiI
zxvuHN6t&pUFoR=NSl@T$mS$|fLc^k6<a<rRX{dir>tkVdzPa`X+B$}8S9ApnUA=+{
z54eWCQ<VK>Pkxsq{$_mF1B9%PzXG*TbvcCIEswDR8j`dz>LGl}+<e>gou>Ndm>PuM
zATMUBai~M0x#)ZsT@6Rd`*aLSp(R^abrSgYKmRn<zZMGCp-3OGv1o|8A`VabxUs~K
z!>`2w+N5vCgo>$xRD!whbU!*pDe>d*i(w%CC>AUVSf46KC2)+ZP2e8QWaWxiw%y@*
zbx(;OmtVsT2}EE{x;G)w8;5!w9`8j+;?K`7kRj{y+Ky^&df8!7D^yWSv-$2;5<eb4
z?@A!-n}@EmQ`rg8@TBIxL-;x}@#FG)I~~tL;f6l?>Zq{b&|dWr`wG&Vw2=65_*Ic1
z_k%Q}kd?xM-g|TZ_&}7PqPE?!)@UX1<M2B@K;Im9Pf?9PX#k=v3YPfu@{33yvPDBl
zidwK1sDdO!oa1XvFZ3AN3perO@*Bl5iO?QrAcDgOt8Cj424Ky0ZIi^GmtWmh<ctS8
z5o(2uTdNWrk8(8%oM$>S;P~z-pc5k#KMubrif)Jid@`pT?gc$fU2cRO6tz0-rCMOf
z`dInIkH@cy;9Duex#9%=(fV{u${|NliA80(m0MC*#Win`;v7m=O#C?fTFap?Cv?pj
vjXzW9c3!==s3tag;Z1w2Z7zJ`&(Hrqz^MZ=)nzRP00000NkvXXu0mjf4$*<;

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/goliath_tentacle_retract.png b/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/goliath_tentacle_retract.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0895ccd15584b4e1db557e7dcdb637e0dd63840
GIT binary patch
literal 1926
zcmV;12YL93P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000ie
z000ie0hKEb8vp<YI7vi7RCt{2THi|?R}}u%#8ub0nD}FxU5rh$O2r3hifKqeXwy8l
z<S~6HGz4kWhf+!&OZyK<>06Le66j0bDs7>GU<-M$O+utXMYCCJjjYXPjY`!0q0#C6
z?#!Kx#?{%G(RA58pfiql?sv|2&bfEE=j=y`OPK(axReQSJ3(X1D;lq}(|`L=gyM<-
z8h@z5hq-l4-WMYYt|NfPD-w!P91&pkHm`?Tk7=#Gr<ldwiAp`CgVT8&5kNpI3G{y5
z9tOYFc*^TXj%aruJaD9e;}m$2`OcJ!O-)FAk};(@&ty+_0V;$&S^|itj8{VZR)<mG
z*>`}`5G+(SN1ps!km582J=q59v{e+VI3_?DUr|#Dr2iiTyw}#I{doU=L9yUj3Umi+
zwL4FieRiLFC2B`l^i?`~-xdMN2zBl1>e4a`OS<<B@XtbxI964qP2_S=2Je>f#P?6e
z<^3e|MbN2iO8^b9f*zZh#!6RIOUx~rpzUjGfWJcCU+iqg<<Un#5SkzZW8oHHWW=#@
zRsxCNA@DipFRh~(NJsExb{`sR{iYuOCTDQ2>5%CJzB4j1vMoE?5}>@!douq0xdsfy
za`<8{izI5Wo>@gqL;=CC!;eleuBW~Z7b7|m%1chgiVq9^{U=d;v$Bc~WRMcL(g{LH
zx&>dGuz|m03Q!5M%87?!HE0XQF@_`PSQp^6K?y#eUB<!cTAXT6i#GzswHcR&r{Pw%
z!vA>esQmh@5co~YPXK}a+S57Q6XQE0H4^{QaL(5JI}$(-5WM#-IwFnKLp|pr>8vEc
zD&PL*!-Wr%7`hRX5zu$M1*3_K_O(`tcs%YXQ58Ogh7o^!WgYKi7w~6ovm~B!Z%LEh
zKY2#S?>ina({aA}a9;ep1TcSi?K`M5ITX_sVE6&65-cIuAFrrENIXf1yt|oMLhn?a
z95<S%lL{~&<2LhgD|{GXOwZB*R(w2ughX{U-rk?Xui|=hVG$P$qUa1I+mWA_04hr*
zXavEiz<TQ<5DVZ{vFH&D0yHF2At^{Wo}Sm065qr_VhlunQvRvp{W1zM-ipt>R<aqN
z#z(SQ{9JPYZP_J>Uoo{ce!&DNCHxFQ=pk5Pc$ay8c|jlZes!f#W?t?9{GU>i3ex*2
z7u(=Y_%vRUF0h>9+gb#<zw`c7yY7WIyHB9)rvWs*bU=g}OmK!>XC%bDmx@g!b0{?Q
z3&Rg@z~}$|xKS9stq&pYy*=p#8Cs)qp&LZ=yJxZXXiyr=m6?mv*$&|I--8mI9#}aV
zg&X5H<A3l2!#tQ5AL3^;5tP`2*oUwU{2d7(gC7a-{y;ta!^XaPwNd=KBf%*HV-aJK
z;&(tsUmpNZj8|WM{lXZ3a#ngZA3i;=LO*Pi{2d7(_!Zt9tvB~%lEJSsWhep9qY+n<
z`k@#Xo^Uvf?p)6Gr!ev59L5)=9eg$3^_L*`U^9#j1+Jy$d`QjFHRks?$Mo|?kVHv|
z@u^fwD$qR{cSXYHck|(YV(c37fuXDG2(U80SvE{=jM>b%7b%cWw!(LU=V@hVHx1q`
zDVN4j;!-96B`#$GP~uW103|ME0#M>oCIBTaWdcy*;<`V8*V!WN5u~{44`5+(e0<zj
ztUZDh#{{q~?(X=rRyh=@xJm)lk>U32|3ykc1XyeD{G0VaS-zf(Ki3SwvGM?O4@4b?
z?%J84s?l3(@58=I*&KB^6h>g-u{@eqWo#Z#%jO84-g+piNrG5B2{!u=#Fa<!O-)T2
zkK;MUF8Q_yP@YvKDjGSw0xSmtNTk!aU=YK?ggTq|Iwe$rq$kv9IAIzv3a2FGG}feE
zSHzexL5^MWZKr^>PS0L}&R8XSCsz^Bp5i)cap6o7ZMPQD8Ht*8c`y5eW@cuD!2z=v
z!g?TuHNm0SM)KuYn_{~(rY5KHsfPrJ%941xzCk``<+kAsVBl)TeAlZcDXR{Q0G7en
z2=Vw9$q38Z;K?&}=)BRQlb=iDWt-SL62MUIXYN%kZg@^mx>>cykd%g2y^nxiVos(~
zDObi@cNbX>Gjx!hBDbFD!z%GQHtNSUq6^Sm7e^`9Iz21IWSbuEsrN}^d#Wpi_v@rb
zSe;eHNtValh*DlPOK@JL!>RT#eBCERp52yZ@$aq%1^Id<+4}BIVtWl>IGqnQ%0-aI
z6TBC<#m@oRyu{9ofw7>BfR#Yh^F@$(O;RCJfz4Na5QfJ7l05_L383+O?#J`>#O<V@
z?*Mw6d1wWvH<%7XvFHXRycTY6+y%Z8sdZYc{-4fQ$?fj)C}bouMIZ<wQC(e8&GQK0
z9?$S1s1+Po5+PrO^P!BXgbG<Nqkwa9QRTWaDE51Br5E~;l(9gIiOK&Ll6tlX;KbKx
zjM!Uc9X3ySe77sZDzw$&Y8txR)#0rs-l{xZj8Z-jL5WM50F=1=2Y}>+6-FXow*UYD
M07*qoM6N<$f`l`U*#H0l

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/goliath_tentacle_spawn.png b/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/goliath_tentacle_spawn.png
new file mode 100644
index 0000000000000000000000000000000000000000..9172b0099ce49fc6915688cbf678a115402e6a0b
GIT binary patch
literal 1944
zcmV;J2WR++P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000ie
z000ie0hKEb8vp<YN=ZaPRCt{2THi}sXBd8BYof6Uw*JVPpsq8Pi5FoVc4Gr!>vp-(
z%kE;ZBC>TCV~k#o?H`b_yCP+@u$$gZw!sR;6?);;mdb>QHq|*Raka53Rr5ouXW#Rk
z^Q9+Z%*n}7mn9F#Nls3_=Y5~={oe00?|T?!j*0*%b5sOCnWG{A${ZB|Q0AxzfHFr#
z0F*EqTVB$5U6}pLWp|8{6@bn+*10h;G2!BCyCRgV0Bx>kxHq9YU6v6*yx-BG{rKR4
zD-wxlqobn-7XdVYSGz`7#kr<q+EhA?yHD37PfWb-_Sb2co|IR0Up;#*zL?jZf&`$W
zopZCG5$h+ya0_AyasAulMN?Cg77PZ#XRMH0g>+J&r{0GPp=Mkfd#sJPs^QZ%a6Ax%
zcln95iB9vGEAtB&54HgD#k^x%7J$yv;hsRFVZ<!p@yO3eeg>P;z$@aJaUqTsa;s1?
z+wSpXgcw-|*1TTC5()Gg!i>d|(s{yaG+Gv5Zf;IE?8U9+75V-`SF^mnaWaA7Xg0Zg
z)?qLT=s3~$mWHlqHTtGE;MJbtI_l8-?mRkfub?XwW`qEKWG#tYup|Iy|Kr56bdV9y
z6{^MSg7C?0iV;MIe^R{nq3cGAPM%KS#cgZSF3j8nosU1Fz+s$9EFn?fAn#Yr_|Whg
zFnBeY`EIub8+H}IoLvXJ_2~5Iv(H(N-(JZ)*YrXVTUg2ZE^|Z#(27lr{QdxQk0*P4
ziq2_XO0D5&O`Q~_q0J{Jhf&I$6pzP?ivVRjuM~r8y$3!K@?IfA5U%diBF^q$t8E3}
zUG)oc=*b7p?g$*q%_U%PGuk-gJ@qc>Y)?(Kn0=p&$g!AT=A@vQ03kr$u?xxp926oP
zFOJNjAHvb-pF#-W_ZtD}Jny^lJZU)zj(I-ND3c(ar}%xiBmRyEQEJ6K4TIx;83F6w
zu=7cf+Z%U*uSIB`5!wH<C6C<hE{#FX1eXYeKolwx32S?CCg5x{7nsFoL~uC_N5ff@
zU=@}HphHY5TvtP4zXvnD2zQDy?rq5|6Mk+b^a=&{crGuBZWbR{6(R4z`9Lx=3Cb2L
zlTgq>NQJgaE*VEhM~%zgoCN92HI6OL7Lti)4C7ovFyRht<9B=s93*yfChMLt0d`Ol
z0_-I!0-(%M5ddY5iU25cR0KeYquAO&Nee*dk5##_xTV2vZJ?wDAn3dj!47N-phAx*
zrZ8cbTXFJwtgT&Rp=80vShfT(J5RjY+N#}q_;BAupwng%IQu@E?6w48$VF$SBqa@*
z(e{5OITdvUTTX|S^9mHCZJ(pSY!CTiF9j4Xz;@;3dtroc-(Am!UGYnL7f`d$5}92%
zDuAliVjrNKud1yE5(g-N+7VV<)i_AxssiP!4%reQV){XH8hR4kODHGQmHf%&RekoM
zi~o6`Q5H|l<@2ITW99)=X`DYz|I#*w!9)mOr4E5@D#XdnP5d)ImsP_rrg1^>tJfT>
zUGT3*!dh%`B_ld{;jWUeS+G@wQ6Yw2rONYz>8=7O)#V#8<KLfaz;HB;2T#NJc6|e#
zNFolmZUkicI;)01rTPbK!p!eB@qf9P!aQoRmE1s7L;?A)3p=`y)kE;Sf5EN*$_UkX
zz!DUzFrSQ{kf*PzIzO7$o&q&>c;(q5?u+MHnqu+v;z$}!U?=`@w4!rMh%fl*yeg2A
z7w{U_W?3c5hr9xq>+-TH{0Nv>-@-eoW&BasEQyKxtD01wW%J=10ra2pX2Nl)`8Xyg
zCv7bS#m}<1NcWPT;U7w*qyT1IzUe~mM>;>b`%ks7Z$bM;tIo-vQvlWX10#$$vowI=
z4{S(h@#HaLH8ptqa2mggD{FVXhEOy{!H)BazyGKnNyAZnTr+=6MBhYJEdtQ{g>EHR
z(Kq9h&yB@=QUvCs$zAeMP61SXt=(vYAy@`S)Qguz(xJ0-K9ow~=h`FaNUchvSfypb
z63`nJSf>Zp3iUt3PbWAoCty221b;v*g?S+Yn<ex}-I+gEGS1r{pz88Om7y-z*`;Mj
z=Ow8yh8dWjDI;kh)sGiZD$mDHd{9#@xRz}5TS|heIf><H61>@c8XZ3k%Fd9>H<3lo
zUIF$CQJAUuG>Y8{cjrHn#m{Be6)KG1(m{y(X-{GqAO65F_lra`gy#3oV)OBkBxGi0
za)S6{hX&Oj!XepE;Y7t)@iVl?WTM-d|7<7l#czJ;JZ)IFz@JwDb?O^nU*P<LR25en
z#V2<qIWagMl53R8tI%`GdDSGv+P{0m*w=IL6Fv3GOedQo{Q-1do(7E*758M>FeOf9
ziii%MM`NawOFds~_$&S^d~u>ab0)~g&&0=$mhN=AxTA2!853j&=nf4EpBh<P-f*a4
zf@gqC7#m~e;%9>dMIz$jc{Xp*p6=;M=l>ZZc4|;?x<kYqc~<zhN1Wp=GXHhhnSlS5
e0CrIJ0{japn}ii*;fKHg0000<MNUMnLSTY%E}=I7

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/goliath_tentacle_wiggle.png b/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/goliath_tentacle_wiggle.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7622134039f4c2d1b4c5765017ee9ab97bcaff0
GIT binary patch
literal 2913
zcmV-n3!e0eP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000ie
z000ie0hKEb8vp<c6G=otRCt{2T3c)s=N10ehPA!Uy1qNL1BBW}Ah)=sGHp$TNSjD$
zrB?K*iFgS@l;#ChEoxsXqE>xrMR~|WsT)N^iXxE*R3~|fgpgG$aZ{|AB4HWXrm&%F
zFbigDv+GN+r|0`;{$Y05>&&bZ)Sd^=US|Ju&UY^V@A=LK{Ey530l;G_&6~bt=+}2{
z{43;joyQUYr}O%~R}g#yppEep1uy!xgdX7IPd*9pePcxkcRa4=3jnQrZq4u&g;GU3
z&(}()=+^p6wZnG?(0L6)xn<jyP9vKh?YNg9cmlwwh}T9jj8XBLhQ&%gkk_>bxKoXW
zMb{<yGt)l^@mvDyRqtBdoj)iEWEWr$K>1rhStPJ?K#*yfO?0E}sH(!p0j?X!HW)QN
z#d^vQySt5dr=}F(y}iB0rAwFA|0JlLuc+Awq}K-k>btVChV9{sjL+R5^wrfGqw}ep
z@0}7@3FK0ePq|l_tgKX7FtW6Y@U>}M&xu`|aP(dkM)QE-mZAXAi|8v6UrgRNqc5@$
z+K8XEHKVht%DB3`46V?Q^Zf0~)-EuzeElES_XOc=XC=nt%@|HDfO^N{i#UQs47W5Y
zI}VCX1Ce^jB02Ts1%Qh6YdYOIa|0{AT}FIvL8T*Q+v+M{rR2*!tvEG)8>oXJU|^zs
zQ(ooyL;-$n+IT^n;krj|0c(p7ORYAY#@O{a?0Whs?B5Yb%aiR$+=^prz6*z+G4R?@
zQ~`5oDwa0@c>&N-=WC|gn=dqBWO5n5o?F5!YLr2fk_80eeT2~?_wB8Z;^ht#2%Vl@
zh58S6Hyi!i(!i~V+68zJili3toej$v+VDjT#aHnQbjjV*%K7fPX|a(Yq;dMpa=|89
zumorXqd><-CTo;}32erWwM8Uq>y-2NmQrY_u7xrb5$oEDV`DeqS5D8$0eh$!M<un7
zqf(VyDiXol*7wx^M*-pHSQXycH;txmM9~sUi>(nUfe=m?2tq*sm;rR2X(jDm(#-6}
z9qA<nfKy%@3gOU8vluzorZRv{N$S!#X>7#w^t7j5z&h^fsKGa%o5k@zH`t%Iq~?`=
z_5y<N{ibUC{O?sbiFql9sJe$Gz*1yM^1bd~&Wy+j0B_{=M8mRrKQajwS*98AsY>;@
z7;&Yd25s_5T$;}C;(Z*BMb&-d@u&iU&1gD{;$np0(|MIqvhK4>Nleu|p|;&w(OY2w
z@ii%jiyIp8eEkXrC!*+?uTc$=x(R@8rrB)B34s0qouIQcWNpiWwBLx@hlwt#tI;N<
zKx1~L@2UHECT99UQkHVPimy{B#d#<A)K4&(fhWH;kDV9mZ6MeSC~sG_C?MXKGJGB@
zDqA2~co5BI2|0Xn>&jaK{6Ux{05hd3tmv}NPbJNJUaa0IVBAwX0Kd~9>8&Z@VH?zj
z9u*+MvIg~Y-KH&3{B~j$!%ODY+btRQ&!$#<_3mxNB^Y#`f%@p2nE`ZOM?aUYqM9K0
zcfRi524%>ezTN14Z%}IO38{P7&a(&fbhIhu%!aG8%f61P`ghVxME|@B03AHOREcLL
z<LERaPx)PEoyr!wWF$zPN!f}E=qTzS#Ql74I;m27Ts6A$X#K%{tlmDa9Ollz=D2?c
zq!HCA=a~V8&@V>xHvEyKwAou0<p5Np%0f$zIM2^@Ae5a}5YErc<PAbW0Qlo0;yh1O
z;W2AVd81kWj4J0TgA*MJdCK1UMYBHuzMZEK#PPUQZxYp>4zn3E8|kQ7cC+Y@5fC#A
zhm&UCVhKD=OZ}7p4>PCvVr#v9CLkC)<W#5~RmV<8!(roVZ*NE6^0Kf012p)$pUCM;
zZLMaLg&l2J?<sVi_p<y59)B-3<kV5{C~T*(b)-F$m<u5>N9zoI(&Ie?7D$wY+@DA!
zlmk4@dIf>&_lUy;Je5k}^`|zNM{Ss(V+^v*-M33lrMw)L+8s6zhz-5H_1;QA8J^=T
zpRu5IkGt0VlmORSk?YZW57#+_E(2d^REH|PRkF!l6`+`P=aXrbc{%OOB7rhPLDW1Y
zSJQHyCLjGimGQe`cc0HCHRgBQEM<+)B>?Lwj~xI(bCG2QAZWf&ulM!Mn+*iCc3A=N
zLRJ=9k5@i|4+?}p0dS`$jf|CvFo_w#m>$R~ZrVyk2d0tbpwNP($pRaYpxDlqacIIl
zAmMktKr+B>Ou32EAQ@uc)L3(ESpErnfc2E1>Yw6^8l&@fQY*M}qrAkZQzx(e)s=WR
zpf!C#NphlATrc-zNIAvxhzzf!sx?cy-okmI$=KD;t_d>z<LNZkQ`lVTI7v~K0ZIg+
zq{rg<MDv2o0LY$S?%@ch=&3Xf!gj~3Kt9R!?{UchFao@i7aS2|`l}zE*l@DKf9l?1
z@KIS%6uCVYC>b~jlNu{#K42xsdj7USs|?81-<+L+o1gdNe71<`C&bra27vUuqQ=CA
zxPWrDGyKSWz~A<5H~3k}kHp;kyk?5Y)9W;(5hN-J!by_{%;4uKT%#0<yw`fxNGkqS
z%Xt0l@tu9<nmaF=_c}o^X9Z0CJ@PvevpOK2h!HnGFAEwU{3?vE{3ZMSW7q$UAMac$
znV)xyZEPJBEq8>poH#=6fy}Rxi~04F8an|qAc$1u)mQML=!t!s3@-S=b79>5#{#y8
zn-$_b0PVmM;Na?a%~zJp&*#%k5IAd~xIRRc{+~{4mD0<if8#^_6|r{p$o$yYUHeJ3
zCjcl+rGxQiHHAT8_ie0LQ}v%fSbcVpQz9Z%PR6KZ^g_}6d?65+d8O(nV?`Q`8T;+u
z`<M^VgGWR&)VCiWzI9nX&FrV-<|eH{3DROGF=(c$0Kifh{%a;b&yph5R!mkDqo1N@
z1hjsFV8kvc5Xc+2_4BpjH&CDnI^W-ZZ&3brWpMOlXgQ>yIr=uK*QxndOr5jnt21|1
zBVsLE^FtZV=PQq5^|J{&^_%knmu({V%^z{HrB$ur)UN}P0f07$S3MZ<ke_cC=gj-~
z-&i(|UJXo1<2m%wyc%fWbcY_3VK;^=^4XlH?pH0{+4QIDn-G&S$fe(&4-oyYzhO?W
zkS<e<kwd>`xH16HU-Ej?+K%W1CDgZDa_zD?1d&W)EYhHcA~ZkGOrUZ#N+ZfiQfjWS
z6qZ=)=4+>ZP0Nq}VHA<2g`E0H(pJO_izGF<OFExOBotlemVy%^Y+_7fHkLgHz6(el
zYJOgi$xsHKWV9C0Bk8v1z?bEE+2rSotaqo-aXrtY^>aRe;+zklw7B)l_Y4;G7c-<$
za6&}aA{z=D3n}WG-+Q3;c`AD`p2^QM{ftra_#tyhLL4Y{E7T{)Z2I>c*p0Ii1U(<1
zNzt78XP5nr%Bqtb^q^G49)mgjOjHd{{p6Q@Dm%!}lc%SldPYc>fLE%^*^6xbxFAk0
zD1Cgd=Mw06Wow^u-mTyBsH|>CY(&S#Xvkf4!s@q-q0$fEV#kl#JiR$o6|(1Z3i0##
zbaMs)4Xt_gb8^HyD8bq$Bldg{8ROs7N4(Dm(0DY|s5*A?^QXr7t?aL8v-o;*o6%z_
zuO!oE-4(&l=Mp+^PMx6${SU`ybluZ=Hok#&kMjZgKe?4iS5AKZ)c6g1NSQ*%DdgyN
z$Mu^2dc>tz{j7QIJTouh*wOOo$qIn(zU~2uNBDVbyVA#9J(;1WL;Tc!srtEHs_oAD
zjj#EDQub_ZFjMwSK+_>!^uIDQ<0<n3dBAQ*gR?`Qf#e#4Ek^zeDC_Z90WU-E00000
LNkvXXu0mjf8!EeE

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/meta.json
new file mode 100644
index 00000000000..b9d3f2bd7fc
--- /dev/null
+++ b/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/meta.json
@@ -0,0 +1,111 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/5a68c5f6d3b60ee82c06e0287d1eb8108d2e1fe2/icons/mob/lavaland/lavaland_monsters.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "goliath",
+      "directions": 4
+    },
+    {
+      "name": "goliath_alert",
+      "directions": 4,
+      "delays": [
+        [
+          1,
+          0.2,
+          1,
+          0.5
+        ],
+        [
+          1,
+          0.2,
+          1,
+          0.5
+        ],
+        [
+          1,
+          0.2,
+          1,
+          0.5
+        ],
+        [
+          1,
+          0.2,
+          1,
+          0.5
+        ]
+      ]
+    },
+    {
+      "name": "goliath_preattack",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "goliath_dead"
+    },
+    {
+      "name": "goliath_tentacle_spawn",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "goliath_tentacle_wiggle",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "goliath_tentacle_retract",
+      "delays": [
+        [
+          0.1,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Materials/hide.rsi/goliath_hide.png b/Resources/Textures/Objects/Materials/hide.rsi/goliath_hide.png
new file mode 100644
index 0000000000000000000000000000000000000000..04526a2daca8c3131c1523bbf25b0cebacbcf675
GIT binary patch
literal 353
zcmV-n0iOPeP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<S6G=otRCt{2mQf0VKoEwfi0C2c20;h#$t(HjaeC}ZJ$Znj8w5Q>
zMAo1FF)Ri%x*5U#Amgg+eEZL=I+GtO0VIF~@LvGgTx!JXDwELxki1xm?9R=3EC>?-
zlS3K;<Dnp~5-c|PE0)jWa@a?4!v%n(gwPrS;ob!y1WU4-N`1QfA<O_s!ae{*m-;}M
z0AMd{21F>hQMCO49dAAe^DaQ70~C^OtHuqMV%^MW?g?`VkN~UI_Lo`y2GH)b*G&-a
zT|m9JWD9}#sW+kkaD`zRx}K5B4q|RXL^dK;OR)rux-8KEGzcJc0-aEUMQ_3of@9Vn
zkszM8Vz2*!E(m?kGgt2)l2Jd$-&6uf014m$Sago4{8LN*00000NkvXXu0mjf16qpI

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Materials/hide.rsi/goliath_hide_2.png b/Resources/Textures/Objects/Materials/hide.rsi/goliath_hide_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b03018487591e30f7d755755b0991f04658f4a9
GIT binary patch
literal 479
zcmV<50U-W~P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<Skx4{BRCt{2md{GVKp4bVDI!Ji;#nx3d-9cf>@)Zj9(^TGIhTT7
zJyh@@BGyj26DMDGH`&mp2pK5bWH&p%?@yLY+=(>;{C|M?h1+5*zTDYh05pXbSI#|s
z?C<q~$O2Gfnp+55=YX^VSW~OZ*?l=KcfZf|b9Od@0N3YkdmETx#1M>}HzkAx?*h@O
z1T=;b46Q5#OM*b&f6@>Q06b)kX>J7*t_gv0zZAs8F20%Fx#{c5E$4sHsyVa3C|L>>
z)+~HKKri2Mh+eND3?7R;oMs7vsm|fr_fxPZY5<7d8X;O+V`c^hwl9!50%&&p{RTud
z1K0!)S;6dKQ$<xXuU<(Hp=FGz0r0k7Rhw%n`F~f>N{rB!K~-g;2!qrBU|z2EY2qOy
z%~X~N>vRp~HCu$`sAWk4K-#UgUiyma8bGLl8Y)<86ZRD$c+L7_BuMO3JlOX@2twy#
z&t(I!Pht?c`_%waN2b=l?R@VI&}MuLMFFhwA*1dDa7@!q07IB30fy2DFan$$;1`dN
V+|Zid8two9002ovPDHLkV1ha3$NK;P

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Materials/hide.rsi/goliath_hide_3.png b/Resources/Textures/Objects/Materials/hide.rsi/goliath_hide_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9a53d76f24f03074c838ddfcec29e98692a0a07
GIT binary patch
literal 554
zcmV+_0@eMAP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<S+(|@1RCt{2m(NPWKp4bVDIy|x=~*bAd-9cf>@)Zj9(|?aA?GEa
zR}TsvM8vw2X4c7<-82cUQgonfn{G0{@88l++%M}N;P3(FCvJ_kcy~uX20&A2aqisR
z>*m@Rh(Q2qOmho?&qF}A0$5Y4)7f>kF2n1sTn)}f65!(4tuGVbFk%Qst~Mov1@8mV
zs{}NL5e%&?1WSTIUOu}aS^&7o8q?egCft((<MX;8CU*05cID0<y<5(|qg8Wefl;y)
zD(qR*{Qy0D<RM0lAq;Md4V-2Pf~kIo&vic~d!hk==&cc=wKZmDU|{<KnInK^r@r2T
z$YuZ!!A({$yLpaLHO%8k)(~38oLT@+rH>ESRPueOXA~o}Wl+T|)c4z_YyiN#+8ffO
z2aq&VRVM6XbZkV;7Gb$+S*%(a$aO2CMCw)A?P{QgsWNr~SX0h=Rp0w|6n5kw)*q{a
zF@vu3u?(F64Ra$-My|=!n4PbO9F+xNA5@VQtJrAl6KkT1kp_A1`ya)&{yMXv{*fM2
zq7%UPjTsMV#=@vapM<HjsZlUbo^UBcT${S)^RfWeI2Xa#pJH19x=eSeEWp0ZwTU|c
s_Mucm9{&G=zRHc`-^svEf0FG|U(JOeVi1c3-2eap07*qoM6N<$f_wk=-T(jq

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Materials/hide.rsi/meta.json b/Resources/Textures/Objects/Materials/hide.rsi/meta.json
new file mode 100644
index 00000000000..0ec2b254800
--- /dev/null
+++ b/Resources/Textures/Objects/Materials/hide.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/88d236d5c91e9a57e103957555c2e9a8c63b68fa/icons/obj/stacks/organic.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "goliath_hide"
+    },
+    {
+      "name": "goliath_hide_2"
+    },
+    {
+      "name": "goliath_hide_3"
+    }
+  ]
+}
\ No newline at end of file

From 3946077cb3fc129bdfa70f8765a9d26131d54a42 Mon Sep 17 00:00:00 2001
From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Date: Thu, 8 Aug 2024 02:47:08 -0700
Subject: [PATCH 071/366] Add EntityWorldTargetAction (#29819)

* Add EntityWorldTargetAction initial implementation

* Update obsolete methods

* Partially working EntityWorldTargetAction

* Fix entity selection

* Move and clean up AfterInteract

* Fix building new walls

* Readd no entity or coordinates error

* Consolidate action validation code

* Add summaries to component

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
---
 Content.Client/Actions/ActionsSystem.cs       |  13 ++
 .../Systems/Actions/ActionUIController.cs     |   9 +-
 .../Actions/ActionOnInteractSystem.cs         |   2 +
 Content.Shared/Actions/ActionEvents.cs        |  28 ++++
 .../EntityWorldTargetActionComponent.cs       |  42 ++++++
 .../ValidateActionEntityWorldTargetEvent.cs   |  10 ++
 Content.Shared/Actions/SharedActionsSystem.cs | 122 +++++++++++++++---
 7 files changed, 204 insertions(+), 22 deletions(-)
 create mode 100644 Content.Shared/Actions/EntityWorldTargetActionComponent.cs
 create mode 100644 Content.Shared/Actions/Events/ValidateActionEntityWorldTargetEvent.cs

diff --git a/Content.Client/Actions/ActionsSystem.cs b/Content.Client/Actions/ActionsSystem.cs
index 2f5b344d82e..48c53869e6c 100644
--- a/Content.Client/Actions/ActionsSystem.cs
+++ b/Content.Client/Actions/ActionsSystem.cs
@@ -49,6 +49,7 @@ public override void Initialize()
             SubscribeLocalEvent<InstantActionComponent, ComponentHandleState>(OnInstantHandleState);
             SubscribeLocalEvent<EntityTargetActionComponent, ComponentHandleState>(OnEntityTargetHandleState);
             SubscribeLocalEvent<WorldTargetActionComponent, ComponentHandleState>(OnWorldTargetHandleState);
+            SubscribeLocalEvent<EntityWorldTargetActionComponent, ComponentHandleState>(OnEntityWorldTargetHandleState);
         }
 
         private void OnInstantHandleState(EntityUid uid, InstantActionComponent component, ref ComponentHandleState args)
@@ -78,6 +79,18 @@ private void OnWorldTargetHandleState(EntityUid uid, WorldTargetActionComponent
             BaseHandleState<WorldTargetActionComponent>(uid, component, state);
         }
 
+        private void OnEntityWorldTargetHandleState(EntityUid uid,
+            EntityWorldTargetActionComponent component,
+            ref ComponentHandleState args)
+        {
+            if (args.Current is not EntityWorldTargetActionComponentState state)
+                return;
+
+            component.Whitelist = state.Whitelist;
+            component.CanTargetSelf = state.CanTargetSelf;
+            BaseHandleState<EntityWorldTargetActionComponent>(uid, component, state);
+        }
+
         private void BaseHandleState<T>(EntityUid uid, BaseActionComponent component, BaseActionComponentState state) where T : BaseActionComponent
         {
             // TODO ACTIONS use auto comp states
diff --git a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
index cf5223fa00f..a96ee96cc64 100644
--- a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
+++ b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
@@ -184,10 +184,13 @@ private bool TargetingOnUse(in PointerInputCmdArgs args)
         switch (action)
         {
             case WorldTargetActionComponent mapTarget:
-                    return TryTargetWorld(args, actionId, mapTarget, user, comp) || !mapTarget.InteractOnMiss;
+                return TryTargetWorld(args, actionId, mapTarget, user, comp) || !mapTarget.InteractOnMiss;
 
             case EntityTargetActionComponent entTarget:
-                    return TryTargetEntity(args, actionId, entTarget, user, comp) || !entTarget.InteractOnMiss;
+                return TryTargetEntity(args, actionId, entTarget, user, comp) || !entTarget.InteractOnMiss;
+
+            case EntityWorldTargetActionComponent entMapTarget:
+                return TryTargetEntityWorld(args, actionId, entMapTarget, user, comp) || !entMapTarget.InteractOnMiss;
 
             default:
                 Logger.Error($"Unknown targeting action: {actionId.GetType()}");
@@ -288,6 +291,8 @@ private bool TryTargetEntityWorld(in PointerInputCmdArgs args,
             {
                 action.Event.Entity = entity;
                 action.Event.Coords = coords;
+                action.Event.Performer = user;
+                action.Event.Action = actionId;
             }
 
             _actionsSystem.PerformAction(user, actionComp, actionId, action, action.Event, _timing.CurTime);
diff --git a/Content.Server/Actions/ActionOnInteractSystem.cs b/Content.Server/Actions/ActionOnInteractSystem.cs
index af9b0b1ddbd..3a942ac4e1f 100644
--- a/Content.Server/Actions/ActionOnInteractSystem.cs
+++ b/Content.Server/Actions/ActionOnInteractSystem.cs
@@ -111,6 +111,8 @@ private void OnAfterInteract(EntityUid uid, ActionOnInteractComponent component,
             var (entActId, entAct) = _random.Pick(entWorldOptions);
             if (entAct.Event != null)
             {
+                entAct.Event.Performer = args.User;
+                entAct.Event.Action = entActId;
                 entAct.Event.Entity = args.Target;
                 entAct.Event.Coords = args.ClickLocation;
             }
diff --git a/Content.Shared/Actions/ActionEvents.cs b/Content.Shared/Actions/ActionEvents.cs
index 8e83e25f7ed..6ff86604589 100644
--- a/Content.Shared/Actions/ActionEvents.cs
+++ b/Content.Shared/Actions/ActionEvents.cs
@@ -101,6 +101,13 @@ public RequestPerformActionEvent(NetEntity action, NetCoordinates entityCoordina
         Action = action;
         EntityCoordinatesTarget = entityCoordinatesTarget;
     }
+
+    public RequestPerformActionEvent(NetEntity action, NetEntity entityTarget, NetCoordinates entityCoordinatesTarget)
+    {
+        Action = action;
+        EntityTarget = entityTarget;
+        EntityCoordinatesTarget = entityCoordinatesTarget;
+    }
 }
 
 /// <summary>
@@ -144,6 +151,27 @@ public abstract partial class WorldTargetActionEvent : BaseActionEvent
     public EntityCoordinates Target;
 }
 
+/// <summary>
+///     This is the type of event that gets raised when an <see cref="EntityWorldTargetActionComponent"/> is performed.
+///     The <see cref="BaseActionEvent.Performer"/>, <see cref="Entity"/>, and <see cref="Coords"/>
+///     fields will automatically be filled out by the <see cref="SharedActionsSystem"/>.
+/// </summary>
+/// <remarks>
+///     To define a new action for some system, you need to create an event that inherits from this class.
+/// </remarks>
+public abstract partial class EntityWorldTargetActionEvent : BaseActionEvent
+{
+    /// <summary>
+    ///     The entity that the user targeted.
+    /// </summary>
+    public EntityUid? Entity;
+
+    /// <summary>
+    ///     The coordinates of the location that the user targeted.
+    /// </summary>
+    public EntityCoordinates? Coords;
+}
+
 /// <summary>
 ///     Base class for events that are raised when an action gets performed. This should not generally be used outside of the action
 ///     system.
diff --git a/Content.Shared/Actions/EntityWorldTargetActionComponent.cs b/Content.Shared/Actions/EntityWorldTargetActionComponent.cs
new file mode 100644
index 00000000000..3cfa60d030a
--- /dev/null
+++ b/Content.Shared/Actions/EntityWorldTargetActionComponent.cs
@@ -0,0 +1,42 @@
+using Content.Shared.Whitelist;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Actions;
+
+/// <summary>
+/// Used on action entities to define an action that triggers when targeting an entity or entity coordinates.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class EntityWorldTargetActionComponent : BaseTargetActionComponent
+{
+    public override BaseActionEvent? BaseEvent => Event;
+
+    /// <summary>
+    ///     The local-event to raise when this action is performed.
+    /// </summary>
+    [DataField]
+    [NonSerialized]
+    public EntityWorldTargetActionEvent? Event;
+
+    /// <summary>
+    /// Determines which entities are valid targets for this action.
+    /// </summary>
+    /// <remarks>No whitelist check when null.</remarks>
+    [DataField] public EntityWhitelist? Whitelist;
+
+    /// <summary>
+    /// Whether this action considers the user as a valid target entity when using this action.
+    /// </summary>
+    [DataField] public bool CanTargetSelf = true;
+}
+
+[Serializable, NetSerializable]
+public sealed class EntityWorldTargetActionComponentState(
+    EntityWorldTargetActionComponent component,
+    IEntityManager entManager)
+    : BaseActionComponentState(component, entManager)
+{
+    public EntityWhitelist? Whitelist = component.Whitelist;
+    public bool CanTargetSelf = component.CanTargetSelf;
+}
diff --git a/Content.Shared/Actions/Events/ValidateActionEntityWorldTargetEvent.cs b/Content.Shared/Actions/Events/ValidateActionEntityWorldTargetEvent.cs
new file mode 100644
index 00000000000..57c47026be0
--- /dev/null
+++ b/Content.Shared/Actions/Events/ValidateActionEntityWorldTargetEvent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.Map;
+
+namespace Content.Shared.Actions.Events;
+
+[ByRefEvent]
+public record struct ValidateActionEntityWorldTargetEvent(
+    EntityUid User,
+    EntityUid? Target,
+    EntityCoordinates? Coords,
+    bool Cancelled = false);
diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs
index 127699e0637..83326349c0e 100644
--- a/Content.Shared/Actions/SharedActionsSystem.cs
+++ b/Content.Shared/Actions/SharedActionsSystem.cs
@@ -36,10 +36,12 @@ public override void Initialize()
         SubscribeLocalEvent<InstantActionComponent, MapInitEvent>(OnActionMapInit);
         SubscribeLocalEvent<EntityTargetActionComponent, MapInitEvent>(OnActionMapInit);
         SubscribeLocalEvent<WorldTargetActionComponent, MapInitEvent>(OnActionMapInit);
+        SubscribeLocalEvent<EntityWorldTargetActionComponent, MapInitEvent>(OnActionMapInit);
 
         SubscribeLocalEvent<InstantActionComponent, ComponentShutdown>(OnActionShutdown);
         SubscribeLocalEvent<EntityTargetActionComponent, ComponentShutdown>(OnActionShutdown);
         SubscribeLocalEvent<WorldTargetActionComponent, ComponentShutdown>(OnActionShutdown);
+        SubscribeLocalEvent<EntityWorldTargetActionComponent, ComponentShutdown>(OnActionShutdown);
 
         SubscribeLocalEvent<ActionsComponent, ActionComponentChangeEvent>(OnActionCompChange);
         SubscribeLocalEvent<ActionsComponent, RelayedActionComponentChangeEvent>(OnRelayActionCompChange);
@@ -56,10 +58,12 @@ public override void Initialize()
         SubscribeLocalEvent<InstantActionComponent, ComponentGetState>(OnInstantGetState);
         SubscribeLocalEvent<EntityTargetActionComponent, ComponentGetState>(OnEntityTargetGetState);
         SubscribeLocalEvent<WorldTargetActionComponent, ComponentGetState>(OnWorldTargetGetState);
+        SubscribeLocalEvent<EntityWorldTargetActionComponent, ComponentGetState>(OnEntityWorldTargetGetState);
 
         SubscribeLocalEvent<InstantActionComponent, GetActionDataEvent>(OnGetActionData);
         SubscribeLocalEvent<EntityTargetActionComponent, GetActionDataEvent>(OnGetActionData);
         SubscribeLocalEvent<WorldTargetActionComponent, GetActionDataEvent>(OnGetActionData);
+        SubscribeLocalEvent<EntityWorldTargetActionComponent, GetActionDataEvent>(OnGetActionData);
 
         SubscribeAllEvent<RequestPerformActionEvent>(OnActionRequest);
     }
@@ -102,6 +106,11 @@ private void OnWorldTargetGetState(EntityUid uid, WorldTargetActionComponent com
         args.State = new WorldTargetActionComponentState(component, EntityManager);
     }
 
+    private void OnEntityWorldTargetGetState(EntityUid uid, EntityWorldTargetActionComponent component, ref ComponentGetState args)
+    {
+        args.State = new EntityWorldTargetActionComponentState(component, EntityManager);
+    }
+
     private void OnGetActionData<T>(EntityUid uid, T component, ref GetActionDataEvent args) where T : BaseActionComponent
     {
         args.Action = component;
@@ -442,6 +451,34 @@ private void OnActionRequest(RequestPerformActionEvent ev, EntitySessionEventArg
                 }
 
                 break;
+            case EntityWorldTargetActionComponent entityWorldAction:
+            {
+                var actionEntity = GetEntity(ev.EntityTarget);
+                var actionCoords = GetCoordinates(ev.EntityCoordinatesTarget);
+
+                if (actionEntity is null && actionCoords is null)
+                {
+                    Log.Error($"Attempted to perform an entity-world-targeted action without an entity or world coordinates! Action: {name}");
+                    return;
+                }
+
+                var entWorldAction = new Entity<EntityWorldTargetActionComponent>(actionEnt, entityWorldAction);
+
+                if (!ValidateEntityWorldTarget(user, actionEntity, actionCoords, entWorldAction))
+                    return;
+
+                _adminLogger.Add(LogType.Action,
+                    $"{ToPrettyString(user):user} is performing the {name:action} action (provided by {ToPrettyString(action.Container ?? user):provider}) targeted at {ToPrettyString(actionEntity):target} {actionCoords:target}.");
+
+                if (entityWorldAction.Event != null)
+                {
+                    entityWorldAction.Event.Entity = actionEntity;
+                    entityWorldAction.Event.Coords = actionCoords;
+                    Dirty(actionEnt, entityWorldAction);
+                    performEvent = entityWorldAction.Event;
+                }
+                break;
+            }
             case InstantActionComponent instantAction:
                 if (action.CheckCanInteract && !_actionBlockerSystem.CanInteract(user, null))
                     return;
@@ -459,7 +496,14 @@ private void OnActionRequest(RequestPerformActionEvent ev, EntitySessionEventArg
 
     public bool ValidateEntityTarget(EntityUid user, EntityUid target, Entity<EntityTargetActionComponent> actionEnt)
     {
-        if (!ValidateEntityTargetBase(user, target, actionEnt))
+        var comp = actionEnt.Comp;
+        if (!ValidateEntityTargetBase(user,
+                target,
+                comp.Whitelist,
+                comp.CheckCanInteract,
+                comp.CanTargetSelf,
+                comp.CheckCanAccess,
+                comp.Range))
             return false;
 
         var ev = new ValidateActionEntityTargetEvent(user, target);
@@ -467,24 +511,27 @@ public bool ValidateEntityTarget(EntityUid user, EntityUid target, Entity<Entity
         return !ev.Cancelled;
     }
 
-    private bool ValidateEntityTargetBase(EntityUid user, EntityUid target, EntityTargetActionComponent action)
+    private bool ValidateEntityTargetBase(EntityUid user,
+        EntityUid? targetEntity,
+        EntityWhitelist? whitelist,
+        bool checkCanInteract,
+        bool canTargetSelf,
+        bool checkCanAccess,
+        float range)
     {
-        if (!target.IsValid() || Deleted(target))
+        if (targetEntity is not { } target || !target.IsValid() || Deleted(target))
             return false;
 
-        if (action.Whitelist != null && !action.Whitelist.IsValid(target, EntityManager))
+        if (_whitelistSystem.IsWhitelistFail(whitelist, target))
             return false;
 
-        if (action.Blacklist != null && action.Blacklist.IsValid(target, EntityManager))
-            return false;
-
-        if (action.CheckCanInteract && !_actionBlockerSystem.CanInteract(user, target))
+        if (checkCanInteract && !_actionBlockerSystem.CanInteract(user, target))
             return false;
 
         if (user == target)
-            return action.CanTargetSelf;
+            return canTargetSelf;
 
-        if (!action.CheckCanAccess)
+        if (!checkCanAccess)
         {
             // even if we don't check for obstructions, we may still need to check the range.
             var xform = Transform(user);
@@ -493,19 +540,20 @@ private bool ValidateEntityTargetBase(EntityUid user, EntityUid target, EntityTa
             if (xform.MapID != targetXform.MapID)
                 return false;
 
-            if (action.Range <= 0)
+            if (range <= 0)
                 return true;
 
             var distance = (_transformSystem.GetWorldPosition(xform) - _transformSystem.GetWorldPosition(targetXform)).Length();
-            return distance <= action.Range;
+            return distance <= range;
         }
 
-        return _interactionSystem.InRangeAndAccessible(user, target, range: action.Range);
+        return _interactionSystem.InRangeAndAccessible(user, target, range: range);
     }
 
     public bool ValidateWorldTarget(EntityUid user, EntityCoordinates coords, Entity<WorldTargetActionComponent> action)
     {
-        if (!ValidateWorldTargetBase(user, coords, action))
+        var comp = action.Comp;
+        if (!ValidateWorldTargetBase(user, coords, comp.CheckCanInteract, comp.CheckCanAccess, comp.Range))
             return false;
 
         var ev = new ValidateActionWorldTargetEvent(user, coords);
@@ -513,12 +561,19 @@ public bool ValidateWorldTarget(EntityUid user, EntityCoordinates coords, Entity
         return !ev.Cancelled;
     }
 
-    private bool ValidateWorldTargetBase(EntityUid user, EntityCoordinates coords, WorldTargetActionComponent action)
+    private bool ValidateWorldTargetBase(EntityUid user,
+        EntityCoordinates? entityCoordinates,
+        bool checkCanInteract,
+        bool checkCanAccess,
+        float range)
     {
-        if (action.CheckCanInteract && !_actionBlockerSystem.CanInteract(user, null))
+        if (entityCoordinates is not { } coords)
+            return false;
+
+        if (checkCanInteract && !_actionBlockerSystem.CanInteract(user, null))
             return false;
 
-        if (!action.CheckCanAccess)
+        if (!checkCanAccess)
         {
             // even if we don't check for obstructions, we may still need to check the range.
             var xform = Transform(user);
@@ -526,13 +581,40 @@ private bool ValidateWorldTargetBase(EntityUid user, EntityCoordinates coords, W
             if (xform.MapID != coords.GetMapId(EntityManager))
                 return false;
 
-            if (action.Range <= 0)
+            if (range <= 0)
                 return true;
 
-            return coords.InRange(EntityManager, _transformSystem, Transform(user).Coordinates, action.Range);
+            return coords.InRange(EntityManager, _transformSystem, Transform(user).Coordinates, range);
         }
 
-        return _interactionSystem.InRangeUnobstructed(user, coords, range: action.Range);
+        return _interactionSystem.InRangeUnobstructed(user, coords, range: range);
+    }
+
+    public bool ValidateEntityWorldTarget(EntityUid user,
+        EntityUid? entity,
+        EntityCoordinates? coords,
+        Entity<EntityWorldTargetActionComponent> action)
+    {
+        var comp = action.Comp;
+        var entityValidated = ValidateEntityTargetBase(user,
+            entity,
+            comp.Whitelist,
+            comp.CheckCanInteract,
+            comp.CanTargetSelf,
+            comp.CheckCanAccess,
+            comp.Range);
+
+        var worldValidated
+            = ValidateWorldTargetBase(user, coords, comp.CheckCanInteract, comp.CheckCanAccess, comp.Range);
+
+        if (!entityValidated && !worldValidated)
+            return false;
+
+        var ev = new ValidateActionEntityWorldTargetEvent(user,
+            entityValidated ? entity : null,
+            worldValidated ? coords : null);
+        RaiseLocalEvent(action, ref ev);
+        return !ev.Cancelled;
     }
 
     public void PerformAction(EntityUid performer, ActionsComponent? component, EntityUid actionId, BaseActionComponent action, BaseActionEvent? actionEvent, TimeSpan curTime, bool predicted = true)

From 221d16fcd9425d4a37162755c89b73730ae8729c Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 07:48:52 -0400
Subject: [PATCH 072/366] done until tomorrow!

---
 .../Inventory/StrippableBoundUserInterface.cs |  4 +--
 .../Systems/Actions/ActionUIController.cs     | 36 +++----------------
 .../Actions/ActionOnInteractSystem.cs         |  2 --
 Content.Server/Chat/Systems/ChatSystem.cs     |  6 ++--
 .../RoundEnd/RoundEndSystem.Pacified.cs       |  3 +-
 .../GameTicking/Rules/TraitorRuleSystem.cs    |  2 +-
 Content.Server/Labels/Label/LabelSystem.cs    |  1 +
 7 files changed, 13 insertions(+), 41 deletions(-)

diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs
index 9a365124477..58883d0ac83 100644
--- a/Content.Client/Inventory/StrippableBoundUserInterface.cs
+++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs
@@ -207,9 +207,9 @@ private void AddInventoryButton(EntityUid invUid, string slotId, InventoryCompon
 
             // If this is a full pocket, obscure the real entity
             // this does not work for modified clients because they are still sent the real entity
-            if (entity != null 
+            if (entity != null
                 && _strippable.IsStripHidden(slotDef, _player.LocalEntity)
-                && !(EntMan.TryGetComponent<ThievingComponent>(_playerManager.LocalEntity, out var thiefComponent) 
+                && !(EntMan.TryGetComponent<ThievingComponent>(PlayerManager.LocalEntity, out var thiefComponent)
                 && thiefComponent.IgnoreStripHidden))
                 entity = _virtualHiddenEntity;
 
diff --git a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
index a96ee96cc64..08dbd0599be 100644
--- a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
+++ b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
@@ -121,7 +121,7 @@ public void OnStateEntered(GameplayState state)
             var boundKey = hotbarKeys[i];
             builder = builder.Bind(boundKey, new PointerInputCmdHandler((in PointerInputCmdArgs args) =>
             {
-                if (args.State != BoundKeyState.Up)
+                if (args.State != BoundKeyState.Down)
                     return false;
 
                 TriggerAction(boundId);
@@ -291,8 +291,6 @@ private bool TryTargetEntityWorld(in PointerInputCmdArgs args,
             {
                 action.Event.Entity = entity;
                 action.Event.Coords = coords;
-                action.Event.Performer = user;
-                action.Event.Action = actionId;
             }
 
             _actionsSystem.PerformAction(user, actionComp, actionId, action, action.Event, _timing.CurTime);
@@ -309,9 +307,7 @@ private bool TryTargetEntityWorld(in PointerInputCmdArgs args,
     public void UnloadButton()
     {
         if (ActionButton == null)
-        {
             return;
-        }
 
         ActionButton.OnPressed -= ActionButtonPressed;
     }
@@ -319,9 +315,7 @@ public void UnloadButton()
     public void LoadButton()
     {
         if (ActionButton == null)
-        {
             return;
-        }
 
         ActionButton.OnPressed += ActionButtonPressed;
     }
@@ -357,9 +351,7 @@ private void TriggerAction(int index)
         if (_actionsSystem == null ||
             !_actions.TryGetValue(index, out var actionId) ||
             !_actionsSystem.TryGetActionData(actionId, out var baseAction))
-        {
             return;
-        }
 
         if (baseAction is BaseTargetActionComponent action)
             ToggleTargeting(actionId.Value, action);
@@ -371,9 +363,7 @@ private void OnActionAdded(EntityUid actionId)
     {
         if (_actionsSystem == null ||
             !_actionsSystem.TryGetActionData(actionId, out var action))
-        {
             return;
-        }
 
         // if the action is toggled when we add it, start targeting
         if (action is BaseTargetActionComponent targetAction && action.Toggled)
@@ -400,10 +390,6 @@ private void OnActionsUpdated()
     {
         QueueWindowUpdate();
 
-        // TODO ACTIONS allow buttons to persist across state applications
-        // Then we don't have to interrupt drags any time the buttons get rebuilt.
-        _menuDragHelper.EndDrag();
-
         if (_actionsSystem != null)
             _container?.SetActionData(_actionsSystem, _actions.ToArray());
     }
@@ -480,7 +466,7 @@ private void PopulateActions(IEnumerable<(EntityUid Id, BaseActionComponent Comp
                 existing.Add(button);
         }
 
-        int i = 0;
+        var i = 0;
         foreach (var action in actions)
         {
             if (i < existing.Count)
@@ -722,17 +708,11 @@ private bool OnMenuBeginDrag()
         {
             if (EntityManager.TryGetComponent(action.EntityIcon, out SpriteComponent? sprite)
                 && sprite.Icon?.GetFrame(RsiDirection.South, 0) is {} frame)
-            {
                 _dragShadow.Texture = frame;
-            }
             else if (action.Icon != null)
-            {
                 _dragShadow.Texture = _spriteSystem.Frame0(action.Icon);
-            }
             else
-            {
                 _dragShadow.Texture = null;
-            }
         }
 
         LayoutContainer.SetPosition(_dragShadow, UIManager.MousePositionScaled.Position - new Vector2(32, 32));
@@ -757,9 +737,7 @@ private void UnloadGui()
         _actionsSystem?.UnlinkAllActions();
 
         if (ActionsBar == null)
-        {
             return;
-        }
 
         if (_window != null)
         {
@@ -776,7 +754,7 @@ private void UnloadGui()
 
     private void LoadGui()
     {
-        DebugTools.Assert(_window == null);
+        UnloadGui();
         _window = UIManager.CreateWindow<ActionsWindow>();
         LayoutContainer.SetAnchorPreset(_window, LayoutContainer.LayoutPreset.CenterTop);
 
@@ -787,9 +765,7 @@ private void LoadGui()
         _window.FilterButton.OnItemSelected += OnFilterSelected;
 
         if (ActionsBar == null)
-        {
             return;
-        }
 
         RegisterActionContainer(ActionsBar.ActionsContainer);
 
@@ -821,17 +797,13 @@ private void AssignSlots(List<SlotAssignment> assignments)
 
         _actions.Clear();
         foreach (var assign in assignments)
-        {
             _actions.Add(assign.ActionId);
-        }
 
         _container?.SetActionData(_actionsSystem, _actions.ToArray());
     }
 
-    public void RemoveActionContainer()
-    {
+    public void RemoveActionContainer() =>
         _container = null;
-    }
 
     public void OnSystemLoaded(ActionsSystem system)
     {
diff --git a/Content.Server/Actions/ActionOnInteractSystem.cs b/Content.Server/Actions/ActionOnInteractSystem.cs
index 3a942ac4e1f..af9b0b1ddbd 100644
--- a/Content.Server/Actions/ActionOnInteractSystem.cs
+++ b/Content.Server/Actions/ActionOnInteractSystem.cs
@@ -111,8 +111,6 @@ private void OnAfterInteract(EntityUid uid, ActionOnInteractComponent component,
             var (entActId, entAct) = _random.Pick(entWorldOptions);
             if (entAct.Event != null)
             {
-                entAct.Event.Performer = args.User;
-                entAct.Event.Action = entActId;
                 entAct.Event.Entity = args.Target;
                 entAct.Event.Coords = args.ClickLocation;
             }
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index be995eb43fc..c8cf93d5a29 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -423,7 +423,7 @@ private void SendEntitySpeak(
         }
         else
         {
-            var nameEv = new TransformSpeakerSpeechEvent(source, Name(source));
+            var nameEv = new TransformSpeakerNameEvent(source, Name(source));
             RaiseLocalEvent(source, nameEv);
             name = nameEv.VoiceName ?? Name(source);
             // Check for a speech verb override
@@ -495,9 +495,9 @@ private void SendEntityWhisper(
         }
         else
         {
-            var nameEv = new TransformSpeakerSpeechEvent(source, Name(source));
+            var nameEv = new TransformSpeakerNameEvent(source, Name(source));
             RaiseLocalEvent(source, nameEv);
-            name = nameEv.VoiceName ?? Name(source);
+            name = nameEv.VoiceName;
         }
         name = FormattedMessage.EscapeText(name);
 
diff --git a/Content.Server/DeltaV/RoundEnd/RoundEndSystem.Pacified.cs b/Content.Server/DeltaV/RoundEnd/RoundEndSystem.Pacified.cs
index e4bc631a1dc..b068c56a2bd 100644
--- a/Content.Server/DeltaV/RoundEnd/RoundEndSystem.Pacified.cs
+++ b/Content.Server/DeltaV/RoundEnd/RoundEndSystem.Pacified.cs
@@ -65,7 +65,8 @@ private void OnRoundEnded(RoundEndTextAppendEvent ev)
         var uplinkQuery = EntityQueryEnumerator<StoreComponent>();
         while (uplinkQuery.MoveNext(out var uid, out var store))
         {
-            store.Listings.Clear();
+            store.FullListingsCatalog.Clear();
+            store.LastAvailableListings.Clear();
         }
     }
 }
diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
index 40827e71cdb..3922bcbb538 100644
--- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
@@ -84,7 +84,7 @@ 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 prototype))
+            if (_jobs.MindTryGetJob(mindId, out _, out var job))
             {
                 if (startingBalance < job.AntagAdvantage) // Can't use Math functions on FixedPoint2
                     startingBalance = 0;
diff --git a/Content.Server/Labels/Label/LabelSystem.cs b/Content.Server/Labels/Label/LabelSystem.cs
index 1737c2cdcd8..145a2aad3de 100644
--- a/Content.Server/Labels/Label/LabelSystem.cs
+++ b/Content.Server/Labels/Label/LabelSystem.cs
@@ -21,6 +21,7 @@ public sealed class LabelSystem : SharedLabelSystem
         [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
         [Dependency] private readonly NameModifierSystem _nameMod = default!;
+        [Dependency] private readonly TagSystem _tagSystem = default!;
 
         public const string ContainerName = "paper_label";
         [ValidatePrototypeId<TagPrototype>]

From c01fdd66c97a0c29d30c73a9584247d65fffb0f5 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 11:52:40 -0400
Subject: [PATCH 073/366] we out here storing!!

---
 .../StoreDiscount/StoreDiscountSystem.cs      | 55 -------------------
 1 file changed, 55 deletions(-)
 delete mode 100644 Content.Server/StoreDiscount/StoreDiscountSystem.cs

diff --git a/Content.Server/StoreDiscount/StoreDiscountSystem.cs b/Content.Server/StoreDiscount/StoreDiscountSystem.cs
deleted file mode 100644
index 8f77eba7801..00000000000
--- a/Content.Server/StoreDiscount/StoreDiscountSystem.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System.Linq;
-using Content.Shared.FixedPoint;
-using Content.Shared.Store;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Server.StoreDiscount;
-
-public sealed class StoreDiscountSystem : EntitySystem
-{
-    [Dependency] private readonly IRobustRandom _random = default!;
-
-    public void ApplyDiscounts(IEnumerable<ListingData> listings, StorePresetPrototype store)
-    {
-        if (!store.Sales.Enabled)
-            return;
-
-        var count = _random.Next(store.Sales.MinItems, store.Sales.MaxItems + 1);
-
-        listings = listings
-            .Where(l =>
-                !l.SaleBlacklist
-                && l.Cost.Any(x => x.Value > 1)
-                && store.Categories.Overlaps(ChangedFormatCategories(l.Categories)))
-            .OrderBy(_ => _random.Next()).Take(count).ToList();
-
-        foreach (var listing in listings)
-        {
-            var sale = GetDiscount(store.Sales.MinMultiplier, store.Sales.MaxMultiplier);
-            var newCost = listing.Cost.ToDictionary(x => x.Key,
-                x => FixedPoint2.New(Math.Max(1, (int) MathF.Round(x.Value.Float() * sale))));
-
-            if (listing.Cost.All(x => x.Value.Int() == newCost[x.Key].Int()))
-                continue;
-
-            var key = listing.Cost.First(x => x.Value > 0).Key;
-            listing.OldCost = listing.Cost;
-            listing.DiscountValue = 100 - (newCost[key] / listing.Cost[key] * 100).Int();
-            listing.Cost = newCost;
-            listing.Categories = new() {store.Sales.SalesCategory};
-        }
-    }
-
-    private IEnumerable<string> ChangedFormatCategories(List<ProtoId<StoreCategoryPrototype>> categories)
-    {
-        var modified = from p in categories select p.Id;
-
-        return modified;
-    }
-
-    private float GetDiscount(float minMultiplier, float maxMultiplier)
-    {
-        return _random.NextFloat() * (maxMultiplier - minMultiplier) + minMultiplier;
-    }
-}

From 9e24956c41548c832b112001bf634f73290f95fe Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 11:52:54 -0400
Subject: [PATCH 074/366] errormaxxing

---
 .../NPC/Systems/FactionSystem.Items.cs        |  15 +-
 .../Radio/EntitySystems/RadioDeviceSystem.cs  |   2 +-
 .../Radio/EntitySystems/RadioSystem.cs        | 104 +++++----
 .../Store/Systems/StoreSystem.Listings.cs     |   2 +-
 Content.Server/Traitor/Uplink/UplinkSystem.cs |  89 ++++----
 Content.Shared/Actions/SharedActionsSystem.cs |   4 +-
 .../Implants/SharedSubdermalImplantSystem.cs  |   2 +-
 .../Overlays/ShowHealthBarsComponent.cs       |   2 +
 .../Components/HeadRevolutionaryComponent.cs  |   2 +-
 .../Components/RevolutionaryComponent.cs      |   2 +-
 .../StatusIcon/StatusIconPrototype.cs         |   5 -
 .../Store/ListingLocalisationHelpers.cs       |   5 -
 Content.Shared/Stunnable/SharedStunSystem.cs  |   1 +
 .../Weapons/Ranged/Systems/SharedGunSystem.cs | 204 +++++++-----------
 14 files changed, 200 insertions(+), 239 deletions(-)

diff --git a/Content.Server/Nyanotrasen/NPC/Systems/FactionSystem.Items.cs b/Content.Server/Nyanotrasen/NPC/Systems/FactionSystem.Items.cs
index 0b971c33946..8076484c8bb 100644
--- a/Content.Server/Nyanotrasen/NPC/Systems/FactionSystem.Items.cs
+++ b/Content.Server/Nyanotrasen/NPC/Systems/FactionSystem.Items.cs
@@ -5,11 +5,11 @@
 
 namespace Content.Server.NPC.Systems;
 
-public partial class NpcFactionSystem : EntitySystem
+public partial class NpcFactionSystem
 {
     public void InitializeItems()
     {
-        SubscribeLocalEvent<NpcFactionMemberComponent, ItemPurchasedEvent>(OnItemPurchased);
+        SubscribeLocalEvent<NpcFactionMemberComponent, StoreBuyFinishedEvent>(OnStoreBuyFinished);
 
         SubscribeLocalEvent<ClothingAddFactionComponent, GotEquippedEvent>(OnClothingEquipped);
         SubscribeLocalEvent<ClothingAddFactionComponent, GotUnequippedEvent>(OnClothingUnequipped);
@@ -19,10 +19,13 @@ public void InitializeItems()
     /// If we bought something we probably don't want it to start biting us after it's automatically placed in our hands.
     /// If you do, consider finding a better solution to grenade penguin CBT.
     /// </summary>
-    private void OnItemPurchased(EntityUid uid, NpcFactionMemberComponent component, ref ItemPurchasedEvent args)
-    {
-        component.ExceptionalFriendlies.Add(args.Purchaser);
-    }
+    // TODO: check if this is the right uid?? we might be cooked.
+    private void OnStoreBuyFinished(
+        EntityUid uid,
+        NpcFactionMemberComponent component,
+        ref StoreBuyFinishedEvent args
+    ) =>
+        component.ExceptionalFriendlies.Add(uid);
 
     private void OnClothingEquipped(EntityUid uid, ClothingAddFactionComponent component, GotEquippedEvent args)
     {
diff --git a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
index c8867744a40..137dc1bc905 100644
--- a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
@@ -217,7 +217,7 @@ private void OnReceiveRadio(EntityUid uid, RadioSpeakerComponent component, ref
             ("originalName", nameEv.VoiceName));
 
         // log to chat so people can identity the speaker/source, but avoid clogging ghost chat if there are many radios
-        _chat.TrySendInGameICMessage(uid, args.Message, InGameICChatType.Whisper, ChatTransmitRange.GhostRangeLimit, nameOverride: name, checkRadioPrefix: false);
+        _chat.TrySendInGameICMessage(uid, args.LanguageObfuscatedChatMsg.Message, InGameICChatType.Whisper, ChatTransmitRange.GhostRangeLimit, nameOverride: name, checkRadioPrefix: false);
     }
 
     private void OnIntercomEncryptionChannelsChanged(Entity<IntercomComponent> ent, ref EncryptionChannelsChangedEvent args)
diff --git a/Content.Server/Radio/EntitySystems/RadioSystem.cs b/Content.Server/Radio/EntitySystems/RadioSystem.cs
index bdc368fa932..fef86ea35da 100644
--- a/Content.Server/Radio/EntitySystems/RadioSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioSystem.cs
@@ -1,12 +1,16 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Chat.Systems;
+using Content.Server.Language;
 using Content.Server.Power.Components;
 using Content.Server.Radio.Components;
 using Content.Shared.Chat;
 using Content.Shared.Database;
+using Content.Shared.Language;
+using Content.Shared.Language.Systems;
 using Content.Shared.Radio;
 using Content.Shared.Radio.Components;
 using Content.Shared.Speech;
+using Microsoft.CodeAnalysis.Host;
 using Robust.Shared.Map;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
@@ -28,6 +32,7 @@ public sealed class RadioSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ChatSystem _chat = default!;
+    [Dependency] private readonly LanguageSystem _language = default!;
 
     // set used to prevent radio feedback loops.
     private readonly HashSet<string> _messages = new();
@@ -54,63 +59,64 @@ private void OnIntrinsicSpeak(EntityUid uid, IntrinsicRadioTransmitterComponent
 
     private void OnIntrinsicReceive(EntityUid uid, IntrinsicRadioReceiverComponent component, ref RadioReceiveEvent args)
     {
+        var listener = args.RadioSource;
+        var msg = args.OriginalChatMsg;
+
+        if (!_language.CanUnderstand(listener, args.Language.ID))
+            msg = args.LanguageObfuscatedChatMsg;
+
         if (TryComp(uid, out ActorComponent? actor))
-            _netMan.ServerSendMessage(args.ChatMsg, actor.PlayerSession.Channel);
+            _netMan.ServerSendMessage(new MsgChatMessage { Message = msg }, actor.PlayerSession.Channel);
     }
 
     /// <summary>
     /// Send radio message to all active radio listeners
     /// </summary>
-    public void SendRadioMessage(EntityUid messageSource, string message, ProtoId<RadioChannelPrototype> channel, EntityUid radioSource, bool escapeMarkup = true)
-    {
-        SendRadioMessage(messageSource, message, _prototype.Index(channel), radioSource, escapeMarkup: escapeMarkup);
-    }
+    public void SendRadioMessage(
+        EntityUid messageSource,
+        string message,
+        ProtoId<RadioChannelPrototype> channel,
+        EntityUid radioSource,
+        LanguagePrototype? language = null,
+        bool escapeMarkup = true
+        ) =>
+        SendRadioMessage(messageSource, message, _prototype.Index(channel), radioSource, escapeMarkup: escapeMarkup, language: language);
 
     /// <summary>
     /// Send radio message to all active radio listeners
     /// </summary>
-    /// <param name="messageSource">Entity that spoke the message</param>
-    /// <param name="radioSource">Entity that picked up the message and will send it, e.g. headset</param>
-    public void SendRadioMessage(EntityUid messageSource, string message, RadioChannelPrototype channel, EntityUid radioSource, bool escapeMarkup = true)
+    public void SendRadioMessage(EntityUid messageSource, string message, RadioChannelPrototype channel, EntityUid radioSource, LanguagePrototype? language = null, bool escapeMarkup = true)
     {
+        if (language == null)
+            language = _language.GetLanguage(messageSource);
+
+        if (!language.SpeechOverride.AllowRadio)
+            return;
+
         // TODO if radios ever garble / modify messages, feedback-prevention needs to be handled better than this.
         if (!_messages.Add(message))
             return;
 
-        var evt = new TransformSpeakerNameEvent(messageSource, MetaData(messageSource).EntityName);
+        var evt = new TransformSpeakerNameEvent(messageSource, Name(messageSource));
         RaiseLocalEvent(messageSource, evt);
-
         var name = evt.VoiceName;
-        name = FormattedMessage.EscapeText(name);
 
-        SpeechVerbPrototype speech;
-        if (evt.SpeechVerb != null && _prototype.TryIndex(evt.SpeechVerb, out var evntProto))
-            speech = evntProto;
-        else
-            speech = _chat.GetSpeechVerb(messageSource, message);
+        name = FormattedMessage.EscapeText(name);
 
+        // most radios are relayed to chat, so lets parse the chat message beforehand
         var content = escapeMarkup
             ? FormattedMessage.EscapeText(message)
             : message;
 
-        var wrappedMessage = Loc.GetString(speech.Bold ? "chat-radio-message-wrap-bold" : "chat-radio-message-wrap",
-            ("color", channel.Color),
-            ("fontType", speech.FontId),
-            ("fontSize", speech.FontSize),
-            ("verb", Loc.GetString(_random.Pick(speech.SpeechVerbStrings))),
-            ("channel", $"\\[{channel.LocalizedName}\\]"),
-            ("name", name),
-            ("message", content));
+        var wrappedMessage = WrapRadioMessage(messageSource, channel, name, content, language);
+        var msg = new ChatMessage(ChatChannel.Radio, content, wrappedMessage, NetEntity.Invalid, null);
 
-        // most radios are relayed to chat, so lets parse the chat message beforehand
-        var chat = new ChatMessage(
-            ChatChannel.Radio,
-            message,
-            wrappedMessage,
-            NetEntity.Invalid,
-            null);
-        var chatMsg = new MsgChatMessage { Message = chat };
-        var ev = new RadioReceiveEvent(message, messageSource, channel, radioSource, chatMsg);
+        // ... you guess it
+        var obfuscated = _language.ObfuscateSpeech(content, language);
+        var obfuscatedWrapped = WrapRadioMessage(messageSource, channel, name, obfuscated, language);
+        var notUdsMsg = new ChatMessage(ChatChannel.Radio, obfuscated, obfuscatedWrapped, NetEntity.Invalid, null);
+
+        var ev = new RadioReceiveEvent(messageSource, channel, msg, notUdsMsg, language, radioSource);
 
         var sendAttemptEv = new RadioSendAttemptEvent(channel, radioSource);
         RaiseLocalEvent(ref sendAttemptEv);
@@ -119,8 +125,9 @@ public void SendRadioMessage(EntityUid messageSource, string message, RadioChann
 
         var sourceMapId = Transform(radioSource).MapID;
         var hasActiveServer = HasActiveServer(sourceMapId, channel.ID);
-        var sourceServerExempt = _exemptQuery.HasComp(radioSource);
+        var hasMicro = HasComp<RadioMicrophoneComponent>(radioSource);
 
+        var speakerQuery = GetEntityQuery<RadioSpeakerComponent>();
         var radioQuery = EntityQueryEnumerator<ActiveRadioComponent, TransformComponent>();
         while (canSend && radioQuery.MoveNext(out var receiver, out var radio, out var transform))
         {
@@ -135,7 +142,7 @@ public void SendRadioMessage(EntityUid messageSource, string message, RadioChann
                 continue;
 
             // don't need telecom server for long range channels or handheld radios and intercoms
-            var needServer = !channel.LongRange && !sourceServerExempt;
+            var needServer = !channel.LongRange && (!hasMicro || !speakerQuery.HasComponent(receiver));
             if (needServer && !hasActiveServer)
                 continue;
 
@@ -155,10 +162,35 @@ public void SendRadioMessage(EntityUid messageSource, string message, RadioChann
         else
             _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Radio message from {ToPrettyString(messageSource):user} on {channel.LocalizedName}: {message}");
 
-        _replay.RecordServerMessage(chat);
+        _replay.RecordServerMessage(msg);
         _messages.Remove(message);
     }
 
+    private string WrapRadioMessage(EntityUid source, RadioChannelPrototype channel, string name, string message, LanguagePrototype language)
+    {
+        // TODO: code duplication with ChatSystem.WrapMessage
+        var speech = _chat.GetSpeechVerb(source, message);
+        var languageColor = channel.Color;
+        if (language.SpeechOverride.Color is { } colorOverride)
+            languageColor = Color.InterpolateBetween(languageColor, colorOverride, colorOverride.A);
+        var languageDisplay = language.IsVisibleLanguage
+            ? Loc.GetString("chat-manager-language-prefix", ("language", language.ChatName))
+            : "";
+        var messageColor = language.IsVisibleLanguage ? languageColor : channel.Color;
+
+        return Loc.GetString(speech.Bold ? "chat-radio-message-wrap-bold" : "chat-radio-message-wrap",
+            ("color", channel.Color),
+            ("languageColor", languageColor),
+            ("messageColor", messageColor),
+            ("fontType", language.SpeechOverride.FontId ?? speech.FontId),
+            ("fontSize", language.SpeechOverride.FontSize ?? speech.FontSize),
+            ("verb", Loc.GetString(_random.Pick(speech.SpeechVerbStrings))),
+            ("channel", $"\\[{channel.LocalizedName}\\]"),
+            ("name", name),
+            ("message", message),
+            ("language", languageDisplay));
+    }
+
     /// <inheritdoc cref="TelecomServerComponent"/>
     private bool HasActiveServer(MapId mapId, string channelId)
     {
diff --git a/Content.Server/Store/Systems/StoreSystem.Listings.cs b/Content.Server/Store/Systems/StoreSystem.Listings.cs
index 4699ec7b669..b32eb505709 100644
--- a/Content.Server/Store/Systems/StoreSystem.Listings.cs
+++ b/Content.Server/Store/Systems/StoreSystem.Listings.cs
@@ -47,7 +47,7 @@ public HashSet<ListingDataWithCostModifiers> GetAllListings()
         var clones = new HashSet<ListingDataWithCostModifiers>();
         foreach (var prototype in _proto.EnumeratePrototypes<ListingPrototype>())
         {
-            clones.Add(new ListingDataWithCostModifiers(prototype));
+            clones.Add(new(prototype));
         }
 
         return clones;
diff --git a/Content.Server/Traitor/Uplink/UplinkSystem.cs b/Content.Server/Traitor/Uplink/UplinkSystem.cs
index 7937d37773c..4cdaaa2a8d6 100644
--- a/Content.Server/Traitor/Uplink/UplinkSystem.cs
+++ b/Content.Server/Traitor/Uplink/UplinkSystem.cs
@@ -1,11 +1,11 @@
 using System.Linq;
 using Content.Server.Store.Systems;
 using Content.Server.StoreDiscount.Systems;
+using Content.Shared.FixedPoint;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Implants;
 using Content.Shared.Inventory;
 using Content.Shared.PDA;
-using Content.Shared.FixedPoint;
 using Content.Shared.Store;
 using Content.Shared.Store.Components;
 using Robust.Shared.Prototypes;
@@ -25,48 +25,33 @@ public sealed class UplinkSystem : EntitySystem
     private const string FallbackUplinkImplant = "UplinkImplant";
     private const string FallbackUplinkCatalog = "UplinkUplinkImplanter";
 
-        /// <summary>
-        /// Adds an uplink to the target
-        /// </summary>
-        /// <param name="user">The person who is getting the uplink</param>
-        /// <param name="balance">The amount of currency on the uplink. If null, will just use the amount specified in the preset.</param>
-        /// <param name="uplinkEntity">The entity that will actually have the uplink functionality. Defaults to the PDA if null.</param>
-        /// <param name="giveDiscounts">Marker that enables discounts for uplink items.</param>
-        /// <returns>Whether or not the uplink was added successfully</returns>
-        public bool AddUplink(
-            EntityUid user,
-            FixedPoint2? balance,
-            EntityUid? uplinkEntity = null,
-            bool giveDiscounts = false
-        )
-        {
-            // Try to find target item if none passed
-            uplinkEntity ??= FindUplinkTarget(user);
-            if (uplinkEntity == null)
-            {
-                return false;
-            }
+    /// <summary>
+    /// Adds an uplink to the target
+    /// </summary>
+    /// <param name="user">The person who is getting the uplink</param>
+    /// <param name="balance">The amount of currency on the uplink. If null, will just use the amount specified in the preset.</param>
+    /// <param name="uplinkEntity">The entity that will actually have the uplink functionality. Defaults to the PDA if null.</param>
+    /// <param name="giveDiscounts">Marker that enables discounts for uplink items.</param>
+    /// <returns>Whether or not the uplink was added successfully</returns>
+    public bool AddUplink(
+        EntityUid user,
+        FixedPoint2 balance,
+        EntityUid? uplinkEntity = null,
+        bool giveDiscounts = false)
+    {
+        // Try to find target item if none passed
 
-            EnsureComp<UplinkComponent>(uplinkEntity.Value);
-            var store = EnsureComp<StoreComponent>(uplinkEntity.Value);
+        uplinkEntity ??= FindUplinkTarget(user);
 
-            store.AccountOwner = user;
-            store.Balance.Clear();
-            if (balance != null)
-            {
-                store.Balance.Clear();
-                _store.TryAddCurrency(new Dictionary<string, FixedPoint2> { { TelecrystalCurrencyPrototype, balance.Value } }, uplinkEntity.Value, store);
-            }
+        if (uplinkEntity == null)
+            return ImplantUplink(user, balance, giveDiscounts);
+
+        EnsureComp<UplinkComponent>(uplinkEntity.Value);
 
-            var uplinkInitializedEvent = new StoreInitializedEvent(
-                TargetUser: user,
-                Store: uplinkEntity.Value,
-                UseDiscounts: giveDiscounts,
-                Listings: _store.GetAvailableListings(user, uplinkEntity.Value, store)
-                                .ToArray()
-            );
-            RaiseLocalEvent(ref uplinkInitializedEvent);
-            // TODO add BUI. Currently can't be done outside of yaml -_-
+        SetUplink(user, uplinkEntity.Value, balance, giveDiscounts);
+
+        // TODO add BUI. Currently can't be done outside of yaml -_-
+        // ^ What does this even mean?
 
         return true;
     }
@@ -120,19 +105,19 @@ private bool ImplantUplink(EntityUid user, FixedPoint2 balance, bool giveDiscoun
         return true;
     }
 
-        /// <summary>
-        /// Finds the entity that can hold an uplink for a user.
-        /// Usually this is a pda in their pda slot, but can also be in their hands. (but not pockets or inside bag, etc.)
-        /// </summary>
-        public EntityUid? FindUplinkTarget(EntityUid user)
+    /// <summary>
+    /// Finds the entity that can hold an uplink for a user.
+    /// Usually this is a pda in their pda slot, but can also be in their hands. (but not pockets or inside bag, etc.)
+    /// </summary>
+    public EntityUid? FindUplinkTarget(EntityUid user)
+    {
+        // Try to find PDA in inventory
+        if (_inventorySystem.TryGetContainerSlotEnumerator(user, out var containerSlotEnumerator))
         {
-            // Try to find PDA in inventory
-            if (_inventorySystem.TryGetContainerSlotEnumerator(user, out var containerSlotEnumerator))
+            while (containerSlotEnumerator.MoveNext(out var pdaUid))
             {
-                while (containerSlotEnumerator.MoveNext(out var pdaUid))
-                {
-                    if (!pdaUid.ContainedEntity.HasValue)
-                        continue;
+                if (!pdaUid.ContainedEntity.HasValue)
+                    continue;
 
                 if (HasComp<PdaComponent>(pdaUid.ContainedEntity.Value) || HasComp<StoreComponent>(pdaUid.ContainedEntity.Value))
                     return pdaUid.ContainedEntity.Value;
@@ -141,10 +126,8 @@ private bool ImplantUplink(EntityUid user, FixedPoint2 balance, bool giveDiscoun
 
         // Also check hands
         foreach (var item in _handsSystem.EnumerateHeld(user))
-        {
             if (HasComp<PdaComponent>(item) || HasComp<StoreComponent>(item))
                 return item;
-        }
 
         return null;
     }
diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs
index 83326349c0e..3dd12668030 100644
--- a/Content.Shared/Actions/SharedActionsSystem.cs
+++ b/Content.Shared/Actions/SharedActionsSystem.cs
@@ -9,7 +9,9 @@
 using Content.Shared.Inventory.Events;
 using Content.Shared.Mind;
 using Content.Shared.Rejuvenate;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Map;
 using Robust.Shared.Timing;
@@ -23,11 +25,11 @@ public abstract class SharedActionsSystem : EntitySystem
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
     [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
     [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
-    [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
     [Dependency] private readonly RotateToFaceSystem _rotateToFaceSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
     [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
diff --git a/Content.Shared/Implants/SharedSubdermalImplantSystem.cs b/Content.Shared/Implants/SharedSubdermalImplantSystem.cs
index e1d65003a65..eee7a9cf958 100644
--- a/Content.Shared/Implants/SharedSubdermalImplantSystem.cs
+++ b/Content.Shared/Implants/SharedSubdermalImplantSystem.cs
@@ -30,7 +30,7 @@ public override void Initialize()
         SubscribeLocalEvent<ImplantedComponent, MobStateChangedEvent>(RelayToImplantEvent);
         SubscribeLocalEvent<ImplantedComponent, AfterInteractUsingEvent>(RelayToImplantEvent);
         SubscribeLocalEvent<ImplantedComponent, SuicideEvent>(RelayToImplantEvent);
-        SubscribeLocalEvent<ImplantedComponent, TransformSpeakerSpeechEvent>(RelayToImplantEvent);
+        SubscribeLocalEvent<ImplantedComponent, TransformSpeakerNameEvent>(RelayToImplantEvent);
     }
 
     private void OnInsert(EntityUid uid, SubdermalImplantComponent component, EntGotInsertedIntoContainerMessage args)
diff --git a/Content.Shared/Overlays/ShowHealthBarsComponent.cs b/Content.Shared/Overlays/ShowHealthBarsComponent.cs
index dfca6ba45f8..32fe331bce7 100644
--- a/Content.Shared/Overlays/ShowHealthBarsComponent.cs
+++ b/Content.Shared/Overlays/ShowHealthBarsComponent.cs
@@ -1,5 +1,7 @@
 using Content.Shared.Damage.Prototypes;
+using Content.Shared.StatusIcon;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Overlays;
diff --git a/Content.Shared/Revolutionary/Components/HeadRevolutionaryComponent.cs b/Content.Shared/Revolutionary/Components/HeadRevolutionaryComponent.cs
index 060c4d022f0..6f5245307d6 100644
--- a/Content.Shared/Revolutionary/Components/HeadRevolutionaryComponent.cs
+++ b/Content.Shared/Revolutionary/Components/HeadRevolutionaryComponent.cs
@@ -9,7 +9,7 @@ namespace Content.Shared.Revolutionary.Components;
 /// Component used for marking a Head Rev for conversion and winning/losing.
 /// </summary>
 [RegisterComponent, NetworkedComponent, Access(typeof(SharedRevolutionarySystem))]
-public sealed partial class HeadRevolutionaryComponent : Component, IAntagStatusIconComponent
+public sealed partial class HeadRevolutionaryComponent : Component
 {
     /// <summary>
     /// The status icon corresponding to the head revolutionary.
diff --git a/Content.Shared/Revolutionary/Components/RevolutionaryComponent.cs b/Content.Shared/Revolutionary/Components/RevolutionaryComponent.cs
index 322645bc0fa..28964227f42 100644
--- a/Content.Shared/Revolutionary/Components/RevolutionaryComponent.cs
+++ b/Content.Shared/Revolutionary/Components/RevolutionaryComponent.cs
@@ -10,7 +10,7 @@ namespace Content.Shared.Revolutionary.Components;
 /// Used for marking regular revs as well as storing icon prototypes so you can see fellow revs.
 /// </summary>
 [RegisterComponent, NetworkedComponent, Access(typeof(SharedRevolutionarySystem))]
-public sealed partial class RevolutionaryComponent : Component, IAntagStatusIconComponent
+public sealed partial class RevolutionaryComponent : Component
 {
     /// <summary>
     /// The status icon prototype displayed for revolutionaries
diff --git a/Content.Shared/StatusIcon/StatusIconPrototype.cs b/Content.Shared/StatusIcon/StatusIconPrototype.cs
index 4ba543a2f58..e947f43298b 100644
--- a/Content.Shared/StatusIcon/StatusIconPrototype.cs
+++ b/Content.Shared/StatusIcon/StatusIconPrototype.cs
@@ -30,11 +30,6 @@ public partial class StatusIconData : IComparable<StatusIconData>
     [DataField("locationPreference")]
     public StatusIconLocationPreference LocationPreference = StatusIconLocationPreference.None;
 
-    public int CompareTo(StatusIconData? other)
-    {
-        return Priority.CompareTo(other?.Priority ?? int.MaxValue);
-    }
-
     /// <summary>
     /// The layer the icon is displayed on. Mod is drawn above Base. Base | Mod
     /// </summary>
diff --git a/Content.Shared/Store/ListingLocalisationHelpers.cs b/Content.Shared/Store/ListingLocalisationHelpers.cs
index 19cd029488f..882300109ce 100644
--- a/Content.Shared/Store/ListingLocalisationHelpers.cs
+++ b/Content.Shared/Store/ListingLocalisationHelpers.cs
@@ -18,11 +18,6 @@ public static string GetLocalisedNameOrEntityName(ListingData listingData, IProt
         else if (listingData.ProductEntity != null)
             name = prototypeManager.Index(listingData.ProductEntity.Value).Name;
 
-        if (listingData.DiscountValue > 0)
-            name += " " + Loc.GetString("store-sales-amount", ("amount", listingData.DiscountValue));
-        else if (listingData.OldCost.Count > 0)
-            name += " " + Loc.GetString("store-sales-over");
-
         return name;
     }
 
diff --git a/Content.Shared/Stunnable/SharedStunSystem.cs b/Content.Shared/Stunnable/SharedStunSystem.cs
index 23fd87ae860..9d2e8d3dde2 100644
--- a/Content.Shared/Stunnable/SharedStunSystem.cs
+++ b/Content.Shared/Stunnable/SharedStunSystem.cs
@@ -16,6 +16,7 @@
 using Content.Shared.Throwing;
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Containers;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Physics.Systems;
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index 539b756a632..c7cc09e618b 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -11,7 +11,6 @@
 using Content.Shared.Gravity;
 using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
-using Content.Shared.Item; // Delta-V: Felinids in duffelbags can't shoot.
 using Content.Shared.Popups;
 using Content.Shared.Projectiles;
 using Content.Shared.Tag;
@@ -23,7 +22,6 @@
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
 using Content.Shared.Whitelist;
-using JetBrains.Annotations;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
@@ -115,18 +113,14 @@ private void OnMapInit(Entity<GunComponent> gun, ref MapInitEvent args)
 
     private void OnGunMelee(EntityUid uid, GunComponent component, MeleeHitEvent args)
     {
-        var curTime = Timing.CurTime;
-
-        if (component.NextFire < curTime)
-            component.NextFire = curTime;
-
-        var meleeCooldown = TimeSpan.FromSeconds(component.MeleeCooldown);
-
-        component.NextFire += meleeCooldown;
-        while (component.NextFire <= curTime)
-            component.NextFire += meleeCooldown;
+        if (!TryComp<MeleeWeaponComponent>(uid, out var melee))
+            return;
 
-        Dirty(uid, component);
+        if (melee.NextAttack > component.NextFire)
+        {
+            component.NextFire = melee.NextAttack;
+            Dirty(uid, component);
+        }
     }
 
     private void OnShootRequest(RequestShootEvent msg, EntitySessionEventArgs args)
@@ -135,8 +129,7 @@ private void OnShootRequest(RequestShootEvent msg, EntitySessionEventArgs args)
 
         if (user == null ||
             !_combatMode.IsInCombatMode(user) ||
-            !TryGetGun(user.Value, out var ent, out var gun) ||
-            HasComp<ItemComponent>(user)) // Delta-V: Felinids in duffelbags can't shoot.
+            !TryGetGun(user.Value, out var ent, out var gun))
         {
             return;
         }
@@ -146,7 +139,7 @@ private void OnShootRequest(RequestShootEvent msg, EntitySessionEventArgs args)
 
         gun.ShootCoordinates = GetCoordinates(msg.Coordinates);
         gun.Target = GetEntity(msg.Target);
-        AttemptShootInternal(user.Value, ent, gun);
+        AttemptShoot(user.Value, ent, gun);
     }
 
     private void OnStopShootRequest(RequestStopShootEvent ev, EntitySessionEventArgs args)
@@ -210,46 +203,13 @@ private void StopShooting(EntityUid uid, GunComponent gun)
         Dirty(uid, gun);
     }
 
-    /// <summary>
-    /// Attempts to shoot the specified target directly.
-    /// This may bypass projectiles firing etc.
-    /// </summary>
-    public bool AttemptDirectShoot(EntityUid user, EntityUid gunUid, EntityUid target, GunComponent gun)
-    {
-        // Unique name so people don't think it's "shoot towards" and not "I will teleport a bullet into them".
-        gun.ShootCoordinates = Transform(target).Coordinates;
-
-        if (!TryTakeAmmo(user, gunUid, gun, out _, out _, out var args))
-        {
-            gun.ShootCoordinates = null;
-            return false;
-        }
-
-        var result = ShootDirect(gunUid, gun, target, args.Ammo, user: user);
-        gun.ShootCoordinates = null;
-        return result;
-    }
-
-    protected virtual bool ShootDirect(EntityUid gunUid, GunComponent gun, EntityUid target, List<(EntityUid? Entity, IShootable Shootable)> ammo, EntityUid user)
-    {
-        return false;
-    }
-
-    /// <summary>
-    /// Sets the targeted entity of the gun. Should be called before attempting to shoot to avoid shooting over the target.
-    /// </summary>
-    public void SetTarget(GunComponent gun, EntityUid target)
-    {
-        gun.Target = target;
-    }
-
     /// <summary>
     /// Attempts to shoot at the target coordinates. Resets the shot counter after every shot.
     /// </summary>
     public void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun, EntityCoordinates toCoordinates)
     {
         gun.ShootCoordinates = toCoordinates;
-        AttemptShootInternal(user, gunUid, gun);
+        AttemptShoot(user, gunUid, gun);
         gun.ShotCounter = 0;
     }
 
@@ -258,37 +218,22 @@ public void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun, Ent
     /// </summary>
     public void AttemptShoot(EntityUid gunUid, GunComponent gun)
     {
-        var coordinates = new EntityCoordinates(gunUid, new Vector2(0, -1));
+        var coordinates = new EntityCoordinates(gunUid, gun.DefaultDirection);
         gun.ShootCoordinates = coordinates;
-        AttemptShootInternal(gunUid, gunUid, gun);
+        AttemptShoot(gunUid, gunUid, gun);
         gun.ShotCounter = 0;
     }
 
-    private void AttemptShootInternal(EntityUid user, EntityUid gunUid, GunComponent gun)
+    private void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun)
     {
-        if (!TryTakeAmmo(user, gunUid, gun, out var fromCoordinates, out var toCoordinates, out var args))
+        if (gun.FireRateModified <= 0f ||
+            !_actionBlockerSystem.CanAttack(user))
             return;
 
-        Shoot(gunUid, gun, args.Ammo, fromCoordinates, toCoordinates, out var userImpulse, user: user);
+        var toCoordinates = gun.ShootCoordinates;
 
-        if (userImpulse && TryComp<PhysicsComponent>(user, out var userPhysics))
-        {
-            if (_gravity.IsWeightless(user, userPhysics))
-                CauseImpulse(fromCoordinates, toCoordinates, user, userPhysics);
-        }
-    }
-
-    /// <summary>
-    /// Validates if a gun can currently shoot.
-    /// </summary>
-    [Pure]
-    private bool CanShoot(EntityUid user, EntityUid gunUid, GunComponent gun)
-    {
-        if (gun.FireRateModified <= 0f ||
-            !_actionBlockerSystem.CanAttack(user))
-        {
-            return false;
-        }
+        if (toCoordinates == null)
+            return;
 
         var curTime = Timing.CurTime;
 
@@ -300,44 +245,22 @@ private bool CanShoot(EntityUid user, EntityUid gunUid, GunComponent gun)
         };
         RaiseLocalEvent(gunUid, ref prevention);
         if (prevention.Cancelled)
-            return false;
+            return;
 
         RaiseLocalEvent(user, ref prevention);
         if (prevention.Cancelled)
-            return false;
+            return;
 
         // Need to do this to play the clicking sound for empty automatic weapons
         // but not play anything for burst fire.
         if (gun.NextFire > curTime)
-            return false;
-
-        return true;
-    }
-
-    /// <summary>
-    /// Tries to return ammo prepped for shooting if a gun is available to shoot.
-    /// </summary>
-    private bool TryTakeAmmo(
-        EntityUid user,
-        EntityUid gunUid, GunComponent gun,
-        out EntityCoordinates fromCoordinates,
-        out EntityCoordinates toCoordinates,
-        [NotNullWhen(true)] out TakeAmmoEvent? args)
-    {
-        toCoordinates = EntityCoordinates.Invalid;
-        fromCoordinates = EntityCoordinates.Invalid;
-        args = null;
-
-        if (!CanShoot(user, gunUid, gun))
-            return false;
-
-        if (gun.ShootCoordinates == null)
-            return false;
+            return;
 
-        toCoordinates = gun.ShootCoordinates.Value;
-        var curTime = Timing.CurTime;
         var fireRate = TimeSpan.FromSeconds(1f / gun.FireRateModified);
 
+        if (gun.SelectedMode == SelectiveFire.Burst || gun.BurstActivated)
+            fireRate = TimeSpan.FromSeconds(1f / gun.BurstFireRate);
+
         // First shot
         // Previously we checked shotcounter but in some cases all the bullets got dumped at once
         // curTime - fireRate is insufficient because if you time it just right you can get a 3rd shot out slightly quicker.
@@ -358,18 +281,24 @@ private bool TryTakeAmmo(
 
         // Get how many shots we're actually allowed to make, due to clip size or otherwise.
         // Don't do this in the loop so we still reset NextFire.
-        switch (gun.SelectedMode)
+        if (!gun.BurstActivated)
+        {
+            switch (gun.SelectedMode)
+            {
+                case SelectiveFire.SemiAuto:
+                    shots = Math.Min(shots, 1 - gun.ShotCounter);
+                    break;
+                case SelectiveFire.Burst:
+                    shots = Math.Min(shots, gun.ShotsPerBurstModified - gun.ShotCounter);
+                    break;
+                case SelectiveFire.FullAuto:
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException($"No implemented shooting behavior for {gun.SelectedMode}!");
+            }
+        } else
         {
-            case SelectiveFire.SemiAuto:
-                shots = Math.Min(shots, 1 - gun.ShotCounter);
-                break;
-            case SelectiveFire.Burst:
-                shots = Math.Min(shots, gun.ShotsPerBurstModified - gun.ShotCounter);
-                break;
-            case SelectiveFire.FullAuto:
-                break;
-            default:
-                throw new ArgumentOutOfRangeException($"No implemented shooting behavior for {gun.SelectedMode}!");
+            shots = Math.Min(shots, gun.ShotsPerBurstModified - gun.ShotCounter);
         }
 
         var attemptEv = new AttemptShootEvent(user, null);
@@ -381,13 +310,13 @@ private bool TryTakeAmmo(
             {
                 PopupSystem.PopupClient(attemptEv.Message, gunUid, user);
             }
-
+            gun.BurstActivated = false;
+            gun.BurstShotsCount = 0;
             gun.NextFire = TimeSpan.FromSeconds(Math.Max(lastFire.TotalSeconds + SafetyNextFire, gun.NextFire.TotalSeconds));
-            return false;
+            return;
         }
 
-        fromCoordinates = Transform(user).Coordinates;
-
+        var fromCoordinates = Transform(user).Coordinates;
         // Remove ammo
         var ev = new TakeAmmoEvent(shots, new List<(EntityUid? Entity, IShootable Shootable)>(), fromCoordinates, user);
 
@@ -409,6 +338,10 @@ private bool TryTakeAmmo(
             var emptyGunShotEvent = new OnEmptyGunShotEvent();
             RaiseLocalEvent(gunUid, ref emptyGunShotEvent);
 
+            gun.BurstActivated = false;
+            gun.BurstShotsCount = 0;
+            gun.NextFire += TimeSpan.FromSeconds(gun.BurstCooldown);
+
             // Play empty gun sounds if relevant
             // If they're firing an existing clip then don't play anything.
             if (shots > 0)
@@ -422,25 +355,40 @@ private bool TryTakeAmmo(
                 // May cause prediction issues? Needs more tweaking
                 gun.NextFire = TimeSpan.FromSeconds(Math.Max(lastFire.TotalSeconds + SafetyNextFire, gun.NextFire.TotalSeconds));
                 Audio.PlayPredicted(gun.SoundEmpty, gunUid, user);
-                return false;
+                return;
             }
 
-            return false;
+            return;
+        }
+
+        // Handle burstfire
+        if (gun.SelectedMode == SelectiveFire.Burst)
+        {
+            gun.BurstActivated = true;
+        }
+        if (gun.BurstActivated)
+        {
+            gun.BurstShotsCount += shots;
+            if (gun.BurstShotsCount >= gun.ShotsPerBurstModified)
+            {
+                gun.NextFire += TimeSpan.FromSeconds(gun.BurstCooldown);
+                gun.BurstActivated = false;
+                gun.BurstShotsCount = 0;
+            }
         }
 
         // Shoot confirmed - sounds also played here in case it's invalid (e.g. cartridge already spent).
+        Shoot(gunUid, gun, ev.Ammo, fromCoordinates, toCoordinates.Value, out var userImpulse, user, throwItems: attemptEv.ThrowItems);
         var shotEv = new GunShotEvent(user, ev.Ammo);
         RaiseLocalEvent(gunUid, ref shotEv);
 
-        if (gun.DoRecoil
-            && userImpulse
-            && TryComp<PhysicsComponent>(user, out var userPhysics)
-            && _gravity.IsWeightless(user, userPhysics))
-            CauseImpulse(fromCoordinates, toCoordinates.Value, user, userPhysics);
+        if (userImpulse && TryComp<PhysicsComponent>(user, out var userPhysics))
+        {
+            if (_gravity.IsWeightless(user, userPhysics))
+                CauseImpulse(fromCoordinates, toCoordinates.Value, user, userPhysics);
+        }
 
         Dirty(gunUid, gun);
-        args = ev;
-        return true;
     }
 
     public void Shoot(
@@ -481,7 +429,7 @@ public void ShootProjectile(EntityUid uid, Vector2 direction, Vector2 gunVelocit
         Projectiles.SetShooter(uid, projectile, user ?? gunUid);
         projectile.Weapon = gunUid;
 
-        TransformSystem.SetWorldRotation(uid, direction.ToWorldAngle());
+        TransformSystem.SetWorldRotation(uid, direction.ToWorldAngle() + projectile.Angle);
     }
 
     protected abstract void Popup(string message, EntityUid? uid, EntityUid? user);
@@ -523,7 +471,7 @@ protected void EjectCartridge(
         {
             Angle ejectAngle = angle.Value;
             ejectAngle += 3.7f; // 212 degrees; casings should eject slightly to the right and behind of a gun
-            ThrowingSystem.TryThrow(entity, ejectAngle.ToVec(), 625f);
+            ThrowingSystem.TryThrow(entity, ejectAngle.ToVec().Normalized() / 100, 5f);
         }
         if (playSound && TryComp<CartridgeAmmoComponent>(entity, out var cartridge))
         {
@@ -558,7 +506,7 @@ protected void MuzzleFlash(EntityUid gun, AmmoComponent component, Angle worldAn
             return;
 
         var ev = new MuzzleFlashEvent(GetNetEntity(gun), sprite, worldAngle);
-        CreateEffect(gun, ev, user);
+        CreateEffect(gun, ev, gun);
     }
 
     public void CauseImpulse(EntityCoordinates fromCoordinates, EntityCoordinates toCoordinates, EntityUid user, PhysicsComponent userPhysics)

From b3c674d8dfb556e02f4199cffbf668c75a3e4289 Mon Sep 17 00:00:00 2001
From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Wed, 6 Nov 2024 15:39:16 +0100
Subject: [PATCH 075/366] fuck you im not making drozd burst Changes to "Burst"
 firemode; Drozd, WT550 and C20-r (#31292)

* Initial commit

* Change burst fire variable to be a set value rather than a multiplier
---
 .../Weapons/Ranged/Systems/GunSystem.cs       |  2 +-
 .../Ranged/Systems/GunSystem.AutoFire.cs      | 25 +++++++++---
 .../Weapons/Ranged/Components/GunComponent.cs | 38 +++++++++++++------
 .../Objects/Weapons/Guns/SMGs/smgs.yml        |  9 ++++-
 4 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
index 4a7711032e4..2e2ef04fae1 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
@@ -154,7 +154,7 @@ public override void Update(float frameTime)
 
         var useKey = gun.UseKey ? EngineKeyFunctions.Use : EngineKeyFunctions.UseSecondary;
 
-        if (_inputSystem.CmdStates.GetState(useKey) != BoundKeyState.Down)
+        if (_inputSystem.CmdStates.GetState(useKey) != BoundKeyState.Down && !gun.BurstActivated)
         {
             if (gun.ShotCounter != 0)
                 EntityManager.RaisePredictiveEvent(new RequestStopShootEvent { Gun = GetNetEntity(gunUid) });
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.AutoFire.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.AutoFire.cs
index 39cd2486ed7..e5439cdb064 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.AutoFire.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.AutoFire.cs
@@ -1,4 +1,6 @@
+using Content.Shared.Damage;
 using Content.Shared.Weapons.Ranged.Components;
+using Robust.Shared.Map;
 
 namespace Content.Server.Weapons.Ranged.Systems;
 
@@ -13,17 +15,28 @@ public override void Update(float frameTime)
          */
 
         // Automatic firing without stopping if the AutoShootGunComponent component is exist and enabled
-        var query = EntityQueryEnumerator<AutoShootGunComponent, GunComponent>();
+        var query = EntityQueryEnumerator<GunComponent>();
 
-        while (query.MoveNext(out var uid, out var autoShoot, out var gun))
+        while (query.MoveNext(out var uid, out var gun))
         {
-            if (!autoShoot.Enabled)
-                continue;
-
             if (gun.NextFire > Timing.CurTime)
                 continue;
 
-            AttemptShoot(uid, gun);
+            if (TryComp(uid, out AutoShootGunComponent? autoShoot))
+            {
+                if (!autoShoot.Enabled)
+                    continue;
+
+                AttemptShoot(uid, gun);
+            }
+            else if (gun.BurstActivated)
+            {
+                var parent = _transform.GetParentUid(uid);
+                if (HasComp<DamageableComponent>(parent))
+                    AttemptShoot(parent, uid, gun, gun.ShootCoordinates ?? new EntityCoordinates(uid, gun.DefaultDirection));
+                else
+                    AttemptShoot(uid, gun);
+            }
         }
     }
 }
diff --git a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
index d522df5395e..fe0ffafb8ac 100644
--- a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
@@ -1,6 +1,4 @@
-using Content.Shared.Damage;
-using Content.Shared.Nyanotrasen.Abilities.Oni;
-using Content.Shared.Tag;
+using System.Numerics;
 using Content.Shared.Weapons.Ranged.Events;
 using Content.Shared.Weapons.Ranged.Systems;
 using Robust.Shared.Audio;
@@ -159,6 +157,30 @@ public sealed partial class GunComponent : Component
     [AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
     public int ShotsPerBurstModified = 3;
 
+    /// <summary>
+    /// How long time must pass between burstfire shots.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float BurstCooldown = 0.25f;
+
+    /// <summary>
+    /// The fire rate of the weapon in burst fire mode.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float BurstFireRate = 8f;
+
+    /// <summary>
+    /// Whether the burst fire mode has been activated.
+    /// </summary>
+    [AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
+    public bool BurstActivated = false;
+
+    /// <summary>
+    /// The burst fire bullet count.
+    /// </summary>
+    [AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
+    public int BurstShotsCount = 0;
+
     /// <summary>
     /// Used for tracking semi-auto / burst
     /// </summary>
@@ -243,16 +265,10 @@ public sealed partial class GunComponent : Component
     public bool ClumsyProof = false;
 
     /// <summary>
-    ///     The percentage chance of a given gun to accidentally discharge if violently thrown into a wall or person
-    /// </summary>
-    [DataField]
-    public float FireOnDropChance = 0.1f;
-
-    /// <summary>
-    ///     Whether or not this gun is truly Recoilless, such as Lasers, and therefore shouldn't move the user.
+    /// Firing direction for an item not being held (e.g. shuttle cannons, thrown guns still firing).
     /// </summary>
     [DataField]
-    public bool DoRecoil = true;
+    public Vector2 DefaultDirection = new Vector2(0, -1);
 }
 
 [Flags]
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index aa0de1918b6..da372d0ed84 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -19,6 +19,7 @@
     minAngle: 2
     maxAngle: 16
     fireRate: 8
+    burstFireRate: 8
     angleIncrease: 3
     angleDecay: 16
     selectedMode: FullAuto
@@ -27,6 +28,7 @@
     - FullAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/smg.ogg
+    defaultDirection: 1, 0
   - type: ChamberMagazineAmmoProvider
     soundRack:
       path: /Audio/Weapons/Guns/Cock/smg_cock.ogg
@@ -167,8 +169,9 @@
     - type: Gun
       minAngle: 21
       maxAngle: 32
-      fireRate: 6
-      selectedMode: FullAuto
+      fireRate: 12
+      burstFireRate: 12
+      selectedMode: Burst
       soundGunshot:
         path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
       availableModes:
@@ -277,6 +280,8 @@
     angleDecay: 6
     selectedMode: FullAuto
     shotsPerBurst: 5
+    burstCooldown: 0.2
+    burstFireRate: 7
     availableModes:
     - SemiAuto
     - Burst

From 6dc24ca16105ae11d1f96ffbd134b505f1a4ab1a Mon Sep 17 00:00:00 2001
From: MilenVolf <63782763+MilenVolf@users.noreply.github.com>
Date: Tue, 12 Nov 2024 22:11:02 +0300
Subject: [PATCH 076/366] Allow editing angle of the fired projectile (#33254)

Add Angle datafield to `ProjectileComponent`. It allows to change the angle of the fired projectile
---
 Content.Shared/Projectiles/ProjectileComponent.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Content.Shared/Projectiles/ProjectileComponent.cs b/Content.Shared/Projectiles/ProjectileComponent.cs
index c24cf2b5ee5..8349252df2b 100644
--- a/Content.Shared/Projectiles/ProjectileComponent.cs
+++ b/Content.Shared/Projectiles/ProjectileComponent.cs
@@ -8,6 +8,12 @@ namespace Content.Shared.Projectiles;
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class ProjectileComponent : Component
 {
+    /// <summary>
+    ///     The angle of the fired projectile.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Angle Angle;
+
     /// <summary>
     ///     The effect that appears when a projectile collides with an entity.
     /// </summary>

From 26bc0173f32f17b38d1649bea06e06aa2b1f863e Mon Sep 17 00:00:00 2001
From: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Date: Mon, 3 Jun 2024 12:12:21 -0400
Subject: [PATCH 077/366] Cleans up StatusIconSystem and fixing some bugs
 (#28270)

---
 .../UI/AgentIDCardBoundUserInterface.cs       |  1 +
 .../Access/UI/AgentIDCardWindow.xaml.cs       |  6 +--
 .../Commands/ShowHealthBarsCommand.cs         |  1 +
 Content.Client/LateJoin/LateJoinGui.cs        |  2 +-
 .../Lobby/UI/HumanoidProfileEditor.xaml.cs    |  2 +-
 .../Overlays/EntityHealthBarOverlay.cs        | 26 ++++++++-----
 .../Overlays/ShowCriminalRecordIconsSystem.cs |  4 +-
 .../Overlays/ShowHealthBarsSystem.cs          | 14 +++++--
 .../Overlays/ShowHealthIconsSystem.cs         |  3 +-
 .../Overlays/ShowHungerIconsSystem.cs         |  2 +-
 Content.Client/Overlays/ShowJobIconsSystem.cs |  2 +-
 .../Overlays/ShowMindShieldIconsSystem.cs     |  4 +-
 .../Overlays/ShowSyndicateIconsSystem.cs      |  3 +-
 .../Overlays/ShowThirstIconsSystem.cs         |  2 +-
 .../Revolutionary/RevolutionarySystem.cs      | 37 ++++++++-----------
 .../SSDIndicator/SSDIndicatorSystem.cs        |  3 +-
 .../StatusIcon/StatusIconOverlay.cs           |  4 +-
 Content.Client/StatusIcon/StatusIconSystem.cs | 36 ++++++++++++++++--
 Content.Client/Stealth/StealthSystem.cs       |  3 +-
 .../Access/Systems/AgentIDCardSystem.cs       |  6 +--
 .../Access/Systems/PresetIdCardSystem.cs      |  2 -
 .../Revolutionary/RevolutionarySystem.cs      |  5 +++
 .../Station/Systems/StationSpawningSystem.cs  |  1 -
 .../Antag/IAntagStatusIconComponent.cs        | 12 ------
 .../Antag/ShowAntagIconsComponent.cs          |  9 +++++
 .../Components/HeadRevolutionaryComponent.cs  |  3 --
 .../Components/RevolutionaryComponent.cs      |  3 --
 .../Components/ShowRevIconsComponent.cs       | 11 ------
 .../SharedRevolutionarySystem.cs              | 22 ++++-------
 .../Components/StatusIconComponent.cs         | 14 +------
 .../StatusIcon/StatusIconPrototype.cs         | 32 ++++++++++++++--
 .../Zombies/InitialInfectedComponent.cs       |  1 -
 .../Zombies/ShowZombieIconsComponent.cs       | 12 ------
 Content.Shared/Zombies/ZombieComponent.cs     |  5 +--
 .../Entities/Mobs/Player/admin_ghost.yml      |  3 +-
 .../{ => StatusIcon}/StatusEffects/health.yml |  0
 .../{ => StatusIcon}/StatusEffects/hunger.yml |  0
 .../StatusEffects/satiation.yml               |  0
 .../{ => StatusIcon}/StatusEffects/ssd.yml    |  0
 Resources/Prototypes/StatusIcon/faction.yml   | 17 +++++++++
 .../{StatusEffects => StatusIcon}/job.yml     |  0
 .../security.yml                              |  0
 42 files changed, 169 insertions(+), 144 deletions(-)
 create mode 100644 Content.Server/Revolutionary/RevolutionarySystem.cs
 delete mode 100644 Content.Shared/Antag/IAntagStatusIconComponent.cs
 create mode 100644 Content.Shared/Antag/ShowAntagIconsComponent.cs
 delete mode 100644 Content.Shared/Revolutionary/Components/ShowRevIconsComponent.cs
 delete mode 100644 Content.Shared/Zombies/ShowZombieIconsComponent.cs
 rename Resources/Prototypes/{ => StatusIcon}/StatusEffects/health.yml (100%)
 rename Resources/Prototypes/{ => StatusIcon}/StatusEffects/hunger.yml (100%)
 rename Resources/Prototypes/{ => StatusIcon}/StatusEffects/satiation.yml (100%)
 rename Resources/Prototypes/{ => StatusIcon}/StatusEffects/ssd.yml (100%)
 rename Resources/Prototypes/{StatusEffects => StatusIcon}/job.yml (100%)
 rename Resources/Prototypes/{StatusEffects => StatusIcon}/security.yml (100%)

diff --git a/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs b/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs
index 050756fcd14..ce675ad2c6b 100644
--- a/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs
+++ b/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs
@@ -3,6 +3,7 @@
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Access.UI
 {
diff --git a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
index 9bc255ec1d0..325cd770781 100644
--- a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
+++ b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
@@ -39,7 +39,7 @@ public AgentIDCardWindow()
             JobLineEdit.OnFocusExit += e => OnJobChanged?.Invoke(e.Text);
         }
 
-        public void SetAllowedIcons(string currentJobIconId)
+        public void SetAllowedIcons(HashSet<ProtoId<StatusIconPrototype>> icons, string currentJobIconId)
         {
             IconGrid.DisposeAllChildren();
 
@@ -49,7 +49,7 @@ public void SetAllowedIcons(string currentJobIconId)
             icons.Sort((x, y) => string.Compare(x.LocalizedJobName, y.LocalizedJobName, StringComparison.CurrentCulture));
             foreach (var jobIconId in icons)
             {
-                if (!_prototypeManager.TryIndex<JobIconPrototype>(jobIconId, out var jobIcon))
+                if (!_prototypeManager.TryIndex(jobIconId, out var jobIcon))
                     continue;
 
                 String styleBase = StyleBase.ButtonOpenBoth;
@@ -79,7 +79,7 @@ public void SetAllowedIcons(string currentJobIconId)
                 };
 
                 jobIconButton.AddChild(jobIconTexture);
-                jobIconButton.OnPressed += _ => OnJobIconChanged?.Invoke(jobIcon.ID);
+                jobIconButton.OnPressed += _ => _bui.OnJobIconChanged(jobIconId);
                 IconGrid.AddChild(jobIconButton);
 
                 i++;
diff --git a/Content.Client/Commands/ShowHealthBarsCommand.cs b/Content.Client/Commands/ShowHealthBarsCommand.cs
index bd3e21718f0..ef918313a0d 100644
--- a/Content.Client/Commands/ShowHealthBarsCommand.cs
+++ b/Content.Client/Commands/ShowHealthBarsCommand.cs
@@ -35,6 +35,7 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
             var showHealthBarsComponent = new ShowHealthBarsComponent
             {
                 DamageContainers = args.ToList(),
+                HealthStatusIcon = "",
                 NetSyncEnabled = false
             };
 
diff --git a/Content.Client/LateJoin/LateJoinGui.cs b/Content.Client/LateJoin/LateJoinGui.cs
index e474f0c9429..31c09ef1a37 100644
--- a/Content.Client/LateJoin/LateJoinGui.cs
+++ b/Content.Client/LateJoin/LateJoinGui.cs
@@ -251,7 +251,7 @@ private void RebuildUI()
                             VerticalAlignment = VAlignment.Center
                         };
 
-                        var jobIcon = _prototypeManager.Index<StatusIconPrototype>(prototype.Icon);
+                        var jobIcon = _prototypeManager.Index(prototype.Icon);
                         icon.Texture = _sprites.Frame0(jobIcon.Icon);
                         jobSelector.AddChild(icon);
 
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index ce14882d167..b2187cef626 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -905,7 +905,7 @@ private void UpdateRoleRequirements()
                         TextureScale = new Vector2(2, 2),
                         VerticalAlignment = VAlignment.Center
                     };
-                    var jobIcon = _prototypeManager.Index<StatusIconPrototype>(job.Icon);
+                    var jobIcon = _prototypeManager.Index(job.Icon);
                     icon.Texture = jobIcon.Icon.Frame0();
                     selector.Setup(items, job.LocalizedName, 200, job.LocalizedDescription, icon);
 
diff --git a/Content.Client/Overlays/EntityHealthBarOverlay.cs b/Content.Client/Overlays/EntityHealthBarOverlay.cs
index dfc3e8da0c5..674714563d8 100644
--- a/Content.Client/Overlays/EntityHealthBarOverlay.cs
+++ b/Content.Client/Overlays/EntityHealthBarOverlay.cs
@@ -1,8 +1,13 @@
+using System.Numerics;
+using Content.Client.StatusIcon;
+using Content.Client.UserInterface.Systems;
 using Content.Shared.Damage;
 using Content.Shared.FixedPoint;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
+using Content.Shared.StatusIcon;
+using Content.Shared.StatusIcon.Components;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
@@ -21,20 +26,27 @@ namespace Content.Client.Overlays;
 public sealed class EntityHealthBarOverlay : Overlay
 {
     private readonly IEntityManager _entManager;
+    private readonly IPrototypeManager _prototype;
+
     private readonly SharedTransformSystem _transform;
     private readonly MobStateSystem _mobStateSystem;
     private readonly MobThresholdSystem _mobThresholdSystem;
+    private readonly StatusIconSystem _statusIconSystem;
     private readonly ProgressColorSystem _progressColor;
+
+
     public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowFOV;
     public HashSet<string> DamageContainers = new();
     public ProtoId<HealthIconPrototype>? StatusIcon;
 
-    public EntityHealthBarOverlay(IEntityManager entManager)
+    public EntityHealthBarOverlay(IEntityManager entManager, IPrototypeManager prototype)
     {
         _entManager = entManager;
+        _prototype = prototype;
         _transform = _entManager.System<SharedTransformSystem>();
         _mobStateSystem = _entManager.System<MobStateSystem>();
         _mobThresholdSystem = _entManager.System<MobThresholdSystem>();
+        _statusIconSystem = _entManager.System<StatusIconSystem>();
         _progressColor = _entManager.System<ProgressColorSystem>();
     }
 
@@ -47,6 +59,7 @@ protected override void Draw(in OverlayDrawArgs args)
         const float scale = 1f;
         var scaleMatrix = Matrix3Helpers.CreateScale(new Vector2(scale, scale));
         var rotationMatrix = Matrix3Helpers.CreateRotation(-rotation);
+        _prototype.TryIndex(StatusIcon, out var statusIcon);
 
         var query = _entManager.AllEntityQueryEnumerator<MobThresholdsComponent, MobStateComponent, DamageableComponent, SpriteComponent>();
         while (query.MoveNext(out var uid,
@@ -55,29 +68,22 @@ protected override void Draw(in OverlayDrawArgs args)
             out var damageableComponent,
             out var spriteComponent))
         {
-            if (_entManager.TryGetComponent<MetaDataComponent>(uid, out var metaDataComponent) &&
-                metaDataComponent.Flags.HasFlag(MetaDataFlags.InContainer))
-            {
+            if (statusIcon != null && !_statusIconSystem.IsVisible((uid, _entManager.GetComponent<MetaDataComponent>(uid)), statusIcon))
                 continue;
-            }
 
+            // We want the stealth user to still be able to see his health bar himself
             if (!xformQuery.TryGetComponent(uid, out var xform) ||
                 xform.MapID != args.MapId)
-            {
                 continue;
-            }
 
             if (damageableComponent.DamageContainerID == null || !DamageContainers.Contains(damageableComponent.DamageContainerID))
-            {
                 continue;
-            }
 
             // we use the status icon component bounds if specified otherwise use sprite
             var bounds = _entManager.GetComponentOrNull<StatusIconComponent>(uid)?.Bounds ?? spriteComponent.Bounds;
             var worldPos = _transform.GetWorldPosition(xform, xformQuery);
 
             if (!bounds.Translated(worldPos).Intersects(args.WorldAABB))
-            {
                 continue;
             }
 
diff --git a/Content.Client/Overlays/ShowCriminalRecordIconsSystem.cs b/Content.Client/Overlays/ShowCriminalRecordIconsSystem.cs
index 8f23cd510cb..c353b172729 100644
--- a/Content.Client/Overlays/ShowCriminalRecordIconsSystem.cs
+++ b/Content.Client/Overlays/ShowCriminalRecordIconsSystem.cs
@@ -19,10 +19,10 @@ public override void Initialize()
 
     private void OnGetStatusIconsEvent(EntityUid uid, CriminalRecordComponent component, ref GetStatusIconsEvent ev)
     {
-        if (!IsActive || ev.InContainer)
+        if (!IsActive)
             return;
 
-        if (_prototype.TryIndex<StatusIconPrototype>(component.StatusIcon.Id, out var iconPrototype))
+        if (_prototype.TryIndex(component.StatusIcon, out var iconPrototype))
             ev.StatusIcons.Add(iconPrototype);
     }
 }
diff --git a/Content.Client/Overlays/ShowHealthBarsSystem.cs b/Content.Client/Overlays/ShowHealthBarsSystem.cs
index 170f552cf3f..1eb712a8988 100644
--- a/Content.Client/Overlays/ShowHealthBarsSystem.cs
+++ b/Content.Client/Overlays/ShowHealthBarsSystem.cs
@@ -2,6 +2,8 @@
 using Content.Shared.Overlays;
 using Robust.Client.Graphics;
 using System.Linq;
+using Robust.Client.Player;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Overlays;
 
@@ -11,6 +13,7 @@ namespace Content.Client.Overlays;
 public sealed class ShowHealthBarsSystem : EquipmentHudSystem<ShowHealthBarsComponent>
 {
     [Dependency] private readonly IOverlayManager _overlayMan = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
 
     private EntityHealthBarOverlay _overlay = default!;
 
@@ -18,16 +21,21 @@ public override void Initialize()
     {
         base.Initialize();
 
-        _overlay = new(EntityManager);
+        _overlay = new(EntityManager, _prototype);
     }
 
     protected override void UpdateInternal(RefreshEquipmentHudEvent<ShowHealthBarsComponent> component)
     {
         base.UpdateInternal(component);
 
-        foreach (var damageContainerId in component.Components.SelectMany(x => x.DamageContainers))
+        foreach (var comp in component.Components)
         {
-            _overlay.DamageContainers.Add(damageContainerId);
+            foreach (var damageContainerId in comp.DamageContainers)
+            {
+                _overlay.DamageContainers.Add(damageContainerId);
+            }
+
+            _overlay.StatusIcon = comp.HealthStatusIcon;
         }
 
         if (!_overlayMan.HasOverlay<EntityHealthBarOverlay>())
diff --git a/Content.Client/Overlays/ShowHealthIconsSystem.cs b/Content.Client/Overlays/ShowHealthIconsSystem.cs
index f76504d2b2c..8c22c78f17c 100644
--- a/Content.Client/Overlays/ShowHealthIconsSystem.cs
+++ b/Content.Client/Overlays/ShowHealthIconsSystem.cs
@@ -24,7 +24,6 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<DamageableComponent, GetStatusIconsEvent>(OnGetStatusIconsEvent);
-
     }
 
     protected override void UpdateInternal(RefreshEquipmentHudEvent<ShowHealthIconsComponent> component)
@@ -46,7 +45,7 @@ protected override void DeactivateInternal()
 
     private void OnGetStatusIconsEvent(Entity<DamageableComponent> entity, ref GetStatusIconsEvent args)
     {
-        if (!IsActive || args.InContainer)
+        if (!IsActive)
             return;
 
         var healthIcons = DecideHealthIcons(entity);
diff --git a/Content.Client/Overlays/ShowHungerIconsSystem.cs b/Content.Client/Overlays/ShowHungerIconsSystem.cs
index b1c0f3a1a0c..6b0d575a810 100644
--- a/Content.Client/Overlays/ShowHungerIconsSystem.cs
+++ b/Content.Client/Overlays/ShowHungerIconsSystem.cs
@@ -18,7 +18,7 @@ public override void Initialize()
 
     private void OnGetStatusIconsEvent(EntityUid uid, HungerComponent component, ref GetStatusIconsEvent ev)
     {
-        if (!IsActive || ev.InContainer)
+        if (!IsActive)
             return;
 
         if (_hunger.TryGetStatusIconPrototype(component, out var iconPrototype))
diff --git a/Content.Client/Overlays/ShowJobIconsSystem.cs b/Content.Client/Overlays/ShowJobIconsSystem.cs
index a2c86413c56..e5ba9b813f0 100644
--- a/Content.Client/Overlays/ShowJobIconsSystem.cs
+++ b/Content.Client/Overlays/ShowJobIconsSystem.cs
@@ -25,7 +25,7 @@ public override void Initialize()
 
     private void OnGetStatusIconsEvent(EntityUid uid, StatusIconComponent _, ref GetStatusIconsEvent ev)
     {
-        if (!IsActive || ev.InContainer)
+        if (!IsActive)
             return;
 
         var iconId = JobIconForNoId;
diff --git a/Content.Client/Overlays/ShowMindShieldIconsSystem.cs b/Content.Client/Overlays/ShowMindShieldIconsSystem.cs
index 8bf39b875f6..cdb9c54fdfa 100644
--- a/Content.Client/Overlays/ShowMindShieldIconsSystem.cs
+++ b/Content.Client/Overlays/ShowMindShieldIconsSystem.cs
@@ -19,10 +19,10 @@ public override void Initialize()
 
     private void OnGetStatusIconsEvent(EntityUid uid, MindShieldComponent component, ref GetStatusIconsEvent ev)
     {
-        if (!IsActive || ev.InContainer)
+        if (!IsActive)
             return;
 
-        if (_prototype.TryIndex<StatusIconPrototype>(component.MindShieldStatusIcon.Id, out var iconPrototype))
+        if (_prototype.TryIndex(component.MindShieldStatusIcon, out var iconPrototype))
             ev.StatusIcons.Add(iconPrototype);
     }
 }
diff --git a/Content.Client/Overlays/ShowSyndicateIconsSystem.cs b/Content.Client/Overlays/ShowSyndicateIconsSystem.cs
index 9ae80045f5e..9d4599b8233 100644
--- a/Content.Client/Overlays/ShowSyndicateIconsSystem.cs
+++ b/Content.Client/Overlays/ShowSyndicateIconsSystem.cs
@@ -19,11 +19,10 @@ public override void Initialize()
 
     private void OnGetStatusIconsEvent(EntityUid uid, NukeOperativeComponent component, ref GetStatusIconsEvent ev)
     {
-        if (!IsActive || ev.InContainer)
+        if (!IsActive)
             return;
 
         if (_prototype.TryIndex<FactionIconPrototype>(component.SyndStatusIcon, out var iconPrototype))
             ev.StatusIcons.Add(iconPrototype);
     }
 }
-
diff --git a/Content.Client/Overlays/ShowThirstIconsSystem.cs b/Content.Client/Overlays/ShowThirstIconsSystem.cs
index b08aa4340b2..44be1f7a67f 100644
--- a/Content.Client/Overlays/ShowThirstIconsSystem.cs
+++ b/Content.Client/Overlays/ShowThirstIconsSystem.cs
@@ -18,7 +18,7 @@ public override void Initialize()
 
     private void OnGetStatusIconsEvent(EntityUid uid, ThirstComponent component, ref GetStatusIconsEvent ev)
     {
-        if (!IsActive || ev.InContainer)
+        if (!IsActive)
             return;
 
         if (_thirst.TryGetStatusIconPrototype(component, out var iconPrototype))
diff --git a/Content.Client/Revolutionary/RevolutionarySystem.cs b/Content.Client/Revolutionary/RevolutionarySystem.cs
index 682c73f93e7..8e7e687fa8f 100644
--- a/Content.Client/Revolutionary/RevolutionarySystem.cs
+++ b/Content.Client/Revolutionary/RevolutionarySystem.cs
@@ -1,44 +1,37 @@
-using Content.Shared.Antag;
 using Content.Shared.Revolutionary.Components;
-using Content.Shared.Ghost;
+using Content.Shared.Revolutionary;
 using Content.Shared.StatusIcon.Components;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Revolutionary;
 
 /// <summary>
 /// Used for the client to get status icons from other revs.
 /// </summary>
-public sealed class RevolutionarySystem : EntitySystem
+public sealed class RevolutionarySystem : SharedRevolutionarySystem
 {
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<RevolutionaryComponent, CanDisplayStatusIconsEvent>(OnCanShowRevIcon);
-        SubscribeLocalEvent<HeadRevolutionaryComponent, CanDisplayStatusIconsEvent>(OnCanShowRevIcon);
+        SubscribeLocalEvent<RevolutionaryComponent, GetStatusIconsEvent>(GetRevIcon);
+        SubscribeLocalEvent<HeadRevolutionaryComponent, GetStatusIconsEvent>(GetHeadRevIcon);
     }
 
-    /// <summary>
-    /// Determine whether a client should display the rev icon.
-    /// </summary>
-    private void OnCanShowRevIcon<T>(EntityUid uid, T comp, ref CanDisplayStatusIconsEvent args) where T : IAntagStatusIconComponent
+    private void GetRevIcon(Entity<RevolutionaryComponent> ent, ref GetStatusIconsEvent args)
     {
-        args.Cancelled = !CanDisplayIcon(args.User, comp.IconVisibleToGhost);
+        if (HasComp<HeadRevolutionaryComponent>(ent))
+            return;
+
+        if (_prototype.TryIndex(ent.Comp.StatusIcon, out var iconPrototype))
+            args.StatusIcons.Add(iconPrototype);
     }
 
-    /// <summary>
-    /// The criteria that determine whether a client should see Rev/Head rev icons.
-    /// </summary>
-    private bool CanDisplayIcon(EntityUid? uid, bool visibleToGhost)
+    private void GetHeadRevIcon(Entity<HeadRevolutionaryComponent> ent, ref GetStatusIconsEvent args)
     {
-        if (HasComp<HeadRevolutionaryComponent>(uid) || HasComp<RevolutionaryComponent>(uid))
-            return true;
-
-        if (visibleToGhost && HasComp<GhostComponent>(uid))
-            return true;
-
-        return HasComp<ShowRevIconsComponent>(uid);
+        if (_prototype.TryIndex(ent.Comp.StatusIcon, out var iconPrototype))
+            args.StatusIcons.Add(iconPrototype);
     }
-
 }
diff --git a/Content.Client/SSDIndicator/SSDIndicatorSystem.cs b/Content.Client/SSDIndicator/SSDIndicatorSystem.cs
index 587450a2f66..e7311953170 100644
--- a/Content.Client/SSDIndicator/SSDIndicatorSystem.cs
+++ b/Content.Client/SSDIndicator/SSDIndicatorSystem.cs
@@ -30,13 +30,12 @@ private void OnGetStatusIcon(EntityUid uid, SSDIndicatorComponent component, ref
     {
         if (component.IsSSD &&
             _cfg.GetCVar(CCVars.ICShowSSDIndicator) &&
-            !args.InContainer &&
             !_mobState.IsDead(uid) &&
             !HasComp<ActiveNPCComponent>(uid) &&
             TryComp<MindContainerComponent>(uid, out var mindContainer) &&
             mindContainer.ShowExamineInfo)
         {
-            args.StatusIcons.Add(_prototype.Index<StatusIconPrototype>(component.Icon));
+            args.StatusIcons.Add(_prototype.Index(component.Icon));
         }
     }
 }
diff --git a/Content.Client/StatusIcon/StatusIconOverlay.cs b/Content.Client/StatusIcon/StatusIconOverlay.cs
index 372bd04f571..7bebac273b9 100644
--- a/Content.Client/StatusIcon/StatusIconOverlay.cs
+++ b/Content.Client/StatusIcon/StatusIconOverlay.cs
@@ -45,7 +45,7 @@ protected override void Draw(in OverlayDrawArgs args)
         var query = _entity.AllEntityQueryEnumerator<StatusIconComponent, SpriteComponent, TransformComponent, MetaDataComponent>();
         while (query.MoveNext(out var uid, out var comp, out var sprite, out var xform, out var meta))
         {
-            if (xform.MapID != args.MapId)
+            if (xform.MapID != args.MapId || !sprite.Visible)
                 continue;
 
             var bounds = comp.Bounds ?? sprite.Bounds;
@@ -72,6 +72,8 @@ protected override void Draw(in OverlayDrawArgs args)
 
             foreach (var proto in icons)
             {
+                if (!_statusIcon.IsVisible((uid, meta), proto))
+                    continue;
 
                 var curTime = _timing.RealTime;
                 var texture = _sprite.GetFrame(proto.Icon, curTime);
diff --git a/Content.Client/StatusIcon/StatusIconSystem.cs b/Content.Client/StatusIcon/StatusIconSystem.cs
index 980fd9f2a92..63f57767695 100644
--- a/Content.Client/StatusIcon/StatusIconSystem.cs
+++ b/Content.Client/StatusIcon/StatusIconSystem.cs
@@ -1,7 +1,11 @@
 using Content.Shared.CCVar;
+using Content.Shared.Ghost;
 using Content.Shared.StatusIcon;
 using Content.Shared.StatusIcon.Components;
+using Content.Shared.Stealth.Components;
+using Content.Shared.Whitelist;
 using Robust.Client.Graphics;
+using Robust.Client.Player;
 using Robust.Shared.Configuration;
 
 namespace Content.Client.StatusIcon;
@@ -13,6 +17,8 @@ public sealed class StatusIconSystem : SharedStatusIconSystem
 {
     [Dependency] private readonly IConfigurationManager _configuration = default!;
     [Dependency] private readonly IOverlayManager _overlay = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly EntityWhitelistSystem _entityWhitelist = default!;
 
     private bool _globalEnabled;
     private bool _localEnabled;
@@ -54,10 +60,34 @@ public List<StatusIconData> GetStatusIcons(EntityUid uid, MetaDataComponent? met
         if (meta.EntityLifeStage >= EntityLifeStage.Terminating)
             return list;
 
-        var inContainer = (meta.Flags & MetaDataFlags.InContainer) != 0;
-        var ev = new GetStatusIconsEvent(list, inContainer);
+        var ev = new GetStatusIconsEvent(list);
         RaiseLocalEvent(uid, ref ev);
         return ev.StatusIcons;
     }
-}
 
+    /// <summary>
+    /// For overlay to check if an entity can be seen.
+    /// </summary>
+    public bool IsVisible(Entity<MetaDataComponent> ent, StatusIconData data)
+    {
+        var viewer = _playerManager.LocalSession?.AttachedEntity;
+
+        // Always show our icons to our entity
+        if (viewer == ent.Owner)
+            return true;
+
+        if (data.VisibleToGhosts && HasComp<GhostComponent>(viewer))
+            return true;
+
+        if (data.HideInContainer && (ent.Comp.Flags & MetaDataFlags.InContainer) != 0)
+            return false;
+
+        if (data.HideOnStealth && TryComp<StealthComponent>(ent, out var stealth) && stealth.Enabled)
+            return false;
+
+        if (data.ShowTo != null && !_entityWhitelist.IsValid(data.ShowTo, viewer))
+            return false;
+
+        return true;
+    }
+}
diff --git a/Content.Client/Stealth/StealthSystem.cs b/Content.Client/Stealth/StealthSystem.cs
index b60ffc2a408..0b94e41f6bc 100644
--- a/Content.Client/Stealth/StealthSystem.cs
+++ b/Content.Client/Stealth/StealthSystem.cs
@@ -1,4 +1,5 @@
 using Content.Client.Interactable.Components;
+using Content.Client.StatusIcon;
 using Content.Shared.Stealth;
 using Content.Shared.Stealth.Components;
 using Robust.Client.GameObjects;
@@ -18,6 +19,7 @@ public override void Initialize()
         base.Initialize();
 
         _shader = _protoMan.Index<ShaderPrototype>("Stealth").InstanceUnique();
+
         SubscribeLocalEvent<StealthComponent, ComponentShutdown>(OnShutdown);
         SubscribeLocalEvent<StealthComponent, ComponentStartup>(OnStartup);
         SubscribeLocalEvent<StealthComponent, BeforePostShaderRenderEvent>(OnShaderRender);
@@ -93,4 +95,3 @@ private void OnShaderRender(EntityUid uid, StealthComponent component, BeforePos
         args.Sprite.Color = new Color(visibility, visibility, 1, 1);
     }
 }
-
diff --git a/Content.Server/Access/Systems/AgentIDCardSystem.cs b/Content.Server/Access/Systems/AgentIDCardSystem.cs
index 1348e68762f..8f1d0d4f820 100644
--- a/Content.Server/Access/Systems/AgentIDCardSystem.cs
+++ b/Content.Server/Access/Systems/AgentIDCardSystem.cs
@@ -90,14 +90,10 @@ private void OnNameChanged(EntityUid uid, AgentIDCardComponent comp, AgentIDCard
         private void OnJobIconChanged(EntityUid uid, AgentIDCardComponent comp, AgentIDCardJobIconChangedMessage args)
         {
             if (!TryComp<IdCardComponent>(uid, out var idCard))
-            {
                 return;
-            }
 
             if (!_prototypeManager.TryIndex(args.JobIconId, out var jobIcon))
-            {
                 return;
-            }
 
             _cardSystem.TryChangeJobIcon(uid, jobIcon, idCard);
 
@@ -109,7 +105,7 @@ private bool TryFindJobProtoFromIcon(JobIconPrototype jobIcon, [NotNullWhen(true
         {
             foreach (var jobPrototype in _prototypeManager.EnumeratePrototypes<JobPrototype>())
             {
-                if(jobPrototype.Icon == jobIcon.ID)
+                if (jobPrototype.Icon == jobIcon.ID)
                 {
                     job = jobPrototype;
                     return true;
diff --git a/Content.Server/Access/Systems/PresetIdCardSystem.cs b/Content.Server/Access/Systems/PresetIdCardSystem.cs
index 10bfcc3f7cd..3896d9f8792 100644
--- a/Content.Server/Access/Systems/PresetIdCardSystem.cs
+++ b/Content.Server/Access/Systems/PresetIdCardSystem.cs
@@ -83,8 +83,6 @@ private void SetupIdAccess(EntityUid uid, PresetIdCardComponent id, bool extende
         _cardSystem.TryChangeJobDepartment(uid, job);
 
         if (_prototypeManager.TryIndex(job.Icon, out var jobIcon))
-        {
             _cardSystem.TryChangeJobIcon(uid, jobIcon);
-        }
     }
 }
diff --git a/Content.Server/Revolutionary/RevolutionarySystem.cs b/Content.Server/Revolutionary/RevolutionarySystem.cs
new file mode 100644
index 00000000000..597c4896b90
--- /dev/null
+++ b/Content.Server/Revolutionary/RevolutionarySystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Revolutionary;
+
+namespace Content.Server.Revolutionary;
+
+public sealed class RevolutionarySystem : SharedRevolutionarySystem;
diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs
index 94cedad74f5..79192d49b40 100644
--- a/Content.Server/Station/Systems/StationSpawningSystem.cs
+++ b/Content.Server/Station/Systems/StationSpawningSystem.cs
@@ -230,7 +230,6 @@ public void EquipIdCard(EntityUid entity, string characterName, JobPrototype job
         if (_prototypeManager.TryIndex(jobPrototype.Icon, out var jobIcon))
             _cardSystem.TryChangeJobIcon(cardId, jobIcon, card);
 
-
         var extendedAccess = false;
         if (station != null)
         {
diff --git a/Content.Shared/Antag/IAntagStatusIconComponent.cs b/Content.Shared/Antag/IAntagStatusIconComponent.cs
deleted file mode 100644
index 981937c9163..00000000000
--- a/Content.Shared/Antag/IAntagStatusIconComponent.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Content.Shared.StatusIcon;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Antag;
-
-public interface IAntagStatusIconComponent
-{
-    public ProtoId<StatusIconPrototype> StatusIcon { get; set; }
-
-    public bool IconVisibleToGhost { get; set; }
-}
-
diff --git a/Content.Shared/Antag/ShowAntagIconsComponent.cs b/Content.Shared/Antag/ShowAntagIconsComponent.cs
new file mode 100644
index 00000000000..c451b69c3e0
--- /dev/null
+++ b/Content.Shared/Antag/ShowAntagIconsComponent.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Antag;
+
+/// <summary>
+/// Determines whether Someone can see antags icons
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ShowAntagIconsComponent: Component;
diff --git a/Content.Shared/Revolutionary/Components/HeadRevolutionaryComponent.cs b/Content.Shared/Revolutionary/Components/HeadRevolutionaryComponent.cs
index 6f5245307d6..12589850e66 100644
--- a/Content.Shared/Revolutionary/Components/HeadRevolutionaryComponent.cs
+++ b/Content.Shared/Revolutionary/Components/HeadRevolutionaryComponent.cs
@@ -24,7 +24,4 @@ public sealed partial class HeadRevolutionaryComponent : Component
     public TimeSpan StunTime = TimeSpan.FromSeconds(3);
 
     public override bool SessionSpecific => true;
-
-    [DataField]
-    public bool IconVisibleToGhost { get; set; } = true;
 }
diff --git a/Content.Shared/Revolutionary/Components/RevolutionaryComponent.cs b/Content.Shared/Revolutionary/Components/RevolutionaryComponent.cs
index 28964227f42..513e8897bdc 100644
--- a/Content.Shared/Revolutionary/Components/RevolutionaryComponent.cs
+++ b/Content.Shared/Revolutionary/Components/RevolutionaryComponent.cs
@@ -25,7 +25,4 @@ public sealed partial class RevolutionaryComponent : Component
     public SoundSpecifier RevStartSound = new SoundPathSpecifier("/Audio/Ambience/Antag/headrev_start.ogg");
 
     public override bool SessionSpecific => true;
-
-    [DataField]
-    public bool IconVisibleToGhost { get; set; }  = true;
 }
diff --git a/Content.Shared/Revolutionary/Components/ShowRevIconsComponent.cs b/Content.Shared/Revolutionary/Components/ShowRevIconsComponent.cs
deleted file mode 100644
index 11e20db3f89..00000000000
--- a/Content.Shared/Revolutionary/Components/ShowRevIconsComponent.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Revolutionary.Components;
-
-/// <summary>
-/// Determines whether Someone can see rev/headrev icons on revs.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class ShowRevIconsComponent: Component
-{
-}
diff --git a/Content.Shared/Revolutionary/SharedRevolutionarySystem.cs b/Content.Shared/Revolutionary/SharedRevolutionarySystem.cs
index ddaf73fcc9f..bbf91193cc3 100644
--- a/Content.Shared/Revolutionary/SharedRevolutionarySystem.cs
+++ b/Content.Shared/Revolutionary/SharedRevolutionarySystem.cs
@@ -1,4 +1,3 @@
-using Content.Shared.Ghost;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Mindshield.Components;
 using Content.Shared.Popups;
@@ -6,10 +5,11 @@
 using Content.Shared.Stunnable;
 using Robust.Shared.GameStates;
 using Robust.Shared.Player;
+using Content.Shared.Antag;
 
 namespace Content.Shared.Revolutionary;
 
-public sealed class SharedRevolutionarySystem : EntitySystem
+public abstract class SharedRevolutionarySystem : EntitySystem
 {
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedStunSystem _sharedStun = default!;
@@ -23,7 +23,7 @@ public override void Initialize()
         SubscribeLocalEvent<HeadRevolutionaryComponent, ComponentGetStateAttemptEvent>(OnRevCompGetStateAttempt);
         SubscribeLocalEvent<RevolutionaryComponent, ComponentStartup>(DirtyRevComps);
         SubscribeLocalEvent<HeadRevolutionaryComponent, ComponentStartup>(DirtyRevComps);
-        SubscribeLocalEvent<ShowRevIconsComponent, ComponentStartup>(DirtyRevComps);
+        SubscribeLocalEvent<ShowAntagIconsComponent, ComponentStartup>(DirtyRevComps);
     }
 
     /// <summary>
@@ -52,7 +52,7 @@ private void MindShieldImplanted(EntityUid uid, MindShieldComponent comp, MapIni
     /// </summary>
     private void OnRevCompGetStateAttempt(EntityUid uid, HeadRevolutionaryComponent comp, ref ComponentGetStateAttemptEvent args)
     {
-        args.Cancelled = !CanGetState(args.Player, comp.IconVisibleToGhost);
+        args.Cancelled = !CanGetState(args.Player);
     }
 
     /// <summary>
@@ -60,30 +60,24 @@ private void OnRevCompGetStateAttempt(EntityUid uid, HeadRevolutionaryComponent
     /// </summary>
     private void OnRevCompGetStateAttempt(EntityUid uid, RevolutionaryComponent comp, ref ComponentGetStateAttemptEvent args)
     {
-        args.Cancelled = !CanGetState(args.Player, comp.IconVisibleToGhost);
+        args.Cancelled = !CanGetState(args.Player);
     }
 
     /// <summary>
     /// The criteria that determine whether a Rev/HeadRev component should be sent to a client.
     /// </summary>
     /// <param name="player"> The Player the component will be sent to.</param>
-    /// <param name="visibleToGhosts"> Whether the component permits the icon to be visible to observers. </param>
     /// <returns></returns>
-    private bool CanGetState(ICommonSession? player, bool visibleToGhosts)
+    private bool CanGetState(ICommonSession? player)
     {
         //Apparently this can be null in replays so I am just returning true.
-        if (player is null)
+        if (player?.AttachedEntity is not {} uid)
             return true;
 
-        var uid = player.AttachedEntity;
-
         if (HasComp<RevolutionaryComponent>(uid) || HasComp<HeadRevolutionaryComponent>(uid))
             return true;
 
-        if (visibleToGhosts && HasComp<GhostComponent>(uid))
-            return true;
-
-        return HasComp<ShowRevIconsComponent>(uid);
+        return HasComp<ShowAntagIconsComponent>(uid);
     }
     /// <summary>
     /// Dirties all the Rev components so they are sent to clients.
diff --git a/Content.Shared/StatusIcon/Components/StatusIconComponent.cs b/Content.Shared/StatusIcon/Components/StatusIconComponent.cs
index 385f9760c65..c56be7c96a5 100644
--- a/Content.Shared/StatusIcon/Components/StatusIconComponent.cs
+++ b/Content.Shared/StatusIcon/Components/StatusIconComponent.cs
@@ -24,16 +24,4 @@ public sealed partial class StatusIconComponent : Component
 /// </summary>
 /// <param name="StatusIcons"></param>
 [ByRefEvent]
-public record struct GetStatusIconsEvent(List<StatusIconData> StatusIcons, bool InContainer);
-
-/// <summary>
-/// Event raised on the Client-side to determine whether to display a status icon on an entity.
-/// </summary>
-/// <param name="User">The player that will see the icons</param>
-[ByRefEvent]
-public record struct CanDisplayStatusIconsEvent(EntityUid? User = null)
-{
-    public EntityUid? User = User;
-
-    public bool Cancelled = false;
-}
+public record struct GetStatusIconsEvent(List<StatusIconData> StatusIcons);
diff --git a/Content.Shared/StatusIcon/StatusIconPrototype.cs b/Content.Shared/StatusIcon/StatusIconPrototype.cs
index e947f43298b..689bec3882b 100644
--- a/Content.Shared/StatusIcon/StatusIconPrototype.cs
+++ b/Content.Shared/StatusIcon/StatusIconPrototype.cs
@@ -1,3 +1,5 @@
+using Content.Shared.Stealth.Components;
+using Content.Shared.Whitelist;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
@@ -15,19 +17,43 @@ public partial class StatusIconData : IComparable<StatusIconData>
     /// <summary>
     /// The icon that's displayed on the entity.
     /// </summary>
-    [DataField("icon", required: true)]
+    [DataField(required: true)]
     public SpriteSpecifier Icon = default!;
 
     /// <summary>
     /// A priority for the order in which the icons will be displayed.
     /// </summary>
-    [DataField("priority")]
+    [DataField]
     public int Priority = 10;
 
+    /// <summary>
+    /// Whether or not to hide the icon to ghosts
+    /// </summary>
+    [DataField]
+    public bool VisibleToGhosts = true;
+
+    /// <summary>
+    /// Whether or not to hide the icon when we are inside a container like a locker or a crate.
+    /// </summary>
+    [DataField]
+    public bool HideInContainer = true;
+
+    /// <summary>
+    /// Whether or not to hide the icon when the entity has an active <see cref="StealthComponent"/>
+    /// </summary>
+    [DataField]
+    public bool HideOnStealth = true;
+
+    /// <summary>
+    /// Specifies what entities and components/tags this icon can be shown to.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? ShowTo;
+
     /// <summary>
     /// A preference for where the icon will be displayed. None | Left | Right
     /// </summary>
-    [DataField("locationPreference")]
+    [DataField]
     public StatusIconLocationPreference LocationPreference = StatusIconLocationPreference.None;
 
     /// <summary>
diff --git a/Content.Shared/Zombies/InitialInfectedComponent.cs b/Content.Shared/Zombies/InitialInfectedComponent.cs
index bde89c1bb41..b69d1515f26 100644
--- a/Content.Shared/Zombies/InitialInfectedComponent.cs
+++ b/Content.Shared/Zombies/InitialInfectedComponent.cs
@@ -1,4 +1,3 @@
-using Content.Shared.Antag;
 using Content.Shared.StatusIcon;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/Zombies/ShowZombieIconsComponent.cs b/Content.Shared/Zombies/ShowZombieIconsComponent.cs
deleted file mode 100644
index a2bc85c0746..00000000000
--- a/Content.Shared/Zombies/ShowZombieIconsComponent.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Zombies;
-
-/// <summary>
-/// Makes it so an entity can view ZombieAntagIcons.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class ShowZombieIconsComponent: Component
-{
-
-}
diff --git a/Content.Shared/Zombies/ZombieComponent.cs b/Content.Shared/Zombies/ZombieComponent.cs
index 663f6cd444f..94e1e5afec4 100644
--- a/Content.Shared/Zombies/ZombieComponent.cs
+++ b/Content.Shared/Zombies/ZombieComponent.cs
@@ -14,7 +14,7 @@
 namespace Content.Shared.Zombies;
 
 [RegisterComponent, NetworkedComponent]
-public sealed partial class ZombieComponent : Component, IAntagStatusIconComponent
+public sealed partial class ZombieComponent : Component
 {
     /// <summary>
     /// The baseline infection chance you have if you are completely nude
@@ -91,9 +91,6 @@ public sealed partial class ZombieComponent : Component, IAntagStatusIconCompone
     [DataField("zombieStatusIcon")]
     public ProtoId<FactionIconPrototype> StatusIcon { get; set; } = "ZombieFaction";
 
-    [DataField]
-    public bool IconVisibleToGhost { get; set; } = true;
-
     /// <summary>
     /// Healing each second
     /// </summary>
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index 1366dfb76ab..df8ebc8a297 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -93,8 +93,7 @@
   - type: Stripping
   - type: SolutionScanner
   - type: IgnoreUIRange
-  - type: ShowRevIcons
-  - type: ShowZombieIcons
+  - type: ShowAntagIcons
   - type: Inventory
     templateId: aghost
   - type: InventorySlots
diff --git a/Resources/Prototypes/StatusEffects/health.yml b/Resources/Prototypes/StatusIcon/StatusEffects/health.yml
similarity index 100%
rename from Resources/Prototypes/StatusEffects/health.yml
rename to Resources/Prototypes/StatusIcon/StatusEffects/health.yml
diff --git a/Resources/Prototypes/StatusEffects/hunger.yml b/Resources/Prototypes/StatusIcon/StatusEffects/hunger.yml
similarity index 100%
rename from Resources/Prototypes/StatusEffects/hunger.yml
rename to Resources/Prototypes/StatusIcon/StatusEffects/hunger.yml
diff --git a/Resources/Prototypes/StatusEffects/satiation.yml b/Resources/Prototypes/StatusIcon/StatusEffects/satiation.yml
similarity index 100%
rename from Resources/Prototypes/StatusEffects/satiation.yml
rename to Resources/Prototypes/StatusIcon/StatusEffects/satiation.yml
diff --git a/Resources/Prototypes/StatusEffects/ssd.yml b/Resources/Prototypes/StatusIcon/StatusEffects/ssd.yml
similarity index 100%
rename from Resources/Prototypes/StatusEffects/ssd.yml
rename to Resources/Prototypes/StatusIcon/StatusEffects/ssd.yml
diff --git a/Resources/Prototypes/StatusIcon/faction.yml b/Resources/Prototypes/StatusIcon/faction.yml
index 82f8ac7175e..016dec5de3c 100644
--- a/Resources/Prototypes/StatusIcon/faction.yml
+++ b/Resources/Prototypes/StatusIcon/faction.yml
@@ -1,6 +1,11 @@
 - type: factionIcon
   id: ZombieFaction
   priority: 11
+  showTo:
+    components:
+    - ShowAntagIcons
+    - Zombie
+    - InitialInfected
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Zombie
@@ -8,6 +13,10 @@
 - type: factionIcon
   id: InitialInfectedFaction
   priority: 11
+  showTo:
+    components:
+    - ShowAntagIcons
+    - InitialInfected
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: InitialInfected
@@ -15,6 +24,10 @@
 - type: factionIcon
   id: RevolutionaryFaction
   priority: 11
+  showTo:
+    components:
+      - ShowAntagIcons
+      - Revolutionary
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Revolutionary
@@ -22,6 +35,10 @@
 - type: factionIcon
   id: HeadRevolutionaryFaction
   priority: 11
+  showTo:
+    components:
+      - ShowAntagIcons
+      - Revolutionary
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: HeadRevolutionary
diff --git a/Resources/Prototypes/StatusEffects/job.yml b/Resources/Prototypes/StatusIcon/job.yml
similarity index 100%
rename from Resources/Prototypes/StatusEffects/job.yml
rename to Resources/Prototypes/StatusIcon/job.yml
diff --git a/Resources/Prototypes/StatusEffects/security.yml b/Resources/Prototypes/StatusIcon/security.yml
similarity index 100%
rename from Resources/Prototypes/StatusEffects/security.yml
rename to Resources/Prototypes/StatusIcon/security.yml

From 443ac8aab2f2f992b5d7575a35e0e5158b066c1d Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 12:22:17 -0400
Subject: [PATCH 078/366] status icon stuff

---
 .../Access/UI/AgentIDCardWindow.xaml.cs       |  9 ++--
 .../BloodCult/BloodCultistSystem.cs           | 47 +++++++++++++++----
 .../NPC/Systems/NPCCombatSystem.Ranged.cs     | 14 ++----
 .../Weapons/Ranged/Components/GunComponent.cs |  6 +++
 .../BloodCultist/BloodCultistComponent.cs     |  2 +-
 5 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
index 325cd770781..320bb88a67e 100644
--- a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
+++ b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
@@ -39,7 +39,7 @@ public AgentIDCardWindow()
             JobLineEdit.OnFocusExit += e => OnJobChanged?.Invoke(e.Text);
         }
 
-        public void SetAllowedIcons(HashSet<ProtoId<StatusIconPrototype>> icons, string currentJobIconId)
+        public void SetAllowedIcons(string currentJobIconId)
         {
             IconGrid.DisposeAllChildren();
 
@@ -47,11 +47,8 @@ public void SetAllowedIcons(HashSet<ProtoId<StatusIconPrototype>> icons, string
             var i = 0;
             var icons = _prototypeManager.EnumeratePrototypes<JobIconPrototype>().Where(icon => icon.AllowSelection).ToList();
             icons.Sort((x, y) => string.Compare(x.LocalizedJobName, y.LocalizedJobName, StringComparison.CurrentCulture));
-            foreach (var jobIconId in icons)
+            foreach (var jobIcon in icons)
             {
-                if (!_prototypeManager.TryIndex(jobIconId, out var jobIcon))
-                    continue;
-
                 String styleBase = StyleBase.ButtonOpenBoth;
                 var modulo = i % JobIconColumnCount;
                 if (modulo == 0)
@@ -79,7 +76,7 @@ public void SetAllowedIcons(HashSet<ProtoId<StatusIconPrototype>> icons, string
                 };
 
                 jobIconButton.AddChild(jobIconTexture);
-                jobIconButton.OnPressed += _ => _bui.OnJobIconChanged(jobIconId);
+                jobIconButton.OnPressed += _ => OnJobIconChanged?.Invoke(jobIcon.ID);
                 IconGrid.AddChild(jobIconButton);
 
                 i++;
diff --git a/Content.Client/WhiteDream/BloodCult/BloodCultistSystem.cs b/Content.Client/WhiteDream/BloodCult/BloodCultistSystem.cs
index b732df9801c..c300dfb24d2 100644
--- a/Content.Client/WhiteDream/BloodCult/BloodCultistSystem.cs
+++ b/Content.Client/WhiteDream/BloodCult/BloodCultistSystem.cs
@@ -1,12 +1,14 @@
 using System.Numerics;
 using Content.Shared.Antag;
 using Content.Shared.Ghost;
+using Content.Shared.StatusIcon;
 using Content.Shared.StatusIcon.Components;
 using Content.Shared.WhiteDream.BloodCult;
 using Content.Shared.WhiteDream.BloodCult.BloodCultist;
 using Content.Shared.WhiteDream.BloodCult.Components;
 using Content.Shared.WhiteDream.BloodCult.Constructs;
 using Robust.Client.GameObjects;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
@@ -15,15 +17,16 @@ namespace Content.Client.WhiteDream.BloodCult;
 public sealed class BloodCultistSystem : EntitySystem
 {
     [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
 
     public override void Initialize()
     {
         SubscribeLocalEvent<PentagramComponent, ComponentStartup>(OnPentagramAdded);
         SubscribeLocalEvent<PentagramComponent, ComponentShutdown>(OnPentagramRemoved);
 
-        SubscribeLocalEvent<ConstructComponent, CanDisplayStatusIconsEvent>(OnCanShowCultIcon);
-        SubscribeLocalEvent<BloodCultistComponent, CanDisplayStatusIconsEvent>(OnCanShowCultIcon);
-        SubscribeLocalEvent<BloodCultLeaderComponent, CanDisplayStatusIconsEvent>(OnCanShowCultIcon);
+        SubscribeLocalEvent<ConstructComponent, GetStatusIconsEvent>(OnCanShowConstructIcon);
+        SubscribeLocalEvent<BloodCultistComponent, GetStatusIconsEvent>(OnCanShowCultMemberIcon);
+        SubscribeLocalEvent<BloodCultLeaderComponent, GetStatusIconsEvent>(OnCanShowCultLeaderIcon);
     }
 
     private void OnPentagramAdded(EntityUid uid, PentagramComponent component, ComponentStartup args)
@@ -38,7 +41,7 @@ private void OnPentagramAdded(EntityUid uid, PentagramComponent component, Compo
         var layer = sprite.AddLayer(new SpriteSpecifier.Rsi(component.RsiPath, randomState));
 
         sprite.LayerMapSet(PentagramKey.Key, layer);
-        sprite.LayerSetOffset(layer, new Vector2(0.0f, adj));
+        sprite.LayerSetOffset(layer, new(0.0f, adj));
     }
 
     private void OnPentagramRemoved(EntityUid uid, PentagramComponent component, ComponentShutdown args)
@@ -50,13 +53,39 @@ private void OnPentagramRemoved(EntityUid uid, PentagramComponent component, Com
     }
 
     /// <summary>
-    /// Determine whether a client should display the cult icon.
+    /// Determine whether a client should display the construct icon.
     /// </summary>
-    private void OnCanShowCultIcon<T>(EntityUid uid, T comp, ref CanDisplayStatusIconsEvent args)
-        where T : IAntagStatusIconComponent
+    private void OnCanShowConstructIcon(Entity<ConstructComponent> ent, ref GetStatusIconsEvent args)
     {
-        if (!CanDisplayIcon(args.User, comp.IconVisibleToGhost))
-            args.Cancelled = true;
+        if (CanDisplayIcon(ent.Owner, ent.Comp.IconVisibleToGhost))
+        {
+            if (_prototype.TryIndex(ent.Comp.StatusIcon, out var iconPrototype))
+                args.StatusIcons.Add(iconPrototype);
+        }
+    }
+
+    /// <summary>
+    /// Determine whether a client should display the cult member icon.
+    /// </summary>
+    private void OnCanShowCultMemberIcon(Entity<BloodCultistComponent> ent, ref GetStatusIconsEvent args)
+    {
+        if (CanDisplayIcon(ent.Owner, ent.Comp.IconVisibleToGhost))
+        {
+            if (_prototype.TryIndex(ent.Comp.StatusIcon, out var iconPrototype))
+                args.StatusIcons.Add(iconPrototype);
+        }
+    }
+
+    /// <summary>
+    /// Determine whether a client should display the cult leader icon.
+    /// </summary>
+    private void OnCanShowCultLeaderIcon(Entity<BloodCultLeaderComponent> ent, ref GetStatusIconsEvent args)
+    {
+        if (CanDisplayIcon(ent.Owner, ent.Comp.IconVisibleToGhost))
+        {
+            if (_prototype.TryIndex(ent.Comp.StatusIcon, out var iconPrototype))
+                args.StatusIcons.Add(iconPrototype);
+        }
     }
 
     /// <summary>
diff --git a/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs b/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs
index efb85b23ae3..f5591daa476 100644
--- a/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs
+++ b/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs
@@ -1,9 +1,9 @@
 using Content.Server.NPC.Components;
 using Content.Shared.CombatMode;
 using Content.Shared.Interaction;
-using Content.Shared.Physics;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
+using Robust.Server.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Physics.Components;
 
@@ -13,6 +13,7 @@ public sealed partial class NPCCombatSystem
 {
     [Dependency] private readonly SharedCombatModeSystem _combat = default!;
     [Dependency] private readonly RotateToFaceSystem _rotate = default!;
+    [Dependency] private readonly MapSystem _map = default!;
 
     private EntityQuery<CombatModeComponent> _combatQuery;
     private EntityQuery<NPCSteeringComponent> _steeringQuery;
@@ -134,7 +135,7 @@ private void UpdateRanged(float frameTime)
             {
                 comp.LOSAccumulator += UnoccludedCooldown;
                 // For consistency with NPC steering.
-                comp.TargetInLOS = _interaction.InRangeUnobstructed(uid, Transform(comp.Target).Coordinates, distance + 0.1f);
+                comp.TargetInLOS = _interaction.InRangeUnobstructed(uid, comp.Target, distance + 0.1f);
             }
 
             if (!comp.TargetInLOS)
@@ -188,13 +189,9 @@ private void UpdateRanged(float frameTime)
             EntityCoordinates targetCordinates;
 
             if (_mapManager.TryFindGridAt(xform.MapID, targetPos, out var gridUid, out var mapGrid))
-            {
-                targetCordinates = new EntityCoordinates(gridUid, mapGrid.WorldToLocal(targetSpot));
-            }
+                targetCordinates = new(gridUid, _map.WorldToLocal(comp.Target, mapGrid, targetSpot));
             else
-            {
-                targetCordinates = new EntityCoordinates(xform.MapUid!.Value, targetSpot);
-            }
+                targetCordinates = new(xform.MapUid!.Value, targetSpot);
 
             comp.Status = CombatStatus.Normal;
 
@@ -203,7 +200,6 @@ private void UpdateRanged(float frameTime)
                 return;
             }
 
-            _gun.SetTarget(gun, comp.Target);
             _gun.AttemptShoot(uid, gunUid, gun, targetCordinates);
         }
     }
diff --git a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
index fe0ffafb8ac..4ac4bca6600 100644
--- a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
@@ -269,6 +269,12 @@ public sealed partial class GunComponent : Component
     /// </summary>
     [DataField]
     public Vector2 DefaultDirection = new Vector2(0, -1);
+
+    /// <summary>
+    ///     The percentage chance of a given gun to accidentally discharge if violently thrown into a wall or person
+    /// </summary>
+    [DataField]
+    public float FireOnDropChance = 0.1f;
 }
 
 [Flags]
diff --git a/Content.Shared/WhiteDream/BloodCult/BloodCultist/BloodCultistComponent.cs b/Content.Shared/WhiteDream/BloodCult/BloodCultist/BloodCultistComponent.cs
index 288d496ee5a..bb1cea074c3 100644
--- a/Content.Shared/WhiteDream/BloodCult/BloodCultist/BloodCultistComponent.cs
+++ b/Content.Shared/WhiteDream/BloodCult/BloodCultist/BloodCultistComponent.cs
@@ -10,7 +10,7 @@
 namespace Content.Shared.WhiteDream.BloodCult.BloodCultist;
 
 [RegisterComponent, NetworkedComponent]
-public sealed partial class BloodCultistComponent : Component, IAntagStatusIconComponent
+public sealed partial class BloodCultistComponent : Component
 {
     [DataField]
     public float HolyConvertTime = 15f;

From e14e003af8921c9fed3ef78268737768d640859a Mon Sep 17 00:00:00 2001
From: Scribbles0 <91828755+Scribbles0@users.noreply.github.com>
Date: Sat, 10 Aug 2024 20:05:54 -0700
Subject: [PATCH 079/366] Melee Executions (#30104)

* melee executions

* fix damage bug

* cleanup

* address reviews hopefully

* resistance bypass mechanic

* component changes

* self executions (not finished yet)

* self execs part two

* ok i fixed things (still not finished)

* finish everything

* review stuff

* nuke if (kind = special)

* more review stuffs

* Make suicide system much less hardcoded and make much more use of events

* Fix a dumb bug I introduced

* self execution popups

* Integration tests

* Why did they even take 0.5 blunt damage?

* More consistent integration tests

* Destructive equals true

* Allow it to dirty-dispose

* IS THIS WHAT YOU WANT?

* FRESH AND CLEAN

* modifier to multiplier

* don't jinx the integration tests

* no file-scoped namespace

* Move the rest of execution to shared, create SuicideGhostEvent

* handled

* Get rid of unused code and add a comment

* ghost before suicide

* stop cat suicides

* popup fix + small suicide change

* make it a bit better

---------

Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
---
 .../Tests/Commands/SuicideCommandTests.cs     | 365 ++++++++++++++++++
 .../Chat/Commands/SuicideCommand.cs           |  20 +-
 Content.Server/Chat/SuicideSystem.cs          | 217 ++++++-----
 .../EntitySystems/TriggerSystem.Mobstate.cs   |  14 +-
 .../EntitySystems/KitchenSpikeSystem.cs       |  55 +--
 .../Kitchen/EntitySystems/MicrowaveSystem.cs  |  25 +-
 .../Materials/MaterialReclaimerSystem.cs      |  14 +-
 .../BiomassReclaimerSystem.cs                 |   6 +-
 Content.Server/Morgue/CrematoriumSystem.cs    |   6 +-
 Content.Shared/Chat/SharedSuicideSystem.cs    |  67 ++++
 Content.Shared/Execution/DoAfterEvent.cs      |   9 +
 .../Execution/ExecutionComponent.cs           |  55 ++-
 Content.Shared/Execution/ExecutionSystem.cs   | 240 ------------
 .../Execution/SharedExecutionSystem.cs        | 234 +++++++++++
 .../Interaction/Events/SuicideEvent.cs        |  71 ++--
 Content.Shared/Mind/SharedMindSystem.cs       |   8 +-
 .../Weapons/Melee/Events/MeleeHitEvent.cs     |   2 +-
 .../Weapons/Melee/MeleeWeaponComponent.cs     |   6 +
 .../Weapons/Melee/SharedMeleeWeaponSystem.cs  |   9 +-
 .../Locale/en-US/execution/execution.ftl      |  13 +-
 .../Entities/Objects/Weapons/Melee/sword.yml  |  16 +-
 21 files changed, 995 insertions(+), 457 deletions(-)
 create mode 100644 Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
 create mode 100644 Content.Shared/Chat/SharedSuicideSystem.cs
 create mode 100644 Content.Shared/Execution/DoAfterEvent.cs
 delete mode 100644 Content.Shared/Execution/ExecutionSystem.cs
 create mode 100644 Content.Shared/Execution/SharedExecutionSystem.cs

diff --git a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
new file mode 100644
index 00000000000..540e86c650a
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
@@ -0,0 +1,365 @@
+using System.Linq;
+using Content.Shared.Damage;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.Execution;
+using Content.Shared.FixedPoint;
+using Content.Shared.Ghost;
+using Content.Shared.Hands.Components;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Mind;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.Tag;
+using Robust.Server.GameObjects;
+using Robust.Server.Player;
+using Robust.Shared.Console;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Prototypes;
+
+namespace Content.IntegrationTests.Tests.Commands;
+
+[TestFixture]
+public sealed class SuicideCommandTests
+{
+
+    [TestPrototypes]
+    private const string Prototypes = @"
+- type: entity
+  id: SharpTestObject
+  name: very sharp test object
+  components:
+  - type: Item
+  - type: MeleeWeapon
+    damage:
+      types:
+        Slash: 5
+  - type: Execution
+
+- type: entity
+  id: MixedDamageTestObject
+  name: mixed damage test object
+  components:
+  - type: Item
+  - type: MeleeWeapon
+    damage:
+      types:
+        Slash: 5
+        Blunt: 5
+  - type: Execution
+
+- type: entity
+  id: TestMaterialReclaimer
+  name: test version of the material reclaimer
+  components:
+  - type: MaterialReclaimer";
+
+    /// <summary>
+    /// Run the suicide command in the console
+    /// Should successfully kill the player and ghost them
+    /// </summary>
+    [Test]
+    public async Task TestSuicide()
+    {
+        await using var pair = await PoolManager.GetServerClient(new PoolSettings
+        {
+            Connected = true,
+            Dirty = true,
+            DummyTicker = false
+        });
+        var server = pair.Server;
+        var consoleHost = server.ResolveDependency<IConsoleHost>();
+        var entManager = server.ResolveDependency<IEntityManager>();
+        var playerMan = server.ResolveDependency<IPlayerManager>();
+        var mindSystem = entManager.System<SharedMindSystem>();
+        var mobStateSystem = entManager.System<MobStateSystem>();
+
+        // We need to know the player and whether they can be hurt, killed, and whether they have a mind
+        var player = playerMan.Sessions.First().AttachedEntity!.Value;
+        var mind = mindSystem.GetMind(player);
+
+        MindComponent mindComponent = default;
+        MobStateComponent mobStateComp = default;
+        await server.WaitPost(() =>
+        {
+            if (mind != null)
+                mindComponent = entManager.GetComponent<MindComponent>(mind.Value);
+
+            mobStateComp = entManager.GetComponent<MobStateComponent>(player);
+        });
+
+
+        // Check that running the suicide command kills the player
+        // and properly ghosts them without them being able to return to their body
+        await server.WaitAssertion(() =>
+        {
+            consoleHost.GetSessionShell(playerMan.Sessions.First()).ExecuteCommand("suicide");
+            Assert.Multiple(() =>
+            {
+                Assert.That(mobStateSystem.IsDead(player, mobStateComp));
+                Assert.That(entManager.TryGetComponent<GhostComponent>(mindComponent.CurrentEntity, out var ghostComp) &&
+                            !ghostComp.CanReturnToBody);
+            });
+        });
+
+        await pair.CleanReturnAsync();
+    }
+
+    /// <summary>
+    /// Run the suicide command while the player is already injured
+    /// This should only deal as much damage as necessary to get to the dead threshold
+    /// </summary>
+    [Test]
+    public async Task TestSuicideWhileDamaged()
+    {
+        await using var pair = await PoolManager.GetServerClient(new PoolSettings
+        {
+            Connected = true,
+            Dirty = true,
+            DummyTicker = false
+        });
+        var server = pair.Server;
+        var consoleHost = server.ResolveDependency<IConsoleHost>();
+        var entManager = server.ResolveDependency<IEntityManager>();
+        var playerMan = server.ResolveDependency<IPlayerManager>();
+        var protoMan = server.ResolveDependency<IPrototypeManager>();
+
+        var damageableSystem = entManager.System<DamageableSystem>();
+        var mindSystem = entManager.System<SharedMindSystem>();
+        var mobStateSystem = entManager.System<MobStateSystem>();
+
+        // We need to know the player and whether they can be hurt, killed, and whether they have a mind
+        var player = playerMan.Sessions.First().AttachedEntity!.Value;
+        var mind = mindSystem.GetMind(player);
+
+        MindComponent mindComponent = default;
+        MobStateComponent mobStateComp = default;
+        MobThresholdsComponent mobThresholdsComp = default;
+        DamageableComponent damageableComp = default;
+        await server.WaitPost(() =>
+        {
+            if (mind != null)
+                mindComponent = entManager.GetComponent<MindComponent>(mind.Value);
+
+            mobStateComp = entManager.GetComponent<MobStateComponent>(player);
+            mobThresholdsComp = entManager.GetComponent<MobThresholdsComponent>(player);
+            damageableComp = entManager.GetComponent<DamageableComponent>(player);
+        });
+
+        if (protoMan.TryIndex<DamageTypePrototype>("Slash", out var slashProto))
+            damageableSystem.TryChangeDamage(player, new DamageSpecifier(slashProto, FixedPoint2.New(46.5)));
+
+        // Check that running the suicide command kills the player
+        // and properly ghosts them without them being able to return to their body
+        // and that all the damage is concentrated in the Slash category
+        await server.WaitAssertion(() =>
+        {
+            consoleHost.GetSessionShell(playerMan.Sessions.First()).ExecuteCommand("suicide");
+            var lethalDamageThreshold = mobThresholdsComp.Thresholds.Keys.Last();
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(mobStateSystem.IsDead(player, mobStateComp));
+                Assert.That(entManager.TryGetComponent<GhostComponent>(mindComponent.CurrentEntity, out var ghostComp) &&
+                            !ghostComp.CanReturnToBody);
+                Assert.That(damageableComp.Damage.GetTotal(), Is.EqualTo(lethalDamageThreshold));
+            });
+        });
+
+        await pair.CleanReturnAsync();
+    }
+
+        /// <summary>
+    /// Run the suicide command in the console
+    /// Should only ghost the player but not kill them
+    /// </summary>
+    [Test]
+    public async Task TestSuicideWhenCannotSuicide()
+    {
+        await using var pair = await PoolManager.GetServerClient(new PoolSettings
+        {
+            Connected = true,
+            Dirty = true,
+            DummyTicker = false
+        });
+        var server = pair.Server;
+        var consoleHost = server.ResolveDependency<IConsoleHost>();
+        var entManager = server.ResolveDependency<IEntityManager>();
+        var playerMan = server.ResolveDependency<IPlayerManager>();
+        var mindSystem = entManager.System<SharedMindSystem>();
+        var mobStateSystem = entManager.System<MobStateSystem>();
+        var tagSystem = entManager.System<TagSystem>();
+
+        // We need to know the player and whether they can be hurt, killed, and whether they have a mind
+        var player = playerMan.Sessions.First().AttachedEntity!.Value;
+        var mind = mindSystem.GetMind(player);
+        MindComponent mindComponent = default;
+        MobStateComponent mobStateComp = default;
+        await server.WaitPost(() =>
+        {
+            if (mind != null)
+                mindComponent = entManager.GetComponent<MindComponent>(mind.Value);
+            mobStateComp = entManager.GetComponent<MobStateComponent>(player);
+        });
+
+        tagSystem.AddTag(player, "CannotSuicide");
+
+        // Check that running the suicide command kills the player
+        // and properly ghosts them without them being able to return to their body
+        await server.WaitAssertion(() =>
+        {
+            consoleHost.GetSessionShell(playerMan.Sessions.First()).ExecuteCommand("suicide");
+            Assert.Multiple(() =>
+            {
+                Assert.That(mobStateSystem.IsAlive(player, mobStateComp));
+                Assert.That(entManager.TryGetComponent<GhostComponent>(mindComponent.CurrentEntity, out var ghostComp) &&
+                            !ghostComp.CanReturnToBody);
+            });
+        });
+
+        await pair.CleanReturnAsync();
+    }
+
+
+    /// <summary>
+    /// Run the suicide command while the player is holding an execution-capable weapon
+    /// </summary>
+    [Test]
+    public async Task TestSuicideByHeldItem()
+    {
+        await using var pair = await PoolManager.GetServerClient(new PoolSettings
+        {
+            Connected = true,
+            Dirty = true,
+            DummyTicker = false
+        });
+        var server = pair.Server;
+        var consoleHost = server.ResolveDependency<IConsoleHost>();
+        var entManager = server.ResolveDependency<IEntityManager>();
+        var playerMan = server.ResolveDependency<IPlayerManager>();
+
+        var handsSystem = entManager.System<SharedHandsSystem>();
+        var mindSystem = entManager.System<SharedMindSystem>();
+        var mobStateSystem = entManager.System<MobStateSystem>();
+        var transformSystem = entManager.System<TransformSystem>();
+
+        // We need to know the player and whether they can be hurt, killed, and whether they have a mind
+        var player = playerMan.Sessions.First().AttachedEntity!.Value;
+        var mind = mindSystem.GetMind(player);
+
+        MindComponent mindComponent = default;
+        MobStateComponent mobStateComp = default;
+        MobThresholdsComponent mobThresholdsComp = default;
+        DamageableComponent damageableComp = default;
+        HandsComponent handsComponent = default;
+        await server.WaitPost(() =>
+        {
+            if (mind != null)
+                mindComponent = entManager.GetComponent<MindComponent>(mind.Value);
+
+            mobStateComp = entManager.GetComponent<MobStateComponent>(player);
+            mobThresholdsComp = entManager.GetComponent<MobThresholdsComponent>(player);
+            damageableComp = entManager.GetComponent<DamageableComponent>(player);
+            handsComponent = entManager.GetComponent<HandsComponent>(player);
+        });
+
+        // Spawn the weapon of choice and put it in the player's hands
+        await server.WaitPost(() =>
+        {
+            var item = entManager.SpawnEntity("SharpTestObject", transformSystem.GetMapCoordinates(player));
+            Assert.That(handsSystem.TryPickup(player, item, handsComponent.ActiveHand!));
+            entManager.TryGetComponent<ExecutionComponent>(item, out var executionComponent);
+            Assert.That(executionComponent, Is.Not.EqualTo(null));
+        });
+
+        // Check that running the suicide command kills the player
+        // and properly ghosts them without them being able to return to their body
+        // and that all the damage is concentrated in the Slash category
+        await server.WaitAssertion(() =>
+        {
+            consoleHost.GetSessionShell(playerMan.Sessions.First()).ExecuteCommand("suicide");
+            var lethalDamageThreshold = mobThresholdsComp.Thresholds.Keys.Last();
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(mobStateSystem.IsDead(player, mobStateComp));
+                Assert.That(entManager.TryGetComponent<GhostComponent>(mindComponent.CurrentEntity, out var ghostComp) &&
+                            !ghostComp.CanReturnToBody);
+                Assert.That(damageableComp.Damage.DamageDict["Slash"], Is.EqualTo(lethalDamageThreshold));
+            });
+        });
+
+        await pair.CleanReturnAsync();
+    }
+
+    /// <summary>
+    /// Run the suicide command while the player is holding an execution-capable weapon
+    /// with damage spread between slash and blunt
+    /// </summary>
+    [Test]
+    public async Task TestSuicideByHeldItemSpreadDamage()
+    {
+        await using var pair = await PoolManager.GetServerClient(new PoolSettings
+        {
+            Connected = true,
+            Dirty = true,
+            DummyTicker = false
+        });
+        var server = pair.Server;
+        var consoleHost = server.ResolveDependency<IConsoleHost>();
+        var entManager = server.ResolveDependency<IEntityManager>();
+        var playerMan = server.ResolveDependency<IPlayerManager>();
+
+        var handsSystem = entManager.System<SharedHandsSystem>();
+        var mindSystem = entManager.System<SharedMindSystem>();
+        var mobStateSystem = entManager.System<MobStateSystem>();
+        var transformSystem = entManager.System<TransformSystem>();
+
+        // We need to know the player and whether they can be hurt, killed, and whether they have a mind
+        var player = playerMan.Sessions.First().AttachedEntity!.Value;
+        var mind = mindSystem.GetMind(player);
+
+        MindComponent mindComponent = default;
+        MobStateComponent mobStateComp = default;
+        MobThresholdsComponent mobThresholdsComp = default;
+        DamageableComponent damageableComp = default;
+        HandsComponent handsComponent = default;
+        await server.WaitPost(() =>
+        {
+            if (mind != null)
+                mindComponent = entManager.GetComponent<MindComponent>(mind.Value);
+
+            mobStateComp = entManager.GetComponent<MobStateComponent>(player);
+            mobThresholdsComp = entManager.GetComponent<MobThresholdsComponent>(player);
+            damageableComp = entManager.GetComponent<DamageableComponent>(player);
+            handsComponent = entManager.GetComponent<HandsComponent>(player);
+        });
+
+        // Spawn the weapon of choice and put it in the player's hands
+        await server.WaitPost(() =>
+        {
+            var item = entManager.SpawnEntity("MixedDamageTestObject", transformSystem.GetMapCoordinates(player));
+            Assert.That(handsSystem.TryPickup(player, item, handsComponent.ActiveHand!));
+            entManager.TryGetComponent<ExecutionComponent>(item, out var executionComponent);
+            Assert.That(executionComponent, Is.Not.EqualTo(null));
+        });
+
+        // Check that running the suicide command kills the player
+        // and properly ghosts them without them being able to return to their body
+        // and that slash damage is split in half
+        await server.WaitAssertion(() =>
+        {
+            consoleHost.GetSessionShell(playerMan.Sessions.First()).ExecuteCommand("suicide");
+            var lethalDamageThreshold = mobThresholdsComp.Thresholds.Keys.Last();
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(mobStateSystem.IsDead(player, mobStateComp));
+                Assert.That(entManager.TryGetComponent<GhostComponent>(mindComponent.CurrentEntity, out var ghostComp) &&
+                            !ghostComp.CanReturnToBody);
+                Assert.That(damageableComp.Damage.DamageDict["Slash"], Is.EqualTo(lethalDamageThreshold / 2));
+            });
+        });
+
+        await pair.CleanReturnAsync();
+    }
+}
diff --git a/Content.Server/Chat/Commands/SuicideCommand.cs b/Content.Server/Chat/Commands/SuicideCommand.cs
index c967ba78d7f..b8a73ea88c2 100644
--- a/Content.Server/Chat/Commands/SuicideCommand.cs
+++ b/Content.Server/Chat/Commands/SuicideCommand.cs
@@ -1,5 +1,6 @@
 using Content.Server.GameTicking;
 using Content.Shared.Administration;
+using Content.Shared.Chat;
 using Content.Shared.Mind;
 using Robust.Shared.Console;
 using Robust.Shared.Enums;
@@ -28,24 +29,25 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
 
             var minds = IoCManager.Resolve<IEntityManager>().System<SharedMindSystem>();
             // This check also proves mind not-null for at the end when the mob is ghosted.
-            if (!minds.TryGetMind(player, out var mindId, out var mind) ||
-                mind.OwnedEntity is not { Valid: true } victim)
+            if (!minds.TryGetMind(player, out var mindId, out var mindComp) ||
+                mindComp.OwnedEntity is not { Valid: true } victim)
             {
                 shell.WriteLine("You don't have a mind!");
                 return;
             }
 
-            var gameTicker = EntitySystem.Get<GameTicker>();
-            var suicideSystem = EntitySystem.Get<SuicideSystem>();
-            if (suicideSystem.Suicide(victim))
+            var suicideSystem = _e.System<SuicideSystem>();
+
+            if (_e.HasComponent<AdminFrozenComponent>(victim))
             {
-                // Prevent the player from returning to the body.
-                // Note that mind cannot be null because otherwise victim would be null.
-                gameTicker.OnGhostAttempt(mindId, false, mind: mind);
+                var deniedMessage = Loc.GetString("suicide-command-denied");
+                shell.WriteLine(deniedMessage);
+                _e.System<PopupSystem>()
+                    .PopupEntity(deniedMessage, victim, victim);
                 return;
             }
 
-            if (gameTicker.OnGhostAttempt(mindId, true, mind: mind))
+            if (suicideSystem.Suicide(victim))
                 return;
 
             shell.WriteLine("You can't ghost right now.");
diff --git a/Content.Server/Chat/SuicideSystem.cs b/Content.Server/Chat/SuicideSystem.cs
index 1cc478696ca..884292b0fa7 100644
--- a/Content.Server/Chat/SuicideSystem.cs
+++ b/Content.Server/Chat/SuicideSystem.cs
@@ -1,143 +1,154 @@
-using Content.Server.Administration.Logs;
-using Content.Server.Popups;
+using Content.Server.GameTicking;
 using Content.Shared.Damage;
-using Content.Shared.Damage.Prototypes;
 using Content.Shared.Database;
 using Content.Shared.Hands.Components;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Item;
+using Content.Shared.Mind;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Popups;
 using Content.Shared.Tag;
 using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
+using Content.Shared.Administration.Logs;
+using Content.Shared.Chat;
+using Content.Shared.Mind.Components;
 
-namespace Content.Server.Chat
+namespace Content.Server.Chat;
+
+public sealed class SuicideSystem : EntitySystem
 {
-    public sealed class SuicideSystem : EntitySystem
+    [Dependency] private readonly EntityLookupSystem _entityLookupSystem = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly TagSystem _tagSystem = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly GameTicker _gameTicker = default!;
+    [Dependency] private readonly SharedSuicideSystem _suicide = default!;
+
+    public override void Initialize()
     {
-        [Dependency] private readonly DamageableSystem _damageableSystem = default!;
-        [Dependency] private readonly EntityLookupSystem _entityLookupSystem = default!;
-        [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly TagSystem _tagSystem = default!;
-        [Dependency] private readonly MobStateSystem _mobState = default!;
-        [Dependency] private readonly SharedPopupSystem _popup = default!;
-
-        public bool Suicide(EntityUid victim)
-        {
-            // Checks to see if the CannotSuicide tag exits, ghosts instead.
-            if (_tagSystem.HasTag(victim, "CannotSuicide"))
-                return false;
-
-            // Checks to see if the player is dead.
-            if (!TryComp<MobStateComponent>(victim, out var mobState) || _mobState.IsDead(victim, mobState))
-                return false;
+        base.Initialize();
 
-            _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(victim):player} is attempting to suicide");
+        SubscribeLocalEvent<DamageableComponent, SuicideEvent>(OnDamageableSuicide);
+        SubscribeLocalEvent<MobStateComponent, SuicideEvent>(OnEnvironmentalSuicide);
+        SubscribeLocalEvent<MindContainerComponent, SuicideGhostEvent>(OnSuicideGhost);
+    }
 
-            var suicideEvent = new SuicideEvent(victim);
+    /// <summary>
+    /// Calling this function will attempt to kill the user by suiciding on objects in the surrounding area
+    /// or by applying a lethal amount of damage to the user with the default method.
+    /// Used when writing /suicide
+    /// </summary>
+    public bool Suicide(EntityUid victim)
+    {
+        // Can't suicide if we're already dead
+        if (!TryComp<MobStateComponent>(victim, out var mobState) || _mobState.IsDead(victim, mobState))
+            return false;
 
-            //Check to see if there were any systems blocking this suicide
-            if (SuicideAttemptBlocked(victim, suicideEvent))
-                return false;
+        var suicideGhostEvent = new SuicideGhostEvent(victim);
+        RaiseLocalEvent(victim, suicideGhostEvent);
 
-            return false; // DeltaV - Prevent Suicide. We allow the event to go out anyways in case anything relies on the event for a message or whatever.
+        // Suicide is considered a fail if the user wasn't able to ghost
+        // Suiciding with the CannotSuicide tag will ghost the player but not kill the body
+        if (!suicideGhostEvent.Handled || _tagSystem.HasTag(victim, "CannotSuicide"))
+            return false;
 
-            bool environmentSuicide = false;
-            // If you are critical, you wouldn't be able to use your surroundings to suicide, so you do the default suicide
-            if (!_mobState.IsCritical(victim, mobState))
-            {
-                environmentSuicide = EnvironmentSuicideHandler(victim, suicideEvent);
-            }
+        _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(victim):player} is attempting to suicide");
+        var suicideEvent = new SuicideEvent(victim);
+        RaiseLocalEvent(victim, suicideEvent);
 
-            if (suicideEvent.AttemptBlocked)
-                return false;
+        _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(victim):player} suicided.");
+        return true;
+    }
 
-            DefaultSuicideHandler(victim, suicideEvent);
+    /// <summary>
+    /// Event subscription created to handle the ghosting aspect relating to suicides
+    /// Mainly useful when you can raise an event in Shared and can't call Suicide() directly
+    /// </summary>
+    private void OnSuicideGhost(Entity<MindContainerComponent> victim, ref SuicideGhostEvent args)
+    {
+        if (args.Handled)
+            return;
 
-            ApplyDeath(victim, suicideEvent.Kind!.Value);
-            _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(victim):player} suicided{(environmentSuicide ? " (environment)" : "")}");
-            return true;
-        }
+        if (victim.Comp.Mind == null)
+            return;
 
-        /// <summary>
-        /// If not handled, does the default suicide, which is biting your own tongue
-        /// </summary>
-        private void DefaultSuicideHandler(EntityUid victim, SuicideEvent suicideEvent)
-        {
-            if (suicideEvent.Handled)
-                return;
+        if (!TryComp<MindComponent>(victim.Comp.Mind, out var mindComponent))
+            return;
 
-            var othersMessage = Loc.GetString("suicide-command-default-text-others", ("name", victim));
-            _popup.PopupEntity(othersMessage, victim, Filter.PvsExcept(victim), true);
+        // CannotSuicide tag will allow the user to ghost, but also return to their mind
+        // This is kind of weird, not sure what it applies to?
+        if (_tagSystem.HasTag(victim, "CannotSuicide"))
+            args.CanReturnToBody = true;
 
-            var selfMessage = Loc.GetString("suicide-command-default-text-self");
-            _popup.PopupEntity(selfMessage, victim, victim);
-            suicideEvent.SetHandled(SuicideKind.Bloodloss);
-        }
+        if (_gameTicker.OnGhostAttempt(victim.Comp.Mind.Value, args.CanReturnToBody, mind: mindComponent))
+            args.Handled = true;
+    }
 
-        /// <summary>
-        /// Checks to see if there are any other systems that prevent suicide
-        /// </summary>
-        /// <returns>Returns true if there was a blocked attempt</returns>
-        private bool SuicideAttemptBlocked(EntityUid victim, SuicideEvent suicideEvent)
-        {
-            RaiseLocalEvent(victim, suicideEvent, true);
+    /// <summary>
+    /// Raise event to attempt to use held item, or surrounding entities to attempt to commit suicide
+    /// </summary>
+    private void OnEnvironmentalSuicide(Entity<MobStateComponent> victim, ref SuicideEvent args)
+    {
+        if (args.Handled || _mobState.IsCritical(victim))
+            return;
 
-            if (suicideEvent.AttemptBlocked)
-                return true;
+        var suicideByEnvironmentEvent = new SuicideByEnvironmentEvent(victim);
 
-            return false;
+        // Try to suicide by raising an event on the held item
+        if (EntityManager.TryGetComponent(victim, out HandsComponent? handsComponent)
+            && handsComponent.ActiveHandEntity is { } item)
+        {
+            RaiseLocalEvent(item, suicideByEnvironmentEvent);
+            if (suicideByEnvironmentEvent.Handled)
+            {
+                args.Handled = suicideByEnvironmentEvent.Handled;
+                return;
+            }
         }
 
-        /// <summary>
-        /// Raise event to attempt to use held item, or surrounding entities to attempt to commit suicide
-        /// </summary>
-        private bool EnvironmentSuicideHandler(EntityUid victim, SuicideEvent suicideEvent)
+        // Try to suicide by nearby entities, like Microwaves or Crematoriums, by raising an event on it
+        // Returns upon being handled by any entity
+        var itemQuery = GetEntityQuery<ItemComponent>();
+        foreach (var entity in _entityLookupSystem.GetEntitiesInRange(victim, 1, LookupFlags.Approximate | LookupFlags.Static))
         {
-            var itemQuery = GetEntityQuery<ItemComponent>();
-
-            // Suicide by held item
-            if (EntityManager.TryGetComponent(victim, out HandsComponent? handsComponent)
-                && handsComponent.ActiveHandEntity is { } item)
-            {
-                RaiseLocalEvent(item, suicideEvent, false);
+            // Skip any nearby items that can be picked up, we already checked the active held item above
+            if (itemQuery.HasComponent(entity))
+                continue;
 
-                if (suicideEvent.Handled)
-                    return true;
-            }
+            RaiseLocalEvent(entity, suicideByEnvironmentEvent);
+            if (!suicideByEnvironmentEvent.Handled)
+                continue;
 
-            // Suicide by nearby entity (ex: Microwave)
-            foreach (var entity in _entityLookupSystem.GetEntitiesInRange(victim, 1, LookupFlags.Approximate | LookupFlags.Static))
-            {
-                // Skip any nearby items that can be picked up, we already checked the active held item above
-                if (itemQuery.HasComponent(entity))
-                    continue;
+            args.Handled = suicideByEnvironmentEvent.Handled;
+            return;
+        }
+    }
 
-                RaiseLocalEvent(entity, suicideEvent);
+    /// <summary>
+    /// Default suicide behavior for any kind of entity that can take damage
+    /// </summary>
+    private void OnDamageableSuicide(Entity<DamageableComponent> victim, ref SuicideEvent args)
+    {
+        if (args.Handled)
+            return;
 
-                if (suicideEvent.Handled)
-                    return true;
-            }
+        var othersMessage = Loc.GetString("suicide-command-default-text-others", ("name", victim));
+        _popup.PopupEntity(othersMessage, victim, Filter.PvsExcept(victim), true);
 
-            return false;
-        }
+        var selfMessage = Loc.GetString("suicide-command-default-text-self");
+        _popup.PopupEntity(selfMessage, victim, victim);
 
-        private void ApplyDeath(EntityUid target, SuicideKind kind)
+        if (args.DamageSpecifier != null)
         {
-            if (kind == SuicideKind.Special)
-                return;
-
-            if (!_prototypeManager.TryIndex<DamageTypePrototype>(kind.ToString(), out var damagePrototype))
-            {
-                const SuicideKind fallback = SuicideKind.Blunt;
-                Log.Error($"{nameof(SuicideSystem)} could not find the damage type prototype associated with {kind}. Falling back to {fallback}");
-                damagePrototype = _prototypeManager.Index<DamageTypePrototype>(fallback.ToString());
-            }
-            const int lethalAmountOfDamage = 200; // TODO: Would be nice to get this number from somewhere else
-            _damageableSystem.TryChangeDamage(target, new(damagePrototype, lethalAmountOfDamage), true, origin: target);
+            _suicide.ApplyLethalDamage(victim, args.DamageSpecifier);
+            args.Handled = true;
+            return;
         }
+
+        args.DamageType ??= "Bloodloss";
+        _suicide.ApplyLethalDamage(victim, args.DamageType);
+        args.Handled = true;
     }
 }
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.Mobstate.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.Mobstate.cs
index 45198662ec3..ccd2a6e3df0 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.Mobstate.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.Mobstate.cs
@@ -38,16 +38,20 @@ private void OnMobStateChanged(EntityUid uid, TriggerOnMobstateChangeComponent c
             Trigger(uid);
     }
 
+    /// <summary>
+    /// Checks if the user has any implants that prevent suicide to avoid some cheesy strategies
+    /// Prevents suicide by handling the event without killing the user
+    /// </summary>
     private void OnSuicide(EntityUid uid, TriggerOnMobstateChangeComponent component, SuicideEvent args)
     {
         if (args.Handled)
             return;
 
-        if (component.PreventSuicide)
-        {
-            _popupSystem.PopupEntity(Loc.GetString("suicide-prevented"), args.Victim, args.Victim);
-            args.BlockSuicideAttempt(component.PreventSuicide);
-        }
+        if (!component.PreventSuicide)
+            return;
+
+        _popupSystem.PopupEntity(Loc.GetString("suicide-prevented"), args.Victim, args.Victim);
+        args.Handled = true;
     }
 
     private void OnSuicideRelay(EntityUid uid, TriggerOnMobstateChangeComponent component, ImplantRelayEvent<SuicideEvent> args)
diff --git a/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs b/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs
index b145bec0148..2ca7cdbd85d 100644
--- a/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs
@@ -2,6 +2,8 @@
 using Content.Server.Body.Systems;
 using Content.Server.Kitchen.Components;
 using Content.Server.Popups;
+using Content.Shared.Chat;
+using Content.Shared.Damage;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
 using Content.Shared.DragDrop;
@@ -16,7 +18,6 @@
 using Content.Shared.Popups;
 using Content.Shared.Storage;
 using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
@@ -36,6 +37,7 @@ public sealed class KitchenSpikeSystem : SharedKitchenSpikeSystem
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly MetaDataSystem _metaData = default!;
+        [Dependency] private readonly SharedSuicideSystem _suicide = default!;
 
         public override void Initialize()
         {
@@ -48,31 +50,38 @@ public override void Initialize()
             //DoAfter
             SubscribeLocalEvent<KitchenSpikeComponent, SpikeDoAfterEvent>(OnDoAfter);
 
-            SubscribeLocalEvent<KitchenSpikeComponent, SuicideEvent>(OnSuicide);
+            SubscribeLocalEvent<KitchenSpikeComponent, SuicideByEnvironmentEvent>(OnSuicideByEnvironment);
 
             SubscribeLocalEvent<ButcherableComponent, CanDropDraggedEvent>(OnButcherableCanDrop);
         }
 
-        private void OnButcherableCanDrop(EntityUid uid, ButcherableComponent component, ref CanDropDraggedEvent args)
+        private void OnButcherableCanDrop(Entity<ButcherableComponent> entity, ref CanDropDraggedEvent args)
         {
             args.Handled = true;
-            args.CanDrop |= component.Type != ButcheringType.Knife;
+            args.CanDrop |= entity.Comp.Type != ButcheringType.Knife;
         }
 
-        private void OnSuicide(EntityUid uid, KitchenSpikeComponent component, SuicideEvent args)
+        /// <summary>
+        /// TODO: Update this so it actually meatspikes the user instead of applying lethal damage to them.
+        /// </summary>
+        private void OnSuicideByEnvironment(Entity<KitchenSpikeComponent> entity, ref SuicideByEnvironmentEvent args)
         {
             if (args.Handled)
                 return;
-            args.SetHandled(SuicideKind.Piercing);
-            var victim = args.Victim;
-            var othersMessage = Loc.GetString("comp-kitchen-spike-suicide-other", ("victim", victim));
-            _popupSystem.PopupEntity(othersMessage, victim);
+
+            if (!TryComp<DamageableComponent>(args.Victim, out var damageableComponent))
+                return;
+
+            _suicide.ApplyLethalDamage((args.Victim, damageableComponent), "Piercing");
+            var othersMessage = Loc.GetString("comp-kitchen-spike-suicide-other", ("victim", args.Victim));
+            _popupSystem.PopupEntity(othersMessage, args.Victim, Filter.PvsExcept(args.Victim), true);
 
             var selfMessage = Loc.GetString("comp-kitchen-spike-suicide-self");
-            _popupSystem.PopupEntity(selfMessage, victim, victim);
+            _popupSystem.PopupEntity(selfMessage, args.Victim, args.Victim);
+            args.Handled = true;
         }
 
-        private void OnDoAfter(EntityUid uid, KitchenSpikeComponent component, DoAfterEvent args)
+        private void OnDoAfter(Entity<KitchenSpikeComponent> entity, ref SpikeDoAfterEvent args)
         {
             if (args.Args.Target == null)
                 return;
@@ -82,49 +91,49 @@ private void OnDoAfter(EntityUid uid, KitchenSpikeComponent component, DoAfterEv
 
             if (args.Cancelled)
             {
-                component.InUse = false;
+                entity.Comp.InUse = false;
                 return;
             }
 
             if (args.Handled)
                 return;
 
-            if (Spikeable(uid, args.Args.User, args.Args.Target.Value, component, butcherable))
-                Spike(uid, args.Args.User, args.Args.Target.Value, component);
+            if (Spikeable(entity, args.Args.User, args.Args.Target.Value, entity.Comp, butcherable))
+                Spike(entity, args.Args.User, args.Args.Target.Value, entity.Comp);
 
-            component.InUse = false;
+            entity.Comp.InUse = false;
             args.Handled = true;
         }
 
-        private void OnDragDrop(EntityUid uid, KitchenSpikeComponent component, ref DragDropTargetEvent args)
+        private void OnDragDrop(Entity<KitchenSpikeComponent> entity, ref DragDropTargetEvent args)
         {
             if (args.Handled)
                 return;
 
             args.Handled = true;
 
-            if (Spikeable(uid, args.User, args.Dragged, component))
-                TrySpike(uid, args.User, args.Dragged, component);
+            if (Spikeable(entity, args.User, args.Dragged, entity.Comp))
+                TrySpike(entity, args.User, args.Dragged, entity.Comp);
         }
 
-        private void OnInteractHand(EntityUid uid, KitchenSpikeComponent component, InteractHandEvent args)
+        private void OnInteractHand(Entity<KitchenSpikeComponent> entity, ref InteractHandEvent args)
         {
             if (args.Handled)
                 return;
 
-            if (component.PrototypesToSpawn?.Count > 0)
+            if (entity.Comp.PrototypesToSpawn?.Count > 0)
             {
-                _popupSystem.PopupEntity(Loc.GetString("comp-kitchen-spike-knife-needed"), uid, args.User);
+                _popupSystem.PopupEntity(Loc.GetString("comp-kitchen-spike-knife-needed"), entity, args.User);
                 args.Handled = true;
             }
         }
 
-        private void OnInteractUsing(EntityUid uid, KitchenSpikeComponent component, InteractUsingEvent args)
+        private void OnInteractUsing(Entity<KitchenSpikeComponent> entity, ref InteractUsingEvent args)
         {
             if (args.Handled)
                 return;
 
-            if (TryGetPiece(uid, args.User, args.Used))
+            if (TryGetPiece(entity, args.User, args.Used))
                 args.Handled = true;
         }
 
diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
index 40be61695fc..be76a906911 100644
--- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
@@ -35,6 +35,10 @@
 using System.Linq;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
+using Content.Shared.Stacks;
+using Content.Server.Construction.Components;
+using Content.Shared.Chat;
+using Content.Shared.Damage;
 
 namespace Content.Server.Kitchen.EntitySystems
 {
@@ -58,6 +62,10 @@ public sealed class MicrowaveSystem : EntitySystem
         [Dependency] private readonly UserInterfaceSystem _userInterface = default!;
         [Dependency] private readonly HandsSystem _handsSystem = default!;
         [Dependency] private readonly SharedItemSystem _item = default!;
+        [Dependency] private readonly SharedStackSystem _stack = default!;
+        [Dependency] private readonly IPrototypeManager _prototype = default!;
+        [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+        [Dependency] private readonly SharedSuicideSystem _suicide = default!;
 
         [ValidatePrototypeId<EntityPrototype>]
         private const string MalfunctionSpark = "Spark";
@@ -75,7 +83,7 @@ public override void Initialize()
             SubscribeLocalEvent<MicrowaveComponent, BreakageEventArgs>(OnBreak);
             SubscribeLocalEvent<MicrowaveComponent, PowerChangedEvent>(OnPowerChanged);
             SubscribeLocalEvent<MicrowaveComponent, AnchorStateChangedEvent>(OnAnchorChanged);
-            SubscribeLocalEvent<MicrowaveComponent, SuicideEvent>(OnSuicide);
+            SubscribeLocalEvent<MicrowaveComponent, SuicideByEnvironmentEvent>(OnSuicideByEnvironment);
             SubscribeLocalEvent<MicrowaveComponent, RefreshPartsEvent>(OnRefreshParts);
             SubscribeLocalEvent<MicrowaveComponent, UpgradeExamineEvent>(OnUpgradeExamine);
 
@@ -233,12 +241,22 @@ private void OnMapInit(Entity<MicrowaveComponent> ent, ref MapInitEvent args)
             _deviceLink.EnsureSinkPorts(ent, ent.Comp.OnPort);
         }
 
-        private void OnSuicide(Entity<MicrowaveComponent> ent, ref SuicideEvent args)
+        /// <summary>
+        /// Kills the user by microwaving their head
+        /// TODO: Make this not awful, it keeps any items attached to your head still on and you can revive someone and cogni them so you have some dumb headless fuck running around. I've seen it happen.
+        /// </summary>
+        private void OnSuicideByEnvironment(Entity<MicrowaveComponent> ent, ref SuicideByEnvironmentEvent args)
         {
             if (args.Handled)
                 return;
 
-            args.SetHandled(SuicideKind.Heat);
+            // The act of getting your head microwaved doesn't actually kill you
+            if (!TryComp<DamageableComponent>(args.Victim, out var damageableComponent))
+                return;
+
+            // The application of lethal damage is what kills you...
+            _suicide.ApplyLethalDamage((args.Victim, damageableComponent), "Heat");
+
             var victim = args.Victim;
             var headCount = 0;
 
@@ -268,6 +286,7 @@ private void OnSuicide(Entity<MicrowaveComponent> ent, ref SuicideEvent args)
             ent.Comp.CurrentCookTimerTime = 10;
             Wzhzhzh(ent.Owner, ent.Comp, args.Victim);
             UpdateUserInterfaceState(ent.Owner, ent.Comp);
+            args.Handled = true;
         }
 
         private void OnSolutionChange(Entity<MicrowaveComponent> ent, ref SolutionContainerChangedEvent args)
diff --git a/Content.Server/Materials/MaterialReclaimerSystem.cs b/Content.Server/Materials/MaterialReclaimerSystem.cs
index 44f92502553..a4039969785 100644
--- a/Content.Server/Materials/MaterialReclaimerSystem.cs
+++ b/Content.Server/Materials/MaterialReclaimerSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Chemistry.Containers.EntitySystems;
+using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Construction;
 using Content.Server.Fluids.EntitySystems;
@@ -56,7 +56,7 @@ public override void Initialize()
         SubscribeLocalEvent<MaterialReclaimerComponent, PowerChangedEvent>(OnPowerChanged);
         SubscribeLocalEvent<MaterialReclaimerComponent, InteractUsingEvent>(OnInteractUsing,
             before: new []{typeof(WiresSystem), typeof(SolutionTransferSystem)});
-        SubscribeLocalEvent<MaterialReclaimerComponent, SuicideEvent>(OnSuicide);
+        SubscribeLocalEvent<MaterialReclaimerComponent, SuicideByEnvironmentEvent>(OnSuicideByEnvironment);
         SubscribeLocalEvent<ActiveMaterialReclaimerComponent, PowerChangedEvent>(OnActivePowerChanged);
     }
     private void OnStartup(Entity<MaterialReclaimerComponent> entity, ref ComponentStartup args)
@@ -106,12 +106,11 @@ private void OnInteractUsing(Entity<MaterialReclaimerComponent> entity, ref Inte
         args.Handled = TryStartProcessItem(entity.Owner, args.Used, entity.Comp, args.User);
     }
 
-    private void OnSuicide(Entity<MaterialReclaimerComponent> entity, ref SuicideEvent args)
+    private void OnSuicideByEnvironment(Entity<MaterialReclaimerComponent> entity, ref SuicideByEnvironmentEvent args)
     {
         if (args.Handled)
             return;
 
-        args.SetHandled(SuicideKind.Bloodloss);
         var victim = args.Victim;
         if (TryComp(victim, out ActorComponent? actor) &&
             _mind.TryGetMind(actor.PlayerSession, out var mindId, out var mind))
@@ -123,12 +122,15 @@ private void OnSuicide(Entity<MaterialReclaimerComponent> entity, ref SuicideEve
             }
         }
 
-        _popup.PopupEntity(Loc.GetString("recycler-component-suicide-message-others", ("victim", Identity.Entity(victim, EntityManager))),
+        _popup.PopupEntity(Loc.GetString("recycler-component-suicide-message-others",
+                ("victim", Identity.Entity(victim, EntityManager))),
             victim,
-            Filter.PvsExcept(victim, entityManager: EntityManager), true);
+            Filter.PvsExcept(victim, entityManager: EntityManager),
+            true);
 
         _body.GibBody(victim, true);
         _appearance.SetData(entity.Owner, RecyclerVisuals.Bloody, true);
+        args.Handled = true;
     }
 
     private void OnActivePowerChanged(Entity<ActiveMaterialReclaimerComponent> entity, ref PowerChangedEvent args)
diff --git a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
index 227283c95d0..2e6e0117154 100644
--- a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
+++ b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
@@ -104,11 +104,11 @@ public override void Initialize()
             SubscribeLocalEvent<BiomassReclaimerComponent, RefreshPartsEvent>(OnRefreshParts);
             SubscribeLocalEvent<BiomassReclaimerComponent, UpgradeExamineEvent>(OnUpgradeExamine);
             SubscribeLocalEvent<BiomassReclaimerComponent, PowerChangedEvent>(OnPowerChanged);
-            SubscribeLocalEvent<BiomassReclaimerComponent, SuicideEvent>(OnSuicide);
+            SubscribeLocalEvent<BiomassReclaimerComponent, SuicideByEnvironmentEvent>(OnSuicideByEnvironment);
             SubscribeLocalEvent<BiomassReclaimerComponent, ReclaimerDoAfterEvent>(OnDoAfter);
         }
 
-        private void OnSuicide(Entity<BiomassReclaimerComponent> ent, ref SuicideEvent args)
+        private void OnSuicideByEnvironment(Entity<BiomassReclaimerComponent> ent, ref SuicideByEnvironmentEvent args)
         {
             if (args.Handled
                 || HasComp<ActiveBiomassReclaimerComponent>(ent)
@@ -117,7 +117,7 @@ private void OnSuicide(Entity<BiomassReclaimerComponent> ent, ref SuicideEvent a
 
             _popup.PopupEntity(Loc.GetString("biomass-reclaimer-suicide-others", ("victim", args.Victim)), ent, PopupType.LargeCaution);
             StartProcessing(args.Victim, ent);
-            args.SetHandled(SuicideKind.Blunt);
+            args.Handled = true;
         }
 
         private void OnInit(EntityUid uid, ActiveBiomassReclaimerComponent component, ComponentInit args)
diff --git a/Content.Server/Morgue/CrematoriumSystem.cs b/Content.Server/Morgue/CrematoriumSystem.cs
index 54b47cff84a..f6859b610af 100644
--- a/Content.Server/Morgue/CrematoriumSystem.cs
+++ b/Content.Server/Morgue/CrematoriumSystem.cs
@@ -38,7 +38,7 @@ public override void Initialize()
 
         SubscribeLocalEvent<CrematoriumComponent, ExaminedEvent>(OnExamine);
         SubscribeLocalEvent<CrematoriumComponent, GetVerbsEvent<AlternativeVerb>>(AddCremateVerb);
-        SubscribeLocalEvent<CrematoriumComponent, SuicideEvent>(OnSuicide);
+        SubscribeLocalEvent<CrematoriumComponent, SuicideByEnvironmentEvent>(OnSuicideByEnvironment);
         SubscribeLocalEvent<ActiveCrematoriumComponent, StorageOpenAttemptEvent>(OnAttemptOpen);
     }
 
@@ -146,11 +146,10 @@ private void FinishCooking(EntityUid uid, CrematoriumComponent component, Entity
         _audio.PlayPvs(component.CremateFinishSound, uid);
     }
 
-    private void OnSuicide(EntityUid uid, CrematoriumComponent component, SuicideEvent args)
+    private void OnSuicideByEnvironment(EntityUid uid, CrematoriumComponent component, SuicideByEnvironmentEvent args)
     {
         if (args.Handled)
             return;
-        args.SetHandled(SuicideKind.Heat);
 
         var victim = args.Victim;
         if (TryComp(victim, out ActorComponent? actor) && _minds.TryGetMind(victim, out var mindId, out var mind))
@@ -179,6 +178,7 @@ private void OnSuicide(EntityUid uid, CrematoriumComponent component, SuicideEve
         }
         _entityStorage.CloseStorage(uid);
         Cremate(uid, component);
+        args.Handled = true;
     }
 
     public override void Update(float frameTime)
diff --git a/Content.Shared/Chat/SharedSuicideSystem.cs b/Content.Shared/Chat/SharedSuicideSystem.cs
new file mode 100644
index 00000000000..d341ea89a8f
--- /dev/null
+++ b/Content.Shared/Chat/SharedSuicideSystem.cs
@@ -0,0 +1,67 @@
+using Content.Shared.Damage;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.Mobs.Components;
+using Robust.Shared.Prototypes;
+using System.Linq;
+
+namespace Content.Shared.Chat;
+
+public sealed class SharedSuicideSystem : EntitySystem
+{
+    [Dependency] private readonly DamageableSystem _damageableSystem = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+    /// <summary>
+    /// Applies lethal damage spread out across the damage types given.
+    /// </summary>
+    public void ApplyLethalDamage(Entity<DamageableComponent> target, DamageSpecifier damageSpecifier)
+    {
+        // Create a new damageSpecifier so that we don't make alterations to the original DamageSpecifier
+        // Failing  to do this will permanently change a weapon's damage making it insta-kill people
+        var appliedDamageSpecifier = new DamageSpecifier(damageSpecifier);
+        if (!TryComp<MobThresholdsComponent>(target, out var mobThresholds))
+            return;
+
+        // Mob thresholds are sorted from alive -> crit -> dead,
+        // grabbing the last key will give us how much damage is needed to kill a target from zero
+        // The exact lethal damage amount is adjusted based on their current damage taken
+        var lethalAmountOfDamage = mobThresholds.Thresholds.Keys.Last() - target.Comp.TotalDamage;
+        var totalDamage = appliedDamageSpecifier.GetTotal();
+
+        // Removing structural because it causes issues against entities that cannot take structural damage,
+        // then getting the total to use in calculations for spreading out damage.
+        appliedDamageSpecifier.DamageDict.Remove("Structural");
+
+        // Split the total amount of damage needed to kill the target by every damage type in the DamageSpecifier
+        foreach (var (key, value) in appliedDamageSpecifier.DamageDict)
+        {
+            appliedDamageSpecifier.DamageDict[key] = Math.Ceiling((double) (value * lethalAmountOfDamage / totalDamage));
+        }
+
+        _damageableSystem.TryChangeDamage(target, appliedDamageSpecifier, true, origin: target);
+    }
+
+    /// <summary>
+    /// Applies lethal damage in a single type, specified by a single damage type.
+    /// </summary>
+    public void ApplyLethalDamage(Entity<DamageableComponent> target, ProtoId<DamageTypePrototype>? damageType)
+    {
+        if (!TryComp<MobThresholdsComponent>(target, out var mobThresholds))
+            return;
+
+        // Mob thresholds are sorted from alive -> crit -> dead,
+        // grabbing the last key will give us how much damage is needed to kill a target from zero
+        // The exact lethal damage amount is adjusted based on their current damage taken
+        var lethalAmountOfDamage = mobThresholds.Thresholds.Keys.Last() - target.Comp.TotalDamage;
+
+        // We don't want structural damage for the same reasons listed above
+        if (!_prototypeManager.TryIndex(damageType, out var damagePrototype) || damagePrototype.ID == "Structural")
+        {
+            Log.Error($"{nameof(SharedSuicideSystem)} could not find the damage type prototype associated with {damageType}. Falling back to Blunt");
+            damagePrototype = _prototypeManager.Index<DamageTypePrototype>("Blunt");
+        }
+
+        var damage = new DamageSpecifier(damagePrototype, lethalAmountOfDamage);
+        _damageableSystem.TryChangeDamage(target, damage, true, origin: target);
+    }
+}
diff --git a/Content.Shared/Execution/DoAfterEvent.cs b/Content.Shared/Execution/DoAfterEvent.cs
new file mode 100644
index 00000000000..78549745276
--- /dev/null
+++ b/Content.Shared/Execution/DoAfterEvent.cs
@@ -0,0 +1,9 @@
+using Content.Shared.DoAfter;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Execution;
+
+[Serializable, NetSerializable]
+public sealed partial class ExecutionDoAfterEvent : SimpleDoAfterEvent
+{
+}
diff --git a/Content.Shared/Execution/ExecutionComponent.cs b/Content.Shared/Execution/ExecutionComponent.cs
index f9c5111d63a..31477ead697 100644
--- a/Content.Shared/Execution/ExecutionComponent.cs
+++ b/Content.Shared/Execution/ExecutionComponent.cs
@@ -14,13 +14,64 @@ public sealed partial class ExecutionComponent : Component
     [DataField, AutoNetworkedField]
     public float DoAfterDuration = 5f;
 
+    /// <summary>
+    /// Arbitrarily chosen number to multiply damage by, used to deal reasonable amounts of damage to a victim of an execution.
+    /// /// </summary>
     [DataField, AutoNetworkedField]
-    public float DamageModifier = 9f;
+    public float DamageMultiplier = 9f;
+
+    /// <summary>
+    /// Shown to the person performing the melee execution (attacker) upon starting a melee execution.
+    /// </summary>
+    [DataField]
+    public LocId InternalMeleeExecutionMessage = "execution-popup-melee-initial-internal";
+
+    /// <summary>
+    /// Shown to bystanders and the victim of a melee execution when a melee execution is started.
+    /// </summary>
+    [DataField]
+    public LocId ExternalMeleeExecutionMessage = "execution-popup-melee-initial-external";
+
+    /// <summary>
+    /// Shown to the attacker upon completion of a melee execution.
+    /// </summary>
+    [DataField]
+    public LocId CompleteInternalMeleeExecutionMessage = "execution-popup-melee-complete-internal";
+
+    /// <summary>
+    /// Shown to bystanders and the victim of a melee execution when a melee execution is completed.
+    /// </summary>
+    [DataField]
+    public LocId CompleteExternalMeleeExecutionMessage = "execution-popup-melee-complete-external";
+
+    /// <summary>
+    /// Shown to the person performing the self execution when starting one.
+    /// </summary>
+    [DataField]
+    public LocId InternalSelfExecutionMessage = "execution-popup-self-initial-internal";
+
+    /// <summary>
+    /// Shown to bystanders near a self execution when one is started.
+    /// </summary>
+    [DataField]
+    public LocId ExternalSelfExecutionMessage = "execution-popup-self-initial-external";
+
+    /// <summary>
+    /// Shown to the person performing a self execution upon completion of a do-after or on use of /suicide with a weapon that has the Execution component.
+    /// </summary>
+    [DataField]
+    public LocId CompleteInternalSelfExecutionMessage = "execution-popup-self-complete-internal";
+
+    /// <summary>
+    /// Shown to bystanders when a self execution is completed or a suicide via execution weapon happens nearby.
+    /// </summary>
+    [DataField]
+    public LocId CompleteExternalSelfExecutionMessage = "execution-popup-self-complete-external";
 
     // Not networked because this is transient inside of a tick.
     /// <summary>
     /// True if it is currently executing for handlers.
     /// </summary>
     [DataField]
-    public bool Executing = true;
+    public bool Executing = false;
 }
diff --git a/Content.Shared/Execution/ExecutionSystem.cs b/Content.Shared/Execution/ExecutionSystem.cs
deleted file mode 100644
index 278001a5d21..00000000000
--- a/Content.Shared/Execution/ExecutionSystem.cs
+++ /dev/null
@@ -1,240 +0,0 @@
-using Content.Shared.Weapons.Ranged.Systems;
-using Content.Shared.ActionBlocker;
-using Content.Shared.CombatMode;
-using Content.Shared.Damage;
-using Content.Shared.Database;
-using Content.Shared.DoAfter;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Mobs.Systems;
-using Content.Shared.Popups;
-using Content.Shared.Verbs;
-using Content.Shared.Weapons.Melee;
-using Content.Shared.Weapons.Melee.Events;
-using Content.Shared.Weapons.Ranged.Components;
-using Robust.Shared.Network;
-using Robust.Shared.Player;
-
-namespace Content.Shared.Execution;
-
-/// <summary>
-///     Verb for violently murdering cuffed creatures.
-/// </summary>
-public sealed class ExecutionSystem : EntitySystem
-{
-    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
-    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
-    [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
-    [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
-    [Dependency] private readonly SharedGunSystem _gunSystem = default!;
-    [Dependency] private readonly SharedCombatModeSystem _combatSystem = default!;
-    [Dependency] private readonly SharedMeleeWeaponSystem _meleeSystem = default!;
-
-    // TODO: Still needs more cleaning up.
-    private const string DefaultInternalMeleeExecutionMessage = "execution-popup-melee-initial-internal";
-    private const string DefaultExternalMeleeExecutionMessage = "execution-popup-melee-initial-external";
-    private const string DefaultCompleteInternalMeleeExecutionMessage = "execution-popup-melee-complete-internal";
-    private const string DefaultCompleteExternalMeleeExecutionMessage = "execution-popup-melee-complete-external";
-    private const string DefaultInternalGunExecutionMessage = "execution-popup-gun-initial-internal";
-    private const string DefaultExternalGunExecutionMessage = "execution-popup-gun-initial-external";
-    private const string DefaultCompleteInternalGunExecutionMessage = "execution-popup-gun-complete-internal";
-    private const string DefaultCompleteExternalGunExecutionMessage = "execution-popup-gun-complete-external";
-
-    /// <inheritdoc/>
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<ExecutionComponent, GetVerbsEvent<UtilityVerb>>(OnGetInteractionsVerbs);
-        SubscribeLocalEvent<ExecutionComponent, ExecutionDoAfterEvent>(OnExecutionDoAfter);
-        SubscribeLocalEvent<ExecutionComponent, GetMeleeDamageEvent>(OnGetMeleeDamage);
-    }
-
-    private void OnGetInteractionsVerbs(EntityUid uid, ExecutionComponent comp, GetVerbsEvent<UtilityVerb> args)
-    {
-        if (args.Hands == null || args.Using == null || !args.CanAccess || !args.CanInteract)
-            return;
-
-        var attacker = args.User;
-        var weapon = args.Using.Value;
-        var victim = args.Target;
-
-        if (!CanExecuteWithAny(victim, attacker))
-            return;
-
-        UtilityVerb verb = new()
-        {
-            Act = () => TryStartExecutionDoAfter(weapon, victim, attacker, comp),
-            Impact = LogImpact.High,
-            Text = Loc.GetString("execution-verb-name"),
-            Message = Loc.GetString("execution-verb-message"),
-        };
-
-        args.Verbs.Add(verb);
-    }
-
-    private void TryStartExecutionDoAfter(EntityUid weapon, EntityUid victim, EntityUid attacker, ExecutionComponent comp)
-    {
-        if (!CanExecuteWithAny(victim, attacker))
-            return;
-
-        // TODO: This should just be on the weapons as a single execution message.
-        var defaultExecutionInternal = DefaultInternalMeleeExecutionMessage;
-        var defaultExecutionExternal = DefaultExternalMeleeExecutionMessage;
-
-        if (HasComp<GunComponent>(weapon))
-        {
-            defaultExecutionExternal = DefaultInternalGunExecutionMessage;
-            defaultExecutionInternal = DefaultExternalGunExecutionMessage;
-        }
-
-        var internalMsg = defaultExecutionInternal;
-        var externalMsg = defaultExecutionExternal;
-        ShowExecutionInternalPopup(internalMsg, attacker, victim, weapon);
-        ShowExecutionExternalPopup(externalMsg, attacker, victim, weapon);
-
-        var doAfter =
-            new DoAfterArgs(EntityManager, attacker, comp.DoAfterDuration, new ExecutionDoAfterEvent(), weapon, target: victim, used: weapon)
-            {
-                BreakOnMove = true,
-                BreakOnDamage = true,
-                NeedHand = true
-            };
-
-        _doAfterSystem.TryStartDoAfter(doAfter);
-
-    }
-
-    private bool CanExecuteWithAny(EntityUid victim, EntityUid attacker)
-    {
-        // Use suicide.
-        if (victim == attacker)
-            return false;
-
-        // No point executing someone if they can't take damage
-        if (!TryComp<DamageableComponent>(victim, out _))
-            return false;
-
-        // You can't execute something that cannot die
-        if (!TryComp<MobStateComponent>(victim, out var mobState))
-            return false;
-
-        // You're not allowed to execute dead people (no fun allowed)
-        if (_mobStateSystem.IsDead(victim, mobState))
-            return false;
-
-        // You must be able to attack people to execute
-        if (!_actionBlockerSystem.CanAttack(attacker, victim))
-            return false;
-
-        // The victim must be incapacitated to be executed
-        if (victim != attacker && _actionBlockerSystem.CanInteract(victim, null))
-            return false;
-
-        // All checks passed
-        return true;
-    }
-
-    private void OnExecutionDoAfter(EntityUid uid, ExecutionComponent component, ExecutionDoAfterEvent args)
-    {
-        if (args.Handled || args.Cancelled || args.Used == null || args.Target == null)
-            return;
-
-        var attacker = args.User;
-        var victim = args.Target.Value;
-        var weapon = args.Used.Value;
-
-        if (!CanExecuteWithAny(victim, attacker))
-            return;
-
-        // This is needed so the melee system does not stop it.
-        var prev = _combatSystem.IsInCombatMode(attacker);
-        _combatSystem.SetInCombatMode(attacker, true);
-        component.Executing = true;
-        string? internalMsg = null;
-        string? externalMsg = null;
-
-        if (TryComp(uid, out MeleeWeaponComponent? melee))
-        {
-            _meleeSystem.AttemptLightAttack(attacker, weapon, melee, victim);
-            internalMsg = DefaultCompleteInternalMeleeExecutionMessage;
-            externalMsg = DefaultCompleteExternalMeleeExecutionMessage;
-        }
-        else if (TryComp(uid, out GunComponent? gun))
-        {
-            var clumsyShot = false;
-
-            // TODO: This should just be an event or something instead to get this.
-            // TODO: Handle clumsy.
-            if (!_gunSystem.AttemptDirectShoot(args.User, uid, args.Target.Value, gun))
-            {
-                internalMsg = null;
-                externalMsg = null;
-            }
-            else
-            {
-                internalMsg = DefaultCompleteInternalGunExecutionMessage;
-                externalMsg = DefaultCompleteExternalGunExecutionMessage;
-            }
-            args.Handled = true;
-        }
-
-        _combatSystem.SetInCombatMode(attacker, prev);
-        component.Executing = false;
-        args.Handled = true;
-
-        if (internalMsg != null && externalMsg != null)
-        {
-            ShowExecutionInternalPopup(internalMsg, attacker, victim, uid);
-            ShowExecutionExternalPopup(externalMsg, attacker, victim, uid);
-        }
-    }
-
-    private void OnGetMeleeDamage(EntityUid uid, ExecutionComponent comp, ref GetMeleeDamageEvent args)
-    {
-        if (!TryComp<MeleeWeaponComponent>(uid, out var melee) ||
-            !TryComp<ExecutionComponent>(uid, out var execComp) ||
-            !execComp.Executing)
-        {
-            return;
-        }
-
-        var bonus = melee.Damage * execComp.DamageModifier - melee.Damage;
-        args.Damage += bonus;
-    }
-
-    private void ShowExecutionInternalPopup(string locString,
-        EntityUid attacker, EntityUid victim, EntityUid weapon, bool predict = true)
-    {
-        if (predict)
-        {
-            _popupSystem.PopupClient(
-                Loc.GetString(locString, ("attacker", attacker), ("victim", victim), ("weapon", weapon)),
-                attacker,
-                attacker,
-                PopupType.Medium
-            );
-        }
-        else
-        {
-            _popupSystem.PopupEntity(
-                Loc.GetString(locString, ("attacker", attacker), ("victim", victim), ("weapon", weapon)),
-                attacker,
-                Filter.Entities(attacker),
-                true,
-                PopupType.Medium
-            );
-        }
-
-    }
-
-    private void ShowExecutionExternalPopup(string locString, EntityUid attacker, EntityUid victim, EntityUid weapon)
-    {
-        _popupSystem.PopupEntity(
-            Loc.GetString(locString, ("attacker", attacker), ("victim", victim), ("weapon", weapon)),
-            attacker,
-            Filter.PvsExcept(attacker),
-            true,
-            PopupType.MediumCaution
-            );
-    }
-}
diff --git a/Content.Shared/Execution/SharedExecutionSystem.cs b/Content.Shared/Execution/SharedExecutionSystem.cs
new file mode 100644
index 00000000000..a1105dd644b
--- /dev/null
+++ b/Content.Shared/Execution/SharedExecutionSystem.cs
@@ -0,0 +1,234 @@
+using Content.Shared.ActionBlocker;
+using Content.Shared.Chat;
+using Content.Shared.CombatMode;
+using Content.Shared.Damage;
+using Content.Shared.Database;
+using Content.Shared.DoAfter;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.Popups;
+using Content.Shared.Verbs;
+using Content.Shared.Weapons.Melee;
+using Content.Shared.Weapons.Melee.Events;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Mind;
+using Robust.Shared.Player;
+using Robust.Shared.Audio.Systems;
+
+namespace Content.Shared.Execution;
+
+/// <summary>
+///     Verb for violently murdering cuffed creatures.
+/// </summary>
+public sealed class SharedExecutionSystem : EntitySystem
+{
+    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedSuicideSystem _suicide = default!;
+    [Dependency] private readonly SharedCombatModeSystem _combat = default!;
+    [Dependency] private readonly SharedExecutionSystem _execution = default!;
+    [Dependency] private readonly SharedMeleeWeaponSystem _melee = default!;
+    [Dependency] private readonly SharedMindSystem _mind = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ExecutionComponent, GetVerbsEvent<UtilityVerb>>(OnGetInteractionsVerbs);
+        SubscribeLocalEvent<ExecutionComponent, GetMeleeDamageEvent>(OnGetMeleeDamage);
+        SubscribeLocalEvent<ExecutionComponent, SuicideByEnvironmentEvent>(OnSuicideByEnvironment);
+        SubscribeLocalEvent<ExecutionComponent, ExecutionDoAfterEvent>(OnExecutionDoAfter);
+    }
+
+    private void OnGetInteractionsVerbs(EntityUid uid, ExecutionComponent comp, GetVerbsEvent<UtilityVerb> args)
+    {
+        if (args.Hands == null || args.Using == null || !args.CanAccess || !args.CanInteract)
+            return;
+
+        var attacker = args.User;
+        var weapon = args.Using.Value;
+        var victim = args.Target;
+
+        if (!CanBeExecuted(victim, attacker))
+            return;
+
+        UtilityVerb verb = new()
+        {
+            Act = () => TryStartExecutionDoAfter(weapon, victim, attacker, comp),
+            Impact = LogImpact.High,
+            Text = Loc.GetString("execution-verb-name"),
+            Message = Loc.GetString("execution-verb-message"),
+        };
+
+        args.Verbs.Add(verb);
+    }
+
+    private void TryStartExecutionDoAfter(EntityUid weapon, EntityUid victim, EntityUid attacker, ExecutionComponent comp)
+    {
+        if (!CanBeExecuted(victim, attacker))
+            return;
+
+        if (attacker == victim)
+        {
+            ShowExecutionInternalPopup(comp.InternalSelfExecutionMessage, attacker, victim, weapon);
+            ShowExecutionExternalPopup(comp.ExternalSelfExecutionMessage, attacker, victim, weapon);
+        }
+        else
+        {
+            ShowExecutionInternalPopup(comp.InternalMeleeExecutionMessage, attacker, victim, weapon);
+            ShowExecutionExternalPopup(comp.ExternalMeleeExecutionMessage, attacker, victim, weapon);
+        }
+
+        var doAfter =
+            new DoAfterArgs(EntityManager, attacker, comp.DoAfterDuration, new ExecutionDoAfterEvent(), weapon, target: victim, used: weapon)
+            {
+                BreakOnMove = true,
+                BreakOnDamage = true,
+                NeedHand = true
+            };
+
+        _doAfter.TryStartDoAfter(doAfter);
+
+    }
+
+    public bool CanBeExecuted(EntityUid victim, EntityUid attacker)
+    {
+        // No point executing someone if they can't take damage
+        if (!HasComp<DamageableComponent>(victim))
+            return false;
+
+        // You can't execute something that cannot die
+        if (!TryComp<MobStateComponent>(victim, out var mobState))
+            return false;
+
+        // You're not allowed to execute dead people (no fun allowed)
+        if (_mobState.IsDead(victim, mobState))
+            return false;
+
+        // You must be able to attack people to execute
+        if (!_actionBlocker.CanAttack(attacker, victim))
+            return false;
+
+        // The victim must be incapacitated to be executed
+        if (victim != attacker && _actionBlocker.CanInteract(victim, null))
+            return false;
+
+        // All checks passed
+        return true;
+    }
+
+    private void OnGetMeleeDamage(Entity<ExecutionComponent> entity, ref GetMeleeDamageEvent args)
+    {
+        if (!TryComp<MeleeWeaponComponent>(entity, out var melee) || !entity.Comp.Executing)
+        {
+            return;
+        }
+
+        var bonus = melee.Damage * entity.Comp.DamageMultiplier - melee.Damage;
+        args.Damage += bonus;
+        args.ResistanceBypass = true;
+    }
+
+    private void OnSuicideByEnvironment(Entity<ExecutionComponent> entity, ref SuicideByEnvironmentEvent args)
+    {
+        if (!TryComp<MeleeWeaponComponent>(entity, out var melee))
+            return;
+
+        string? internalMsg = entity.Comp.CompleteInternalSelfExecutionMessage;
+        string? externalMsg = entity.Comp.CompleteExternalSelfExecutionMessage;
+
+        if (!TryComp<DamageableComponent>(args.Victim, out var damageableComponent))
+            return;
+
+        ShowExecutionInternalPopup(internalMsg, args.Victim, args.Victim, entity, false);
+        ShowExecutionExternalPopup(externalMsg, args.Victim, args.Victim, entity);
+        _audio.PlayPredicted(melee.HitSound, args.Victim, args.Victim);
+        _suicide.ApplyLethalDamage((args.Victim, damageableComponent), melee.Damage);
+        args.Handled = true;
+    }
+
+    private void ShowExecutionInternalPopup(string locString, EntityUid attacker, EntityUid victim, EntityUid weapon, bool predict = true)
+    {
+        if (predict)
+        {
+            _popup.PopupClient(
+               Loc.GetString(locString, ("attacker", attacker), ("victim", victim), ("weapon", weapon)),
+               attacker,
+               attacker,
+               PopupType.MediumCaution
+               );
+        }
+        else
+        {
+            _popup.PopupEntity(
+               Loc.GetString(locString, ("attacker", attacker), ("victim", victim), ("weapon", weapon)),
+               attacker,
+               attacker,
+               PopupType.MediumCaution
+               );
+        }
+    }
+
+    private void ShowExecutionExternalPopup(string locString, EntityUid attacker, EntityUid victim, EntityUid weapon)
+    {
+        _popup.PopupEntity(
+            Loc.GetString(locString, ("attacker", attacker), ("victim", victim), ("weapon", weapon)),
+            attacker,
+            Filter.PvsExcept(attacker),
+            true,
+            PopupType.MediumCaution
+            );
+    }
+
+    private void OnExecutionDoAfter(Entity<ExecutionComponent> entity, ref ExecutionDoAfterEvent args)
+    {
+        if (args.Handled || args.Cancelled || args.Used == null || args.Target == null)
+            return;
+
+        if (!TryComp<MeleeWeaponComponent>(entity, out var meleeWeaponComp))
+            return;
+
+        var attacker = args.User;
+        var victim = args.Target.Value;
+        var weapon = args.Used.Value;
+
+        if (!_execution.CanBeExecuted(victim, attacker))
+            return;
+
+        // This is needed so the melee system does not stop it.
+        var prev = _combat.IsInCombatMode(attacker);
+        _combat.SetInCombatMode(attacker, true);
+        entity.Comp.Executing = true;
+
+        var internalMsg = entity.Comp.CompleteInternalMeleeExecutionMessage;
+        var externalMsg = entity.Comp.CompleteExternalMeleeExecutionMessage;
+
+        if (attacker == victim)
+        {
+            var suicideEvent = new SuicideEvent(victim);
+            RaiseLocalEvent(victim, suicideEvent);
+
+            var suicideGhostEvent = new SuicideGhostEvent(victim);
+            RaiseLocalEvent(victim, suicideGhostEvent);
+        }
+        else
+        {
+            _melee.AttemptLightAttack(attacker, weapon, meleeWeaponComp, victim);
+        }
+
+        _combat.SetInCombatMode(attacker, prev);
+        entity.Comp.Executing = false;
+        args.Handled = true;
+
+        if (attacker != victim)
+        {
+            _execution.ShowExecutionInternalPopup(internalMsg, attacker, victim, entity);
+            _execution.ShowExecutionExternalPopup(externalMsg, attacker, victim, entity);
+        }
+    }
+}
diff --git a/Content.Shared/Interaction/Events/SuicideEvent.cs b/Content.Shared/Interaction/Events/SuicideEvent.cs
index 7b9c1efe0dd..bcd5df67abf 100644
--- a/Content.Shared/Interaction/Events/SuicideEvent.cs
+++ b/Content.Shared/Interaction/Events/SuicideEvent.cs
@@ -1,48 +1,41 @@
-namespace Content.Shared.Interaction.Events
+using Content.Shared.Damage;
+using Content.Shared.Damage.Prototypes;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Interaction.Events;
+
+/// <summary>
+///     Raised Directed at an entity to check whether they will handle the suicide.
+/// </summary>
+public sealed class SuicideEvent : HandledEntityEventArgs
 {
-    /// <summary>
-    ///     Raised Directed at an entity to check whether they will handle the suicide.
-    /// </summary>
-    public sealed class SuicideEvent : EntityEventArgs
+    public SuicideEvent(EntityUid victim)
     {
-        public SuicideEvent(EntityUid victim)
-        {
-            Victim = victim;
-        }
-        public void SetHandled(SuicideKind kind)
-        {
-            if (Handled)
-                throw new InvalidOperationException("Suicide was already handled");
-
-            Kind = kind;
-        }
+        Victim = victim;
+    }
 
-        public void BlockSuicideAttempt(bool suicideAttempt)
-        {
-            if (suicideAttempt)
-                AttemptBlocked = suicideAttempt;
-        }
+    public DamageSpecifier? DamageSpecifier;
+    public ProtoId<DamageTypePrototype>? DamageType;
+    public EntityUid Victim { get; private set; }
+}
 
-        public SuicideKind? Kind { get; private set; }
-        public EntityUid Victim { get; private set; }
-        public bool AttemptBlocked { get; private set; }
-        public bool Handled => Kind != null;
+public sealed class SuicideByEnvironmentEvent : HandledEntityEventArgs
+{
+    public SuicideByEnvironmentEvent(EntityUid victim)
+    {
+        Victim = victim;
     }
 
-    public enum SuicideKind
-    {
-        Special, //Doesn't damage the mob, used for "weird" suicides like gibbing
+    public EntityUid Victim { get; set; }
+}
 
-        //Damage type suicides
-        Blunt,
-        Slash,
-        Piercing,
-        Heat,
-        Shock,
-        Cold,
-        Poison,
-        Radiation,
-        Asphyxiation,
-        Bloodloss
+public sealed class SuicideGhostEvent : HandledEntityEventArgs
+{
+    public SuicideGhostEvent(EntityUid victim)
+    {
+        Victim = victim;
     }
+
+    public EntityUid Victim { get; set; }
+    public bool CanReturnToBody;
 }
diff --git a/Content.Shared/Mind/SharedMindSystem.cs b/Content.Shared/Mind/SharedMindSystem.cs
index bf1065c1b1d..2b83f051904 100644
--- a/Content.Shared/Mind/SharedMindSystem.cs
+++ b/Content.Shared/Mind/SharedMindSystem.cs
@@ -168,15 +168,17 @@ private void OnExamined(EntityUid uid, MindContainerComponent mindContainer, Exa
             args.PushMarkup($"[color=yellow]{Loc.GetString("comp-mind-examined-ssd", ("ent", uid))}[/color]");
     }
 
+    /// <summary>
+    /// Checks to see if the user's mind prevents them from suicide
+    /// Handles the suicide event without killing the user if true
+    /// </summary>
     private void OnSuicide(EntityUid uid, MindContainerComponent component, SuicideEvent args)
     {
         if (args.Handled)
             return;
 
         if (TryComp(component.Mind, out MindComponent? mind) && mind.PreventSuicide)
-        {
-            args.BlockSuicideAttempt(true);
-        }
+            args.Handled = true;
     }
 
     public EntityUid? GetMind(EntityUid uid, MindContainerComponent? mind = null)
diff --git a/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs b/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs
index 55c01c1d6f4..75c85790deb 100644
--- a/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs
+++ b/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs
@@ -80,7 +80,7 @@ public MeleeHitEvent(List<EntityUid> hitEntities, EntityUid user, EntityUid weap
 /// Raised on a melee weapon to calculate potential damage bonuses or decreases.
 /// </summary>
 [ByRefEvent]
-public record struct GetMeleeDamageEvent(EntityUid Weapon, DamageSpecifier Damage, List<DamageModifierSet> Modifiers, EntityUid User);
+public record struct GetMeleeDamageEvent(EntityUid Weapon, DamageSpecifier Damage, List<DamageModifierSet> Modifiers, EntityUid User, bool ResistanceBypass = false);
 
 /// <summary>
 /// Raised on a melee weapon to calculate the attack rate.
diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
index b698728193f..b33b2cbc4f6 100644
--- a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
+++ b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
@@ -91,6 +91,12 @@ public sealed partial class MeleeWeaponComponent : Component
     [DataField, AutoNetworkedField]
     public bool AutoAttack;
 
+    /// <summary>
+    /// If true, attacks will bypass armor resistances.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    public bool ResistanceBypass = false;
+    
     /// <summary>
     /// Base damage for this weapon. Can be modified via heavy damage or other means.
     /// </summary>
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index 3dbb7991bd6..e95924b69b3 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -186,7 +186,7 @@ public DamageSpecifier GetDamage(EntityUid uid, EntityUid user, MeleeWeaponCompo
         if (!Resolve(uid, ref component, false))
             return new DamageSpecifier();
 
-        var ev = new GetMeleeDamageEvent(uid, new (component.Damage), new(), user);
+        var ev = new GetMeleeDamageEvent(uid, new(component.Damage), new(), user, component.ResistanceBypass);
         RaiseLocalEvent(uid, ref ev);
 
         if (component.ContestArgs is not null)
@@ -214,9 +214,7 @@ public FixedPoint2 GetHeavyDamageModifier(EntityUid uid, EntityUid user, MeleeWe
         var ev = new GetHeavyDamageModifierEvent(uid, component.ClickDamageModifier, 1, user);
         RaiseLocalEvent(uid, ref ev);
 
-        return ev.DamageModifier
-                * ev.Multipliers
-                * component.HeavyDamageBaseModifier;
+        return ev.DamageModifier * ev.Multipliers;
     }
 
     public bool TryGetWeapon(EntityUid entity, out EntityUid weaponUid, [NotNullWhen(true)] out MeleeWeaponComponent? melee)
@@ -424,6 +422,7 @@ protected virtual void DoLightAttack(EntityUid user, LightAttackEvent ev, Entity
     {
         var damage = GetDamage(meleeUid, user, component);
         var target = GetEntity(ev.Target);
+        var resistanceBypass = GetResistanceBypass(meleeUid, user, component);
 
         // For consistency with wide attacks stuff needs damageable.
         if (Deleted(target) ||
@@ -480,7 +479,7 @@ protected virtual void DoLightAttack(EntityUid user, LightAttackEvent ev, Entity
         RaiseLocalEvent(target.Value, attackedEvent);
 
         var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage + attackedEvent.BonusDamage, hitEvent.ModifiersList);
-        var damageResult = Damageable.TryChangeDamage(target, modifiedDamage, origin: user, partMultiplier: component.ClickPartDamageMultiplier);
+        var damageResult = Damageable.TryChangeDamage(target, modifiedDamage, origin: user, ignoreResistances: resistanceBypass, partMultiplier: component.ClickPartDamageMultiplier);
 
         if (damageResult is {Empty: false})
         {
diff --git a/Resources/Locale/en-US/execution/execution.ftl b/Resources/Locale/en-US/execution/execution.ftl
index 5bd4613e8c3..08f9a06dd48 100644
--- a/Resources/Locale/en-US/execution/execution.ftl
+++ b/Resources/Locale/en-US/execution/execution.ftl
@@ -6,15 +6,12 @@ execution-verb-message = Use your weapon to execute someone.
 # victim (the person being executed)
 # weapon (the weapon used for the execution)
 
-execution-popup-gun-initial-internal = You ready the muzzle of {THE($weapon)} against {$victim}'s head.
-execution-popup-gun-initial-external = {$attacker} readies the muzzle of {THE($weapon)} against {$victim}'s head.
-execution-popup-gun-complete-internal = You blast {$victim} in the head!
-execution-popup-gun-complete-external = {$attacker} blasts {$victim} in the head!
-execution-popup-gun-clumsy-internal = You miss {$victim}'s head and shoot your foot instead!
-execution-popup-gun-clumsy-external = {$attacker} misses {$victim} and shoots {POSS-ADJ($attacker)} foot instead!
-execution-popup-gun-empty = {CAPITALIZE(THE($weapon))} clicks.
-
 execution-popup-melee-initial-internal = You ready {THE($weapon)} against {$victim}'s throat.
 execution-popup-melee-initial-external = {$attacker} readies {POSS-ADJ($attacker)} {$weapon} against the throat of {$victim}.
 execution-popup-melee-complete-internal = You slit the throat of {$victim}!
 execution-popup-melee-complete-external = {$attacker} slits the throat of {$victim}!
+
+execution-popup-self-initial-internal = You ready {THE($weapon)} against your own throat.
+execution-popup-self-initial-external = {$attacker} readies {POSS-ADJ($attacker)} {$weapon} against their own throat.
+execution-popup-self-complete-internal = You slit your own throat!
+execution-popup-self-complete-external = {$attacker} slits their own throat!
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
index 2ac023edae4..ffdbdc59112 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -5,10 +5,18 @@
   description: A sharp sword.
   abstract: true
   components:
-    - type: Sharp
-    - type: Execution
-      doAfterDuration: 4.0
-    - type: DisarmMalus
+  - type: Sharp
+  - type: Execution
+    doAfterDuration: 4.0
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+  - type: Sprite
+    state: icon
+  - type: Item
+    size: Normal
+  - type: Utensil
+    types:
+      - Knife
 
 - type: entity
   name: captain's sabre

From eac6071eef33dd195c383b007ea9b3929be3333d Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 12:37:21 -0400
Subject: [PATCH 080/366] more fixes

---
 .../Overlays/EntityHealthBarOverlay.cs        |  18 +-
 .../Chat/Commands/SuicideCommand.cs           |  18 +-
 .../Kitchen/EntitySystems/MicrowaveSystem.cs  |   3 +-
 .../Execution/SharedExecutionSystem.cs        |   2 +-
 .../Magic/Events/ChargeSpellEvent.cs          |   4 +
 .../Magic/Events/KnockSpellEvent.cs           |   2 +
 .../Magic/Events/TeleportSpellEvent.cs        |   4 +
 Content.Shared/Magic/SharedMagicSystem.cs     |   2 +-
 .../Weapons/Melee/SharedMeleeWeaponSystem.cs  | 226 +++++++++++-------
 .../Weapons/Ranged/Components/GunComponent.cs |   1 +
 .../BloodCultist/BloodCultLeaderComponent.cs  |   2 +-
 .../Constructs/ConstructComponent.cs          |   2 +-
 12 files changed, 177 insertions(+), 107 deletions(-)

diff --git a/Content.Client/Overlays/EntityHealthBarOverlay.cs b/Content.Client/Overlays/EntityHealthBarOverlay.cs
index 674714563d8..193635bda7b 100644
--- a/Content.Client/Overlays/EntityHealthBarOverlay.cs
+++ b/Content.Client/Overlays/EntityHealthBarOverlay.cs
@@ -11,10 +11,6 @@
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
-using System.Numerics;
-using Content.Shared.StatusIcon.Components;
-using Content.Client.UserInterface.Systems;
-using Content.Shared.StatusIcon;
 using Robust.Shared.Prototypes;
 using static Robust.Shared.Maths.Color;
 
@@ -85,7 +81,10 @@ protected override void Draw(in OverlayDrawArgs args)
 
             if (!bounds.Translated(worldPos).Intersects(args.WorldAABB))
                 continue;
-            }
+
+            // we are all progressing towards death every day
+            if (CalcProgress(uid, mobStateComponent, damageableComponent, mobThresholdsComponent) is not { } deathProgress)
+                continue;
 
             var worldPosition = _transform.GetWorldPosition(xform);
             var worldMatrix = Matrix3Helpers.CreateTranslation(worldPosition);
@@ -99,10 +98,6 @@ protected override void Draw(in OverlayDrawArgs args)
             var widthOfMob = bounds.Width * EyeManager.PixelsPerMeter;
 
             var position = new Vector2(-widthOfMob / EyeManager.PixelsPerMeter / 2, yOffset / EyeManager.PixelsPerMeter);
-
-            // we are all progressing towards death every day
-            (float ratio, bool inCrit) deathProgress = CalcProgress(uid, mobStateComponent, damageableComponent, mobThresholdsComponent);
-
             var color = GetProgressColor(deathProgress.ratio, deathProgress.inCrit);
 
             // Hardcoded width of the progress bar because it doesn't match the texture.
@@ -130,10 +125,13 @@ protected override void Draw(in OverlayDrawArgs args)
     /// <summary>
     /// Returns a ratio between 0 and 1, and whether the entity is in crit.
     /// </summary>
-    private (float, bool) CalcProgress(EntityUid uid, MobStateComponent component, DamageableComponent dmg, MobThresholdsComponent thresholds)
+    private (float ratio, bool inCrit)? CalcProgress(EntityUid uid, MobStateComponent component, DamageableComponent dmg, MobThresholdsComponent thresholds)
     {
         if (_mobStateSystem.IsAlive(uid, component))
         {
+            if (dmg.HealthBarThreshold != null && dmg.TotalDamage < dmg.HealthBarThreshold)
+                return null;
+
             if (!_mobThresholdSystem.TryGetThresholdForState(uid, MobState.Critical, out var threshold, thresholds) &&
                 !_mobThresholdSystem.TryGetThresholdForState(uid, MobState.Dead, out threshold, thresholds))
                 return (1, false);
diff --git a/Content.Server/Chat/Commands/SuicideCommand.cs b/Content.Server/Chat/Commands/SuicideCommand.cs
index b8a73ea88c2..e3794bcaa8f 100644
--- a/Content.Server/Chat/Commands/SuicideCommand.cs
+++ b/Content.Server/Chat/Commands/SuicideCommand.cs
@@ -1,4 +1,5 @@
 using Content.Server.GameTicking;
+using Content.Server.Popups;
 using Content.Shared.Administration;
 using Content.Shared.Chat;
 using Content.Shared.Mind;
@@ -10,6 +11,8 @@ namespace Content.Server.Chat.Commands
     [AnyCommand]
     internal sealed class SuicideCommand : IConsoleCommand
     {
+        [Dependency] private readonly IEntityManager _entityManager = default!;
+
         public string Command => "suicide";
 
         public string Description => Loc.GetString("suicide-command-description");
@@ -20,29 +23,30 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             if (shell.Player is not { } player)
             {
-                shell.WriteLine(Loc.GetString("shell-cannot-run-command-from-server"));
+                shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server"));
                 return;
             }
 
             if (player.Status != SessionStatus.InGame || player.AttachedEntity == null)
                 return;
 
-            var minds = IoCManager.Resolve<IEntityManager>().System<SharedMindSystem>();
+            var minds = _entityManager.System<SharedMindSystem>();
+
             // This check also proves mind not-null for at the end when the mob is ghosted.
             if (!minds.TryGetMind(player, out var mindId, out var mindComp) ||
                 mindComp.OwnedEntity is not { Valid: true } victim)
             {
-                shell.WriteLine("You don't have a mind!");
+                shell.WriteLine(Loc.GetString("suicide-command-no-mind"));
                 return;
             }
 
-            var suicideSystem = _e.System<SuicideSystem>();
+            var suicideSystem = _entityManager.System<SuicideSystem>();
 
-            if (_e.HasComponent<AdminFrozenComponent>(victim))
+            if (_entityManager.HasComponent<AdminFrozenComponent>(victim))
             {
                 var deniedMessage = Loc.GetString("suicide-command-denied");
                 shell.WriteLine(deniedMessage);
-                _e.System<PopupSystem>()
+                _entityManager.System<PopupSystem>()
                     .PopupEntity(deniedMessage, victim, victim);
                 return;
             }
@@ -50,7 +54,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             if (suicideSystem.Suicide(victim))
                 return;
 
-            shell.WriteLine("You can't ghost right now.");
+            shell.WriteLine(Loc.GetString("ghost-command-denied"));
         }
     }
 }
diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
index be76a906911..d005b041e49 100644
--- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
@@ -33,6 +33,7 @@
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
 using System.Linq;
+using Content.Server.Administration.Logs;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using Content.Shared.Stacks;
@@ -107,7 +108,7 @@ private void OnCookStart(Entity<ActiveMicrowaveComponent> ent, ref ComponentStar
             if (!TryComp<MicrowaveComponent>(ent, out var microwaveComponent))
                 return;
             SetAppearance(ent.Owner, MicrowaveVisualState.Cooking, microwaveComponent);
-            
+
             var audio = _audio.PlayPvs(microwaveComponent.LoopingSound, ent, AudioParams.Default.WithLoop(true).WithMaxDistance(5));
 
             if (audio == null)
diff --git a/Content.Shared/Execution/SharedExecutionSystem.cs b/Content.Shared/Execution/SharedExecutionSystem.cs
index a1105dd644b..4f0617b4881 100644
--- a/Content.Shared/Execution/SharedExecutionSystem.cs
+++ b/Content.Shared/Execution/SharedExecutionSystem.cs
@@ -147,7 +147,7 @@ private void OnSuicideByEnvironment(Entity<ExecutionComponent> entity, ref Suici
 
         ShowExecutionInternalPopup(internalMsg, args.Victim, args.Victim, entity, false);
         ShowExecutionExternalPopup(externalMsg, args.Victim, args.Victim, entity);
-        _audio.PlayPredicted(melee.HitSound, args.Victim, args.Victim);
+        _audio.PlayPredicted(melee.SoundHit, args.Victim, args.Victim);
         _suicide.ApplyLethalDamage((args.Victim, damageableComponent), melee.Damage);
         args.Handled = true;
     }
diff --git a/Content.Shared/Magic/Events/ChargeSpellEvent.cs b/Content.Shared/Magic/Events/ChargeSpellEvent.cs
index 8898761ec2a..47a5a5bd623 100644
--- a/Content.Shared/Magic/Events/ChargeSpellEvent.cs
+++ b/Content.Shared/Magic/Events/ChargeSpellEvent.cs
@@ -1,4 +1,6 @@
 using Content.Shared.Actions;
+using Content.Shared.Chat;
+
 
 namespace Content.Shared.Magic.Events;
 
@@ -15,4 +17,6 @@ public sealed partial class ChargeSpellEvent : InstantActionEvent, ISpeakSpell
 
     [DataField]
     public string? Speech { get; private set; }
+
+    public InGameICChatType ChatType { get; } = InGameICChatType.Speak;
 }
diff --git a/Content.Shared/Magic/Events/KnockSpellEvent.cs b/Content.Shared/Magic/Events/KnockSpellEvent.cs
index ef742e843e7..cb161b77eb0 100644
--- a/Content.Shared/Magic/Events/KnockSpellEvent.cs
+++ b/Content.Shared/Magic/Events/KnockSpellEvent.cs
@@ -1,4 +1,6 @@
 using Content.Shared.Actions;
+using Content.Shared.Chat;
+
 
 namespace Content.Shared.Magic.Events;
 
diff --git a/Content.Shared/Magic/Events/TeleportSpellEvent.cs b/Content.Shared/Magic/Events/TeleportSpellEvent.cs
index 525c1e51052..ff29b213346 100644
--- a/Content.Shared/Magic/Events/TeleportSpellEvent.cs
+++ b/Content.Shared/Magic/Events/TeleportSpellEvent.cs
@@ -1,4 +1,6 @@
 using Content.Shared.Actions;
+using Content.Shared.Chat;
+
 
 namespace Content.Shared.Magic.Events;
 
@@ -16,4 +18,6 @@ public sealed partial class TeleportSpellEvent : WorldTargetActionEvent, ISpeakS
     /// </summary>
     [DataField]
     public float BlinkVolume = 5f;
+
+    public InGameICChatType ChatType { get; } = InGameICChatType.Speak;
 }
diff --git a/Content.Shared/Magic/SharedMagicSystem.cs b/Content.Shared/Magic/SharedMagicSystem.cs
index cc7a297aa40..b0a9fef75d0 100644
--- a/Content.Shared/Magic/SharedMagicSystem.cs
+++ b/Content.Shared/Magic/SharedMagicSystem.cs
@@ -513,7 +513,7 @@ private void Speak(BaseActionEvent args)
         if (args is not ISpeakSpell speak || string.IsNullOrWhiteSpace(speak.Speech))
             return;
 
-        var ev = new SpeakSpellEvent(args.Performer, speak.Speech);
+        var ev = new SpeakSpellEvent(args.Performer, speak.Speech, speak.ChatType);
         RaiseLocalEvent(ref ev);
     }
 }
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index e95924b69b3..7a3e7ee503a 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -4,9 +4,7 @@
 using Content.Shared.ActionBlocker;
 using Content.Shared.Administration.Logs;
 using Content.Shared.CombatMode;
-using Content.Shared.Contests;
 using Content.Shared.Damage;
-using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
 using Content.Shared.FixedPoint;
@@ -14,6 +12,7 @@
 using Content.Shared.Hands.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Inventory;
+using Content.Shared.Inventory.VirtualItem;
 using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.Physics;
 using Content.Shared.Popups;
@@ -32,26 +31,30 @@
 
 namespace Content.Shared.Weapons.Melee;
 
-public abstract partial class SharedMeleeWeaponSystem : EntitySystem
+public abstract class SharedMeleeWeaponSystem : EntitySystem
 {
-    [Dependency] protected readonly ISharedAdminLogManager AdminLogger = default!;
-    [Dependency] protected readonly ActionBlockerSystem Blocker = default!;
-    [Dependency] protected readonly SharedCombatModeSystem CombatMode = default!;
-    [Dependency] protected readonly DamageableSystem Damageable = default!;
-    [Dependency] protected readonly SharedInteractionSystem Interaction = default!;
-    [Dependency] protected readonly IMapManager MapManager = default!;
-    [Dependency] protected readonly SharedPopupSystem PopupSystem = default!;
-    [Dependency] protected readonly IGameTiming Timing = default!;
-    [Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
-    [Dependency] private readonly InventorySystem _inventory = default!;
-    [Dependency] private readonly MeleeSoundSystem _meleeSound = default!;
-    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
-    [Dependency] private readonly IPrototypeManager _protoManager = default!;
-    [Dependency] private readonly StaminaSystem _stamina = default!;
-    [Dependency] private readonly ContestsSystem _contests = default!;
+    [Dependency] protected readonly ISharedAdminLogManager   AdminLogger     = default!;
+    [Dependency] protected readonly ActionBlockerSystem      Blocker         = default!;
+    [Dependency] protected readonly SharedCombatModeSystem   CombatMode      = default!;
+    [Dependency] protected readonly DamageableSystem         Damageable      = default!;
+    [Dependency] protected readonly SharedInteractionSystem  Interaction     = default!;
+    [Dependency] protected readonly IMapManager              MapManager      = default!;
+    [Dependency] protected readonly SharedPopupSystem        PopupSystem     = default!;
+    [Dependency] protected readonly IGameTiming              Timing          = default!;
+    [Dependency] protected readonly SharedTransformSystem    TransformSystem = default!;
+    [Dependency] private   readonly InventorySystem         _inventory       = default!;
+    [Dependency] private   readonly MeleeSoundSystem        _meleeSound      = default!;
+    [Dependency] private   readonly SharedPhysicsSystem     _physics         = default!;
+    [Dependency] private   readonly IPrototypeManager       _protoManager    = default!;
+    [Dependency] private   readonly StaminaSystem           _stamina         = default!;
 
     private const int AttackMask = (int) (CollisionGroup.MobMask | CollisionGroup.Opaque);
 
+    /// <summary>
+    /// Maximum amount of targets allowed for a wide-attack.
+    /// </summary>
+    public const int MaxTargets = 5;
+
     /// <summary>
     /// If an attack is released within this buffer it's assumed to be full damage.
     /// </summary>
@@ -62,6 +65,8 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<MeleeWeaponComponent, HandSelectedEvent>(OnMeleeSelected);
+        SubscribeLocalEvent<MeleeWeaponComponent, ShotAttemptedEvent>(OnMeleeShotAttempted);
+        SubscribeLocalEvent<MeleeWeaponComponent, GunShotEvent>(OnMeleeShot);
         SubscribeLocalEvent<BonusMeleeDamageComponent, GetMeleeDamageEvent>(OnGetBonusMeleeDamage);
         SubscribeLocalEvent<BonusMeleeDamageComponent, GetHeavyDamageModifierEvent>(OnGetBonusHeavyDamageModifier);
         SubscribeLocalEvent<BonusMeleeAttackRateComponent, GetMeleeAttackRateEvent>(OnGetBonusMeleeAttackRate);
@@ -74,7 +79,8 @@ public override void Initialize()
         SubscribeAllEvent<StopAttackEvent>(OnStopAttack);
 
 #if DEBUG
-        SubscribeLocalEvent<MeleeWeaponComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<MeleeWeaponComponent,
+                            MapInitEvent>                   (OnMapInit);
     }
 
     private void OnMapInit(EntityUid uid, MeleeWeaponComponent component, MapInitEvent args)
@@ -84,6 +90,24 @@ private void OnMapInit(EntityUid uid, MeleeWeaponComponent component, MapInitEve
 #endif
     }
 
+    private void OnMeleeShotAttempted(EntityUid uid, MeleeWeaponComponent comp, ref ShotAttemptedEvent args)
+    {
+        if (comp.NextAttack > Timing.CurTime)
+            args.Cancel();
+    }
+
+    private void OnMeleeShot(EntityUid uid, MeleeWeaponComponent component, ref GunShotEvent args)
+    {
+        if (!TryComp<GunComponent>(uid, out var gun))
+            return;
+
+        if (gun.NextFire > component.NextAttack)
+        {
+            component.NextAttack = gun.NextFire;
+            Dirty(uid, component);
+        }
+    }
+
     private void OnMeleeSelected(EntityUid uid, MeleeWeaponComponent component, HandSelectedEvent args)
     {
         var attackRate = GetAttackRate(uid, args.User, component);
@@ -149,23 +173,29 @@ private void OnStopAttack(StopAttackEvent msg, EntitySessionEventArgs args)
 
     private void OnLightAttack(LightAttackEvent msg, EntitySessionEventArgs args)
     {
-        if (args.SenderSession.AttachedEntity is not {} user ||
-            !TryGetWeapon(user, out var weaponUid, out var weapon) ||
-            weaponUid != GetEntity(msg.Weapon) ||
-            weapon.DisableClick)
+        if (args.SenderSession.AttachedEntity is not {} user)
+            return;
+
+        if (!TryGetWeapon(user, out var weaponUid, out var weapon) ||
+            weaponUid != GetEntity(msg.Weapon))
+        {
             return;
+        }
 
         AttemptAttack(user, weaponUid, weapon, msg, args.SenderSession);
     }
 
     private void OnHeavyAttack(HeavyAttackEvent msg, EntitySessionEventArgs args)
     {
-        if (args.SenderSession.AttachedEntity is not {} user ||
-            !TryGetWeapon(user, out var weaponUid, out var weapon) ||
-            weaponUid != GetEntity(msg.Weapon) ||
-            weapon.DisableHeavy)
+        if (args.SenderSession.AttachedEntity is not {} user)
             return;
 
+        if (!TryGetWeapon(user, out var weaponUid, out var weapon) ||
+            weaponUid != GetEntity(msg.Weapon))
+        {
+            return;
+        }
+
         AttemptAttack(user, weaponUid, weapon, msg, args.SenderSession);
     }
 
@@ -189,9 +219,6 @@ public DamageSpecifier GetDamage(EntityUid uid, EntityUid user, MeleeWeaponCompo
         var ev = new GetMeleeDamageEvent(uid, new(component.Damage), new(), user, component.ResistanceBypass);
         RaiseLocalEvent(uid, ref ev);
 
-        if (component.ContestArgs is not null)
-            ev.Damage *= _contests.ContestConstructor(user, component.ContestArgs);
-
         return DamageSpecifier.ApplyModifierSets(ev.Damage, ev.Modifiers);
     }
 
@@ -217,6 +244,17 @@ public FixedPoint2 GetHeavyDamageModifier(EntityUid uid, EntityUid user, MeleeWe
         return ev.DamageModifier * ev.Multipliers;
     }
 
+    public bool GetResistanceBypass(EntityUid uid, EntityUid user, MeleeWeaponComponent? component = null)
+    {
+        if (!Resolve(uid, ref component))
+            return false;
+
+        var ev = new GetMeleeDamageEvent(uid, new(component.Damage), new(), user, component.ResistanceBypass);
+        RaiseLocalEvent(uid, ref ev);
+
+        return ev.ResistanceBypass;
+    }
+
     public bool TryGetWeapon(EntityUid entity, out EntityUid weaponUid, [NotNullWhen(true)] out MeleeWeaponComponent? melee)
     {
         weaponUid = default;
@@ -248,7 +286,8 @@ public bool TryGetWeapon(EntityUid entity, out EntityUid weaponUid, [NotNullWhen
                 return true;
             }
 
-            return false;
+            if (!HasComp<VirtualItemComponent>(held))
+                return false;
         }
 
         // Use hands clothing if applicable.
@@ -277,7 +316,7 @@ public void AttemptLightAttackMiss(EntityUid user, EntityUid weaponUid, MeleeWea
 
     public bool AttemptLightAttack(EntityUid user, EntityUid weaponUid, MeleeWeaponComponent weapon, EntityUid target)
     {
-        if (!TryComp<TransformComponent>(target, out var targetXform))
+        if (!TryComp(target, out TransformComponent? targetXform))
             return false;
 
         return AttemptAttack(user, weaponUid, weapon, new LightAttackEvent(GetNetEntity(target), GetNetEntity(weaponUid), GetNetCoordinates(targetXform.Coordinates)), null);
@@ -285,7 +324,7 @@ public bool AttemptLightAttack(EntityUid user, EntityUid weaponUid, MeleeWeaponC
 
     public bool AttemptDisarmAttack(EntityUid user, EntityUid weaponUid, MeleeWeaponComponent weapon, EntityUid target)
     {
-        if (!TryComp<TransformComponent>(target, out var targetXform))
+        if (!TryComp(target, out TransformComponent? targetXform))
             return false;
 
         return AttemptAttack(user, weaponUid, weapon, new DisarmAttackEvent(GetNetEntity(target), GetNetCoordinates(targetXform.Coordinates)), null);
@@ -305,8 +344,6 @@ private bool AttemptAttack(EntityUid user, EntityUid weaponUid, MeleeWeaponCompo
         if (!CombatMode.IsInCombatMode(user))
             return false;
 
-        var fireRateSwingModifier = 1f;
-
         EntityUid? target = null;
         switch (attack)
         {
@@ -335,9 +372,6 @@ private bool AttemptAttack(EntityUid user, EntityUid weaponUid, MeleeWeaponCompo
                 if (!Blocker.CanAttack(user, target, (weaponUid, weapon), true))
                     return false;
                 break;
-            case HeavyAttackEvent:
-                fireRateSwingModifier = weapon.HeavyRateModifier;
-                break;
             default:
                 if (!Blocker.CanAttack(user, weapon: (weaponUid, weapon)))
                     return false;
@@ -345,7 +379,7 @@ private bool AttemptAttack(EntityUid user, EntityUid weaponUid, MeleeWeaponCompo
         }
 
         // Windup time checked elsewhere.
-        var fireRate = TimeSpan.FromSeconds(GetAttackRate(weaponUid, user, weapon) * fireRateSwingModifier);
+        var fireRate = TimeSpan.FromSeconds(1f / GetAttackRate(weaponUid, user, weapon));
         var swings = 0;
 
         // TODO: If we get autoattacks then probably need a shotcounter like guns so we can do timing properly.
@@ -361,12 +395,7 @@ private bool AttemptAttack(EntityUid user, EntityUid weaponUid, MeleeWeaponCompo
         Dirty(weaponUid, weapon);
 
         // Do this AFTER attack so it doesn't spam every tick
-        // White Dream: Added PlayerUid
-        var ev = new AttemptMeleeEvent
-        {
-            PlayerUid = user
-        };
-
+        var ev = new AttemptMeleeEvent();
         RaiseLocalEvent(weaponUid, ref ev);
 
         if (ev.Cancelled)
@@ -406,7 +435,7 @@ private bool AttemptAttack(EntityUid user, EntityUid weaponUid, MeleeWeaponCompo
                     throw new NotImplementedException();
             }
 
-            DoLungeAnimation(user, weaponUid, weapon.Angle, GetCoordinates(attack.Coordinates).ToMap(EntityManager, TransformSystem), weapon.Range, animation);
+            DoLungeAnimation(user, weaponUid, weapon.Angle, TransformSystem.ToMapCoordinates(GetCoordinates(attack.Coordinates)), weapon.Range, animation);
         }
 
         var attackEv = new MeleeAttackEvent(weaponUid);
@@ -420,14 +449,15 @@ private bool AttemptAttack(EntityUid user, EntityUid weaponUid, MeleeWeaponCompo
 
     protected virtual void DoLightAttack(EntityUid user, LightAttackEvent ev, EntityUid meleeUid, MeleeWeaponComponent component, ICommonSession? session)
     {
-        var damage = GetDamage(meleeUid, user, component);
+        // If I do not come back later to fix Light Attacks being Heavy Attacks you can throw me in the spider pit -Errant
+        var damage = GetDamage(meleeUid, user, component) * GetHeavyDamageModifier(meleeUid, user, component);
         var target = GetEntity(ev.Target);
         var resistanceBypass = GetResistanceBypass(meleeUid, user, component);
 
         // For consistency with wide attacks stuff needs damageable.
         if (Deleted(target) ||
             !HasComp<DamageableComponent>(target) ||
-            !TryComp<TransformComponent>(target, out var targetXform) ||
+            !TryComp(target, out TransformComponent? targetXform) ||
             // Not in LOS.
             !InRange(user, target.Value, component.Range, session))
         {
@@ -437,12 +467,14 @@ protected virtual void DoLightAttack(EntityUid user, LightAttackEvent ev, Entity
             // TODO: This needs fixing
             if (meleeUid == user)
             {
-                AdminLogger.Add(LogType.MeleeHit, LogImpact.Low,
+                AdminLogger.Add(LogType.MeleeHit,
+                    LogImpact.Low,
                     $"{ToPrettyString(user):actor} melee attacked (light) using their hands and missed");
             }
             else
             {
-                AdminLogger.Add(LogType.MeleeHit, LogImpact.Low,
+                AdminLogger.Add(LogType.MeleeHit,
+                    LogImpact.Low,
                     $"{ToPrettyString(user):actor} melee attacked (light) using {ToPrettyString(meleeUid):tool} and missed");
             }
             var missEvent = new MeleeHitEvent(new List<EntityUid>(), user, meleeUid, damage, null);
@@ -479,7 +511,7 @@ protected virtual void DoLightAttack(EntityUid user, LightAttackEvent ev, Entity
         RaiseLocalEvent(target.Value, attackedEvent);
 
         var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage + attackedEvent.BonusDamage, hitEvent.ModifiersList);
-        var damageResult = Damageable.TryChangeDamage(target, modifiedDamage, origin: user, ignoreResistances: resistanceBypass, partMultiplier: component.ClickPartDamageMultiplier);
+        var damageResult = Damageable.TryChangeDamage(target, modifiedDamage, origin:user, ignoreResistances:resistanceBypass);
 
         if (damageResult is {Empty: false})
         {
@@ -491,12 +523,14 @@ protected virtual void DoLightAttack(EntityUid user, LightAttackEvent ev, Entity
 
             if (meleeUid == user)
             {
-                AdminLogger.Add(LogType.MeleeHit, LogImpact.Medium,
+                AdminLogger.Add(LogType.MeleeHit,
+                    LogImpact.Medium,
                     $"{ToPrettyString(user):actor} melee attacked (light) {ToPrettyString(target.Value):subject} using their hands and dealt {damageResult.GetTotal():damage} damage");
             }
             else
             {
-                AdminLogger.Add(LogType.MeleeHit, LogImpact.Medium,
+                AdminLogger.Add(LogType.MeleeHit,
+                    LogImpact.Medium,
                     $"{ToPrettyString(user):actor} melee attacked (light) {ToPrettyString(target.Value):subject} using {ToPrettyString(meleeUid):tool} and dealt {damageResult.GetTotal():damage} damage");
             }
 
@@ -510,47 +544,38 @@ protected virtual void DoLightAttack(EntityUid user, LightAttackEvent ev, Entity
         }
     }
 
-    protected abstract void DoDamageEffect(List<EntityUid> targets, EntityUid? user, TransformComponent targetXform);
+    protected abstract void DoDamageEffect(List<EntityUid> targets, EntityUid? user,  TransformComponent targetXform);
 
     private bool DoHeavyAttack(EntityUid user, HeavyAttackEvent ev, EntityUid meleeUid, MeleeWeaponComponent component, ICommonSession? session)
     {
         // TODO: This is copy-paste as fuck with DoPreciseAttack
-        if (!TryComp<TransformComponent>(user, out var userXform))
+        if (!TryComp(user, out TransformComponent? userXform))
             return false;
 
-        var targetMap = GetCoordinates(ev.Coordinates).ToMap(EntityManager, TransformSystem);
+        var targetMap = TransformSystem.ToMapCoordinates(GetCoordinates(ev.Coordinates));
 
         if (targetMap.MapId != userXform.MapID)
             return false;
 
-        if (TryComp<StaminaComponent>(user, out var stamina))
-        {
-            if (stamina.CritThreshold - stamina.StaminaDamage <= component.HeavyStaminaCost)
-            {
-                PopupSystem.PopupClient(Loc.GetString("melee-heavy-no-stamina"), meleeUid, user);
-                return false;
-            }
-
-            _stamina.TakeStaminaDamage(user, component.HeavyStaminaCost, stamina, visual: false);
-        }
-
         var userPos = TransformSystem.GetWorldPosition(userXform);
         var direction = targetMap.Position - userPos;
-        var distance = Math.Min(component.Range * component.HeavyRangeModifier, direction.Length());
+        var distance = Math.Min(component.Range, direction.Length());
 
-        var damage = GetDamage(meleeUid, user, component) * GetHeavyDamageModifier(meleeUid, user, component);
+        var damage = GetDamage(meleeUid, user, component);
         var entities = GetEntityList(ev.Entities);
 
         if (entities.Count == 0)
         {
             if (meleeUid == user)
             {
-                AdminLogger.Add(LogType.MeleeHit, LogImpact.Low,
+                AdminLogger.Add(LogType.MeleeHit,
+                    LogImpact.Low,
                     $"{ToPrettyString(user):actor} melee attacked (heavy) using their hands and missed");
             }
             else
             {
-                AdminLogger.Add(LogType.MeleeHit, LogImpact.Low,
+                AdminLogger.Add(LogType.MeleeHit,
+                    LogImpact.Low,
                     $"{ToPrettyString(user):actor} melee attacked (heavy) using {ToPrettyString(meleeUid):tool} and missed");
             }
             var missEvent = new MeleeHitEvent(new List<EntityUid>(), user, meleeUid, damage, direction);
@@ -562,15 +587,23 @@ private bool DoHeavyAttack(EntityUid user, HeavyAttackEvent ev, EntityUid meleeU
             return true;
         }
 
-        var maxTargets = component.MaxTargets;
-        if (entities.Count > maxTargets)
-            entities.RemoveRange(maxTargets, entities.Count - maxTargets);
+        // Naughty input
+        if (entities.Count > MaxTargets)
+        {
+            entities.RemoveRange(MaxTargets, entities.Count - MaxTargets);
+        }
 
         // Validate client
         for (var i = entities.Count - 1; i >= 0; i--)
         {
-            if (ArcRaySuccessful(entities[i], userPos, direction.ToWorldAngle(), component.Angle, distance,
-                    userXform.MapID, user, session))
+            if (ArcRaySuccessful(entities[i],
+                    userPos,
+                    direction.ToWorldAngle(),
+                    component.Angle,
+                    distance,
+                    userXform.MapID,
+                    user,
+                    session))
             {
                 continue;
             }
@@ -616,33 +649,45 @@ private bool DoHeavyAttack(EntityUid user, HeavyAttackEvent ev, EntityUid meleeU
 
         var appliedDamage = new DamageSpecifier();
 
-        foreach (var entity in targets)
+        for (var i = targets.Count - 1; i >= 0; i--)
         {
+            var entity = targets[i];
             // We raise an attack attempt here as well,
             // primarily because this was an untargeted wideswing: if a subscriber to that event cared about
             // the potential target (such as for pacifism), they need to be made aware of the target here.
             // In that case, just continue.
             if (!Blocker.CanAttack(user, entity, (weapon, component)))
+            {
+                targets.RemoveAt(i);
                 continue;
+            }
 
             var attackedEvent = new AttackedEvent(meleeUid, user, GetCoordinates(ev.Coordinates));
             RaiseLocalEvent(entity, attackedEvent);
             var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage + attackedEvent.BonusDamage, hitEvent.ModifiersList);
 
-            var damageResult = Damageable.TryChangeDamage(entity, modifiedDamage, origin: user, partMultiplier: component.HeavyPartDamageMultiplier);
+            var damageResult = Damageable.TryChangeDamage(entity, modifiedDamage, origin:user);
 
             if (damageResult != null && damageResult.GetTotal() > FixedPoint2.Zero)
             {
+                // If the target has stamina and is taking blunt damage, they should also take stamina damage based on their blunt to stamina factor
+                if (damageResult.DamageDict.TryGetValue("Blunt", out var bluntDamage))
+                {
+                    _stamina.TakeStaminaDamage(entity, (bluntDamage * component.BluntStaminaDamageFactor).Float(), visual: false, source: user, with: meleeUid == user ? null : meleeUid);
+                }
+
                 appliedDamage += damageResult;
 
                 if (meleeUid == user)
                 {
-                    AdminLogger.Add(LogType.MeleeHit, LogImpact.Medium,
+                    AdminLogger.Add(LogType.MeleeHit,
+                        LogImpact.Medium,
                         $"{ToPrettyString(user):actor} melee attacked (heavy) {ToPrettyString(entity):subject} using their hands and dealt {damageResult.GetTotal():damage} damage");
                 }
                 else
                 {
-                    AdminLogger.Add(LogType.MeleeHit, LogImpact.Medium,
+                    AdminLogger.Add(LogType.MeleeHit,
+                        LogImpact.Medium,
                         $"{ToPrettyString(user):actor} melee attacked (heavy) {ToPrettyString(entity):subject} using {ToPrettyString(meleeUid):tool} and dealt {damageResult.GetTotal():damage} damage");
                 }
             }
@@ -676,8 +721,13 @@ protected HashSet<EntityUid> ArcRayCast(Vector2 position, Angle angle, Angle arc
         {
             var castAngle = new Angle(baseAngle + increment * i);
             var res = _physics.IntersectRay(mapId,
-                new CollisionRay(position, castAngle.ToWorldVec(),
-                    AttackMask), range, ignore, false).ToList();
+                new CollisionRay(position,
+                    castAngle.ToWorldVec(),
+                    AttackMask),
+                range,
+                ignore,
+                false)
+                .ToList();
 
             if (res.Count != 0)
             {
@@ -688,8 +738,14 @@ protected HashSet<EntityUid> ArcRayCast(Vector2 position, Angle angle, Angle arc
         return resSet;
     }
 
-    protected virtual bool ArcRaySuccessful(EntityUid targetUid, Vector2 position, Angle angle, Angle arcWidth, float range,
-        MapId mapId, EntityUid ignore, ICommonSession? session)
+    protected virtual bool ArcRaySuccessful(EntityUid targetUid,
+        Vector2 position,
+        Angle angle,
+        Angle arcWidth,
+        float range,
+        MapId mapId,
+        EntityUid ignore,
+        ICommonSession? session)
     {
         // Only matters for server.
         return true;
@@ -738,7 +794,7 @@ protected virtual bool DoDisarm(EntityUid user, DisarmAttackEvent ev, EntityUid
     private void DoLungeAnimation(EntityUid user, EntityUid weapon, Angle angle, MapCoordinates coordinates, float length, string? animation)
     {
         // TODO: Assert that offset eyes are still okay.
-        if (!TryComp<TransformComponent>(user, out var userXform))
+        if (!TryComp(user, out TransformComponent? userXform))
             return;
 
         var invMatrix = TransformSystem.GetInvWorldMatrix(userXform);
diff --git a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
index 4ac4bca6600..056b14f6924 100644
--- a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
@@ -1,4 +1,5 @@
 using System.Numerics;
+using Content.Shared.Nyanotrasen.Abilities.Oni;
 using Content.Shared.Weapons.Ranged.Events;
 using Content.Shared.Weapons.Ranged.Systems;
 using Robust.Shared.Audio;
diff --git a/Content.Shared/WhiteDream/BloodCult/BloodCultist/BloodCultLeaderComponent.cs b/Content.Shared/WhiteDream/BloodCult/BloodCultist/BloodCultLeaderComponent.cs
index 6c0a118cac5..69e9194229f 100644
--- a/Content.Shared/WhiteDream/BloodCult/BloodCultist/BloodCultLeaderComponent.cs
+++ b/Content.Shared/WhiteDream/BloodCult/BloodCultist/BloodCultLeaderComponent.cs
@@ -6,7 +6,7 @@
 namespace Content.Shared.WhiteDream.BloodCult.BloodCultist;
 
 [RegisterComponent, NetworkedComponent]
-public sealed partial class BloodCultLeaderComponent : Component, IAntagStatusIconComponent
+public sealed partial class BloodCultLeaderComponent : Component
 {
     [DataField]
     public ProtoId<StatusIconPrototype> StatusIcon { get; set; } = "BloodCultLeader";
diff --git a/Content.Shared/WhiteDream/BloodCult/Constructs/ConstructComponent.cs b/Content.Shared/WhiteDream/BloodCult/Constructs/ConstructComponent.cs
index 24d67ed2c8d..6c226b92d65 100644
--- a/Content.Shared/WhiteDream/BloodCult/Constructs/ConstructComponent.cs
+++ b/Content.Shared/WhiteDream/BloodCult/Constructs/ConstructComponent.cs
@@ -5,7 +5,7 @@
 namespace Content.Shared.WhiteDream.BloodCult.Constructs;
 
 [RegisterComponent]
-public sealed partial class ConstructComponent : Component, IAntagStatusIconComponent
+public sealed partial class ConstructComponent : Component
 {
     [DataField]
     public List<EntProtoId> Actions = new();

From 691c103e57b3eae852f4b88eee71362544d1b719 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 12:45:38 -0400
Subject: [PATCH 081/366] Remove duplicate

---
 Resources/Locale/en-US/job/job-names.ftl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl
index d65eb5c3d90..aea1ad3f16c 100644
--- a/Resources/Locale/en-US/job/job-names.ftl
+++ b/Resources/Locale/en-US/job/job-names.ftl
@@ -58,7 +58,6 @@ job-name-visitor = Visitor
 job-name-geneticist = Geneticist
 job-name-no-id = No ID
 job-name-prisoner = Prisoner
-job-name-roboticist = Roboticist
 job-name-syndicate = Syndicate
 job-name-unknown = Unknown
 job-name-virologist = Virologist

From 4ceb5250e4da70b9e9d8d2d6606066c9d5be01f1 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 13:29:43 -0400
Subject: [PATCH 082/366] we out here

---
 .../en-US/nyanotrasen/job/job-names.ftl       |   1 -
 .../Prototypes/Catalog/uplink_catalog.yml     | 560 +-----------------
 .../Prototypes/DeltaV/StatusEffects/job.yml   |   8 +-
 .../Entities/Markers/Spawners/ghost_roles.yml |   6 +-
 .../Entities/Objects/Magic/books.yml          |  43 --
 .../Nyanotrasen/StatusEffects/job.yml         |  10 +-
 .../StatusIcon/StatusEffects/hunger.yml       |  57 --
 .../WhiteDream/StatusIcon/antag.yml           |  18 +-
 8 files changed, 29 insertions(+), 674 deletions(-)
 delete mode 100644 Resources/Prototypes/StatusIcon/StatusEffects/hunger.yml

diff --git a/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl b/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl
index 8660d214615..429be6e49f0 100644
--- a/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl
+++ b/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl
@@ -2,7 +2,6 @@ job-name-gladiator = Gladiator
 job-name-guard = Prison Guard
 job-name-mail-carrier = Courier
 job-name-martialartist =  Martial Artist
-job-name-prisoner = Prisoner
 job-name-mantis = Mantis
 
 # Role timers
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 22910b60b17..646b67d7844 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -13,7 +13,6 @@
     Telecrystal: 3
   categories:
   - UplinkWeapons
-  saleLimit: 1
 
 - type: listing
   id: UplinkRevolverPython
@@ -27,7 +26,6 @@
     Telecrystal: 8 # Originally was 13 TC but was not used due to high cost
   categories:
   - UplinkWeapons
-  saleLimit: 1
 
 # Inbuilt suppressor so it's sneaky + more expensive.
 - type: listing
@@ -42,7 +40,6 @@
     Telecrystal: 4
   categories:
   - UplinkWeapons
-  saleLimit: 1
 
 # Poor accuracy, slow to fire, cheap option
 - type: listing
@@ -54,7 +51,6 @@
     Telecrystal: 1
   categories:
   - UplinkWeapons
-  saleLimit: 1
 
 - type: listing
   id: UplinkEsword
@@ -69,7 +65,6 @@
     Telecrystal: 8
   categories:
   - UplinkWeapons
-  saleLimit: 2
 
 - type: listing
   id: UplinkEnergyDagger
@@ -84,7 +79,6 @@
     Telecrystal: 2
   categories:
   - UplinkWeapons
-  saleLimit: 1
 
 - type: listing
   id: UplinkThrowingKnivesKit
@@ -112,7 +106,6 @@
     Telecrystal: 8
   categories:
   - UplinkWeapons
-  saleLimit: 1
 
 - type: listing
   id: UplinkDisposableTurret
@@ -131,7 +124,6 @@
       blacklist:
         tags:
           - NukeOpsUplink
-  saleLimit: 2
 
 - type: listing
   id: UplinkEshield
@@ -344,7 +336,6 @@
     whitelist:
       tags:
       - NukeOpsUplink
-  saleLimit: 1
 
 - type: listing
   id: UplinkC4Bundle
@@ -358,7 +349,6 @@
     Telecrystal: 12 #you're buying bulk so its a 25% discount, so no additional random discount over it
   categories:
   - UplinkExplosives
-  saleLimit: 1
 
 - type: listing
   id: UplinkEmpGrenade
@@ -402,7 +392,6 @@
     blacklist:
       tags:
       - NukeOpsUplink
-  saleLimit: 1
 
 - type: listing
   id: UplinkSyndicateBombNukie
@@ -418,7 +407,6 @@
     whitelist:
       tags:
       - NukeOpsUplink
-  saleLimit: 1
 
 - type: listing
   id: UplinkClusterGrenade
@@ -625,7 +613,6 @@
     blacklist:
       components:
       - SurplusBundle
-  saleLimit: 1
 
 - type: listing
   id: UplinkNocturineChemistryBottle
@@ -639,7 +626,6 @@
     Telecrystal: 6
   categories:
   - UplinkChemicals
-  saleLimit: 1
 
 - type: listing
   id: UplinkCombatMedkit
@@ -653,7 +639,6 @@
     Telecrystal: 5
   categories:
   - UplinkChemicals
-  saleLimit: 1
 
 - type: listing
   id: UplinkCombatMedipen
@@ -667,7 +652,6 @@
     Telecrystal: 4
   categories:
   - UplinkChemicals
-  saleLimit: 1
 
 - type: listing
   id: UplinkStimpack
@@ -681,7 +665,6 @@
     Telecrystal: 4
   categories:
   - UplinkChemicals
-  saleLimit: 1
 
 - type: listing
   id: UplinkStimkit
@@ -695,7 +678,6 @@
     Telecrystal: 12
   categories:
   - UplinkChemicals
-  saleLimit: 1
 
 - type: listing
   id: UplinkCigarettes
@@ -731,7 +713,6 @@
       blacklist:
         components:
           - SurplusBundle
-  saleLimit: 1
 
 # Deception
 
@@ -1017,25 +998,6 @@
         components:
           - SurplusBundle
 
-- type: listing
-  id: UplinkSurplusBundle
-  name: uplink-surplus-bundle-name
-  description: uplink-surplus-bundle-desc
-  productEntity: CrateSyndicateSurplusBundle
-  cost:
-    Telecrystal: 20
-  categories:
-  - UplinkDisruption
-  conditions:
-  - !type:StoreWhitelistCondition
-    blacklist:
-      tags:
-      - NukeOpsUplink
-  - !type:BuyerWhitelistCondition
-    blacklist:
-      components:
-      - SurplusBundle
-
 - type: listing
   id: UplinkSuperSurplusBundle
   name: uplink-super-surplus-bundle-name
@@ -1107,7 +1069,6 @@
       blacklist:
         tags:
           - NukeOpsUplink
-  saleLimit: 1
 
 - type: listing
   id: UplinkReinforcementRadioSyndicateNukeops # Version for Nukeops that spawns an agent with the NukeOperative component.
@@ -1124,7 +1085,6 @@
       whitelist:
         tags:
           - NukeOpsUplink
-  saleLimit: 1
 
 - type: listing
   id: UplinkReinforcementRadioSyndicateCyborgAssault
@@ -1141,7 +1101,6 @@
       whitelist:
         tags:
           - NukeOpsUplink
-  saleLimit: 1
 
 - type: listing
   id: UplinkReinforcementRadioSyndicateAncestor
@@ -1180,7 +1139,6 @@
       whitelist:
         tags:
           - NukeOpsUplink
-  saleLimit: 1
 
 - type: listing
   id: UplinkCarpDehydrated
@@ -1209,56 +1167,6 @@
   categories:
   - UplinkUtility
 
-- type: listing
-  id: UplinkVoiceMask
-  name: uplink-voice-mask-name
-  description: uplink-voice-mask-desc
-  productEntity: ClothingMaskGasVoiceChameleon
-  cost:
-    Telecrystal: 2
-  categories:
-  - UplinkUtility
-
-- type: listing
-  id: UplinkClothingEyesHudSyndicate
-  name: uplink-clothing-eyes-hud-syndicate-name
-  description: uplink-clothing-eyes-hud-syndicate-desc
-  productEntity: ClothingEyesHudSyndicate
-  cost:
-    Telecrystal: 2
-  categories:
-    - UplinkUtility
-
-- type: listing
-  id: UplinkRadioJammer
-  name: uplink-radio-jammer-name
-  description: uplink-radio-jammer-desc
-  productEntity: RadioJammer
-  cost:
-    Telecrystal: 4
-  categories:
-  - UplinkUtility
-
-- type: listing
-  id: UplinkHypoDart
-  name: uplink-hypodart-name
-  description: uplink-hypodart-desc
-  icon: { sprite: /Textures/Objects/Fun/Darts/dart_red.rsi, state: icon }
-  productEntity: HypoDartBox
-  cost:
-    Telecrystal: 2
-  categories:
-  - UplinkUtility
-
-- type: listing
-  id: UplinkSyndicateWeaponModule
-  name: uplink-syndicate-weapon-module-name
-  description: uplink-syndicate-weapon-module-desc
-  productEntity: BorgModuleSyndicateWeapon
-  cost:
-    Telecrystal: 5
-  categories:
-    - UplinkUtility
 # Implants
 
 - type: listing
@@ -1459,38 +1367,8 @@
   categories:
   - UplinkBundles
 
-- type: listing
-  id: UplinkSyndicateBombFake
-  name: uplink-exploding-syndicate-bomb-fake-name
-  description: uplink-exploding-syndicate-bomb-fake-desc
-  productEntity: SyndicateBombFake
-  cost:
-    Telecrystal: 4
-  categories:
-  - UplinkUtility
-
 # Disruption
 
-- type: listing
-  id: UplinkAmmoBundle
-  name: uplink-ammo-bundle-name
-  description: uplink-ammo-bundle-desc
-  productEntity: ClothingBackpackDuffelSyndicateAmmoFilled
-  cost:
-    Telecrystal: 15
-  categories:
-  - UplinkBundles
-  conditions:
-    - !type:StoreWhitelistCondition
-      whitelist:
-        tags:
-          - NukeOpsUplink
-    - !type:BuyerWhitelistCondition
-      blacklist:
-        components:
-          - SurplusBundle
-  saleLimit: 1
-
 - type: listing
   id: UplinkChameleon
   name: uplink-chameleon-name
@@ -1543,7 +1421,6 @@
     Telecrystal: 12
   categories:
   - UplinkBundles
-  saleLimit: 1
 
 - type: listing
   id: UplinkClothingShoesBootsMagSyndie
@@ -1557,7 +1434,6 @@
     Telecrystal: 17
   categories:
   - UplinkBundles
-  saleLimit: 1
 
 - type: listing
   id: UplinkEVASyndie
@@ -1572,7 +1448,6 @@
     Telecrystal: 20
   categories:
   - UplinkBundles
-  saleLimit: 1
 
 - type: listing
   id: UplinkHardsuitCarp
@@ -1587,7 +1462,6 @@
     Telecrystal: 25
   categories:
   - UplinkBundles
-  saleLimit: 1
 
 - type: listing
   id: UplinkHardsuitSyndie
@@ -1602,7 +1476,6 @@
     Telecrystal: 30
   categories:
   - UplinkBundles
-  saleLimit: 1
 
 - type: listing
   id: UplinkSurplusBundle
@@ -1674,59 +1547,6 @@
 
 # Tools
 
-- type: listing
-  id: UplinkToolbox
-  name: uplink-toolbox-name
-  description: uplink-toolbox-desc
-  productEntity: ToolboxSyndicateFilled
-  cost:
-    Telecrystal: 2
-  categories:
-  - UplinkTools
-
-- type: listing
-  id: UplinkSyndicateJawsOfLife
-  name: uplink-syndicate-jaws-of-life-name
-  description: uplink-syndicate-jaws-of-life-desc
-  productEntity: SyndicateJawsOfLife
-  cost:
-    Telecrystal: 2
-  categories:
-  - UplinkTools
-
-- type: listing
-  id: UplinkBarberScissors
-  name: uplink-barber-scissors-name
-  description: uplink-barber-scissors-desc
-  productEntity: BarberScissors
-  cost:
-    Telecrystal: 1
-  categories:
-  - UplinkPointless
-
-- type: listing
-  id: UplinkSnackBox
-  name: uplink-snack-box-name
-  description: uplink-snack-box-desc
-  productEntity: HappyHonkNukieSnacks
-  cost:
-    Telecrystal: 1
-  categories:
-  - UplinkPointless
-
-- type: listing
-  id: UplinkRevolverCapGun
-  name: uplink-revolver-cap-gun-name
-  description: uplink-revolver-cap-gun-desc
-  productEntity: RevolverCapGun
-  discountCategory: rareDiscounts
-  discountDownTo:
-    Telecrystal: 2
-  cost:
-    Telecrystal: 4
-  categories:
-  - UplinkTools
-
 - type: listing
   id: UplinkSyndicateStamp
   name: uplink-syndicate-stamp-name
@@ -1745,21 +1565,6 @@
         components:
           - SurplusBundle
 
-- type: listing
-  id: UplinkCarpDehydrated
-  name: uplink-carp-dehydrated-name
-  description: uplink-carp-dehydrated-desc
-  productEntity: DehydratedSpaceCarp
-  cost:
-    Telecrystal: 2
-  categories:
-  - UplinkTools
-  conditions:
-  - !type:StoreWhitelistCondition
-    blacklist:
-      tags:
-      - NukeOpsUplink
-
 # Job Specific
 
 - type: listing
@@ -1850,7 +1655,6 @@
   - !type:BuyerJobCondition
     whitelist:
     - Chaplain
-  saleLimit: 1
 
 - type: listing
   id: uplinkRevolverCapGunFake
@@ -1869,7 +1673,6 @@
     whitelist:
     - Mime
     - Clown
-  saleLimit: 1
 
 - type: listing
   id: uplinkBananaPeelExplosive
@@ -1923,7 +1726,6 @@
   - !type:BuyerJobCondition
     whitelist:
     - Clown
-  saleLimit: 1
 
 - type: listing
   id: uplinkHotPotato
@@ -2026,15 +1828,6 @@
     blacklist:
       components:
       - SurplusBundle
-- type: listing
-  id: UplinkSingarityBeacon
-  name: uplink-singularity-beacon-name
-  description: uplink-singularity-beacon-desc
-  productEntity: SingularityBeacon
-  cost:
-    Telecrystal: 12
-  categories:
-    - UplinkUtility
 
 - type: listing
   id: UplinkEmpFlashlight
@@ -2056,355 +1849,4 @@
   cost:
     Telecrystal: 1
   categories:
-    - UplinkArmor
-
-- type: listing
-  id: UplinkChameleon
-  name: uplink-chameleon-name
-  description: uplink-chameleon-desc
-  productEntity: ClothingBackpackChameleonFill
-  icon: { sprite: /Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi, state: icon }
-  cost:
-    Telecrystal: 4
-  categories:
-    - UplinkArmor
-
-- type: listing
-  id: UplinkClothingNoSlipsShoes
-  name: uplink-clothing-no-slips-shoes-name
-  description: uplink-clothing-no-slips-shoes-desc
-  productEntity: ClothingShoesChameleonNoSlips
-  cost:
-    Telecrystal: 2
-  categories:
-  - UplinkArmor
-
-- type: listing
-  id: UplinkgClothingThievingGloves
-  name: uplink-clothing-thieving-gloves-name
-  description: uplink-clothing-thieving-gloves-desc
-  productEntity: ThievingGloves
-  cost:
-    Telecrystal: 4
-  categories:
-  - UplinkArmor
-
-- type: listing
-  id: UplinkClothingOuterVestWeb
-  name: uplink-clothing-outer-vest-web-name
-  description: uplink-clothing-outer-vest-web-desc
-  productEntity: ClothingOuterVestWeb
-  cost:
-    Telecrystal: 3
-  categories:
-  - UplinkArmor
-
-- type: listing
-  id: UplinkClothingShoesBootsMagSyndie
-  name: uplink-clothing-shoes-boots-mag-syndie-name
-  description: uplink-clothing-shoes-boots-mag-syndie-desc
-  productEntity: ClothingShoesBootsMagSyndie
-  cost:
-    Telecrystal: 4
-  categories:
-  - UplinkArmor
-
-- type: listing
-  id: UplinkEVASyndie
-  name: uplink-eva-syndie-name
-  description: uplink-eva-syndie-desc
-  icon: { sprite: /Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi, state: icon }
-  productEntity: ClothingBackpackDuffelSyndicateEVABundle
-  cost:
-    Telecrystal: 2
-  categories:
-  - UplinkArmor
-
-- type: listing
-  id: UplinkHardsuitSyndie
-  name: uplink-hardsuit-syndie-name
-  description: uplink-hardsuit-syndie-desc
-  icon: { sprite: /Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi, state: icon }
-  productEntity: ClothingBackpackDuffelSyndicateHardsuitBundle
-  cost:
-    Telecrystal: 8
-  categories:
-  - UplinkArmor
-  saleLimit: 1
-
-- type: listing
-  id: UplinkHardsuitSyndieElite
-  name: uplink-hardsuit-syndieelite-name
-  description: uplink-hardsuit-syndieelite-desc
-  icon: { sprite: /Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi, state: icon }
-  productEntity: ClothingBackpackDuffelSyndicateEliteHardsuitBundle
-  cost:
-    Telecrystal: 10
-  categories:
-  - UplinkArmor
-  saleLimit: 1
-
-- type: listing
-  id: UplinkClothingOuterHardsuitJuggernaut
-  name: uplink-clothing-outer-hardsuit-juggernaut-name
-  description: uplink-clothing-outer-hardsuit-juggernaut-desc
-  icon: { sprite: /Textures/Structures/Storage/Crates/syndicate.rsi, state: icon }
-  productEntity: CrateCybersunJuggernautBundle
-  cost:
-    Telecrystal: 12
-  categories:
-  - UplinkArmor
-  saleLimit: 1
-
-# Misc
-
-- type: listing
-  id: UplinkClothingConductingGloves
-  name: uplink-clothing-conducting-gloves-name
-  description: uplink-clothing-conducting-gloves-desc
-  productEntity: ClothingHandsGlovesConducting
-  cost:
-    Telecrystal: 2
-  categories:
-  - UplinkMisc
-
-- type: listing
-  id: UplinkSnackBox
-  name: uplink-snack-box-name
-  description: uplink-snack-box-desc
-  productEntity: HappyHonkNukieSnacks
-  cost:
-    Telecrystal: 1
-  categories:
-  - UplinkMisc
-
-- type: listing
-  id: UplinkEshield
-  name: uplink-eshield-name
-  description: uplink-eshield-desc
-  icon: { sprite: /Textures/Objects/Weapons/Melee/e_shield.rsi, state: eshield-on }
-  productEntity: EnergyShield
-  cost:
-    Telecrystal: 8
-  categories:
-  - UplinkMisc
-  conditions:
-  - !type:StoreWhitelistCondition
-    whitelist:
-      tags:
-      - NukeOpsUplink
-  saleLimit: 1
-
-- type: listing
-  id: UplinkSoapSyndie
-  name: uplink-soap-name
-  description: uplink-soap-desc
-  productEntity: SoapSyndie
-  cost:
-    Telecrystal: 1
-  categories:
-  - UplinkMisc
-
-- type: listing
-  id: UplinkSlipocalypseClusterSoap
-  name: uplink-slipocalypse-clustersoap-name
-  description: uplink-slipocalypse-clustersoap-desc
-  productEntity: SlipocalypseClusterSoap
-  cost:
-    Telecrystal: 3
-  categories:
-  - UplinkMisc
-
-# - type: listing
-#   id: UplinkGigacancerScanner
-#   name: Ultragigacancer Health Analyzer
-#   description: Works like a normal health analyzer, other than giving everyone it scans ultragigacancer.
-#   productEntity: HandheldHealthAnalyzerGigacancer
-#   cost:
-#     Telecrystal: 5
-#   categories:
-#   - UplinkMisc
-
-- type: listing
-  id: UplinkMobCatMicrobomb
-  name: uplink-mobcat-microbomb-name
-  description: uplink-mobcat-microbomb-desc
-  icon: { sprite: /Textures/Mobs/Pets/cat.rsi, state: syndicat }
-  productEntity: MobCatSyndy
-  cost:
-    Telecrystal: 10
-  categories:
-    - UplinkMisc
-  conditions:
-    - !type:StoreWhitelistCondition
-      whitelist:
-        tags:
-          - NukeOpsUplink
-  saleLimit: 1
-
-- type: listing
-  id: UplinkBackpackSyndicate
-  name: uplink-backpack-syndicate-name
-  description: uplink-backpack-syndicate-desc
-  productEntity: ClothingBackpackSyndicate
-  cost:
-    Telecrystal: 2
-  categories:
-    - UplinkPointless
-
- # Pointless
-
-- type: listing
-  id: UplinkBarberScissors
-  name: uplink-barber-scissors-name
-  description: uplink-barber-scissors-desc
-  productEntity: BarberScissors
-  cost:
-    Telecrystal: 1
-  categories:
-  - UplinkPointless
-
-- type: listing
-  id: UplinkRevolverCapGun
-  name: uplink-revolver-cap-gun-name
-  description: uplink-revolver-cap-gun-desc
-  productEntity: RevolverCapGun
-  cost:
-    Telecrystal: 4
-  categories:
-  - UplinkPointless
-
-- type: listing
-  id: UplinkSyndicateStamp
-  name: uplink-syndicate-stamp-name
-  description: uplink-syndicate-stamp-desc
-  productEntity: RubberStampSyndicate
-  cost:
-    Telecrystal: 2
-  categories:
-  - UplinkPointless
-
-# - type: listing # DeltaV - Move cat ears out of syndicate uplink into the AutoDrobe
-#   id: UplinkCatEars
-#   name: uplink-cat-ears-name
-#   description: uplink-cat-ears-desc
-#   productEntity: ClothingHeadHatCatEars
-#   cost:
-#     Telecrystal: 4 # Nyanotrasen - Make Cat Ears 4TC instead of 26TC
-#   categories:
-#   - UplinkPointless
-
-- type: listing
-  id: UplinkOutlawHat
-  name: uplink-outlaw-hat-name
-  description: uplink-outlaw-hat-desc
-  productEntity: ClothingHeadHatOutlawHat
-  cost:
-    Telecrystal: 1
-  categories:
-  - UplinkPointless
-
-- type: listing
-  id: UplinkOutlawGlasses
-  name: uplink-outlaw-glasses-name
-  description: uplink-outlaw-glasses-desc
-  productEntity: ClothingEyesGlassesOutlawGlasses
-  cost:
-    Telecrystal: 1
-  categories:
-  - UplinkPointless
-
-- type: listing
-  id: UplinkCostumePyjama
-  name: uplink-costume-pyjama-name
-  description: uplink-costume-pyjama-desc
-  productEntity: ClothingBackpackDuffelSyndicatePyjamaBundle
-  cost:
-    Telecrystal: 4
-  categories:
-  - UplinkPointless
-
-- type: listing
-  id: UplinkCostumeClown
-  name: uplink-costume-clown-name
-  description: uplink-costume-clown-desc
-  productEntity: ClothingBackpackDuffelSyndicateCostumeClown
-  cost:
-    Telecrystal: 2
-  categories:
-  - UplinkPointless
-
-# - type: listing # DeltaV - Disable carp suit being buyable
-#   id: UplinkCarpSuitBundle
-#   name: uplink-carp-suit-bundle-name
-#   description: uplink-carp-suit-bundle-desc
-#   productEntity: ClothingBackpackDuffelSyndicateCarpSuit
-#   cost:
-#     Telecrystal: 4
-#   categories:
-#   - UplinkPointless
-
-- type: listing
-  id: UplinkOperativeSuit
-  name: uplink-operative-suit-name
-  description: uplink-operative-suit-desc
-  productEntity: ClothingUniformJumpsuitOperative
-  cost:
-    Telecrystal: 1
-  categories:
-  - UplinkPointless
-
-- type: listing
-  id: UplinkOperativeSkirt
-  name: uplink-operative-skirt-name
-  description: uplink-operative-skirt-desc
-  productEntity: ClothingUniformJumpskirtOperative
-  cost:
-    Telecrystal: 1
-  categories:
-  - UplinkPointless
-
-- type: listing
-  id: UplinkBalloon
-  name: uplink-balloon-name
-  description: uplink-balloon-desc
-  productEntity: BalloonSyn
-  cost:
-    Telecrystal: 20
-  categories:
-  - UplinkPointless
-
-- type: listing
-  id: UplinkScarfSyndieRed
-  name: uplink-scarf-syndie-red-name
-  description: uplink-scarf-syndie-red-desc
-  productEntity: ClothingNeckScarfStripedSyndieRed
-  cost:
-    Telecrystal: 1
-  categories:
-  - UplinkPointless
-
-- type: listing
-  id: UplinkScarfSyndieGreen
-  name: uplink-scarf-syndie-green-name
-  description: uplink-scarf-syndie-green-desc
-  productEntity: ClothingNeckScarfStripedSyndieGreen
-  cost:
-    Telecrystal: 1
-  categories:
-    - UplinkPointless
-
-- type: listing
-  id: UplinkSyndicatePersonalAI
-  name: uplink-syndicate-pai-name
-  description: uplink-syndicate-pai-desc
-  icon: { sprite: /Textures/Objects/Fun/pai.rsi, state: syndicate-icon-pai-off }
-  productEntity: SyndicatePersonalAI
-  cost:
-    Telecrystal: 1
-  categories:
-    - UplinkPointless
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 1
-    
+    - UplinkArmor
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/StatusEffects/job.yml b/Resources/Prototypes/DeltaV/StatusEffects/job.yml
index 894e1586b40..415188d75ca 100644
--- a/Resources/Prototypes/DeltaV/StatusEffects/job.yml
+++ b/Resources/Prototypes/DeltaV/StatusEffects/job.yml
@@ -1,25 +1,25 @@
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconMedicalBorg
   icon:
     sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: MedicalBorg
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconChiefJustice
   icon:
     sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: ChiefJustice
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconClerk
   icon:
     sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: Clerk
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconProsecutor
   icon:
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
index f0f37822f4c..05646a465c1 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
@@ -130,9 +130,11 @@
       state: alive
 
 - type: entity
-  noSpawn: true
-  parent: BaseAntagSpawner
+  parent: MarkerBase
   id: SpawnPointGhostSpaceNinja
+  categories: [ HideSpawnMenu ]
+  name: ghost role spawn point
+  suffix: space ninja
   components:
   - type: GhostRole
     name: ghost-role-information-space-ninja-name
diff --git a/Resources/Prototypes/Entities/Objects/Magic/books.yml b/Resources/Prototypes/Entities/Objects/Magic/books.yml
index 5bb841cfc5d..7697e46b32a 100644
--- a/Resources/Prototypes/Entities/Objects/Magic/books.yml
+++ b/Resources/Prototypes/Entities/Objects/Magic/books.yml
@@ -25,49 +25,6 @@
     - type: EmitSoundOnLand
       sound: /Audio/SimpleStation14/Items/Handling/book_drop.ogg
 
-# For the Wizard Antag
-# Do not add discounts or price inflation
-- type: entity
-  id: WizardsGrimoire
-  name: wizards grimoire
-  suffix: Wizard
-  parent: [ BaseItem, StorePresetSpellbook ]
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/books.rsi
-      layers:
-      - state: paper_blood
-      - state: cover_strong
-        color: "#645a5a"
-      - state: decor_wingette_flat
-        color: "#4d0303"
-      - state: icon_pentagramm
-        color: "#f7e19f"
-    - type: UserInterface
-      interfaces:
-        enum.StoreUiKey.Key:
-          type: StoreBoundUserInterface
-    - type: ActivatableUI
-      key: enum.StoreUiKey.Key
-    - type: Store
-      refundAllowed: true
-      ownerOnly: true # get your own tome!
-      balance:
-        WizCoin: 10 # prices are balanced around this 10 point maximum and how strong the spells are
-
-# Not meant for wizard antag but meant for spawning, so people can't abuse refund if they were given a tome
-- type: entity
-  id: WizardsGrimoireNoRefund
-  name: wizards grimoire
-  suffix: Wizard, No Refund
-  parent: [ WizardsGrimoire, StorePresetSpellbook ]
-  components:
-    - type: Store
-      refundAllowed: false
-      ownerOnly: true # get your own tome!
-      balance:
-        WizCoin: 10 # prices are balanced around this 10 point maximum and how strong the spells are
-
 # For the Wizard Antag
 # Do not add discounts or price inflation
 - type: entity
diff --git a/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml b/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml
index 943660199ba..6a48a061f23 100644
--- a/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml
+++ b/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml
@@ -1,32 +1,32 @@
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconGladiator
   icon:
     sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: nyanoGladiator
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconPrisonGuard
   icon:
     sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: nyanoPrisonGuard
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconMailCarrier
   icon:
     sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: nyanoMailCarrier
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconMartialArtist
   icon:
     sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: nyanoMartialArtist
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconForensicMantis
   icon:
diff --git a/Resources/Prototypes/StatusIcon/StatusEffects/hunger.yml b/Resources/Prototypes/StatusIcon/StatusEffects/hunger.yml
deleted file mode 100644
index 749d1f88f18..00000000000
--- a/Resources/Prototypes/StatusIcon/StatusEffects/hunger.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-#Hunger
-- type: satiationIcon
-  id: HungerIcon
-  abstract: true
-  priority: 5
-  locationPreference: Right
-  isShaded: true
-
-- type: satiationIcon
-  id: HungerIconOverfed
-  parent: HungerIcon
-  icon:
-    sprite: /Textures/Interface/Misc/food_icons.rsi
-    state: overfed
-
-- type: satiationIcon
-  id: HungerIconPeckish
-  parent: HungerIcon
-  icon:
-    sprite: /Textures/Interface/Misc/food_icons.rsi
-    state: peckish
-
-- type: satiationIcon
-  id: HungerIconStarving
-  parent: HungerIcon
-  icon:
-    sprite: /Textures/Interface/Misc/food_icons.rsi
-    state: starving
-
-#Thirst
-- type: satiationIcon
-  id: ThirstIcon
-  abstract: true
-  priority: 5
-  locationPreference: Left
-  isShaded: true
-
-- type: satiationIcon
-  id: ThirstIconOverhydrated
-  parent: ThirstIcon
-  icon:
-    sprite: /Textures/Interface/Misc/food_icons.rsi
-    state: overhydrated
-
-- type: satiationIcon
-  id: ThirstIconThirsty
-  parent: ThirstIcon
-  icon:
-    sprite: /Textures/Interface/Misc/food_icons.rsi
-    state: thirsty
-
-- type: satiationIcon
-  id: ThirstIconParched
-  parent: ThirstIcon
-  icon:
-    sprite: /Textures/Interface/Misc/food_icons.rsi
-    state: parched
diff --git a/Resources/Prototypes/WhiteDream/StatusIcon/antag.yml b/Resources/Prototypes/WhiteDream/StatusIcon/antag.yml
index 9910ed6f4c0..102a9e8787f 100644
--- a/Resources/Prototypes/WhiteDream/StatusIcon/antag.yml
+++ b/Resources/Prototypes/WhiteDream/StatusIcon/antag.yml
@@ -1,15 +1,27 @@
-- type: statusIcon
+- type: factionIcon
   id: BloodCultMember
   priority: 11
   locationPreference: left
+  showTo:
+    components:
+      - ShowAntagIcons
+      - Construct
+      - BloodCultist
+      - BloodCultLeader
   icon:
     sprite: /Textures/WhiteDream/BloodCult/cult_hud.rsi
     state: cult_member
 
-- type: statusIcon
+- type: factionIcon
   id: BloodCultLeader
   priority: 11
   locationPreference: left
+  showTo:
+    components:
+      - ShowAntagIcons
+      - Construct
+      - BloodCultist
+      - BloodCultLeader
   icon:
     sprite: /Textures/WhiteDream/BloodCult/cult_hud.rsi
-    state: cult_leader
+    state: cult_leader
\ No newline at end of file

From 8bdbbcaad080d4a85539e06718c7180ee0217f58 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sat, 10 Aug 2024 11:14:58 -0400
Subject: [PATCH 083/366] Cursed Mask (#29659)

* Cursed Mask

* extra expressions

* block ingestion

* mind returning

* okay fix the removal shit
---
 .../Clothing/Systems/CursedMaskSystem.cs      |   6 ++
 .../Clothing/Systems/CursedMaskSystem.cs      |  92 ++++++++++++++++++
 .../Components/CursedMaskComponent.cs         |  65 +++++++++++++
 .../Clothing/SharedCursedMaskSystem.cs        |  73 ++++++++++++++
 .../Inventory/Events/UnequipAttemptEvent.cs   |   6 ++
 .../Inventory/SelfEquipOnlyComponent.cs       |  16 +++
 .../Inventory/SelfEquipOnlySystem.cs          |  45 +++++++++
 .../Systems/MovementSpeedModifierSystem.cs    |   5 +
 .../en-US/clothing/components/cursed-mask.ftl |   5 +
 .../Mask/goldenmask.rsi/equipped-MASK-vox.png | Bin 0 -> 453 bytes
 .../Mask/goldenmask.rsi/equipped-MASK.png     | Bin 0 -> 401 bytes
 .../Mask/goldenmask.rsi/icon-anger.png        | Bin 0 -> 422 bytes
 .../Mask/goldenmask.rsi/icon-despair.png      | Bin 0 -> 414 bytes
 .../Clothing/Mask/goldenmask.rsi/icon-joy.png | Bin 0 -> 414 bytes
 .../Clothing/Mask/goldenmask.rsi/icon.png     | Bin 0 -> 402 bytes
 .../Mask/goldenmask.rsi/inhand-left.png       | Bin 0 -> 360 bytes
 .../Mask/goldenmask.rsi/inhand-right.png      | Bin 0 -> 353 bytes
 .../Clothing/Mask/goldenmask.rsi/meta.json    |  39 ++++++++
 18 files changed, 352 insertions(+)
 create mode 100644 Content.Client/Clothing/Systems/CursedMaskSystem.cs
 create mode 100644 Content.Server/Clothing/Systems/CursedMaskSystem.cs
 create mode 100644 Content.Shared/Clothing/Components/CursedMaskComponent.cs
 create mode 100644 Content.Shared/Clothing/SharedCursedMaskSystem.cs
 create mode 100644 Content.Shared/Inventory/SelfEquipOnlyComponent.cs
 create mode 100644 Content.Shared/Inventory/SelfEquipOnlySystem.cs
 create mode 100644 Resources/Locale/en-US/clothing/components/cursed-mask.ftl
 create mode 100644 Resources/Textures/Clothing/Mask/goldenmask.rsi/equipped-MASK-vox.png
 create mode 100644 Resources/Textures/Clothing/Mask/goldenmask.rsi/equipped-MASK.png
 create mode 100644 Resources/Textures/Clothing/Mask/goldenmask.rsi/icon-anger.png
 create mode 100644 Resources/Textures/Clothing/Mask/goldenmask.rsi/icon-despair.png
 create mode 100644 Resources/Textures/Clothing/Mask/goldenmask.rsi/icon-joy.png
 create mode 100644 Resources/Textures/Clothing/Mask/goldenmask.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Mask/goldenmask.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Mask/goldenmask.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Mask/goldenmask.rsi/meta.json

diff --git a/Content.Client/Clothing/Systems/CursedMaskSystem.cs b/Content.Client/Clothing/Systems/CursedMaskSystem.cs
new file mode 100644
index 00000000000..bc931d15fd5
--- /dev/null
+++ b/Content.Client/Clothing/Systems/CursedMaskSystem.cs
@@ -0,0 +1,6 @@
+using Content.Shared.Clothing;
+
+namespace Content.Client.Clothing.Systems;
+
+/// <inheritdoc/>
+public sealed class CursedMaskSystem : SharedCursedMaskSystem;
diff --git a/Content.Server/Clothing/Systems/CursedMaskSystem.cs b/Content.Server/Clothing/Systems/CursedMaskSystem.cs
new file mode 100644
index 00000000000..2045ff5ccd6
--- /dev/null
+++ b/Content.Server/Clothing/Systems/CursedMaskSystem.cs
@@ -0,0 +1,92 @@
+using Content.Server.Administration.Logs;
+using Content.Server.GameTicking;
+using Content.Server.Mind;
+using Content.Server.NPC;
+using Content.Server.NPC.HTN;
+using Content.Server.NPC.Systems;
+using Content.Server.Popups;
+using Content.Shared.Clothing;
+using Content.Shared.Clothing.Components;
+using Content.Shared.Database;
+using Content.Shared.NPC.Components;
+using Content.Shared.NPC.Systems;
+using Content.Shared.Players;
+using Content.Shared.Popups;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Clothing.Systems;
+
+/// <inheritdoc/>
+public sealed class CursedMaskSystem : SharedCursedMaskSystem
+{
+    [Dependency] private readonly IAdminLogManager _adminLog = default!;
+    [Dependency] private readonly GameTicker _ticker = default!;
+    [Dependency] private readonly HTNSystem _htn = default!;
+    [Dependency] private readonly MindSystem _mind = default!;
+    [Dependency] private readonly NPCSystem _npc = default!;
+    [Dependency] private readonly NpcFactionSystem _npcFaction = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
+
+    // We can't store this info on the component easily
+    private static readonly ProtoId<HTNCompoundPrototype> TakeoverRootTask = "SimpleHostileCompound";
+
+    protected override void TryTakeover(Entity<CursedMaskComponent> ent, EntityUid wearer)
+    {
+        if (ent.Comp.CurrentState != CursedMaskExpression.Anger)
+            return;
+
+        if (TryComp<ActorComponent>(wearer, out var actor) && actor.PlayerSession.GetMind() is { } mind)
+        {
+            var session = actor.PlayerSession;
+            if (!_ticker.OnGhostAttempt(mind, false))
+                return;
+
+            ent.Comp.StolenMind = mind;
+
+            _popup.PopupEntity(Loc.GetString("cursed-mask-takeover-popup"), wearer, session, PopupType.LargeCaution);
+            _adminLog.Add(LogType.Action,
+                LogImpact.Extreme,
+                $"{ToPrettyString(wearer):player} had their body taken over and turned into an enemy through the cursed mask {ToPrettyString(ent):entity}");
+        }
+
+        var npcFaction = EnsureComp<NpcFactionMemberComponent>(wearer);
+        ent.Comp.OldFactions = npcFaction.Factions;
+        _npcFaction.ClearFactions((wearer, npcFaction), false);
+        _npcFaction.AddFaction((wearer, npcFaction), ent.Comp.CursedMaskFaction);
+
+        ent.Comp.HasNpc = !EnsureComp<HTNComponent>(wearer, out var htn);
+        htn.RootTask = new HTNCompoundTask { Task = TakeoverRootTask };
+        htn.Blackboard.SetValue(NPCBlackboard.Owner, wearer);
+        _npc.WakeNPC(wearer, htn);
+        _htn.Replan(htn);
+    }
+
+    protected override void OnClothingUnequip(Entity<CursedMaskComponent> ent, ref ClothingGotUnequippedEvent args)
+    {
+        // If we are taking off the cursed mask
+        if (ent.Comp.CurrentState == CursedMaskExpression.Anger)
+        {
+            if (ent.Comp.HasNpc)
+                RemComp<HTNComponent>(args.Wearer);
+
+            var npcFaction = EnsureComp<NpcFactionMemberComponent>(args.Wearer);
+            _npcFaction.RemoveFaction((args.Wearer, npcFaction), ent.Comp.CursedMaskFaction, false);
+            _npcFaction.AddFactions((args.Wearer, npcFaction), ent.Comp.OldFactions);
+
+            ent.Comp.HasNpc = false;
+            ent.Comp.OldFactions.Clear();
+
+            if (Exists(ent.Comp.StolenMind))
+            {
+                _mind.TransferTo(ent.Comp.StolenMind.Value, args.Wearer);
+                _adminLog.Add(LogType.Action,
+                    LogImpact.Extreme,
+                    $"{ToPrettyString(args.Wearer):player} was restored to their body after the removal of {ToPrettyString(ent):entity}.");
+                ent.Comp.StolenMind = null;
+            }
+        }
+
+        RandomizeCursedMask(ent, args.Wearer);
+    }
+}
diff --git a/Content.Shared/Clothing/Components/CursedMaskComponent.cs b/Content.Shared/Clothing/Components/CursedMaskComponent.cs
new file mode 100644
index 00000000000..6073bdf5fc5
--- /dev/null
+++ b/Content.Shared/Clothing/Components/CursedMaskComponent.cs
@@ -0,0 +1,65 @@
+using Content.Shared.Damage;
+using Content.Shared.NPC.Prototypes;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Clothing.Components;
+
+/// <summary>
+/// This is used for a mask that takes over the host when worn.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedCursedMaskSystem))]
+public sealed partial class CursedMaskComponent : Component
+{
+    /// <summary>
+    /// The current expression shown. Used to determine which effect is applied.
+    /// </summary>
+    [DataField]
+    public CursedMaskExpression CurrentState = CursedMaskExpression.Neutral;
+
+    /// <summary>
+    /// Speed modifier applied when the "Joy" expression is present.
+    /// </summary>
+    [DataField]
+    public float JoySpeedModifier = 1.15f;
+
+    /// <summary>
+    /// Damage modifier applied when the "Despair" expression is present.
+    /// </summary>
+    [DataField]
+    public DamageModifierSet DespairDamageModifier = new();
+
+    /// <summary>
+    /// Whether or not the mask is currently attached to an NPC.
+    /// </summary>
+    [DataField]
+    public bool HasNpc;
+
+    /// <summary>
+    /// The mind that was booted from the wearer when the mask took over.
+    /// </summary>
+    [DataField]
+    public EntityUid? StolenMind;
+
+    [DataField]
+    public ProtoId<NpcFactionPrototype> CursedMaskFaction = "SimpleHostile";
+
+    [DataField]
+    public HashSet<ProtoId<NpcFactionPrototype>> OldFactions = new();
+}
+
+[Serializable, NetSerializable]
+public enum CursedMaskVisuals : byte
+{
+     State
+}
+
+[Serializable, NetSerializable]
+public enum CursedMaskExpression : byte
+{
+    Neutral,
+    Joy,
+    Despair,
+    Anger
+}
diff --git a/Content.Shared/Clothing/SharedCursedMaskSystem.cs b/Content.Shared/Clothing/SharedCursedMaskSystem.cs
new file mode 100644
index 00000000000..8ba83be151c
--- /dev/null
+++ b/Content.Shared/Clothing/SharedCursedMaskSystem.cs
@@ -0,0 +1,73 @@
+using Content.Shared.Clothing.Components;
+using Content.Shared.Damage;
+using Content.Shared.Examine;
+using Content.Shared.Inventory;
+using Content.Shared.Movement.Systems;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Clothing;
+
+/// <summary>
+/// This handles <see cref="CursedMaskComponent"/>
+/// </summary>
+public abstract class SharedCursedMaskSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<CursedMaskComponent, ClothingGotEquippedEvent>(OnClothingEquip);
+        SubscribeLocalEvent<CursedMaskComponent, ClothingGotUnequippedEvent>(OnClothingUnequip);
+        SubscribeLocalEvent<CursedMaskComponent, ExaminedEvent>(OnExamine);
+
+        SubscribeLocalEvent<CursedMaskComponent, InventoryRelayedEvent<RefreshMovementSpeedModifiersEvent>>(OnMovementSpeedModifier);
+        SubscribeLocalEvent<CursedMaskComponent, InventoryRelayedEvent<DamageModifyEvent>>(OnModifyDamage);
+    }
+
+    private void OnClothingEquip(Entity<CursedMaskComponent> ent, ref ClothingGotEquippedEvent args)
+    {
+        RandomizeCursedMask(ent, args.Wearer);
+        TryTakeover(ent, args.Wearer);
+    }
+
+    protected virtual void OnClothingUnequip(Entity<CursedMaskComponent> ent, ref ClothingGotUnequippedEvent args)
+    {
+        RandomizeCursedMask(ent, args.Wearer);
+    }
+
+    private void OnExamine(Entity<CursedMaskComponent> ent, ref ExaminedEvent args)
+    {
+        args.PushMarkup(Loc.GetString($"cursed-mask-examine-{ent.Comp.CurrentState.ToString()}"));
+    }
+
+    private void OnMovementSpeedModifier(Entity<CursedMaskComponent> ent, ref InventoryRelayedEvent<RefreshMovementSpeedModifiersEvent> args)
+    {
+        if (ent.Comp.CurrentState == CursedMaskExpression.Joy)
+            args.Args.ModifySpeed(ent.Comp.JoySpeedModifier);
+    }
+
+    private void OnModifyDamage(Entity<CursedMaskComponent> ent, ref InventoryRelayedEvent<DamageModifyEvent> args)
+    {
+        if (ent.Comp.CurrentState == CursedMaskExpression.Despair)
+            args.Args.Damage = DamageSpecifier.ApplyModifierSet(args.Args.Damage, ent.Comp.DespairDamageModifier);
+    }
+
+    protected void RandomizeCursedMask(Entity<CursedMaskComponent> ent, EntityUid wearer)
+    {
+        var random = new System.Random((int) _timing.CurTick.Value);
+        ent.Comp.CurrentState = random.Pick(Enum.GetValues<CursedMaskExpression>());
+        _appearance.SetData(ent, CursedMaskVisuals.State, ent.Comp.CurrentState);
+        _movementSpeedModifier.RefreshMovementSpeedModifiers(wearer);
+    }
+
+    protected virtual void TryTakeover(Entity<CursedMaskComponent> ent, EntityUid wearer)
+    {
+
+    }
+}
diff --git a/Content.Shared/Inventory/Events/UnequipAttemptEvent.cs b/Content.Shared/Inventory/Events/UnequipAttemptEvent.cs
index d8d0a2a23b2..b647ee8e92b 100644
--- a/Content.Shared/Inventory/Events/UnequipAttemptEvent.cs
+++ b/Content.Shared/Inventory/Events/UnequipAttemptEvent.cs
@@ -17,6 +17,11 @@ public abstract class UnequipAttemptEventBase : CancellableEntityEventArgs
     /// </summary>
     public readonly EntityUid Equipment;
 
+    /// <summary>
+    /// The slotFlags of the slot this item is being removed from.
+    /// </summary>
+    public readonly SlotFlags SlotFlags;
+
     /// <summary>
     /// The slot the entity is being unequipped from.
     /// </summary>
@@ -33,6 +38,7 @@ public UnequipAttemptEventBase(EntityUid unequipee, EntityUid unEquipTarget, Ent
         UnEquipTarget = unEquipTarget;
         Equipment = equipment;
         Unequipee = unequipee;
+        SlotFlags = slotDefinition.SlotFlags;
         Slot = slotDefinition.Name;
     }
 }
diff --git a/Content.Shared/Inventory/SelfEquipOnlyComponent.cs b/Content.Shared/Inventory/SelfEquipOnlyComponent.cs
new file mode 100644
index 00000000000..ee1980ef8ad
--- /dev/null
+++ b/Content.Shared/Inventory/SelfEquipOnlyComponent.cs
@@ -0,0 +1,16 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Inventory;
+
+/// <summary>
+/// This is used for an item that can only be equipped/unequipped by the user.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(SelfEquipOnlySystem))]
+public sealed partial class SelfEquipOnlyComponent : Component
+{
+    /// <summary>
+    /// Whether or not the self-equip only condition requires the person to be conscious.
+    /// </summary>
+    [DataField]
+    public bool UnequipRequireConscious = true;
+}
diff --git a/Content.Shared/Inventory/SelfEquipOnlySystem.cs b/Content.Shared/Inventory/SelfEquipOnlySystem.cs
new file mode 100644
index 00000000000..2bd113e22b1
--- /dev/null
+++ b/Content.Shared/Inventory/SelfEquipOnlySystem.cs
@@ -0,0 +1,45 @@
+using Content.Shared.ActionBlocker;
+using Content.Shared.Clothing.Components;
+using Content.Shared.Inventory.Events;
+
+namespace Content.Shared.Inventory;
+
+public sealed class SelfEquipOnlySystem : EntitySystem
+{
+    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<SelfEquipOnlyComponent, BeingEquippedAttemptEvent>(OnBeingEquipped);
+        SubscribeLocalEvent<SelfEquipOnlyComponent, BeingUnequippedAttemptEvent>(OnBeingUnequipped);
+    }
+
+    private void OnBeingEquipped(Entity<SelfEquipOnlyComponent> ent, ref BeingEquippedAttemptEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        if (TryComp<ClothingComponent>(ent, out var clothing) && (clothing.Slots & args.SlotFlags) == SlotFlags.NONE)
+            return;
+
+        if (args.Equipee != args.EquipTarget)
+            args.Cancel();
+    }
+
+    private void OnBeingUnequipped(Entity<SelfEquipOnlyComponent> ent, ref BeingUnequippedAttemptEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        if (args.Unequipee == args.UnEquipTarget)
+            return;
+
+        if (TryComp<ClothingComponent>(ent, out var clothing) && (clothing.Slots & args.SlotFlags) == SlotFlags.NONE)
+            return;
+
+        if (ent.Comp.UnequipRequireConscious && !_actionBlocker.CanConsciouslyPerformAction(args.UnEquipTarget))
+            return;
+        args.Cancel();
+    }
+}
diff --git a/Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs b/Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs
index 67a238cf60f..d866d83d78d 100644
--- a/Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs
+++ b/Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs
@@ -88,5 +88,10 @@ public RefreshMovementSpeedModifiersEvent(bool isImmune = false)
         {
             IsImmune = isImmune;
         }
+
+        public void ModifySpeed(float mod)
+        {
+            ModifySpeed(mod, mod);
+        }
     }
 }
diff --git a/Resources/Locale/en-US/clothing/components/cursed-mask.ftl b/Resources/Locale/en-US/clothing/components/cursed-mask.ftl
new file mode 100644
index 00000000000..c93a6cfb87f
--- /dev/null
+++ b/Resources/Locale/en-US/clothing/components/cursed-mask.ftl
@@ -0,0 +1,5 @@
+cursed-mask-examine-Neutral = It depicts an entirely unremarkable visage.
+cursed-mask-examine-Joy = It depicts a face basking in joy.
+cursed-mask-examine-Despair = It depicts a face wraught with despair.
+cursed-mask-examine-Anger = It depicts a furious expression locked in rage.
+cursed-mask-takeover-popup = The mask seizes control over your body!
diff --git a/Resources/Textures/Clothing/Mask/goldenmask.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/goldenmask.rsi/equipped-MASK-vox.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b4db3d093f3ce403532aad2a62ec4e9f8ad84d7
GIT binary patch
literal 453
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z>pfi@Ln`LH
zz2)84Y{0{oU_9&hh6dO3mt8G_Bfi+^oM;kG6`OY2nP;&|nY-YB^@VH!!jD*1yb^HS
zcQbg+-oN^1+14^AUHn&muC?MgZ|U18Ik&8$S6UbO<@1dFMAH2Y{r1eAy7sodWxd)<
zF^PDaSBW>}`MKrg<5!+to+)=-`QP=Q#-5A<vDJIyCqH3mX<bqI;o8>hpBCC#6HS>P
zxtLVzouBtTd#WhI&ga|bZ}s9jU=SqCH2rC#2LC>Rf6qfBv|cyuU3{bTPUg=w8$Y}5
zd0f8#kHD^_(dBYLe?q`Lol8%`R(@Y|<V3#R#ssI`yjK}o4v1@<oGkS!jJKh{|L*=X
zdl$c$7q#{6N_K~!r%{eK%I+!g<{L40ln5`Ib~5}c!--#wbr1F=p46EjlVX2kt)szA
z#=@xUJWuX%-CntWt^e#Qw{SP#6T#M|)qmnT%T{<>bI;xC^X`;E&}P{}&-u?S>aHuX
ru9st2^tW}I4RhYkcQBVRF!=ms5dXPZm)qYlA0+7M>gTe~DWM4fti--h

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/goldenmask.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/goldenmask.rsi/equipped-MASK.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1353c49800fd1c34bbec12e444e800b915cf49e
GIT binary patch
literal 401
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zy**tVLn`LH
zy=7Q*SV5rm;c}mMi<?BO`nhY=Vt&|Yx-1l)$fSH*GCgUbX_wLe>lrQw59xWZdaN*K
zTe|mn{bsIPT9Vg3imNZ+h&%c9XXNeUQS$DkXPcM#FE!M#t=iVLf5~6-?(hRIb$0&S
zclPVfy{&l_F<<B3@@1`GyTc^BHjXhmuRW?e++j}9(c=^D1JUCY+bw2d`m-NQoijOU
z&$g-GA7?iAU-AlN*7MZ(W>vY;i1E_j_xbB5vjaT>0t*g_eP>yd6eiyv&6jlAaE+Hk
zPbI_l<0)$+j>b)GI3#~7ZVJ$8@;Sev<~9_CF9;RNQ~&>Wo)hn6Q33Up(mGXDe&#o1
zkMEBz33|sJqcth6G$Lx%`#HW}RTr}y(X5{mSL;*vvie?{m}kV)2BQU=)T96Mp5n5Y
o`~Sqnnh&|}*|+w=9P<B|c#Qt+1Z$yP${=@ny85}Sb4q9e01eovqyPW_

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/goldenmask.rsi/icon-anger.png b/Resources/Textures/Clothing/Mask/goldenmask.rsi/icon-anger.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e002cadcfec46f5efa09984b32af920b33c3b37
GIT binary patch
literal 422
zcmV;X0a^ZuP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$U`a$lR9J=WRy!7hAP^k#avuvUJWmQelNLFTg%qBM6l8TJd=?Umyyr9q#GL_V
z2*8CeVQ1KHzQ6rS$ms$?Gqp3US>x}1Dj-G_0tu7gE)@`h>Y(flt2(IK8vo;g5K<mE
zO+b#UR7{Zv%nImcCn2Nxs~|OCu>jqq+q_>YLhN3D*1mvHza$;m0shibaU$fi<?pz-
zl#rwVa=9@;|M(<Mi2{J>325!wF%hB^Xzhv-K|27d+sV!9+U>9lA@UrOCZv<jU+!i6
z9LxK3<5rD+r?x<R4)EFNCY%V~Cz-uiz@cy?dNpGKVGMZ$V@{8~%SEyH-_ZAi|15=Q
z3seV1apd6S2a#q=Ms|h8CTxej7!glTM@A9lLiqR;iZ2q&`1S)koPcBQrQ|^6jff)0
z_uM}zr6|4+(EgGT{tWpfhpM~W*u&BpzX^Mj4^vsq>dPdF*aTFNU$_7OFJ?WsQYw_3
QuK)l507*qoM6N<$g6~we=>Px#

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/goldenmask.rsi/icon-despair.png b/Resources/Textures/Clothing/Mask/goldenmask.rsi/icon-despair.png
new file mode 100644
index 0000000000000000000000000000000000000000..71bdd72fc6fe15a98498be51aa83c4dd9641188b
GIT binary patch
literal 414
zcmV;P0b%}$P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$SV=@dR9J=WRy(r8APihG?>;U_;q$!0K2uWUJZ@C@M7)Agka>IrI7Mc>Gnv>5
z(XPY_8@MnCx5174|8|y;j|)gu>NYsq^S_-cAV-t}3)A37D<B0k!?+F3%rLz<zQ+S8
zlsxb;0X4E#F-;zz9k5d%VWY)e&>FB=fSt<sGOiV&c5hsDEFcxvOh<J=+}fCwt4+n<
zBn2Tw0qk-jVEGNnYhd!{3$WJT=R~Ncz*?V-$?vQGNHQ6tJ&@N>G$EgKvT7pWvHV}l
zF`^@Jsrsq_32r4P1&-Sxw<tFqDd@IfN?(tz1(ahbM^ILubH2Q;jbiiDklQZDPky&T
zwFPE|;c;a0ScHrd`MBmFQa_CD>oFOR8qsk?bL)o%0KobTNx2)Td%3QLp*JEPJ-~ON
z2kj=LKpvk1(kEJUy~{loIC(GufxM;t-2$YDw}1}v3l{+359rLWDLe&DK>z>%07*qo
IM6N<$f=9Ek8UO$Q

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/goldenmask.rsi/icon-joy.png b/Resources/Textures/Clothing/Mask/goldenmask.rsi/icon-joy.png
new file mode 100644
index 0000000000000000000000000000000000000000..93d0e26ddd995f797956bdedadd6c3886a852472
GIT binary patch
literal 414
zcmV;P0b%}$P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$SV=@dR9J=WRxy%;FbrJZ<Uc8#g7;hjZ-OH4p@<4z<P?mKje~93A;rzGGa0ZT
z+LgVw08V^}Fe7~O|DU6Td|kj^rC~;pCH?GB0V$$As4xpIRsnl(9bA|ZTnE>h<NtVI
z4>=EfO+bmPR!o%#WC8qjBT=KpvtTt~wE%z3k2!7?VO|0yljXJY_^S6QaWRV9C!ShP
z%vHv59_O}cR)D%(1n7U?NmEer=?-|mj#DB`OW^&QOv!J<`eQPV$+D4`kTs#6bX>Iv
z@EG6U)tJaDajyEJ0ESMbCI!+Suo@7sE<r`|S|O$;!UqpmpK?Cmml{=dH{^Y;M0~A<
zX$f2hr`u7<V-Xw|S>u*AZJvSK05|sAp)}pMXDUq33Vq*_x2hWs)0Q;e<2>f~N@)Hf
zvNoo}1+WidQuc`zP2X~3kH7~Llh;gtvj7(HC!m4+#0da+0uW26unb2>O#lD@07*qo
IM6N<$g8zoFF#rGn

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/goldenmask.rsi/icon.png b/Resources/Textures/Clothing/Mask/goldenmask.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..1da86e3c821b218b25d19b67a700f505e9d9410b
GIT binary patch
literal 402
zcmV;D0d4+?P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$Oi4sRR9J=WR<W|eAP`&}|HlH0e2<0srdaqrDZC<Igaw}O<iT-}SU8iNaTFx%
z9@)JC*s&5}Mp*OwVJjhD7m%wo%m}oU|JzhRi6{paX2H=aAO|<Vg&DyOaJ_r{jt6qk
zJn%IEHL_MQO&*{H@TWf#Hd=ZLRs%K*@F#sN=dB{l?oF%K$XJ*q9n}Tt(aNeNaXK%@
znh;e0yPOEPUh<?&mJ@Tk1K!7RNrWi{-p9=t=P`aHInObeyav^T-09Nl9@GD|JeM=7
z_6p1?kkv3r$ph(n4YpTMh}#y=nPMm-D620yU;eH|vAGrVu}kNt<Sj4>a0492Q9{P>
zLnOs{OCvI$z<K=KjFuQRqSyDLuP>qbBJr3Iv=qF0f_dLnH=^EjNVJ=f%0|oiq=v4$
w+;m0Y9-oqrx3)dIFOw|dEue#Z#|{8^0z3MuXv#n8!~g&Q07*qoM6N<$f@_bkmjD0&

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/goldenmask.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/goldenmask.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ce2895a3976461d1346d46c0044f2d76a6e9cd1
GIT binary patch
literal 360
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zl{{S>Ln`LH
zz2%s7*g&B5q36rmT?OY;=6l9{v5AW4o|CaFpncZ_0h7uy?!Wd1H=25m1$}Tk&jU0D
z2t00f{X9{zZQiZZl9T^%$DPf8JL~!#zqI=A*{5>eZH+g4c6HC0o#LHUzoWYB_yy0_
z{bgQMc;9Qkd~8eg*S;6A-*_{^H@`faqy4v1`|r-!(yx65fudTQf11qP`ps7C{Anw@
z^J}YSTJ?KyyIofN{ptIwz54YvjAyDY7p}iySZWJ#0|Uc?(qlLGY4tnUJ>W=}NnQP!
zLuexZi8Lm+6`wh@Uiuv1NR@jSdUZ<pXN$|{L86~HHnB$7mz}k()cJQ}(=FAqom=Ni
zHeKAA>U)g+<%{X}gP#a4;S}8b`TU2I{0s+#?HE^fU)9Wcd2kxYK2KLamvv4FO#m{p
Bpb-E7

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/goldenmask.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/goldenmask.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba7133027623e415e20fb05a1efb229af3b12553
GIT binary patch
literal 353
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zr9E97Ln`LH
zy=5rWWFXM`aQWj}oedvc3YG;_$Z>1f1nNBM>sWMzQ{~K`_|$-#(?vIUr~r)s0*6Ug
zEPu{;y!6-9^8H~G&VIc9{amTvzsnyd{hfRL>iWrFuN#z=-sF`?|EIm)_g~@v2<1Jo
zjIHL1TJN72FWB#SHSkr8M7dti@90klJdZxR>$~@1*3VUwe*LRFbIjNJ@7_CY`@hZE
z6R)1+Yp~QmuIlgY*^|FNPid3Yt^IWA+b1T76Bq(k&8cRaw(8)&1_{gWJUXF|1wKFg
zCe-xiT;j=-PFts|E~;Ip>ls!b3Y6^0UT#x<#aQ9_yvD@0Q?@%_SvsZo{DB>1tEw)l
xpWK<A5b^s;N>&5w#_QSZ4@T!+`^TuzXnlL{nTISlL|H+$dAj<!taD0e0s!K{q;dcN

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/goldenmask.rsi/meta.json b/Resources/Textures/Clothing/Mask/goldenmask.rsi/meta.json
new file mode 100644
index 00000000000..62072e7107e
--- /dev/null
+++ b/Resources/Textures/Clothing/Mask/goldenmask.rsi/meta.json
@@ -0,0 +1,39 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/vgstation-coders/vgstation13/blob/HEAD/icons/obj/clothing/masks.dmi. Vox and Reptilian edits by EmoGarbage404 (Github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon-joy"
+    },
+    {
+      "name": "icon-despair"
+    },
+    {
+      "name": "icon-anger"
+    },
+    {
+      "name": "equipped-MASK",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-vox",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

From 4fea0c5e019a1f46f266cbf02875f5f4f794550d Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Mon, 18 Mar 2024 07:23:25 +0000
Subject: [PATCH 084/366] Move faction exception and everything it needs to
 shared (#25154)

* move faction prototype to shared

* move faction exception and member stuff to shared

* fix breaking changes for random stuff

* move pettable friend stuff to shared

* mostly fix

* final fixy

* dragonops

* final fixy II

* use querys and fix warpspeed fish (probably)

* fixer

* Rrrr!

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
---
 Content.Client/Entry/EntryPoint.cs            |   2 -
 .../Dragon/Components/DragonComponent.cs      |   8 +
 Content.Server/Dragon/DragonSystem.cs         |  10 +
 .../Components/PettableFriendComponent.cs     |  23 ---
 .../Friends/Systems/PettableFriendSystem.cs   |  50 -----
 .../Rules/Components/NukeopsRuleComponent.cs  |   2 +-
 .../Rules/Components/TraitorRuleComponent.cs  |   2 +-
 .../GameTicking/Rules/NukeopsRuleSystem.cs    |   6 +
 .../Rules/RevolutionaryRuleSystem.cs          |   4 +-
 .../GameTicking/Rules/TraitorRuleSystem.cs    |   5 +-
 .../FactionExceptionTrackerComponent.cs       |  16 --
 .../Components/NpcFactionMemberComponent.cs   |  36 ----
 .../NPC/Components/NpcFactionPrototype.cs     |  22 ---
 Content.Server/NPC/FactionData.cs             |  13 --
 .../NPC/Systems/NPCRetaliationSystem.cs       |  29 +--
 .../NPC/Systems/NPCSteeringSystem.Context.cs  |   2 +-
 .../NPC/Systems/NPCSteeringSystem.cs          |   2 +
 .../NPC/Systems/NPCUtilitySystem.cs           |   1 +
 .../NPC/Systems/NpcFactionSystem.Exception.cs | 130 -------------
 .../Zombies/ZombieSystem.Transform.cs         |   8 +-
 .../Components/PettableFriendComponent.cs     |  24 +++
 .../Friends/Systems/PettableFriendSystem.cs   |  62 ++++++
 .../Components/FactionExceptionComponent.cs   |  11 +-
 .../FactionExceptionTrackerComponent.cs       |  17 ++
 .../Components/NpcFactionMemberComponent.cs   |  28 +++
 .../NPC/Prototypes/NpcFactionPrototype.cs     |  32 ++++
 .../NPC/Systems/NpcFactionSystem.Exception.cs | 135 +++++++++++++
 .../NPC/Systems/NpcFactionSystem.cs           | 180 +++++++++---------
 28 files changed, 450 insertions(+), 410 deletions(-)
 delete mode 100644 Content.Server/Friends/Components/PettableFriendComponent.cs
 delete mode 100644 Content.Server/Friends/Systems/PettableFriendSystem.cs
 delete mode 100644 Content.Server/NPC/Components/FactionExceptionTrackerComponent.cs
 delete mode 100644 Content.Server/NPC/Components/NpcFactionMemberComponent.cs
 delete mode 100644 Content.Server/NPC/Components/NpcFactionPrototype.cs
 delete mode 100644 Content.Server/NPC/FactionData.cs
 delete mode 100644 Content.Server/NPC/Systems/NpcFactionSystem.Exception.cs
 create mode 100644 Content.Shared/Friends/Components/PettableFriendComponent.cs
 create mode 100644 Content.Shared/Friends/Systems/PettableFriendSystem.cs
 rename {Content.Server => Content.Shared}/NPC/Components/FactionExceptionComponent.cs (72%)
 create mode 100644 Content.Shared/NPC/Components/FactionExceptionTrackerComponent.cs
 create mode 100644 Content.Shared/NPC/Components/NpcFactionMemberComponent.cs
 create mode 100644 Content.Shared/NPC/Prototypes/NpcFactionPrototype.cs
 create mode 100644 Content.Shared/NPC/Systems/NpcFactionSystem.Exception.cs
 rename {Content.Server => Content.Shared}/NPC/Systems/NpcFactionSystem.cs (51%)

diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index bf5f021be3d..d53babcd664 100644
--- a/Content.Client/Entry/EntryPoint.cs
+++ b/Content.Client/Entry/EntryPoint.cs
@@ -102,12 +102,10 @@ public override void Init()
             _prototypeManager.RegisterIgnore("seed"); // Seeds prototypes are server-only.
             _prototypeManager.RegisterIgnore("objective");
             _prototypeManager.RegisterIgnore("holiday");
-            _prototypeManager.RegisterIgnore("aiFaction");
             _prototypeManager.RegisterIgnore("htnCompound");
             _prototypeManager.RegisterIgnore("htnPrimitive");
             _prototypeManager.RegisterIgnore("gameMap");
             _prototypeManager.RegisterIgnore("gameMapPool");
-            _prototypeManager.RegisterIgnore("npcFaction");
             _prototypeManager.RegisterIgnore("lobbyBackground");
             _prototypeManager.RegisterIgnore("gamePreset");
             _prototypeManager.RegisterIgnore("noiseChannel");
diff --git a/Content.Server/Dragon/Components/DragonComponent.cs b/Content.Server/Dragon/Components/DragonComponent.cs
index f403979a007..80461e156af 100644
--- a/Content.Server/Dragon/Components/DragonComponent.cs
+++ b/Content.Server/Dragon/Components/DragonComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.NPC.Prototypes;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
@@ -57,5 +58,12 @@ public sealed partial class DragonComponent : Component
             {
                 Params = AudioParams.Default.WithVolume(3f),
             };
+
+        /// <summary>
+        /// NPC faction to re-add after being zombified.
+        /// Prevents zombie dragon from being attacked by its own carp.
+        /// </summary>
+        [DataField]
+        public ProtoId<NpcFactionPrototype> Faction = "Dragon";
     }
 }
diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs
index 79e5c0a2a9c..26cdd876b88 100644
--- a/Content.Server/Dragon/DragonSystem.cs
+++ b/Content.Server/Dragon/DragonSystem.cs
@@ -10,7 +10,9 @@
 using Content.Shared.Mind.Components;
 using Content.Shared.Mobs;
 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;
@@ -22,6 +24,7 @@ public sealed partial class DragonSystem : EntitySystem
     [Dependency] private readonly CarpRiftsConditionSystem _carpRifts = default!;
     [Dependency] private readonly ITileDefinitionManager _tileDef = default!;
     [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!;
@@ -54,6 +57,7 @@ public override void Initialize()
         SubscribeLocalEvent<DragonComponent, RefreshMovementSpeedModifiersEvent>(OnDragonMove);
         SubscribeLocalEvent<DragonComponent, MobStateChangedEvent>(OnMobStateChanged);
         SubscribeLocalEvent<DragonComponent, GenericAntagCreatedEvent>(OnCreated);
+        SubscribeLocalEvent<DragonComponent, EntityZombifiedEvent>(OnZombified);
     }
 
     public override void Update(float frameTime)
@@ -201,6 +205,12 @@ private void OnCreated(EntityUid uid, DragonComponent comp, ref GenericAntagCrea
         }, mind);
     }
 
+    private void OnZombified(Entity<DragonComponent> ent, ref EntityZombifiedEvent args)
+    {
+        // prevent carp attacking zombie dragon
+        _faction.AddFaction(ent.Owner, ent.Comp.Faction);
+    }
+
     private void Roar(EntityUid uid, DragonComponent comp)
     {
         if (comp.SoundRoar != null)
diff --git a/Content.Server/Friends/Components/PettableFriendComponent.cs b/Content.Server/Friends/Components/PettableFriendComponent.cs
deleted file mode 100644
index fe68029a663..00000000000
--- a/Content.Server/Friends/Components/PettableFriendComponent.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Content.Server.Friends.Systems;
-
-namespace Content.Server.Friends.Components;
-
-/// <summary>
-/// Pet something to become friends with it (use in hand, press Z)
-/// Uses FactionExceptionComponent behind the scenes
-/// </summary>
-[RegisterComponent, Access(typeof(PettableFriendSystem))]
-public sealed partial class PettableFriendComponent : Component
-{
-    /// <summary>
-    /// Localized popup sent when petting for the first time
-    /// </summary>
-    [DataField("successString", required: true), ViewVariables(VVAccess.ReadWrite)]
-    public string SuccessString = string.Empty;
-
-    /// <summary>
-    /// Localized popup sent when petting multiple times
-    /// </summary>
-    [DataField("failureString", required: true), ViewVariables(VVAccess.ReadWrite)]
-    public string FailureString = string.Empty;
-}
diff --git a/Content.Server/Friends/Systems/PettableFriendSystem.cs b/Content.Server/Friends/Systems/PettableFriendSystem.cs
deleted file mode 100644
index 8f70c843e70..00000000000
--- a/Content.Server/Friends/Systems/PettableFriendSystem.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using Content.Server.Friends.Components;
-using Content.Server.NPC.Components;
-using Content.Server.NPC.Systems;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Popups;
-
-namespace Content.Server.Friends.Systems;
-
-public sealed class PettableFriendSystem : EntitySystem
-{
-    [Dependency] private readonly NpcFactionSystem _factionException = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<PettableFriendComponent, UseInHandEvent>(OnUseInHand);
-        SubscribeLocalEvent<PettableFriendComponent, GotRehydratedEvent>(OnRehydrated);
-    }
-
-    private void OnUseInHand(EntityUid uid, PettableFriendComponent comp, UseInHandEvent args)
-    {
-        var user = args.User;
-        if (args.Handled || !TryComp<FactionExceptionComponent>(uid, out var factionException))
-            return;
-
-        if (_factionException.IsIgnored(uid, user, factionException))
-        {
-            _popup.PopupEntity(Loc.GetString(comp.FailureString, ("target", uid)), user, user);
-            return;
-        }
-
-        // you have made a new friend :)
-        _popup.PopupEntity(Loc.GetString(comp.SuccessString, ("target", uid)), user, user);
-        _factionException.IgnoreEntity(uid, user, factionException);
-        args.Handled = true;
-    }
-
-    private void OnRehydrated(EntityUid uid, PettableFriendComponent _, ref GotRehydratedEvent args)
-    {
-        // can only pet before hydrating, after that the fish cannot be negotiated with
-        if (!TryComp<FactionExceptionComponent>(uid, out var comp))
-            return;
-
-        var targetComp = AddComp<FactionExceptionComponent>(args.Target);
-        _factionException.IgnoreEntities(args.Target, comp.Ignored, targetComp);
-    }
-}
diff --git a/Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs
index 7862b38e592..44bfbdffe0a 100644
--- a/Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs
@@ -1,7 +1,7 @@
 using Content.Server.Maps;
-using Content.Server.NPC.Components;
 using Content.Server.RoundEnd;
 using Content.Shared.Dataset;
+using Content.Shared.NPC.Prototypes;
 using Content.Shared.Roles;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
diff --git a/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs
index f98b97f8425..623da7a1745 100644
--- a/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs
@@ -1,5 +1,5 @@
-using Content.Server.NPC.Components;
 using Content.Shared.Dataset;
+using Content.Shared.NPC.Prototypes;
 using Content.Shared.FixedPoint;
 using Content.Shared.Random;
 using Content.Shared.Roles;
diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
index e390fb9c08d..5b20f16f680 100644
--- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -1,6 +1,10 @@
 using Content.Server.Antag;
 using Content.Server.Communications;
 using Content.Server.GameTicking.Rules.Components;
+using Content.Server.Ghost.Roles.Components;
+using Content.Server.Ghost.Roles.Events;
+using Content.Server.Humanoid;
+using Content.Server.Mind;
 using Content.Server.Nuke;
 using Content.Server.NukeOps;
 using Content.Server.Popups;
@@ -13,6 +17,8 @@
 using Content.Server.Store.Systems;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
+using Content.Shared.NPC.Components;
+using Content.Shared.NPC.Systems;
 using Content.Shared.Nuke;
 using Content.Shared.NukeOps;
 using Content.Shared.Store;
diff --git a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
index 29f69db14a2..c5f88ab6cf1 100644
--- a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
@@ -4,8 +4,6 @@
 using Content.Server.Flash;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Mind;
-using Content.Server.NPC.Components;
-using Content.Server.NPC.Systems;
 using Content.Server.Popups;
 using Content.Server.Revolutionary;
 using Content.Server.Revolutionary.Components;
@@ -23,6 +21,8 @@
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
+using Content.Shared.NPC.Prototypes;
+using Content.Shared.NPC.Systems;
 using Content.Shared.Revolutionary.Components;
 using Content.Shared.Stunnable;
 using Content.Shared.Zombies;
diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
index 3922bcbb538..fe46f6371bf 100644
--- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
@@ -1,7 +1,6 @@
 using Content.Server.Antag;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Mind;
-using Content.Server.NPC.Systems;
 using Content.Server.Objectives;
 using Content.Server.PDA.Ringer;
 using Content.Server.Roles;
@@ -9,7 +8,9 @@
 using Content.Shared.FixedPoint;
 using Content.Shared.GameTicking.Components;
 using Content.Shared.Mind;
-using Content.Shared.Mood;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.NPC.Systems;
+using Content.Shared.Objectives.Components;
 using Content.Shared.PDA;
 using Content.Shared.Roles;
 using Content.Shared.Roles.Jobs;
diff --git a/Content.Server/NPC/Components/FactionExceptionTrackerComponent.cs b/Content.Server/NPC/Components/FactionExceptionTrackerComponent.cs
deleted file mode 100644
index 804a61b456d..00000000000
--- a/Content.Server/NPC/Components/FactionExceptionTrackerComponent.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Server.NPC.Systems;
-
-namespace Content.Server.NPC.Components;
-
-/// <summary>
-/// This is used for tracking entities stored in <see cref="FactionExceptionComponent"/>
-/// </summary>
-[RegisterComponent, Access(typeof(NpcFactionSystem))]
-public sealed partial class FactionExceptionTrackerComponent : Component
-{
-    /// <summary>
-    /// entities with <see cref="FactionExceptionComponent"/> that are tracking this entity.
-    /// </summary>
-    [DataField("entities")]
-    public HashSet<EntityUid> Entities = new();
-}
diff --git a/Content.Server/NPC/Components/NpcFactionMemberComponent.cs b/Content.Server/NPC/Components/NpcFactionMemberComponent.cs
deleted file mode 100644
index f38d8cca0f4..00000000000
--- a/Content.Server/NPC/Components/NpcFactionMemberComponent.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Content.Server.NPC.Systems;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
-
-namespace Content.Server.NPC.Components
-{
-    [RegisterComponent]
-    public sealed partial class NpcFactionMemberComponent : Component
-    {
-        /// <summary>
-        /// Factions this entity is a part of.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite),
-         DataField("factions", customTypeSerializer:typeof(PrototypeIdHashSetSerializer<NpcFactionPrototype>))]
-        public HashSet<string> Factions = new();
-
-        /// <summary>
-        /// Cached friendly factions.
-        /// </summary>
-        [ViewVariables]
-        public readonly HashSet<string> FriendlyFactions = new();
-
-        /// <summary>
-        /// Cached hostile factions.
-        /// </summary>
-        [ViewVariables]
-        public readonly HashSet<string> HostileFactions = new();
-
-        // Nyano - Summary - Begin modified code block: support for specific entities to be friendly.
-        /// <summary>
-        /// Permanently friendly specific entities. Our summoner, etc.
-        /// Would like to separate. Could I do that by extending this method, maybe?
-        /// </summary>
-        public HashSet<EntityUid> ExceptionalFriendlies = new();
-        // Nyano - End modified code block.
-    }
-}
diff --git a/Content.Server/NPC/Components/NpcFactionPrototype.cs b/Content.Server/NPC/Components/NpcFactionPrototype.cs
deleted file mode 100644
index fe5774710af..00000000000
--- a/Content.Server/NPC/Components/NpcFactionPrototype.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
-
-namespace Content.Server.NPC.Components
-{
-    /// <summary>
-    /// Contains data about this faction's relations with other factions.
-    /// </summary>
-    [Prototype("npcFaction")]
-    public sealed partial class NpcFactionPrototype : IPrototype
-    {
-        [ViewVariables]
-        [IdDataField]
-        public string ID { get; private set; } = default!;
-
-        [ViewVariables(VVAccess.ReadWrite), DataField("friendly", customTypeSerializer:typeof(PrototypeIdListSerializer<NpcFactionPrototype>))]
-        public List<string> Friendly = new();
-
-        [ViewVariables(VVAccess.ReadWrite), DataField("hostile", customTypeSerializer:typeof(PrototypeIdListSerializer<NpcFactionPrototype>))]
-        public List<string> Hostile = new();
-    }
-}
diff --git a/Content.Server/NPC/FactionData.cs b/Content.Server/NPC/FactionData.cs
deleted file mode 100644
index b74150acc9d..00000000000
--- a/Content.Server/NPC/FactionData.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Content.Server.NPC;
-
-/// <summary>
-/// Cached data for the faction prototype. Can be modified at runtime.
-/// </summary>
-public sealed class FactionData
-{
-    [ViewVariables]
-    public HashSet<string> Friendly = new();
-
-    [ViewVariables]
-    public HashSet<string> Hostile = new();
-}
diff --git a/Content.Server/NPC/Systems/NPCRetaliationSystem.cs b/Content.Server/NPC/Systems/NPCRetaliationSystem.cs
index a855c9915a0..5ea69ee79af 100644
--- a/Content.Server/NPC/Systems/NPCRetaliationSystem.cs
+++ b/Content.Server/NPC/Systems/NPCRetaliationSystem.cs
@@ -1,7 +1,9 @@
-using Content.Server.NPC.Components;
+using Content.Server.NPC.Components;
 using Content.Shared.CombatMode;
 using Content.Shared.Damage;
 using Content.Shared.Mobs.Components;
+using Content.Shared.NPC.Components;
+using Content.Shared.NPC.Systems;
 using Robust.Shared.Collections;
 using Robust.Shared.Timing;
 
@@ -22,27 +24,24 @@ public override void Initialize()
         SubscribeLocalEvent<NPCRetaliationComponent, DisarmedEvent>(OnDisarmed);
     }
 
-    private void OnDamageChanged(EntityUid uid, NPCRetaliationComponent component, DamageChangedEvent args)
+    private void OnDamageChanged(Entity<NPCRetaliationComponent> ent, ref DamageChangedEvent args)
     {
         if (!args.DamageIncreased)
             return;
 
-        if (args.Origin is not { } origin)
+        if (args.Origin is not {} origin)
             return;
 
-        TryRetaliate(uid, origin, component);
+        TryRetaliate(ent, origin);
     }
 
-    private void OnDisarmed(EntityUid uid, NPCRetaliationComponent component, DisarmedEvent args)
+    private void OnDisarmed(Entity<NPCRetaliationComponent> ent, ref DisarmedEvent args)
     {
-        TryRetaliate(uid, args.Source, component);
+        TryRetaliate(ent, args.Source);
     }
 
-    public bool TryRetaliate(EntityUid uid, EntityUid target, NPCRetaliationComponent? component = null)
+    public bool TryRetaliate(Entity<NPCRetaliationComponent> ent, EntityUid target)
     {
-        if (!Resolve(uid, ref component))
-            return false;
-
         // don't retaliate against inanimate objects.
         if (!HasComp<MobStateComponent>(target))
             return false;
@@ -51,9 +50,9 @@ public bool TryRetaliate(EntityUid uid, EntityUid target, NPCRetaliationComponen
             && _npcFaction.IsEntityFriendly(uid, target))
             return false;
 
-        _npcFaction.AggroEntity(uid, target);
-        if (component.AttackMemoryLength is { } memoryLength)
-            component.AttackMemories[target] = _timing.CurTime + memoryLength;
+        _npcFaction.AggroEntity(ent.Owner, target);
+        if (ent.Comp.AttackMemoryLength is {} memoryLength)
+            ent.Comp.AttackMemories[target] = _timing.CurTime + memoryLength;
 
         return true;
     }
@@ -65,12 +64,14 @@ public override void Update(float frameTime)
         var query = EntityQueryEnumerator<NPCRetaliationComponent, FactionExceptionComponent>();
         while (query.MoveNext(out var uid, out var retaliationComponent, out var factionException))
         {
+            // TODO: can probably reuse this allocation and clear it
             foreach (var entity in new ValueList<EntityUid>(retaliationComponent.AttackMemories.Keys))
             {
                 if (!TerminatingOrDeleted(entity) && _timing.CurTime < retaliationComponent.AttackMemories[entity])
                     continue;
 
-                _npcFaction.DeAggroEntity(uid, entity, factionException);
+                _npcFaction.DeAggroEntity((uid, factionException), entity);
+                // TODO: should probably remove the AttackMemory, thats the whole point of the ValueList right??
             }
         }
     }
diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
index ce10d4f5d5e..5f871a6ecfa 100644
--- a/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
+++ b/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
@@ -582,7 +582,7 @@ private void Separation(
                 (mask & otherBody.CollisionLayer) == 0x0 &&
                 (layer & otherBody.CollisionMask) == 0x0 ||
                 !_factionQuery.TryGetComponent(ent, out var otherFaction) ||
-                !_npcFaction.IsEntityFriendly(uid, ent, ourFaction, otherFaction) ||
+                !_npcFaction.IsEntityFriendly((uid, ourFaction), (ent, otherFaction)) ||
                 // Use <= 0 so we ignore stationary friends in case.
                 Vector2.Dot(otherBody.LinearVelocity, ourVelocity) <= 0f)
             {
diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.cs
index 8729c9f7d8b..1be0a2f154c 100644
--- a/Content.Server/NPC/Systems/NPCSteeringSystem.cs
+++ b/Content.Server/NPC/Systems/NPCSteeringSystem.cs
@@ -13,6 +13,8 @@
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
 using Content.Shared.NPC;
+using Content.Shared.NPC.Components;
+using Content.Shared.NPC.Systems;
 using Content.Shared.NPC.Events;
 using Content.Shared.Physics;
 using Content.Shared.Weapons.Melee;
diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
index e0bcb68c1e2..4153262806a 100644
--- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs
+++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
@@ -12,6 +12,7 @@
 using Content.Shared.Hands.Components;
 using Content.Shared.Inventory;
 using Content.Shared.Mobs.Systems;
+using Content.Shared.NPC.Systems;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Tools.Systems;
diff --git a/Content.Server/NPC/Systems/NpcFactionSystem.Exception.cs b/Content.Server/NPC/Systems/NpcFactionSystem.Exception.cs
deleted file mode 100644
index acef9005ead..00000000000
--- a/Content.Server/NPC/Systems/NpcFactionSystem.Exception.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-using System.Linq;
-using Content.Server.NPC.Components;
-
-namespace Content.Server.NPC.Systems;
-
-/// <summary>
-/// Prevents an NPC from attacking some entities from an enemy faction.
-/// </summary>
-public sealed partial class NpcFactionSystem
-{
-    private EntityQuery<FactionExceptionComponent> _exceptionQuery;
-    private EntityQuery<FactionExceptionTrackerComponent> _trackerQuery;
-
-    public void InitializeException()
-    {
-        _exceptionQuery = GetEntityQuery<FactionExceptionComponent>();
-        _trackerQuery = GetEntityQuery<FactionExceptionTrackerComponent>();
-
-        SubscribeLocalEvent<FactionExceptionComponent, ComponentShutdown>(OnShutdown);
-        SubscribeLocalEvent<FactionExceptionTrackerComponent, ComponentShutdown>(OnTrackerShutdown);
-    }
-
-    private void OnShutdown(EntityUid uid, FactionExceptionComponent component, ComponentShutdown args)
-    {
-        foreach (var ent in component.Hostiles)
-        {
-            if (!_trackerQuery.TryGetComponent(ent, out var trackerComponent))
-                continue;
-            trackerComponent.Entities.Remove(uid);
-        }
-
-        foreach (var ent in component.Ignored)
-        {
-            if (!_trackerQuery.TryGetComponent(ent, out var trackerComponent))
-                continue;
-            trackerComponent.Entities.Remove(uid);
-        }
-    }
-
-    private void OnTrackerShutdown(EntityUid uid, FactionExceptionTrackerComponent component, ComponentShutdown args)
-    {
-        foreach (var ent in component.Entities)
-        {
-            if (!_exceptionQuery.TryGetComponent(ent, out var exceptionComponent))
-                continue;
-            exceptionComponent.Ignored.Remove(uid);
-            exceptionComponent.Hostiles.Remove(uid);
-        }
-    }
-
-    /// <summary>
-    /// Returns whether the entity from an enemy faction won't be attacked
-    /// </summary>
-    public bool IsIgnored(EntityUid uid, EntityUid target, FactionExceptionComponent? comp = null)
-    {
-        if (!Resolve(uid, ref comp, false))
-            return false;
-
-        return comp.Ignored.Contains(target);
-    }
-
-    /// <summary>
-    /// Returns the specific hostile entities for a given entity.
-    /// </summary>
-    public IEnumerable<EntityUid> GetHostiles(EntityUid uid, FactionExceptionComponent? comp = null)
-    {
-        if (!Resolve(uid, ref comp, false))
-            return Array.Empty<EntityUid>();
-
-        return comp.Hostiles;
-    }
-
-    /// <summary>
-    /// Prevents an entity from an enemy faction from being attacked
-    /// </summary>
-    public void IgnoreEntity(EntityUid uid, EntityUid target, FactionExceptionComponent? comp = null)
-    {
-        comp ??= EnsureComp<FactionExceptionComponent>(uid);
-        comp.Ignored.Add(target);
-        EnsureComp<FactionExceptionTrackerComponent>(target).Entities.Add(uid);
-    }
-
-    /// <summary>
-    /// Prevents a list of entities from an enemy faction from being attacked
-    /// </summary>
-    public void IgnoreEntities(EntityUid uid, IEnumerable<EntityUid> ignored, FactionExceptionComponent? comp = null)
-    {
-        comp ??= EnsureComp<FactionExceptionComponent>(uid);
-        foreach (var ignore in ignored)
-        {
-            IgnoreEntity(uid, ignore, comp);
-        }
-    }
-
-    /// <summary>
-    /// Makes an entity always be considered hostile.
-    /// </summary>
-    public void AggroEntity(EntityUid uid, EntityUid target, FactionExceptionComponent? comp = null)
-    {
-        comp ??= EnsureComp<FactionExceptionComponent>(uid);
-        comp.Hostiles.Add(target);
-        EnsureComp<FactionExceptionTrackerComponent>(target).Entities.Add(uid);
-    }
-
-    /// <summary>
-    /// Makes an entity no longer be considered hostile, if it was.
-    /// Doesn't apply to regular faction hostilities.
-    /// </summary>
-    public void DeAggroEntity(EntityUid uid, EntityUid target, FactionExceptionComponent? comp = null)
-    {
-        if (!Resolve(uid, ref comp, false))
-            return;
-        if (!comp.Hostiles.Remove(target) || !_trackerQuery.TryGetComponent(target, out var tracker))
-            return;
-        tracker.Entities.Remove(uid);
-    }
-
-    /// <summary>
-    /// Makes a list of entities no longer be considered hostile, if it was.
-    /// Doesn't apply to regular faction hostilities.
-    /// </summary>
-    public void AggroEntities(EntityUid uid, IEnumerable<EntityUid> entities, FactionExceptionComponent? comp = null)
-    {
-        comp ??= EnsureComp<FactionExceptionComponent>(uid);
-        foreach (var ent in entities)
-        {
-            AggroEntity(uid, ent, comp);
-        }
-    }
-}
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index 99ca5be7343..2ddff91d40b 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -28,6 +28,8 @@
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Movement.Systems;
+using Content.Shared.NPC.Components;
+using Content.Shared.NPC.Systems;
 using Content.Shared.Nutrition.AnimalHusbandry;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Popups;
@@ -224,11 +226,7 @@ public void ZombifyEntity(EntityUid target, MobStateComponent? mobState = null)
                 _damageable.SetAllDamage(target, damageablecomp, 0);
             _mobState.ChangeMobState(target, MobState.Alive);
 
-            var factionComp = EnsureComp<NpcFactionMemberComponent>(target);
-            foreach (var id in new List<string>(factionComp.Factions))
-            {
-                _faction.RemoveFaction(target, id);
-            }
+            _faction.ClearFactions(target, dirty: false);
             _faction.AddFaction(target, "Zombie");
 
             //gives it the funny "Zombie ___" name.
diff --git a/Content.Shared/Friends/Components/PettableFriendComponent.cs b/Content.Shared/Friends/Components/PettableFriendComponent.cs
new file mode 100644
index 00000000000..d05e1769aec
--- /dev/null
+++ b/Content.Shared/Friends/Components/PettableFriendComponent.cs
@@ -0,0 +1,24 @@
+using Content.Shared.Friends.Systems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Friends.Components;
+
+/// <summary>
+/// Pet something to become friends with it (use in hand, press Z)
+/// Requires this entity to have FactionExceptionComponent to work.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(PettableFriendSystem))]
+public sealed partial class PettableFriendComponent : Component
+{
+    /// <summary>
+    /// Localized popup sent when petting for the first time
+    /// </summary>
+    [DataField(required: true)]
+    public LocId SuccessString = string.Empty;
+
+    /// <summary>
+    /// Localized popup sent when petting multiple times
+    /// </summary>
+    [DataField(required: true)]
+    public LocId FailureString = string.Empty;
+}
diff --git a/Content.Shared/Friends/Systems/PettableFriendSystem.cs b/Content.Shared/Friends/Systems/PettableFriendSystem.cs
new file mode 100644
index 00000000000..00a4ddd155c
--- /dev/null
+++ b/Content.Shared/Friends/Systems/PettableFriendSystem.cs
@@ -0,0 +1,62 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Friends.Components;
+using Content.Shared.Interaction.Events;
+using Content.Shared.NPC.Components;
+using Content.Shared.NPC.Systems;
+using Content.Shared.Popups;
+using Content.Shared.Timing;
+
+namespace Content.Shared.Friends.Systems;
+
+public sealed class PettableFriendSystem : EntitySystem
+{
+    [Dependency] private readonly NpcFactionSystem _factionException = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly UseDelaySystem _useDelay = default!;
+
+    private EntityQuery<FactionExceptionComponent> _exceptionQuery;
+    private EntityQuery<UseDelayComponent> _useDelayQuery;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _exceptionQuery = GetEntityQuery<FactionExceptionComponent>();
+        _useDelayQuery = GetEntityQuery<UseDelayComponent>();
+
+        SubscribeLocalEvent<PettableFriendComponent, UseInHandEvent>(OnUseInHand);
+        SubscribeLocalEvent<PettableFriendComponent, GotRehydratedEvent>(OnRehydrated);
+    }
+
+    private void OnUseInHand(Entity<PettableFriendComponent> ent, ref UseInHandEvent args)
+    {
+        var (uid, comp) = ent;
+        var user = args.User;
+        if (args.Handled || !_exceptionQuery.TryGetComponent(uid, out var exceptionComp))
+            return;
+
+        if (_useDelayQuery.TryGetComponent(uid, out var useDelay) && !_useDelay.TryResetDelay((uid, useDelay), true))
+            return;
+
+        var exception = (uid, exceptionComp);
+        if (_factionException.IsIgnored(exception, user))
+        {
+            _popup.PopupClient(Loc.GetString(comp.FailureString, ("target", uid)), user, user);
+            return;
+        }
+
+        // you have made a new friend :)
+        _popup.PopupClient(Loc.GetString(comp.SuccessString, ("target", uid)), user, user);
+        _factionException.IgnoreEntity(exception, user);
+        args.Handled = true;
+    }
+
+    private void OnRehydrated(Entity<PettableFriendComponent> ent, ref GotRehydratedEvent args)
+    {
+        // can only pet before hydrating, after that the fish cannot be negotiated with
+        if (!TryComp<FactionExceptionComponent>(ent, out var comp))
+            return;
+
+        _factionException.IgnoreEntities(args.Target, comp.Ignored);
+    }
+}
diff --git a/Content.Server/NPC/Components/FactionExceptionComponent.cs b/Content.Shared/NPC/Components/FactionExceptionComponent.cs
similarity index 72%
rename from Content.Server/NPC/Components/FactionExceptionComponent.cs
rename to Content.Shared/NPC/Components/FactionExceptionComponent.cs
index 6abd503537c..54de0404c2f 100644
--- a/Content.Server/NPC/Components/FactionExceptionComponent.cs
+++ b/Content.Shared/NPC/Components/FactionExceptionComponent.cs
@@ -1,23 +1,24 @@
-using Content.Server.NPC.Systems;
+using Content.Shared.NPC.Systems;
+using Robust.Shared.GameStates;
 
-namespace Content.Server.NPC.Components;
+namespace Content.Shared.NPC.Components;
 
 /// <summary>
 /// Prevents an NPC from attacking ignored entities from enemy factions.
 /// Can be added to if pettable, see PettableFriendComponent.
 /// </summary>
-[RegisterComponent, Access(typeof(NpcFactionSystem))]
+[RegisterComponent, NetworkedComponent, Access(typeof(NpcFactionSystem))]
 public sealed partial class FactionExceptionComponent : Component
 {
     /// <summary>
     /// Collection of entities that this NPC will refuse to attack
     /// </summary>
-    [DataField("ignored")]
+    [DataField]
     public HashSet<EntityUid> Ignored = new();
 
     /// <summary>
     /// Collection of entities that this NPC will attack, regardless of faction.
     /// </summary>
-    [DataField("hostiles")]
+    [DataField]
     public HashSet<EntityUid> Hostiles = new();
 }
diff --git a/Content.Shared/NPC/Components/FactionExceptionTrackerComponent.cs b/Content.Shared/NPC/Components/FactionExceptionTrackerComponent.cs
new file mode 100644
index 00000000000..f6eded7371b
--- /dev/null
+++ b/Content.Shared/NPC/Components/FactionExceptionTrackerComponent.cs
@@ -0,0 +1,17 @@
+using Content.Shared.NPC.Systems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.NPC.Components;
+
+/// <summary>
+/// This is used for tracking entities stored in <see cref="FactionExceptionComponent"/>.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(NpcFactionSystem))]
+public sealed partial class FactionExceptionTrackerComponent : Component
+{
+    /// <summary>
+    /// Entities with <see cref="FactionExceptionComponent"/> that are tracking this entity.
+    /// </summary>
+    [DataField]
+    public HashSet<EntityUid> Entities = new();
+}
diff --git a/Content.Shared/NPC/Components/NpcFactionMemberComponent.cs b/Content.Shared/NPC/Components/NpcFactionMemberComponent.cs
new file mode 100644
index 00000000000..91521e98545
--- /dev/null
+++ b/Content.Shared/NPC/Components/NpcFactionMemberComponent.cs
@@ -0,0 +1,28 @@
+using Content.Shared.NPC.Prototypes;
+using Content.Shared.NPC.Systems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.NPC.Components;
+
+[RegisterComponent, NetworkedComponent, Access(typeof(NpcFactionSystem))]
+public sealed partial class NpcFactionMemberComponent : Component
+{
+    /// <summary>
+    /// Factions this entity is a part of.
+    /// </summary>
+    [DataField]
+    public HashSet<ProtoId<NpcFactionPrototype>> Factions = new();
+
+    /// <summary>
+    /// Cached friendly factions.
+    /// </summary>
+    [ViewVariables]
+    public readonly HashSet<ProtoId<NpcFactionPrototype>> FriendlyFactions = new();
+
+    /// <summary>
+    /// Cached hostile factions.
+    /// </summary>
+    [ViewVariables]
+    public readonly HashSet<ProtoId<NpcFactionPrototype>> HostileFactions = new();
+}
diff --git a/Content.Shared/NPC/Prototypes/NpcFactionPrototype.cs b/Content.Shared/NPC/Prototypes/NpcFactionPrototype.cs
new file mode 100644
index 00000000000..1dcdd751c88
--- /dev/null
+++ b/Content.Shared/NPC/Prototypes/NpcFactionPrototype.cs
@@ -0,0 +1,32 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.NPC.Prototypes;
+
+/// <summary>
+/// Contains data about this faction's relations with other factions.
+/// </summary>
+[Prototype("npcFaction")]
+public sealed partial class NpcFactionPrototype : IPrototype
+{
+    [ViewVariables]
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    [DataField]
+    public List<ProtoId<NpcFactionPrototype>> Friendly = new();
+
+    [DataField]
+    public List<ProtoId<NpcFactionPrototype>> Hostile = new();
+}
+
+/// <summary>
+/// Cached data for the faction prototype. Is modified at runtime, whereas the prototype is not.
+/// </summary>
+public record struct FactionData
+{
+    [ViewVariables]
+    public HashSet<ProtoId<NpcFactionPrototype>> Friendly;
+
+    [ViewVariables]
+    public HashSet<ProtoId<NpcFactionPrototype>> Hostile;
+}
diff --git a/Content.Shared/NPC/Systems/NpcFactionSystem.Exception.cs b/Content.Shared/NPC/Systems/NpcFactionSystem.Exception.cs
new file mode 100644
index 00000000000..e69f0c2f7ad
--- /dev/null
+++ b/Content.Shared/NPC/Systems/NpcFactionSystem.Exception.cs
@@ -0,0 +1,135 @@
+using Content.Shared.NPC.Components;
+using System.Linq;
+
+namespace Content.Shared.NPC.Systems;
+
+/// <summary>
+/// Prevents an NPC from attacking some entities from an enemy faction.
+/// Also makes it attack some entities even if they are in neutral factions (retaliation).
+/// </summary>
+public sealed partial class NpcFactionSystem
+{
+    private EntityQuery<FactionExceptionComponent> _exceptionQuery;
+    private EntityQuery<FactionExceptionTrackerComponent> _trackerQuery;
+
+    public void InitializeException()
+    {
+        _exceptionQuery = GetEntityQuery<FactionExceptionComponent>();
+        _trackerQuery = GetEntityQuery<FactionExceptionTrackerComponent>();
+
+        SubscribeLocalEvent<FactionExceptionComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<FactionExceptionTrackerComponent, ComponentShutdown>(OnTrackerShutdown);
+    }
+
+    private void OnShutdown(Entity<FactionExceptionComponent> ent, ref ComponentShutdown args)
+    {
+        foreach (var uid in ent.Comp.Hostiles)
+        {
+            if (_trackerQuery.TryGetComponent(uid, out var tracker))
+                tracker.Entities.Remove(ent);
+        }
+
+        foreach (var uid in ent.Comp.Ignored)
+        {
+            if (_trackerQuery.TryGetComponent(uid, out var tracker))
+                tracker.Entities.Remove(ent);
+        }
+    }
+
+    private void OnTrackerShutdown(Entity<FactionExceptionTrackerComponent> ent, ref ComponentShutdown args)
+    {
+        foreach (var uid in ent.Comp.Entities)
+        {
+            if (!_exceptionQuery.TryGetComponent(uid, out var exception))
+                continue;
+
+            exception.Ignored.Remove(ent);
+            exception.Hostiles.Remove(ent);
+        }
+    }
+
+    /// <summary>
+    /// Returns whether the entity from an enemy faction won't be attacked
+    /// </summary>
+    public bool IsIgnored(Entity<FactionExceptionComponent?> ent, EntityUid target)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return false;
+
+        return ent.Comp.Ignored.Contains(target);
+    }
+
+    /// <summary>
+    /// Returns the specific hostile entities for a given entity.
+    /// </summary>
+    public IEnumerable<EntityUid> GetHostiles(Entity<FactionExceptionComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return Array.Empty<EntityUid>();
+
+        // evil c#
+        return ent.Comp!.Hostiles;
+    }
+
+    /// <summary>
+    /// Prevents an entity from an enemy faction from being attacked
+    /// </summary>
+    public void IgnoreEntity(Entity<FactionExceptionComponent?> ent, Entity<FactionExceptionTrackerComponent?> target)
+    {
+        ent.Comp ??= EnsureComp<FactionExceptionComponent>(ent);
+        ent.Comp.Ignored.Add(target);
+        target.Comp ??= EnsureComp<FactionExceptionTrackerComponent>(target);
+        target.Comp.Entities.Add(ent);
+    }
+
+    /// <summary>
+    /// Prevents a list of entities from an enemy faction from being attacked
+    /// </summary>
+    public void IgnoreEntities(Entity<FactionExceptionComponent?> ent, IEnumerable<EntityUid> ignored)
+    {
+        ent.Comp ??= EnsureComp<FactionExceptionComponent>(ent);
+        foreach (var ignore in ignored)
+        {
+            IgnoreEntity(ent, ignore);
+        }
+    }
+
+    /// <summary>
+    /// Makes an entity always be considered hostile.
+    /// </summary>
+    public void AggroEntity(Entity<FactionExceptionComponent?> ent, Entity<FactionExceptionTrackerComponent?> target)
+    {
+        ent.Comp ??= EnsureComp<FactionExceptionComponent>(ent);
+        ent.Comp.Hostiles.Add(target);
+        target.Comp ??= EnsureComp<FactionExceptionTrackerComponent>(target);
+        target.Comp.Entities.Add(ent);
+    }
+
+    /// <summary>
+    /// Makes an entity no longer be considered hostile, if it was.
+    /// Doesn't apply to regular faction hostilities.
+    /// </summary>
+    public void DeAggroEntity(Entity<FactionExceptionComponent?> ent, EntityUid target)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return;
+
+        if (!ent.Comp.Hostiles.Remove(target) || !_trackerQuery.TryGetComponent(target, out var tracker))
+            return;
+
+        tracker.Entities.Remove(ent);
+    }
+
+    /// <summary>
+    /// Makes a list of entities no longer be considered hostile, if it was.
+    /// Doesn't apply to regular faction hostilities.
+    /// </summary>
+    public void AggroEntities(Entity<FactionExceptionComponent?> ent, IEnumerable<EntityUid> entities)
+    {
+        ent.Comp ??= EnsureComp<FactionExceptionComponent>(ent);
+        foreach (var uid in entities)
+        {
+            AggroEntity(ent, uid);
+        }
+    }
+}
diff --git a/Content.Server/NPC/Systems/NpcFactionSystem.cs b/Content.Shared/NPC/Systems/NpcFactionSystem.cs
similarity index 51%
rename from Content.Server/NPC/Systems/NpcFactionSystem.cs
rename to Content.Shared/NPC/Systems/NpcFactionSystem.cs
index a96067c5cf3..f0bb1945eb4 100644
--- a/Content.Server/NPC/Systems/NpcFactionSystem.cs
+++ b/Content.Shared/NPC/Systems/NpcFactionSystem.cs
@@ -1,10 +1,10 @@
+using Content.Shared.NPC.Components;
+using Content.Shared.NPC.Prototypes;
+using Robust.Shared.Prototypes;
 using System.Collections.Frozen;
 using System.Linq;
-using Content.Server.NPC.Components;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
 
-namespace Content.Server.NPC.Systems;
+namespace Content.Shared.NPC.Systems;
 
 /// <summary>
 ///     Outlines faction relationships with each other.
@@ -13,7 +13,8 @@ namespace Content.Server.NPC.Systems;
 public sealed partial class NpcFactionSystem : EntitySystem
 {
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
-    [Dependency] private readonly IPrototypeManager _protoManager = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly SharedTransformSystem _xform = default!;
 
     /// <summary>
     /// To avoid prototype mutability we store an intermediary data class that gets used instead.
@@ -37,122 +38,126 @@ private void OnProtoReload(PrototypesReloadedEventArgs obj)
             RefreshFactions();
     }
 
-    private void OnFactionStartup(EntityUid uid, NpcFactionMemberComponent memberComponent, ComponentStartup args)
+    private void OnFactionStartup(Entity<NpcFactionMemberComponent> ent, ref ComponentStartup args)
     {
-        RefreshFactions(memberComponent);
+        RefreshFactions(ent);
     }
 
     /// <summary>
     /// Refreshes the cached factions for this component.
     /// </summary>
-    private void RefreshFactions(NpcFactionMemberComponent memberComponent)
+    private void RefreshFactions(Entity<NpcFactionMemberComponent> ent)
     {
-        memberComponent.FriendlyFactions.Clear();
-        memberComponent.HostileFactions.Clear();
+        ent.Comp.FriendlyFactions.Clear();
+        ent.Comp.HostileFactions.Clear();
 
-        foreach (var faction in memberComponent.Factions)
+        foreach (var faction in ent.Comp.Factions)
         {
-            // YAML Linter already yells about this
+            // YAML Linter already yells about this, don't need to log an error here
             if (!_factions.TryGetValue(faction, out var factionData))
                 continue;
 
-            memberComponent.FriendlyFactions.UnionWith(factionData.Friendly);
-            memberComponent.HostileFactions.UnionWith(factionData.Hostile);
+            ent.Comp.FriendlyFactions.UnionWith(factionData.Friendly);
+            ent.Comp.HostileFactions.UnionWith(factionData.Hostile);
         }
     }
 
+    /// <summary>
+    /// Returns whether an entity is a member of a faction.
+    /// </summary>
+    public bool IsMember(Entity<NpcFactionMemberComponent?> ent, string faction)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return false;
+
+        return ent.Comp.Factions.Contains(faction);
+    }
+
     /// <summary>
     /// Adds this entity to the particular faction.
     /// </summary>
-    public void AddFaction(EntityUid uid, string faction, bool dirty = true)
+    public void AddFaction(Entity<NpcFactionMemberComponent?> ent, string faction, bool dirty = true)
     {
-        if (!_protoManager.HasIndex<NpcFactionPrototype>(faction))
+        if (!_proto.HasIndex<NpcFactionPrototype>(faction))
         {
             Log.Error($"Unable to find faction {faction}");
             return;
         }
 
-        var comp = EnsureComp<NpcFactionMemberComponent>(uid);
-        if (!comp.Factions.Add(faction))
+        ent.Comp ??= EnsureComp<NpcFactionMemberComponent>(ent);
+        if (!ent.Comp.Factions.Add(faction))
             return;
 
         if (dirty)
-        {
-            RefreshFactions(comp);
-        }
+            RefreshFactions((ent, ent.Comp));
     }
 
     /// <summary>
     /// Removes this entity from the particular faction.
     /// </summary>
-    public void RemoveFaction(EntityUid uid, string faction, bool dirty = true)
+    public void RemoveFaction(Entity<NpcFactionMemberComponent?> ent, string faction, bool dirty = true)
     {
-        if (!_protoManager.HasIndex<NpcFactionPrototype>(faction))
+        if (!_proto.HasIndex<NpcFactionPrototype>(faction))
         {
             Log.Error($"Unable to find faction {faction}");
             return;
         }
 
-        if (!TryComp<NpcFactionMemberComponent>(uid, out var component))
+        if (!Resolve(ent, ref ent.Comp, false))
             return;
 
-        if (!component.Factions.Remove(faction))
+        if (!ent.Comp.Factions.Remove(faction))
             return;
 
         if (dirty)
-        {
-            RefreshFactions(component);
-        }
+            RefreshFactions((ent, ent.Comp));
     }
 
     /// <summary>
     /// Remove this entity from all factions.
     /// </summary>
-    public void ClearFactions(EntityUid uid, bool dirty = true)
+    public void ClearFactions(Entity<NpcFactionMemberComponent?> ent, bool dirty = true)
     {
-        if (!TryComp<NpcFactionMemberComponent>(uid, out var component))
+        if (!Resolve(ent, ref ent.Comp, false))
             return;
 
-        component.Factions.Clear();
+        ent.Comp.Factions.Clear();
 
         if (dirty)
-            RefreshFactions(component);
+            RefreshFactions((ent, ent.Comp));
     }
 
-    public IEnumerable<EntityUid> GetNearbyHostiles(EntityUid entity, float range, NpcFactionMemberComponent? component = null)
+    public IEnumerable<EntityUid> GetNearbyHostiles(Entity<NpcFactionMemberComponent?, FactionExceptionComponent?> ent, float range)
     {
-        if (!Resolve(entity, ref component, false))
+        if (!Resolve(ent, ref ent.Comp1, false))
             return Array.Empty<EntityUid>();
 
-        var hostiles = GetNearbyFactions(entity, range, component.HostileFactions);
-        if (TryComp<FactionExceptionComponent>(entity, out var factionException))
-        {
-            // ignore anything from enemy faction that we are explicitly friendly towards
-            return hostiles
-                .Union(GetHostiles(entity, factionException))
-                .Where(target => !IsIgnored(entity, target, factionException));
-        }
-
-        return hostiles;
+        var hostiles = GetNearbyFactions(ent, range, ent.Comp1.HostileFactions)
+            // ignore mobs that have both hostile faction and the same faction,
+            // otherwise having multiple factions is strictly negative
+            .Where(target => !IsEntityFriendly((ent, ent.Comp1), target));
+        if (!Resolve(ent, ref ent.Comp2, false))
+            return hostiles;
+
+        // ignore anything from enemy faction that we are explicitly friendly towards
+        var faction = (ent.Owner, ent.Comp2);
+        return hostiles
+            .Union(GetHostiles(faction))
+            .Where(target => !IsIgnored(faction, target));
     }
 
-    [PublicAPI]
-    public IEnumerable<EntityUid> GetNearbyFriendlies(EntityUid entity, float range, NpcFactionMemberComponent? component = null)
+    public IEnumerable<EntityUid> GetNearbyFriendlies(Entity<NpcFactionMemberComponent?> ent, float range)
     {
-        if (!Resolve(entity, ref component, false))
+        if (!Resolve(ent, ref ent.Comp, false))
             return Array.Empty<EntityUid>();
 
-        return GetNearbyFactions(entity, range, component.FriendlyFactions);
+        return GetNearbyFactions(ent, range, ent.Comp.FriendlyFactions);
     }
 
-    private IEnumerable<EntityUid> GetNearbyFactions(EntityUid entity, float range, HashSet<string> factions)
+    private IEnumerable<EntityUid> GetNearbyFactions(EntityUid entity, float range, HashSet<ProtoId<NpcFactionPrototype>> factions)
     {
-        var xformQuery = GetEntityQuery<TransformComponent>();
-
-        if (!xformQuery.TryGetComponent(entity, out var entityXform))
-            yield break;
-
-        foreach (var ent in _lookup.GetEntitiesInRange<NpcFactionMemberComponent>(entityXform.MapPosition, range))
+        var xform = Transform(entity);
+        foreach (var ent in _lookup.GetEntitiesInRange<NpcFactionMemberComponent>(_xform.GetMapCoordinates((entity, xform)), range))
         {
             if (ent.Owner == entity)
                 continue;
@@ -164,12 +169,15 @@ private IEnumerable<EntityUid> GetNearbyFactions(EntityUid entity, float range,
         }
     }
 
-    public bool IsEntityFriendly(EntityUid uidA, EntityUid uidB, NpcFactionMemberComponent? factionA = null, NpcFactionMemberComponent? factionB = null)
+    /// <remarks>
+    /// 1-way and purely faction based, ignores faction exception.
+    /// </remarks>
+    public bool IsEntityFriendly(Entity<NpcFactionMemberComponent?> ent, Entity<NpcFactionMemberComponent?> other)
     {
-        if (!Resolve(uidA, ref factionA, false) || !Resolve(uidB, ref factionB, false))
+        if (!Resolve(ent, ref ent.Comp, false) || !Resolve(other, ref other.Comp, false))
             return false;
 
-        return factionA.Factions.Overlaps(factionB.Factions) || factionA.FriendlyFactions.Overlaps(factionB.Factions);
+        return ent.Comp.Factions.Overlaps(other.Comp.Factions) || ent.Comp.FriendlyFactions.Overlaps(other.Comp.Factions);
     }
 
     public bool IsFactionFriendly(string target, string with)
@@ -177,13 +185,13 @@ public bool IsFactionFriendly(string target, string with)
         return _factions[target].Friendly.Contains(with) && _factions[with].Friendly.Contains(target);
     }
 
-    public bool IsFactionFriendly(string target, EntityUid with, NpcFactionMemberComponent? factionWith = null)
+    public bool IsFactionFriendly(string target, Entity<NpcFactionMemberComponent?> with)
     {
-        if (!Resolve(with, ref factionWith, false))
+        if (!Resolve(with, ref with.Comp, false))
             return false;
 
-        return factionWith.Factions.All(x => IsFactionFriendly(target, x)) ||
-               factionWith.FriendlyFactions.Contains(target);
+        return with.Comp.Factions.All(x => IsFactionFriendly(target, x)) ||
+               with.Comp.FriendlyFactions.Contains(target);
     }
 
     public bool IsFactionHostile(string target, string with)
@@ -191,13 +199,13 @@ public bool IsFactionHostile(string target, string with)
         return _factions[target].Hostile.Contains(with) && _factions[with].Hostile.Contains(target);
     }
 
-    public bool IsFactionHostile(string target, EntityUid with, NpcFactionMemberComponent? factionWith = null)
+    public bool IsFactionHostile(string target, Entity<NpcFactionMemberComponent?> with)
     {
-        if (!Resolve(with, ref factionWith, false))
+        if (!Resolve(with, ref with.Comp, false))
             return false;
 
-        return factionWith.Factions.All(x => IsFactionHostile(target, x)) ||
-               factionWith.HostileFactions.Contains(target);
+        return with.Comp.Factions.All(x => IsFactionHostile(target, x)) ||
+               with.Comp.HostileFactions.Contains(target);
     }
 
     public bool IsFactionNeutral(string target, string with)
@@ -227,26 +235,6 @@ public void MakeFriendly(string source, string target)
         RefreshFactions();
     }
 
-    private void RefreshFactions()
-    {
-
-        _factions = _protoManager.EnumeratePrototypes<NpcFactionPrototype>().ToFrozenDictionary(
-            faction => faction.ID,
-            faction =>  new FactionData
-            {
-                Friendly = faction.Friendly.ToHashSet(),
-                Hostile = faction.Hostile.ToHashSet()
-
-            });
-
-        foreach (var comp in EntityQuery<NpcFactionMemberComponent>(true))
-        {
-            comp.FriendlyFactions.Clear();
-            comp.HostileFactions.Clear();
-            RefreshFactions(comp);
-        }
-    }
-
     /// <summary>
     /// Makes the source faction hostile to the target faction, 1-way.
     /// </summary>
@@ -268,5 +256,23 @@ public void MakeHostile(string source, string target)
         sourceFaction.Hostile.Add(target);
         RefreshFactions();
     }
-}
 
+    private void RefreshFactions()
+    {
+        _factions = _proto.EnumeratePrototypes<NpcFactionPrototype>().ToFrozenDictionary(
+            faction => faction.ID,
+            faction =>  new FactionData
+            {
+                Friendly = faction.Friendly.ToHashSet(),
+                Hostile = faction.Hostile.ToHashSet()
+            });
+
+        var query = AllEntityQuery<NpcFactionMemberComponent>();
+        while (query.MoveNext(out var uid, out var comp))
+        {
+            comp.FriendlyFactions.Clear();
+            comp.HostileFactions.Clear();
+            RefreshFactions((uid, comp));
+        }
+    }
+}

From 0b0bfa8f00345706a7592521163eacf067ec9195 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 13:38:01 -0400
Subject: [PATCH 085/366] yeag

---
 .../NPC/Components/NpcFactionMemberComponent.cs           | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Content.Shared/NPC/Components/NpcFactionMemberComponent.cs b/Content.Shared/NPC/Components/NpcFactionMemberComponent.cs
index 91521e98545..188ece81ed7 100644
--- a/Content.Shared/NPC/Components/NpcFactionMemberComponent.cs
+++ b/Content.Shared/NPC/Components/NpcFactionMemberComponent.cs
@@ -25,4 +25,12 @@ public sealed partial class NpcFactionMemberComponent : Component
     /// </summary>
     [ViewVariables]
     public readonly HashSet<ProtoId<NpcFactionPrototype>> HostileFactions = new();
+
+    // Nyano - Summary - Begin modified code block: support for specific entities to be friendly.
+    /// <summary>
+    /// Permanently friendly specific entities. Our summoner, etc.
+    /// Would like to separate. Could I do that by extending this method, maybe?
+    /// </summary>
+    public HashSet<EntityUid> ExceptionalFriendlies = new();
+    // Nyano - End modified code block.
 }

From 3dec03bb73f3f64bc24f46502f93ee3308407b95 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 14:16:15 -0400
Subject: [PATCH 086/366] mostly fixes

---
 .../Components/Faction/ClothingAddFactionComponent.cs     | 3 ++-
 .../Nyanotrasen/NPC/Systems/FactionSystem.Core.cs         | 5 +++--
 .../Nyanotrasen/NPC/Systems/FactionSystem.Items.cs        | 8 +++++---
 Content.Shared/Store/StoreBuyFinishedEvent.cs             | 7 +++++++
 4 files changed, 17 insertions(+), 6 deletions(-)
 rename {Content.Server/Nyanotrasen/NPC/Systems => Content.Shared/Nyanotrasen/NPC}/Components/Faction/ClothingAddFactionComponent.cs (89%)
 rename {Content.Server => Content.Shared}/Nyanotrasen/NPC/Systems/FactionSystem.Core.cs (94%)
 rename {Content.Server => Content.Shared}/Nyanotrasen/NPC/Systems/FactionSystem.Items.cs (94%)
 create mode 100644 Content.Shared/Store/StoreBuyFinishedEvent.cs

diff --git a/Content.Server/Nyanotrasen/NPC/Systems/Components/Faction/ClothingAddFactionComponent.cs b/Content.Shared/Nyanotrasen/NPC/Components/Faction/ClothingAddFactionComponent.cs
similarity index 89%
rename from Content.Server/Nyanotrasen/NPC/Systems/Components/Faction/ClothingAddFactionComponent.cs
rename to Content.Shared/Nyanotrasen/NPC/Components/Faction/ClothingAddFactionComponent.cs
index ceff6c582df..94fcec8afce 100644
--- a/Content.Server/Nyanotrasen/NPC/Systems/Components/Faction/ClothingAddFactionComponent.cs
+++ b/Content.Shared/Nyanotrasen/NPC/Components/Faction/ClothingAddFactionComponent.cs
@@ -1,6 +1,7 @@
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.NPC.Components
+
+namespace Content.Shared.Nyanotrasen.NPC.Systems.Components.Faction
 {
     [RegisterComponent]
     /// <summary>
diff --git a/Content.Server/Nyanotrasen/NPC/Systems/FactionSystem.Core.cs b/Content.Shared/Nyanotrasen/NPC/Systems/FactionSystem.Core.cs
similarity index 94%
rename from Content.Server/Nyanotrasen/NPC/Systems/FactionSystem.Core.cs
rename to Content.Shared/Nyanotrasen/NPC/Systems/FactionSystem.Core.cs
index 3ce0ca73ebb..c6cf98a8852 100644
--- a/Content.Server/Nyanotrasen/NPC/Systems/FactionSystem.Core.cs
+++ b/Content.Shared/Nyanotrasen/NPC/Systems/FactionSystem.Core.cs
@@ -1,6 +1,7 @@
-using Content.Server.NPC.Components;
+using Content.Shared.NPC.Components;
 
-namespace Content.Server.NPC.Systems;
+
+namespace Content.Shared.Nyanotrasen.NPC.Systems;
 
 public partial class NpcFactionSystem : EntitySystem
 {
diff --git a/Content.Server/Nyanotrasen/NPC/Systems/FactionSystem.Items.cs b/Content.Shared/Nyanotrasen/NPC/Systems/FactionSystem.Items.cs
similarity index 94%
rename from Content.Server/Nyanotrasen/NPC/Systems/FactionSystem.Items.cs
rename to Content.Shared/Nyanotrasen/NPC/Systems/FactionSystem.Items.cs
index 8076484c8bb..b5a6ce3027a 100644
--- a/Content.Server/Nyanotrasen/NPC/Systems/FactionSystem.Items.cs
+++ b/Content.Shared/Nyanotrasen/NPC/Systems/FactionSystem.Items.cs
@@ -1,12 +1,14 @@
-using Content.Server.NPC.Components;
-using Content.Server.Store.Systems;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Inventory.Events;
+using Content.Shared.NPC.Components;
 
-namespace Content.Server.NPC.Systems;
+
+namespace Content.Shared.Nyanotrasen.NPC.Systems;
 
 public partial class NpcFactionSystem
 {
+
+
     public void InitializeItems()
     {
         SubscribeLocalEvent<NpcFactionMemberComponent, StoreBuyFinishedEvent>(OnStoreBuyFinished);
diff --git a/Content.Shared/Store/StoreBuyFinishedEvent.cs b/Content.Shared/Store/StoreBuyFinishedEvent.cs
new file mode 100644
index 00000000000..693b2ca3d82
--- /dev/null
+++ b/Content.Shared/Store/StoreBuyFinishedEvent.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared.Store;
+
+
+public sealed class StoreBuyFinishedEvent
+{
+    
+}

From 8ef6f708fda1164e724acd0896b48d58a138e863 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 14:16:30 -0400
Subject: [PATCH 087/366] more fixes!

---
 .../Psionics/PsionicFamiliarSystem.cs         |  5 +++-
 .../Antag/MobReplacementRuleSystem.cs         |  2 ++
 .../GameTicking/Rules/NukeopsRuleSystem.cs    |  2 +-
 .../GameTicking/Rules/TraitorRuleSystem.cs    |  2 ++
 .../LifeDrainer/LifeDrainerSystem.cs          |  3 ++-
 .../Operators/PickDrainTargetOperator.cs      |  2 ++
 .../NPC/Systems/NPCRetaliationSystem.cs       |  4 ++--
 .../Invisibility/PsionicInvisibilitySystem.cs |  2 ++
 Content.Server/Psionics/PsionicsSystem.cs     |  5 +++-
 Content.Server/Shadowkin/EtherealSystem.cs    |  7 +++---
 .../Events/GlimmerMobSpawnRule.cs             |  1 +
 .../Store/Systems/StoreSystem.Ui.cs           | 15 +++---------
 .../Systems/StoreDiscountSystem.cs            |  2 +-
 .../Traits/TraitSystem.Functions.cs           |  2 +-
 .../Gamerule/BloodCultRuleComponent.cs        |  3 +--
 .../BloodCult/Gamerule/BloodCultRuleSystem.cs |  2 ++
 .../NPC/Systems/NpcFactionSystem.cs           | 24 ++++++++++++++++++-
 .../Faction/ClothingAddFactionComponent.cs    |  3 ++-
 .../NPC/Systems/FactionSystem.Core.cs         |  4 ++--
 .../NPC/Systems/FactionSystem.Items.cs        | 13 +++++-----
 Content.Shared/Shadowkin/EtherealComponent.cs |  7 ++++--
 Content.Shared/Store/StoreBuyFinishedEvent.cs | 15 ++++++++----
 22 files changed, 83 insertions(+), 42 deletions(-)

diff --git a/Content.Server/Abilities/Psionics/PsionicFamiliarSystem.cs b/Content.Server/Abilities/Psionics/PsionicFamiliarSystem.cs
index d382c1f2318..6fbfbdb08cf 100644
--- a/Content.Server/Abilities/Psionics/PsionicFamiliarSystem.cs
+++ b/Content.Server/Abilities/Psionics/PsionicFamiliarSystem.cs
@@ -9,6 +9,9 @@
 using Content.Shared.Mobs;
 using Robust.Shared.Map;
 using System.Numerics;
+using Content.Shared.NPC.Components;
+using NpcFactionSystem = Content.Shared.NPC.Systems.NpcFactionSystem;
+
 
 namespace Content.Server.Abilities.Psionics;
 
@@ -60,7 +63,7 @@ private void InheritFactions(EntityUid uid, EntityUid familiar, PsionicFamiliarC
         EnsureComp<NpcFactionMemberComponent>(familiar, out var familiarFactions);
         foreach (var faction in masterFactions.Factions)
         {
-            if (familiarFactions.Factions.Contains(faction))
+            if (_factions.IsMember(familiar, faction))
                 continue;
 
             _factions.AddFaction(familiar, faction, true);
diff --git a/Content.Server/Antag/MobReplacementRuleSystem.cs b/Content.Server/Antag/MobReplacementRuleSystem.cs
index b2ad984884b..8d2a7991b76 100644
--- a/Content.Server/Antag/MobReplacementRuleSystem.cs
+++ b/Content.Server/Antag/MobReplacementRuleSystem.cs
@@ -24,6 +24,8 @@
 using Content.Server.GameTicking;
 using Content.Server.Chat.Systems;
 using Content.Server.NPC.Systems;
+using Content.Shared.NPC.Systems;
+
 
 namespace Content.Server.Antag;
 
diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
index 5b20f16f680..4d02e2311d1 100644
--- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -79,7 +79,7 @@ protected override void Started(EntityUid uid, NukeopsRuleComponent component, G
         var eligibleQuery = EntityQueryEnumerator<StationEventEligibleComponent, NpcFactionMemberComponent>();
         while (eligibleQuery.MoveNext(out var eligibleUid, out var eligibleComp, out var member))
         {
-            if (!_npcFaction.IsFactionHostile(component.Faction, eligibleUid, member))
+            if (!_npcFaction.IsFactionHostile(component.Faction, (eligibleUid, member)))
                 continue;
 
             eligible.Add((eligibleUid, eligibleComp, member));
diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
index fe46f6371bf..f50868e2f5f 100644
--- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
@@ -18,6 +18,8 @@
 using Robust.Shared.Random;
 using System.Linq;
 using System.Text;
+using Content.Shared.Mood;
+
 
 namespace Content.Server.GameTicking.Rules;
 
diff --git a/Content.Server/LifeDrainer/LifeDrainerSystem.cs b/Content.Server/LifeDrainer/LifeDrainerSystem.cs
index 2a9c5bb4583..3c0089b190e 100644
--- a/Content.Server/LifeDrainer/LifeDrainerSystem.cs
+++ b/Content.Server/LifeDrainer/LifeDrainerSystem.cs
@@ -1,6 +1,5 @@
 using Content.Server.Abilities.Psionics;
 using Content.Server.Carrying;
-using Content.Server.NPC.Systems;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Damage;
 using Content.Shared.DoAfter;
@@ -14,6 +13,8 @@
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;
+using Content.Shared.NPC.Systems;
+
 
 namespace Content.Server.LifeDrainer;
 
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/PickDrainTargetOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/PickDrainTargetOperator.cs
index 52c12777aa5..dbb09bb6135 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/PickDrainTargetOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/PickDrainTargetOperator.cs
@@ -3,6 +3,8 @@
 using Content.Server.LifeDrainer;
 using Content.Server.NPC.Pathfinding;
 using Content.Server.NPC.Systems;
+using NpcFactionSystem = Content.Shared.NPC.Systems.NpcFactionSystem;
+
 
 namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators;
 
diff --git a/Content.Server/NPC/Systems/NPCRetaliationSystem.cs b/Content.Server/NPC/Systems/NPCRetaliationSystem.cs
index 5ea69ee79af..bffd8a4bc41 100644
--- a/Content.Server/NPC/Systems/NPCRetaliationSystem.cs
+++ b/Content.Server/NPC/Systems/NPCRetaliationSystem.cs
@@ -46,8 +46,8 @@ public bool TryRetaliate(Entity<NPCRetaliationComponent> ent, EntityUid target)
         if (!HasComp<MobStateComponent>(target))
             return false;
 
-        if (!component.RetaliateFriendlies
-            && _npcFaction.IsEntityFriendly(uid, target))
+        if (!ent.Comp.RetaliateFriendlies
+            && _npcFaction.IsEntityFriendly(ent.Owner, target))
             return false;
 
         _npcFaction.AggroEntity(ent.Owner, target);
diff --git a/Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs b/Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs
index b9aac6ccee2..d6d20149be6 100644
--- a/Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs
+++ b/Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs
@@ -5,6 +5,8 @@
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
 using Robust.Server.GameObjects;
+using Content.Shared.NPC.Systems;
+
 
 namespace Content.Server.Psionics
 {
diff --git a/Content.Server/Psionics/PsionicsSystem.cs b/Content.Server/Psionics/PsionicsSystem.cs
index 9685334daba..3e9b3f2e86c 100644
--- a/Content.Server/Psionics/PsionicsSystem.cs
+++ b/Content.Server/Psionics/PsionicsSystem.cs
@@ -19,6 +19,9 @@
 using Content.Shared.Mobs;
 using Content.Shared.Damage;
 using Content.Shared.Interaction.Events;
+using Content.Shared.NPC.Components;
+using Content.Shared.NPC.Systems;
+
 
 namespace Content.Server.Psionics;
 
@@ -309,7 +312,7 @@ private void SetFamiliarTarget(EntityUid target, PsionicComponent component)
             if (!TryComp<NPCRetaliationComponent>(familiar, out var retaliationComponent))
                 continue;
 
-            _retaliationSystem.TryRetaliate(familiar, target, retaliationComponent);
+            _retaliationSystem.TryRetaliate((familiar, retaliationComponent), target);
         }
     }
 }
diff --git a/Content.Server/Shadowkin/EtherealSystem.cs b/Content.Server/Shadowkin/EtherealSystem.cs
index 2622547a3f6..04281d81f81 100644
--- a/Content.Server/Shadowkin/EtherealSystem.cs
+++ b/Content.Server/Shadowkin/EtherealSystem.cs
@@ -7,12 +7,13 @@
 using Content.Shared.Stealth;
 using Content.Shared.Stealth.Components;
 using Content.Server.Body.Components;
-using Content.Server.NPC.Components;
-using Content.Server.NPC.Systems;
 using System.Linq;
 using Content.Shared.Abilities.Psionics;
 using Robust.Shared.Random;
 using Content.Server.Light.Components;
+using Content.Shared.NPC.Components;
+using Content.Shared.NPC.Systems;
+
 
 namespace Content.Server.Shadowkin;
 
@@ -213,4 +214,4 @@ public override void Update(float frameTime)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Server/StationEvents/Events/GlimmerMobSpawnRule.cs b/Content.Server/StationEvents/Events/GlimmerMobSpawnRule.cs
index f80bc83a1e6..4df099b0897 100644
--- a/Content.Server/StationEvents/Events/GlimmerMobSpawnRule.cs
+++ b/Content.Server/StationEvents/Events/GlimmerMobSpawnRule.cs
@@ -8,6 +8,7 @@
 using Content.Server.StationEvents.Components;
 using Content.Shared.Psionics.Glimmer;
 using Content.Shared.Abilities.Psionics;
+using Content.Shared.NPC.Components;
 using Robust.Shared.Map;
 
 namespace Content.Server.StationEvents.Events;
diff --git a/Content.Server/Store/Systems/StoreSystem.Ui.cs b/Content.Server/Store/Systems/StoreSystem.Ui.cs
index 247055c2a7f..d186ce1e3b2 100644
--- a/Content.Server/Store/Systems/StoreSystem.Ui.cs
+++ b/Content.Server/Store/Systems/StoreSystem.Ui.cs
@@ -265,13 +265,15 @@ private void OnBuyRequest(EntityUid uid, StoreComponent component, StoreBuyListi
         listing.PurchaseAmount++; //track how many times something has been purchased
         _audio.PlayEntity(component.BuySuccessSound, msg.Actor, uid); //cha-ching!
 
+        // Nyano code needs to know when a buy finished. Probably a better way?
         var buyFinished = new StoreBuyFinishedEvent
         {
+            Buyer = buyer,
             PurchasedItem = listing,
             StoreUid = uid
         };
-        RaiseLocalEvent(ref buyFinished);
 
+        RaiseLocalEvent(ref buyFinished);
         UpdateUserInterface(buyer, uid, component);
     }
 
@@ -387,14 +389,3 @@ public void DisableRefund(EntityUid store, StoreComponent? component = null)
         component.RefundAllowed = false;
     }
 }
-
-/// <summary>
-/// Event of successfully finishing purchase in store (<see cref="StoreSystem"/>.
-/// </summary>
-/// <param name="StoreUid">EntityUid on which store is placed.</param>
-/// <param name="PurchasedItem">ListingItem that was purchased.</param>
-[ByRefEvent]
-public readonly record struct StoreBuyFinishedEvent(
-    EntityUid StoreUid,
-    ListingDataWithCostModifiers PurchasedItem
-);
diff --git a/Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs b/Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs
index 9b4a0481aa2..c1352baf113 100644
--- a/Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs
+++ b/Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs
@@ -32,7 +32,7 @@ public override void Initialize()
     /// <summary> Decrements discounted item count, removes discount modifier and category, if counter reaches zero. </summary>
     private void OnBuyFinished(ref StoreBuyFinishedEvent ev)
     {
-        var (storeId, purchasedItem) = ev;
+        var (_, storeId, purchasedItem) = ev;
         if (!TryComp<StoreDiscountComponent>(storeId, out var discountsComponent))
         {
             return;
diff --git a/Content.Server/Traits/TraitSystem.Functions.cs b/Content.Server/Traits/TraitSystem.Functions.cs
index 57b508018a6..7ec8b8c54f6 100644
--- a/Content.Server/Traits/TraitSystem.Functions.cs
+++ b/Content.Server/Traits/TraitSystem.Functions.cs
@@ -9,7 +9,6 @@
 using Content.Shared.Psionics;
 using Content.Server.Language;
 using Content.Shared.Mood;
-using Content.Server.NPC.Systems;
 using Content.Shared.Traits.Assorted.Components;
 using Content.Shared.Damage;
 using Content.Shared.Chemistry.Components;
@@ -18,6 +17,7 @@
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Mobs;
 using Content.Shared.Damage.Components;
+using Content.Shared.NPC.Systems;
 
 namespace Content.Server.Traits;
 
diff --git a/Content.Server/WhiteDream/BloodCult/Gamerule/BloodCultRuleComponent.cs b/Content.Server/WhiteDream/BloodCult/Gamerule/BloodCultRuleComponent.cs
index d0a1991a9fd..c89a50f4606 100644
--- a/Content.Server/WhiteDream/BloodCult/Gamerule/BloodCultRuleComponent.cs
+++ b/Content.Server/WhiteDream/BloodCult/Gamerule/BloodCultRuleComponent.cs
@@ -1,5 +1,4 @@
-using Content.Server.NPC.Components;
-using Content.Server.WhiteDream.BloodCult.RendingRunePlacement;
+using Content.Shared.NPC.Prototypes;
 using Content.Shared.WhiteDream.BloodCult.BloodCultist;
 using Content.Shared.WhiteDream.BloodCult.Constructs;
 using Robust.Shared.Prototypes;
diff --git a/Content.Server/WhiteDream/BloodCult/Gamerule/BloodCultRuleSystem.cs b/Content.Server/WhiteDream/BloodCult/Gamerule/BloodCultRuleSystem.cs
index bfb06c85ccf..a3ec2a9b07a 100644
--- a/Content.Server/WhiteDream/BloodCult/Gamerule/BloodCultRuleSystem.cs
+++ b/Content.Server/WhiteDream/BloodCult/Gamerule/BloodCultRuleSystem.cs
@@ -36,6 +36,8 @@
 using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
+using Content.Shared.NPC.Systems;
+
 
 namespace Content.Server.WhiteDream.BloodCult.Gamerule;
 
diff --git a/Content.Shared/NPC/Systems/NpcFactionSystem.cs b/Content.Shared/NPC/Systems/NpcFactionSystem.cs
index f0bb1945eb4..c35f0c7b4cb 100644
--- a/Content.Shared/NPC/Systems/NpcFactionSystem.cs
+++ b/Content.Shared/NPC/Systems/NpcFactionSystem.cs
@@ -8,7 +8,7 @@ namespace Content.Shared.NPC.Systems;
 
 /// <summary>
 ///     Outlines faction relationships with each other.
-///     part of psionics rework was making this a partial class. Should've already been handled upstream, based on the linter. 
+///     part of psionics rework was making this a partial class. Should've already been handled upstream, based on the linter.
 /// </summary>
 public sealed partial class NpcFactionSystem : EntitySystem
 {
@@ -92,6 +92,28 @@ public void AddFaction(Entity<NpcFactionMemberComponent?> ent, string faction, b
             RefreshFactions((ent, ent.Comp));
     }
 
+    /// <summary>
+    /// Adds this entity to the particular factions.
+    /// </summary>
+    public void AddFactions(Entity<NpcFactionMemberComponent?> ent, HashSet<ProtoId<NpcFactionPrototype>> factions, bool dirty = true)
+    {
+        ent.Comp ??= EnsureComp<NpcFactionMemberComponent>(ent);
+
+        foreach (var faction in factions)
+        {
+            if (!_proto.HasIndex(faction))
+            {
+                Log.Error($"Unable to find faction {faction}");
+                continue;
+            }
+
+            ent.Comp.Factions.Add(faction);
+        }
+
+        if (dirty)
+            RefreshFactions((ent, ent.Comp));
+    }
+
     /// <summary>
     /// Removes this entity from the particular faction.
     /// </summary>
diff --git a/Content.Shared/Nyanotrasen/NPC/Components/Faction/ClothingAddFactionComponent.cs b/Content.Shared/Nyanotrasen/NPC/Components/Faction/ClothingAddFactionComponent.cs
index 94fcec8afce..b113107aa6f 100644
--- a/Content.Shared/Nyanotrasen/NPC/Components/Faction/ClothingAddFactionComponent.cs
+++ b/Content.Shared/Nyanotrasen/NPC/Components/Faction/ClothingAddFactionComponent.cs
@@ -1,7 +1,8 @@
+using Content.Shared.NPC.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 
-namespace Content.Shared.Nyanotrasen.NPC.Systems.Components.Faction
+namespace Content.Shared.Nyanotrasen.NPC.Components.Faction
 {
     [RegisterComponent]
     /// <summary>
diff --git a/Content.Shared/Nyanotrasen/NPC/Systems/FactionSystem.Core.cs b/Content.Shared/Nyanotrasen/NPC/Systems/FactionSystem.Core.cs
index c6cf98a8852..3b2502d1d51 100644
--- a/Content.Shared/Nyanotrasen/NPC/Systems/FactionSystem.Core.cs
+++ b/Content.Shared/Nyanotrasen/NPC/Systems/FactionSystem.Core.cs
@@ -1,9 +1,9 @@
 using Content.Shared.NPC.Components;
 
 
-namespace Content.Shared.Nyanotrasen.NPC.Systems;
+namespace Content.Shared.NPC.Systems;
 
-public partial class NpcFactionSystem : EntitySystem
+public sealed partial class NpcFactionSystem
 {
     public void InitializeCore()
     {
diff --git a/Content.Shared/Nyanotrasen/NPC/Systems/FactionSystem.Items.cs b/Content.Shared/Nyanotrasen/NPC/Systems/FactionSystem.Items.cs
index b5a6ce3027a..62f3c33cf62 100644
--- a/Content.Shared/Nyanotrasen/NPC/Systems/FactionSystem.Items.cs
+++ b/Content.Shared/Nyanotrasen/NPC/Systems/FactionSystem.Items.cs
@@ -1,14 +1,14 @@
 using Content.Shared.Clothing.Components;
 using Content.Shared.Inventory.Events;
 using Content.Shared.NPC.Components;
+using Content.Shared.Nyanotrasen.NPC.Components.Faction;
+using Content.Shared.Store;
 
+namespace Content.Shared.NPC.Systems;
 
-namespace Content.Shared.Nyanotrasen.NPC.Systems;
-
-public partial class NpcFactionSystem
+public sealed partial class NpcFactionSystem
 {
 
-
     public void InitializeItems()
     {
         SubscribeLocalEvent<NpcFactionMemberComponent, StoreBuyFinishedEvent>(OnStoreBuyFinished);
@@ -23,11 +23,10 @@ public void InitializeItems()
     /// </summary>
     // TODO: check if this is the right uid?? we might be cooked.
     private void OnStoreBuyFinished(
-        EntityUid uid,
-        NpcFactionMemberComponent component,
+        Entity<NpcFactionMemberComponent> entity,
         ref StoreBuyFinishedEvent args
     ) =>
-        component.ExceptionalFriendlies.Add(uid);
+        entity.Comp.ExceptionalFriendlies.Add(args.Buyer);
 
     private void OnClothingEquipped(EntityUid uid, ClothingAddFactionComponent component, GotEquippedEvent args)
     {
diff --git a/Content.Shared/Shadowkin/EtherealComponent.cs b/Content.Shared/Shadowkin/EtherealComponent.cs
index 0fc50c0f12e..d1b5adef0e4 100644
--- a/Content.Shared/Shadowkin/EtherealComponent.cs
+++ b/Content.Shared/Shadowkin/EtherealComponent.cs
@@ -1,4 +1,7 @@
+using Content.Shared.NPC.Prototypes;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
 
 namespace Content.Shared.Shadowkin;
 
@@ -31,6 +34,6 @@ public sealed partial class EtherealComponent : Component
 
     public int OldMobLayer;
 
-    public List<string> SuppressedFactions = new();
+    public List<ProtoId<NpcFactionPrototype>> SuppressedFactions = new();
     public bool HasDoorBumpTag;
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Store/StoreBuyFinishedEvent.cs b/Content.Shared/Store/StoreBuyFinishedEvent.cs
index 693b2ca3d82..2661d7f20a8 100644
--- a/Content.Shared/Store/StoreBuyFinishedEvent.cs
+++ b/Content.Shared/Store/StoreBuyFinishedEvent.cs
@@ -1,7 +1,14 @@
 namespace Content.Shared.Store;
 
 
-public sealed class StoreBuyFinishedEvent
-{
-    
-}
+/// <summary>
+/// Event of successfully finishing purchase in store (<see cref="StoreSystem"/>.
+/// </summary>
+/// <param name="StoreUid">EntityUid on which store is placed.</param>
+/// <param name="PurchasedItem">ListingItem that was purchased.</param>
+[ByRefEvent]
+public readonly record struct StoreBuyFinishedEvent(
+    EntityUid Buyer,
+    EntityUid StoreUid,
+    ListingDataWithCostModifiers PurchasedItem
+);

From 294f5d4cee5be37e1ba7d47520d658462cfc8415 Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Fri, 1 Nov 2024 02:34:27 +0000
Subject: [PATCH 088/366] add IsMemberOfAny to faction system (#32975)

* add IsMemberOfAny to faction system

* pro

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 Content.Shared/NPC/Systems/NpcFactionSystem.cs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Content.Shared/NPC/Systems/NpcFactionSystem.cs b/Content.Shared/NPC/Systems/NpcFactionSystem.cs
index c35f0c7b4cb..448c7eeaec8 100644
--- a/Content.Shared/NPC/Systems/NpcFactionSystem.cs
+++ b/Content.Shared/NPC/Systems/NpcFactionSystem.cs
@@ -73,6 +73,24 @@ public bool IsMember(Entity<NpcFactionMemberComponent?> ent, string faction)
         return ent.Comp.Factions.Contains(faction);
     }
 
+    /// <summary>
+    /// Returns whether an entity is a member of any listed faction.
+    /// If the list is empty this returns false.
+    /// </summary>
+    public bool IsMemberOfAny(Entity<NpcFactionMemberComponent?> ent, IEnumerable<ProtoId<NpcFactionPrototype>> factions)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return false;
+
+        foreach (var faction in factions)
+        {
+            if (ent.Comp.Factions.Contains(faction))
+                return true;
+        }
+
+        return false;
+    }
+
     /// <summary>
     /// Adds this entity to the particular faction.
     /// </summary>

From 58e207e90412c731db00dc1288eba2ac5b0270f8 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 14:51:28 -0400
Subject: [PATCH 089/366] hm

---
 .../Entities/Clothing/Shoes/misc.yml          |  7 +--
 .../Entities/Objects/Materials/materials.yml  | 46 +++++++++++++---
 .../Weapons/Melee/telescopic_baton.yml        |  6 ++-
 Resources/Prototypes/Store/presets.yml        | 53 ++++++++++---------
 4 files changed, 74 insertions(+), 38 deletions(-)

diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
index 4683388dc26..fae87172238 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
@@ -127,13 +127,10 @@
   id: ActionToggleSpeedBoots
   name: Toggle Speed Boots
   description: Toggles the speed boots on and off.
-  categories: [ HideSpawnMenu ]
   components:
   - type: InstantAction
-    itemIconStyle: NoItem
-    event: !type:ToggleClothingSpeedEvent
-    icon: { sprite: Clothing/Shoes/Boots/speedboots.rsi, state: icon }
-    iconOn: { sprite: Clothing/Shoes/Boots/speedboots.rsi, state: icon-on }
+    itemIconStyle: BigItem
+    event: !type:ToggleActionEvent
 
 - type: entity
   parent: ClothingShoesBase
diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index 228dc05d58e..b509b8a4c41 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -12,7 +12,6 @@
   - type: Tag
     tags:
       - RawMaterial
-      - NoPaint
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible
@@ -55,6 +54,8 @@
         reagents:
         - ReagentId: Cellulose
           Quantity: 6
+  - type: Item
+    heldPrefix: cardboard
 
 - type: entity
   parent: MaterialCardboard
@@ -118,6 +119,9 @@
   - type: Appearance
   - type: Food
     requiresSpecialDigestion: true
+  - type: FlavorProfile
+    flavors:
+    - fiber
   - type: SolutionContainerManager
     solutions:
       food:
@@ -133,6 +137,8 @@
   - type: Construction
     graph: WebObjects # not sure if I should either keep this here or just make another prototype. Will keep it here just in case.
     node: cloth
+  - type: Item
+    heldPrefix: cloth
 
 - type: entity
   parent: MaterialCloth
@@ -193,6 +199,8 @@
     tags:
       - ClothMade
       - RawMaterial
+  - type: Item
+    heldPrefix: durathread
 
 - type: entity
   parent: MaterialDurathread
@@ -332,8 +340,7 @@
     sprite: Objects/Materials/materials.rsi
     state: corgihide
   - type: Item
-    sprite: Clothing/Head/Misc/hides.rsi
-    heldPrefix: corgi
+    heldPrefix: corgihide
   - type: Clothing
     sprite: Clothing/Head/Misc/hides.rsi
     equippedPrefix: corgi2
@@ -351,8 +358,17 @@
   components:
   - type: Stack
     stackType: Diamond
+    baseLayer: base
+    layerStates:
+    - diamond
+    - diamond_2
+    - diamond_3
   - type: Sprite
     state: diamond
+    layers:
+    - state: diamond
+      map: ["base"]
+  - type: Appearance
   - type: Item
     heldPrefix: diamond
   - type: Extractable
@@ -363,6 +379,10 @@
         reagents:
         - ReagentId: Carbon
           Quantity: 20
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      Diamond: 100
 
 - type: entity
   parent: MaterialDiamond
@@ -393,6 +413,9 @@
   - type: Appearance
   - type: Food
     requiresSpecialDigestion: true
+  - type: FlavorProfile
+    flavors:
+    - fiber
   - type: SolutionContainerManager
     solutions:
       food:
@@ -409,6 +432,8 @@
     tags:
       - ClothMade
       - RawMaterial
+  - type: Item
+    heldPrefix: cotton
 
 - type: entity
   parent: MaterialCotton
@@ -461,6 +486,8 @@
     tags:
       - ClothMade
       - RawMaterial
+  - type: Item
+    heldPrefix: pyrotton
 
 - type: entity
   parent: MaterialPyrotton
@@ -494,8 +521,6 @@
     layerStates:
       - bananium
       - bananium_1
-  - type: RadiationSource
-    intensity: 0.1
   - type: FlavorProfile
     flavors:
       - banana
@@ -522,6 +547,8 @@
       - ReagentId: Honk
         Quantity: 5
   - type: Appearance
+  - type: Item
+    heldPrefix: bananium
 
 - type: entity
   parent: MaterialBananium
@@ -572,6 +599,9 @@
     tags:
       - ClothMade
       - RawMaterial
+  - type: Item
+    sprite: Objects/Materials/silk.rsi
+    heldPrefix: silk
 
 - type: entity
   parent: MaterialWebSilk
@@ -617,6 +647,8 @@
         reagents:
         - ReagentId: Vitamin
           Quantity: 3
+  - type: Item
+    heldPrefix: bones
 
 - type: entity
   parent: MaterialBones
@@ -671,6 +703,8 @@
     - goliath_hide_3
   - type: Item
     size: Large
+    heldPrefix: goliathhide
+    sprite: Objects/Materials/hide.rsi
     shape:
     - 0,0,2,2
 
@@ -680,4 +714,4 @@
   suffix: 1
   components:
   - type: Stack
-    count: 1
+    count: 1
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/telescopic_baton.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/telescopic_baton.yml
index 7851a9403b4..c35af489e93 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/telescopic_baton.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/telescopic_baton.yml
@@ -20,8 +20,10 @@
       path: /Audio/Weapons/telescopicoff.ogg
       params:
         volume: -2
-  - type: ItemToggleDisarmMalus
-    activatedDisarmMalus: 0.6
+  - type: ComponentToggler
+    components:
+    - type: DisarmMalus
+      malus: 0.6
   - type: ItemToggleMeleeWeapon
     activatedDamage:
       types:
diff --git a/Resources/Prototypes/Store/presets.yml b/Resources/Prototypes/Store/presets.yml
index 1f0f6acdce7..20efd9a9088 100644
--- a/Resources/Prototypes/Store/presets.yml
+++ b/Resources/Prototypes/Store/presets.yml
@@ -1,30 +1,33 @@
 - type: entity
   id: StorePresetUplink
-  storeName: Uplink
-  categories:
-  - UplinkWeapons
-  - UplinkAmmo
-  - UplinkExplosives
-  - UplinkMisc
-  - UplinkBundles
-  - UplinkTools
-  - UplinkUtility
-  - UplinkImplants
-  - UplinkJob
-  - UplinkArmor
-  - UplinkPointless
-  - UplinkSales
-  currencyWhitelist:
-  - Telecrystal
-  balance:
-    Telecrystal: 0
-  sales:
-    enabled: true
-    minMultiplier: 0.2
-    maxMultiplier: 0.8
-    minItems: 3
-    maxItems: 8
-    salesCategory: UplinkSales
+  abstract: true
+  components:
+  - type: Store
+    storeName: Uplink
+    categories:
+    - UplinkWeapons
+    - UplinkAmmo
+    - UplinkExplosives
+    - UplinkMisc
+    - UplinkBundles
+    - UplinkTools
+    - UplinkUtility
+    - UplinkImplants
+    - UplinkJob
+    - UplinkArmor
+    - UplinkPointless
+    - UplinkSales
+    currencyWhitelist:
+    - Telecrystal
+    balance:
+      Telecrystal: 0
+    sales:
+      enabled: true
+      minMultiplier: 0.2
+      maxMultiplier: 0.8
+      minItems: 3
+      maxItems: 8
+      salesCategory: UplinkSales
 
 - type: entity
   id: StorePresetSpellbook

From df832d1964a0fe342c44cd823af1e9c201488b9f Mon Sep 17 00:00:00 2001
From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Sat, 10 Aug 2024 22:31:32 +0300
Subject: [PATCH 090/366] Custom burgers - FoodSequence system (#30755)

* setup foodsequence

* name generation and max layers limit

* move to nutrition

* move code to serverside

* move to appearance data

* marked fields as required

* Update foodsequence.yml

* b

* burgeers!

* Update produce.yml

* Update meat.yml

* Update burger.yml

* fix duplicate naming

* Update Resources/Locale/en-US/nutrition/components/food-sequence.ftl

Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>

* merge flavor profiles

* make food trash List<>

* merge trash

* Update FoodComponent.cs

* Update FoodComponent.cs

* organs and cannabis support

---------

Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
---
 .../EntitySystems/ClientFoodSequenceSystem.cs |  57 +++
 .../Nutrition/Components/FoodComponent.cs     |   4 +-
 .../Nutrition/EntitySystems/CreamPieSystem.cs |   7 +-
 .../EntitySystems/FoodSequenceSystem.cs       | 140 ++++++
 .../Nutrition/EntitySystems/FoodSystem.cs     |  26 +-
 .../EntitySystems/SliceableFoodSystem.cs      |   6 +-
 .../FoodSequenceElementComponent.cs           |  43 ++
 .../FoodSequenceStartPointComponent.cs        |  66 +++
 .../EntitySystems/SharedFoodSequenceSystem.cs |   5 +
 .../nutrition/components/food-sequence.ftl    |  70 +++
 Resources/Prototypes/Body/Organs/human.yml    |  45 +-
 .../Objects/Consumable/Food/Baked/pie.yml     |   3 +-
 .../Consumable/Food/Containers/tin.yml        |  12 +-
 .../Objects/Consumable/Food/burger.yml        |  65 ++-
 .../Entities/Objects/Consumable/Food/egg.yml  |   3 +-
 .../Objects/Consumable/Food/frozen.yml        |  27 +-
 .../Objects/Consumable/Food/ingredients.yml   |  17 +
 .../Objects/Consumable/Food/meals.yml         |   6 +-
 .../Entities/Objects/Consumable/Food/meat.yml | 399 ++++++++++++++++
 .../Objects/Consumable/Food/produce.yml       | 429 +++++++++++++++++-
 .../Objects/Consumable/Food/skewer.yml        |   3 +-
 .../Objects/Consumable/Food/snacks.yml        |  80 +++-
 .../Entities/Objects/Consumable/Food/soup.yml |   6 +-
 .../Entities/Objects/Materials/materials.yml  |   2 +-
 .../Objects/Specific/Hydroponics/leaves.yml   |  49 ++
 .../Consumable/Food/burger.rsi/bun_bottom.png | Bin 0 -> 319 bytes
 .../Consumable/Food/burger.rsi/bun_top.png    | Bin 0 -> 367 bytes
 .../Consumable/Food/burger.rsi/meta.json      |   6 +
 .../Consumable/Food/meat.rsi/tomato.png       | Bin 463 -> 476 bytes
 .../Specific/Hydroponics/aloe.rsi/produce.png | Bin 903 -> 817 bytes
 .../Hydroponics/apple.rsi/produce.png         | Bin 378 -> 389 bytes
 .../Hydroponics/blood_tomato.rsi/produce.png  | Bin 234 -> 262 bytes
 .../Hydroponics/blue_tomato.rsi/produce.png   | Bin 219 -> 248 bytes
 .../Hydroponics/cannabis.rsi/produce.png      | Bin 220 -> 239 bytes
 34 files changed, 1517 insertions(+), 59 deletions(-)
 create mode 100644 Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs
 create mode 100644 Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs
 create mode 100644 Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs
 create mode 100644 Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs
 create mode 100644 Content.Shared/Nutrition/EntitySystems/SharedFoodSequenceSystem.cs
 create mode 100644 Resources/Locale/en-US/nutrition/components/food-sequence.ftl
 create mode 100644 Resources/Textures/Objects/Consumable/Food/burger.rsi/bun_bottom.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/burger.rsi/bun_top.png

diff --git a/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs b/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs
new file mode 100644
index 00000000000..452bb552de6
--- /dev/null
+++ b/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs
@@ -0,0 +1,57 @@
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.Nutrition.EntitySystems;
+
+public sealed class ClientFoodSequenceSystem : SharedFoodSequenceSystem
+{
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<FoodSequenceStartPointComponent, AfterAutoHandleStateEvent>(OnHandleState);
+    }
+
+    private void OnHandleState(Entity<FoodSequenceStartPointComponent> start, ref AfterAutoHandleStateEvent args)
+    {
+        if (!TryComp<SpriteComponent>(start, out var sprite))
+            return;
+
+        UpdateFoodVisuals(start, sprite);
+    }
+
+    private void UpdateFoodVisuals(Entity<FoodSequenceStartPointComponent> start, SpriteComponent? sprite = null)
+    {
+        if (!Resolve(start, ref sprite, false))
+            return;
+
+        //Remove old layers
+        foreach (var key in start.Comp.RevealedLayers)
+        {
+            sprite.RemoveLayer(key);
+        }
+        start.Comp.RevealedLayers.Clear();
+
+        //Add new layers
+        var counter = 0;
+        foreach (var state in start.Comp.FoodLayers)
+        {
+            if (state.Sprite is null)
+                continue;
+
+            counter++;
+
+            var keyCode = $"food-layer-{counter}";
+            start.Comp.RevealedLayers.Add(keyCode);
+
+            var index = sprite.LayerMapReserveBlank(keyCode);
+
+            //Set image
+            sprite.LayerSetSprite(index, state.Sprite);
+
+            //Offset the layer
+            var layerPos = start.Comp.StartPosition;
+            layerPos += start.Comp.Offset * counter;
+            sprite.LayerSetOffset(index, layerPos);
+        }
+    }
+}
diff --git a/Content.Server/Nutrition/Components/FoodComponent.cs b/Content.Server/Nutrition/Components/FoodComponent.cs
index 5ead67a12b2..cfb69f53f0c 100644
--- a/Content.Server/Nutrition/Components/FoodComponent.cs
+++ b/Content.Server/Nutrition/Components/FoodComponent.cs
@@ -7,7 +7,7 @@
 
 namespace Content.Server.Nutrition.Components;
 
-[RegisterComponent, Access(typeof(FoodSystem))]
+[RegisterComponent, Access(typeof(FoodSystem), typeof(FoodSequenceSystem))]
 public sealed partial class FoodComponent : Component
 {
     [DataField]
@@ -17,7 +17,7 @@ public sealed partial class FoodComponent : Component
     public SoundSpecifier UseSound = new SoundCollectionSpecifier("eating");
 
     [DataField]
-    public EntProtoId? Trash;
+    public List<EntProtoId> Trash = new();
 
     [DataField]
     public FixedPoint2? TransferAmount = FixedPoint2.New(5);
diff --git a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
index a28679ddbc9..50b9297ca73 100644
--- a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
@@ -48,9 +48,12 @@ protected override void SplattedCreamPie(EntityUid uid, CreamPieComponent creamP
                 {
                     _puddle.TrySpillAt(uid, solution, out _, false);
                 }
-                if (!string.IsNullOrEmpty(foodComp.Trash))
+                if (foodComp.Trash.Count == 0)
                 {
-                    EntityManager.SpawnEntity(foodComp.Trash, Transform(uid).Coordinates);
+                    foreach (var trash in foodComp.Trash)
+                    {
+                        EntityManager.SpawnEntity(trash, Transform(uid).Coordinates);
+                    }
                 }
             }
             ActivatePayload(uid);
diff --git a/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs
new file mode 100644
index 00000000000..6970f11b6e1
--- /dev/null
+++ b/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs
@@ -0,0 +1,140 @@
+using System.Text;
+using Content.Server.Nutrition.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Interaction;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.Popups;
+
+namespace Content.Server.Nutrition.EntitySystems;
+
+public sealed class FoodSequenceSystem : SharedFoodSequenceSystem
+{
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly MetaDataSystem _metaData = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<FoodSequenceStartPointComponent, InteractUsingEvent>(OnInteractUsing);
+    }
+
+    private void OnInteractUsing(Entity<FoodSequenceStartPointComponent> ent, ref InteractUsingEvent args)
+    {
+        if (TryComp<FoodSequenceElementComponent>(args.Used, out var sequenceElement))
+            TryAddFoodElement(ent, (args.Used, sequenceElement), args.User);
+    }
+
+    private bool TryAddFoodElement(Entity<FoodSequenceStartPointComponent> start, Entity<FoodSequenceElementComponent> element, EntityUid? user = null)
+    {
+        FoodSequenceElementEntry? elementData = null;
+        foreach (var entry in element.Comp.Entries)
+        {
+            if (entry.Key == start.Comp.Key)
+            {
+                elementData = entry.Value;
+                break;
+            }
+        }
+
+        if (elementData is null)
+            return false;
+
+        //if we run out of space, we can still put in one last, final finishing element.
+        if (start.Comp.FoodLayers.Count >= start.Comp.MaxLayers && !elementData.Value.Final || start.Comp.Finished)
+        {
+            if (user is not null)
+                _popup.PopupEntity(Loc.GetString("food-sequence-no-space"), start, user.Value);
+            return false;
+        }
+
+        if (elementData.Value.Sprite is not null)
+        {
+            start.Comp.FoodLayers.Add(elementData.Value);
+            Dirty(start);
+        }
+
+        if (elementData.Value.Final)
+            start.Comp.Finished = true;
+
+        UpdateFoodName(start);
+        MergeFoodSolutions(start, element);
+        MergeFlavorProfiles(start, element);
+        MergeTrash(start, element);
+        QueueDel(element);
+        return true;
+    }
+
+    private void UpdateFoodName(Entity<FoodSequenceStartPointComponent> start)
+    {
+        if (start.Comp.NameGeneration is null)
+            return;
+
+        var content = new StringBuilder();
+        var separator = "";
+        if (start.Comp.ContentSeparator is not null)
+            separator = Loc.GetString(start.Comp.ContentSeparator);
+
+        HashSet<LocId> existedContentNames = new();
+        foreach (var layer in start.Comp.FoodLayers)
+        {
+            if (layer.Name is not null && !existedContentNames.Contains(layer.Name.Value))
+            {
+                content.Append(Loc.GetString(layer.Name.Value));
+                existedContentNames.Add(layer.Name.Value);
+            }
+
+            content.Append(separator);
+        }
+
+        var newName = Loc.GetString(start.Comp.NameGeneration.Value,
+            ("prefix", start.Comp.NamePrefix is not null ? Loc.GetString(start.Comp.NamePrefix) : ""),
+            ("content", content),
+            ("suffix", start.Comp.NameSuffix is not null ? Loc.GetString(start.Comp.NameSuffix) : ""));
+
+        _metaData.SetEntityName(start, newName);
+    }
+
+    private void MergeFoodSolutions(Entity<FoodSequenceStartPointComponent> start, Entity<FoodSequenceElementComponent> element)
+    {
+        if (!_solutionContainer.TryGetSolution(start.Owner, start.Comp.Solution, out var startSolutionEntity, out var startSolution))
+            return;
+
+        if (!_solutionContainer.TryGetSolution(element.Owner, element.Comp.Solution, out _, out var elementSolution))
+            return;
+
+        startSolution.MaxVolume += elementSolution.MaxVolume;
+        _solutionContainer.TryAddSolution(startSolutionEntity.Value, elementSolution);
+    }
+
+    private void MergeFlavorProfiles(Entity<FoodSequenceStartPointComponent> start, Entity<FoodSequenceElementComponent> element)
+    {
+        if (!TryComp<FlavorProfileComponent>(start, out var startProfile))
+            return;
+
+        if (!TryComp<FlavorProfileComponent>(element, out var elementProfile))
+            return;
+
+        foreach (var flavor in elementProfile.Flavors)
+        {
+            if (startProfile != null && !startProfile.Flavors.Contains(flavor))
+                startProfile.Flavors.Add(flavor);
+        }
+    }
+
+    private void MergeTrash(Entity<FoodSequenceStartPointComponent> start, Entity<FoodSequenceElementComponent> element)
+    {
+        if (!TryComp<FoodComponent>(start, out var startFood))
+            return;
+
+        if (!TryComp<FoodComponent>(element, out var elementFood))
+            return;
+
+        foreach (var trash in elementFood.Trash)
+        {
+            startFood.Trash.Add(trash);
+        }
+    }
+}
diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
index feb7c494841..ad43477e782 100644
--- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
@@ -326,27 +326,31 @@ public void DeleteAndSpawnTrash(FoodComponent component, EntityUid food, EntityU
         if (ev.Cancelled)
             return;
 
-        if (string.IsNullOrEmpty(component.Trash))
+        if (component.Trash.Count == 0)
         {
             QueueDel(food);
             return;
         }
 
         //We're empty. Become trash.
-        var position = Transform(food).MapPosition;
-        var finisher = Spawn(component.Trash, position);
+        //cache some data as we remove food, before spawning trash and passing it to the hand.
 
-        // If the user is holding the item
-        if (_hands.IsHolding(user, food, out var hand))
+        var position = _transform.GetMapCoordinates(food);
+        var trashes = component.Trash;
+        var tryPickup = _hands.IsHolding(user, food, out _);
+
+        Del(food);
+        foreach (var trash in trashes)
         {
-            Del(food);
+            var spawnedTrash = Spawn(trash, position);
 
-            // Put the trash in the user's hand
-            _hands.TryPickup(user, finisher, hand);
-            return;
+            // If the user is holding the item
+            if (tryPickup)
+            {
+                // Put the trash in the user's hand
+                _hands.TryPickupAnyHand(user, spawnedTrash);
+            }
         }
-
-        QueueDel(food);
     }
 
     private void AddEatVerb(Entity<FoodComponent> entity, ref GetVerbsEvent<AlternativeVerb> ev)
diff --git a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs b/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
index abb6f393ac5..2dbd6f7b8fc 100644
--- a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
@@ -139,14 +139,16 @@ private void DeleteFood(EntityUid uid, EntityUid user, FoodComponent foodComp)
             if (ev.Cancelled)
                 return;
 
-            if (string.IsNullOrEmpty(foodComp.Trash))
+            if (foodComp.Trash.Count == 0)
             {
                 QueueDel(uid);
                 return;
             }
 
             // Locate the sliced food and spawn its trash
-            var trashUid = Spawn(foodComp.Trash, _xformSystem.GetMapCoordinates(uid));
+            foreach (var trash in foodComp.Trash)
+            {
+                var trashUid = Spawn(trash, _xformSystem.GetMapCoordinates(uid));
 
             // try putting the trash in the food's container too, to be consistent with slice spawning?
             if (_containerSystem.TryGetContainingContainer(uid, out var container) && _containerSystem.CanInsert(trashUid, container))
diff --git a/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs b/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs
new file mode 100644
index 00000000000..1fc8aeec0a2
--- /dev/null
+++ b/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs
@@ -0,0 +1,43 @@
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Nutrition.Components;
+
+/// <summary>
+/// Tndicates that this entity can be inserted into FoodSequence, which will transfer all reagents to the target.
+/// </summary>
+[RegisterComponent, Access(typeof(SharedFoodSequenceSystem))]
+public sealed partial class FoodSequenceElementComponent : Component
+{
+    /// <summary>
+    /// the same object can be used in different sequences, and it will have a different sprite in different sequences.
+    /// </summary>
+    [DataField(required: true)]
+    public Dictionary<string, FoodSequenceElementEntry> Entries = new();
+
+    /// <summary>
+    /// which solution we will add to the main dish
+    /// </summary>
+    [DataField]
+    public string Solution = "food";
+}
+
+[DataRecord, Serializable, NetSerializable]
+public partial record struct FoodSequenceElementEntry()
+{
+    /// <summary>
+    /// A localized name piece to build into the item name generator.
+    /// </summary>
+    public LocId? Name { get; set; } = null;
+
+    /// <summary>
+    /// state used to generate the appearance of the added layer
+    /// </summary>
+    public SpriteSpecifier? Sprite { get; set; } = null;
+
+    /// <summary>
+    /// If the layer is the final one, it can be added over the limit, but no other layers can be added after it.
+    /// </summary>
+    public bool Final { get; set; } = false;
+}
diff --git a/Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs b/Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs
new file mode 100644
index 00000000000..b8186fdaf09
--- /dev/null
+++ b/Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs
@@ -0,0 +1,66 @@
+using System.Numerics;
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Nutrition.Components;
+
+/// <summary>
+/// A starting point for the creation of procedural food.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true), Access(typeof(SharedFoodSequenceSystem))]
+public sealed partial class FoodSequenceStartPointComponent : Component
+{
+    /// <summary>
+    /// A key that determines which types of food elements can be attached to a food.
+    /// </summary>
+    [DataField(required: true)]
+    public string Key = string.Empty;
+
+    /// <summary>
+    /// The maximum number of layers of food that can be placed on this item.
+    /// </summary>
+    [DataField]
+    public int MaxLayers = 10;
+
+    /// <summary>
+    /// Start shift from the center of the sprite where the first layer of food will be placed.
+    /// </summary>
+    [DataField]
+    public Vector2 StartPosition = Vector2.Zero;
+
+    /// <summary>
+    /// Shift from the start position applied to each subsequent layer.
+    /// </summary>
+    [DataField]
+    public Vector2 Offset = Vector2.Zero;
+
+    /// <summary>
+    /// Can we put more layers?
+    /// </summary>
+    [DataField]
+    public bool Finished;
+
+    /// <summary>
+    /// list of sprite states to be displayed on this object.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public List<FoodSequenceElementEntry> FoodLayers = new();
+
+    public HashSet<string> RevealedLayers = new();
+
+    [DataField]
+    public string Solution = "food";
+
+    [DataField]
+    public LocId? NameGeneration;
+
+    [DataField]
+    public LocId? NamePrefix;
+
+    [DataField]
+    public LocId? ContentSeparator;
+
+    [DataField]
+    public LocId? NameSuffix;
+}
diff --git a/Content.Shared/Nutrition/EntitySystems/SharedFoodSequenceSystem.cs b/Content.Shared/Nutrition/EntitySystems/SharedFoodSequenceSystem.cs
new file mode 100644
index 00000000000..2623e4a7162
--- /dev/null
+++ b/Content.Shared/Nutrition/EntitySystems/SharedFoodSequenceSystem.cs
@@ -0,0 +1,5 @@
+namespace Content.Shared.Nutrition.EntitySystems;
+
+public abstract class SharedFoodSequenceSystem : EntitySystem
+{
+}
diff --git a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
new file mode 100644
index 00000000000..5679dd1b521
--- /dev/null
+++ b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
@@ -0,0 +1,70 @@
+food-sequence-no-space = You can't put any more!
+
+food-sequence-standart-gen = {$prefix}{$content}{$suffix}
+
+#Burger
+food-sequence-burger-suffix = burger
+
+food-sequence-burger-content-raw-meat = raw
+food-sequence-burger-content-carp = carpo
+food-sequence-burger-content-bear = bear
+food-sequence-burger-content-penguin = peng
+food-sequence-burger-content-chiken = chiken
+food-sequence-burger-content-duck = duck
+food-sequence-burger-content-corgi = corgi
+food-sequence-burger-content-crab = crabs
+food-sequence-burger-content-goliath = goli
+food-sequence-burger-content-dragon = dragon
+food-sequence-burger-content-rat = rat
+food-sequence-burger-content-lizard = lizzy
+food-sequence-burger-content-plant = plant
+food-sequence-burger-content-rotten = trash
+food-sequence-burger-content-spider = web
+food-sequence-burger-content-clump = clump
+food-sequence-burger-content-snake = snake
+food-sequence-burger-content-xeno = xeno
+food-sequence-burger-content-tomato = tomato
+food-sequence-burger-content-salami = salami
+food-sequence-burger-content-clown = clown
+food-sequence-burger-content-slime = slime
+
+food-sequence-burger-content-pea = pea
+food-sequence-burger-content-banana = banana
+food-sequence-burger-content-mimana = mimana
+food-sequence-burger-content-carrot = carro
+food-sequence-burger-content-cabbage = cabba
+food-sequence-burger-content-garlic = garli
+food-sequence-burger-content-lemon = lemon
+food-sequence-burger-content-orange = orange
+food-sequence-burger-content-pineapple = pine
+food-sequence-burger-content-potato = potato
+food-sequence-burger-content-apple = apple
+food-sequence-burger-content-cocoa = cocoa
+food-sequence-burger-content-corn = corn
+food-sequence-burger-content-onion = oni
+food-sequence-burger-content-mushroom = shroom
+food-sequence-burger-content-chili = chili
+food-sequence-burger-content-chilly = chilly
+food-sequence-burger-content-aloe = aloe
+food-sequence-burger-content-poppy = poppy
+food-sequence-burger-content-lily = lily
+food-sequence-burger-content-ambrosia = ambro
+food-sequence-burger-content-galaxy = galaxy
+food-sequence-burger-content-glasstle = glass
+food-sequence-burger-content-gatfruit = gat
+food-sequence-burger-content-rice = rice
+food-sequence-burger-content-soy = soy
+food-sequence-burger-content-koibean = koi
+food-sequence-burger-content-watermelon = water
+food-sequence-burger-content-cannabis = funny
+food-sequence-burger-content-rainbow-cannabis = FUNNY
+food-sequence-burger-content-tobacco = tobaco
+
+food-sequence-burger-content-cheese = cheese
+
+food-sequence-burger-content-brain = brain
+food-sequence-burger-content-tongue = tongue
+food-sequence-burger-content-appendix = appendi
+food-sequence-burger-content-ears = ear
+food-sequence-burger-content-stomach = stomach
+food-sequence-burger-content-liver = liver
\ No newline at end of file
diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml
index b088455e6b5..5b073446010 100644
--- a/Resources/Prototypes/Body/Organs/human.yml
+++ b/Resources/Prototypes/Body/Organs/human.yml
@@ -68,7 +68,14 @@
   - type: FlavorProfile
     flavors:
       - people
-
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-brain
+        sprite:
+          sprite: Mobs/Species/Human/organs.rsi
+          state: brain
+  
 - type: entity
   id: OrganHumanEyes
   parent: BaseHumanOrgan
@@ -91,6 +98,13 @@
   components:
   - type: Sprite
     state: tongue
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-tongue
+        sprite:
+          sprite: Mobs/Species/Human/organs.rsi
+          state: tongue
 
 - type: entity
   id: OrganHumanAppendix
@@ -102,6 +116,13 @@
     - state: appendix
     - state: appendix-inflamed
       visible: false
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-appendix
+        sprite:
+          sprite: Mobs/Species/Human/organs.rsi
+          state: appendix
 
 - type: entity
   id: OrganHumanEars
@@ -111,7 +132,13 @@
   components:
   - type: Sprite
     state: ears
-  - type: Ears
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-ears
+        sprite:
+          sprite: Mobs/Species/Human/organs.rsi
+          state: ears
 
 - type: entity
   id: OrganHumanLungs
@@ -201,6 +228,13 @@
     groups:
     - id: Food
     - id: Drink
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-stomach
+        sprite:
+          sprite: Mobs/Species/Human/organs.rsi
+          state: stomach
 
 - type: entity
   id: OrganHumanLiver
@@ -219,6 +253,13 @@
     groups:
     - id: Alcohol
       rateModifier: 0.1 # removes alcohol very slowly along with the stomach removing it as a drink
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-liver
+        sprite:
+          sprite: Mobs/Species/Human/organs.rsi
+          state: liver
 
 - type: entity
   id: OrganHumanKidneys
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
index 8cd1c5dfab6..8daf1e3dba4 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
@@ -23,7 +23,8 @@
         - ReagentId: Vitamin
           Quantity: 5
   - type: Food #All pies here made with a pie tin; unless you're some kind of savage, you're probably not destroying this when you eat or slice the pie!
-    trash: FoodPlateTin
+    trash: 
+    - FoodPlateTin
   - type: SliceableFood
     count: 4
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml
index dc1a4ec74cd..3fbf14a6d60 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml
@@ -88,7 +88,8 @@
     - sweet
     - funny
   - type: Food
-    trash: FoodTinPeachesTrash
+    trash: 
+    - FoodTinPeachesTrash
   - type: Tag
     tags:
     - Fruit
@@ -110,7 +111,8 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/Tins/maint_peaches.rsi
   - type: Food
-    trash: FoodTinPeachesMaintTrash
+    trash: 
+    - FoodTinPeachesMaintTrash
 
 # only exists for backwards compatibility with a few maps, nothing else uses it
 - type: entity
@@ -147,7 +149,8 @@
     - salty
     - cheap
   - type: Food
-    trash: FoodTinBeansTrash
+    trash: 
+    - FoodTinBeansTrash
 
 - type: entity
   parent: FoodTinBaseTrash
@@ -176,7 +179,8 @@
     - salty
     - cheap
   - type: Food
-    trash: FoodTinMRETrash
+    trash: 
+    - FoodTinMRETrash
   - type: Tag
     tags:
     - Meat
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
index 22e6fce8e14..8009779a36d 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
@@ -19,7 +19,69 @@
         reagents:
         - ReagentId: Nutriment
           Quantity: 6.66 # 1/3 of a loaf of bread, technically losing 0.01 nutriment per batch of three buns over making bread loaves/slices
+  - type: Butcherable
+    butcherDelay: 1
+    spawned:
+      - id: FoodBreadBunTop
+        amount: 1
+      - id: FoodBreadBunBottom
+        amount: 1
 
+- type: entity
+  id: FoodBreadBunBottom
+  parent: FoodBreadSliceBase
+  name: bottom bun
+  description: It's time to start building the burger tower. 
+  components:
+  - type: Food
+  - type: Sprite
+    drawdepth: Mobs
+    noRot: true
+    sprite: Objects/Consumable/Food/burger.rsi
+    layers:
+    - state: bun_bottom
+  - type: FoodSequenceStartPoint
+    key: burger
+    maxLayers: 20
+    startPosition: 0, 0
+    offset: 0, 0.1
+    nameGeneration: food-sequence-standart-gen
+    nameSuffix: food-sequence-burger-suffix
+  - type: Appearance
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 3.3 # 1/2 of a bun
+
+- type: entity
+  id: FoodBreadBunTop
+  parent: FoodBreadSliceBase
+  name: top bun
+  description: the perfect finish for your burger tower
+  components:
+  - type: Food
+  - type: Sprite
+    sprite: Objects/Consumable/Food/burger.rsi
+    layers:
+    - state: bun_top
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 3.3 # 1/2 of a bun
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        final: true
+        sprite:
+          sprite: Objects/Consumable/Food/burger.rsi
+          state: bun_top
+  
 # Base
 
 - type: entity
@@ -620,7 +682,8 @@
   description: An elusive rib shaped burger with limited availability across the galaxy. Not as good as you remember it.
   components:
   - type: Food
-    trash: FoodKebabSkewer
+    trash: 
+    - FoodKebabSkewer
   - type: FlavorProfile
     flavors:
       - bun
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
index 8cd2fa70ee5..a4593d50063 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
@@ -11,7 +11,8 @@
       - Egg
       - Meat
   - type: Food
-    trash: Eggshells
+    trash: 
+    - Eggshells
   - type: Sprite
     sprite: Objects/Consumable/Food/egg.rsi
   - type: Item
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml
index c760e5e3ebb..6465b5d06f6 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml
@@ -88,7 +88,8 @@
     - state: popsicle
       color: orange
   - type: Food
-    trash: FoodFrozenPopsicleTrash
+    trash: 
+    - FoodFrozenPopsicleTrash
 
 - type: entity
   name: berry creamsicle
@@ -103,7 +104,8 @@
     - state: popsicle
       color: red
   - type: Food
-    trash: FoodFrozenPopsicleTrash
+    trash: 
+    - FoodFrozenPopsicleTrash
   - type: Tag
     tags:
     - Fruit
@@ -119,7 +121,8 @@
     - state: stick
     - state: jumbo
   - type: Food
-    trash: FoodFrozenPopsicleTrash
+    trash: 
+    - FoodFrozenPopsicleTrash
   - type: SolutionContainerManager
     solutions:
       food:
@@ -149,7 +152,8 @@
         - state: alpha-filling
     #      color: foo
     - type: Food
-      trash: FoodFrozenSnowconeTrash
+      trash: 
+      - FoodFrozenSnowconeTrash
     - type: SolutionContainerManager
       solutions:
         food:
@@ -187,7 +191,8 @@
     - state: cone
     - state: berry
   - type: Food
-    trash: FoodFrozenSnowconeTrash
+    trash: 
+    - FoodFrozenSnowconeTrash
   - type: Tag
     tags:
     - Fruit
@@ -203,7 +208,8 @@
     - state: cone
     - state: fruitsalad
   - type: Food
-    trash: FoodFrozenSnowconeTrash
+    trash: 
+    - FoodFrozenSnowconeTrash
   - type: Tag
     tags:
     - Fruit
@@ -219,7 +225,8 @@
     - state: cone
     - state: clown
   - type: Food
-    trash: FoodFrozenSnowconeTrash
+    trash: 
+    - FoodFrozenSnowconeTrash
 
 - type: entity
   name: mime snowcone
@@ -232,7 +239,8 @@
     - state: cone
     - state: mime
   - type: Food
-    trash: FoodFrozenSnowconeTrash
+    trash: 
+    - FoodFrozenSnowconeTrash
 
 - type: entity
   name: rainbow snowcone
@@ -245,7 +253,8 @@
     - state: cone
     - state: rainbow
   - type: Food
-    trash: FoodFrozenSnowconeTrash
+    trash: 
+    - FoodFrozenSnowconeTrash
 
 # Trash
 
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
index c6c7e5677e5..9e183f35825 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -484,6 +484,13 @@
   - type: SliceableFood
     count: 3
     slice: FoodCheeseSlice
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-cheese
+        sprite:
+          sprite: Objects/Consumable/Food/ingredients.rsi
+          state: cheesewheel
 
 - type: entity
   name: cheese wedge
@@ -503,6 +510,16 @@
         reagents:
         - ReagentId: Nutriment
           Quantity: 5
+  - type: Tag
+    tags:
+    - Slice
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-cheese
+        sprite:
+          sprite: Objects/Consumable/Food/ingredients.rsi
+          state: cheesewedge
 
 - type: entity
   name: chèvre log
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
index 74277cf7ff4..530ca126a59 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
@@ -331,7 +331,8 @@
   description: BBQ ribs, slathered in a healthy coating of BBQ sauce. The least vegan thing to ever exist.
   components:
   - type: Food
-    trash: FoodKebabSkewer
+    trash: 
+    - FoodKebabSkewer
   - type: FlavorProfile
     flavors:
       - meaty
@@ -593,7 +594,8 @@
   description: Buttery.
   components:
   - type: Food
-    trash: FoodPlate
+    trash: 
+    - FoodPlate
   - type: FlavorProfile
     flavors:
       - corn
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index 58af9cf3bd8..4d1eae82d74 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -106,6 +106,13 @@
     graph: MeatSteak
     node: start
     defaultTarget: meat steak
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-raw-meat
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: plain
   - type: Tag
     tags:
     - Meat
@@ -150,6 +157,13 @@
         reagents:
         - ReagentId: CarpoToxin
           Quantity: 5
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-carp
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: fish
   - type: Extractable
     juiceSolution:
       reagents:
@@ -185,6 +199,13 @@
     graph: Bacon
     node: start
     defaultTarget: bacon
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-carp
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: bacon
 
 - type: entity
   name: raw bear meat
@@ -209,6 +230,13 @@
     graph: BearSteak
     node: start
     defaultTarget: filet migrawr
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-bear
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: bear
 
 
 - type: entity
@@ -234,6 +262,13 @@
     graph: PenguinSteak
     node: start
     defaultTarget: cooked penguin
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-penguin
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: bird
 
 - type: entity
   name: raw chicken meat
@@ -260,6 +295,13 @@
     graph: ChickenSteak
     node: start
     defaultTarget: cooked chicken
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-chiken
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: bird
 
 - type: entity
   name: raw duck meat
@@ -284,6 +326,13 @@
     graph: DuckSteak
     node: start
     defaultTarget: cooked duck
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-penguin
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: bird
 
 - type: entity
   name: prime-cut corgi meat
@@ -309,6 +358,13 @@
     price: 750
   - type: StealTarget
     stealGroup: FoodMeatCorgi
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-corgi
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: corgi
 
 - type: entity
   name: raw crab meat
@@ -333,6 +389,13 @@
     graph: CrabSteak
     node: start
     defaultTarget: cooked crab
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-crab
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: crab
 
 - type: entity
   name: raw goliath meat
@@ -356,6 +419,13 @@
     graph: GoliathSteak
     node: start
     defaultTarget: goliath steak
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-goliath
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: goliath
 
 - type: entity
   name: dragon flesh
@@ -383,6 +453,13 @@
       reagents:
       - ReagentId: Ichor
         Quantity: 10
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-dragon
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: dragon
 
 - type: entity
   name: raw rat meat
@@ -403,6 +480,13 @@
   - type: SliceableFood
     count: 3
     slice: FoodMeatCutlet
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-rat
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: plain
 
 - type: entity
   name: raw lizard meat
@@ -427,6 +511,13 @@
     graph: LizardSteak
     node: start
     defaultTarget: lizard steak
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-lizard
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: lizard
 
 - type: entity
   name: raw plant meat
@@ -436,6 +527,13 @@
   components:
   - type: Sprite
     state: plant
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-plant
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: plant
 
 - type: entity
   name: rotten meat
@@ -459,6 +557,13 @@
           Quantity: 4
         - ReagentId: Fat
           Quantity: 4
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-rotten
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: rotten
 
 - type: entity
   name: raw spider meat
@@ -479,6 +584,13 @@
   - type: SliceableFood
     count: 3
     slice: FoodMeatSpiderCutlet
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-spider
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: spider
 
 - type: entity
   name: raw spider leg
@@ -496,6 +608,13 @@
           Quantity: 10
         - ReagentId: Fat
           Quantity: 3
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-spider
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: spiderleg
 
 - type: entity
   name: meatwheat clump
@@ -511,6 +630,13 @@
         reagents:
         - ReagentId: UncookedAnimalProteins
           Quantity: 1
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-clump
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: clump
 
 - type: entity
   name: raw snake meat
@@ -531,6 +657,13 @@
           Quantity: 10
         - ReagentId: Toxin
           Quantity: 2
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-snake
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: snake
 
 - type: entity
   name: raw xeno meat
@@ -558,6 +691,13 @@
   - type: SliceableFood
     count: 3
     slice: FoodMeatXenoCutlet
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-xeno
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: xeno
 
 - type: entity
   name: raw rouny meat
@@ -587,6 +727,13 @@
     graph: RounySteak
     node: start
     defaultTarget: rouny steak
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-xeno
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: xeno
 
 - type: entity
   name: killer tomato meat
@@ -599,6 +746,15 @@
   - type: SliceableFood
     count: 3
     slice: FoodMeatTomatoCutlet
+  - type: StaticPrice
+    price: 100
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-tomato
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: tomato
 
 - type: entity
   name: salami
@@ -644,6 +800,13 @@
     state: clown
   - type: SliceableFood
     slice: FoodMeatSalamiSlice
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-clown
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: clown
 
 - type: entity
   name: meatball
@@ -657,6 +820,13 @@
     - Meat
   - type: Sprite
     state: meatball
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-raw-meat
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: meatball
 
 - type: entity
   name: slimeball
@@ -673,6 +843,13 @@
     - Meat
   - type: Sprite
     state: slime
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-slime
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: slime
 
 # Cooked
 
@@ -736,6 +913,12 @@
   - type: Construction
     graph: MeatSteak
     node: meat steak
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: plain-cooked
 
 - type: entity
   name: bacon
@@ -764,6 +947,15 @@
           Quantity: 5
         - ReagentId: Protein
           Quantity: 5
+  - type: Construction
+    graph: Bacon
+    node: bacon
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: bacon-cooked
 
 - type: entity
   name: cooked bear
@@ -793,6 +985,13 @@
   - type: Construction
     graph: BearSteak
     node: filet migrawr
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-bear
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: product-cooked
 
 - type: entity
   name: penguin filet
@@ -821,6 +1020,13 @@
   - type: Construction
     graph: PenguinSteak
     node: cooked penguin
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-penguin
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: bird-cooked
 
 - type: entity
   name: cooked chicken
@@ -849,6 +1055,13 @@
   - type: Construction
     graph: ChickenSteak
     node: cooked chicken
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-chiken
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: bird-cooked
 
 - type: entity
   name: fried chicken
@@ -877,6 +1090,13 @@
           Quantity: 5
         - ReagentId: Protein
           Quantity: 5
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-chiken
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: chicken-fried
 
 - type: entity
   name: cooked duck
@@ -905,6 +1125,13 @@
   - type: Construction
     graph: DuckSteak
     node: cooked duck
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-duck
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: bird-cooked
 
 - type: entity
   name: cooked crab
@@ -933,6 +1160,13 @@
   - type: Construction
     graph: CrabSteak
     node: cooked crab
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-crab
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: crab-cooked
 
 - type: entity
   name: goliath steak
@@ -959,6 +1193,13 @@
   - type: Construction
     graph: GoliathSteak
     node: goliath steak
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-goliath
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: goliath-cooked
 
 - type: entity
   name: rouny steak
@@ -989,6 +1230,13 @@
   - type: Construction
     graph: RounySteak
     node: rouny steak
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-xeno
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: rouny-cooked
 
 - type: entity
   name: lizard steak
@@ -1018,6 +1266,13 @@
   - type: Construction
     graph: LizardSteak
     node: lizard steak
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-lizard
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: lizard-cooked
 
 - type: entity
   name: boiled spider leg
@@ -1040,6 +1295,13 @@
           Quantity: 5
         - ReagentId: Protein
           Quantity: 5
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-spider
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: spiderleg-cooked
 
 - type: entity
   name: meatball
@@ -1061,6 +1323,12 @@
           Quantity: 5
         - ReagentId: Protein
           Quantity: 5
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: meatball-cooked
 
 # Cutlets
 
@@ -1087,6 +1355,12 @@
           Quantity: 3
         - ReagentId: Fat
           Quantity: 2
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: cutlet
 
 - type: entity
   name: raw bear cutlet
@@ -1112,6 +1386,14 @@
           Quantity: 3
         - ReagentId: Fat
           Quantity: 2
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-bear
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: cutlet
+          color: brown
 
 - type: entity
   name: raw penguin cutlet
@@ -1135,6 +1417,14 @@
           Quantity: 3
         - ReagentId: Fat
           Quantity: 2
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-penguin
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: cutlet
+          color: white
 
 - type: entity
   name: raw chicken cutlet
@@ -1158,6 +1448,14 @@
           Quantity: 3
         - ReagentId: Fat
           Quantity: 2
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-chiken
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: cutlet
+          color: white
 
 - type: entity
   name: raw duck cutlet
@@ -1181,6 +1479,14 @@
           Quantity: 3
         - ReagentId: Fat
           Quantity: 2
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-duck
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: cutlet
+          color: white
 
 - type: entity
   name: raw lizard cutlet
@@ -1207,6 +1513,14 @@
           Quantity: 3
         - ReagentId: Fat
           Quantity: 2
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-lizard
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: cutlet
+          color: pink
 
 - type: entity
   name: raw spider cutlet
@@ -1229,6 +1543,13 @@
           Quantity: 3
         - ReagentId: Fat
           Quantity: 2
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-spider
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: spidercutlet
 
 - type: entity
   name: raw xeno cutlet
@@ -1253,6 +1574,13 @@
         reagents:
         - ReagentId: SulfuricAcid
           Quantity: 20
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-xeno
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: xenocutlet
 
 - type: entity
   name: raw killer tomato cutlet
@@ -1267,6 +1595,15 @@
   - type: Sprite
     state: salami-slice
     color: red
+  - type: StaticPrice
+    price: 30
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-tomato
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: salami-slice
 
 - type: entity
   name: salami slice
@@ -1289,6 +1626,13 @@
           Quantity: 1
         - ReagentId: Protein
           Quantity: 1
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-salami
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: salami-slice
 
 # Cooked
 
@@ -1313,6 +1657,12 @@
           Quantity: 2
         - ReagentId: Protein
           Quantity: 2
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: cutlet-cooked
 
 - type: entity
   name: bear cutlet
@@ -1338,6 +1688,13 @@
           Quantity: 2
         - ReagentId: Protein
           Quantity: 2
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-bear
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: cutlet-cooked
 
 - type: entity
   name: penguin cutlet
@@ -1361,6 +1718,13 @@
           Quantity: 2
         - ReagentId: Protein
           Quantity: 2
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-penguin
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: cutlet-cooked
 
 - type: entity
   name: chicken cutlet
@@ -1384,6 +1748,13 @@
           Quantity: 2
         - ReagentId: Protein
           Quantity: 2
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-chiken
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: cutlet-cooked
 
 - type: entity
   name: duck cutlet
@@ -1407,6 +1778,13 @@
           Quantity: 2
         - ReagentId: Protein
           Quantity: 2
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-duck
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: cutlet-cooked
 
 - type: entity
   name: lizard cutlet
@@ -1431,6 +1809,13 @@
           Quantity: 2
         - ReagentId: Protein
           Quantity: 2
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-lizard
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: cutlet-cooked
 
 - type: entity
   name: spider cutlet
@@ -1453,6 +1838,13 @@
           Quantity: 1
         - ReagentId: Protein
           Quantity: 1
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-spider
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: cutlet-cooked
 
 - type: entity
   name: xeno cutlet
@@ -1475,3 +1867,10 @@
           Quantity: 1
         - ReagentId: Protein
           Quantity: 1
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-xeno
+        sprite:
+          sprite: Objects/Consumable/Food/meat.rsi
+          state: xenocutlet-cooked
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index 3bf253f773b..b70e199243e 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -127,6 +127,13 @@
   - type: Tag
     tags:
     - Vegetable
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-pea
+        sprite:
+          sprite: Objects/Specific/Hydroponics/laughin_pea.rsi
+          state: produce
 
 - type: entity
   name: tower-cap log
@@ -239,7 +246,8 @@
     flavors:
       - banana
   - type: Food
-    trash: TrashBananaPeel
+    trash: 
+    - TrashBananaPeel
   - type: SolutionContainerManager
     solutions:
       food:
@@ -262,6 +270,13 @@
     tags:
     - Fruit
     - Banana
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-banana
+        sprite:
+          sprite: Objects/Specific/Hydroponics/banana.rsi
+          state: produce
 
 - type: entity
   name: mimana
@@ -274,7 +289,8 @@
       - banana
       - nothing
   - type: Food
-    trash: TrashMimanaPeel
+    trash: 
+    - TrashMimanaPeel
   - type: SolutionContainerManager
     solutions:
       food:
@@ -298,6 +314,13 @@
   - type: Tag
     tags:
     - Fruit
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-mimana
+        sprite:
+          sprite: Objects/Specific/Hydroponics/mimana.rsi
+          state: produce
 
 - type: entity
   name: banana peel
@@ -443,6 +466,13 @@
         Quantity: 10
       - ReagentId: Oculine
         Quantity: 2
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-carrot
+        sprite:
+          sprite: Objects/Specific/Hydroponics/carrot.rsi
+          state: produce
 
 - type: entity
   name: cabbage
@@ -469,6 +499,13 @@
   - type: Tag
     tags:
     - Vegetable
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-cabbage
+        sprite:
+          sprite: Objects/Specific/Hydroponics/cabbage.rsi
+          state: produce
 
 - type: entity
   name: garlic
@@ -497,6 +534,13 @@
   - type: Tag
     tags:
     - Vegetable
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-garlic
+        sprite:
+          sprite: Objects/Specific/Hydroponics/garlic.rsi
+          state: produce
 
 - type: entity
   name: lemon
@@ -529,6 +573,13 @@
     tags:
     - Lemon
     - Fruit
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-lemon
+        sprite:
+          sprite: Objects/Specific/Hydroponics/lemon.rsi
+          state: produce
 
 - type: entity
   name: lemoon
@@ -560,6 +611,13 @@
   - type: Tag
     tags:
     - Fruit
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-lemon
+        sprite:
+          sprite: Objects/Specific/Hydroponics/lemoon.rsi
+          state: produce
 
 - type: entity
   name: lime
@@ -583,6 +641,13 @@
     tags:
     - Lime
     - Fruit
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-lemon
+        sprite:
+          sprite: Objects/Specific/Hydroponics/lime.rsi
+          state: produce
 
 - type: entity
   name: orange
@@ -605,6 +670,13 @@
   - type: Tag
     tags:
     - Fruit
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-orange
+        sprite:
+          sprite: Objects/Specific/Hydroponics/orange.rsi
+          state: produce
 
 - type: entity
   name: pineapple
@@ -641,6 +713,13 @@
   - type: Tag
     tags:
     - Fruit
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-pineapple
+        sprite:
+          sprite: Objects/Specific/Hydroponics/pineapple.rsi
+          state: produce
 
 - type: entity
   name: potato
@@ -673,6 +752,13 @@
     tags:
     - Potato
     - Vegetable
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-potato
+        sprite:
+          sprite: Objects/Specific/Hydroponics/potato.rsi
+          state: produce
 
 
 - type: entity
@@ -729,6 +815,13 @@
     tags:
     - Fruit
     - Vegetable
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-tomato
+        sprite:
+          sprite: Objects/Specific/Hydroponics/tomato.rsi
+          state: produce
 
 - type: entity
   name: blue tomato
@@ -774,6 +867,13 @@
     tags:
     - Fruit
     - Vegetable
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-tomato
+        sprite:
+          sprite: Objects/Specific/Hydroponics/blue_tomato.rsi
+          state: produce
 
 - type: entity
   name: blood tomato
@@ -817,6 +917,13 @@
     tags:
     - Fruit # Fuck you they're a fruit
     - Vegetable
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-tomato
+        sprite:
+          sprite: Objects/Specific/Hydroponics/blood_tomato.rsi
+          state: produce
 
 - type: entity
   name: eggplant
@@ -875,6 +982,56 @@
   - type: Tag
     tags:
     - Fruit
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-apple
+        sprite:
+          sprite: Objects/Specific/Hydroponics/apple.rsi
+          state: produce
+
+- type: entity
+  name: golden apple
+  parent: FoodProduceBase
+  id: FoodGoldenApple
+  description: It should be shaped like a cube, shouldn't it?
+  components:
+  - type: FlavorProfile
+    flavors:
+      - apple
+      - metallic
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 30
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+        - ReagentId: Vitamin
+          Quantity: 4
+        - ReagentId: DoctorsDelight
+          Quantity: 13
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/golden_apple.rsi
+  - type: Produce
+    seedId: goldenApple
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: JuiceApple
+        Quantity: 10
+      - ReagentId: Gold
+        Quantity: 10
+  - type: Tag
+    tags:
+    - Fruit
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-apple
+        sprite:
+          sprite: Objects/Specific/Hydroponics/golden_apple.rsi
+          state: produce
 
 - type: entity
   name: cocoa pod
@@ -908,6 +1065,13 @@
   - type: Tag
     tags:
     - Fruit
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-cocoa
+        sprite:
+          sprite: Objects/Specific/Hydroponics/cocoa.rsi
+          state: produce
 
 - type: entity
   name: ear of corn
@@ -919,7 +1083,8 @@
     flavors:
       - corn
   - type: Food
-    trash: FoodCornTrash
+    trash: 
+    - FoodCornTrash
   - type: SolutionContainerManager
     solutions:
       food:
@@ -945,6 +1110,13 @@
         Quantity: 3
       - ReagentId: Enzyme
         Quantity: 2
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-corn
+        sprite:
+          sprite: Objects/Specific/Hydroponics/corn.rsi
+          state: produce
 
 - type: entity
   name: corn cob
@@ -967,6 +1139,13 @@
         reagents:
         - ReagentId: Cornmeal
           Quantity: 10
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-corn
+        sprite:
+          sprite: Objects/Specific/Hydroponics/corn.rsi
+          state: produce
 
 - type: entity
   name: onion
@@ -998,6 +1177,13 @@
   - type: Tag
     tags:
     - Vegetable
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-onion
+        sprite:
+          sprite: Objects/Specific/Hydroponics/onion.rsi
+          state: produce
 
 - type: entity
   name: red onion
@@ -1029,6 +1215,13 @@
   - type: Tag
     tags:
     - Vegetable
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-onion
+        sprite:
+          sprite: Objects/Specific/Hydroponics/onion_red.rsi
+          state: produce
 
 - type: entity
   name: chanterelle cluster
@@ -1049,6 +1242,13 @@
   - type: Tag
     tags:
     - Vegetable
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-mushroom
+        sprite:
+          sprite: Objects/Specific/Hydroponics/chanterelle.rsi
+          state: produce
 
 # Slices
 
@@ -1088,6 +1288,14 @@
   - type: Tag
     tags:
     - Fruit
+    - Slice
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-pineapple
+        sprite:
+          sprite: Objects/Specific/Hydroponics/pineapple.rsi
+          state: slice
 
 - type: entity
   name: onion slice
@@ -1111,6 +1319,17 @@
           Quantity: 1
         - ReagentId: Vitamin
           Quantity: 1
+  - type: Tag
+    tags:
+    - Vegetable
+    - Slice
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-onion
+        sprite:
+          sprite: Objects/Specific/Hydroponics/onion.rsi
+          state: slice
 
 - type: entity
   name: red onion slice
@@ -1134,6 +1353,17 @@
           Quantity: 1
         - ReagentId: Vitamin
           Quantity: 1
+  - type: Tag
+    tags:
+    - Vegetable
+    - Slice
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-onion
+        sprite:
+          sprite: Objects/Specific/Hydroponics/onion_red.rsi
+          state: slice
 
 - type: entity
   name: chili pepper
@@ -1162,6 +1392,13 @@
     - type: Tag
       tags:
       - Vegetable
+    - type: FoodSequenceElement
+      entries:
+        burger:
+          name: food-sequence-burger-content-chili
+          sprite:
+            sprite: Objects/Specific/Hydroponics/chili.rsi
+            state: produce
 
 - type: entity
   name: chilly pepper
@@ -1188,6 +1425,13 @@
       sprite: Objects/Specific/Hydroponics/chilly.rsi
     - type: Produce
       seedId: chilly
+    - type: FoodSequenceElement
+      entries:
+        burger:
+          name: food-sequence-burger-content-chilly
+          sprite:
+            sprite: Objects/Specific/Hydroponics/chilly.rsi
+            state: produce
 
 - type: entity
   name: aloe
@@ -1216,6 +1460,13 @@
   - type: Tag
     tags:
     - Vegetable
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-aloe
+        sprite:
+          sprite: Objects/Specific/Hydroponics/aloe.rsi
+          state: produce
 
 - type: entity
   name: poppy
@@ -1248,6 +1499,13 @@
   - type: Tag
     tags:
     - Flower # TODO add "RedFlower" or "Poppy" tag, when other color flowers will be
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-poppy
+        sprite:
+          sprite: Objects/Specific/Hydroponics/poppy.rsi
+          state: produce
 
 - type: entity
   name: lily
@@ -1276,6 +1534,13 @@
   - type: Tag
     tags:
     - Flower
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-lily
+        sprite:
+          sprite: Objects/Specific/Hydroponics/lily.rsi
+          state: produce
 
 - type: entity
   name: lingzhi
@@ -1302,6 +1567,13 @@
     seedId: lingzhi
   - type: Extractable
     grindableSolutionName: food
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-mushroom
+        sprite:
+          sprite: Objects/Specific/Hydroponics/lingzhi.rsi
+          state: produce
 
 - type: entity
   name: ambrosia vulgaris
@@ -1341,6 +1613,13 @@
   - type: Tag
     tags:
     - Ambrosia
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-ambrosia
+        sprite:
+          sprite: Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi
+          state: produce
 
 - type: entity
   name: ambrosia deus
@@ -1378,6 +1657,13 @@
   - type: Tag
     tags:
     - Ambrosia
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-ambrosia
+        sprite:
+          sprite: Objects/Specific/Hydroponics/ambrosia_deus.rsi
+          state: produce
 
 - type: entity
   name: galaxythistle
@@ -1405,6 +1691,84 @@
     tags:
     - Galaxythistle
     - Fruit # Probably?
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-galaxy
+        sprite:
+          sprite: Objects/Specific/Hydroponics/galaxythistle.rsi
+          state: produce
+
+- type: entity
+  name: glasstle
+  parent: FoodProduceBase
+  id: FoodGlasstle
+  description: A fragile crystal plant with lot of spiky thorns. 
+  components:
+  - type: Item
+    size: Small
+    sprite: Objects/Specific/Hydroponics/glasstle.rsi
+    heldPrefix: produce  
+  - type: FlavorProfile
+    flavors:
+      - sharp
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 15
+        reagents:
+        - ReagentId: Razorium
+          Quantity: 15
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/glasstle.rsi
+  - type: Produce
+    seedId: glasstle
+  - type: Extractable
+    grindableSolutionName: food
+  - type: Damageable 
+    damageContainer: Inorganic
+  - type: ToolRefinable
+    refineResult:
+    - id: SheetGlass1
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 10
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+          params:
+            volume: -4
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlass:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: DamageOnHit 
+    damage:
+      types:
+        Blunt: 10
+  - type: MeleeWeapon
+    wideAnimationRotation: 60
+    damage:
+      types:
+        Slash: 15
+    soundHit:
+        path: /Audio/Weapons/bladeslice.ogg
+  - type: Tag
+    tags:
+    - Galaxythistle
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-glasstle
+        sprite:
+          sprite: Objects/Specific/Hydroponics/glasstle.rsi
+          state: produce
 
 - type: entity
   name: fly amanita
@@ -1431,6 +1795,13 @@
   - type: Extractable
     grindableSolutionName: food
   - type: BadFood
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-mushroom
+        sprite:
+          sprite: Objects/Specific/Hydroponics/fly_amanita.rsi
+          state: produce
 
 - type: entity
   name: gatfruit
@@ -1455,10 +1826,18 @@
   - type: Produce
     seedId: gatfruit
   - type: Food
-    trash: WeaponRevolverPython
+    trash: 
+    - WeaponRevolverPython
   - type: Tag
     tags:
     - Fruit # It's in the name
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-gatfruit
+        sprite:
+          sprite: Objects/Specific/Hydroponics/gatfruit.rsi
+          state: produce
 
 - type: entity
   name: rice bushel
@@ -1476,6 +1855,13 @@
           Quantity: 10
   - type: Produce
     seedId: rice
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-rice
+        sprite:
+          sprite: Objects/Specific/Hydroponics/rice.rsi
+          state: produce
 
 - type: entity
   name: soybeans
@@ -1502,6 +1888,13 @@
   - type: Tag
     tags:
     - Vegetable
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-soy
+        sprite:
+          sprite: Objects/Specific/Hydroponics/soybeans.rsi
+          state: produce
 
 - type: entity
   name: spaceman's trumpet
@@ -1530,6 +1923,13 @@
     - Flower
   - type: Instrument #hehe trumpet
     program: 56
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-soy
+        sprite:
+          sprite: Objects/Specific/Hydroponics/soybeans.rsi
+          state: produce
 
 - type: entity
   name: koibean
@@ -1558,6 +1958,13 @@
   - type: Tag
     tags:
     - Vegetable
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-koibean
+        sprite:
+          sprite: Objects/Specific/Hydroponics/koibean.rsi
+          state: produce
 
 - type: entity
   name: watermelon
@@ -1650,6 +2057,17 @@
       reagents:
       - ReagentId: JuiceWatermelon
         Quantity: 4
+  - type: Tag
+    tags:
+    - Fruit
+    - Slice
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-watermelon
+        sprite:
+          sprite: Objects/Specific/Hydroponics/watermelon.rsi
+          state: slice
 
 - type: entity
   name: grapes
@@ -1723,7 +2141,8 @@
     flavors:
       - bungo
   - type: Food
-    trash: FoodBungoPit
+    trash: 
+    - FoodBungoPit
   - type: SolutionContainerManager
     solutions:
       food:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
index 6c16a541cd9..64b8c288af3 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
@@ -7,7 +7,8 @@
   abstract: true
   components:
   - type: Food
-    trash: FoodKebabSkewer
+    trash: 
+    - FoodKebabSkewer
   - type: Sprite
     sprite: Objects/Consumable/Food/skewer.rsi
   - type: SolutionContainerManager
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
index 9e36d34af7c..13badcb62bd 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -41,7 +41,8 @@
     state: boritos
   - type: Item
   - type: Food
-    trash: FoodPacketBoritosTrash
+    trash: 
+    - FoodPacketBoritosTrash
 
 - type: entity
   name: C&Ds
@@ -56,7 +57,8 @@
     state: cnds
   - type: Item
   - type: Food
-    trash: FoodPacketCnDsTrash
+    trash: 
+    - FoodPacketCnDsTrash
 
 - type: entity
   name: cheesie honkers
@@ -72,7 +74,8 @@
     state: cheesiehonkers
   - type: Item
   - type: Food
-    trash: FoodPacketCheesieTrash
+    trash: 
+    - FoodPacketCheesieTrash
 
 - type: entity
   name: chips
@@ -89,7 +92,8 @@
     state: chips
   - type: Item
   - type: Food
-    trash: FoodPacketChipsTrash
+    trash: 
+    - FoodPacketChipsTrash
 
 - type: entity
   name: chocolate bar
@@ -183,7 +187,8 @@
     state: pistachio
   - type: Item
   - type: Food
-    trash: FoodPacketPistachioTrash
+    trash: 
+    - FoodPacketPistachioTrash
   - type: Tag
     tags:
     - Fruit # Seed of a fruit, you can yell at me
@@ -204,7 +209,8 @@
   - type: Item
     heldPrefix: popcorn
   - type: Food
-    trash: FoodPacketPopcornTrash
+    trash: 
+    - FoodPacketPopcornTrash
 
 - type: entity
   name: 4no raisins
@@ -219,7 +225,8 @@
     state: raisins
   - type: Item
   - type: Food
-    trash: FoodPacketRaisinsTrash
+    trash: 
+    - FoodPacketRaisinsTrash
   - type: Tag
     tags:
     - Fruit
@@ -237,7 +244,8 @@
     state: semki
   - type: Item
   - type: Food
-    trash: FoodPacketSemkiTrash
+    trash: 
+    - FoodPacketSemkiTrash
 
 - type: entity
   name: sus jerky
@@ -252,7 +260,8 @@
     state: susjerky
   - type: Item
   - type: Food
-    trash: FoodPacketSusTrash
+    trash: 
+    - FoodPacketSusTrash
   - type: Tag
     tags:
     - Meat
@@ -270,7 +279,49 @@
     state: syndicakes
   - type: Item
   - type: Food
-    trash: FoodPacketSyndiTrash
+    trash: 
+    - FoodPacketSyndiTrash
+
+- type: entity
+  parent: FoodSnackBase
+  id: DrinkRamen
+  name: cup ramen
+  description: A cheap food with a taste that reminds you of your school years.
+  components:
+  - type: RefillableSolution
+    solution: food
+  - type: InjectableSolution
+    solution: food
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50 #big cup
+        reagents:
+        - ReagentId: DryRamen
+          Quantity: 30
+        - ReagentId: Soysauce
+          Quantity: 5
+  - type: Sprite
+    state: ramen
+  - type: Food
+    trash: 
+    - FoodPacketCupRamenTrash
+
+- type: entity
+  parent: DrinkRamen
+  id: DrinkHellRamen
+  name: hell ramen
+  description: Super spicy flavor!
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: DryRamen
+          Quantity: 30
+        - ReagentId: CapsaicinOil
+          Quantity: 5
 
 - type: entity
   name: chow mein
@@ -296,7 +347,8 @@
         - ReagentId: Soysauce
           Quantity: 2
   - type: Food
-    trash: FoodPacketChowMeinTrash
+    trash: 
+    - FoodPacketChowMeinTrash
 
 - type: entity
   name: dan dan noodles
@@ -324,7 +376,8 @@
         - ReagentId: Soysauce
           Quantity: 2
   - type: Food
-    trash: FoodPacketDanDanTrash
+    trash: 
+    - FoodPacketDanDanTrash
 
 - type: entity
   name: fortune cookie
@@ -349,7 +402,8 @@
     heldPrefix: packet
     size: Tiny
   - type: Food
-    trash: FoodCookieFortune
+    trash: 
+    - FoodCookieFortune
 
 - type: entity
   id: FoodSnackNutribrick
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
index 6b96f3bcb36..5c2a87c2b11 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
@@ -8,7 +8,8 @@
   - type: Item
     storedRotation: -90
   - type: Food
-    trash: FoodBowlBig
+    trash: 
+    - FoodBowlBig
     utensil: Spoon
   - type: SolutionContainerManager
     solutions:
@@ -970,7 +971,8 @@
     flavors:
       - miso
   - type: Food
-    trash: FoodBowlFancy
+    trash: 
+    - FoodBowlFancy
   - type: Sprite
     layers:
     - state: bowl2
diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index b509b8a4c41..2eae810e664 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -525,7 +525,7 @@
     flavors:
       - banana
   - type: Food
-    trash:
+    trash: 
     - TrashBananiumPeel
   - type: BadFood
   - type: SolutionContainerManager
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml
index c26ba925e0d..6bef30e8c7e 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml
@@ -17,6 +17,13 @@
         reagents:
         - ReagentId: THC
           Quantity: 15
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-cannabis
+        sprite:
+          sprite: Objects/Specific/Hydroponics/cannabis.rsi
+          state: produce
 
 
 - type: entity
@@ -37,6 +44,13 @@
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/tobacco.rsi
     state: dried
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-cannabis
+        sprite:
+          sprite: Objects/Specific/Hydroponics/tobacco.rsi
+          state: dried
 
 - type: entity
   name: ground cannabis
@@ -65,6 +79,13 @@
       - Smokable
   - type: Item
     size: Tiny
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-cannabis
+        sprite:
+          sprite: Objects/Misc/reagent_fillings.rsi
+          state: powderpile
     
 - type: entity
   name: rainbow cannabis leaves
@@ -97,6 +118,13 @@
 #         Quantity: 1
         - ReagentId: Psicodine
           Quantity: 0.6
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-rainbow-cannabis
+        sprite:
+          sprite: Objects/Specific/Hydroponics/rainbow_cannabis.rsi
+          state: produce
 
 - type: entity
   name: dried rainbow cannabis leaves
@@ -127,6 +155,13 @@
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/rainbow_cannabis.rsi
     state: dried
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-rainbow-cannabis
+        sprite:
+          sprite: Objects/Specific/Hydroponics/rainbow_cannabis.rsi
+          state: dried
 
 - type: entity
   name: ground rainbow cannabis
@@ -160,6 +195,13 @@
   - type: Construction
     graph: smokeableGroundCannabisRainbow
     node: groundRainbow
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-rainbow-cannabis
+        sprite:
+          sprite: Objects/Specific/Hydroponics/rainbow_cannabis.rsi
+          state: powderpile_rainbow
 
 - type: entity
   name: tobacco leaves
@@ -218,3 +260,10 @@
       - Smokable
   - type: Item
     size: Tiny
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-tobacco
+        sprite:
+          sprite: Objects/Misc/reagent_fillings.rsi
+          state: powderpile
diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/bun_bottom.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/bun_bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..aec759f62a0d4acf5c95c4d3d2cc8178cd07db8a
GIT binary patch
literal 319
zcmV-F0l@x=P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#`AI}UR9J=Wl)Y*KK@>($#AXpJjMcyr!Nx{gF$nttsZHbKrP10K5M)K{Ok*Q#
zSg>*}gb+yKTF8i)$le_hn|sRn`wn;R3@D1CC=cezWm8~CFUQ7fx3h{a!SBrit={Wt
zd@&4xed;12UK|)w8(j74f95ywip4Nw@VU<=A*w)DI6&2})9L{nt09%h6p)19B2kc7
zMv0dhel8Iuo@lLD0FHMo;WwO%!$H`Dfgx?168*Oqc7Ek*6PDvGAEPg3>u+%*=6VHf
zQ=<0#L$}jl=T}a1<#@|vx+F@xT;aI{tOS4+vDjd^<3I49$T_Y*p`s{?asbW!TZ<z1
R;9dX#002ovPDHLkV1h?^i536=

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/bun_top.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/bun_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..8eb16ce1ff1951f47c26c60989e95cc18300feb1
GIT binary patch
literal 367
zcmV-#0g(QQP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$DM>^@R9J=Wlrc-gKp2Lf29ZikD0E7e2w9WTMTC@4aP$YXztR4Hjs+<O#6{Y!
z1zp-H5PA)YL*taw)C@_mxZJbdec#>tes|v;C=?2X;-6_XSv0iCj^`dW&GtHLB0Tmr
zT+0MN4?Px>2smU-j8sk@+GM%#WyhdB==1UTBIB9wu$V;LFAud$R7%Xnd!vBX@(lo^
zW5~Ej1OWR)u-@)!nb4|=yOv2hUjfj)y9MApxGszVdZU1`ua)*mBLe`gWuk|k9LLic
zA`yH>&xk}2PiHcg&R4QO{>;F7yOY&tzQaBdv<Lmd(PzF>$gfJR9w@6!4?Srv7q8O;
zwO;{zU&*mBaGF=})5MLfbJczS6?=^@c-o|=`v=O5<TMdhC=?1s&KGf4eX7$^s8|31
N002ovPDHLkV1mKLpWFZd

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/burger.rsi/meta.json
index 5a7ffa873f3..2ad83dfc3c6 100644
--- a/Resources/Textures/Objects/Consumable/Food/burger.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/burger.rsi/meta.json
@@ -28,6 +28,12 @@
     {
       "name": "bun"
     },
+    {
+      "name": "bun_top"
+    },
+    {
+      "name": "bun_bottom"
+    },
     {
       "name": "c"
     },
diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/tomato.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/tomato.png
index 72242699f2f7c2ecce55bf8f76d73cc827bdc91d..0d749888b0ef7e77887314901f4ea919a3ab4725 100644
GIT binary patch
delta 372
zcmV-)0gL|61Kb0UBNYGvb5ch_0Itp)=>Px$mPtfGR9J<PD^h<7_20F&%BAyIcIx-<
z$m%UsQ#*OqG?$C|=5;!6OTnz`n&)y+<T1MzTe}g@_iSEJr$h@0#T>v$rvT`k-2iZK
zaj5c|<vIY_N*(~aZvsw7f;tfh;AJkd`zFa!L7fMUwr9>Fh>aisk=eDNYpHX#lE+A=
z7&O`>ONBXe=}v#K8mHH_NbSV}YisR*6a=U3MkaxgNvIAaO9d5^v9xL<t-9I(Qcz|M
zPTTFf2L_F{iZ#o11^a7&r&k+5wNVNSg!wfVc}rYi<=*Yfv#&?s5}rg;({$vWo&D`O
zqvC0t*6~PfJUFv2R^zm4qq(_XUOzINjJf)__w>>N02EY&$i4CKz4f!^!0G^Q2$37c
z%TyF(t_9!+;Z}dL`6IT-TpK_j<l75I0EUyXiY+o<3cwFWB*r?Xp+bfFQ~CrwBEb!(
S&;jWH0000<MNUMnLSTY@X0KBK

delta 359
zcmV-t0hs>W1J47HBM1SONkl<Zc$|?qQh)mIT3hAPc`Q5i`*&pZma3_pJZqZEMSb%+
zowuc6)^*KuxhV3OU5l;Vi06AYFQ`+Zg@j@bV5Cz3^v-SoIJh`edChVifNUiXfZaC%
zrz1g~2n6sl7ukK2WT~LegGSpkXA#6k5P-<+TF|xBIa|qNq*DwUZIY$JoVj$TSbvSv
z>sqAtVu7`_c0dY(({>}1z{n(22a=_Nipf}7wUJg`Z2&1Kvj(T__T2-6Mq9<2<+_6X
zHNexW4WQa6g$2U=8jHLoF0gX%_T|~vBX9{%qN!;*^3Klw_MB1iG*0Vyq&6O$*%zyE
zTD8&K+%K;m8BWGrecXF`X#oHVLR945c=+D>S#w}@05^ol4dZ1h3NqIM@PlxxKiT{d
zTV$>cAQ1BH1tS2%$ymh}nJ)$42O|<=9n(;uLWTNM`UKXP!3|HOi8BBI002ovPDHLk
FV1mv3tt0>d

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
index 68f2133a9984185760b34ab2742e08141fe36bf0..3e0c08cf2d6e3c8e3557a85934584fabf8c089d4 100644
GIT binary patch
delta 393
zcmV;40e1d}2eAgQvjKkrXh}ptR9J=Wl|M_vKp4iKhFaPnHBfYj(6Oi>h={A-z{#nT
zZq8lY9J0A&aB@o!N54eYd;lZa>X4zK5L>u}H1r(8ok99138|pmvmKYa_s8=-?*$MN
z5)%3gx_iB)gO^LXiMwlgif7jcT@^Ry_iN8p0+1~}i#+ToM<9PuP$|gL3s~_mCaBNT
zqFYTBVNB3zs~qHTw}<PCL1_?a)n*tI06-!sNF)Wb$U}V|fJ6c0rUC$Pd>4kTmCnaf
za?{c&01T%i0Kj<S@jd29BBc<mhFrQOD-Rg9Mr+|V9N&f9R4|@+Xf<T+%ukTh{gcA&
z$n~*dYxMoY<F<d3C|C&5X{+e&$%ULKM9V+`a7VHbKpNB{!7P<t)6%KqyL`RKjmQ4;
z<^Y(o8DSs{;<$H~s}+^JXr`sp;dI2u^D}tM4N=*X3Vb`lMwdjv+B{SWz?5|a03NQM
neiwj=O-<E5Fd-qK|D`YIWwB9EcN?Ps0000<MNUMnLSO-cPXD=+

delta 479
zcmV<50U-Xd28Rc*vjKkq24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_
z00007bV*G`2j&6<6Cxyhx+%~A000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dak
zSAh-}0004BNkl<ZSi|j=F-yZx6opShEoqP%C^|&wSX2;1#MOU);N;XvH|H*H4%u8X
zIJqT=qkkf6et?l|b;!_Ah%LN?H1s)?gb;&C!?U2gvpsTo_v74iUjQyHE-o&vzoNU>
zTRM8Vq^$21>Nd}x5Be%@&hLed0OXr5A`d&t5l9p;0}<*p4`YJXa@BN8QW3@ky{?*p
z9PSQqeKBeTB36GDgfRgCB%*>uRIrFVw3Y!#6hM{~0D$AWFl>!7cfhoC3IOBz1OPCd
zdD*wrkwjcUblP&GkyI8Nwnl|;8;<WnmK0299y)C~bEXJ#x_`3PIBFLfwnpDSyv%kI
z1*H(Zu8RJiT-%AYgOh>)$Q;Q-q(QA4%*HEZS~_)n_ghz3^KLv2pMMXaEF;C0JszA@
zjzVDdq?(pa$MZ?Ho}a;6EeK`+MMu)rB~kEW9+(4^IRXF=S5KP-C~ghQ9~jsF(if-+
Vu~FH3;57gM002ovPDHLkV1ms~zuW)-

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
index 0bb7ca471b441e1a8e95737a1e226d2158d245d5..cc0a026b59f55fe524fffa5bc072e72acc42ab9b 100644
GIT binary patch
delta 363
zcmV-x0hIpw0)+#RBYyw^b5ch_0Itp)=>Px$KS@MER9J=Wl(9;~Kpcm^rYSTSw6#MK
zA%j&EIyegY2;%6bb#e6p92|-uK7xG<L41XRh@e{qr=|{#me3+;B(3Lgln|$!R#3Qa
zxsX5keLpU_fJURy{6}gHM6H3CMwam%x!(c5Bd-AtSEo}(nSY%V#82fJ)dzxo#Gnn`
z2=0c^4B)5~&)1u3nM$u9tQUoKc17uUk8&<4FXv#T0uP&NJCeF>STBm~#x?-sn`=Iv
zeD0s+Y-udlSqI*C!McU~X}WAPb=8rN=w3o-AlyMhJdwLw;6$kt6$=2Fxi^AW7-b-8
zC*{2=*p`}HxnzLXhkOgH5G*IY->ZVL0P{AOS@4#Bp}@<G{9?^D7`7m&Kv0k~+lu9?
zC><I191#@at^O+Y`f^=7NS~|x9{_l~NFKFGAr-MkqtR&o44*%)T5i~tZsq_0002ov
JPDHLkV1lPgq(1-v

delta 352
zcmV-m0iXVb1Ns7xBYy!wNkl<Zc%1E%ze>YE9LGQDA80UWYlk922CFD^a1`_r#L-Rb
z;_3r9I21vA1p5|(_zDFPLAMG{O*=GNLW`u4ww^->F)q!8xZP*DaKFoazWnYE6bgkx
zp^%{7MAVyzH22KN$ek`YUH=>4bTi#Bu{pRvq$StlE_9C(qkj(cC-5|emJ4U)u)f`j
zzt?YK9f8*<3H|Dh^7#>!d{kb^!$uWec9V5vZfdVl64{-70A>&Oe7`w7_x#%0%pVs`
z_&Nmr5ek=boyg5yF?A6ATktXnYZMU&a%&IFiHuez0H7^>;(owXgGnbUAJo9mlgVQT
zu!m4+gYJQDhFSB28e~>r*??RY?Dc;L@V?;R)Z7+~+u&BgE&4S>59LXTbz!V)gj)<-
y{a0!a{c-g~{wYfR@Ol${YC)hRVueDX2>1b4wOVfEB2GB~0000<MNUMnLSTZpx1<gL

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce.png
index bf5f2fee7aefdfa6693502601c99a9cf4ae63096..be24a81a605a9265ef250233e028b1bc506f0229 100644
GIT binary patch
delta 175
zcmaFG*v2$Lg^RH`$lZxy-8q?;6BX_21xkYaf*Jm!f&&5F&I}9;8J;eVAr`%F&m9zM
zP~cz*XjKv3@c;kq3(KTSGI#B~zWvRFOI?%ytYu`7+#aM*a4UQ1V#W>k6_OXRol$xv
zI&0-diSiQr4TZ&_Zygh5PCr;@t8+&$G4a>wLy!MCJv#Z>^SbV;3aO+s+W((1CHk@o
Usy$=209wl6>FVdQ&MBb@02BRGrvLx|

delta 149
zcmV;G0BZk+0_p*fB#|*Ze*tt-PE!Ct=GbNc003x7L_t(IjqT1c5`ZuW1i%Cg#sKmE
zzm>$X0~-qqy>^cqQu^~s^0Nj2WL!#tz-g_Owg$j{gN%t9FpH>HXr{(u+|m8O#?4i=
z2ZeDggS+;yaJqzr={F0P`wNLD&nI2CsN#+>e>(?p4+RlIo5ETE3jhEBNkvXXu0mjf
DI59r|

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce.png
index 465dd4eefba5cd76ca04263a1f4be64fed919f43..b2a6d230a3c4cd5344cbbe4a3d459834289a48ac 100644
GIT binary patch
delta 161
zcmcc3_=9nR3KwH>kh>GZx^prwCo0<43zP);1vC6d1qTAUof#MyqC8z3Lo9mVo^#}D
zFyL^xC?>K|_shTSqO*4t-<k2w>h^a}kIdXtpUyXFeBLHpVi|JINmO)^me9Rfd)c2R
zrhjl;SYX`l7{hPg-pHG;;9+{@Jxj%z9iQ3P``%?0bYfQ2WM|^#0b0Z0>FVdQ&MBb@
E0L->W)c^nh

delta 133
zcmV;00DAxU0owtPB#|*ZdjWJ(PE!Ct=GbNc003D@L_t(IjqT1s4uCKSM9~%$D+Rp&
zZN(<;95=3v&h~v0O8NKF)rSR9<!L79vNTzhIx3_!k#sY^4)o+;@PSggd%z&ChkL-l
nhZ_h=PmLo1o^#&#hCjU>-sA%z1rHON00000NkvXXu0mjfkTW->

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png
index a03a31182b1513f9953168253a5405d9b45b6989..601dc37fbc89881ee3c8d548f9aff4c70f63dc0d 100644
GIT binary patch
delta 191
zcmcb^_?~fsgct`i0|SH0lCEPwim^Dz-HBn{IhmIe6;<llOM?7@8UBO8()wk;feK1J
zT^vI!dhbqj<ZCeCU^%V#<G=cDm17yV4(**|V$9T?JSX}ZXTs%%Qf_BuhA(}KMVeIQ
zAFZ9>xNXiOy?@4bD<yu~<$jb}*kD(D_gUqKKQ$Yd=6$#DuvvbgG;_m~jeMQ&>Sj&w
rT~v@_5&HYT+!9%n7n6d0thVOyRx&C)5?`|y=mG{$S3j3^P6<r_UP@E<

delta 172
zcmV;d08{_(0o(zQ7zqRe0001iRA<MLE+l^ebW%=J06^y0W&i*HbxA})R49?fj=>Fp
zAPhxI!Mm0P2#t3Iy_2|sj^O?~h!?aSK$|paUef<Qz~5suz)1n$s}EKHxkwO~Ai<ba
z<`FdrMtE&<-o6{IU|PuS?~3!yLUkSZ)Bq3l<n&l5Q;+M*in^pBo_9&&mKQ;Y;+YuX
a!?^&+BnbMpYMpuj0000<MNUMnLSTYcph@ij


From f0b295223a1657f67047317d096ee9579e054057 Mon Sep 17 00:00:00 2001
From: BombasterDS <115770678+BombasterDS@users.noreply.github.com>
Date: Sun, 28 Jul 2024 01:08:49 +1000
Subject: [PATCH 091/366] Some plant mutations (#28993)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Some new plants mutations

* glasstle inhand

* gapple trico increase ↑

1-10 to 3-16

* replace trico with doc delight
---
 Resources/Locale/en-US/seeds/seeds.ftl        |   6 +
 .../Objects/Consumable/Food/produce.yml       | 116 ++++++++++++++++++
 .../Objects/Specific/Hydroponics/seeds.yml    |  31 +++++
 Resources/Prototypes/Hydroponics/seeds.yml    |  78 ++++++++++++
 .../Hydroponics/glasstle.rsi/dead.png         | Bin 0 -> 867 bytes
 .../Hydroponics/glasstle.rsi/harvest.png      | Bin 0 -> 1011 bytes
 .../Hydroponics/glasstle.rsi/meta.json        |  40 ++++++
 .../glasstle.rsi/produce-inhand-left.png      | Bin 0 -> 411 bytes
 .../glasstle.rsi/produce-inhand-right.png     | Bin 0 -> 412 bytes
 .../Hydroponics/glasstle.rsi/produce.png      | Bin 0 -> 835 bytes
 .../Hydroponics/glasstle.rsi/seed.png         | Bin 0 -> 423 bytes
 .../Hydroponics/glasstle.rsi/stage-1.png      | Bin 0 -> 581 bytes
 .../Hydroponics/glasstle.rsi/stage-2.png      | Bin 0 -> 688 bytes
 .../Hydroponics/glasstle.rsi/stage-3.png      | Bin 0 -> 817 bytes
 .../Hydroponics/golden_apple.rsi/dead.png     | Bin 0 -> 390 bytes
 .../Hydroponics/golden_apple.rsi/harvest.png  | Bin 0 -> 688 bytes
 .../Hydroponics/golden_apple.rsi/meta.json    |  41 +++++++
 .../Hydroponics/golden_apple.rsi/produce.png  | Bin 0 -> 478 bytes
 .../Hydroponics/golden_apple.rsi/seed.png     | Bin 0 -> 396 bytes
 .../Hydroponics/golden_apple.rsi/stage-1.png  | Bin 0 -> 166 bytes
 .../Hydroponics/golden_apple.rsi/stage-2.png  | Bin 0 -> 183 bytes
 .../Hydroponics/golden_apple.rsi/stage-3.png  | Bin 0 -> 215 bytes
 .../Hydroponics/golden_apple.rsi/stage-4.png  | Bin 0 -> 286 bytes
 .../Hydroponics/golden_apple.rsi/stage-5.png  | Bin 0 -> 454 bytes
 .../Hydroponics/golden_apple.rsi/stage-6.png  | Bin 0 -> 573 bytes
 .../Hydroponics/papercane.rsi/dead.png        | Bin 0 -> 314 bytes
 .../Hydroponics/papercane.rsi/harvest.png     | Bin 0 -> 296 bytes
 .../Hydroponics/papercane.rsi/meta.json       |  32 +++++
 .../Hydroponics/papercane.rsi/produce.png     | Bin 0 -> 401 bytes
 .../Hydroponics/papercane.rsi/seed.png        | Bin 0 -> 371 bytes
 .../Hydroponics/papercane.rsi/stage-1.png     | Bin 0 -> 143 bytes
 .../Hydroponics/papercane.rsi/stage-2.png     | Bin 0 -> 186 bytes
 .../Hydroponics/papercane.rsi/stage-3.png     | Bin 0 -> 210 bytes
 33 files changed, 344 insertions(+)
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/dead.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/harvest.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce-inhand-left.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce-inhand-right.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/seed.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-3.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/dead.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/harvest.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/seed.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-3.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-4.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-5.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-6.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/dead.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/harvest.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/produce.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/seed.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-3.png

diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl
index 9abfcdaff12..7176c3c1d8e 100644
--- a/Resources/Locale/en-US/seeds/seeds.ftl
+++ b/Resources/Locale/en-US/seeds/seeds.ftl
@@ -32,6 +32,8 @@ seeds-potato-name = potato
 seeds-potato-display-name = potatoes
 seeds-sugarcane-name = sugarcane
 seeds-sugarcane-display-name = sugarcanes
+seeds-papercane-name = papercane
+seeds-papercane-display-name = papercanes
 seeds-towercap-name = tower cap
 seeds-towercap-display-name = tower caps
 seeds-steelcap-name = steel cap
@@ -46,6 +48,8 @@ seeds-eggplant-name = eggplant
 seeds-eggplant-display-name = eggplants
 seeds-apple-name = apple
 seeds-apple-display-name = apple tree
+seeds-goldenapple-name = golden apple
+seeds-goldenapple-display-name = golden apple tree
 seeds-corn-name = corn
 seeds-corn-display-name = ears of corn
 seeds-onion-name = onion
@@ -86,6 +90,8 @@ seeds-ambrosiadeus-name = ambrosia deus
 seeds-ambrosiadeus-display-name = ambrosia deus
 seeds-galaxythistle-name = galaxythistle
 seeds-galaxythistle-display-name = galaxythistle
+seeds-glasstle-name = glasstle
+seeds-glasstle-display-name = glasstle
 seeds-flyamanita-name = fly amanita
 seeds-flyamanita-display-name = fly amanita
 seeds-gatfruit-name = gatfruit
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index b70e199243e..fc005e5015f 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -95,6 +95,21 @@
   - type: Produce
     seedId: sugarcane
 
+- type: entity
+  name: papercane roll
+  description: Why do we even need to grow paper?
+  id: Papercane
+  parent: ProduceBase
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/papercane.rsi
+  - type: SolutionContainerManager
+  - type: Produce
+    seedId: papercane
+  - type: Log
+    spawnedPrototype: SheetPaper1
+    spawnCount: 2
+
 - type: entity
   parent: FoodProduceBase
   id: FoodLaughinPeaPod
@@ -1033,6 +1048,42 @@
           sprite: Objects/Specific/Hydroponics/golden_apple.rsi
           state: produce
 
+- type: entity
+  name: golden apple
+  parent: FoodProduceBase
+  id: FoodGoldenApple
+  description: It should be shaped like a cube, shouldn't it?
+  components:
+  - type: FlavorProfile
+    flavors:
+      - apple
+      - metallic
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 30
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+        - ReagentId: Vitamin
+          Quantity: 4
+        - ReagentId: DoctorsDelight
+          Quantity: 13
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/golden_apple.rsi
+  - type: Produce
+    seedId: goldenApple
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: JuiceApple
+        Quantity: 10
+      - ReagentId: Gold
+        Quantity: 10
+  - type: Tag
+    tags:
+    - Fruit
+
 - type: entity
   name: cocoa pod
   parent: FoodProduceBase
@@ -1770,6 +1821,71 @@
           sprite: Objects/Specific/Hydroponics/glasstle.rsi
           state: produce
 
+- type: entity
+  name: glasstle
+  parent: FoodProduceBase
+  id: FoodGlasstle
+  description: A fragile crystal plant with lot of spiky thorns. 
+  components:
+  - type: Item
+    size: Small
+    sprite: Objects/Specific/Hydroponics/glasstle.rsi
+    heldPrefix: produce  
+  - type: FlavorProfile
+    flavors:
+      - sharp
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 15
+        reagents:
+        - ReagentId: Razorium
+          Quantity: 15
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/glasstle.rsi
+  - type: Produce
+    seedId: glasstle
+  - type: Extractable
+    grindableSolutionName: food
+  - type: Damageable 
+    damageContainer: Inorganic
+  - type: ToolRefinable
+    refineResult:
+    - id: SheetGlass1
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 10
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+          params:
+            volume: -4
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlass:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: DamageOnHit 
+    damage:
+      types:
+        Blunt: 10
+  - type: MeleeWeapon
+    wideAnimationRotation: 60
+    damage:
+      types:
+        Slash: 15
+    soundHit:
+        path: /Audio/Weapons/bladeslice.ogg
+  - type: Tag
+    tags:
+    - Galaxythistle
+
+
 - type: entity
   name: fly amanita
   parent: FoodProduceBase
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
index 92aa22a8bae..9090f75bc36 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -163,6 +163,16 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/sugarcane.rsi
 
+- type: entity
+  parent: SeedBase
+  name: packet of papercane seeds
+  id: PapercaneSeeds
+  components:
+    - type: Seed
+      seedId: papercane
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/papercane.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of tower cap spores
@@ -233,6 +243,16 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/apple.rsi
 
+- type: entity
+  parent: SeedBase
+  name: packet of golden apple seeds
+  id: GoldenAppleSeeds
+  components:
+    - type: Seed
+      seedId: goldenApple
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/golden_apple.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of corn seeds
@@ -417,6 +437,17 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/galaxythistle.rsi
 
+- type: entity
+  parent: SeedBase
+  name: packet of glasstle seeds
+  description: "Scars of gloomy nights."
+  id: GlasstleSeeds
+  components:
+    - type: Seed
+      seedId: glasstle
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/glasstle.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of fly amanita spores
diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index e134d24c26d..e1ae7c7080d 100644
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -341,6 +341,8 @@
   packetPrototype: SugarcaneSeeds
   productPrototypes:
     - Sugarcane
+  mutationPrototypes:
+    - papercane
   harvestRepeat: Repeat
   lifespan: 60
   maturation: 6
@@ -355,6 +357,24 @@
       Max: 5
       potencyDivisor: 5
 
+- type: seed
+  id: papercane
+  name: seeds-papercane-name
+  noun: seeds-noun-seeds
+  displayName: seeds-papercane-display-name
+  plantRsi: Objects/Specific/Hydroponics/papercane.rsi
+  packetPrototype: PapercaneSeeds
+  productPrototypes:
+    - Papercane
+  harvestRepeat: Repeat
+  lifespan: 60
+  maturation: 6
+  production: 6
+  yield: 3
+  potency: 10
+  growthStages: 3
+  idealHeat: 298
+
 - type: seed
   id: towercap
   name: seeds-towercap-name
@@ -592,6 +612,8 @@
   packetPrototype: AppleSeeds
   productPrototypes:
     - FoodApple
+  mutationPrototypes:
+    - goldenApple
   harvestRepeat: Repeat
   lifespan: 55
   maturation: 6
@@ -609,6 +631,38 @@
       Max: 4
       potencyDivisor: 25
 
+- type: seed
+  id: goldenApple
+  name: seeds-goldenapple-name
+  noun: seeds-noun-seeds
+  displayName: seeds-goldenapple-display-name
+  plantRsi: Objects/Specific/Hydroponics/golden_apple.rsi
+  packetPrototype: GoldenAppleSeeds
+  productPrototypes:
+    - FoodGoldenApple
+  harvestRepeat: Repeat
+  lifespan: 55
+  maturation: 6
+  production: 6
+  yield: 3
+  potency: 10
+  idealLight: 6
+  waterConsumption: 0.75
+  nutrientConsumption: 0.75
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 10
+      PotencyDivisor: 10
+    Vitamin:
+      Min: 1
+      Max: 4
+      PotencyDivisor: 25
+    DoctorsDelight:
+      Min: 3
+      Max: 13
+      PotencyDivisor: 10 
+
 - type: seed
   id: corn
   name: seeds-corn-name
@@ -1159,6 +1213,8 @@
   packetPrototype: GalaxythistleSeeds
   productPrototypes:
     - FoodGalaxythistle
+  mutationPrototypes:
+    - glasstle
   lifespan: 25
   maturation: 10
   production: 3
@@ -1172,6 +1228,28 @@
       Max: 25
       potencyDivisor: 4
 
+- type: seed
+  id: glasstle
+  name: seeds-glasstle-name
+  noun: seeds-noun-seeds
+  displayName: seeds-glasstle-display-name
+  plantRsi: Objects/Specific/Hydroponics/glasstle.rsi
+  packetPrototype: GlasstleSeeds
+  productPrototypes:
+    - FoodGlasstle
+  lifespan: 25
+  maturation: 10
+  production: 3
+  yield: 3
+  potency: 10
+  growthStages: 3
+  waterConsumption: 0.5
+  chemicals:
+    Razorium:
+      Min: 1
+      Max: 25
+      PotencyDivisor: 4
+
 - type: seed
   id: flyAmanita
   name: seeds-flyamanita-name
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/dead.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb10912e697abc45db9b07e4c28cd9ae1481086a
GIT binary patch
literal 867
zcmV-p1DyPcP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004lX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7vm2Q!E`WT;Lp6cusQDionYs1;guFuC*#nzSS-
zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYS_3;J6>}?mh0_0YbCFbgL&0=!R{k
zlL;xCTa`ku5D<chIHC%(YICxjg75gcM}V()F`ngr?$0rx<t+vTB;r|CGi~Ax;^|Gh
z#(AGuWF<u-J|~WvbV1@ruB#ruaW1+n@J!Lnr00o6VyW20Y8SJTsS{5TM>O4_d?D+x
z#(9ggUa7P8J^2g6d1Gan>oiA^#3Gg;LxPGr%Ba9bj8=mb3u)R<`1nU$zf3NbTxBqF
zET9S<it7jegWug+g~<soDVzX$UmWLS3<&K4t%l=#A3IL#1PDF@S4PKQZ2~i&q&GTR
z<Omqt1}?5Unz{#E?f}D2HN{k1DM(W&6oB_L`lcK(bPM#adA+swaryvcsH@ZsaBv8W
z7b$z)=iPnXz5RQp-QN$LEONL_u9E@)00EmxL_t(oh3!-^Yr;SneOJgN2p#Mo6cO6e
zu^{>rvbZ`1vWQbSa17|AkWmPkL?|s8U8T^Upa>m06kCuYl%j(mI5}L0@LkUun_9XQ
z?oGMeckg@O%ew#?8X6iJ8vg~R&4p=m0RV0giofDzNd;~Yit%WOv=Obdxjg)4oskI7
zu@X7H!%<SfdbyCz`#qoe%{u#OV>bw;YrhiU2BDya{hrTws}oD6HX&!oxk9lNTXzsD
z)%b(F)rp;u-m79vn~Txy-A-+y0|0P-Robim{>Eo&y&Ht$>1B#Sv4rtx2mp9~_{`9t
z(cR+N5-@0Vg*vV0STbyCqkUpM$6}siv9tlG!6nQmGnCu4EgmUg(CCVji&LyN+uuqJ
z8(B&FZ?97Tk>#Fau}YN-%1PRYazg|4dp^5<f7}r+1(e%0HlNG@Kn91VUoRKnt&Y5o
zX(MV%XH&-+nG-d%w7=R!T-jWHM?kEtrp?9WSzb;EME9T8U!POQnb>PtsdBN}0K`TA
tkVFBz)sfeaCZ&d|t#O1J8X6jh;sbr>+X8RjVl@B&002ovPDHLkV1kfWiWvX^

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/harvest.png
new file mode 100644
index 0000000000000000000000000000000000000000..924aedcea7a612abb9820c0d27b1b60467e41de5
GIT binary patch
literal 1011
zcmV<P0}T9$P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004lX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7vm2Q!E`WT;Lp6cusQDionYs1;guFuC*#nzSS-
zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYS_3;J6>}?mh0_0YbCFbgL&0=!R{k
zlL;xCTa`ku5D<chIHC%(YICxjg75gcM}V()F`ngr?$0rx<t+vTB;r|CGi~Ax;^|Gh
z#(AGuWF<u-J|~WvbV1@ruB#ruaW1+n@J!Lnr00o6VyW20Y8SJTsS{5TM>O4_d?D+x
z#(9ggUa7P8J^2g6d1Gan>oiA^#3Gg;LxPGr%Ba9bj8=mb3u)R<`1nU$zf3NbTxBqF
zET9S<it7jegWug+g~<soDVzX$UmWLS3<&K4t%l=#A3IL#1PDF@S4PKQZ2~i&q&GTR
z<Omqt1}?5Unz{#E?f}D2HN{k1DM(W&6oB_L`lcK(bPM#adA+swaryvcsH@ZsaBv8W
z7b$z)=iPnXz5RQp-QN$LEONL_u9E@)00JvXL_t(oh3!_qi`sA$|D?1WbgEtIO)cml
z#jR60%+xGG;r@csY_1tP-(GMCbn0d(ROA+&(xKp>h;ZX^=N*Yl2zWZ^O$90Cb$a$|
z{N}6q+R+aP@samF@AnI^2Y!6^X&-$6c$8Jabo&GV7fy>_J$;D_r$wSXD-0ba)9urT
z;2OCn&#?IYfNv*d^qh*8t;ae_05Ev}4&%Ff9Od2si>a;|y%H2kd5rJwQ7GlHTud<^
z4N<PuwMvlLfkG*d%XS;=#C$Z=;nj1%_Csn^i^lWUZ#T%VzkV_-FUXt)t;PWW%L`~S
z=&Z<f?d*i)yxV?A09JL^i98ee?Ux&pEgjv)6QS$@)9q6fMYtMYA&R1nW%FnGOKE(s
zP049C-9DLapJdT;>iOLyM4hyEl+7c~{88=&mW%1y#$%(6YH`gD%UKTqettZWaw$uY
zB$q{#Bxf1xO$MD*a-{>dAJVY(eQn##M?+X%K#gkANJ}Z}_MD0_8FaMw!wQxcP`Or@
z_JGO>;6F^sws{vDRi(c-(ju|EfK=rC(<WwR+YhBgvf7G-yO1lVKy0?2Q!#8mB<=|r
zak*Bf%XWJui)Xa;OKIyhOpX~JAlnZ~e2!=Tcti(#PQ|difYK&G>HtT>hT<8)@`8=%
z#OLH?6dO10HW7E5(g0Hzgm`WN;P~_m;(t*dcbm9voUhpuv!FWHTkklhPK=O^AD^Bn
hx7+~-9B{xc_zMY#dEKQCPMH7z002ovPDHLkV1hb-*eC!1

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/meta.json
new file mode 100644
index 00000000000..1359fd7f8cb
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/meta.json
@@ -0,0 +1,40 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    },
+	{
+      "name": "produce-inhand-left",
+	  "directions": 4
+    },
+	{
+      "name": "produce-inhand-right",
+	  "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..0527f86b93771eab13d20a638beee6530c7c9825
GIT binary patch
literal 411
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zLp@y_Ln`LH
zy``Uj$U%bb1N#@5)@6MOZa)Mff=nZ~Kgj;U&=Glu=VVE9<}XIR*mj1SDV%b~JU)r{
zR;r!8F)8i(?zqX%)o1_y{cP1daRntXFj5L@WjGM@RyBIbrdZ9NmT9|#Cg}!6uG(8O
zKRN39F}2qPmpVfgo8#nn-;}t1`DxynuO$cb%#JO%?!JaAvVC%2@8(ENhc#T1KjrwI
zOEcLYNUPZYHtmM%19po!`4T_pZ52;gdWu0nb*D`gf5rbFF28L4mfqJ&j>=ru$Hd^j
z{^tDu<v-WT1fR>?t8wywt>E09y|Y&@zEaqzadK(t`h_*e)~(NU`SB_3%>uRSY7hs5
z$VFMJp8U7+`Nnres6YJV|I!(6WLGR@2>nzqt5(gPwR*|Rock~DHER9b&$qmqeb%WD
z((h$gX#c-{G2(qgcI4ixpLfi<xVuUZWKw!9qv5Z6-<v|CnSi0q;OXk;vd$@?2>?dK
Bw_^YR

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd3cc3216e9e530e9f73fc500ecc37914ea16d25
GIT binary patch
literal 412
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z!#rIaLn`LH
zy|pm!P=E;A1Nkp9t;_ln+$uUEgG?j0Kgh0NIHHr+ma^-hNo_;-I_HL*O)UMAY|9MN
zUzyE}$lP`5TiO5R9tscV6!%-(JGg+s{~Kv5Rc5ts3b1Bmh*u3N_f5UHSLce~qDqa~
zOTDUJzv7?%Sn~EuiRL)@eO@U~{j5qws`<6cFMSME0tx{ora!j)t0#M)>PBm_^^N)K
zByNViHcLo}1~LnB*k32!GOOFON&LvC4BH2fKXX4k9h_~(aN^?Zx{uGddoUy{<6C=^
z;coXk-S1`9jyZn>{@rO7Ka%vw?93HMuUdz_c4|AK*S>pQ{kT2BsTbm0FsXKW*M9N9
z)Ubuszty*=-o4+w!f18CDTYn&-n)j(4Ascpl$y@nb4p8O-~RuHR;+Ofm25heD(ba=
x|MLqo);QgbY>fK9U-SF-Wmg=5rlqXOUwi%D_bvBsNdkkL!PC{xWt~$(697J-yAuEa

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce.png
new file mode 100644
index 0000000000000000000000000000000000000000..11c43d8d13ef2e818537ecb8809909ad270af5ff
GIT binary patch
literal 835
zcmV-J1HAl+P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%{YgYYR9J=8mrqC(Q5?rVqpRaqZs~$+nwqE(dCqHxP76^HMF$HyL=Y_$L4OXJ
z$R0u>sgVAWWI@qEqUf+4jHrnIULu6TS~quVU3GMw+1Yj4&DTNQqPCiGilyK6z4!Zm
z-uL%=Gw;Fw9FKY)3cEQ9>@3#Db-Vft2e{iA5L#5_ZfC%j3kwF&qAI1!U1(9&j=p(-
zj>jLeJN5Mk#bi2;7FC%{$2t5UlpQ<qY}j^R{4%!Re3ebUGw@Da+<QT6yZ%Jv8aEq~
z)djx(pjccqYg{auAsL^*n3@1b5w~}(vz*UT5BU0nqP~0yv1EotPA34(4Ry#%%OR6y
z<E49+9rz=_rPpI(Uc70U%<Gs+bA^ldBMSBIQic?brseLRAdWu`n}RWAS;zC3a2FTw
zGCD<bg^Phvm1?I%ST$&<bTg!A0JG)LHOi{%==C<5%5ACy?JXYZWps*qcPRs-Dzz>-
zEB-bVrrP;UYi4r9v^apn>_mVeMWfm&F{~P_beA$18KJ(SjIe4jttXfsjaW$sm~`Oq
zgOKR;HcGWFnU5(!txG1PXw;Q2A*>oy%{h=xsN6Z&DxG=}G2M)&06N#MlmLcRgGxu5
zkfKpDSB4swOmJKy6&a+ka290$niZx?VEP#D47?KnBbg$qoDv^Xf*P01U{pbi1QDqO
zDP3oC_bp3D(G=;i$6*mtG_Gz~Edk7b{k}|1ppSimv_Zh{lK{3}zAv0^Pj;^Dxb|iu
z=Z@AN@C)yelVV3_PtNg<=P^@G{P7gDt}4&DlQK^g0ON^N&UNiAp1<S3@50;GoxdB=
z(Vjlh<SDZaVF|#0<z`k)O&JWvCXpS5+3}5Sr~m%X==+Gqbq<}sApp+!S|!<0$gTE0
z62O+Wt_3+^3E=F$9a6$b^JC|G+q#8LF}MBuEH~bQI(2u~6;V>`U|5;G4>~d_`uqp}
zeb@gOn>x<r_gx@9PutbE2T&r?`2~n4jr;=4B<(#)Yy&WD|81D}_zL1wMU_J(rYQgb
N002ovPDHLkV1j@vh<N}2

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/seed.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3e99168ddc1b42a6c3d5dfdccbf5c12ef045d30
GIT binary patch
literal 423
zcmV;Y0a*TtP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$VM#<mR9J=Wl`%^~Q5462TJR__kw-21F1aX9LX%5VBm}v*1TOh4#HF>b(bVWt
zAoKyGNoW$M=&4H~l8=gpcnyy$4p!$zQN#T$_i^vx{Qviy!+l_}SS)``Od6QlsfEc*
zfnYq~vlU=;aVpLmH*xE@ie#ohasPPf>bMGkY_%0ibBdipRE3q~)`#cmTnT{Ji4Vvs
zv1(#Kv%ZmDx<9?WA)PDXxN2_VD~wv8#T{4SxQY|CJ^$8cQek5Q*=j3X>~k{_M=3=!
z5v5o(@+$_kh^BkEhwuAz%lV}-!FV9bDVl-BsjfFF3|~ULwHV!U9?w(k9(ioeMzlM9
z0HZdDE1++7es;y?Y!sRB6vLrU>aI5zH^q1e>x~NSPCqg+^hrHEaCtqUc2NA50nt04
zUqQ)`>GB8T0gt`*&%OiF-agN!;+)3+0*Uxra4)*OkpXQ&5+@b6SS*%*!8<;9d+7PQ
RmP-Ht002ovPDHLkV1jc=z3%`3

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4204913b5ead6961b25bc590ecfce8c62276a5d
GIT binary patch
literal 581
zcmV-L0=oT)P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004lX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7vm2Q!E`WT;Lp6cusQDionYs1;guFuC*#nzSS-
zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYS_3;J6>}?mh0_0YbCFbgL&0=!R{k
zlL;xCTa`ku5D<chIHC%(YICxjg75gcM}V()F`ngr?$0rx<t+vTB;r|CGi~Ax;^|Gh
z#(AGuWF<u-J|~WvbV1@ruB#ruaW1+n@J!Lnr00o6VyW20Y8SJTsS{5TM>O4_d?D+x
z#(9ggUa7P8J^2g6d1Gan>oiA^#3Gg;LxPGr%Ba9bj8=mb3u)R<`1nU$zf3NbTxBqF
zET9S<it7jegWug+g~<soDVzX$UmWLS3<&K4t%l=#A3IL#1PDF@S4PKQZ2~i&q&GTR
z<Omqt1}?5Unz{#E?f}D2HN{k1DM(W&6oB_L`lcK(bPM#adA+swaryvcsH@ZsaBv8W
z7b$z)=iPnXz5RQp-QN$LEONL_u9E@)004bSL_t(og=1hC1*2dTjDk@x3P!;w80mnK
zT#X6a@BF`e^92LDpg6;xcvZ5^VIo%}%<|{QHj--u@gQOQo&VUxwbOgBijxBHh5*ds
zC$A{Bhdc)?@Kj-h`O;<K?f=MZmxZ_CY>k8_nuQQf!?e?T;EostqhJ(_0!jb?vJo<5
TV5q(;00000NkvXXu0mjf@b3WT

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..804aa0201271ca56ca431a544417ec8b6d2af80f
GIT binary patch
literal 688
zcmV;h0#E&kP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004lX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7vm2Q!E`WT;Lp6cusQDionYs1;guFuC*#nzSS-
zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYS_3;J6>}?mh0_0YbCFbgL&0=!R{k
zlL;xCTa`ku5D<chIHC%(YICxjg75gcM}V()F`ngr?$0rx<t+vTB;r|CGi~Ax;^|Gh
z#(AGuWF<u-J|~WvbV1@ruB#ruaW1+n@J!Lnr00o6VyW20Y8SJTsS{5TM>O4_d?D+x
z#(9ggUa7P8J^2g6d1Gan>oiA^#3Gg;LxPGr%Ba9bj8=mb3u)R<`1nU$zf3NbTxBqF
zET9S<it7jegWug+g~<soDVzX$UmWLS3<&K4t%l=#A3IL#1PDF@S4PKQZ2~i&q&GTR
z<Omqt1}?5Unz{#E?f}D2HN{k1DM(W&6oB_L`lcK(bPM#adA+swaryvcsH@ZsaBv8W
z7b$z)=iPnXz5RQp-QN$LEONL_u9E@)008JoL_t(og=1hC1*2dTjDk@x3Pu41U`OZn
z|CE}+M2Y5Bc3w*DXJ8~pQ^NK;{}~t<81CMD!N4vk&cMLHz_2G?l`OLeYD(CC=ReFM
zWJ_!(9Qn^KD9-Tw*hYq{GfT*_oG4&B;mCiNg}47}r}x0)8x{gEG2018C{7D_0kY-9
zh{FKPq4)q%iBQtYpCoY@c=C#Hz~FTNx(~I}d;VkdHF^{wt8-a+8?P(yCLUx%C9V7!
zo*&zYmHlM@a)uiV>M+dGPVf0oD1j18y)YlZEWA3igc0U2Nh^P{v)?Ef1*2dTzyJWs
WvtbV+%d(XK0000<MNUMnLSTaCeKB7E

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e6923c9e2da2af76522899cb72285c5869d4c98
GIT binary patch
literal 817
zcmV-11J3-3P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004lX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7vm2Q!E`WT;Lp6cusQDionYs1;guFuC*#nzSS-
zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYS_3;J6>}?mh0_0YbCFbgL&0=!R{k
zlL;xCTa`ku5D<chIHC%(YICxjg75gcM}V()F`ngr?$0rx<t+vTB;r|CGi~Ax;^|Gh
z#(AGuWF<u-J|~WvbV1@ruB#ruaW1+n@J!Lnr00o6VyW20Y8SJTsS{5TM>O4_d?D+x
z#(9ggUa7P8J^2g6d1Gan>oiA^#3Gg;LxPGr%Ba9bj8=mb3u)R<`1nU$zf3NbTxBqF
zET9S<it7jegWug+g~<soDVzX$UmWLS3<&K4t%l=#A3IL#1PDF@S4PKQZ2~i&q&GTR
z<Omqt1}?5Unz{#E?f}D2HN{k1DM(W&6oB_L`lcK(bPM#adA+swaryvcsH@ZsaBv8W
z7b$z)=iPnXz5RQp-QN$LEONL_u9E@)00C)9L_t(oh3!=#Z^A$n{yH-~wN{e_!9Qq*
z!}llb9Co65ehC7L8)jq<)J-fwjF2YNq+7VTCJY25n?k**M@mbtO>cAenQPL#_r33X
z@7@6x78Vu;c)pipn&ZqQ_-FNP$`7Y*V7osf0NBP67K5;Mo>~sH`!i}ZT>yaR2Zv(*
zt$=K=8%-CVA741XxWs<9uFGA$fOM~gR1`fuqS17*->tEYBW&Xco#E1WAPaHI;?8hM
zt!|H6-JTJ#)&U_E38{z)S*4JQUT&@&09Xt{r%3%@TvN3BGh(&be>(L-D&kmO{!#~C
zZ?B!zd~#B$=LdzcJfy4nL`P8#+=eX5)K!^}(pykOUKJ)gB3Fcv>S*%$6jB|{37_nc
z&Z$BN(nQII&>1f2Z9E2$?|rf%@SLRMnLL?}3dL!6c)Ew49~=fM`<+Zjcz?Ld<>GkV
vTT%LmuzgIp7=#Wd_WS_64=gM!Eb8JHQ905+oK>sG00000NkvXXu0mjf(%x?)

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/dead.png
new file mode 100644
index 0000000000000000000000000000000000000000..817c0f4bff16fee612ea7c54b594e29462015f5f
GIT binary patch
literal 390
zcmV;10eSw3P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003^Nkl<Zc${Nk
z7zM)>6gV^dr>h0X{IwZWvK-kUY(By!Pc_StEx~6fvcqT^>@#Dq8xFIS=5Y?Q1e-%>
z7W~)@E^ub}U*OE}|Kc3){|pScLxySqW;x7aWQWX*K^4R1c$$F_BZTGXK~L4Fz~>Y6
zP@%fz$QEJCj@TTB%~2EsTm=$(uAoW0<MJhp4l$yv9AG5ZVIf8g|6R2h7_L8u@F(mg
z&ny;l9kAvc1EY)}#Me*WlWPhC0~5I#VR8TDJ;X6|cK|HtDFq}s;Cv0k|57*XiS2w1
zL>!kq$qwl8)P@^$agO)@BV`Q#&pu>e=-$P^h#dT`S`amcEewq3YZ(4VnL+f<iAB^G
zWP>@exXbwvBLs$J!8x%E|5wM^Vd%kS4g&*;+3<V~!~atc7#Pxjl`=4Veut3Y6=Gmm
k)lGIn90j9b6pU;D0E_LiUhRO))Bpeg07*qoM6N<$f{g~K9smFU

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/harvest.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a49c3f5c53313cc74fc63cf84992621bf5927e3
GIT binary patch
literal 688
zcmV;h0#E&kP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%YDq*vR9J=Wl`&`&Q5?p9DI!SILQ*$PNNJ#;gS2~>>rkx_0#`&z2FVf~gi4Xx
z!AYcp2re0JXxu7j4?@s@1m4m`I#@e(X(9B4ETx6>A}Ydjc)47o^>V#hI+$;HcmI3u
zzTdn5_Y&yoq^b(pF&<Nq(5BN`q~qSzv=*T%B#sTyK|1Cgp*~-ezwOGZLsiJ;hf%rt
zW>}dycDrs?G&tDrYVHpJm=*0$kk@5NA_Z2R#@<i*FZ6+^d5atyJtH8I>gL@Az^bEb
zWd-5bogj`4u{i0k&si?+0MJY>uo-{itq-t!e}F<h(o8Opo*V|iSZRT{W|0RF9V9gb
zWOVOqY<>#j+txY1hwYcv)+o#h1pzc}kEr_lckOyQQ)cmH7RCv@dkA<67H=SzvL#5Q
zFe@5+4itvw;rlmc){Cq@Dyz`N;%dRI>^}l%C0fr2l?6c8%IbJob&Rz<g;}A}AB!u9
zLO$ZI#j1Pvp#WSNB}pPhGk%Y4>j&5NAA5#?xsm7kol*6ye;Ko)p^ufing<7HY5VPn
z1W4DiFm)4SMdM-=^sy4#m!1N!T-;&lz6hLyU;wRFyjq9ViFt?)Kr*RXFrl)6RfpYO
zaK6BmtEv_N!uJ#$HrF!(G#gW7(WeABHd~F>9LH7x-N>tX$2bMSWR&FLab_GzRmhof
zq>)qC=3O<m=boBcCPohFg18W;Z~nWClAN1F&P@{9ICQU!9CE7xpATU5WBB*@{u}zK
z9l#SRGytgGp9z4G^Ll<cb_M`$??H_x31Rmiq9gQT=pmfn_X-1X;8|FPo_gx(Ki4lh
W@gM4Dj2y540000<MNUMnLSTY0hdHeP

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json
new file mode 100644
index 00000000000..775f8df408f
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json
@@ -0,0 +1,41 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    },
+    {
+      "name": "stage-4"
+    },
+    {
+      "name": "stage-5"
+    },
+    {
+      "name": "stage-6"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c369829601ccaf27ce6f0d9a59cc38a55c6eb06
GIT binary patch
literal 478
zcmV<40U`d0P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$m`OxIR9J=Wl)FnDQ51*2nQ`2iUBxAeqNYh_A*)S5!H5tP3roS$)(2^m!oMJh
zqzEZ(?d)TdB83u3DIrA`gF*3$yNo+`cW3XtDSTwRoe6^=+^;_8{J#4HgTY`hJS7fx
z9DT4|&}q)JlY~>8gOZ|I;`PXYUVJr`s#I&4E%bf(qXsvV)~c<zg<s!gbv=}H`WCv-
z%i4N_)$waOZG~%TraskU&q^$?`_|We(_=UT%K&`aS^?nY%rv@wil|9WcJ`V1SWPU^
zvf;~{jP9Q7rz8IY06RB~)iDay-zf1573>305t8!vb0*)1i6q)u6&!k9bORS>MSAis
z3b3L}0K(uH@2)QAI~*n7fYt({RHs@lP_uth5t1B7+>{Op^&kLV_O`AfB$aX_eSs+a
zH?$Nq5H$sW#UFa|?nAh!DFPY$TZu2=IvUTlAQ~bR655Lo!Oh`*#>RD%A3>~+4-39l
zQZq3-K@=&X>JI>(J-@vHd!MfWSlSHIe+A8K%zGL@HZ+;613<=i{wvsEFc|Ln3;so%
Ug6ux(7XSbN07*qoM6N<$g8QS;-T(jq

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/seed.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fc96ba7c2934b8857a0d409c07c6f57674230e5
GIT binary patch
literal 396
zcmV;70dxL|P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$MoC0LR9J=Wl|4(tP!xtAKZZCt2*zHK4q}=tr5&VDNQY)~@<%v0IXStxI63(j
z+{LL|9J-3MxHRo1h0;3dq+1*$A=pIDEd?F!vs}nIocHBDHwhRF2E!k-B5k~?T*o!L
zPJh<pw-ex~8;Iww>bUhBmzrJ2KlXD^&v60hw8B_AQ|uJJQ`p|L3+q9(4ZvU&0kS04
zbqpjZOXWTfpC1USZ9K<KO)TAjvQ!#%mcb}OS&G3Z%B>e6z5|_B7-#o9-a6pq@i47>
zj;kfCZ6Faz#FbwH;O=cdx2HerEziKuTdn*O8<iU_PhA>8bIycx|6&8cT)ZE{Gj{e~
z0B8hFvEaf6vaH>AnU2d$$7KL^pKcd6AbJaueP&ZA64i-cY(RJT<Z~jPsr@gIh`+wi
qxEP*`W@~?nC4EwHgTY|<7kmMB;AtbKJ(!CC0000<MNUMnLSTYBo~O?M

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..e65be188b1ead65e047022e7a40b927041a7c75b
GIT binary patch
literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}37#&FArY;~
z2@<S}6GVEN0u8v_4r)kTO1Qo6{}ic%F1+PDbC~zlESh9|g5`O(1e+O`pY4JxRa`O#
z#%&M(e|;`6ONiZI(o*d;U+fP*FXymZFTi|wRo<sFQefjM7#Oa%3H{xjeegffE(T9m
KKbLh*2~7atsyPk-

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..165e17b57c9f1baa10538828417ae860a493d139
GIT binary patch
literal 183
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}g`O^sArY;~
z2@<S}6GVEN0u8v_4o+aZ{q67aD;#QFCG|gDR{l+4T5<mTbpxINjtWb|pu<I72hYrC
z<YLrfaw{@b`fXRs`SaO?r5g`O8oy9~qk3LPtjNSyKrc1n#~(h$1KLLp9Jt`y7YH%^
b00YCP4dN5k_FJ_AEobm_^>bP0l+XkK;XOgz

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b193a59e3b8299279744948c692ecb677c3c4f3
GIT binary patch
literal 215
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6FprVLn2y}
z6C_v{Cy4Yk1sXg#xUKd-`?*J<(rhP+QrrVLW@v2u^2bo!>#h1>#yG#8=h+elwSMon
z6zpqzXn#gALe_=fz?khJM-k)8zy>y+XbB1SD~wZ^x?~Fe{$#L9NaIm?muRxHVa*Ti
zf@51s4#j;slceZ=ndM;+Tif~f0!(|HczAg3K9MlxayzIY!OFv+p`l&;->+~X&~Xf&
Lu6{1-oD!M<L8eON

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..e66ff1ddc943764b0d59a4b307fbf787a3d94c58
GIT binary patch
literal 286
zcmV+(0pb3MP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#*hxe|R9J=Wl%W~IFc5`b`LGxmi3L!o41vLQ159mJh>F6&3YCn2!!SS)B<(d6
z(MvA~@|&h<bMIa55};5>psnHlQ+#0JeC>_U@$C5EUFOC*0MN?6i;8>N8V<&~PL$3^
zMnz3%^)^CHeUw84BA^vq5RboQBkqTM&<0G*d@<?oAhzFCU$Yk5jriDwaS$|Cz6pb1
zFhR}8-;B}LYK2iFS)nF=!eN^(KJ63;z&0>f{n-X?_u-RE#aT2~`{u%nwd5>nHb>z3
k=qFZd04GkULZMK=3ulFe0UVCfoB#j-07*qoM6N<$f|zT0p#T5?

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-5.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-5.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc1807e0899d514f7465d381794b679a560ed07a
GIT binary patch
literal 454
zcmV;%0XhDOP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$fJsC_R9J=Wl`l`jKp4h<BLs&5g&@H)xsPzm%mii&YHEhcCWKExmP~S{AAoRX
zqK4!Q9?8Val99~8M>s^=YrAgC`Y#joF>UUy@AJI(zRz1|P!)V_jx8ZAqIN;s2*Nex
zPz|{av?H4gk*|$%Fi5Yu?3Kgzpwct=+PK|Vq<ya(zBY11y1u?PNG~9*l{`X7CPx8b
zBp^wyoN%vdBzwW_5)g*uR#3sZpYGlDwNW#{;7;Q%gkd6>K5AGkabL&WUcr1Fp1r=w
zd`n-niinB>?0F75*!rj3AU%`EhWQlw+OS&MY~6_f2yP{Wnh6FkhsQlR^q_JuY9`=e
zoC<Eq`=Z5a$;X1~r=Y#k$aY{G(l#Mbj}<qwN!ZTqVul?u11V4V{9PLM!BCFrwPP1d
z@4ZZU>JgAYl=b&7ynPmnb#N1IA{xzQ$V&;Z1E?el3#bZ(1SGG&*FJ)P`8ps6c>gNr
w|NTFs9hhD|!P!r|aDD+i7uC?9L4$veKj4Atu{5_5tpET307*qoM6N<$f?NR0^Z)<=

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-6.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-6.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2790c179ab92e0291d6f52ba93b23c96925a508
GIT binary patch
literal 573
zcmV-D0>b@?P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$_en%SR9J=Wl&x>uKp4h<nWiDnQnJED%D=Gkk}E5SCON1IGI3!^S^tBP(j$fi
z(=1s5hDXX*SZc|WN+w&f%x~awcDzOPM^qIo4>{k5?|I($ecpp34n?ALYaEElXwnNY
zY0WJz#Dqj?suCQR*116f?4|oIkfCP2FyB?#tQR@V7epI@_a%hD?+ozWOPkR~7$Lh6
zevb`#mYRLXZU0o2cuPesaI}Cd#S^h1smivHs)XsR*#~f3<b&V*-;w%m0f9fE$W1B%
zc`urD+o&Cv-_>@Wr3B0P-;8vip9!}$m-i;x;4H+J!LA3(m`Hs!>F*gmba=obdh|_%
zmx>bylj<ym>5SE_A*aakMBFxI54@~2Q99ZPyrrsZ?TNTfxqR>mE>$gtB5$0ZC{31j
zcEX?%w2178$&e>vbJlSOwc)Ub$acX_?N1yGnQhHSe~=G)d4NRe=nB2M6*W0o3be_Y
zFU&kkdq2(Zdy#K_fGCaA=L)7Xo}Ra7s<L?j2X;X}$WZT&t5Y<I(yLRnT$}Ic%8d2d
zSHqS>uF+PA74iDye?x})`W$_I&S>J%wUTS}(=+@k;K$GL_w?(6J*W+MAVv!S6aAYA
zkn5)ApQmpiz}6njc!&wRAEG_D`*Z^z@@C=V4EQ!y!x2Xu@t@-lY%v3iS|8W)00000
LNkvXXu0mjfH}eq6

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/dead.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c7185bb1e470f850e312ac4ad03db4f19b43af5
GIT binary patch
literal 314
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Up!qLLn2y}
z6C_v{Cy4Yk1sZU5uv|TA_J3n%`_F>4&X3C{B<Trn<f>&dlKgb(OQ6if%R+zRoxDs1
zBF~&Tw0X~_3yiCiHH#RSnVFj#JN3El-?HOy?%i4|(7b9H@5MBsw++wF#|uBzU}Ixz
zyM4Vs;6CG|NsD+uK-O1K;-GbY7;o1Mpwc#pqkIjGUAshkUL<*D>K1HV%zizwBk&DF
z&c1`HZMv}mZy09e$L-zGtk|~h-MhD+uaq;`eR%ekU1Z;;Rf@H;3Q9T+ifuAMA;kyo
z-hM85L?xudY(~TZr!|L+)ys|k{Pw@GcT3R=4Ui{)Ffn{G^bqHpn7s?=e+ExiKbLh*
G2~7ZZLVTP6

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/harvest.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1f2111b252f58bb36342de074f841b5f16aa61d
GIT binary patch
literal 296
zcmV+@0oVSCP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#;z>k7R9J=WlfenYFbqY%OSkAM-lAYl(L*Q6p;I`}EwYN|a8D|ZQ6nYTgo58C
zK^Xt9FBupN{+ZyBgGW9^EO_LUQjRgM3`n&m;#RS}sa!0F<^`@4kPPy7iV62ewCdZD
zI+JR9M_@`o>P+j_ItG&gNu)Nz|4+K%{i60`;ArcY5Inw-|60~2SjD>U01-K0{W6$R
z*t!E(i}<|2P0%kSBFDm#K?ya1`XVXbax9#bbquBvl<)|oT4`1~ci6yI*IKQKfvv8!
uS`z~jTDRSHfYG{bx&u8q-N0Zl7<>RtxVj0W0>1MA0000<MNUMnLSTYGo_&A-

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/meta.json
new file mode 100644
index 00000000000..3f97a14afa6
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/meta.json
@@ -0,0 +1,32 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/produce.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe787f35f520b2b6834b32afaf857fd71c68f0ab
GIT binary patch
literal 401
zcmV;C0dD?@P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$OG!jQR9J=Wlr56NKoCYBTk8-MH{lB01J^nVACW6W<G2Tc3yjDC=o3VZ!So8Y
zhv9dD5URE+uPSE5yy^Zr4FdxMA4F9xgkbsE=u>hLF@UlxY1<Zn*=#oY>RYU;rm9w!
zB>+`b0njuJ0KGgwL`+0XRSh7<NQ{x9D3W}!Sd5^j2wd#ddfS_(VYAt=TCI}zZ4byZ
zcG|Y3u50G=IlzS+;QL+jJmckZ$$r02IRmNX=X9EZyy_TZI(NBOd`sR5AF})lA()8R
zdcC&4Z#eK$2lDBLL)LlT&s6+WYh3J9RYg%0DeG5S{qPXF+_#w1MgGtORMqkUn@*?c
zpY9@d?#_VA$Kx?@%sSs>UAcP6dDh<cylN4#^QH0%7ZK!Hzq{SnIJxkayq87t%Si`z
vyBz?N$%O583-nX<T|x*?ZL)!Zfq%~rGq3j5z5rfX00000NkvXXu0mjftthwq

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/seed.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ba27fa5b7d743fc19d02d60b3dbabfb966c0a4e
GIT binary patch
literal 371
zcmV-(0gV2MP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$ElET{R9J=Wl|M=YK@`S+2C=b8mB@qL&PK2?kpv5^yg)7><N|wx6y6{g5OM*_
zZM=Yzm_|sGZWe~v+1R96i!f2wiM%n07V~QcW*+bR-Z%RPB9TbskJ-@{US`MT(a9mR
z>74IYfZ^4xy6<j?+eA_T&d)BqYa%IyHDse+sWqW?3ab?A2m2e(JMAt2g*AXKiJ$}=
zBI4bDnB3E8ch^a12sR)h>#O)kVGSZeVU72EYXjM+R|4MV%W;F`^xa4ZwUA<;c)v9u
zP17$mv*}#bQ<Z?5zRGgkAb-wTG$)_-LsC#DP@UdQZcJF@Retmq^jib+d^P!Ab1QwF
z0e7D+g`3A~*dQGG5C$cnZEmeq_YD3QXvAL@uiOove&<uHsnd!_B9X|y;0^F|X&qzb
Rm_z^o002ovPDHLkV1n@0q22%h

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b26285f7c086142c962de3dc9f773898f1274c6
GIT binary patch
literal 143
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}o}Mm_ArY-_
zFKpywP~c$=EIoT>x>9p$-;G-uT8x74rtUvE5opMd&W<B*%`V5u+C6)hm}V$<^KRHS
oJA<IBRlAq6q$oEqFflA(?pUjnopAhz5YSKtPgg&ebxsLQ0JZlp4*&oF

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..df5aff42b0c9029fb0ca9fd212bf3db36b7677b0
GIT binary patch
literal 186
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}C7v#hArY-_
zCmM1cFyL^VEO+7R!OxaY66PKDYju*AYF^0lPg<UF{xT5;h8wJcg@PX?ryJclvuEqG
z!0$&5KY4_{uJt&wG%>CJ^0$~@ta=?8CtNvL*Cgz3*#2L(RFm;cO#0mthi}&&HoRGT
jm{HsDz<Wjph5{x}nYfwXKUgOM?Pu_G^>bP0l+XkKgPulA

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c926be364b0482251b68555aac1a245664541ce
GIT binary patch
literal 210
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}J)SO(ArY-_
zCvD_CpuodoA35nz^#(y!U2DVkV8w+;0vRNgRN{X+{V?E{IHo5cC@k2YqIJ0VoJ{hQ
zdvCfoKMmk`xT5`z@yj`@7#J$vPYe=j_s|ai+qV6x-fIR1k;bB*m-wzs(T}*-7&+rW
z9aGTZXk$^v=XVyrTzhjv!?)GDS+~UB)in?n{t<h?fafvOP1c70artk#f$n1PboFyt
I=akR{07f5AE&u=k

literal 0
HcmV?d00001


From f80e507e93980b7f1125d974ca10d21f82157bab Mon Sep 17 00:00:00 2001
From: Redfire1331 <125223432+Redfire1331@users.noreply.github.com>
Date: Thu, 20 Jun 2024 08:34:46 -0400
Subject: [PATCH 092/366] made cup ramen eatable with anything with the fork
 component (#27826)

* made cup ramen eatable with anything with the fork component

* removed extra png

* made cupramen fillable with water, and made hot ramen dry ramen.

---------

Co-authored-by: redfire1331 <Redfire1331@users.noreply.github.com>
---
 .../Objects/Consumable/Drinks/drinks.yml      |  38 --------------
 .../Objects/Consumable/Food/snacks.yml        |  49 ++++++++++++++++++
 .../Consumable/Drinks/ramen.rsi/meta.json     |   1 -
 .../Consumable/Food/snacks.rsi/meta.json      |   5 +-
 .../icon.png => Food/snacks.rsi/ramen.png}    | Bin
 5 files changed, 53 insertions(+), 40 deletions(-)
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/ramen.rsi/meta.json
 rename Resources/Textures/Objects/Consumable/{Drinks/ramen.rsi/icon.png => Food/snacks.rsi/ramen.png} (100%)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
index 701b8ac28ef..ea6889a6158 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -2369,44 +2369,6 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/shake-white.rsi
 
-- type: entity
-  parent: DrinkGlassBase
-  id: DrinkRamen
-  name: cup ramen
-  description: Just add 10ml boiling water. A taste that reminds you of your school years.
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 40 #big cup
-        reagents:
-        - ReagentId: DryRamen
-          Quantity: 25
-        - ReagentId: Soysauce
-          Quantity: 5
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/ramen.rsi
-  - type: Tag
-    tags:
-    - Trash
-  - type: SpaceGarbage
-
-- type: entity
-  parent: DrinkRamen
-  id: DrinkHellRamen
-  name: hell ramen
-  description: Just add 10ml boiling water. Super spicy flavor.
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 40
-        reagents:
-        - ReagentId: DryRamen
-          Quantity: 25
-        - ReagentId: CapsaicinOil
-          Quantity: 5
-
 - type: entity
   parent: DrinkGlass
   id: DrinkBloodGlass
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
index 13badcb62bd..98d7aef10fa 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -323,6 +323,46 @@
         - ReagentId: CapsaicinOil
           Quantity: 5
 
+- type: entity
+  parent: FoodSnackBase
+  id: DrinkRamen
+  name: cup ramen
+  description: A cheap food with a taste that reminds you of your school years.
+  components:
+  - type: RefillableSolution
+    solution: food
+  - type: InjectableSolution
+    solution: food
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50 #big cup
+        reagents:
+        - ReagentId: DryRamen
+          Quantity: 30
+        - ReagentId: Soysauce
+          Quantity: 5
+  - type: Sprite
+    state: ramen
+  - type: Food
+    trash: FoodPacketCupRamenTrash
+
+- type: entity
+  parent: DrinkRamen
+  id: DrinkHellRamen
+  name: hell ramen
+  description: Super spicy flavor!
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: DryRamen
+          Quantity: 30
+        - ReagentId: CapsaicinOil
+          Quantity: 5
+
 - type: entity
   name: chow mein
   parent: FoodSnackBase
@@ -630,6 +670,15 @@
 - type: entity
   categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
+  id: FoodPacketCupRamenTrash
+  name: empty cup ramen
+  components:
+  - type: Sprite
+    state: ramen
+
+- type: entity
+  noSpawn: true
+  parent: FoodPacketTrash
   id: FoodPacketChowMeinTrash
   name: empty chow mein box
   components:
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ramen.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/ramen.rsi/meta.json
deleted file mode 100644
index db0ac608ed0..00000000000
--- a/Resources/Textures/Objects/Consumable/Drinks/ramen.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json
index 6f699103840..4ff3230cae7 100644
--- a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json
@@ -1,12 +1,15 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, chinese from paradise, ticket by peptide, cnds-trash based on boritos-trash and syndicakes modified by potato1234x",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, chinese from paradise, ticket by peptide, cnds-trash based on boritos-trash and syndicakes modified by potato1234x, ramen from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
+    {
+      "name": "ramen"
+    },
     {
       "name": "boritos"
     },
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ramen.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/ramen.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/ramen.rsi/icon.png
rename to Resources/Textures/Objects/Consumable/Food/snacks.rsi/ramen.png

From 66195ff6de465d64eabebceb5e99cd9c51d911b2 Mon Sep 17 00:00:00 2001
From: saga3152 <133799418+saga3152@users.noreply.github.com>
Date: Sun, 22 Sep 2024 17:15:12 +0200
Subject: [PATCH 093/366] Lemons, limes, and oranges can now be mutated into
 each other (#32306)

---
 Resources/Prototypes/Hydroponics/seeds.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index e1ae7c7080d..d53ba9bcfdc 100644
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -180,6 +180,8 @@
     - FoodLemon
   mutationPrototypes:
     - lemoon
+    - lime
+    - orange
   harvestRepeat: Repeat
   lifespan: 55
   maturation: 6
@@ -232,6 +234,9 @@
   packetPrototype: LimeSeeds
   productPrototypes:
     - FoodLime
+  mutationPrototypes:
+    - orange
+    - lemon
   harvestRepeat: Repeat
   lifespan: 55
   maturation: 6
@@ -258,6 +263,10 @@
   packetPrototype: OrangeSeeds
   productPrototypes:
     - FoodOrange
+  mutationPrototypes:
+    - extradimensionalOrange
+    - lemon
+    - lime
   harvestRepeat: Repeat
   lifespan: 55
   maturation: 6

From dd43916bc27b451ee369d44d110e09a216363d2e Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 15:06:00 -0400
Subject: [PATCH 094/366] sliceable!

---
 Content.Server/DeltaV/Nutrition/Events.cs     |  34 ---
 .../EntitySystems/FoodSequenceSystem.cs       |   2 -
 .../EntitySystems/SliceableFoodSystem.cs      | 275 ++++++++----------
 3 files changed, 128 insertions(+), 183 deletions(-)
 delete mode 100644 Content.Server/DeltaV/Nutrition/Events.cs

diff --git a/Content.Server/DeltaV/Nutrition/Events.cs b/Content.Server/DeltaV/Nutrition/Events.cs
deleted file mode 100644
index fb1b2b870bd..00000000000
--- a/Content.Server/DeltaV/Nutrition/Events.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-namespace Content.Server.Nutrition;
-
-/// <summary>
-/// Raised on a food being sliced.
-/// Used by deep frier to apply friedness to slices (e.g. deep fried pizza)
-/// </summary>
-public sealed class SliceFoodEvent : EntityEventArgs
-{
-    /// <summary>
-    /// Who did the slicing?
-    /// <summary>
-    public EntityUid User;
-
-    /// <summary>
-    /// What has been sliced?
-    /// <summary>
-    /// <remarks>
-    /// This could soon be deleted if there was not enough food left to
-    /// continue slicing.
-    /// </remarks>
-    public EntityUid Food;
-
-    /// <summary>
-    /// What is the slice?
-    /// <summary>
-    public EntityUid Slice;
-
-    public SliceFoodEvent(EntityUid user, EntityUid food, EntityUid slice)
-    {
-        User = user;
-        Food = food;
-        Slice = slice;
-    }
-}
diff --git a/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs
index 6970f11b6e1..8045f54f0d1 100644
--- a/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs
@@ -133,8 +133,6 @@ private void MergeTrash(Entity<FoodSequenceStartPointComponent> start, Entity<Fo
             return;
 
         foreach (var trash in elementFood.Trash)
-        {
             startFood.Trash.Add(trash);
-        }
     }
 }
diff --git a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs b/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
index 2dbd6f7b8fc..832d0755970 100644
--- a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
@@ -1,193 +1,174 @@
-using Content.Server.Nutrition; // DeltaV
-using Content.Server.Chemistry.Containers.EntitySystems;
+using Content.Server.DoAfter;
 using Content.Server.Nutrition.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Nutrition;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Examine;
+using Content.Shared.DoAfter;
 using Content.Shared.FixedPoint;
 using Content.Shared.Interaction;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Random;
 using Robust.Shared.Containers;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Systems;
 
-namespace Content.Server.Nutrition.EntitySystems
+namespace Content.Server.Nutrition.EntitySystems;
+
+public sealed class SliceableFoodSystem : EntitySystem
 {
-    public sealed class SliceableFoodSystem : EntitySystem
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
+    [Dependency] private readonly DoAfterSystem _doAfter = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+    public override void Initialize()
     {
-        [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
-        [Dependency] private readonly SharedAudioSystem _audio = default!;
-        [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
-        [Dependency] private readonly TransformSystem _xformSystem = default!;
+        base.Initialize();
+
+        SubscribeLocalEvent<SliceableFoodComponent, InteractUsingEvent>(OnInteractUsing);
+        SubscribeLocalEvent<SliceableFoodComponent, SliceFoodDoAfterEvent>(OnSlicedoAfter);
+        SubscribeLocalEvent<SliceableFoodComponent, ComponentStartup>(OnComponentStartup);
+    }
 
-        public override void Initialize()
+    private void OnInteractUsing(Entity<SliceableFoodComponent> entity, ref InteractUsingEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        var doAfterArgs = new DoAfterArgs(EntityManager,
+            args.User,
+            entity.Comp.SliceTime,
+            new SliceFoodDoAfterEvent(),
+            entity,
+            entity,
+            args.Used)
         {
-            base.Initialize();
+            BreakOnDamage = true,
+            BreakOnMove = true,
+            NeedHand = true,
+        };
+        _doAfter.TryStartDoAfter(doAfterArgs);
+    }
 
-            SubscribeLocalEvent<SliceableFoodComponent, ExaminedEvent>(OnExamined);
-            SubscribeLocalEvent<SliceableFoodComponent, InteractUsingEvent>(OnInteractUsing);
-            SubscribeLocalEvent<SliceableFoodComponent, ComponentStartup>(OnComponentStartup);
-        }
+    private void OnSlicedoAfter(Entity<SliceableFoodComponent> entity, ref SliceFoodDoAfterEvent args)
+    {
+        if (args.Cancelled || args.Handled || args.Args.Target == null)
+            return;
 
-        private void OnInteractUsing(Entity<SliceableFoodComponent> entity, ref InteractUsingEvent args)
-        {
-            if (args.Handled)
-                return;
+        if (TrySliceFood(entity, args.User, args.Used, entity.Comp))
+            args.Handled = true;
+    }
 
-            if (TrySliceFood(entity, args.User, args.Used, entity.Comp))
-                args.Handled = true;
-        }
+    private bool TrySliceFood(EntityUid uid,
+        EntityUid user,
+        EntityUid? usedItem,
+        SliceableFoodComponent? component = null,
+        FoodComponent? food = null,
+        TransformComponent? transform = null)
+    {
+        if (!Resolve(uid, ref component, ref food, ref transform) ||
+            string.IsNullOrEmpty(component.Slice))
+            return false;
 
-        private bool TrySliceFood(EntityUid uid, EntityUid user, EntityUid usedItem,
-            SliceableFoodComponent? component = null, FoodComponent? food = null, TransformComponent? transform = null)
-        {
-            if (!Resolve(uid, ref component, ref food, ref transform) ||
-                string.IsNullOrEmpty(component.Slice))
-            {
-                return false;
-            }
-
-            if (!_solutionContainerSystem.TryGetSolution(uid, food.Solution, out var soln, out var solution))
-            {
-                return false;
-            }
-
-            if (!TryComp<UtensilComponent>(usedItem, out var utensil) || (utensil.Types & UtensilType.Knife) == 0)
-            {
-                return false;
-            }
+        if (!_solutionContainer.TryGetSolution(uid, food.Solution, out var soln, out var solution))
+            return false;
+
+        if (!TryComp<UtensilComponent>(usedItem, out var utensil) || (utensil.Types & UtensilType.Knife) == 0)
+            return false;
 
+        var sliceVolume = solution.Volume / FixedPoint2.New(component.TotalCount);
+        for (int i = 0; i < component.TotalCount; i++)
+        {
             var sliceUid = Slice(uid, user, component, transform);
 
-            var lostSolution = _solutionContainerSystem.SplitSolution(soln.Value, solution.Volume / FixedPoint2.New(component.Count));
+            var lostSolution =
+                _solutionContainer.SplitSolution(soln.Value, sliceVolume);
 
             // Fill new slice
             FillSlice(sliceUid, lostSolution);
+        }
 
-            _audio.PlayPvs(component.Sound, transform.Coordinates, AudioParams.Default.WithVolume(-2));
-            var ev = new SliceFoodEvent(uid, user, usedItem);
-            RaiseLocalEvent(ev);
-
-            // Decrease size of item based on count - Could implement in the future
-            // Bug with this currently is the size in a container is not updated
-            // if (TryComp(uid, out ItemComponent? itemComp) && TryComp(sliceUid, out ItemComponent? sliceComp))
-            // {
-            //     itemComp.Size -= sliceComp.Size;
-            // }
-
-            component.Count--;
-
-            // If someone makes food proto with 1 slice...
-            if (component.Count < 1)
-            {
-                DeleteFood(uid, user, food);
-                return true;
-            }
+        _audio.PlayPvs(component.Sound, transform.Coordinates, AudioParams.Default.WithVolume(-2));
+        var ev = new SliceFoodEvent();
+        RaiseLocalEvent(uid, ref ev);
 
-            // Split last slice
-            if (component.Count > 1)
-                return true;
+        DeleteFood(uid, user, food);
+        return true;
+    }
 
-            sliceUid = Slice(uid, user, component, transform);
+    /// <summary>
+    /// Create a new slice in the world and returns its entity.
+    /// The solutions must be set afterwards.
+    /// </summary>
+    public EntityUid Slice(EntityUid uid,
+        EntityUid user,
+        SliceableFoodComponent? comp = null,
+        TransformComponent? transform = null)
+    {
+        if (!Resolve(uid, ref comp, ref transform))
+            return EntityUid.Invalid;
 
-            // Fill last slice with the rest of the solution
-            FillSlice(sliceUid, solution);
+        var sliceUid = Spawn(comp.Slice, _transform.GetMapCoordinates(uid));
 
-            DeleteFood(uid, user, food);
-            return true;
-        }
+        // try putting the slice into the container if the food being sliced is in a container!
+        // this lets you do things like slice a pizza up inside of a hot food cart without making a food-everywhere mess
+        _transform.DropNextTo(sliceUid, (uid, transform));
+        _transform.SetLocalRotation(sliceUid, 0);
 
-        /// <summary>
-        /// Create a new slice in the world and returns its entity.
-        /// The solutions must be set afterwards.
-        /// </summary>
-        public EntityUid Slice(EntityUid uid, EntityUid user, SliceableFoodComponent? comp = null, TransformComponent? transform = null)
+        if (!_container.IsEntityOrParentInContainer(sliceUid))
         {
-            if (!Resolve(uid, ref comp, ref transform))
-                return EntityUid.Invalid;
-
-            var sliceUid = Spawn(comp.Slice, _xformSystem.GetMapCoordinates(uid));
-
-            // try putting the slice into the container if the food being sliced is in a container!
-            // this lets you do things like slice a pizza up inside of a hot food cart without making a food-everywhere mess
-            if (_containerSystem.TryGetContainingContainer(uid, out var container) && _containerSystem.CanInsert(sliceUid, container))
-            {
-                _containerSystem.Insert(sliceUid, container);
-            }
-            else // puts it down "right-side up"
-            {
-                _xformSystem.AttachToGridOrMap(sliceUid);
-                _xformSystem.SetLocalRotation(sliceUid, 0);
-            }
-
-            // DeltaV - Begin deep frier related code
-            var sliceEvent = new SliceFoodEvent(user, uid, sliceUid);
-            RaiseLocalEvent(uid, sliceEvent);
-            // DeltaV - End deep frier related code
-
-            return sliceUid;
+            var randVect = _random.NextVector2(2.0f, 2.5f);
+            if (TryComp<PhysicsComponent>(sliceUid, out var physics))
+                _physics.SetLinearVelocity(sliceUid, randVect, body: physics);
         }
 
-        private void DeleteFood(EntityUid uid, EntityUid user, FoodComponent foodComp)
+        return sliceUid;
+    }
+
+    private void DeleteFood(EntityUid uid, EntityUid user, FoodComponent foodComp)
+    {
+        var ev = new BeforeFullySlicedEvent
+        {
+            User = user
+        };
+        RaiseLocalEvent(uid, ev);
+        if (ev.Cancelled)
+            return;
+
+        // Locate the sliced food and spawn its trash
+        foreach (var trash in foodComp.Trash)
         {
-            var ev = new BeforeFullySlicedEvent
-            {
-                User = user
-            };
-            RaiseLocalEvent(uid, ev);
-            if (ev.Cancelled)
-                return;
-
-            if (foodComp.Trash.Count == 0)
-            {
-                QueueDel(uid);
-                return;
-            }
-
-            // Locate the sliced food and spawn its trash
-            foreach (var trash in foodComp.Trash)
-            {
-                var trashUid = Spawn(trash, _xformSystem.GetMapCoordinates(uid));
+            var trashUid = Spawn(trash, _transform.GetMapCoordinates(uid));
 
             // try putting the trash in the food's container too, to be consistent with slice spawning?
-            if (_containerSystem.TryGetContainingContainer(uid, out var container) && _containerSystem.CanInsert(trashUid, container))
-            {
-                _containerSystem.Insert(trashUid, container);
-            }
-            else // puts it down "right-side up"
-            {
-                _xformSystem.AttachToGridOrMap(trashUid);
-                _xformSystem.SetLocalRotation(trashUid, 0);
-            }
-
-            QueueDel(uid);
+            _transform.DropNextTo(trashUid, uid);
+            _transform.SetLocalRotation(trashUid, 0);
         }
 
-        private void FillSlice(EntityUid sliceUid, Solution solution)
-        {
-            // Replace all reagents on prototype not just copying poisons (example: slices of eaten pizza should have less nutrition)
-            if (TryComp<FoodComponent>(sliceUid, out var sliceFoodComp) &&
-                _solutionContainerSystem.TryGetSolution(sliceUid, sliceFoodComp.Solution, out var itsSoln, out var itsSolution))
-            {
-                _solutionContainerSystem.RemoveAllSolution(itsSoln.Value);
-
-                var lostSolutionPart = solution.SplitSolution(itsSolution.AvailableVolume);
-                _solutionContainerSystem.TryAddSolution(itsSoln.Value, lostSolutionPart);
-            }
-        }
+        QueueDel(uid);
+    }
 
-        private void OnComponentStartup(Entity<SliceableFoodComponent> entity, ref ComponentStartup args)
+    private void FillSlice(EntityUid sliceUid, Solution solution)
+    {
+        // Replace all reagents on prototype not just copying poisons (example: slices of eaten pizza should have less nutrition)
+        if (TryComp<FoodComponent>(sliceUid, out var sliceFoodComp) &&
+            _solutionContainer.TryGetSolution(sliceUid, sliceFoodComp.Solution, out var itsSoln, out var itsSolution))
         {
-            entity.Comp.Count = entity.Comp.TotalCount;
+            _solutionContainer.RemoveAllSolution(itsSoln.Value);
 
-            var foodComp = EnsureComp<FoodComponent>(entity);
-            _solutionContainerSystem.EnsureSolution(entity.Owner, foodComp.Solution);
+            var lostSolutionPart = solution.SplitSolution(itsSolution.AvailableVolume);
+            _solutionContainer.TryAddSolution(itsSoln.Value, lostSolutionPart);
         }
+    }
 
-        private void OnExamined(Entity<SliceableFoodComponent> entity, ref ExaminedEvent args)
-        {
-            args.PushMarkup(Loc.GetString("sliceable-food-component-on-examine-remaining-slices-text", ("remainingCount", entity.Comp.Count)));
-        }
+    private void OnComponentStartup(Entity<SliceableFoodComponent> entity, ref ComponentStartup args)
+    {
+        var foodComp = EnsureComp<FoodComponent>(entity);
+        _solutionContainer.EnsureSolution(entity.Owner, foodComp.Solution, out _);
     }
 }

From 8a73eb17627026351ccc77378080c209277d8d3a Mon Sep 17 00:00:00 2001
From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Tue, 13 Aug 2024 13:53:59 +0300
Subject: [PATCH 095/366] Sliceable doAfter (#30824)

* init

* wtf git
---
 .../Components/SliceableFoodComponent.cs       | 18 ++++++++++++------
 .../EntitySystems/SliceableFoodSystem.cs       |  2 ++
 Content.Shared/Nutrition/Events.cs             |  8 ++++++++
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/Content.Server/Nutrition/Components/SliceableFoodComponent.cs b/Content.Server/Nutrition/Components/SliceableFoodComponent.cs
index 2b74d0c67ec..7877e91d031 100644
--- a/Content.Server/Nutrition/Components/SliceableFoodComponent.cs
+++ b/Content.Server/Nutrition/Components/SliceableFoodComponent.cs
@@ -11,21 +11,27 @@ public sealed partial class SliceableFoodComponent : Component
     /// Prototype to spawn after slicing.
     /// If null then it can't be sliced.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public EntProtoId? Slice;
 
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Items/Culinary/chop.ogg");
 
     /// <summary>
     /// Number of slices the food starts with.
     /// </summary>
-    [DataField("count"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField("count")]
     public ushort TotalCount = 5;
 
     /// <summary>
-    /// Number of slices left.
+    /// how long it takes for this food to be sliced
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    public ushort Count;
+    [DataField]
+    public float SliceTime = 1f;
+
+    /// <summary>
+    /// all the pieces will be shifted in random directions.
+    /// </summary>
+    [DataField]
+    public float SpawnOffset = 0.5f;
 }
diff --git a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs b/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
index 832d0755970..ae7b05c604d 100644
--- a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
@@ -1,3 +1,4 @@
+using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.DoAfter;
 using Content.Server.Nutrition.Components;
 using Content.Shared.Chemistry.EntitySystems;
@@ -172,3 +173,4 @@ private void OnComponentStartup(Entity<SliceableFoodComponent> entity, ref Compo
         _solutionContainer.EnsureSolution(entity.Owner, foodComp.Solution, out _);
     }
 }
+
diff --git a/Content.Shared/Nutrition/Events.cs b/Content.Shared/Nutrition/Events.cs
index f2936d603d9..abba2583ba4 100644
--- a/Content.Shared/Nutrition/Events.cs
+++ b/Content.Shared/Nutrition/Events.cs
@@ -59,3 +59,11 @@ public VapeDoAfterEvent(Solution solution, bool forced)
 /// </summary>
 [ByRefEvent]
 public record struct SliceFoodEvent();
+
+/// <summary>
+/// is called after a successful attempt at slicing food.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed partial class SliceFoodDoAfterEvent : SimpleDoAfterEvent
+{
+}

From 982e5d516abea7ca3a0ca3323847e5b933c97297 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 15:18:56 -0400
Subject: [PATCH 096/366] use dv deepfryer changes

---
 Content.Server/DeltaV/Nutrition/Events.cs     | 38 +++++++++++++++++++
 .../Nutrition/EntitySystems/FoodSystem.cs     |  1 +
 .../EntitySystems/SliceableFoodSystem.cs      |  7 +++-
 .../Kitchen/EntitySystems/DeepFryerSystem.cs  |  7 ++--
 4 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 Content.Server/DeltaV/Nutrition/Events.cs

diff --git a/Content.Server/DeltaV/Nutrition/Events.cs b/Content.Server/DeltaV/Nutrition/Events.cs
new file mode 100644
index 00000000000..403484f4cb6
--- /dev/null
+++ b/Content.Server/DeltaV/Nutrition/Events.cs
@@ -0,0 +1,38 @@
+namespace Content.Server.Nutrition;
+
+/// <summary>
+/// Raised on a food being sliced.
+/// Used by deep frier to apply friedness to slices (e.g. deep fried pizza)
+/// </summary>
+/// <remarks>
+/// Not to be confused with upstream SliceFoodEvent which doesn't pass the slice entities, and is only raised once.
+/// </remarks>
+[ByRefEvent]
+public sealed class FoodSlicedEvent : EntityEventArgs
+{
+    /// <summary>
+    /// Who did the slicing?
+    /// <summary>
+    public EntityUid User;
+
+    /// <summary>
+    /// What has been sliced?
+    /// <summary>
+    /// <remarks>
+    /// This could soon be deleted if there was not enough food left to
+    /// continue slicing.
+    /// </remarks>
+    public EntityUid Food;
+
+    /// <summary>
+    /// What is the slice?
+    /// <summary>
+    public EntityUid Slice;
+
+    public FoodSlicedEvent(EntityUid user, EntityUid food, EntityUid slice)
+    {
+        User = user;
+        Food = food;
+        Slice = slice;
+    }
+}
\ No newline at end of file
diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
index ad43477e782..ecc67c8315d 100644
--- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
@@ -59,6 +59,7 @@ public sealed class FoodSystem : EntitySystem
     [Dependency] private readonly StomachSystem _stomach = default!;
     [Dependency] private readonly UtensilSystem _utensil = default!;
     [Dependency] private readonly IConfigurationManager _config = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
 
     public const float MaxFeedDistance = 1.0f;
 
diff --git a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs b/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
index ae7b05c604d..71360c1cb47 100644
--- a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
@@ -1,4 +1,3 @@
-using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.DoAfter;
 using Content.Server.Nutrition.Components;
 using Content.Shared.Chemistry.EntitySystems;
@@ -121,6 +120,11 @@ public EntityUid Slice(EntityUid uid,
         _transform.DropNextTo(sliceUid, (uid, transform));
         _transform.SetLocalRotation(sliceUid, 0);
 
+        // DeltaV - start of deep frier stuff
+        var slicedEv = new FoodSlicedEvent(user, uid, sliceUid);
+        RaiseLocalEvent(uid, ref slicedEv);
+        // DeltaV - end of deep frier stuff
+
         if (!_container.IsEntityOrParentInContainer(sliceUid))
         {
             var randVect = _random.NextVector2(2.0f, 2.5f);
@@ -173,4 +177,3 @@ private void OnComponentStartup(Entity<SliceableFoodComponent> entity, ref Compo
         _solutionContainer.EnsureSolution(entity.Owner, foodComp.Solution, out _);
     }
 }
-
diff --git a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs
index 1e030a9f3db..74d4f5a1ac0 100644
--- a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs
+++ b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+    using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Server.Audio;
@@ -38,6 +38,7 @@
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Movement.Events;
+using Content.Shared.Nutrition;
 using Content.Shared.Nyanotrasen.Kitchen;
 using Content.Shared.Nyanotrasen.Kitchen.Components;
 using Content.Shared.Nyanotrasen.Kitchen.UI;
@@ -124,7 +125,7 @@ public override void Initialize()
         SubscribeLocalEvent<DeepFriedComponent, ComponentInit>(OnInitDeepFried);
         SubscribeLocalEvent<DeepFriedComponent, ExaminedEvent>(OnExamineFried);
         SubscribeLocalEvent<DeepFriedComponent, PriceCalculationEvent>(OnPriceCalculation);
-        SubscribeLocalEvent<DeepFriedComponent, SliceFoodEvent>(OnSliceDeepFried);
+        SubscribeLocalEvent<DeepFriedComponent, FoodSlicedEvent>(OnSliceDeepFried);
     }
 
     private void UpdateUserInterface(EntityUid uid, DeepFryerComponent component)
@@ -723,7 +724,7 @@ private void OnPriceCalculation(EntityUid uid, DeepFriedComponent component, ref
         args.Price *= component.PriceCoefficient;
     }
 
-    private void OnSliceDeepFried(EntityUid uid, DeepFriedComponent component, SliceFoodEvent args)
+    private void OnSliceDeepFried(EntityUid uid, DeepFriedComponent component, FoodSlicedEvent args)
     {
         MakeCrispy(args.Slice);
 

From 7f76d90e5f50195d75edd6f34c574b92edd6532f Mon Sep 17 00:00:00 2001
From: Verm <32827189+Vermidia@users.noreply.github.com>
Date: Sun, 2 Jun 2024 22:28:53 -0500
Subject: [PATCH 097/366] Welding tweaks (#27959)

---
 .../Configurable/ConfigurationSystem.cs       |  6 +-
 Content.Server/Construction/RefiningSystem.cs | 51 -------------
 .../DamageOnToolInteractComponent.cs          | 27 ++++---
 .../Systems/DamageOnToolInteractSystem.cs     |  5 +-
 .../Mech/Systems/MechAssemblySystem.cs        |  5 +-
 Content.Server/Mech/Systems/MechSystem.cs     |  4 +-
 .../PneumaticCannon/PneumaticCannonSystem.cs  |  8 +--
 .../Melee/EnergySword/EnergySwordSystem.cs    |  6 +-
 .../ArtifactElectricityTriggerSystem.cs       |  4 +-
 .../EntitySystems/AnchorableSystem.cs         |  2 +-
 .../EntitySystems/EncryptionKeySystem.cs      |  2 +-
 .../Tools/Components/ToolComponent.cs         | 71 ++++++++-----------
 .../Components/ToolRefinableComponent.cs      | 10 +--
 .../Tools/Systems/SharedToolSystem.Welder.cs  | 22 +++---
 .../Tools/Systems/SharedToolSystem.cs         |  3 +-
 .../Tools/Systems/ToolRefinableSystem.cs      | 53 ++++++++++++++
 .../Prototypes/Entities/Mobs/NPCs/animals.yml |  2 +-
 .../Prototypes/Entities/Mobs/NPCs/xeno.yml    |  2 +-
 .../Consumable/Drinks/drinks_bottles.yml      |  2 +-
 .../Objects/Consumable/Drinks/drinks_cans.yml |  2 +-
 .../Entities/Objects/Materials/shards.yml     | 10 +--
 .../Entities/Objects/Misc/broken_bottle.yml   |  2 +-
 .../Objects/Misc/fire_extinguisher.yml        |  2 +-
 .../Entities/Objects/Power/lights.yml         | 14 ++--
 .../Entities/Objects/Tools/cowtools.yml       | 10 +--
 .../Entities/Objects/Tools/gas_tanks.yml      |  2 +-
 .../Entities/Objects/Tools/jaws_of_life.yml   |  4 +-
 .../Entities/Objects/Tools/tools.yml          |  4 +-
 .../Entities/Objects/Tools/welders.yml        |  4 +-
 .../Objects/Weapons/Melee/baseball_bat.yml    |  2 +-
 .../Structures/Storage/Tanks/tanks.yml        |  4 +-
 .../Structures/Wallmounts/walldispenser.yml   |  3 +-
 .../XenoArch/Effects/utility_effects.yml      |  2 +-
 33 files changed, 175 insertions(+), 175 deletions(-)
 delete mode 100644 Content.Server/Construction/RefiningSystem.cs
 rename Content.Server/Construction/Components/WelderRefinableComponent.cs => Content.Shared/Tools/Components/ToolRefinableComponent.cs (61%)
 create mode 100644 Content.Shared/Tools/Systems/ToolRefinableSystem.cs

diff --git a/Content.Server/Configurable/ConfigurationSystem.cs b/Content.Server/Configurable/ConfigurationSystem.cs
index 5f5f1ef7d16..bf89c3f7ed1 100644
--- a/Content.Server/Configurable/ConfigurationSystem.cs
+++ b/Content.Server/Configurable/ConfigurationSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Configurable;
 using Content.Shared.Interaction;
 using Content.Shared.Tools.Components;
+using Content.Shared.Tools.Systems;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
@@ -11,6 +12,7 @@ namespace Content.Server.Configurable;
 public sealed class ConfigurationSystem : EntitySystem
 {
     [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
+    [Dependency] private readonly SharedToolSystem _toolSystem = default!;
 
     public override void Initialize()
     {
@@ -28,7 +30,7 @@ private void OnInteractUsing(EntityUid uid, ConfigurationComponent component, In
         if (args.Handled)
             return;
 
-        if (!TryComp(args.Used, out ToolComponent? tool) || !tool.Qualities.Contains(component.QualityNeeded))
+        if (!_toolSystem.HasQuality(args.Used, component.QualityNeeded))
             return;
 
         args.Handled = _uiSystem.TryOpenUi(uid, ConfigurationUiKey.Key, args.User);
@@ -68,7 +70,7 @@ private void OnUpdate(EntityUid uid, ConfigurationComponent component, Configura
 
     private void OnInsert(EntityUid uid, ConfigurationComponent component, ContainerIsInsertingAttemptEvent args)
     {
-        if (!TryComp(args.EntityUid, out ToolComponent? tool) || !tool.Qualities.Contains(component.QualityNeeded))
+        if (!_toolSystem.HasQuality(args.EntityUid, component.QualityNeeded))
             return;
 
         args.Cancel();
diff --git a/Content.Server/Construction/RefiningSystem.cs b/Content.Server/Construction/RefiningSystem.cs
deleted file mode 100644
index 2ca32baf906..00000000000
--- a/Content.Server/Construction/RefiningSystem.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using Content.Server.Construction.Components;
-using Content.Server.Stack;
-using Content.Shared.Construction;
-using Content.Shared.Interaction;
-using Content.Shared.Stacks;
-using Content.Shared.Storage;
-using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem;
-
-namespace Content.Server.Construction;
-
-public sealed class RefiningSystem : EntitySystem
-{
-    [Dependency] private readonly SharedToolSystem _toolSystem = default!;
-    [Dependency] private readonly StackSystem _stackSystem = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<WelderRefinableComponent, InteractUsingEvent>(OnInteractUsing);
-        SubscribeLocalEvent<WelderRefinableComponent, WelderRefineDoAfterEvent>(OnDoAfter);
-    }
-
-    private void OnInteractUsing(EntityUid uid, WelderRefinableComponent component, InteractUsingEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        args.Handled = _toolSystem.UseTool(args.Used, args.User, uid, component.RefineTime, component.QualityNeeded, new WelderRefineDoAfterEvent(), fuel: component.RefineFuel);
-    }
-
-    private void OnDoAfter(EntityUid uid, WelderRefinableComponent component, WelderRefineDoAfterEvent args)
-    {
-        if (args.Cancelled)
-            return;
-
-        // Get last owner coordinates and delete it
-        var resultPosition = Transform(uid).Coordinates;
-        EntityManager.DeleteEntity(uid);
-
-        // Spawn each result after refine
-        foreach (var ent in EntitySpawnCollection.GetSpawns(component.RefineResult ?? new()))
-        {
-            var droppedEnt = Spawn(ent, resultPosition);
-
-            // TODO: If something has a stack... Just use a prototype with a single thing in the stack.
-            // This is not a good way to do it.
-            if (TryComp<StackComponent>(droppedEnt, out var stack))
-                _stackSystem.SetCount(droppedEnt, 1, stack);
-        }
-    }
-}
diff --git a/Content.Server/Damage/Components/DamageOnToolInteractComponent.cs b/Content.Server/Damage/Components/DamageOnToolInteractComponent.cs
index e54090cdbbf..547c29a202d 100644
--- a/Content.Server/Damage/Components/DamageOnToolInteractComponent.cs
+++ b/Content.Server/Damage/Components/DamageOnToolInteractComponent.cs
@@ -1,22 +1,19 @@
 using Content.Shared.Damage;
 using Content.Shared.Tools;
-using Robust.Shared.Utility;
+using Robust.Shared.Prototypes;
 
-namespace Content.Server.Damage.Components
+namespace Content.Server.Damage.Components;
+
+[RegisterComponent]
+public sealed partial class DamageOnToolInteractComponent : Component
 {
-    [RegisterComponent]
-    public sealed partial class DamageOnToolInteractComponent : Component
-    {
-        [DataField("tools")]
-        public PrototypeFlags<ToolQualityPrototype> Tools { get; private set; } = new ();
+    [DataField]
+    public ProtoId<ToolQualityPrototype> Tools { get; private set; }
 
-        // TODO: Remove this snowflake stuff, make damage per-tool quality perhaps?
-        [DataField("weldingDamage")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public DamageSpecifier? WeldingDamage { get; private set; }
+    // TODO: Remove this snowflake stuff, make damage per-tool quality perhaps?
+    [DataField]
+    public DamageSpecifier? WeldingDamage { get; private set; }
 
-        [DataField("defaultDamage")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public DamageSpecifier? DefaultDamage { get; private set; }
-    }
+    [DataField]
+    public DamageSpecifier? DefaultDamage { get; private set; }
 }
diff --git a/Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs b/Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs
index 42676c1891c..5980455e49c 100644
--- a/Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs
+++ b/Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Database;
 using Content.Shared.Interaction;
 using Content.Shared.Tools.Components;
+using Content.Shared.Tools.Systems;
 using ItemToggleComponent = Content.Shared.Item.ItemToggle.Components.ItemToggleComponent;
 
 namespace Content.Server.Damage.Systems
@@ -12,6 +13,7 @@ public sealed class DamageOnToolInteractSystem : EntitySystem
     {
         [Dependency] private readonly DamageableSystem _damageableSystem = default!;
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+        [Dependency] private readonly SharedToolSystem _toolSystem = default!;
 
         public override void Initialize()
         {
@@ -42,8 +44,7 @@ private void OnInteracted(EntityUid uid, DamageOnToolInteractComponent component
                 args.Handled = true;
             }
             else if (component.DefaultDamage is {} damage
-                && EntityManager.TryGetComponent(args.Used, out ToolComponent? tool)
-                && tool.Qualities.ContainsAny(component.Tools))
+                && _toolSystem.HasQuality(args.Used, component.Tools))
             {
                 var dmg = _damageableSystem.TryChangeDamage(args.Target, damage, origin: args.User);
 
diff --git a/Content.Server/Mech/Systems/MechAssemblySystem.cs b/Content.Server/Mech/Systems/MechAssemblySystem.cs
index e5b7bfaac3c..57c0174657a 100644
--- a/Content.Server/Mech/Systems/MechAssemblySystem.cs
+++ b/Content.Server/Mech/Systems/MechAssemblySystem.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Interaction;
 using Content.Shared.Tag;
 using Content.Shared.Tools.Components;
+using Content.Shared.Tools.Systems;
 using Robust.Server.Containers;
 using Robust.Shared.Containers;
 
@@ -14,6 +15,8 @@ namespace Content.Server.Mech.Systems;
 public sealed class MechAssemblySystem : EntitySystem
 {
     [Dependency] private readonly ContainerSystem _container = default!;
+    [Dependency] private readonly TagSystem _tag = default!;
+    [Dependency] private readonly SharedToolSystem _toolSystem = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -29,7 +32,7 @@ private void OnInit(EntityUid uid, MechAssemblyComponent component, ComponentIni
 
     private void OnInteractUsing(EntityUid uid, MechAssemblyComponent component, InteractUsingEvent args)
     {
-        if (TryComp<ToolComponent>(args.Used, out var toolComp) && toolComp.Qualities.Contains(component.QualityNeeded))
+        if (_toolSystem.HasQuality(args.Used, component.QualityNeeded))
         {
             foreach (var tag in component.RequiredParts.Keys)
             {
diff --git a/Content.Server/Mech/Systems/MechSystem.cs b/Content.Server/Mech/Systems/MechSystem.cs
index 53c6c62cdb8..68b973f5887 100644
--- a/Content.Server/Mech/Systems/MechSystem.cs
+++ b/Content.Server/Mech/Systems/MechSystem.cs
@@ -17,6 +17,7 @@
 using Content.Shared.Verbs;
 using Content.Shared.Wires;
 using Content.Server.Body.Systems;
+using Content.Shared.Tools.Systems;
 using Robust.Server.Containers;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
@@ -35,6 +36,7 @@ public sealed partial class MechSystem : SharedMechSystem
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
+    [Dependency] private readonly SharedToolSystem _toolSystem = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -87,7 +89,7 @@ private void OnInteractUsing(EntityUid uid, MechComponent component, InteractUsi
             return;
         }
 
-        if (TryComp<ToolComponent>(args.Used, out var tool) && tool.Qualities.Contains("Prying") && component.BatterySlot.ContainedEntity != null)
+        if (_toolSystem.HasQuality(args.Used, "Prying") && component.BatterySlot.ContainedEntity != null)
         {
             var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, component.BatteryRemovalDelay,
                 new RemoveBatteryEvent(), uid, target: uid, used: args.Target)
diff --git a/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs b/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs
index 6e0e0c503a9..7882522d30b 100644
--- a/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs
+++ b/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs
@@ -7,7 +7,7 @@
 using Content.Shared.Interaction;
 using Content.Shared.PneumaticCannon;
 using Content.Shared.StatusEffect;
-using Content.Shared.Tools.Components;
+using Content.Shared.Tools.Systems;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
 using Content.Shared.Weapons.Ranged.Systems;
@@ -22,6 +22,7 @@ public sealed class PneumaticCannonSystem : SharedPneumaticCannonSystem
     [Dependency] private readonly GunSystem _gun = default!;
     [Dependency] private readonly StunSystem _stun = default!;
     [Dependency] private readonly ItemSlotsSystem _slots = default!;
+    [Dependency] private readonly SharedToolSystem _toolSystem = default!;
 
     public override void Initialize()
     {
@@ -38,10 +39,7 @@ private void OnInteractUsing(EntityUid uid, PneumaticCannonComponent component,
         if (args.Handled)
             return;
 
-        if (!TryComp<ToolComponent>(args.Used, out var tool))
-            return;
-
-        if (!tool.Qualities.Contains(component.ToolModifyPower))
+        if (!_toolSystem.HasQuality(args.Used, component.ToolModifyPower))
             return;
 
         var val = (int) component.Power;
diff --git a/Content.Server/Weapons/Melee/EnergySword/EnergySwordSystem.cs b/Content.Server/Weapons/Melee/EnergySword/EnergySwordSystem.cs
index e8897781f5e..5970e163196 100644
--- a/Content.Server/Weapons/Melee/EnergySword/EnergySwordSystem.cs
+++ b/Content.Server/Weapons/Melee/EnergySword/EnergySwordSystem.cs
@@ -2,8 +2,7 @@
 using Content.Shared.Light;
 using Content.Shared.Light.Components;
 using Content.Shared.Toggleable;
-using Content.Shared.Tools.Components;
-using Content.Shared.Item;
+using Content.Shared.Tools.Systems;
 using Robust.Shared.Random;
 
 namespace Content.Server.Weapons.Melee.EnergySword;
@@ -13,6 +12,7 @@ public sealed class EnergySwordSystem : EntitySystem
     [Dependency] private readonly SharedRgbLightControllerSystem _rgbSystem = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedToolSystem _toolSystem = default!;
 
     public override void Initialize()
     {
@@ -38,7 +38,7 @@ private void OnInteractUsing(EntityUid uid, EnergySwordComponent comp, InteractU
         if (args.Handled)
             return;
 
-        if (!TryComp(args.Used, out ToolComponent? tool) || !tool.Qualities.ContainsAny("Pulsing"))
+        if (!_toolSystem.HasQuality(args.Used, "Pulsing"))
             return;
 
         args.Handled = true;
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactElectricityTriggerSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactElectricityTriggerSystem.cs
index aa2a16aa1b2..019e09bbbbc 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactElectricityTriggerSystem.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactElectricityTriggerSystem.cs
@@ -3,12 +3,14 @@
 using Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Tools.Components;
+using Content.Shared.Tools.Systems;
 
 namespace Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Systems;
 
 public sealed class ArtifactElectricityTriggerSystem : EntitySystem
 {
     [Dependency] private readonly ArtifactSystem _artifactSystem = default!;
+    [Dependency] private readonly SharedToolSystem _toolSystem = default!;
 
     public override void Initialize()
     {
@@ -42,7 +44,7 @@ private void OnInteractUsing(EntityUid uid, ArtifactElectricityTriggerComponent
         if (args.Handled)
             return;
 
-        if (!TryComp(args.Used, out ToolComponent? tool) || !tool.Qualities.ContainsAny("Pulsing"))
+        if (!_toolSystem.HasQuality(args.Used, "Pulsing"))
             return;
 
         args.Handled = _artifactSystem.TryActivateArtifact(uid, args.User);
diff --git a/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs b/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
index c041cf1ba06..94453b84706 100644
--- a/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
+++ b/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
@@ -80,7 +80,7 @@ private void OnInteractUsing(EntityUid uid, AnchorableComponent anchorable, Inte
             return;
 
         // If the used entity doesn't have a tool, return early.
-        if (!TryComp(args.Used, out ToolComponent? usedTool) || !usedTool.Qualities.Contains(anchorable.Tool))
+        if (!TryComp(args.Used, out ToolComponent? usedTool) || !_tool.HasQuality(args.Used, anchorable.Tool, usedTool))
             return;
 
         args.Handled = true;
diff --git a/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs b/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs
index 5a384173d0c..e04fd0a4a5c 100644
--- a/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs
+++ b/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs
@@ -105,7 +105,7 @@ private void OnInteractUsing(EntityUid uid, EncryptionKeyHolderComponent compone
             TryInsertKey(uid, component, args);
         }
         else if (TryComp<ToolComponent>(args.Used, out var tool)
-                 && tool.Qualities.Contains(component.KeysExtractionMethod)
+                 && _tool.HasQuality(args.Used, component.KeysExtractionMethod, tool)
                  && component.KeyContainer.ContainedEntities.Count > 0) // dont block deconstruction
         {
             args.Handled = true;
diff --git a/Content.Shared/Tools/Components/ToolComponent.cs b/Content.Shared/Tools/Components/ToolComponent.cs
index 92857ab9054..a7210c6fa07 100644
--- a/Content.Shared/Tools/Components/ToolComponent.cs
+++ b/Content.Shared/Tools/Components/ToolComponent.cs
@@ -1,52 +1,43 @@
+using Content.Shared.Tools.Systems;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Utility;
 
-namespace Content.Shared.Tools.Components
-{
-    [RegisterComponent, NetworkedComponent] // TODO move tool system to shared, and make it a friend.
-    public sealed partial class ToolComponent : Component
-    {
-        [DataField("qualities")]
-        public PrototypeFlags<ToolQualityPrototype> Qualities { get; set; } = new();
-
-        /// <summary>
-        ///     For tool interactions that have a delay before action this will modify the rate, time to wait is divided by this value
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("speed")]
-        public float SpeedModifier { get; set; } = 1;
+namespace Content.Shared.Tools.Components;
 
-        [DataField("useSound")]
-        public SoundSpecifier? UseSound { get; set; }
-    }
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(SharedToolSystem))]
+public sealed partial class ToolComponent : Component
+{
+    [DataField]
+    public PrototypeFlags<ToolQualityPrototype> Qualities  = [];
 
     /// <summary>
-    /// Attempt event called *before* any do afters to see if the tool usage should succeed or not.
-    /// Raised on both the tool and then target.
+    ///     For tool interactions that have a delay before action this will modify the rate, time to wait is divided by this value
     /// </summary>
-    public sealed class ToolUseAttemptEvent : CancellableEntityEventArgs
-    {
-        public EntityUid User { get; }
+    [DataField]
+    public float SpeedModifier  = 1;
 
-        public ToolUseAttemptEvent(EntityUid user)
-        {
-            User = user;
-        }
-    }
+    [DataField]
+    public SoundSpecifier? UseSound;
+}
 
-    /// <summary>
-    /// Event raised on the user of a tool to see if they can actually use it.
-    /// </summary>
-    [ByRefEvent]
-    public struct ToolUserAttemptUseEvent
-    {
-        public EntityUid? Target;
-        public bool Cancelled = false;
+/// <summary>
+/// Attempt event called *before* any do afters to see if the tool usage should succeed or not.
+/// Raised on both the tool and then target.
+/// </summary>
+public sealed class ToolUseAttemptEvent(EntityUid user, float fuel) : CancellableEntityEventArgs
+{
+    public EntityUid User { get; } = user;
+    public float Fuel = fuel;
+}
 
-        public ToolUserAttemptUseEvent(EntityUid? target)
-        {
-            Target = target;
-        }
-    }
+/// <summary>
+/// Event raised on the user of a tool to see if they can actually use it.
+/// </summary>
+[ByRefEvent]
+public struct ToolUserAttemptUseEvent(EntityUid? target)
+{
+    public EntityUid? Target = target;
+    public bool Cancelled = false;
 }
diff --git a/Content.Server/Construction/Components/WelderRefinableComponent.cs b/Content.Shared/Tools/Components/ToolRefinableComponent.cs
similarity index 61%
rename from Content.Server/Construction/Components/WelderRefinableComponent.cs
rename to Content.Shared/Tools/Components/ToolRefinableComponent.cs
index 31b029e2415..1d89624ad7d 100644
--- a/Content.Server/Construction/Components/WelderRefinableComponent.cs
+++ b/Content.Shared/Tools/Components/ToolRefinableComponent.cs
@@ -1,15 +1,17 @@
 using Content.Shared.Tools;
 using Content.Shared.Storage;
+using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
+using Content.Shared.Tools.Systems;
 
-namespace Content.Server.Construction.Components;
+namespace Content.Shared.Tools.Components;
 
 /// <summary>
 /// Used for something that can be refined by welder.
 /// For example, glass shard can be refined to glass sheet.
 /// </summary>
-[RegisterComponent]
-public sealed partial class WelderRefinableComponent : Component
+[RegisterComponent, NetworkedComponent, Access(typeof(ToolRefinableSystem))]
+public sealed partial class ToolRefinableComponent : Component
 {
     [DataField]
     public HashSet<EntitySpawnEntry>? RefineResult;
@@ -18,7 +20,7 @@ public sealed partial class WelderRefinableComponent : Component
     public float RefineTime = 2f;
 
     [DataField]
-    public float RefineFuel;
+    public float RefineFuel = 3f;
 
     [DataField]
     public ProtoId<ToolQualityPrototype> QualityNeeded = "Welding";
diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs b/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs
index e790b59cd12..60eafce4742 100644
--- a/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs
+++ b/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs
@@ -16,8 +16,15 @@ public void InitializeWelder()
     {
         SubscribeLocalEvent<WelderComponent, ExaminedEvent>(OnWelderExamine);
         SubscribeLocalEvent<WelderComponent, AfterInteractEvent>(OnWelderAfterInteract);
-        SubscribeLocalEvent<WelderComponent, DoAfterAttemptEvent<ToolDoAfterEvent>>(OnWelderToolUseAttempt);
+
+        SubscribeLocalEvent<WelderComponent, ToolUseAttemptEvent>((uid, comp, ev) => {
+            CanCancelWelderUse((uid, comp), ev.User, ev.Fuel, ev);
+        });
+        SubscribeLocalEvent<WelderComponent, DoAfterAttemptEvent<ToolDoAfterEvent>>((uid, comp, ev) => {
+            CanCancelWelderUse((uid, comp), ev.Event.User, ev.Event.Fuel, ev);
+        });
         SubscribeLocalEvent<WelderComponent, ToolDoAfterEvent>(OnWelderDoAfter);
+
         SubscribeLocalEvent<WelderComponent, ItemToggledEvent>(OnToggle);
         SubscribeLocalEvent<WelderComponent, ItemToggleActivateAttemptEvent>(OnActivateAttempt);
     }
@@ -120,23 +127,20 @@ private void OnWelderAfterInteract(Entity<WelderComponent> entity, ref AfterInte
         }
     }
 
-    private void OnWelderToolUseAttempt(Entity<WelderComponent> entity, ref DoAfterAttemptEvent<ToolDoAfterEvent> args)
+    private void CanCancelWelderUse(Entity<WelderComponent> entity, EntityUid user, float requiredFuel, CancellableEntityEventArgs ev)
     {
-        var user = args.DoAfter.Args.User;
-
         if (!ItemToggle.IsActivated(entity.Owner))
         {
             _popup.PopupClient(Loc.GetString("welder-component-welder-not-lit-message"), entity, user);
-            args.Cancel();
-            return;
+            ev.Cancel();
         }
 
-        var (fuel, _) = GetWelderFuelAndCapacity(entity);
+        var (currentFuel, _) = GetWelderFuelAndCapacity(entity);
 
-        if (args.Event.Fuel > fuel)
+        if (requiredFuel > currentFuel)
         {
             _popup.PopupClient(Loc.GetString("welder-component-cannot-weld-message"), entity, user);
-            args.Cancel();
+            ev.Cancel();
         }
     }
 
diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.cs b/Content.Shared/Tools/Systems/SharedToolSystem.cs
index a134e03aac6..b6276f2dd61 100644
--- a/Content.Shared/Tools/Systems/SharedToolSystem.cs
+++ b/Content.Shared/Tools/Systems/SharedToolSystem.cs
@@ -220,7 +220,7 @@ private bool CanStartToolUse(EntityUid tool, EntityUid user, EntityUid? target,
             return false;
 
         // check if the tool allows being used
-        var beforeAttempt = new ToolUseAttemptEvent(user);
+        var beforeAttempt = new ToolUseAttemptEvent(user, fuel);
         RaiseLocalEvent(tool, beforeAttempt);
         if (beforeAttempt.Cancelled)
             return false;
@@ -299,4 +299,3 @@ public LatticeCuttingCompleteEvent(NetCoordinates coordinates)
 public sealed partial class CableCuttingFinishedEvent : SimpleDoAfterEvent;
 
 #endregion
-
diff --git a/Content.Shared/Tools/Systems/ToolRefinableSystem.cs b/Content.Shared/Tools/Systems/ToolRefinableSystem.cs
new file mode 100644
index 00000000000..9f9ecbdf4dd
--- /dev/null
+++ b/Content.Shared/Tools/Systems/ToolRefinableSystem.cs
@@ -0,0 +1,53 @@
+using Content.Server.Construction.Components;
+using Content.Server.Stack;
+using Content.Shared.Construction;
+using Content.Shared.Interaction;
+using Content.Shared.Stacks;
+using Content.Shared.Storage;
+using Content.Shared.Tools.Components;
+using Robust.Shared.Network;
+using Robust.Shared.Random;
+using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem;
+
+namespace Content.Shared.Tools.Systems;
+
+public sealed class ToolRefinableSystem : EntitySystem
+{
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedToolSystem _toolSystem = default!;
+    [Dependency] private readonly StackSystem _stackSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<ToolRefinableComponent, InteractUsingEvent>(OnInteractUsing);
+        SubscribeLocalEvent<ToolRefinableComponent, WelderRefineDoAfterEvent>(OnDoAfter);
+    }
+
+    private void OnInteractUsing(EntityUid uid, ToolRefinableComponent component, InteractUsingEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        args.Handled = _toolSystem.UseTool(args.Used, args.User, uid, component.RefineTime, component.QualityNeeded, new WelderRefineDoAfterEvent(), fuel: component.RefineFuel);
+    }
+
+    private void OnDoAfter(EntityUid uid, ToolRefinableComponent component, WelderRefineDoAfterEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        if (_net.IsClient)
+            return;
+
+        var xform = Transform(uid);
+        var spawns = EntitySpawnCollection.GetSpawns(component.RefineResult, _random);
+        foreach (var spawn in spawns)
+        {
+            SpawnNextToOrDrop(spawn, uid, xform);
+        }
+
+        Del(uid);
+    }
+}
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 077e076959b..e05975f75de 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -2367,7 +2367,7 @@
     - DoorBumpOpener
     - FootstepSound
   - type: Tool # Open door from xeno.yml.
-    speed: 1.5
+    speedModifier: 1.5
     qualities:
       - Prying
     useSound:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index 04c4dd083e0..7358d072360 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -22,7 +22,7 @@
       NavSmash: !type:Bool
         true
   - type: Tool
-    speed: 1.5
+    speedModifier: 1.5
     qualities:
       - Prying
   - type: Prying
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
index 7a4983b14d5..1198cf41f26 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -92,7 +92,7 @@
   - type: Tool
     qualities:
     - Rolling
-    speed: 0.75 # not as good as a rolling pin but does the job
+    speedModifier: 0.75 # not as good as a rolling pin but does the job
   - type: PhysicalComposition
     materialComposition:
       Glass: 100
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
index 52ffb8dd1cc..65259836341 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -62,7 +62,7 @@
   - type: Tool
     qualities:
     - Rolling
-    speed: 0.25 # its small so takes longer to roll the entire dough flat
+    speedModifier: 0.25 # its small so takes longer to roll the entire dough flat
   - type: SpaceGarbage
   - type: TrashOnSolutionEmpty
     solution: drink
diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
index b328265e212..93e20e0b92e 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -100,7 +100,7 @@
   components:
   - type: Sprite
     color: "#bbeeff"
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
   - type: DamageUserOnTrigger
@@ -135,7 +135,7 @@
     damage:
       types:
         Slash: 4.5
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: PartRodMetal1
@@ -171,11 +171,11 @@
     damage:
       types:
         Slash: 5.5
+  - type: ToolRefinable
   - type: EmbedPassiveDamage
     damage:
       types:
         Slash: 0.15
-  - type: WelderRefinable
     refineResult:
     - id: SheetGlass1
     - id: SheetPlasma1
@@ -214,7 +214,7 @@
       types:
         Slash: 4.5
         Radiation: 2
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: SheetUranium1
@@ -249,7 +249,7 @@
   components:
   - type: Sprite
     color: "#e0aa36"
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: SheetBrass1
diff --git a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
index e38cb94d202..f774ec1640a 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
@@ -35,6 +35,6 @@
     materialComposition:
       Glass: 50
   - type: SpaceGarbage
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
index c3b0eebe982..e8f629531e0 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -55,7 +55,7 @@
   - type: Tool
     qualities:
     - Rolling
-    speed: 0.5 # its very big, akward to use
+    speedModifier: 0.5 # its very big, akward to use
   - type: Appearance
   - type: GenericVisualizer
     visuals:
diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml
index 289736f6717..81225cab815 100644
--- a/Resources/Prototypes/Entities/Objects/Power/lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml
@@ -66,7 +66,7 @@
     materialComposition:
       Glass: 25
   - type: SpaceGarbage
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
 
@@ -274,7 +274,7 @@
   - type: Construction
     graph: CyanLight
     node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: ShardCrystalCyan
@@ -294,7 +294,7 @@
   - type: Construction
     graph: BlueLight
     node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: ShardCrystalBlue
@@ -314,7 +314,7 @@
   - type: Construction
     graph: PinkLight
     node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: ShardCrystalPink
@@ -334,7 +334,7 @@
   - type: Construction
     graph: OrangeLight
     node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: ShardCrystalOrange
@@ -354,7 +354,7 @@
   - type: Construction
     graph: RedLight
     node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: ShardCrystalRed
@@ -374,7 +374,7 @@
   - type: Construction
     graph: GreenLight
     node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: ShardCrystalGreen
diff --git a/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml b/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
index 399e14cc975..fa6a506bdf9 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
@@ -21,7 +21,7 @@
     - Cutting
     useSound:
       path: /Audio/Items/wirecutter.ogg
-    speed: 0.05
+    speedModifier: 0.05
   - type: Item
     sprite: Objects/Tools/Cowtools/haycutters.rsi
 
@@ -46,7 +46,7 @@
     - Screwing
     useSound:
       collection: Screwdriver
-    speed: 0.05
+    speedModifier: 0.05
 
 - type: entity
   name: wronch
@@ -69,7 +69,7 @@
     - Anchoring
     useSound:
       path: /Audio/Items/ratchet.ogg
-    speed: 0.05
+    speedModifier: 0.05
 
 - type: entity
   name: cowbar
@@ -93,7 +93,7 @@
     - Prying
     useSound:
       path: /Audio/Items/crowbar.ogg
-    speed: 0.05
+    speedModifier: 0.05
   - type: ToolTileCompatible
   - type: Prying
 
@@ -127,7 +127,7 @@
     size: Small
     sprite: Objects/Tools/Cowtools/cowelder.rsi
   - type: Tool
-    speed: 0.05
+    speedModifier: 0.05
 
 - type: entity
   name: milkalyzer
diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
index c8e47b6fdae..4db76a97968 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -62,7 +62,7 @@
   - type: Tool
     qualities:
     - Rolling
-    speed: 0.6 # fairly unwieldly but nice round surface
+    speedModifier: 0.6 # fairly unwieldly but nice round surface
 
 - type: entity
   parent: GasTankRoundBase
diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
index 3beb11f4238..70e0fbbce72 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
@@ -21,7 +21,7 @@
   - type: Tool
     qualities:
       - Prying
-    speed: 1.5
+    speedModifier: 1.5
     useSound: /Audio/Items/jaws_pry.ogg
   - type: Prying
     pryPowered: true
@@ -86,7 +86,7 @@
   - type: Tool
     qualities:
       - Prying
-    speed: 3.0
+    speedModifier: 3.0
   - type: MultipleTool
     entries:
       - behavior: Prying
diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index 69af8e4741c..9c08724b6cc 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -425,7 +425,7 @@
   - type: Tool
     qualities:
       - Screwing
-    speed: 1.5
+    speedModifier: 1.5
     useSound: /Audio/Items/drill_use.ogg
   - type: MultipleTool
     statusShowBehavior: true
@@ -628,7 +628,7 @@
   - type: Tool
     qualities:
       - Screwing
-    speed: 1.2 # Kept for future adjustments. Currently 1.2x for balance
+    speedModifier: 1.2 # Kept for future adjustments. Currently 1.2x for balance
     useSound: /Audio/Items/drill_use.ogg
   - type: ToolTileCompatible
   - type: MultipleTool
diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
index 3b4394bdc3c..ed9b4270f17 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
@@ -166,7 +166,7 @@
           Quantity: 250
         maxVol: 250
   - type: Tool
-    speed: 1.3
+    speedModifier: 1.3
 
 - type: entity
   name: experimental welding tool
@@ -217,7 +217,7 @@
           Quantity: 50
         maxVol: 50
   - type: Tool
-    speed: 0.7
+    speedModifier: 0.7
   - type: PointLight
     enabled: false
     radius: 1.0
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
index 60ba7aa2c30..b26ae8ad14d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -35,7 +35,7 @@
   - type: Tool
     qualities:
     - Rolling
-    speed: 0.75 # a bit unwieldly but does the job
+    speedModifier: 0.75 # a bit unwieldly but does the job
   - type: Clothing
     quickEquip: false
     slots:
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
index 934298b6207..df19550cdbd 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
@@ -25,8 +25,7 @@
   - type: ReagentTank
     tankType: Fuel
   - type: DamageOnToolInteract
-    tools:
-    - Welding
+    tools: Welding
     weldingDamage:
       types:
         Heat: 10
@@ -217,4 +216,3 @@
       fillBaseName: watertank-2-
     - type: ExaminableSolution
       solution: tank
-
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
index 72ea308af08..3570264a57a 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
@@ -82,8 +82,7 @@
   - type: ReagentTank
     tankType: Fuel
   - type: DamageOnToolInteract
-    tools:
-    - Welding
+    tools: Welding
     weldingDamage:
       types:
         Heat: 20
diff --git a/Resources/Prototypes/XenoArch/Effects/utility_effects.yml b/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
index 84df09af33d..a8967080579 100644
--- a/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
+++ b/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
@@ -220,7 +220,7 @@
   - type: Tool
     qualities:
     - Screwing
-    speed: 2 # Very powerful multitool to balance out the desire to sell or scrap for points
+    speedModifier: 2 # Very powerful multitool to balance out the desire to sell or scrap for points
     useSound: /Audio/Items/drill_use.ogg
   - type: Tag
     tags:

From ac025d97062fa24b24226e7fb1fc63e7833b94e6 Mon Sep 17 00:00:00 2001
From: Tunguso4ka <71643624+Tunguso4ka@users.noreply.github.com>
Date: Wed, 15 May 2024 02:57:42 +0300
Subject: [PATCH 098/366] Renamed old snake_case IDs to PascalCase IDs (#28014)

* Renamed soda_dispenser to SodaDispenser

* oops, wrong time

* oops

* guidebook

* chem_master
---
 .../Objects/Devices/Circuitboards/Machine/production.yml  | 2 +-
 .../Prototypes/Entities/Structures/Dispensers/soda.yml    | 8 ++++----
 .../Entities/Structures/Machines/chem_master.yml          | 2 +-
 Resources/ServerInfo/Guidebook/Medical/Chemist.xml        | 2 +-
 Resources/ServerInfo/Guidebook/Medical/Medical.xml        | 2 +-
 Resources/ServerInfo/Guidebook/Service/Bartender.xml      | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 61dbb70cd4d..398bbe9ddb1 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -649,7 +649,7 @@
     - type: Sprite
       state: medical
     - type: MachineBoard
-      prototype: chem_master
+      prototype: ChemMaster
       requirements:
         Capacitor: 1
       materialRequirements:
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
index 72468973ee4..e3042c798cc 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
@@ -1,9 +1,9 @@
 - type: entity
-  id: soda_dispenser
-  name: soda dispenser
-  suffix: Filled
   parent: ReagentDispenserBase
+  id: SodaDispenser
+  name: soda dispenser
   description: A beverage dispenser with a selection of soda and several other common beverages. Has a single fill slot for containers.
+  suffix: Filled
   components:
   - type: Rotatable
   - type: Sprite
@@ -24,9 +24,9 @@
     - Bartender
 
 - type: entity
+  parent: SodaDispenser
   id: SodaDispenserEmpty
   suffix: Empty
-  parent: soda_dispenser
   components:
   - type: ReagentDispenser
     storageWhitelist:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
index 4e565054b46..d78ed1182cd 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
@@ -1,5 +1,5 @@
 - type: entity
-  id: chem_master
+  id: ChemMaster
   parent: [ BaseMachinePowered, ConstructibleMachine ]
   name: ChemMaster 4000
   description: An industrial grade chemical manipulator with pill and bottle production included.
diff --git a/Resources/ServerInfo/Guidebook/Medical/Chemist.xml b/Resources/ServerInfo/Guidebook/Medical/Chemist.xml
index 05b853d1880..caced42bdf9 100644
--- a/Resources/ServerInfo/Guidebook/Medical/Chemist.xml
+++ b/Resources/ServerInfo/Guidebook/Medical/Chemist.xml
@@ -10,7 +10,7 @@ While chemists primarily make medications, there's a very wide variety of chemic
 <GuideEntityEmbed Entity="ChemDispenser"/>
 <GuideEntityEmbed Entity="ChemBag"/>
 <GuideEntityEmbed Entity="KitchenReagentGrinder"/>
-<GuideEntityEmbed Entity="chem_master"/>
+<GuideEntityEmbed Entity="ChemMaster"/>
 </Box>
 <Box>
 <GuideEntityEmbed Entity="LargeBeaker"/>
diff --git a/Resources/ServerInfo/Guidebook/Medical/Medical.xml b/Resources/ServerInfo/Guidebook/Medical/Medical.xml
index 22a4149833b..5924a569eb5 100644
--- a/Resources/ServerInfo/Guidebook/Medical/Medical.xml
+++ b/Resources/ServerInfo/Guidebook/Medical/Medical.xml
@@ -17,6 +17,6 @@ Right now, medbay is divided into two different sets of care:
 <GuideEntityEmbed Entity="ChemDispenser"/>
 <GuideEntityEmbed Entity="LargeBeaker"/>
 <GuideEntityEmbed Entity="PillCanister"/>
-<GuideEntityEmbed Entity="chem_master"/>
+<GuideEntityEmbed Entity="ChemMaster"/>
 </Box>
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Service/Bartender.xml b/Resources/ServerInfo/Guidebook/Service/Bartender.xml
index b7599fc0d1c..fd54bdeef0d 100644
--- a/Resources/ServerInfo/Guidebook/Service/Bartender.xml
+++ b/Resources/ServerInfo/Guidebook/Service/Bartender.xml
@@ -7,7 +7,7 @@ The materials for these drinks can be found in various places:
 </Box>
 <Box>
 <GuideEntityEmbed Entity="BoozeDispenser"/>
-<GuideEntityEmbed Entity="soda_dispenser"/>
+<GuideEntityEmbed Entity="SodaDispenser"/>
 <GuideEntityEmbed Entity="VendingMachineBooze"/>
 </Box>
 

From b183d8e3e21e794bb8fe9ca6dd4fbc755e244573 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 16:02:37 -0400
Subject: [PATCH 099/366] i love regex

---
 .../Nyanotrasen/Abilities/Oni/OniSystem.cs    |   4 +-
 .../Components/ToolRefinableComponent.cs      |   4 +-
 .../Tools/Systems/SharedToolSystem.cs         |   7 +-
 .../Tools/Systems/ToolRefinableSystem.cs      |  14 +--
 .../Objects/Consumable/Food/produce.yml       | 101 ------------------
 .../Objects/Consumable/Food/snacks.yml        |  75 ++++---------
 .../Entities/Objects/Materials/shards.yml     |   3 +
 .../Entities/Structures/Storage/barrels.yml   |   3 +-
 .../Entities/Structures/Storage/tanks.yml     |   3 +-
 .../Objects/Consumable/Food/meals.yml         |   3 +-
 .../Objects/Consumable/Food/snacks.yml        |   6 +-
 11 files changed, 50 insertions(+), 173 deletions(-)

diff --git a/Content.Server/Nyanotrasen/Abilities/Oni/OniSystem.cs b/Content.Server/Nyanotrasen/Abilities/Oni/OniSystem.cs
index a7e2295b751..bb3a91e598f 100644
--- a/Content.Server/Nyanotrasen/Abilities/Oni/OniSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Oni/OniSystem.cs
@@ -30,7 +30,7 @@ private void OnEntInserted(EntityUid uid, OniComponent component, EntInsertedInt
             heldComp.Holder = uid;
 
             if (TryComp<ToolComponent>(args.Entity, out var tool) && _toolSystem.HasQuality(args.Entity, "Prying", tool))
-                tool.SpeedModifier *= 1.66f;
+                _toolSystem.SetSpeedModifier((args.Entity, tool), tool.SpeedModifier * 1.66f);
 
             if (_gunSystem.TryGetGun(args.Entity, out _, out var gun))
             {
@@ -43,7 +43,7 @@ private void OnEntInserted(EntityUid uid, OniComponent component, EntInsertedInt
         private void OnEntRemoved(EntityUid uid, OniComponent component, EntRemovedFromContainerMessage args)
         {
             if (TryComp<ToolComponent>(args.Entity, out var tool) && _toolSystem.HasQuality(args.Entity, "Prying", tool))
-                tool.SpeedModifier /= 1.66f;
+                _toolSystem.SetSpeedModifier((args.Entity, tool), tool.SpeedModifier / 1.66f);
 
             if (_gunSystem.TryGetGun(args.Entity, out _, out var gun))
             {
diff --git a/Content.Shared/Tools/Components/ToolRefinableComponent.cs b/Content.Shared/Tools/Components/ToolRefinableComponent.cs
index 1d89624ad7d..8adf0443510 100644
--- a/Content.Shared/Tools/Components/ToolRefinableComponent.cs
+++ b/Content.Shared/Tools/Components/ToolRefinableComponent.cs
@@ -13,8 +13,8 @@ namespace Content.Shared.Tools.Components;
 [RegisterComponent, NetworkedComponent, Access(typeof(ToolRefinableSystem))]
 public sealed partial class ToolRefinableComponent : Component
 {
-    [DataField]
-    public HashSet<EntitySpawnEntry>? RefineResult;
+    [DataField(required: true)]
+    public HashSet<EntitySpawnEntry> RefineResult;
 
     [DataField]
     public float RefineTime = 2f;
diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.cs b/Content.Shared/Tools/Systems/SharedToolSystem.cs
index b6276f2dd61..1aac1561656 100644
--- a/Content.Shared/Tools/Systems/SharedToolSystem.cs
+++ b/Content.Shared/Tools/Systems/SharedToolSystem.cs
@@ -234,6 +234,9 @@ private bool CanStartToolUse(EntityUid tool, EntityUid user, EntityUid? target,
         return !beforeAttempt.Cancelled;
     }
 
+    public void SetSpeedModifier(Entity<ToolComponent> ent, float value) =>
+        ent.Comp.SpeedModifier = value;
+
     #region DoAfterEvents
 
     [Serializable, NetSerializable]
@@ -282,9 +285,7 @@ protected sealed partial class LatticeCuttingCompleteEvent : DoAfterEvent
         [DataField(required:true)]
         public NetCoordinates Coordinates;
 
-        private LatticeCuttingCompleteEvent()
-        {
-        }
+        private LatticeCuttingCompleteEvent() { }
 
         public LatticeCuttingCompleteEvent(NetCoordinates coordinates)
         {
diff --git a/Content.Shared/Tools/Systems/ToolRefinableSystem.cs b/Content.Shared/Tools/Systems/ToolRefinableSystem.cs
index 9f9ecbdf4dd..7dd82136da6 100644
--- a/Content.Shared/Tools/Systems/ToolRefinableSystem.cs
+++ b/Content.Shared/Tools/Systems/ToolRefinableSystem.cs
@@ -1,13 +1,9 @@
-using Content.Server.Construction.Components;
-using Content.Server.Stack;
 using Content.Shared.Construction;
 using Content.Shared.Interaction;
-using Content.Shared.Stacks;
 using Content.Shared.Storage;
 using Content.Shared.Tools.Components;
 using Robust.Shared.Network;
 using Robust.Shared.Random;
-using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem;
 
 namespace Content.Shared.Tools.Systems;
 
@@ -16,7 +12,6 @@ public sealed class ToolRefinableSystem : EntitySystem
     [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SharedToolSystem _toolSystem = default!;
-    [Dependency] private readonly StackSystem _stackSystem = default!;
 
     public override void Initialize()
     {
@@ -30,7 +25,14 @@ private void OnInteractUsing(EntityUid uid, ToolRefinableComponent component, In
         if (args.Handled)
             return;
 
-        args.Handled = _toolSystem.UseTool(args.Used, args.User, uid, component.RefineTime, component.QualityNeeded, new WelderRefineDoAfterEvent(), fuel: component.RefineFuel);
+        args.Handled = _toolSystem.UseTool(
+            args.Used,
+            args.User,
+            uid,
+            component.RefineTime,
+            component.QualityNeeded,
+            new WelderRefineDoAfterEvent(),
+            fuel: component.RefineFuel);
     }
 
     private void OnDoAfter(EntityUid uid, ToolRefinableComponent component, WelderRefineDoAfterEvent args)
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index fc005e5015f..7f6050c4b10 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -1048,42 +1048,6 @@
           sprite: Objects/Specific/Hydroponics/golden_apple.rsi
           state: produce
 
-- type: entity
-  name: golden apple
-  parent: FoodProduceBase
-  id: FoodGoldenApple
-  description: It should be shaped like a cube, shouldn't it?
-  components:
-  - type: FlavorProfile
-    flavors:
-      - apple
-      - metallic
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 30
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 10
-        - ReagentId: Vitamin
-          Quantity: 4
-        - ReagentId: DoctorsDelight
-          Quantity: 13
-  - type: Sprite
-    sprite: Objects/Specific/Hydroponics/golden_apple.rsi
-  - type: Produce
-    seedId: goldenApple
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: JuiceApple
-        Quantity: 10
-      - ReagentId: Gold
-        Quantity: 10
-  - type: Tag
-    tags:
-    - Fruit
-
 - type: entity
   name: cocoa pod
   parent: FoodProduceBase
@@ -1821,71 +1785,6 @@
           sprite: Objects/Specific/Hydroponics/glasstle.rsi
           state: produce
 
-- type: entity
-  name: glasstle
-  parent: FoodProduceBase
-  id: FoodGlasstle
-  description: A fragile crystal plant with lot of spiky thorns. 
-  components:
-  - type: Item
-    size: Small
-    sprite: Objects/Specific/Hydroponics/glasstle.rsi
-    heldPrefix: produce  
-  - type: FlavorProfile
-    flavors:
-      - sharp
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 15
-        reagents:
-        - ReagentId: Razorium
-          Quantity: 15
-  - type: Sprite
-    sprite: Objects/Specific/Hydroponics/glasstle.rsi
-  - type: Produce
-    seedId: glasstle
-  - type: Extractable
-    grindableSolutionName: food
-  - type: Damageable 
-    damageContainer: Inorganic
-  - type: ToolRefinable
-    refineResult:
-    - id: SheetGlass1
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 10
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: GlassBreak
-          params:
-            volume: -4
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          ShardGlass:
-            min: 1
-            max: 1
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-  - type: DamageOnHit 
-    damage:
-      types:
-        Blunt: 10
-  - type: MeleeWeapon
-    wideAnimationRotation: 60
-    damage:
-      types:
-        Slash: 15
-    soundHit:
-        path: /Audio/Weapons/bladeslice.ogg
-  - type: Tag
-    tags:
-    - Galaxythistle
-
-
 - type: entity
   name: fly amanita
   parent: FoodProduceBase
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
index 98d7aef10fa..3981c761b61 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -323,46 +323,6 @@
         - ReagentId: CapsaicinOil
           Quantity: 5
 
-- type: entity
-  parent: FoodSnackBase
-  id: DrinkRamen
-  name: cup ramen
-  description: A cheap food with a taste that reminds you of your school years.
-  components:
-  - type: RefillableSolution
-    solution: food
-  - type: InjectableSolution
-    solution: food
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 50 #big cup
-        reagents:
-        - ReagentId: DryRamen
-          Quantity: 30
-        - ReagentId: Soysauce
-          Quantity: 5
-  - type: Sprite
-    state: ramen
-  - type: Food
-    trash: FoodPacketCupRamenTrash
-
-- type: entity
-  parent: DrinkRamen
-  id: DrinkHellRamen
-  name: hell ramen
-  description: Super spicy flavor!
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 50
-        reagents:
-        - ReagentId: DryRamen
-          Quantity: 30
-        - ReagentId: CapsaicinOil
-          Quantity: 5
-
 - type: entity
   name: chow mein
   parent: FoodSnackBase
@@ -745,7 +705,8 @@
     state: proteinbar
   - type: Item
   - type: Food
-    trash: FoodPacketProteinbarTrash
+    trash:
+    - FoodPacketProteinbarTrash
   - type: SolutionContainerManager
     solutions:
       food:
@@ -883,7 +844,8 @@
     state: tidegobs
   - type: Item
   - type: Food
-    trash: FoodPacketTidegobsTrash
+    trash:
+    - FoodPacketTidegobsTrash
 
 - type: entity
   parent: FoodSnackBase
@@ -899,7 +861,8 @@
     state: saturno
   - type: Item
   - type: Food
-    trash: FoodPacketSaturnosTrash
+    trash:
+    - FoodPacketSaturnosTrash
 
 - type: entity
   parent: FoodSnackBase
@@ -915,7 +878,8 @@
     state: jupiter
   - type: Item
   - type: Food
-    trash: FoodPacketJoveGelloTrash
+    trash:
+    - FoodPacketJoveGelloTrash
 
 - type: entity
   parent: FoodSnackBase
@@ -931,7 +895,8 @@
     state: pluto
   - type: Item
   - type: Food
-    trash: FoodPacketPlutoniumrodsTrash
+    trash:
+    - FoodPacketPlutoniumrodsTrash
 
 - type: entity
   parent: FoodSnackBase
@@ -949,7 +914,8 @@
     state: mars
   - type: Item
   - type: Food
-    trash: FoodPacketMarsFroukaTrash
+    trash:
+    - FoodPacketMarsFroukaTrash
 
 - type: entity
   parent: FoodSnackBase
@@ -965,7 +931,8 @@
     state: venus
   - type: Item
   - type: Food
-    trash: FoodPacketVenusTrash
+    trash: 
+    - FoodPacketVenusTrash
 
 - type: entity
   parent: FoodSnackBase
@@ -982,7 +949,8 @@
     state: oort
   - type: Item
   - type: Food
-    trash: FoodPacketOortrocksTrash
+    trash: 
+    - FoodPacketOortrocksTrash
 
 # Weeb Vend
 - type: entity
@@ -993,13 +961,14 @@
   components:
   - type: FlavorProfile
     flavors:
-      - spicy
+    - spicy
   - type: Sprite
     sprite: Objects/Consumable/Food/bay_food.rsi
     state: weebonuts
   - type: Item
   - type: Food
-    trash: FoodPacketRedalertnutsTrash
+    trash: 
+    - FoodPacketRedalertnutsTrash
 
 - type: entity
   parent: FoodSnackBase
@@ -1045,7 +1014,8 @@
     state: chocobanana
   - type: Item
   - type: Food
-    trash: FoodPacketStickTrash
+    trash:
+    - FoodPacketStickTrash
 
 - type: entity
   parent: FoodSnackBase
@@ -1062,7 +1032,8 @@
     state: dango
   - type: Item
   - type: Food
-    trash: FoodPacketStickTrash
+    trash:
+    - FoodPacketStickTrash
 
 # Old food
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
index 93e20e0b92e..59e23ef82ab 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -172,6 +172,9 @@
       types:
         Slash: 5.5
   - type: ToolRefinable
+    refineResult:
+      - id: SheetGlass1
+      - id: SheetPlasma1
   - type: EmbedPassiveDamage
     damage:
       types:
diff --git a/Resources/Prototypes/Entities/Structures/Storage/barrels.yml b/Resources/Prototypes/Entities/Structures/Storage/barrels.yml
index 0cbbb2ede8b..052c21206b5 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/barrels.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/barrels.yml
@@ -192,8 +192,7 @@
         - ReagentId: WeldingFuel
           Quantity: 500
   - type: DamageOnToolInteract
-    tools:
-    - Welding
+    tools: Welding
     weldingDamage:
       types:
         Heat: 10
diff --git a/Resources/Prototypes/Entities/Structures/Storage/tanks.yml b/Resources/Prototypes/Entities/Structures/Storage/tanks.yml
index 41038fb74d1..a9875172e59 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/tanks.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/tanks.yml
@@ -81,8 +81,7 @@
   - type: ReagentTank
     tankType: Fuel
   - type: DamageOnToolInteract
-    tools:
-    - Welding
+    tools: Welding
     weldingDamage:
       types:
         Heat: 10
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/meals.yml
index 624689a7ed2..9a36d379716 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/meals.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/meals.yml
@@ -73,7 +73,8 @@
     count: 6
     slice: FoodMothGreenLasagneSlice
   - type: Food
-    trash: FoodPlate
+    trash:
+    - FoodPlate
   - type: Sprite
     sprite: Nyanotrasen/Objects/Consumable/Food/meal.rsi
     state: greenlasagne
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/snacks.yml
index f49d6cb2cec..773f848a42e 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/snacks.yml
@@ -12,7 +12,8 @@
       - tofu
       - leafy
   - type: Food
-    trash: FoodPlateSmall
+    trash:
+    - FoodPlateSmall
   - type: Sprite
     sprite: Nyanotrasen/Objects/Consumable/Food/Snacks/moth.rsi
     state: squeakingstirfry
@@ -214,7 +215,8 @@
     sprite: Nyanotrasen/Objects/Consumable/Food/Snacks/boritopie.rsi
     state: borito-pie
   - type: Food
-    trash: FoodPacketBoritosTrash
+    trash:
+    - FoodPacketBoritosTrash
   - type: SolutionContainerManager
     solutions:
       food:

From 80ce29b5948c3197e13bb915b67e7b58414e4e4c Mon Sep 17 00:00:00 2001
From: KonstantinAngelov <168754339+KonstantinAngelov@users.noreply.github.com>
Date: Thu, 27 Jun 2024 18:11:33 +0300
Subject: [PATCH 100/366] CookBook name,id and description changed to not be
 "meta" (#29467)

* CookBook name,id and description changed

* Id isues with CookBook fixed

* Maps not added
---
 Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml | 2 +-
 Resources/Prototypes/Catalog/Fills/Crates/service.yml  | 2 +-
 Resources/Prototypes/Entities/Objects/Misc/books.yml   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
index b52e8530085..09c7e165bfa 100644
--- a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
+++ b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
@@ -15,7 +15,7 @@
         orGroup: BookPool
       - id: BookBartendersManual
         orGroup: BookPool
-      - id: BookChefGaming
+      - id: BookHowToCookForFortySpaceman
         orGroup: BookPool
       - id: BookLeafLoversSecret
         orGroup: BookPool
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
index 35e66ac4d35..3e38b6c4efc 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -162,7 +162,7 @@
       - id: BookSpaceEncyclopedia
       - id: BookTheBookOfControl
       - id: BookBartendersManual
-      - id: BookChefGaming
+      - id: BookHowToCookForFortySpaceman
       - id: BookLeafLoversSecret
       - id: BookEngineersHandbook
       - id: BookScientistsGuidebook
diff --git a/Resources/Prototypes/Entities/Objects/Misc/books.yml b/Resources/Prototypes/Entities/Objects/Misc/books.yml
index fca4b5c59dd..a839d287ff8 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/books.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/books.yml
@@ -116,10 +116,10 @@
     - Bartender
 
 - type: entity
-  id: BookChefGaming
+  id: BookHowToCookForFortySpaceman
   parent: BaseItem
-  name: chef gaming
-  description: A book about cooking written by a gamer chef.
+  name: How To Cook For Forty Spacemen
+  description: A book about cooking written by a space chef.
   components:
   - type: Sprite
     sprite: Objects/Misc/books.rsi

From b2bd362cc18bf00eb9f199696041ce0c7f83dfb3 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 16:08:04 -0400
Subject: [PATCH 101/366] yeag!!

---
 .../Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml   | 2 +-
 .../Nyanotrasen/Entities/Markers/Spawners/Random/books.yml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml
index 43e26db6352..c4fd8bb1d2e 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml
@@ -111,7 +111,7 @@
     - id: BookBartendersManual
       prob: 0.2
       orGroup: bookguide
-    - id: BookChefGaming
+    - id: BookHowToCookForFortySpaceman
       prob: 0.2
       orGroup: bookguide
     - id: BookLeafLoversSecret
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml
index 2f790f2ce1c..6ee19cce6b3 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml
@@ -50,7 +50,7 @@
       - BookSpaceEncyclopedia
       - BookTheBookOfControl
       - BookBartendersManual
-      - BookChefGaming
+      - BookHowToCookForFortySpaceman
       - BookLeafLoversSecret
       - BookEngineersHandbook
       - BookScientistsGuidebook

From 867e59cbdacb4aa5afc67e64336d452304f705e7 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 16:10:41 -0400
Subject: [PATCH 102/366] yesyes

---
 Resources/Migrations/eeMigration.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Migrations/eeMigration.yml b/Resources/Migrations/eeMigration.yml
index ea2ac962144..6793f2f5b8c 100644
--- a/Resources/Migrations/eeMigration.yml
+++ b/Resources/Migrations/eeMigration.yml
@@ -28,7 +28,7 @@ HyperlinkBookAtmos: BookAtmosDistro
 HyperlinkBookBartending: BookBartendersManual
 HyperlinkBookBotany: BookLeafLoversSecret
 HyperlinkBookChemistry: BookChemicalCompendium
-HyperlinkBookCooking: BookChefGaming
+HyperlinkBookCooking: BookHowToCookForFortySpaceman
 HyperlinkBookGlimmer: BookScientistsGuidebook
 HyperlinkBookHacking: BookEngineersHandbook
 HyperlinkBookMedical: BookMedicalReferenceBook

From 0115d14d4de6cde52391c687ba156cd3963115a6 Mon Sep 17 00:00:00 2001
From: Verm <32827189+Vermidia@users.noreply.github.com>
Date: Fri, 14 Jun 2024 16:44:23 -0500
Subject: [PATCH 103/366] Changes all the uplink ally icons to be a combination
 of the mob + radio (#28954)

* New Icons!

* Better meta info
---
 .../Prototypes/Catalog/uplink_catalog.yml     |   4 +--
 .../Devices/communication.rsi/meta.json       |  25 +++++++++++++++++-
 .../communication.rsi/old-radio-ancestor.png  | Bin 0 -> 1346 bytes
 .../old-radio-borg-assault.png                | Bin 0 -> 1475 bytes
 .../communication.rsi/old-radio-syndicat.png  | Bin 0 -> 1234 bytes
 .../communication.rsi/old-radio-urist.png     | Bin 0 -> 1496 bytes
 6 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/old-radio-ancestor.png
 create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/old-radio-borg-assault.png
 create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/old-radio-syndicat.png
 create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/old-radio-urist.png

diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 646b67d7844..9a5ee170c15 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -1075,7 +1075,7 @@
   name: uplink-reinforcement-radio-name
   description: uplink-reinforcement-radio-desc
   productEntity: ReinforcementRadioSyndicateNukeops
-  icon: { sprite: Objects/Devices/communication.rsi, state: radio }
+  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-urist }
   cost:
     Telecrystal: 16
   categories:
@@ -1091,7 +1091,7 @@
   name:  uplink-reinforcement-radio-cyborg-assault-name
   description: uplink-reinforcement-radio-cyborg-assault-desc
   productEntity: ReinforcementRadioSyndicateCyborgAssault
-  icon: { sprite: Mobs/Silicon/chassis.rsi, state: synd_sec }
+  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-borg-assault }
   cost:
     Telecrystal: 65
   categories:
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/meta.json b/Resources/Textures/Objects/Devices/communication.rsi/meta.json
index e9350caad8d..d672347f884 100644
--- a/Resources/Textures/Objects/Devices/communication.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/communication.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6 // Radio, Beacon, Signaler Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+  "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6. Uplink radio sprites by Vermidia, derivative of other lisenced sprites in the repo // Radio, Beacon, Signaler Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
@@ -89,6 +89,29 @@
     {
       "name": "off-walkietalkie-inhand-left",
       "directions": 4
+    },
+    {
+      "name": "old-radio"
+    },
+    {
+      "name": "old-radio-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "old-radio-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "old-radio-syndicat"
+    },
+    {
+      "name": "old-radio-urist"
+    },
+    {
+      "name": "old-radio-ancestor"
+    },
+    {
+      "name": "old-radio-borg-assault"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-ancestor.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-ancestor.png
new file mode 100644
index 0000000000000000000000000000000000000000..65ecc4c0d6ea427de5f5a2f024f3b9d79f0c9362
GIT binary patch
literal 1346
zcmV-I1-<%-P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004PX+uL$X=7sm
z04R}lk-bYoQ5eR5YGsrmQA0$7gGGZv6hvbf<YEnKkkz8suR!f`uM*N4v@{3}QA=M#
z|3R%mYe5hcK}2J7UrWgCJsK#X=W_1*<2mPfdGB+<9?EHXvtt(Wg`yD-20Y8L6_4|c
zF6=nzq(82i`a)zrO564QfKAnVzv|WgUdz>+Oqm+kx`n4T-6#snG=w&by5e2oK`k3k
z3Lgvm3>i@PM(K$<zbeku`BSkG4bOpH_4H(#IMKvf*2oKw3w!gqlJ+-``Vv>FuoRIx
zEPDi#FhK%%NKj&(97X(63zAuD-$c!~$cA_{dFzxh#E~H@UZ1EX>6((77Cj|Tj<U-A
zf1YM~YO>zl6@bnc%la4v=N?ommi2RDS=Cc;Ji}F?;op#)X1+wPG&JuKxVPcrx}hcZ
z;c^Ftp7gj8uSpKs_H-KF&!H~{19#A~TF>h5oU=!WZpkmYg@Z#Fll$(qU!j3#-j$j|
z761SM32;bRa{vGf5&!@T5&_cPe*6Fc1A9qCK~z{r?N&`lR8bWE)SU6J937|3nNcS&
zD#-kqFsy_YF+z~GaN$($5(23fK~Qd@%xG7*$riS7XVD@kL0lMAiZhWF1S2u&jHXUb
z;~(af-sarrd%owqXO0qWJn%U8oqNyyzVqFm_kb<iQs6%;5ce<etyU{bPEJNzYAR;u
z<}g1$51-GciWMI#fxf;zwpNbGWRm(%S5-+v<#Bm_%mm8H%Hq^WloS_pV5`LfQ&tw7
zPABs7^SP&Yij#@sL=qcbf{u<3R#Q`>$k(b;UU480*f3_4@<c)&j8w~7T3Yy1Qc}V_
z@Q^WAJ-c5CcJ3gemT%K+L?ybqy7=U6ZEdjGY_ONwQJwoz;OBPZ!814dM}YQ^P+)2j
z*lo3~x!Jz?yi#s!Yb&d-ujlV}yPY{44tTv@PULoOrzW`OX8s#EC9WRR)YQa2?E@37
z?P3LMJP!Vl^e6X3%TMz}DX<=JE#|*}&PrX2VI2~5VTfMrSiK1q1PDAm(}WYJYGb_~
z@Z`}Qo|B!OjmgPL7z_q!j!-BBqtS@5u`wQ#lh~$)^nKi~N+3AXkFYU8lU(E&A{Y!}
zX=w?5zaN&!*(aZplEUNE9|2e7s}h)*`hk(JgCI4gf&rNG3wTm+VG36oZ$=TgT6BR|
zzPPxEq@*OwMXp~0BO_1m6i-MH$kTlxs-Q}M28rP0Mbih8aqsMPO$Eg22#DIG0C~M$
zkLl@Y{^)c%gu`KJ4ow17xkw^yhp?Uo%K@yc><W(wJeStjm}A4_s8^Dm<R@i{wg>Qj
z#-sqJ8Ddi4!<$ZyT3B8Qd7I9AU0od~@#5)Y>@VCErP9!-9uwDuI9*DYg{ia&s3}0e
zqRHFw@xnK)yStnFJo8Q!0wE53=}f7jPgQ~Wxfx`dviU&r^iDQ7@S6LALq`?u;o)Jl
zx3@!|VZ}no$HxqfOmHHir&y%w$gy`b!3(B(52R<TY`mya)(HF>A3(+7y&QCCG$f78
z%Q0{=ulhZB_t~$&R4A}~zcZ3QRy%gYjxXav7J)me&%<msqoJXJ0GZmd(AcOYkbh*>
zOCs`Lz?`*C+`92rN|AxDInAa%#{`_1n27T7a`g1{fJl%v-)#nM%--JKIQkEun7H|t
zPk{O!h^1lz_INy+DK3{wQJhF*Wizf9ZEM_?0{>WnKhO(+TN9`Ib^rhX07*qoM6N<$
Eg1e1|bpQYW

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-borg-assault.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-borg-assault.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7908a149206d7d43b0b4dbe2292196d6cdbd3c3
GIT binary patch
literal 1475
zcmV;!1w8tRP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004QX+uL$X=7sm
z04R}lk-bYoQ5eR5+J{kwLk%Gf4i*g>Q4oz`kc%~#K~{@izXG+(y-G-H(9$3@L@j*{
z{Rg!Mtp!0)1QCtReJvrk_o$$Rp3AxKkLR4{<-N}Zdnl{r%+6WJ<qJkQ81Sq_S3Qn*
zy0PP69Cu7J^@XMR2yNHTBQ{kZ{Hj;`do5RAB57)1>k*#TbfX|F(-7J!=!*A*2enKr
zA$%h2Gh{&FTcyWq{H8cv<1fWVBs>Rp)zg!1;&>Bl86zh=ChW~+i&}ji^(D?^etAi%
zTlO#}VS)tk5U0onSqk{2<|VV%zKN=DkxlVv^42L~h$Br#ygpHj(lseHC3;exEG3ou
z|2)mq)MTx@GXPz$mi0LTj(w<<E$jExvMOiL@dDTRhJRCXn)w#J+|azo;M#%9n}!xY
zfU8{?de&n`tSWWLwx?3?aRL2N7`TVtwOUs7bIzY2vMs;p4i1lCRPMXh{{Ri-Xb|54
zMbH2M010qNS#tmY4#WTe4#WYKD-Ig~00a9;L_t(oN4-};NK{c2y=tIhI?jk;nxv@=
z5f*}?i-MxCMXL(LAX)`2!d*L8E+PVH<EFOJB3Eux3R=`+7{iiEhSAhCOTy7<5;Z8B
zbDQ&f|Ihz3e<XS^{Quv(@1FC{z3;v^Me+|?C{(v=x=AFy6!~?#&#$4I9f6w<H|p@l
z#y6TNAwNX+OaR~jt_g({bS;t4XLWUz{xW2C^O4vy0jDA)QmCTEg-(DyRv!!mY%4eY
zFch$H=7$q+PXtUSSUKfq9v}pMn{NV<NJJCMT+#gEk`0`oP+&cov^eBa!8d{K?(QNu
z>g+gSIqp4oT0jCSOisPgcdQ=Z7-Pd6FA}~9(AmZ57y8=O)uGQjm(R=DnTSNIQu^y#
zjmyohV>TPkaSKbq1jde^l>WX;5{*u&zm@tXInvW36PthBSGBZCJW#9euz@Y+c(sDJ
zAyzY%_6C^&5I!1~x9!~`>EGZ?%)-GKY-Zzgf;p2?>B=FCz`@35TUj+{?QCx8YFgV`
zWbVU)0@SZ8NaM#@3CCWmY2-kY%mnLXB0Yv}2wM=AbdI<+8v%fSUYhr;<47c|W;hMb
zh7g3-Ry72@6(Y&faw`O|86STpx4tiXDqw--S~<a>fM#?}P$r%}*G$KAVBm(t4EfD5
z*d*50b(gr6WhDUcK&V#ET)5(yEEpKQe^+joq-1#iA+_UnL%dmhPy?_-K!Vj03Jm_N
z%uk@b^OP%rL@FvjYD#qM-RO)yaS&nOvk}ZJK<MMQ*P&#~fmCu`J}txrY9te1rJ<=!
z{U>&kvN*bG0|PjZVZ1wmsSru95IKot)d7Oz$+q}%)dHhKDnJ#`Z>j)7v}Hf$I4fcn
z0j!)P%y?X1ey=3xm<mt@^iu_rF-gD<KAg>$0%c{zy2W_R!f_!A02FiKBX0=Y6xiPW
zCHInl%LBpj^rHY*4Ij=B*phH-GbN$gI<?0W-)v8+8!U;bgx4-G6O!}M2OnY_(-^bW
zfk5zY;yGg#pMGWQaweD=f9DP`Cptr*3S`RfF68%Wr4{9ZO6a@+U%l2ZBO?#ApBE8S
zM)aYXTh*-=SRu%D253k!w_qj|SIiO&a9&2(M;r8Kh-BT83%(DS*Db6RWf=7yV8{u)
zqYq;Yh4FtO|2A|BK}&OZ7Y@yeXC6QVBq8{K3ML86#W#GJ7<n%wn1DFLArg-<$2Sff
z#`V#|$Le@)KBkGCR>T4VaC%&QU_NYVm-9ay+2VBL4F}FCGo8TB>zyYf=3xQ!MY4Hw
z0E_{SC&96D00P(qr&F_^cLR($eWA}Y1eBif8X6j+T2>}=)y}*z`!gZZIcXnO4lop6
d+y1}x{{{lWpDlfW*scHo002ovPDHLkV1n)7p5p)j

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-syndicat.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-syndicat.png
new file mode 100644
index 0000000000000000000000000000000000000000..702f32fc59962a1bc94423835b05cc203093c448
GIT binary patch
literal 1234
zcmV;@1TFiCP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004PX+uL$X=7sm
z04R}lk-bYoQ5eR5YGsrmQA0$7gGGZv6hvbf<YEnKkkz8suR!f`uM*N4v@{3}QA=M#
z|3R%mYe5hcK}2J7UrWgCJsK#X=W_1*<2mPfdGB+<9?EHXvtt(Wg`yD-20Y8L6_4|c
zF6=nzq(82i`a)zrO564QfKAnVzv|WgUdz>+Oqm+kx`n4T-6#snG=w&by5e2oK`k3k
z3Lgvm3>i@PM(K$<zbeku`BSkG4bOpH_4H(#IMKvf*2oKw3w!gqlJ+-``Vv>FuoRIx
zEPDi#FhK%%NKj&(97X(63zAuD-$c!~$cA_{dFzxh#E~H@UZ1EX>6((77Cj|Tj<U-A
zf1YM~YO>zl6@bnc%la4v=N?ommi2RDS=Cc;Ji}F?;op#)X1+wPG&JuKxVPcrx}hcZ
z;c^Ftp7gj8uSpKs_H-KF&!H~{19#A~TF>h5oU=!WZpkmYg@Z#Fll$(qU!j3#-j$j|
z761SM32;bRa{vGf5&!@T5&_cPe*6Fc0}Dw+K~z{r?N&WZQ&AK?wM41VLaPvgwpIgy
z6s<Z)Q+3fekkrjI#?3f1E*c%&3=Jlo95gN_je~pRCP@dQ3rY$DN`yc_L|SNsQrf=O
z0*R^b9JtTN^WK(LT})5%a_;~4-S3`z?gOY<O@aSefk1a}vE2Ull^dY#k4B?q7sWX@
z^?Dk|e5E)g$5%oERp>u`Mo7A11(2EB?be0EVd0`fb`$k2pLD^L#jI?GwX1hm6#-np
z=ksw%Ajqq34`{(e?Nt*Hkr*}DAeqb4Cf$WCaHiJDqhUMtt4$|5>^9r6lEIdUeNpCy
zLZPDH@25JRd0!zWj3Fd2I5R24rHSRhd1HdXAQ48X*#||SGV@Biir#Nb_5xn&iagh?
zk<5eBlQ4AD1jpOkV179P-mh5*^z;I%<6X=uxVs1-c$1|CE_$z5b#0SxU&7(W2Dmaa
zqReLmSOW$q#zJ^xn6T@3NXc(;E`gLZ23v>p+`j#5KfvO2L+fw^5CrXxv;dFB=HUL>
zPIzi`P+RL_9G<CSfJ;Eiti#g6ET9^h)GBm1x@dB0GXr-Y3~~uPxfK9QED9@jD{Q`b
z4Ytl6m@g#Yz@^JDFDue&sDs$tG_1&VpT%5c3UH6W(RBiH*))M8iAGa1fu`eAAk}BN
z1dJOdXtp|GVfGVT+sG4`)aRiiLCKAyBScDj1Gowx0s}|S2q3^V6|o^W23l0kg6%Ts
zraaUrf0z}orasd(Rg(}BVDh79Ht{|}Mc2805S3XDFd7<2erCp<<fP3J6)Awg%tU3@
zFBS5D9}+<?GA@BaUII(Y5t@S@>u9qd-;wV+bzWG;9DuvLEzA9)!$mQGc4KLR{B|my
zRQPa%u*v*OcJXQRd(7!&+V#WYDh;@|aS$HYf2Z<*u7%Wyd>B`7cPX%w--{S{)tcSf
zLAxHv0X;;KnQ@(44m^C8nHtruy{CB?<(Tt*o(sDkGpu8~_BZX1o?{*(cExb_YGZY6
w9{B47SfF7dQXAH_{{nlGv^J=wz`s`DCq@flV$z0S#Q*>R07*qoM6N<$g8T+N5C8xG

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-urist.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-urist.png
new file mode 100644
index 0000000000000000000000000000000000000000..3cdf1c61bf02dbef927e6823b658db870070b0a8
GIT binary patch
literal 1496
zcmV;}1t<E6P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004PX+uL$X=7sm
z04R}lk-bYoQ5eR5YGsrmQA0$7gGGZv6hvbf<YEnKkkz8suR!f`uM*N4v@{3}QA=M#
z|3R%mYe5hcK}2J7UrWgCJsK#X=W_1*<2mPfdGB+<9?EHXvtt(Wg`yD-20Y8L6_4|c
zF6=nzq(82i`a)zrO564QfKAnVzv|WgUdz>+Oqm+kx`n4T-6#snG=w&by5e2oK`k3k
z3Lgvm3>i@PM(K$<zbeku`BSkG4bOpH_4H(#IMKvf*2oKw3w!gqlJ+-``Vv>FuoRIx
zEPDi#FhK%%NKj&(97X(63zAuD-$c!~$cA_{dFzxh#E~H@UZ1EX>6((77Cj|Tj<U-A
zf1YM~YO>zl6@bnc%la4v=N?ommi2RDS=Cc;Ji}F?;op#)X1+wPG&JuKxVPcrx}hcZ
z;c^Ftp7gj8uSpKs_H-KF&!H~{19#A~TF>h5oU=!WZpkmYg@Z#Fll$(qU!j3#-j$j|
z761SM32;bRa{vGf5&!@T5&_cPe*6Fc1QAI@K~z{r%~nfjV^tXb)5fOe{hYLUK&uVu
zV{l$dhfydl1VL~ibRjNuIWQX+#f9ji2rk^X9S~&p6&KE83bPnGFR8`HSQ}}BRGY-M
zNt>A5rp?3VdcVItcW#=S^p&bV9R73e{qO&M|Kpr<iT-0ToCSX2=1a2hYrj6%62sVT
z0syyNeou8<xJhy=5^c@EL2$uB`r#HeBhk^W3~0e${P7066&e}QmPL!%HUe;3lGfPw
z!-0?Mw0N!;?6C>V&d#b0rgexESL4%6qPCSLTDr{|YdmjOf)n)sNQ{n->VAt<KNERf
z<<<)PROO$VnySl0G#Zryfq-nc+vSmwkvfg%7;Pzma56qVZV)7VJ|8=;R4Qb(S}Bo8
z)M<~$L)B`Pgq@biiAtb#Ae_40Zra@3B%{$t7K?>UCKHv*Whxen)Y;id4u^v>nGAob
zXcf09f!=VxZpsAsYGT<Sz<YXnXm@v)2S@-+O8|t-W;1`fwzjuZ1PR@f5a0l4)g-X_
zyR?P03WtO&>^rAWD8vy1xKJqY=<4cXdyxs)Hh>%!xgZ5_M4ruNx%LnMpa-<25GBys
zfG9G7EYuMIxWnzESKoO1&>iyC7oRd9<jr>{2x~+KLMQ=9pbRJr01-6+gTbKMuvqJs
zU}HV0OCT%FQN`1#MvI9gN%TwZ8`T~Sm(S-3oi9jeox$E_v#I2D2}t=IrGAeSvXReb
zDA*TaAK7xA-v4Nl=U>J?r<xL-RcWy8SgC<<sZ>%)q|<3KD9Iih8<Wl5-L$3bj1Glp
zDwU$9*RcSH7GlagOP{^-Auqk;V{nhxOCDt%i^cdk(vP~M^P!OmAz`I4g={MXAx#M&
zazVmsce1fFG)#LlqMgidtT#6{2+pwQQGX#=LxjdWkxUXYpp~YVkzNLVemqSWka#@K
zz!;cc8T4~!*J?G6S`4gTc+SD^=I7_tZ)Rp@cmwF}g1*Rk-5#i;eqd2vc|cB^i4y5;
zeiJ@tuABcQmFeDh@rG@$TY{aUL~dUXJA%fVqki&;b>za!4fANoLf^;!q_<wX$TokZ
z()7xuKAwMl_a}Nj{InOe+;ubHa6N6jR#9u;tuB5`gZ(}l9thI?xh3*@ZOR!?<Fz2M
zvYKt3f&JrGMgtyKdYw4y_xyWZ7P|A`SHtC@ki59OO40sax-=9Zg+PPbh7ufh2Q(wr
ztAGs;1R7og{9h5}bd#@Ly(&Xv094Gyb3G!*{wHh|&HTaweK0XmXM#1JpQ*T9E;aIS
zI4plMImsD-##&?ob_a=^`i}@sBa!{PLOBW7*Vh?CxpWMo6n?*7{a3)DmCNN0|06nT
y%9J0EhNy4{00abZHyo5?GI{F2kIL`=Z}$(b7Y0@-ZA3}{0000<MNUMnLSTZ~<iF1V

literal 0
HcmV?d00001


From 7c0ab4216784ebb257b3e26e589413c236c82db6 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 16:30:05 -0400
Subject: [PATCH 104/366] hm

---
 Resources/Prototypes/Entities/Mobs/Species/base.yml | 1 -
 Resources/Prototypes/StatusIcon/job.yml             | 8 --------
 2 files changed, 9 deletions(-)

diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index c19eb1edc4a..7ae38f707e9 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -144,7 +144,6 @@
     - PsionicsDisabled
     - PsionicallyInsulated
   - type: Reflect
-    enabled: false
     reflectProb: 0
   - type: Body
     prototype: Human
diff --git a/Resources/Prototypes/StatusIcon/job.yml b/Resources/Prototypes/StatusIcon/job.yml
index bb2ae3b64d0..17c9cee8045 100644
--- a/Resources/Prototypes/StatusIcon/job.yml
+++ b/Resources/Prototypes/StatusIcon/job.yml
@@ -436,11 +436,3 @@
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Visitor
   jobName: job-name-visitor
-
-- type: jobIcon
-  parent: JobIcon
-  id: JobIconAdmin
-  icon:
-    sprite: /Textures/Interface/Misc/job_icons.rsi
-    state: Admin
-  allowSelection: false

From 36b5e7ca0a9756d13c25ec0f86597d83d54bf2f1 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 16:39:15 -0400
Subject: [PATCH 105/366] hrm

---
 Resources/Prototypes/DeltaV/Entities/Mobs/Player/human.yml | 3 ---
 Resources/Prototypes/Entities/Clothing/Hands/gloves.yml    | 1 -
 Resources/Prototypes/Entities/Clothing/Head/misc.yml       | 2 +-
 Resources/Prototypes/Store/presets.yml                     | 2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/human.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/human.yml
index 5bc30734426..5c61c9d359e 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/human.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/human.yml
@@ -9,9 +9,6 @@
     - type: NpcFactionMember
       factions:
       - Syndicate
-    - type: AutoTraitor
-      giveUplink: false
-      giveObjectives: false
     - type: AutoImplant
       implants:
       - DeathAcidifierImplant
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
index 748e3482a8e..7ee52b16570 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -233,7 +233,6 @@
   - type: FingerprintMask
   - type: Thieving
     stripTimeReduction: 1
-    stealthy: true
   - type: ToggleClothing
     action: ActionToggleNinjaGloves
   - type: NinjaGloves
diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
index 10eaf1cb44e..bd7899d75f8 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
@@ -194,7 +194,7 @@
     accent: OwOAccent
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   id: ActionBecomeValid
   name: Become Valid
   description: "*notices your killsign* owo whats this"
diff --git a/Resources/Prototypes/Store/presets.yml b/Resources/Prototypes/Store/presets.yml
index 20efd9a9088..ff9981edde7 100644
--- a/Resources/Prototypes/Store/presets.yml
+++ b/Resources/Prototypes/Store/presets.yml
@@ -3,7 +3,7 @@
   abstract: true
   components:
   - type: Store
-    storeName: Uplink
+    name: store-preset-name-uplink
     categories:
     - UplinkWeapons
     - UplinkAmmo

From 0eed4f68f0cf812332c1ad2d0c07c9349447c256 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 16:45:29 -0400
Subject: [PATCH 106/366] oh?

---
 .../Objects/Devices/communication.rsi/meta.json       | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/meta.json b/Resources/Textures/Objects/Devices/communication.rsi/meta.json
index d672347f884..56e5f8f68d0 100644
--- a/Resources/Textures/Objects/Devices/communication.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/communication.rsi/meta.json
@@ -90,17 +90,6 @@
       "name": "off-walkietalkie-inhand-left",
       "directions": 4
     },
-    {
-      "name": "old-radio"
-    },
-    {
-      "name": "old-radio-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "old-radio-inhand-right",
-      "directions": 4
-    },
     {
       "name": "old-radio-syndicat"
     },

From 7c01202814731ecd55e8463c5c8ca0fb1998bafa Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Tue, 28 May 2024 02:51:50 +0200
Subject: [PATCH 107/366] Fix climbing and bonking simultaneously (#27268)

* Properly network ClumsyComponent

* Fix being able to climb and bonk at the same time.
Also properly subscribe to AttemptClimbEvent by-ref.

* Update Content.Shared/Interaction/Components/ClumsyComponent.cs
---
 .../Cargo/Systems/CargoSystem.Bounty.cs       |  4 ++-
 .../Cargo/Prototypes/CargoBountyPrototype.cs  |  8 ++++-
 .../Prototypes/Catalog/Bounties/bounties.yml  | 15 +++++++++
 .../Objects/Consumable/Food/Baked/bread.yml   | 18 ++++++++---
 .../Objects/Consumable/Food/Baked/cake.yml    | 32 +++++++++++++++++++
 .../Objects/Consumable/Food/Baked/misc.yml    |  9 ++++--
 .../Objects/Consumable/Food/Baked/pie.yml     | 10 ++++++
 .../Objects/Consumable/Food/Baked/pizza.yml   | 12 ++++++-
 .../Objects/Consumable/Food/ingredients.yml   | 15 +++++++++
 .../Objects/Consumable/Food/produce.yml       |  3 ++
 Resources/Prototypes/tags.yml                 | 12 +++++--
 11 files changed, 125 insertions(+), 13 deletions(-)

diff --git a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
index 9922cc5a37e..d9e0c9fe157 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
@@ -11,6 +11,7 @@
 using Content.Shared.Database;
 using Content.Shared.NameIdentifier;
 using Content.Shared.Stacks;
+using Content.Shared.Whitelist;
 using JetBrains.Annotations;
 using Robust.Server.Containers;
 using Robust.Shared.Containers;
@@ -23,6 +24,7 @@ public sealed partial class CargoSystem
 {
     [Dependency] private readonly ContainerSystem _container = default!;
     [Dependency] private readonly NameIdentifierSystem _nameIdentifier = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSys = default!;
 
     [ValidatePrototypeId<NameIdentifierGroupPrototype>]
     private const string BountyNameIdentifierGroup = "Bounty";
@@ -311,7 +313,7 @@ public bool IsBountyComplete(HashSet<EntityUid> entities, IEnumerable<CargoBount
             var temp = new HashSet<EntityUid>();
             foreach (var entity in entities)
             {
-                if (!entry.Whitelist.IsValid(entity, EntityManager))
+                if (!_whitelistSys.IsValid(entry.Whitelist, entity) || (entry.Blacklist != null && _whitelistSys.IsValid(entry.Blacklist, entity)))
                     continue;
 
                 count += _stackQuery.CompOrNull(entity)?.Count ?? 1;
diff --git a/Content.Shared/Cargo/Prototypes/CargoBountyPrototype.cs b/Content.Shared/Cargo/Prototypes/CargoBountyPrototype.cs
index bf4907b0dd4..b40b03672ef 100644
--- a/Content.Shared/Cargo/Prototypes/CargoBountyPrototype.cs
+++ b/Content.Shared/Cargo/Prototypes/CargoBountyPrototype.cs
@@ -31,7 +31,7 @@ public sealed partial class CargoBountyPrototype : IPrototype
     /// <summary>
     /// The entries that must be satisfied for the cargo bounty to be complete.
     /// </summary>
-    [DataField( required: true)]
+    [DataField(required: true)]
     public List<CargoBountyItemEntry> Entries = new();
 
     /// <summary>
@@ -50,6 +50,12 @@ public readonly partial record struct CargoBountyItemEntry()
     [DataField(required: true)]
     public EntityWhitelist Whitelist { get; init; } = default!;
 
+    /// <summary>
+    /// A blacklist that can be used to exclude items in the whitelist.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Blacklist { get; init; } = null;
+
     // todo: implement some kind of simple generic condition system
 
     /// <summary>
diff --git a/Resources/Prototypes/Catalog/Bounties/bounties.yml b/Resources/Prototypes/Catalog/Bounties/bounties.yml
index 3c1bd02fcfc..bedfe442872 100644
--- a/Resources/Prototypes/Catalog/Bounties/bounties.yml
+++ b/Resources/Prototypes/Catalog/Bounties/bounties.yml
@@ -309,6 +309,9 @@
     whitelist:
       tags:
       - Pie
+    blacklist:
+      tags:
+      - Slice
 
 - type: cargoBounty
   id: BountyPrisonUniform
@@ -541,6 +544,12 @@
     whitelist:
       tags:
       - Fruit
+    blacklist:
+      tags:
+      - Slice
+      - Cake
+      - Pie
+      - Bread
 
 - type: cargoBounty
   id: BountyVegetable
@@ -552,6 +561,12 @@
     whitelist:
       tags:
       - Vegetable
+    blacklist:
+      tags:
+      - Slice
+      - Cake
+      - Pie
+      - Bread
 
 - type: cargoBounty
   id: BountyChili
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
index e40ac40a289..22c1fe021b9 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
@@ -34,7 +34,9 @@
     flavors:
       - bread
   - type: Tag
-    tags: [] #override bread
+    tags:
+    - Bread
+    - Slice
   - type: SolutionContainerManager
     solutions:
       food:
@@ -116,6 +118,8 @@
   - type: Tag
     tags:
     - Fruit
+    - Bread
+    - Slice
 
 - type: entity
   name: cornbread
@@ -274,6 +278,8 @@
   - type: Tag
     tags:
     - Meat
+    - Bread
+    - Slice
 
 - type: entity
   name: mimana bread
@@ -418,6 +424,8 @@
   - type: Tag
     tags:
     - Meat
+    - Bread
+    - Slice
 
 - type: entity
   name: spider meat bread
@@ -476,6 +484,8 @@
   - type: Tag
     tags:
     - Meat
+    - Bread
+    - Slice
 
 - type: entity
   name: tofu bread
@@ -585,6 +595,8 @@
   - type: Tag
     tags:
     - Meat
+    - Bread
+    - Slice
 
 # Other than bread/slices
 
@@ -594,9 +606,6 @@
   id: FoodBreadBaguette
   description: Bon appétit!
   components:
-  - type: Tag
-    tags:
-    - Baguette
   - type: Sprite
     state: baguette
   - type: SliceableFood
@@ -824,6 +833,7 @@
     tags:
     - VimPilot
     - DoorBumpOpener
+    - Bread
   - type: CanEscapeInventory
     baseResistTime: 2
   - type: Puller
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
index c939dec52c6..922d4938885 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -23,6 +23,9 @@
           Quantity: 5
   - type: Item
     size: Normal
+  - type: Tag
+    tags:
+    - Cake
 
 - type: entity
   parent: FoodCakeBase
@@ -45,6 +48,10 @@
           Quantity: 1
   - type: Item
     size: Tiny
+  - type: Tag
+    tags:
+    - Cake
+    - Slice
 
 # Custom Cake Example
 
@@ -63,6 +70,7 @@
     slice: FoodCakeBlueberrySlice
   - type: Tag
     tags:
+    - Cake
     - Fruit
 
 - type: entity
@@ -78,7 +86,9 @@
       color: blue
   - type: Tag
     tags:
+    - Cake
     - Fruit
+    - Slice
 
 # Cake
 
@@ -203,6 +213,7 @@
     slice: FoodCakeOrangeSlice
   - type: Tag
     tags:
+    - Cake
     - Fruit
 
 - type: entity
@@ -214,7 +225,9 @@
     state: orange-slice
   - type: Tag
     tags:
+    - Cake
     - Fruit
+    - Slice
 # Tastes like sweetness, cake, oranges.
 
 - type: entity
@@ -229,6 +242,7 @@
     slice: FoodCakeLimeSlice
   - type: Tag
     tags:
+    - Cake
     - Fruit
 
 - type: entity
@@ -240,7 +254,9 @@
     state: lime-slice
   - type: Tag
     tags:
+    - Cake
     - Fruit
+    - Slice
 # Tastes like sweetness, cake, limes.
 
 - type: entity
@@ -255,6 +271,7 @@
     slice: FoodCakeLemonSlice
   - type: Tag
     tags:
+    - Cake
     - Fruit
 
 - type: entity
@@ -266,7 +283,9 @@
     state: lemon-slice
   - type: Tag
     tags:
+    - Cake
     - Fruit
+    - Slice
 # Tastes like sweetness, cake, lemons.
 
 - type: entity
@@ -296,6 +315,7 @@
           Quantity: 5
   - type: Tag
     tags:
+    - Cake
     - Fruit
 
 - type: entity
@@ -323,7 +343,9 @@
           Quantity: 1
   - type: Tag
     tags:
+    - Cake
     - Fruit
+    - Slice
 
 - type: entity
   name: chocolate cake
@@ -379,6 +401,7 @@
     slice: FoodCakeAppleSlice
   - type: Tag
     tags:
+    - Cake
     - Fruit
 
 - type: entity
@@ -391,7 +414,9 @@
     state: apple-slice
   - type: Tag
     tags:
+    - Cake
     - Fruit
+    - Slice
 # Tastes like sweetness, cake, slime.
 
 - type: entity
@@ -436,6 +461,7 @@
           Quantity: 11
   - type: Tag
     tags:
+    - Cake
     - Fruit
 
 - type: entity
@@ -457,7 +483,9 @@
           Quantity: 2.2
   - type: Tag
     tags:
+    - Cake
     - Fruit
+    - Slice
 # Tastes like sweetness, cake, pumpkin.
 
 - type: entity
@@ -686,6 +714,7 @@
     tags:
     - VimPilot
     - DoorBumpOpener
+    - Cake
   - type: CanEscapeInventory
     baseResistTime: 2
   - type: Puller
@@ -752,3 +781,6 @@
     color: "#FFFF00"
     radius: 1.4
     energy: 1.4
+  - type: Tag
+    tags:
+    - Slice
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
index b1bbdfb5305..fde181d8b9b 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
@@ -163,9 +163,6 @@
 
 # Nuggets
 
-- type: Tag
-  id: Nugget
-
 - type: entity
   name: chicken nugget
   parent: FoodBakedBase
@@ -530,6 +527,9 @@
           Quantity: 5
         - ReagentId: Theobromine
           Quantity: 3
+  - type: Tag
+    tags:
+    - Slice
 
 - type: entity
   name: special brownies
@@ -585,6 +585,9 @@
           Quantity: 3
         - ReagentId: THC
           Quantity: 25
+  - type: Tag
+    tags:
+    - Slice
 
 - type: entity
   name: onion rings
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
index 8daf1e3dba4..717f2629ca7 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
@@ -53,6 +53,10 @@
           Quantity: 1.2
         - ReagentId: Vitamin
           Quantity: 1
+  - type: Tag
+    tags:
+    - Pie
+    - Slice
 
 # Pie
 
@@ -95,6 +99,7 @@
     tags:
     - Fruit
     - Pie
+    - Slice
 # Tastes like pie, apple.
 
 - type: entity
@@ -183,6 +188,7 @@
     tags:
     - Fruit
     - Pie
+    - Slice
 # Tastes like pie, cream, banana.
 
 - type: entity
@@ -225,6 +231,7 @@
     tags:
     - Fruit
     - Pie
+    - Slice
 # Tastes like pie, blackberries.
 
 - type: entity
@@ -264,6 +271,7 @@
     tags:
     - Fruit
     - Pie
+    - Slice
 # Tastes like pie, cherries.
 
 - type: entity
@@ -303,6 +311,7 @@
     tags:
     - Meat
     - Pie
+    - Slice
 # Tastes like pie, meat.
 
 - type: entity
@@ -343,6 +352,7 @@
     tags:
     - Meat
     - Pie
+    - Slice
 # Tastes like pie, meat, acid.
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
index bdce1d44086..154f34063c8 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
@@ -59,6 +59,7 @@
     tags:
     - Pizza
     - ReptilianFood
+    - Slice
 
 # Pizza
 
@@ -135,6 +136,7 @@
     tags:
     - Meat
     - Pizza
+    - Slice
 # Tastes like crust, tomato, cheese, meat.
 
 - type: entity
@@ -291,6 +293,7 @@
     tags:
     - Meat
     - Pizza
+    - Slice
 # Tastes like crust, tomato, cheese, meat, laziness.
 
 - type: entity
@@ -391,6 +394,7 @@
     tags:
     - Meat
     - Pizza
+    - Slice
 # Tastes like crust, tomato, cheese, sausage, sass.
 
 - type: entity
@@ -411,9 +415,13 @@
     - state: pineapple
   - type: SliceableFood
     slice: FoodPizzaPineappleSlice
+  - type: Tag
+    tags:
+    - Meat
+    - Pizza
 
 - type: entity
-  name: slice of pineapple pizza
+  name: slice of Hawaiian pizza
   parent: FoodPizzaSliceBase
   id: FoodPizzaPineappleSlice
   description: A slice of joy/sin.
@@ -432,6 +440,7 @@
     tags:
     - Meat
     - Pizza
+    - Slice
 # Tastes like crust, tomato, cheese, pineapple, ham.
 
 #TODO: This is a meme pizza from /tg/. It has specially coded mechanics.
@@ -504,6 +513,7 @@
     tags:
     - Meat
     - Pizza
+    - Slice
 # Tastes like crust, tomato, cheese, pepperoni, 9 millimeter bullets.
 
 #TODO: Make this do poison damage and make cut pizza slices eventually rot into this.
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
index 9e183f35825..06fff118d19 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -302,6 +302,9 @@
       - dough
   - type: Sprite
     state: dough-slice
+  - type: Tag
+    tags:
+    - Slice
 
 - type: entity
   name: cornmeal dough
@@ -331,6 +334,9 @@
       - dough
   - type: Sprite
     state: cornmealdough-slice
+  - type: Tag
+    tags:
+    - Slice
 
 - type: entity
   name: tortilla dough
@@ -363,6 +369,9 @@
   - type: Construction
     graph: Tortilla
     node: start
+  - type: Tag
+    tags:
+    - Slice
 
 - type: entity
   name: flattened tortilla dough
@@ -567,6 +576,9 @@
           Quantity: 1
         - ReagentId: Vitamin
           Quantity: 0.2
+  - type: Tag
+    tags:
+    - Slice
 
 - type: entity
   name: tofu
@@ -612,6 +624,9 @@
           Quantity: 3
         - ReagentId: Nutriment
           Quantity: 2
+  - type: Tag
+    tags:
+    - Slice
 
 - type: entity
   name: burned mess
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index 7f6050c4b10..431343ccb99 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -1283,6 +1283,9 @@
     state: slice
   - type: Extractable
     grindableSolutionName: food
+  - type: Tag
+    tags:
+    - Slice
 
 - type: entity
   name: pineapple slice
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 58976f79c96..bdebdccf58e 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -31,9 +31,6 @@
 - type: Tag
   id: ATVKeys
 
-- type: Tag
-  id: Baguette
-
 - type: Tag
   id: Balloon
 
@@ -262,6 +259,9 @@
 - type: Tag
   id: CableCoil
 
+- type: Tag
+  id: Cake
+
 - type: Tag
   id: CaneBlade
 
@@ -959,6 +959,9 @@
 - type: Tag
   id: NozzleBackTank
 
+- type: Tag
+  id: Nugget # for chicken nuggets
+
 - type: Tag
   id: NukeOpsUplink
 
@@ -1164,6 +1167,9 @@
 - type: Tag
   id: Skewer
 
+- type: Tag
+  id: Slice # sliced fruit, vegetables, pizza etc.
+
 - type: Tag
   id: SmallAIChip
 

From 085502217d807a33b5e34f873a0a92b7a198d4df Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 23:08:29 -0400
Subject: [PATCH 108/366] insane!

---
 .../DeltaV/Entities/Mobs/NPCs/nukiemouse.yml  |  3 +--
 .../Prototypes/Entities/Mobs/NPCs/xenopet.yml |  2 +-
 .../Entities/Mobs/Player/dragon.yml           |  2 --
 .../Objects/Consumable/Food/snacks.yml        |  2 +-
 .../Circuitboards/Machine/production.yml      |  8 ------
 .../Devices/Circuitboards/computer.yml        |  4 ---
 .../Entities/Objects/Magic/books.yml          |  2 --
 .../Entities/Objects/Materials/materials.yml  | 26 ++++---------------
 .../Entities/Objects/Materials/shards.yml     |  3 ---
 .../Objects/Specific/Medical/surgery.yml      |  2 +-
 .../Guns/Ammunition/Projectiles/shotgun.yml   | 14 +++++-----
 .../Weapons/Guns/Battery/battery_guns.yml     |  2 --
 .../Prototypes/Entities/Surgery/surgeries.yml | 11 +++++---
 .../Entities/Surgery/surgery_steps.yml        |  4 +--
 Resources/Prototypes/Traits/disabilities.yml  |  2 +-
 .../WhiteDream/Entities/Actions/cultists.yml  |  1 -
 .../Objects/Weapons/Projectiles/cult.yml      |  4 +--
 17 files changed, 28 insertions(+), 64 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml
index 09cafa29575..2784bd213e1 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml
@@ -159,8 +159,7 @@
     - Syndicate
   # make the player a traitor once its taken
   - type: AutoTraitor
-    giveUplink: false
-    giveObjectives: false
+    preset: TraitorReinforcement
   - type: InteractionPopup
     successChance: 0.6
     interactSuccessString: petting-success-nukie-mouse
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml
index 37cfa7b46de..97240dd1eec 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml
@@ -133,7 +133,7 @@
     factions:
     - PetsNT
   - type: Tool
-    speed: 3
+    speedModifier: 3
     qualities:
       - Prying
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index 81cd8a579b2..e0a7f57a4b2 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -145,8 +145,6 @@
   components:
   - type: Dragon
     spawnRiftAction: ActionSpawnRift
-  - type: GenericAntag
-    rule: Dragon
   - type: ActionGun
     action: ActionDragonsBreath
     gunProto: DragonsBreathGun
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
index 3981c761b61..bdeeeccad47 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -637,7 +637,7 @@
     state: ramen
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketChowMeinTrash
   name: empty chow mein box
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 398bbe9ddb1..453259e4381 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -617,10 +617,6 @@
       materialRequirements:
         Steel: 1
         Cable: 2
-    - type: ReverseEngineering # Delta
-      difficulty: 3
-      recipes:
-        - CrewMonitoringServerMachineCircuitboard
 
 - type: entity
   id: CryoPodMachineCircuitboard
@@ -1641,10 +1637,6 @@
       materialRequirements:
         Steel: 5
         Cable: 1
-    - type: ReverseEngineering # Nyano
-      difficulty: 2
-      recipes:
-      - TraversalDistorterMachineCircuitboard
 
 - type: entity
   id: MedicalBiofabMachineBoard
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
index 7681a459cb1..e1fd49972c7 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -412,10 +412,6 @@
       price: 150
     - type: ComputerBoard
       prototype: ComputerMassMedia
-    - type: ReverseEngineering # Nyano
-      difficulty: 3
-      recipes:
-        - ComputerMassMediaCircuitboard
 
 - type: entity
   parent: BaseComputerCircuitboard
diff --git a/Resources/Prototypes/Entities/Objects/Magic/books.yml b/Resources/Prototypes/Entities/Objects/Magic/books.yml
index 7697e46b32a..5651e3e50f6 100644
--- a/Resources/Prototypes/Entities/Objects/Magic/books.yml
+++ b/Resources/Prototypes/Entities/Objects/Magic/books.yml
@@ -52,7 +52,6 @@
     - type: Store
       refundAllowed: true
       ownerOnly: true # get your own tome!
-      preset: StorePresetSpellbook
       balance:
         WizCoin: 10 # prices are balanced around this 10 point maximum and how strong the spells are
 
@@ -66,7 +65,6 @@
     - type: Store
       refundAllowed: false
       ownerOnly: true # get your own tome!
-      preset: StorePresetSpellbook
       balance:
         WizCoin: 10 # prices are balanced around this 10 point maximum and how strong the spells are
 
diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index 2eae810e664..75a02f05a49 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -54,8 +54,6 @@
         reagents:
         - ReagentId: Cellulose
           Quantity: 6
-  - type: Item
-    heldPrefix: cardboard
 
 - type: entity
   parent: MaterialCardboard
@@ -137,8 +135,6 @@
   - type: Construction
     graph: WebObjects # not sure if I should either keep this here or just make another prototype. Will keep it here just in case.
     node: cloth
-  - type: Item
-    heldPrefix: cloth
 
 - type: entity
   parent: MaterialCloth
@@ -199,8 +195,6 @@
     tags:
       - ClothMade
       - RawMaterial
-  - type: Item
-    heldPrefix: durathread
 
 - type: entity
   parent: MaterialDurathread
@@ -340,7 +334,8 @@
     sprite: Objects/Materials/materials.rsi
     state: corgihide
   - type: Item
-    heldPrefix: corgihide
+    sprite: Clothing/Head/Misc/hides.rsi
+    heldPrefix: corgi
   - type: Clothing
     sprite: Clothing/Head/Misc/hides.rsi
     equippedPrefix: corgi2
@@ -432,8 +427,6 @@
     tags:
       - ClothMade
       - RawMaterial
-  - type: Item
-    heldPrefix: cotton
 
 - type: entity
   parent: MaterialCotton
@@ -486,8 +479,6 @@
     tags:
       - ClothMade
       - RawMaterial
-  - type: Item
-    heldPrefix: pyrotton
 
 - type: entity
   parent: MaterialPyrotton
@@ -521,11 +512,13 @@
     layerStates:
       - bananium
       - bananium_1
+  - type: RadiationSource #Delta V - Adds radiation
+    intensity: 0.1
   - type: FlavorProfile
     flavors:
       - banana
   - type: Food
-    trash: 
+    trash:
     - TrashBananiumPeel
   - type: BadFood
   - type: SolutionContainerManager
@@ -547,8 +540,6 @@
       - ReagentId: Honk
         Quantity: 5
   - type: Appearance
-  - type: Item
-    heldPrefix: bananium
 
 - type: entity
   parent: MaterialBananium
@@ -599,9 +590,6 @@
     tags:
       - ClothMade
       - RawMaterial
-  - type: Item
-    sprite: Objects/Materials/silk.rsi
-    heldPrefix: silk
 
 - type: entity
   parent: MaterialWebSilk
@@ -647,8 +635,6 @@
         reagents:
         - ReagentId: Vitamin
           Quantity: 3
-  - type: Item
-    heldPrefix: bones
 
 - type: entity
   parent: MaterialBones
@@ -703,8 +689,6 @@
     - goliath_hide_3
   - type: Item
     size: Large
-    heldPrefix: goliathhide
-    sprite: Objects/Materials/hide.rsi
     shape:
     - 0,0,2,2
 
diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
index 59e23ef82ab..b350ab1c9cd 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -179,9 +179,6 @@
     damage:
       types:
         Slash: 0.15
-    refineResult:
-    - id: SheetGlass1
-    - id: SheetPlasma1
   - type: DamageUserOnTrigger
     damage:
       types:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
index f990736d700..baf26c65b2f 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
@@ -421,7 +421,7 @@
   - type: Tool
     qualities:
       - Sawing
-    speed: 1.0
+    speedModifier: 1.0
   - type: MeleeWeapon
     attackRate: 1.3333
     range: 1.35
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
index ce79b6f4174..d8c465cf9e8 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -44,7 +44,7 @@
 
 - type: entity
   id: PelletShotgunSpread
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: PelletShotgun
   components:
   - type: ProjectileSpread
@@ -71,7 +71,7 @@
 
 - type: entity
   id: PelletShotgunIncendiarySpread
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: PelletShotgunIncendiary
   components:
   - type: ProjectileSpread
@@ -95,7 +95,7 @@
 
 - type: entity
   id: PelletShotgunPracticeSpread
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: PelletShotgunPractice
   components:
   - type: ProjectileSpread
@@ -120,7 +120,7 @@
 
 - type: entity
   id: PelletShotgunImprovisedSpread
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: PelletShotgunImprovised
   components:
   - type: ProjectileSpread
@@ -219,7 +219,7 @@
 
 - type: entity
   id: PelletShotgunUraniumSpread
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: PelletShotgunUranium
   components:
   - type: ProjectileSpread
@@ -247,7 +247,7 @@
 
 - type: entity
   id: PelletGrapeshotSpread
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: PelletGrapeshot
   components:
   - type: ProjectileSpread
@@ -278,7 +278,7 @@
 - type: entity
   id: PelletGlassSpread
   parent: PelletGlass
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: ProjectileSpread
     proto: PelletGlass
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 62291cc2714..6763599ebb2 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -21,7 +21,6 @@
     fireOnDropChance: 0.15
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/laser.ogg
-    doRecoil: false
   - type: Battery
     maxCharge: 1000
     startingCharge: 1000
@@ -72,7 +71,6 @@
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/laser.ogg
-    doRecoil: false
   - type: MagazineAmmoProvider
   - type: ItemSlots
     slots:
diff --git a/Resources/Prototypes/Entities/Surgery/surgeries.yml b/Resources/Prototypes/Entities/Surgery/surgeries.yml
index 2db9782b67e..3e967c70302 100644
--- a/Resources/Prototypes/Entities/Surgery/surgeries.yml
+++ b/Resources/Prototypes/Entities/Surgery/surgeries.yml
@@ -65,7 +65,7 @@
         - type: OhioAccent
         - type: RatvarianLanguage
         - type: Clumsy
-          clumsyDamage: # Placeholder values to be able to initialize the component
+          gunShootFailDamage: # Placeholder values to be able to initialize the component
             types:
               Blunt: 0
     inverse: true
@@ -92,9 +92,12 @@
         - type: OhioAccent
         - type: RatvarianLanguage
         - type: Clumsy
-          clumsyDamage:
-            types:
-              Blunt: 0
+          gunShootFailDamage:
+          types:
+            Blunt: 5
+            Piercing: 4
+          groups:
+            Burn: 3
 
 - type: entity
   parent: SurgeryBase
diff --git a/Resources/Prototypes/Entities/Surgery/surgery_steps.yml b/Resources/Prototypes/Entities/Surgery/surgery_steps.yml
index c2e213670e2..500acbb3fd1 100644
--- a/Resources/Prototypes/Entities/Surgery/surgery_steps.yml
+++ b/Resources/Prototypes/Entities/Surgery/surgery_steps.yml
@@ -538,7 +538,7 @@
         - type: OhioAccent
         - type: RatvarianLanguage
         - type: Clumsy
-          clumsyDamage:
+          gunShootFailDamage:
             types:
               Blunt: 5
               Piercing: 4
@@ -569,7 +569,7 @@
         - type: OhioAccent
         - type: RatvarianLanguage
         - type: Clumsy
-          clumsyDamage:
+          gunShootFailDamage:
             types:
               Blunt: 0
   - type: Sprite
diff --git a/Resources/Prototypes/Traits/disabilities.yml b/Resources/Prototypes/Traits/disabilities.yml
index 83645e3a820..68877b01d27 100644
--- a/Resources/Prototypes/Traits/disabilities.yml
+++ b/Resources/Prototypes/Traits/disabilities.yml
@@ -270,7 +270,7 @@
     - !type:TraitAddComponent
       components:
         - type: Clumsy
-          clumsyDamage:
+          gunShootFailDamage:
             types:
               Blunt: 5
               Piercing: 4
diff --git a/Resources/Prototypes/WhiteDream/Entities/Actions/cultists.yml b/Resources/Prototypes/WhiteDream/Entities/Actions/cultists.yml
index 45e6217c602..2c20947fc90 100644
--- a/Resources/Prototypes/WhiteDream/Entities/Actions/cultists.yml
+++ b/Resources/Prototypes/WhiteDream/Entities/Actions/cultists.yml
@@ -368,5 +368,4 @@
       state: gauntlet_echo
     event: !type:ProjectileSpellEvent
       prototype: ProjectileGauntlet
-      projectileSpeed: 5
   - type: BaseCultSpell
diff --git a/Resources/Prototypes/WhiteDream/Entities/Objects/Weapons/Projectiles/cult.yml b/Resources/Prototypes/WhiteDream/Entities/Objects/Weapons/Projectiles/cult.yml
index 69a007b90e3..03514fae809 100644
--- a/Resources/Prototypes/WhiteDream/Entities/Objects/Weapons/Projectiles/cult.yml
+++ b/Resources/Prototypes/WhiteDream/Entities/Objects/Weapons/Projectiles/cult.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: ProjectileGauntlet
   name: gauntlet
   description: Oh no.
@@ -17,4 +17,4 @@
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
     layers:
-    - state: gauntlet_echo
+    - state: gauntlet_echo
\ No newline at end of file

From 2e2a7a8ce8447b6641a2a23f7599400c35c7777d Mon Sep 17 00:00:00 2001
From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Wed, 13 Mar 2024 10:47:17 +0100
Subject: [PATCH 109/366] Changed names of uplink categories and swapped around
 items (#25079)

* Changed names of uplink categories and swapped around items

* sloth feedback
---
 Resources/Locale/en-US/store/categories.ftl   | 14 +--
 .../Prototypes/Catalog/uplink_catalog.yml     | 92 +++++++++++--------
 Resources/Prototypes/Store/categories.yml     | 34 +++----
 Resources/Prototypes/Store/presets.yml        | 12 +--
 4 files changed, 82 insertions(+), 70 deletions(-)

diff --git a/Resources/Locale/en-US/store/categories.ftl b/Resources/Locale/en-US/store/categories.ftl
index cca23d58cf7..64ed0b5c637 100644
--- a/Resources/Locale/en-US/store/categories.ftl
+++ b/Resources/Locale/en-US/store/categories.ftl
@@ -1,16 +1,16 @@
-# Uplink
+# Uplink
 store-category-debug = debug category
 store-category-debug2 = debug category 2
-store-category-weapons = Weapons
+store-category-weapons = Weaponry
 store-category-ammo = Ammo
 store-category-explosives = Explosives
-store-category-misc = Misc
-store-category-bundles = Bundles
-store-category-tools = Tools
-store-category-utility = Utility
+store-category-chemicals = Chemicals
+store-category-deception = Deception
+store-category-disruption = Disruption
 store-category-implants = Implants
+store-category-allies = Allies
 store-category-job = Job
-store-category-armor = Armor
+store-category-wearables = Wearables
 store-category-pointless = Pointless
 store-discounted-items = Discounts
 
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 9a5ee170c15..0dbb737e586 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -12,7 +12,7 @@
   cost:
     Telecrystal: 3
   categories:
-  - UplinkWeapons
+  - UplinkWeaponry
 
 - type: listing
   id: UplinkRevolverPython
@@ -25,7 +25,7 @@
   cost:
     Telecrystal: 8 # Originally was 13 TC but was not used due to high cost
   categories:
-  - UplinkWeapons
+  - UplinkWeaponry
 
 # Inbuilt suppressor so it's sneaky + more expensive.
 - type: listing
@@ -39,7 +39,7 @@
   cost:
     Telecrystal: 4
   categories:
-  - UplinkWeapons
+  - UplinkWeaponry
 
 # Poor accuracy, slow to fire, cheap option
 - type: listing
@@ -50,7 +50,7 @@
   cost:
     Telecrystal: 1
   categories:
-  - UplinkWeapons
+  - UplinkWeaponry
 
 - type: listing
   id: UplinkEsword
@@ -64,7 +64,7 @@
   cost:
     Telecrystal: 8
   categories:
-  - UplinkWeapons
+  - UplinkWeaponry
 
 - type: listing
   id: UplinkEnergyDagger
@@ -78,7 +78,7 @@
   cost:
     Telecrystal: 2
   categories:
-  - UplinkWeapons
+  - UplinkWeaponry
 
 - type: listing
   id: UplinkThrowingKnivesKit
@@ -92,7 +92,21 @@
   cost:
     Telecrystal: 6
   categories:
-    - UplinkWeapons
+    - UplinkWeaponry
+
+- type: listing
+  id: UplinkThrowingKnivesKit
+  name: uplink-knives-kit-name
+  description: uplink-knives-kit-desc
+  icon: { sprite: /Textures/Objects/Storage/boxicons.rsi, state: throwing_knives }
+  productEntity: ThrowingKnivesKit
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 3
+  cost:
+    Telecrystal: 6
+  categories:
+    - UplinkWeaponry
 
 - type: listing
   id: UplinkGlovesNorthStar
@@ -105,7 +119,7 @@
   cost:
     Telecrystal: 8
   categories:
-  - UplinkWeapons
+  - UplinkWeaponry
 
 - type: listing
   id: UplinkDisposableTurret
@@ -118,7 +132,7 @@
   cost:
     Telecrystal: 6
   categories:
-  - UplinkWeapons
+  - UplinkWeaponry
   conditions:
     - !type:StoreWhitelistCondition
       blacklist:
@@ -770,11 +784,11 @@
   - UplinkDeception
 
 - type: listing
-  id: UplinkBinaryTranslatorKey
-  name: uplink-binary-translator-key-name
-  description: uplink-binary-translator-key-desc
-  icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: rd_label }
-  productEntity: EncryptionKeyBinary
+  id: UplinkMobCatMicrobomb
+  name: uplink-mobcat-microbomb-name
+  description: uplink-mobcat-microbomb-desc
+  icon: { sprite: /Textures/Mobs/Pets/cat.rsi, state: syndicat }
+  productEntity: MobCatSyndy
   cost:
     Telecrystal: 1
   categories:
@@ -1339,7 +1353,7 @@
         components:
           - SurplusBundle
 
-# Bundles
+# Wearables
 
 - type: listing
   id: UplinkJetpack
@@ -1381,7 +1395,7 @@
   cost:
     Telecrystal: 4
   categories:
-  - UplinkBundles
+    - UplinkWearables
 
 - type: listing
   id: UplinkClothingNoSlipsShoes
@@ -1392,9 +1406,10 @@
   discountDownTo:
     Telecrystal: 1
   cost:
-    Telecrystal: 6
+    Telecrystal: 2
   categories:
   - UplinkWearables
+  - UplinkWearables
 
 - type: listing
   id: UplinkgClothingThievingGloves
@@ -1406,8 +1421,10 @@
     Telecrystal: 2
   cost:
     Telecrystal: 4
+    Telecrystal: 4
   categories:
   - UplinkWearables
+  - UplinkWearables
 
 - type: listing
   id: UplinkClothingOuterVestWeb
@@ -1418,9 +1435,9 @@
   discountDownTo:
     Telecrystal: 1
   cost:
-    Telecrystal: 12
+    Telecrystal: 3
   categories:
-  - UplinkBundles
+  - UplinkWearables
 
 - type: listing
   id: UplinkClothingShoesBootsMagSyndie
@@ -1431,9 +1448,9 @@
   discountDownTo:
     Telecrystal: 2
   cost:
-    Telecrystal: 17
+    Telecrystal: 4
   categories:
-  - UplinkBundles
+  - UplinkWearables
 
 - type: listing
   id: UplinkEVASyndie
@@ -1445,9 +1462,9 @@
   discountDownTo:
     Telecrystal: 1
   cost:
-    Telecrystal: 20
+    Telecrystal: 2
   categories:
-  - UplinkBundles
+  - UplinkWearables
 
 - type: listing
   id: UplinkHardsuitCarp
@@ -1459,9 +1476,9 @@
   discountDownTo:
     Telecrystal: 2
   cost:
-    Telecrystal: 25
+    Telecrystal: 8
   categories:
-  - UplinkBundles
+  - UplinkWearables
 
 - type: listing
   id: UplinkHardsuitSyndie
@@ -1473,17 +1490,17 @@
   discountDownTo:
     Telecrystal: 4
   cost:
-    Telecrystal: 30
+    Telecrystal: 10
   categories:
-  - UplinkBundles
+  - UplinkWearables
 
 - type: listing
-  id: UplinkSurplusBundle
-  name: uplink-surplus-bundle-name
-  description: uplink-surplus-bundle-desc
-  productEntity: CrateSyndicateSurplusBundle
+  id: UplinkClothingConductingGloves
+  name: uplink-clothing-conducting-gloves-name
+  description: uplink-clothing-conducting-gloves-desc
+  productEntity: ClothingHandsGlovesConducting
   cost:
-    Telecrystal: 20
+    Telecrystal: 2
   categories:
   - UplinkBundles
   conditions:
@@ -1507,7 +1524,7 @@
   discountDownTo:
     Telecrystal: 7
   cost:
-    Telecrystal: 40
+    Telecrystal: 1
   categories:
   - UplinkWearables
 
@@ -1556,14 +1573,9 @@
   discountDownTo:
     Telecrystal: 1
   cost:
-    Telecrystal: 8
+    Telecrystal: 1
   categories:
-  - UplinkTools
-  conditions:
-    - !type:BuyerWhitelistCondition
-      blacklist:
-        components:
-          - SurplusBundle
+  - UplinkPointless
 
 # Job Specific
 
diff --git a/Resources/Prototypes/Store/categories.yml b/Resources/Prototypes/Store/categories.yml
index 425244a0fac..16612c7c721 100644
--- a/Resources/Prototypes/Store/categories.yml
+++ b/Resources/Prototypes/Store/categories.yml
@@ -35,7 +35,7 @@
 
 #uplink categoires
 - type: storeCategory
-  id: UplinkWeapons
+  id: UplinkWeaponry
   name: store-category-weapons
   priority: 0
 
@@ -50,44 +50,44 @@
   priority: 2
 
 - type: storeCategory
-  id: UplinkMisc
-  name: store-category-misc
+  id: UplinkWearables
+  name: store-category-wearables
   priority: 3
 
 - type: storeCategory
-  id: UplinkBundles
-  name: store-category-bundles
+  id: UplinkChemicals
+  name: store-category-chemicals
   priority: 4
 
 - type: storeCategory
-  id: UplinkTools
-  name: store-category-tools
+  id: UplinkDeception
+  name: store-category-deception
   priority: 5
 
 - type: storeCategory
-  id: UplinkUtility
-  name: store-category-utility
+  id: UplinkDisruption
+  name: store-category-disruption
   priority: 6
 
 - type: storeCategory
   id: UplinkImplants
   name: store-category-implants
-  priority: 6
-
-- type: storeCategory
-  id: UplinkJob
-  name: store-category-job
   priority: 7
 
 - type: storeCategory
-  id: UplinkArmor
-  name: store-category-armor
+  id: UplinkAllies
+  name: store-category-allies
   priority: 8
 
+- type: storeCategory
+  id: UplinkJob
+  name: store-category-job
+  priority: 9
+
 - type: storeCategory
   id: UplinkPointless
   name: store-category-pointless
-  priority: 9
+  priority: 10
 
 - type: storeCategory
   id: UplinkDeception
diff --git a/Resources/Prototypes/Store/presets.yml b/Resources/Prototypes/Store/presets.yml
index ff9981edde7..356cf5a4ecf 100644
--- a/Resources/Prototypes/Store/presets.yml
+++ b/Resources/Prototypes/Store/presets.yml
@@ -5,16 +5,16 @@
   - type: Store
     name: store-preset-name-uplink
     categories:
-    - UplinkWeapons
+    - UplinkWeaponry
     - UplinkAmmo
     - UplinkExplosives
-    - UplinkMisc
-    - UplinkBundles
-    - UplinkTools
-    - UplinkUtility
+    - UplinkWearables
+    - UplinkChemicals
+    - UplinkDeception
+    - UplinkDisruption
     - UplinkImplants
     - UplinkJob
-    - UplinkArmor
+    - UplinkAllies
     - UplinkPointless
     - UplinkSales
     currencyWhitelist:

From 9906f3506dee3dab2bfd530747ec8f90677493cf Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 23:20:37 -0400
Subject: [PATCH 110/366] yeag!!

---
 .../Prototypes/Catalog/uplink_catalog.yml     | 30 +++++++++----------
 .../DeltaV/Catalog/uplink_catalog.yml         |  2 +-
 .../reinforcement_teleporter.yml              | 17 +++++++++++
 .../Nyanotrasen/Catalog/uplink_catalog.yml    |  4 +--
 4 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 0dbb737e586..787fe368ff4 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -741,7 +741,7 @@
   cost:
     Telecrystal: 3
   categories:
-  - UplinkUtility
+  - UplinkDeception
 
 - type: listing
   id: UplinkStealthBox
@@ -754,7 +754,7 @@
   cost:
     Telecrystal: 5
   categories:
-  - UplinkUtility
+  - UplinkDeception
 
 - type: listing
   id: UplinkChameleonProjector
@@ -802,7 +802,7 @@
   cost:
     Telecrystal: 1
   categories:
-  - UplinkUtility
+  - UplinkDeception
 
 - type: listing
   id: UplinkDecoyDisk
@@ -812,7 +812,7 @@
   cost:
     Telecrystal: 1
   categories:
-  - UplinkUtility
+  - UplinkDeception
 
 - type: listing
   id: UplinkUltrabrightLantern
@@ -825,7 +825,7 @@
   cost:
     Telecrystal: 2
   categories:
-  - UplinkUtility
+  - UplinkDeception
 
 - type: listing
   id: UplinkBribe
@@ -838,7 +838,7 @@
   cost:
     Telecrystal: 4
   categories:
-    - UplinkUtility
+    - UplinkDeception
 
 # - type: listing
 #   id: UplinkGigacancerScanner
@@ -1077,7 +1077,7 @@
   cost:
     Telecrystal: 16
   categories:
-  - UplinkUtility
+  - UplinkAllies
   conditions:
     - !type:StoreWhitelistCondition
       blacklist:
@@ -1093,7 +1093,7 @@
   cost:
     Telecrystal: 16
   categories:
-  - UplinkUtility
+  - UplinkAllies
   conditions:
     - !type:StoreWhitelistCondition
       whitelist:
@@ -1109,7 +1109,7 @@
   cost:
     Telecrystal: 65
   categories:
-    - UplinkUtility
+    - UplinkAllies
   conditions:
     - !type:StoreWhitelistCondition
       whitelist:
@@ -1128,7 +1128,7 @@
   cost:
     Telecrystal: 8
   categories:
-  - UplinkUtility
+  - UplinkAllies
   conditions:
     - !type:StoreWhitelistCondition
       blacklist:
@@ -1147,7 +1147,7 @@
   cost:
     Telecrystal: 6
   categories:
-  - UplinkUtility
+  - UplinkAllies
   conditions:
     - !type:StoreWhitelistCondition
       whitelist:
@@ -1165,7 +1165,7 @@
   cost:
     Telecrystal: 2
   categories:
-  - UplinkUtility
+  - UplinkAllies
 
 - type: listing
   id: UplinkMobCatMicrobomb
@@ -1179,7 +1179,7 @@
   cost:
     Telecrystal: 6
   categories:
-  - UplinkUtility
+  - UplinkAllies
 
 # Implants
 
@@ -1849,7 +1849,7 @@
   cost:
     Telecrystal: 3
   categories:
-    - UplinkUtility
+    - UplinkAllies
 
 # Armor
 
@@ -1861,4 +1861,4 @@
   cost:
     Telecrystal: 1
   categories:
-    - UplinkArmor
\ No newline at end of file
+    - UplinkWearables
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
index ca0e83d45a3..62525a9c077 100644
--- a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
@@ -7,7 +7,7 @@
   cost:
     Telecrystal: 3
   categories:
-  - UplinkUtility
+  - UplinkAllies
 
 - type: listing
   id: UplinkBionicSyrinxImplanter
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
index 660a8c9e60c..c1011952f78 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
@@ -54,6 +54,23 @@
     prototype: MobMonkeySyndicateAgentNukeops
     selectablePrototypes: ["SyndicateMonkeyNukeops", "SyndicateKoboldNukeops"]
 
+- type: entity
+  parent: ReinforcementRadio
+  id: ReinforcementRadioSyndicateSyndiCat
+  name: syndicat reinforcement radio
+  description: Calls in a faithfully trained cat with a microbomb to assist you.
+  components:
+  - type: GhostRole
+    name: ghost-role-information-SyndiCat-name
+    description: ghost-role-information-SyndiCat-description
+    rules: ghost-role-information-syndicate-reinforcement-rules
+    raffle:
+      settings: default
+  - type: GhostRoleMobSpawner
+    prototype: MobCatSyndy
+  - type: EmitSoundOnUse
+    sound: /Audio/Animals/cat_meow.ogg
+
 - type: entity
   parent: ReinforcementRadioSyndicate
   id: ReinforcementRadioSyndicateCyborgAssault # Reinforcement radio exclusive to nukeops uplink
diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/uplink_catalog.yml b/Resources/Prototypes/Nyanotrasen/Catalog/uplink_catalog.yml
index 043e16054ff..77446652bbd 100644
--- a/Resources/Prototypes/Nyanotrasen/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Nyanotrasen/Catalog/uplink_catalog.yml
@@ -6,7 +6,7 @@
   cost:
     Telecrystal: 10
   categories:
-  - UplinkWeapons
+  - UplinkWeaponry
   conditions:
   - !type:BuyerSpeciesCondition
     whitelist:
@@ -34,7 +34,7 @@
   cost:
     Telecrystal: 6
   categories:
-  - UplinkArmor
+  - UplinkWearables
   conditions:
   - !type:BuyerSpeciesCondition
     whitelist:

From dfa4da546183f3915ffa6ac7bbfaae9a9ca85343 Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Sun, 16 Jun 2024 11:57:57 +0000
Subject: [PATCH 111/366] add carp hardsuit for traitors (#25155)

* FactionClothing

* swtich carp to the Dragon faction

* add carp hardsuit

* add carp hardsuit to uplink

* fixes

* webedit ops 1

* why did i name it that wtf

* among

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 .../Components/FactionClothingComponent.cs    | 27 ++++++++++++
 .../EntitySystems/FactionClothingSystem.cs    | 42 +++++++++++++++++++
 .../Locale/en-US/store/uplink-catalog.ftl     |  3 ++
 .../Entities/Clothing/Head/hoods.yml          | 16 +++++++
 .../Entities/Clothing/OuterClothing/suits.yml | 13 ++++++
 .../Prototypes/Entities/Mobs/NPCs/carp.yml    |  2 +-
 6 files changed, 102 insertions(+), 1 deletion(-)
 create mode 100644 Content.Shared/Clothing/Components/FactionClothingComponent.cs
 create mode 100644 Content.Shared/Clothing/EntitySystems/FactionClothingSystem.cs

diff --git a/Content.Shared/Clothing/Components/FactionClothingComponent.cs b/Content.Shared/Clothing/Components/FactionClothingComponent.cs
new file mode 100644
index 00000000000..d49ee4f81d6
--- /dev/null
+++ b/Content.Shared/Clothing/Components/FactionClothingComponent.cs
@@ -0,0 +1,27 @@
+using Content.Shared.Clothing.EntitySystems;
+using Content.Shared.NPC.Prototypes;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Clothing.Components;
+
+/// <summary>
+/// When equipped, adds the wearer to a faction.
+/// When removed, removes the wearer from a faction.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(FactionClothingSystem))]
+public sealed partial class FactionClothingComponent : Component
+{
+    /// <summary>
+    /// Faction to add and remove.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<NpcFactionPrototype> Faction = string.Empty;
+
+    /// <summary>
+    /// If true, the wearer was already part of the faction.
+    /// This prevents wrongly removing them after removing the item.
+    /// </summary>
+    [DataField]
+    public bool AlreadyMember;
+}
diff --git a/Content.Shared/Clothing/EntitySystems/FactionClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/FactionClothingSystem.cs
new file mode 100644
index 00000000000..76b7b9aa66d
--- /dev/null
+++ b/Content.Shared/Clothing/EntitySystems/FactionClothingSystem.cs
@@ -0,0 +1,42 @@
+using Content.Shared.Clothing.Components;
+using Content.Shared.Inventory.Events;
+using Content.Shared.NPC.Components;
+using Content.Shared.NPC.Systems;
+
+namespace Content.Shared.Clothing.EntitySystems;
+
+/// <summary>
+/// Handles <see cref="FactionClothingComponent"/> faction adding and removal.
+/// </summary>
+public sealed class FactionClothingSystem : EntitySystem
+{
+    [Dependency] private readonly NpcFactionSystem _faction = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<FactionClothingComponent, GotEquippedEvent>(OnEquipped);
+        SubscribeLocalEvent<FactionClothingComponent, GotUnequippedEvent>(OnUnequipped);
+    }
+
+    private void OnEquipped(Entity<FactionClothingComponent> ent, ref GotEquippedEvent args)
+    {
+        TryComp<NpcFactionMemberComponent>(args.Equipee, out var factionComp);
+        var faction = (args.Equipee, factionComp);
+        ent.Comp.AlreadyMember = _faction.IsMember(faction, ent.Comp.Faction);
+
+        _faction.AddFaction(faction, ent.Comp.Faction);
+    }
+
+    private void OnUnequipped(Entity<FactionClothingComponent> ent, ref GotUnequippedEvent args)
+    {
+        if (ent.Comp.AlreadyMember)
+        {
+            ent.Comp.AlreadyMember = false;
+            return;
+        }
+
+        _faction.RemoveFaction(args.Equipee, ent.Comp.Faction);
+    }
+}
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 2ac91d171eb..c2bb30a738a 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -317,6 +317,9 @@ uplink-clothing-shoes-boots-mag-syndie-desc = A pair of boots that prevent slipp
 uplink-eva-syndie-name = Syndicate EVA Bundle
 uplink-eva-syndie-desc = A simple EVA suit that offers no protection other than what's needed to survive in space.
 
+uplink-hardsuit-carp-name = Carp Hardsuit
+uplink-hardsuit-carp-desc = Looks like an ordinary carp suit, except fully spaceproof and tricks space carp into thinking you are one of them.
+
 uplink-hardsuit-syndie-name = Syndicate Hardsuit
 uplink-hardsuit-syndie-desc = The Syndicate's well known armored blood red hardsuit, capable of space walks and bullet resistant.
 
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
index be7bda91008..9d9cdfce38f 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
@@ -206,6 +206,22 @@
     slots:
     - Hair
 
+- type: entity
+  parent: ClothingHeadHatHoodCarp
+  id: ClothingHeadHelmetHardsuitCarp
+  noSpawn: true
+  components:
+  - type: PressureProtection
+    highPressureMultiplier: 0.6
+    lowPressureMultiplier: 1000
+  - type: TemperatureProtection
+    coefficient: 0.2
+  - type: BreathMask
+  # this is on the hood so you only fool the fish if you wear the whole set
+  # wear carp suit and security helmet, they'll know you are fake
+  - type: FactionClothing
+    faction: Dragon
+
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatHoodMoth
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
index 7ba33bd0da6..ac4d430557e 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -297,3 +297,16 @@
   - type: ContainerContainer
     containers:
       toggleable-clothing: !type:ContainerSlot {}
+
+- type: entity
+  parent: ClothingOuterSuitCarp
+  id: ClothingOuterHardsuitCarp
+  suffix: Hardsuit, DO NOT MAP
+  components:
+  - type: PressureProtection
+    highPressureMultiplier: 0.6
+    lowPressureMultiplier: 1000
+  - type: TemperatureProtection
+    coefficient: 0.01
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitCarp
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
index bf13f9dfa49..d241173f2e6 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -15,7 +15,7 @@
           true
     - type: NpcFactionMember
       factions:
-        - SimpleHostile
+      - Dragon
     - type: Sprite
       drawdepth: Mobs
       sprite: Mobs/Aliens/Carps/space.rsi

From 883aae462dc82bacef942e9896a8b729196b47ef Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 15 Dec 2024 23:25:06 -0400
Subject: [PATCH 112/366] hrm

---
 Resources/Prototypes/Catalog/uplink_catalog.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 787fe368ff4..9fe3e394af2 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -1332,7 +1332,6 @@
       blacklist:
         tags:
           - NukeOpsUplink
-  saleBlacklist: true
 
 - type: listing
   id: UplinkDeathRattle
@@ -1512,7 +1511,6 @@
     blacklist:
       components:
       - SurplusBundle
-  saleBlacklist: true
 
 - type: listing
   id: UplinkHardsuitSyndieElite
@@ -1560,7 +1558,6 @@
     blacklist:
       components:
       - SurplusBundle
-  saleBlacklist: true
 
 # Tools
 

From 2115843939b83e3725a539ae7051e1bc17440bae Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Fri, 13 Sep 2024 16:02:54 +0200
Subject: [PATCH 113/366] Add extradimensional orange, holymelon, meatwheat,
 worldpeas mutations (#27624)

* new mutations

* translation string fix

* add haloperidol to plant

* fix

* add FoodSequence

* food sequence fixes
---
 .../FoodSequenceElementPrototype.cs           |   45 +
 .../Locale/en-US/flavors/flavor-profiles.ftl  |    5 +
 .../nutrition/components/food-sequence.ftl    |   18 +-
 Resources/Locale/en-US/seeds/seeds.ftl        |   12 +-
 .../Entities/Objects/Consumable/Food/meat.yml |    9 +-
 .../Objects/Consumable/Food/produce.yml       |  194 +++
 .../Objects/Specific/Hydroponics/seeds.yml    |   43 +
 Resources/Prototypes/Flavors/flavors.yml      |   37 +-
 Resources/Prototypes/Hydroponics/seeds.yml    |  246 +++-
 .../Recipes/Cooking/food_sequence_element.yml | 1178 +++++++++++++++++
 .../Consumable/Food/skewer.rsi/meta.json      |    7 +-
 .../Food/skewer.rsi/skewer-holymelon.png      |  Bin 0 -> 356 bytes
 .../extradimensional_orange.rsi/dead.png      |  Bin 0 -> 448 bytes
 .../extradimensional_orange.rsi/harvest.png   |  Bin 0 -> 725 bytes
 .../extradimensional_orange.rsi/meta.json     |   68 +
 .../extradimensional_orange.rsi/produce.png   |  Bin 0 -> 24211 bytes
 .../extradimensional_orange.rsi/seed.png      |  Bin 0 -> 2826 bytes
 .../extradimensional_orange.rsi/stage-1.png   |  Bin 0 -> 169 bytes
 .../extradimensional_orange.rsi/stage-2.png   |  Bin 0 -> 196 bytes
 .../extradimensional_orange.rsi/stage-3.png   |  Bin 0 -> 243 bytes
 .../extradimensional_orange.rsi/stage-4.png   |  Bin 0 -> 359 bytes
 .../extradimensional_orange.rsi/stage-5.png   |  Bin 0 -> 545 bytes
 .../extradimensional_orange.rsi/stage-6.png   |  Bin 0 -> 625 bytes
 .../Hydroponics/holymelon.rsi/dead.png        |  Bin 0 -> 317 bytes
 .../Hydroponics/holymelon.rsi/harvest.png     |  Bin 0 -> 440 bytes
 .../Hydroponics/holymelon.rsi/meta.json       |   52 +
 .../Hydroponics/holymelon.rsi/produce.png     |  Bin 0 -> 1288 bytes
 .../Hydroponics/holymelon.rsi/seed.png        |  Bin 0 -> 427 bytes
 .../Hydroponics/holymelon.rsi/slice.png       |  Bin 0 -> 378 bytes
 .../Hydroponics/holymelon.rsi/stage-1.png     |  Bin 0 -> 158 bytes
 .../Hydroponics/holymelon.rsi/stage-2.png     |  Bin 0 -> 177 bytes
 .../Hydroponics/holymelon.rsi/stage-3.png     |  Bin 0 -> 291 bytes
 .../Hydroponics/holymelon.rsi/stage-4.png     |  Bin 0 -> 326 bytes
 .../Hydroponics/holymelon.rsi/stage-5.png     |  Bin 0 -> 360 bytes
 .../Hydroponics/holymelon.rsi/stage-6.png     |  Bin 0 -> 398 bytes
 .../Hydroponics/meatwheat.rsi/dead.png        |  Bin 0 -> 581 bytes
 .../Hydroponics/meatwheat.rsi/harvest.png     |  Bin 0 -> 1208 bytes
 .../Hydroponics/meatwheat.rsi/meta.json       |   41 +
 .../Hydroponics/meatwheat.rsi/produce.png     |  Bin 0 -> 993 bytes
 .../Hydroponics/meatwheat.rsi/seed.png        |  Bin 0 -> 406 bytes
 .../Hydroponics/meatwheat.rsi/stage-1.png     |  Bin 0 -> 391 bytes
 .../Hydroponics/meatwheat.rsi/stage-2.png     |  Bin 0 -> 641 bytes
 .../Hydroponics/meatwheat.rsi/stage-3.png     |  Bin 0 -> 809 bytes
 .../Hydroponics/meatwheat.rsi/stage-4.png     |  Bin 0 -> 835 bytes
 .../Hydroponics/meatwheat.rsi/stage-5.png     |  Bin 0 -> 994 bytes
 .../Hydroponics/meatwheat.rsi/stage-6.png     |  Bin 0 -> 1003 bytes
 .../Hydroponics/watermelon.rsi/meta.json      |    2 +-
 .../Hydroponics/watermelon.rsi/produce.png    |  Bin 439 -> 717 bytes
 .../Hydroponics/world_pea.rsi/dead.png        |  Bin 0 -> 555 bytes
 .../Hydroponics/world_pea.rsi/harvest.png     |  Bin 0 -> 717 bytes
 .../Hydroponics/world_pea.rsi/meta.json       |   32 +
 .../Hydroponics/world_pea.rsi/produce.png     |  Bin 0 -> 512 bytes
 .../Hydroponics/world_pea.rsi/seed.png        |  Bin 0 -> 2832 bytes
 .../Hydroponics/world_pea.rsi/stage-1.png     |  Bin 0 -> 353 bytes
 .../Hydroponics/world_pea.rsi/stage-2.png     |  Bin 0 -> 425 bytes
 .../Hydroponics/world_pea.rsi/stage-3.png     |  Bin 0 -> 556 bytes
 56 files changed, 1976 insertions(+), 13 deletions(-)
 create mode 100644 Content.Shared/Nutrition/Prototypes/FoodSequenceElementPrototype.cs
 create mode 100644 Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml
 create mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-holymelon.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/dead.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/harvest.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/produce.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/seed.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/stage-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/stage-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/stage-3.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/stage-4.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/stage-5.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/stage-6.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/dead.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/harvest.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/seed.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/slice.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-3.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-4.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-5.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-6.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/dead.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/harvest.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/seed.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/stage-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/stage-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/stage-3.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/stage-4.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/stage-5.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/stage-6.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/dead.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/harvest.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/produce.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/seed.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/stage-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/stage-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/stage-3.png

diff --git a/Content.Shared/Nutrition/Prototypes/FoodSequenceElementPrototype.cs b/Content.Shared/Nutrition/Prototypes/FoodSequenceElementPrototype.cs
new file mode 100644
index 00000000000..931d8a35327
--- /dev/null
+++ b/Content.Shared/Nutrition/Prototypes/FoodSequenceElementPrototype.cs
@@ -0,0 +1,45 @@
+using Content.Shared.Tag;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+using System.Numerics;
+
+namespace Content.Shared.Nutrition.Prototypes;
+
+/// <summary>
+/// Unique data storage block for different FoodSequence layers
+/// </summary>
+[Prototype("foodSequenceElement")]
+public sealed partial class FoodSequenceElementPrototype : IPrototype
+{
+    [IdDataField] public string ID { get; private set; } = default!;
+
+    /// <summary>
+    /// sprite options. A random one will be selected and used to display the layer.
+    /// </summary>
+    [DataField]
+    public List<SpriteSpecifier> Sprites { get; private set; } = new();
+
+    /// <summary>
+    /// Relative size of the sprite displayed in the food sequence.
+    /// </summary>
+    [DataField]
+    public Vector2 Scale { get; private set; } = Vector2.One;
+
+    /// <summary>
+    /// A localized name piece to build into the item name generator.
+    /// </summary>
+    [DataField]
+    public LocId? Name { get; private set; }
+
+    /// <summary>
+    /// If the layer is the final one, it can be added over the limit, but no other layers can be added after it.
+    /// </summary>
+    [DataField]
+    public bool Final { get; private set; }
+
+    /// <summary>
+    /// Tag list of this layer. Used for recipes for food metamorphosis.
+    /// </summary>
+    [DataField]
+    public List<ProtoId<TagPrototype>> Tags { get; set; } = new();
+}
diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
index 39b185bd02f..ed9656f27cf 100644
--- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
@@ -171,6 +171,11 @@ flavor-complex-violets = like violets
 flavor-complex-pyrotton = like a burning mouth
 flavor-complex-mothballs = like mothballs
 flavor-complex-paint-thinner = like paint thinner
+flavor-complex-numbing-tranquility = like numbing tranquility
+flavor-complex-true-nature = like the true nature of reality
+flavor-complex-false-meat = not entirely unlike meat
+flavor-complex-paper = like mushy pulp
+flavor-complex-compressed-meat = like compressed meat
 
 # Drink-specific flavors.
 
diff --git a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
index 5679dd1b521..36f2004b1b7 100644
--- a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
+++ b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
@@ -2,7 +2,6 @@ food-sequence-no-space = You can't put any more!
 
 food-sequence-standart-gen = {$prefix}{$content}{$suffix}
 
-#Burger
 food-sequence-burger-suffix = burger
 
 food-sequence-burger-content-raw-meat = raw
@@ -56,6 +55,7 @@ food-sequence-burger-content-rice = rice
 food-sequence-burger-content-soy = soy
 food-sequence-burger-content-koibean = koi
 food-sequence-burger-content-watermelon = water
+food-sequence-burger-content-holymelon = holy
 food-sequence-burger-content-cannabis = funny
 food-sequence-burger-content-rainbow-cannabis = FUNNY
 food-sequence-burger-content-tobacco = tobaco
@@ -67,4 +67,18 @@ food-sequence-burger-content-tongue = tongue
 food-sequence-burger-content-appendix = appendi
 food-sequence-burger-content-ears = ear
 food-sequence-burger-content-stomach = stomach
-food-sequence-burger-content-liver = liver
\ No newline at end of file
+food-sequence-burger-content-liver = liver
+food-sequence-burger-content-suppermatter = supper
+food-sequence-burger-content-hamster = hams
+food-sequence-burger-content-berries = berri
+food-sequence-burger-content-spacemans-trumpet = spacetrump
+food-sequence-burger-content-extradimensional-orange = 3d
+food-sequence-burger-content-world-pea = peace
+
+# TACO
+
+food-sequence-taco-gen = taco with {$content}
+
+# SKEWER
+
+food-sequence-skewer-gen = {$content} kebab
diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl
index 7176c3c1d8e..cf6ab6e373c 100644
--- a/Resources/Locale/en-US/seeds/seeds.ftl
+++ b/Resources/Locale/en-US/seeds/seeds.ftl
@@ -6,6 +6,8 @@ seeds-noun-spores = spores
 # Seeds
 seeds-wheat-name = wheat
 seeds-wheat-display-name = wheat stalks
+seeds-meatwheat-name = meatwheat
+seeds-meatwheat-display-name = meatwheat stalks
 seeds-oat-name = oat
 seeds-oat-display-name = oat stalks
 seeds-banana-name = banana
@@ -26,6 +28,8 @@ seeds-lime-name = lime
 seeds-lime-display-name = lime trees
 seeds-orange-name = orange
 seeds-orange-display-name = orange trees
+seeds-extradimensionalorange-name = extradimensional orange
+seeds-extradimensionalorange-display-name = extradimensional orange trees
 seeds-pineapple-name = pineapple
 seeds-pineapple-display-name = pineapple plant
 seeds-potato-name = potato
@@ -105,7 +109,9 @@ seeds-spacemans-trumpet-display-name = spaceman's trumpet plant
 seeds-koibean-name = koibeans
 seeds-koibean-display-name = koibean plant
 seeds-watermelon-name = watermelon
-seeds-watermelon-display-name = watermelon plant
+seeds-watermelon-display-name = watermelon vines
+seeds-holymelon-name = holymelon
+seeds-holymelon-display-name = holymelon vines
 seeds-grape-name = grape
 seeds-grape-display-name = grape plant
 seeds-cocoa-name = cocoa
@@ -114,8 +120,10 @@ seeds-berries-name = berries
 seeds-berries-display-name = berry bush
 seeds-bungo-name = bungo
 seeds-bungo-display-name = bungo plant
-seeds-pea-name = pea
+seeds-pea-name = peas
 seeds-pea-display-name = pea vines
+seeds-worldpea-name = world peas
+seeds-worldpea-display-name = world pea vines
 seeds-pumpkin-name = pumpkin
 seeds-pumpkin-display-name = pumpkins
 seeds-cotton-name = cotton
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index 4d1eae82d74..d363b9b56db 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -622,6 +622,9 @@
   id: FoodMeatWheat
   description: This doesn't look like meat, but your standards aren't that high to begin with.
   components:
+  - type: FlavorProfile
+    flavors:
+      - falsemeat
   - type: Sprite
     state: clump
   - type: SolutionContainerManager
@@ -952,10 +955,8 @@
     node: bacon
   - type: FoodSequenceElement
     entries:
-      burger:
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: bacon-cooked
+      Burger: MeatBacon
+      Taco: MeatBacon
 
 - type: entity
   name: cooked bear
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index 431343ccb99..101639a3b31 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -56,6 +56,28 @@
     tags:
     - Wheat
 
+- type: entity
+  name: meatwheat bushel
+  description: Some blood-drenched wheat stalks. You can crush them into what passes for meat if you squint hard enough.
+  id: MeatwheatBushel
+  parent: ProduceBase
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/meatwheat.rsi
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 10
+  - type: SpawnItemsOnUse
+    items:
+      - id: FoodMeatWheat
+    sound:
+      path: /Audio/Voice/Slime/slime_squish.ogg
+  - type: Produce
+    seedId: meatwheat
+
 - type: entity
   name: oat bushel
   description: Eat oats, do squats.
@@ -693,6 +715,47 @@
           sprite: Objects/Specific/Hydroponics/orange.rsi
           state: produce
 
+- type: entity
+  name: extradimensional orange
+  parent: FoodProduceBase
+  id: FoodExtradimensionalOrange
+  description: You can hardly wrap your head around this thing.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - truenature
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 14
+        reagents:
+        - ReagentId: Haloperidol
+          Quantity: 5
+        - ReagentId: Nutriment
+          Quantity: 5
+        - ReagentId: Vitamin
+          Quantity: 4
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/extradimensional_orange.rsi
+    scale: 0.5,0.5
+  - type: Produce
+    seedId: extradimensionalOrange
+  - type: PotencyVisuals
+    minimumScale: 0.5 # reduce this in size because the sprite is way too big
+    maximumScale: 1
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: JuiceOrange
+        Quantity: 10
+  - type: Tag
+    tags:
+    - Fruit
+  - type: FoodSequenceElement
+    entries:
+      Burger: ExtradimensionalOrangeBurger
+      Taco: ExtradimensionalOrange
+
 - type: entity
   name: pineapple
   parent: FoodProduceBase
@@ -2087,6 +2150,105 @@
           sprite: Objects/Specific/Hydroponics/watermelon.rsi
           state: slice
 
+- type: entity
+  name: holymelon
+  parent: [FoodProduceBase, ItemHeftyBase]
+  id: FoodHolymelon
+  description: The water within this melon has been blessed by some deity that's particularly fond of watermelon.
+  components:
+  - type: Item
+    size: Small
+  - type: FlavorProfile
+    flavors:
+      - holy
+      - watermelon
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 25
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+        - ReagentId: Vitamin
+          Quantity: 5
+        - ReagentId: Holywater
+          Quantity: 10
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/holymelon.rsi
+  - type: Produce
+    seedId: watermelon
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Wine
+        Quantity: 20
+  - type: Damageable
+    damageContainer: Biological
+  - type: DamageOnHighSpeedImpact
+    minimumSpeed: 0.1
+    damage:
+      types:
+        Blunt: 1
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: desecration
+      - !type:SpillBehavior
+        solution: food
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: SliceableFood
+    count: 5
+    slice: FoodHolymelonSlice
+  - type: Tag
+    tags:
+    - Fruit
+
+- type: entity
+  name: holymelon slice
+  parent: ProduceSliceBase
+  id: FoodHolymelonSlice
+  description: Juicy golden and red slice.
+  components:
+  - type: Item
+    size: Tiny
+  - type: FlavorProfile
+    flavors:
+      - holy
+      - watermelon
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/holymelon.rsi
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 2
+        - ReagentId: Vitamin
+          Quantity: 1
+        - ReagentId: Holywater
+          Quantity: 2
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Wine
+        Quantity: 4
+  - type: Tag
+    tags:
+    - Fruit
+    - Slice
+  - type: FoodSequenceElement
+    entries:
+      Burger: HolymelonSliceBurger
+      Taco: HolymelonSlice
+      Skewer: HolymelonSliceSkewer
+
 - type: entity
   name: grapes
   parent: FoodProduceBase
@@ -2232,6 +2394,38 @@
     tags:
     - Vegetable
 
+- type: entity
+  parent: FoodProduceBase
+  id: FoodWorldPeas
+  name: cluster of world peas
+  description: It's rumored to bring peace to any who consume it.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - numbingtranquility
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 8
+        reagents:
+        - ReagentId: Happiness
+          Quantity: 3
+        - ReagentId: Nutriment
+          Quantity: 3
+        - ReagentId: Pax
+          Quantity: 2
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/world_pea.rsi
+  - type: Produce
+    seedId: worldPea
+  - type: Tag
+    tags:
+    - Vegetable
+  - type: FoodSequenceElement
+    entries:
+      Taco: WorldPea
+      Burger: WorldPeaBurger
+
 - type: entity
   name: pumpkin
   parent: FoodProduceBase
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
index 9090f75bc36..25209a50507 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -22,6 +22,17 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/wheat.rsi
 
+- type: entity
+  parent: SeedBase
+  name: packet of meatwheat seeds
+  description: "If you ever wanted to drive a vegetarian to insanity, here's how."
+  id: MeatwheatSeeds
+  components:
+    - type: Seed
+      seedId: meatwheat
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/meatwheat.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of oat seeds
@@ -133,6 +144,17 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/orange.rsi
 
+- type: entity
+  parent: SeedBase
+  name: packet of extradimensional orange seeds
+  description: "Polygonal seeds."
+  id: ExtradimensionalOrangeSeeds
+  components:
+    - type: Seed
+      seedId: extradimensionalOrange
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/extradimensional_orange.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of pineapple seeds
@@ -542,6 +564,16 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/watermelon.rsi
 
+- type: entity
+  parent: SeedBase
+  name: packet of holymelon seeds
+  id: HolymelonSeeds
+  components:
+    - type: Seed
+      seedId: holymelon
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/holymelon.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of grape seeds
@@ -594,6 +626,17 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/pea.rsi
 
+- type: entity
+  parent: SeedBase
+  id: WorldPeaSeeds
+  name: packet of world pea seeds
+  description: "These rather large seeds give off a soothing blue glow."
+  components:
+    - type: Seed
+      seedId: worldPea
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/world_pea.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of pumpkin seeds
diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml
index 26190d87912..7534a8cdc68 100644
--- a/Resources/Prototypes/Flavors/flavors.yml
+++ b/Resources/Prototypes/Flavors/flavors.yml
@@ -1079,6 +1079,11 @@
   flavorType: Complex
   description: flavor-complex-fishops
 
+#- type: flavor
+#  id: bluepumpkin
+#  flavorType: Complex
+#  description: flavor-complex-blue-pumpkin
+
 - type: flavor
   id: violets
   flavorType: Complex
@@ -1097,4 +1102,34 @@
 - type: flavor
   id: paintthinner
   flavorType: Complex
-  description: flavor-complex-paint-thinner
\ No newline at end of file
+  description: flavor-complex-paint-thinner
+
+- type: flavor
+  id: numbingtranquility
+  flavorType: Complex
+  description: flavor-complex-numbing-tranquility
+
+- type: flavor
+  id: truenature
+  flavorType: Complex
+  description: flavor-complex-true-nature
+
+- type: flavor
+  id: falsemeat
+  flavorType: Complex
+  description: flavor-complex-false-meat
+
+- type: flavor
+  id: cherry
+  flavorType: Complex
+  description: flavor-complex-cherry
+
+- type: flavor
+  id: paper
+  flavorType: Complex
+  description: flavor-complex-paper
+
+- type: flavor
+  id: compressed-meat
+  flavorType: Complex
+  description: flavor-complex-compressed-meat
diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index d53ba9bcfdc..03d28127a60 100644
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -7,6 +7,8 @@
   packetPrototype: WheatSeeds
   productPrototypes:
     - WheatBushel
+  mutationPrototypes:
+    - meatwheat
   lifespan: 25
   maturation: 6
   production: 3
@@ -24,6 +26,58 @@
       Max: 20
       potencyDivisor: 20
 
+- type: seed
+  id: meatwheat
+  name: seeds-meatwheat-name
+  noun: seeds-noun-seeds
+  displayName: seeds-meatwheat-display-name
+  plantRsi: Objects/Specific/Hydroponics/meatwheat.rsi
+  packetPrototype: MeatwheatSeeds
+  productPrototypes:
+    - MeatwheatBushel
+  lifespan: 25
+  maturation: 6
+  production: 3
+  yield: 3
+  potency: 5
+  idealLight: 8
+  nutrientConsumption: 0.40
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 20
+      PotencyDivisor: 20
+    UncookedAnimalProteins:
+      Min: 5
+      Max: 20
+      PotencyDivisor: 20
+
+- type: seed
+  id: meatwheat
+  name: seeds-meatwheat-name
+  noun: seeds-noun-seeds
+  displayName: seeds-meatwheat-display-name
+  plantRsi: Objects/Specific/Hydroponics/meatwheat.rsi
+  packetPrototype: MeatwheatSeeds
+  productPrototypes:
+    - MeatwheatBushel
+  lifespan: 25
+  maturation: 6
+  production: 3
+  yield: 3
+  potency: 5
+  idealLight: 8
+  nutrientConsumption: 0.40
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 20
+      PotencyDivisor: 20
+    UncookedAnimalProteins:
+      Min: 5
+      Max: 20
+      PotencyDivisor: 20
+
 - type: seed
   id: oat
   name: seeds-oat-name
@@ -145,6 +199,8 @@
   packetPrototype: LaughinPeaSeeds
   productPrototypes:
     - FoodLaughinPeaPod
+  mutationPrototypes:
+    - worldPea
   lifespan: 25
   growthStages: 3
   maturation: 7
@@ -267,6 +323,8 @@
     - extradimensionalOrange
     - lemon
     - lime
+  mutationPrototypes:
+    - extradimensionalOrange
   harvestRepeat: Repeat
   lifespan: 55
   maturation: 6
@@ -284,6 +342,66 @@
       Max: 4
       potencyDivisor: 25
 
+- type: seed
+  id: extradimensionalOrange
+  name: seeds-extradimensionalorange-name
+  noun: seeds-noun-seeds
+  displayName: seeds-extradimensionalorange-display-name
+  plantRsi: Objects/Specific/Hydroponics/extradimensional_orange.rsi
+  packetPrototype: ExtradimensionalOrangeSeeds
+  productPrototypes:
+    - FoodExtradimensionalOrange
+  harvestRepeat: Repeat
+  lifespan: 55
+  maturation: 6
+  production: 6
+  yield: 3
+  potency: 10
+  idealLight: 8
+  chemicals:
+    Haloperidol:
+      Min: 1
+      Max: 5
+      PotencyDivisor: 20
+    Nutriment:
+      Min: 1
+      Max: 5
+      PotencyDivisor: 20
+    Vitamin:
+      Min: 1
+      Max: 4
+      PotencyDivisor: 25
+
+- type: seed
+  id: extradimensionalOrange
+  name: seeds-extradimensionalorange-name
+  noun: seeds-noun-seeds
+  displayName: seeds-extradimensionalorange-display-name
+  plantRsi: Objects/Specific/Hydroponics/extradimensional_orange.rsi
+  packetPrototype: ExtradimensionalOrangeSeeds
+  productPrototypes:
+    - FoodExtradimensionalOrange
+  harvestRepeat: Repeat
+  lifespan: 55
+  maturation: 6
+  production: 6
+  yield: 3
+  potency: 10
+  idealLight: 8
+  chemicals:
+    Haloperidol:
+      Min: 1
+      Max: 5
+      PotencyDivisor: 20
+    Nutriment:
+      Min: 1
+      Max: 5
+      PotencyDivisor: 20
+    Vitamin:
+      Min: 1
+      Max: 4
+      PotencyDivisor: 25
+
 - type: seed
   id: pineapple
   name: seeds-pineapple-name
@@ -670,7 +788,7 @@
     DoctorsDelight:
       Min: 3
       Max: 13
-      PotencyDivisor: 10 
+      PotencyDivisor: 10
 
 - type: seed
   id: corn
@@ -1452,6 +1570,8 @@
   packetPrototype: WatermelonSeeds
   productPrototypes:
     - FoodWatermelon
+  mutationPrototypes:
+    - holymelon
   lifespan: 55
   maturation: 12
   production: 3
@@ -1472,6 +1592,64 @@
       Max: 5
       potencyDivisor: 20
 
+- type: seed
+  id: holymelon
+  name: seeds-holymelon-name
+  noun: seeds-noun-seeds
+  displayName: seeds-holymelon-display-name
+  plantRsi: Objects/Specific/Hydroponics/holymelon.rsi
+  packetPrototype: HolymelonSeeds
+  productPrototypes:
+    - FoodHolymelon
+  lifespan: 55
+  maturation: 12
+  production: 3
+  yield: 1
+  potency: 1
+  idealLight: 8
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 10
+      PotencyDivisor: 10
+    Holywater:
+      Min: 1
+      Max: 10
+      PotencyDivisor: 10
+    Vitamin:
+      Min: 1
+      Max: 5
+      PotencyDivisor: 20
+
+- type: seed
+  id: holymelon
+  name: seeds-holymelon-name
+  noun: seeds-noun-seeds
+  displayName: seeds-holymelon-display-name
+  plantRsi: Objects/Specific/Hydroponics/holymelon.rsi
+  packetPrototype: HolymelonSeeds
+  productPrototypes:
+    - FoodHolymelon
+  lifespan: 55
+  maturation: 12
+  production: 3
+  yield: 1
+  potency: 1
+  idealLight: 8
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 10
+      PotencyDivisor: 10
+    Holywater:
+      Min: 1
+      Max: 10
+      PotencyDivisor: 10
+    Vitamin:
+      Min: 1
+      Max: 5
+      PotencyDivisor: 20
+
 - type: seed
   id: cocoa
   name: seeds-cocoa-name
@@ -1586,6 +1764,72 @@
       Max: 2
       potencyDivisor: 50
 
+- type: seed
+  id: worldPea
+  name: seeds-worldpea-name
+  noun: seeds-noun-seeds
+  displayName: seeds-worldpea-display-name
+  plantRsi: Objects/Specific/Hydroponics/world_pea.rsi
+  packetPrototype: PeaSeeds
+  productPrototypes:
+    - FoodWorldPeas
+  lifespan: 25
+  growthStages: 3
+  maturation: 20
+  production: 6
+  yield: 3
+  potency: 25
+  idealLight: 8
+  harvestRepeat: Repeat
+  nutrientConsumption: 0.5
+  waterConsumption: 0.5
+  chemicals:
+    Happiness:
+      Min: 1
+      Max: 3
+      PotencyDivisor: 25
+    Nutriment:
+      Min: 1
+      Max: 3
+      PotencyDivisor: 20
+    Pax:
+      Min: 1
+      Max: 2
+      PotencyDivisor: 50
+
+- type: seed
+  id: worldPea
+  name: seeds-worldpea-name
+  noun: seeds-noun-seeds
+  displayName: seeds-worldpea-display-name
+  plantRsi: Objects/Specific/Hydroponics/world_pea.rsi
+  packetPrototype: PeaSeeds
+  productPrototypes:
+    - FoodWorldPeas
+  lifespan: 25
+  growthStages: 3
+  maturation: 20
+  production: 6
+  yield: 3
+  potency: 25
+  idealLight: 8
+  harvestRepeat: Repeat
+  nutrientConsumption: 0.5
+  waterConsumption: 0.5
+  chemicals:
+    Happiness:
+      Min: 1
+      Max: 3
+      PotencyDivisor: 25
+    Nutriment:
+      Min: 1
+      Max: 3
+      PotencyDivisor: 20
+    Pax:
+      Min: 1
+      Max: 2
+      PotencyDivisor: 50
+
 - type: seed
   id: pumpkin
   name: seeds-pumpkin-name
diff --git a/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml b/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml
new file mode 100644
index 00000000000..43d6fe8852b
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml
@@ -0,0 +1,1178 @@
+# Bun bottom
+
+- type: foodSequenceElement
+  id: BunTopBurger
+  final: true
+  sprites:
+  - sprite: Objects/Consumable/Food/burger_sequence.rsi
+    state: bun_top
+  tags:
+  - Bun
+
+# Mice
+
+- type: foodSequenceElement
+  id: RatBurger
+  name: food-sequence-burger-content-rat
+  sprites:
+  - sprite: Mobs/Animals/mouse.rsi
+    state: dead-0
+  - sprite: Mobs/Animals/mouse.rsi
+    state: dead-1
+  - sprite: Mobs/Animals/mouse.rsi
+    state: dead-2
+
+- type: foodSequenceElement
+  id: RatTaco
+  name: food-sequence-content-rat
+  sprites:
+  - sprite: Objects/Consumable/Food/taco_sequence.rsi
+    state: rat
+
+- type: foodSequenceElement
+  id: RatSkewer
+  name: food-sequence-content-rat
+  sprites:
+  - sprite: Objects/Consumable/Food/skewer.rsi
+    state: skewer-rat
+
+# Cheese
+
+- type: foodSequenceElement
+  id: CheeseBurger
+  name: food-sequence-content-cheese
+  sprites:
+  - sprite: Objects/Consumable/Food/burger_sequence.rsi
+    state: cheese
+  tags:
+  - Cheese
+
+- type: foodSequenceElement
+  id: CheeseTaco
+  name: food-sequence-content-cheese
+  sprites:
+  - sprite: Objects/Consumable/Food/taco_sequence.rsi
+    state: cheese
+  tags:
+  - Cheese
+
+# Steak
+
+- type: foodSequenceElement
+  id: MeatSteak
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: plain-cooked
+  tags:
+  - Cooked
+  - Meat
+
+# Bacon
+
+- type: foodSequenceElement
+  id: MeatBacon
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: bacon-cooked
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: bacon2-cooked
+  tags:
+  - Cooked
+  - Meat
+
+# Bear meat
+
+- type: foodSequenceElement
+  id: MeatBear
+  name: food-sequence-content-bear
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: product-cooked
+  tags:
+  - Cooked
+  - Meat
+
+- type: foodSequenceElement
+  id: MeatBearBurger
+  name: food-sequence-burger-content-bear
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: product-cooked
+  tags:
+  - Cooked
+  - Meat
+
+# Penguin meat
+
+- type: foodSequenceElement
+  id: MeatPenguin
+  name: food-sequence-content-penguin
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: bird-cooked
+  tags:
+  - Cooked
+  - Meat
+
+- type: foodSequenceElement
+  id: MeatPenguinBurger
+  name: food-sequence-burger-content-penguin
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: bird-cooked
+  tags:
+  - Cooked
+  - Meat
+
+# Chicken meat
+
+- type: foodSequenceElement
+  id: MeatChicken
+  name: food-sequence-content-chicken
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: chicken-fried
+  tags:
+  - Cooked
+  - Meat
+  - Chicken
+
+# Fried Chicken meat
+
+- type: foodSequenceElement
+  id: MeatFriedChicken
+  name: food-sequence-content-chicken
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: chicken-fried
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: chicken2-fried
+  tags:
+  - Cooked
+  - Meat
+  - Chicken
+
+# Duck meat
+
+- type: foodSequenceElement
+  id: MeatDuck
+  name: food-sequence-content-duck
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: bird-cooked
+  tags:
+  - Cooked
+  - Meat
+
+# Crab meat
+
+- type: foodSequenceElement
+  id: MeatCrab
+  name: food-sequence-content-crab
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: crab-cooked
+  tags:
+  - Cooked
+  - Meat
+  - Crab
+
+- type: foodSequenceElement
+  id: MeatCrabBurger
+  name: food-sequence-burger-content-crab
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: crab-cooked
+  tags:
+  - Cooked
+  - Meat
+  - Crab
+
+# Meat goliath
+
+- type: foodSequenceElement
+  id: MeatGoliath
+  name: food-sequence-content-goliath
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: goliath-cooked
+  tags:
+  - Cooked
+  - Meat
+
+- type: foodSequenceElement
+  id: MeatGoliathBurger
+  name: food-sequence-burger-content-goliath
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: goliath-cooked
+  tags:
+  - Cooked
+  - Meat
+
+# Xeno meat
+
+- type: foodSequenceElement
+  id: MeatXeno
+  name: food-sequence-content-xeno
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: rouny-cooked
+  tags:
+  - Cooked
+  - Meat
+
+# Meat lizard
+
+- type: foodSequenceElement
+  id: MeatLizard
+  name: food-sequence-content-lizard
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: lizard-cooked
+  tags:
+  - Cooked
+  - Meat
+
+- type: foodSequenceElement
+  id: MeatLizardBurger
+  name: food-sequence-burger-content-lizard
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: lizard-cooked
+  tags:
+  - Cooked
+  - Meat
+
+# Meat spider
+
+- type: foodSequenceElement
+  id: MeatSpider
+  name: food-sequence-content-spider
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: spiderleg-cooked
+  tags:
+  - Cooked
+  - Meat
+
+- type: foodSequenceElement
+  id: MeatSpiderBurger
+  name: food-sequence-burger-content-spider
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: spiderleg-cooked
+  tags:
+  - Cooked
+  - Meat
+
+# Meatball
+
+- type: foodSequenceElement
+  id: MeatBall
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: meatball-cooked
+  tags:
+  - Cooked
+  - Meat
+
+# Snail meat
+
+- type: foodSequenceElement
+  id: MeatSnail
+  name: food-sequence-content-snail
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: snail-cooked
+  tags:
+  - Cooked
+  - Meat
+
+# Meat cutlet
+
+- type: foodSequenceElement
+  id: MeatCutlet
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: cutlet-cooked
+  tags:
+  - Cooked
+  - Cutlet
+  - Meat
+
+# Bear cutlet
+
+- type: foodSequenceElement
+  id: BearCutlet
+  name: food-sequence-content-bear
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: cutlet-cooked
+  tags:
+  - Cooked
+  - Cutlet
+  - Meat
+
+- type: foodSequenceElement
+  id: BearCutletBurger
+  name: food-sequence-burger-content-bear
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: cutlet-cooked
+  tags:
+  - Cooked
+  - Cutlet
+  - Meat
+
+# Penguin cutlet
+
+- type: foodSequenceElement
+  id: PenguinCutlet
+  name: food-sequence-content-penguin
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: cutlet-cooked
+  tags:
+  - Cooked
+  - Cutlet
+  - Meat
+
+- type: foodSequenceElement
+  id: PenguinCutletBurger
+  name: food-sequence-burger-content-penguin
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: cutlet-cooked
+  tags:
+  - Cooked
+  - Cutlet
+  - Meat
+
+# Chicken cutlet
+
+- type: foodSequenceElement
+  id: ChickenCutlet
+  name: food-sequence-content-chicken
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: cutlet-cooked
+  tags:
+  - Cooked
+  - Cutlet
+  - Meat
+  - Chicken
+
+# Duck cutlet
+
+- type: foodSequenceElement
+  id: DuckCutlet
+  name: food-sequence-content-duck
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: cutlet-cooked
+  tags:
+  - Cooked
+  - Cutlet
+  - Meat
+
+# Spider cutlet
+
+- type: foodSequenceElement
+  id: LizardCutlet
+  name: food-sequence-content-lizard
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: cutlet-cooked
+  tags:
+  - Cooked
+  - Cutlet
+  - Meat
+
+- type: foodSequenceElement
+  id: LizardCutletBurger
+  name: food-sequence-burger-content-lizard
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: cutlet-cooked
+  tags:
+  - Cooked
+  - Cutlet
+  - Meat
+
+# Spider cutlet
+
+- type: foodSequenceElement
+  id: SpiderCutlet
+  name: food-sequence-content-spider
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: spidercutlet-cooked
+  tags:
+  - Cooked
+  - Cutlet
+  - Meat
+
+- type: foodSequenceElement
+  id: SpiderCutletBurger
+  name: food-sequence-burger-content-spider
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: spidercutlet-cooked
+  tags:
+  - Cooked
+  - Cutlet
+  - Meat
+
+# Xeno cutlet
+
+- type: foodSequenceElement
+  id: XenoCutlet
+  name: food-sequence-content-xeno
+  sprites:
+  - sprite: Objects/Consumable/Food/meat.rsi
+    state: xenocutlet-cooked
+  tags:
+  - Cooked
+  - Cutlet
+  - Meat
+
+# Brain
+
+- type: foodSequenceElement
+  id: Brain
+  name: food-sequence-content-brain
+  sprites:
+  - sprite: Mobs/Species/Human/organs.rsi
+    state: brain
+  tags:
+  - Brain
+  - Raw
+
+# Banana
+
+- type: foodSequenceElement
+  id: Banana
+  name: food-sequence-content-banana
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/banana.rsi
+    state: produce
+  tags:
+  - Fruit
+
+# Mimana
+
+- type: foodSequenceElement
+  id: Mimana
+  name: food-sequence-content-mimana
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/mimana.rsi
+    state: produce
+  tags:
+  - Fruit
+
+# Carrot
+
+- type: foodSequenceElement
+  id: Carrot
+  name: food-sequence-content-carrot
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/carrot.rsi
+    state: produce
+  tags:
+  - Vegetable
+
+- type: foodSequenceElement
+  id: CarrotBurger
+  name: food-sequence-burger-content-carrot
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/carrot.rsi
+    state: produce
+  tags:
+  - Vegetable
+
+# Cabbage
+
+- type: foodSequenceElement
+  id: Cabbage
+  name: food-sequence-content-cabbage
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/carrot.rsi
+    state: produce
+  tags:
+  - Vegetable
+
+- type: foodSequenceElement
+  id: CabbageBurger
+  name: food-sequence-burger-content-cabbage
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/cabbage.rsi
+    state: produce
+  tags:
+  - Vegetable
+
+# Garlic
+
+- type: foodSequenceElement
+  id: Garlic
+  name: food-sequence-content-garlic
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/garlic.rsi
+    state: produce
+  tags:
+  - Vegetable
+
+- type: foodSequenceElement
+  id: GarlicBurger
+  name: food-sequence-burger-content-garlic
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/garlic.rsi
+    state: produce
+  tags:
+  - Vegetable
+
+# Lemon
+
+- type: foodSequenceElement
+  id: Lemon
+  name: food-sequence-content-lemon
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/lemon.rsi
+    state: produce
+  tags:
+    - Fruit
+
+# Lemoon
+
+- type: foodSequenceElement
+  id: Lemoon
+  name: food-sequence-content-lemoon
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/lemoon.rsi
+    state: produce
+  tags:
+    - Fruit
+
+# Lime
+
+- type: foodSequenceElement
+  id: Lime
+  name: food-sequence-content-lime
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/lime.rsi
+    state: produce
+  tags:
+    - Fruit
+
+# Orange
+
+- type: foodSequenceElement
+  id: Orange
+  name: food-sequence-content-orange
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/orange.rsi
+    state: produce
+  tags:
+    - Fruit
+
+# Extradimensional Orange
+
+- type: foodSequenceElement
+  id: ExtradimensionalOrange
+  name: food-sequence-content-orange
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/extradimensional_orange.rsi
+    state: produce
+  scale: 0.5,0.5
+  tags:
+    - Fruit
+
+- type: foodSequenceElement
+  id: ExtradimensionalOrangeBurger
+  name: food-sequence-burger-content-extradimensional-orange
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/extradimensional_orange.rsi
+    state: produce
+  scale: 0.5,0.5
+  tags:
+    - Fruit
+
+# Potato
+
+- type: foodSequenceElement
+  id: Potato
+  name: food-sequence-content-potato
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/potato.rsi
+    state: produce
+  tags:
+    - Vegetable
+
+# Tomato
+
+- type: foodSequenceElement
+  id: Tomato
+  name: food-sequence-content-tomato
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/tomato.rsi
+    state: produce
+  tags:
+  - Fruit
+  - Vegetable
+
+- type: foodSequenceElement
+  id: TomatoSkewer
+  name: food-sequence-content-tomato
+  sprites:
+  - sprite: Objects/Consumable/Food/skewer.rsi
+    state: skewer-tomato
+  tags:
+  - Fruit
+  - Vegetable
+
+# Blue Tomato
+
+- type: foodSequenceElement
+  id: BlueTomato
+  name: food-sequence-content-tomato
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/blue_tomato.rsi
+    state: produce
+  tags:
+  - Fruit
+  - Vegetable
+
+# Blood Tomato
+
+- type: foodSequenceElement
+  id: BloodTomato
+  name: food-sequence-content-tomato
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/blood_tomato.rsi
+    state: produce
+  tags:
+  - Fruit
+  - Vegetable
+
+# Apple
+
+- type: foodSequenceElement
+  id: Apple
+  name: food-sequence-content-apple
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/apple.rsi
+    state: produce
+  tags:
+  - Fruit
+
+# Golden Apple
+
+- type: foodSequenceElement
+  id: GoldenApple
+  name: food-sequence-content-apple
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/golden_apple.rsi
+    state: produce
+  tags:
+  - Fruit
+
+# Pineapple
+
+- type: foodSequenceElement
+  id: PineappleSliceBurger
+  name: food-sequence-burger-content-pineapple
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/pineapple.rsi
+    state: slice
+  tags:
+  - Fruit
+  - Slice
+
+- type: foodSequenceElement
+  id: PineappleSlice
+  name: food-sequence-content-pineapple
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/pineapple.rsi
+    state: slice
+  tags:
+  - Fruit
+  - Slice
+
+# Onion
+
+- type: foodSequenceElement
+  id: OnionSliceBurger
+  name: food-sequence-burger-content-onion
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/onion.rsi
+    state: slice
+  tags:
+  - Vegetable
+  - Slice
+
+- type: foodSequenceElement
+  id: OnionSlice
+  name: food-sequence-content-onion
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/onion.rsi
+    state: slice
+  tags:
+  - Vegetable
+  - Slice
+
+# Onion red
+
+- type: foodSequenceElement
+  id: OnionRedSliceBurger
+  name: food-sequence-burger-content-onion
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/onion_red.rsi
+    state: slice
+  tags:
+  - Vegetable
+  - Slice
+
+- type: foodSequenceElement
+  id: OnionRedSlice
+  name: food-sequence-content-onion
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/onion_red.rsi
+    state: slice
+  tags:
+  - Vegetable
+  - Slice
+
+# Watermelon
+
+- type: foodSequenceElement
+  id: WatermelonSliceBurger
+  name: food-sequence-burger-content-watermelon
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/watermelon.rsi
+    state: slice
+  tags:
+  - Fruit
+  - Slice
+
+- type: foodSequenceElement
+  id: WatermelonSlice
+  name: food-sequence-content-watermelon
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/watermelon.rsi
+    state: slice
+  tags:
+  - Fruit
+  - Slice
+
+- type: foodSequenceElement
+  id: WatermelonSliceSkewer
+  name: food-sequence-content-watermelon
+  sprites:
+  - sprite: Objects/Consumable/Food/skewer.rsi
+    state: skewer-watermelon
+  tags:
+  - Fruit
+  - Slice
+
+# Holymelon
+
+- type: foodSequenceElement
+  id: HolymelonSliceBurger
+  name: food-sequence-burger-content-holymelon
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/holymelon.rsi
+    state: slice
+  tags:
+  - Fruit
+  - Slice
+
+- type: foodSequenceElement
+  id: HolymelonSlice
+  name: food-sequence-content-holymelon
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/holymelon.rsi
+    state: slice
+  tags:
+  - Fruit
+  - Slice
+
+- type: foodSequenceElement
+  id: HolymelonSliceSkewer
+  name: food-sequence-content-holymelon
+  sprites:
+  - sprite: Objects/Consumable/Food/skewer.rsi
+    state: skewer-holymelon
+  tags:
+  - Fruit
+  - Slice
+
+# Chili pepper
+
+- type: foodSequenceElement
+  id: ChiliPepper
+  name: food-sequence-content-chili
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/chili.rsi
+    state: produce
+  tags:
+  - Vegetable
+
+- type: foodSequenceElement
+  id: ChiliPepperSkewer
+  name: food-sequence-content-chili
+  sprites:
+  - sprite: Objects/Consumable/Food/skewer.rsi
+    state: skewer-pepper
+  tags:
+  - Vegetable
+
+# Chilly pepper
+
+- type: foodSequenceElement
+  id: ChillyPepper
+  name: food-sequence-content-chilly
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/chilly.rsi
+    state: produce
+  tags:
+  - Vegetable
+
+- type: foodSequenceElement
+  id: ChillyPepperSkewer
+  name: food-sequence-content-chilly
+  sprites:
+  - sprite: Objects/Consumable/Food/skewer.rsi
+    state: skewer-bluepepper
+  tags:
+  - Vegetable
+
+# Corn
+- type: foodSequenceElement
+  id: Corn
+  name: food-sequence-content-corn
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/corn.rsi
+    state: produce
+  tags:
+  - Vegetable
+
+- type: foodSequenceElement
+  id: CornSkewer
+  name: food-sequence-content-corn
+  sprites:
+  - sprite: Objects/Consumable/Food/skewer.rsi
+    state: skewer-corn
+  tags:
+  - Vegetable
+
+# Aloe
+
+- type: foodSequenceElement
+  id: Aloe
+  name: food-sequence-content-aloe
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/aloe.rsi
+    state: produce
+  tags:
+  - Vegetable
+
+# Poppy
+
+- type: foodSequenceElement
+  id: Poppy
+  name: food-sequence-content-poppy
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/poppy.rsi
+    state: produce
+  tags:
+  - Flower
+
+# lily
+
+- type: foodSequenceElement
+  id: Lily
+  name: food-sequence-content-lily
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/lily.rsi
+    state: produce
+  tags:
+  - Flower
+
+# lingzhi
+
+- type: foodSequenceElement
+  id: Lingzhi
+  name: food-sequence-content-mushroom
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/lingzhi.rsi
+    state: produce
+
+# AmbrosiaVulgaris
+
+- type: foodSequenceElement
+  id: AmbrosiaVulgaris
+  name: food-sequence-content-ambrosia
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi
+    state: produce
+
+- type: foodSequenceElement
+  id: AmbrosiaVulgarisBurger
+  name: food-sequence-burger-content-ambrosia
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi
+    state: produce
+
+# AmbrosiaDeus
+
+- type: foodSequenceElement
+  id: AmbrosiaDeus
+  name: food-sequence-content-ambrosia
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/ambrosia_deus.rsi
+    state: produce
+
+- type: foodSequenceElement
+  id: AmbrosiaDeusBurger
+  name: food-sequence-burger-content-ambrosia
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/ambrosia_deus.rsi
+    state: produce
+
+# Glasstle
+
+- type: foodSequenceElement
+  id: Glasstle
+  name: food-sequence-content-glasstle
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/glasstle.rsi
+    state: produce
+  tags:
+  - Fruit
+
+- type: foodSequenceElement
+  id: GlasstleBurger
+  name: food-sequence-burger-content-glasstle
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/glasstle.rsi
+    state: produce
+  tags:
+  - Fruit
+
+# FlyAmanita
+
+- type: foodSequenceElement
+  id: FlyAmanita
+  name: food-sequence-content-mushroom
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/fly_amanita.rsi
+    state: produce
+
+# Gatfruit
+
+- type: foodSequenceElement
+  id: Gatfruit
+  name: food-sequence-content-gatfruit
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/gatfruit.rsi
+    state: produce
+  tags:
+  - Fruit
+
+- type: foodSequenceElement
+  id: GatfruitBurger
+  name: food-sequence-burger-content-gatfruit
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/gatfruit.rsi
+    state: produce
+  tags:
+  - Fruit
+
+# Capfruit
+
+- type: foodSequenceElement
+  id: Capfruit
+  name: food-sequence-content-capfruit
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/capfruit.rsi
+    state: produce
+  tags:
+  - Fruit
+
+- type: foodSequenceElement
+  id: CapfruitBurger
+  name: food-sequence-burger-content-capfruit
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/capfruit.rsi
+    state: produce
+  tags:
+  - Fruit
+
+# Soybeans
+
+- type: foodSequenceElement
+  id: Soybeans
+  name: food-sequence-content-soy
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/soybeans.rsi
+    state: produce
+  tags:
+  - Vegetable
+
+- type: foodSequenceElement
+  id: SoybeansBurger
+  name: food-sequence-burger-content-soy
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/soybeans.rsi
+    state: produce
+  tags:
+  - Vegetable
+
+# SpacemansTrumpet
+
+- type: foodSequenceElement
+  id: SpacemansTrumpet
+  name: food-sequence-content-spacemans-trumpet
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/spacemans_trumpet.rsi
+    state: produce
+  tags:
+  - Flower
+
+- type: foodSequenceElement
+  id: SpacemansTrumpetBurger
+  name: food-sequence-burger-content-spacemans-trumpet
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/spacemans_trumpet.rsi
+    state: produce
+  tags:
+  - Flower
+
+# Koibean
+
+- type: foodSequenceElement
+  id: Koibean
+  name: food-sequence-content-koibean
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/koibean.rsi
+    state: produce
+  tags:
+  - Fruit
+
+- type: foodSequenceElement
+  id: KoibeanBurger
+  name: food-sequence-burger-content-koibean
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/koibean.rsi
+    state: produce
+  tags:
+  - Fruit
+
+# Galaxythistle
+
+- type: foodSequenceElement
+  id: Galaxythistle
+  name: food-sequence-content-galaxy
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/galaxythistle.rsi
+    state: produce
+  tags:
+  - Fruit
+
+- type: foodSequenceElement
+  id: GalaxythistleBurger
+  name: food-sequence-burger-content-galaxy
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/galaxythistle.rsi
+    state: produce
+  tags:
+  - Fruit
+
+# bungo
+
+- type: foodSequenceElement
+  id: Bungo
+  name: food-sequence-content-bungo
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/bungo.rsi
+    state: produce
+  tags:
+  - Fruit
+
+# Pea
+
+- type: foodSequenceElement
+  id: Pea
+  name: food-sequence-content-pea
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/pea.rsi
+    state: produce
+  tags:
+  - Vegetable
+
+# World Pea
+
+- type: foodSequenceElement
+  id: WorldPea
+  name: food-sequence-content-world-pea
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/world_pea.rsi
+    state: produce
+  tags:
+  - Vegetable
+
+- type: foodSequenceElement
+  id: WorldPeaBurger
+  name: food-sequence-burger-content-world-pea
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/world_pea.rsi
+    state: produce
+  tags:
+  - Vegetable
+
+# Cherry
+
+- type: foodSequenceElement
+  id: Cherry
+  name: food-sequence-content-cherry
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/cherry.rsi
+    state: produce
+  tags:
+  - Fruit
+
+# Berries
+
+- type: foodSequenceElement
+  id: Berries
+  name: food-sequence-content-berries
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/berries.rsi
+    state: produce
+  tags:
+  - Fruit
+
+- type: foodSequenceElement
+  id: BerriesBurger
+  name: food-sequence-burger-content-berries
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/berries.rsi
+    state: produce
+  tags:
+  - Fruit
+
+# Suppermatter
+
+- type: foodSequenceElement
+  id: Suppermatter
+  name: food-sequence-content-suppermatter
+  sprites:
+  - sprite: Objects/Consumable/Food/Baked/cake.rsi
+    state: suppermatter-shard
+
+- type: foodSequenceElement
+  id: SuppermatterBurger
+  name: food-sequence-burger-content-suppermatter
+  sprites:
+  - sprite: Objects/Consumable/Food/Baked/cake.rsi
+    state: suppermatter-shard
diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json
index 03fb0afdaea..f52afc92a70 100644
--- a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa",
+  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, skewer-holymelon edited from skewer-watermelon by slarticodefast",
   "size": {
     "x": 32,
     "y": 32
@@ -98,7 +98,10 @@
       "name": "skewer-snake1"
     },
     {
-      "name": "skewer-snake2"
+      "name": "skewer-watermelon"
+    },
+    {
+      "name": "skewer-holymelon"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-holymelon.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-holymelon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bc88a45b8c5d071f1b9621b954106bbf232acec
GIT binary patch
literal 356
zcmV-q0h|7bP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003iNkl<ZScPL4
z1*2dTjCjCEZU8*G+|BUy#YF~g3H|>dTGMq2S!R)}>H6*%81p~3gg%38$tH#ihYvFt
zek0E_EaYecS+3FZkb&XY5{8%m$ut29m?+Z@0W1Gd!xSRHqs!g@|GV4%|If?t|2P-J
z{}((A|Ic$VkR1*rhX5$S!N5i;_?)6BXlIAel1vN?<c0#t4gjTm5UBhK;otv9j<pmx
z011Gy9V4aDKyDgfga-eASTxWzCxC6{W%ysg#sJO@l;i}mq5zZ?8LVs>{Gr9zgkR(*
zM6w(J%Ze7v5I!s#$N}UgLdF{<@(iF*0AnZsr2|q!fvgGyRw2P^LU6qR1IG?CFn%W9
zT(TShtBR2TxMqY_&kS<9rDRw0qhJ(_f)NH77#IM{4rkiNgXe1i0000<MNUMnLSTaI
C=8@X~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/dead.png
new file mode 100644
index 0000000000000000000000000000000000000000..b79722cbe5c69d9d3787f7d5b5d7c5ae91f27bd3
GIT binary patch
literal 448
zcmV;x0YCnUP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004pNkl<ZSPAV_
zy)Oqr5Pd6JjY{D^P)T$`Ckh&&(ugQj63wsBiteY7s3a6BiI1oiDk>o&h)SnWY5V~v
z&t>dn%_ei_Xxt@tJ3Almy`9_J1KO+YK+O)UE}+n*>0HNt%|6+VB18avVmCr;k!WB|
zrfr?`W1Awh5Dh4#GU{04_RcyA-YKw<=R~IY?zsg_AMd;KsZSx6AUA<0QC20yQo}jP
zIg0O3$GOQ!E+VynMup|T=(l2)AT6$zO`;UI3GyDVnz0dJb_F3NO*i4iHIU|bIkI^v
zpv*aPFR+ld__IJpAQ(QEi^LP7z|(V?zO|29SiLSbBkA}IVQ`>a{mZM7;B>k7K#C{t
zp5zph#=Y~}0;Kg`qFi1j0k@|pI!pG+#~4X+@yY@=7l*!%Sf2Zr2PkeHf$koHZa+67
zui+U4ikP1USi8Fs{}*LOjVD2@GWq=YCFmoW`A2Kx-)eF=#ICe?xWcP@VELf~yuU?l
qef_{;w-Qz?ZmqThZ3q5)2R;C31+uwlT=#JR0000<MNUMnLSTY2-^iN)

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/harvest.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bbddd83d85ab10092d3369317e3697b9f4c9b9a
GIT binary patch
literal 725
zcmV;`0xJE9P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80007<Nkl<ZSPAV^
zziSjh7=61j!d(PWBYF}<EG;Zt^iL2%I^{Zlbg@#CfQ4WoHWq>&S}AGN*l8j71F^PI
zw$Z{gMume2iZ*v1D$e@7nVZbAx$MpES?<8@&U`cTy>H%ovq05GWMJYc5~i@<5!3l?
z&w_DmAHNK4)h5>++_PZa83cBPdTUPHX-g!IFtHlzspP9;BE8=38}tna1+y^%C9{#H
zy1s}cJP5D|g3AlZJD29(imY9Ag=BMO$8KkKraw*t)h~y-2m%B<1>{JKOJgQQ_b>4C
zV}w)tr2t{#zc5g{+BcX0-I<caKTK5w>%NW<G=RMgh483yY`h6UhJ4$au6Y|+2$Nnn
zQe(DlsIUDFG1gQ%KEDT;k3-zpCF~ql-VAsZ@aPtj6CLQ2QR8pI#QBvF!B${qS>ajJ
z&`w#%3LB;CU3A7Z(e>}#TfiGYK<c_AU&wQ^CLl5n#uZwBfQ54cE?@+w_I!#o<Dd<8
z&}_%gBH(FQ#IemrdyWY>H*QY4v_;~56H+Sskhu*~uZ6uN;A*nbdAwfx$!!4T;SJ!G
z<gGY#K<R?HZ`f_fm4FG@tQ5`9F`hKU<@@^o0hzPjs0(=TD}?$a>_|cI^gylzl178`
z6a=E#9z;sJoD#hMz!jpqNJZN3?@;<ySP9H*{(EQvmO?t32BQh5Z^|jf?d>nnMr7Zb
zmHyx!yDuMJ@(f#$ou?cG;SG5C3V1HJfd7XDu>j*fS1+BjZ~^Jf{6U>rHj&od;)mhR
z(gobUf`lHR3=dzF&ok5m=@X~>)`00)nSSX42*%To+Da8b`YrI(ZrdyOEmeTko{(f=
z?zAhYXc=CA!feu3?}Ge!zPoU5yY#QQan-9Bs2HdiD8Rr!@xk_9%r|<600000NkvXX
Hu0mjfP;y$7

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/meta.json
new file mode 100644
index 00000000000..c2fd092c025
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/meta.json
@@ -0,0 +1,68 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3 and modified by slarticodefast",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce",
+      "delays": [
+        [
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08
+        ]
+      ]
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    },
+    {
+      "name": "stage-4"
+    },
+    {
+      "name": "stage-5"
+    },
+    {
+      "name": "stage-6"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/produce.png
new file mode 100644
index 0000000000000000000000000000000000000000..be5b16262e5110216a09e87f7b76916ece884818
GIT binary patch
literal 24211
zcmce-1ymgEvMAca;10pvT?Uun?ye!o0D}b!5L^Zi1PdAxf@^|90t8KP_XL6mm*8%5
z$=?6|&pvORbMJYw-mKNr-Cx&NUe#Y$SI6jRDdS*LU;+SuqpG5y_ps0Xv!SCt{J$Et
z=YH5>xT~0Y0sz*dKN|>mn?(iy=+%w}CSE3*8sau?E<8|MH)|M=uZ#NwGyq6Q`?^DI
zp2586tYP+!u96G~&Fu_yj<%8v#zLA9O?P>igQJSS2Tb2z%fQC}nT?n&gR~T#gs=Dm
z0vDJUl+M@1+0|3rSCZi$c*P%%{|xgo(ES6%>zO2j>>q-3CYm~Q@@^h5I$<6Nw+#fs
zPbVVA!zU~#C=B7E<A?A=cp*Z(eEi&e!r~A?aXt~czkUo4)I4nM#Pt-E{-X78CduI7
z<>fBU%j@Ig!{Z~s<K|({%O@r##tY%+<>%*qfZ+D@bM=Dya=Usm{tJTw%+toh(cR0@
z&6VyCMyR#h3ol8A2TuPff{Xj#Xk9)3QqzONczvPnynH;6KO+4D(AMT}IQJJG&i^28
zYr_k3hPl98y*wXa`TmA=cX0D^^K@|gZ&3ez`9BeOP_3rs-!%S9UR+%MCgJI&==~tZ
zUkdpzp*;=!++n<WFi*D^9yTyV?*}#+|0Rv5mmcgt^!Y!S{s8`u$?oFv9x$kvn}>m$
zoAbY{tn)8<>G=70`03b;9bIkRd_39zQ2T2FOabZzlVo@>xga-0kegr3;KAhl{NjQl
zoDhC-2;`rjnr^m^c7FdEQ~+YYC-BERghc-n=!3u6LcO5>M_^kUaXU8;7wChw99^LH
zFkW|8dj`6{Z6Gf1=IrM2K=^?>fqx%Ym6zA?aI<rCez@SNrz}UOswgkaCnhY+&CkR4
z4|X**#Z_HBy`Zi(FjWOfh6h=B935@NZS45@Y++)8+;+A$qTFKEf&$#ud^SSde0&eX
zLc(GY8=(h6|1h_>f}72YKmPM){y#&>*3ISt$A7T*5Gle?TTxMNn6NcJw>3milp88+
z3*#1s*+6WC_{D^Uga!YFP20oqA)2Ai|Bm$!SGErrZ6Qzr0Z~3dZX02k0Ji{45W+16
z5#i?+`ty5W3Mwoh_9tfk$(M?w=Yx&?{)$3<*z>=RoE_=@;d$avn?DgH$zb!x8(_8!
ze+@hS7y9@gQT}Vbj|1!h>Ho${{z=`_&CbgQ>H(9rf6(3k(F=M1JLWy1-v4{nZ3IMY
zA$Eec+<bNdqTF^uf>3TzC=|lYXDebOD9kUw&kqs)m+1eQ_5Z?a|DUk_ms)Hbpsx0?
zhxE+L@ZSn!<L2rO^Y}MgxI;al4_O)J;VH>r=i%l;2X%LMcC>;1F&wYAtL<OO?r&G4
z^Kzs6j|lm1>Da<N9RE#i|4!v^7U=#zr1yU|(*G#l{;B={AC1KO=Wg@Q$l?9J2Gw7|
z|4&US{jtqI60-Pz6+Zt{AAHEr;t$E=?{xBiEAaoK@Am&Tf&B5Be+d3>x7~jYJ>1Lx
z9R9tCcsTic83J>CaBh!>MTR>W(+&U_#;7XD8u<SF-5Qi+0DH^oKT=j-UTGFSEvVl)
z1ta5fRNx|~ASNJ4s#5CFT`Opl{q_l`_XTyvuD?sK_u09x`H$r<*cr^|QP0i8pr%pJ
z(ZlV?(~Fv-en3nz2AR<-J14wMk9BQfLAJ?Es>$E)?zGypvstxaU;963_%nXF_s#!M
zdz`iDmveCuEIoSg>H6lTf`FXhb!2<ilTuOH_IKJ#aJ=BFK}%fqI9cK(-6X!G@mr1i
z5COEOCa@+Cf@FtJ<(x?e-%X6{!(rx@E~b-%SyY*=O(T{%JMU2a0Df}4U`Djdb#X6U
z|F>M6^KZt<U24jk5Wg-?VkgX8y?8|Q9u*?R0)QIznqQxIUxXY0(YPz$B&Dm8?~#>j
z*99mJH6xuPslutEvmgoVynFx#JThsNjz9&k5PY2V+<+Zqg5d}Dz)j{qX1AT-2Ix5N
z@tJT`DRM@?C<1|mgvS2%w@QFRk|mbkpn*7Nt|bPjrZxhgs_?qFSxa>!Dng?BdY4d!
zULk^Ns&5S#$O^9=T~J;{^)T$(zjr&|UMN-0GDGUP3h}ca{uX|=ci$eybPT{H$CZ;}
zyworNlZL~wpyrb;yF_=?<8sj=WPr=^wqKH0ww*R`0&GNz35<u(tRFo4TyAUDgO_->
zAbDkb`|a)`+w{_MU!8LS+P7ym1{NQ?+rPcLIOo0Oy@+Z5v7`rRae8u)a8>^Nd}^8S
zihIVViq;oHfXYM4KsR5^YJFbOFz5dA?C1SeGwZYEqTy;m^-=XGaEFQwDmGhP`g70w
zOCK$sOGg((So`qKrh7f-(o<(q!1k)@*Ts$TVjk>#FKt>f@m_2I@hU*Sm^AnW1Rr^P
zsqLFb5!j=N*+$;YvskJW0ZKJnTj~91kvV;OH<i`iBG9^3JvU>&FhPHL#BYDwnGkgT
z6;^P)c^lm<wsxAil77;jp^3M=WgmsrA$p&!Z}&<g$8h6mW5^Rf|B=rz)L3}UC-`Ca
z<^s%Q`~WJLjuXb?MVX0E$($6q8$T%8a6zm<1(;eLNGy%mfxb~1OtH!#HqY$H`?b@i
zB`n^{n*fsyF*}pbt{_0(b1(}pPx|aI=YBr{C3^o|@E|FD>1}tSxVQ6n`34`Z``sAz
zVUDCI4YIvVYamHW4AT3VhST%yhPe063I=Q?lJ|Z;P=J(5Xy&_24bX>qwR_|8%p$XH
zf1IB+UTLPSvB-Zwhr@~tz?Ma@s8C2<+BVr3;=m{ib%5iG0IGL-O}Rs}cz6Be39W>{
z=_whaX8)I3EM`Yl`p<Q3qZu~>;DkD0iFW3^lx~!m08Xquzwd0ZH*<GFbpts~+}P|!
zk^ulC?$(7XThM92ZH`>X^rz{}gX;XtrwwJuudP8zpIu5DKIS0~zwtkAovK-i2#&rk
z%ec=UON`vXLy{S=ydA5&TJ_lM%I9z1RPD_s>9%JtXto6+9&xP1l|lAQ4f<}}wClAi
z8W;8vK6ob0dG2z?1;iYD0H<yeyZb=h3hHin&LXUVH~K#Q!t@3@$rNZ2Tr>^lY_l=f
z(?bS~<VFPzI_fr!<PgZsbxjldh^^pfcv4khK#m#JidpI%(p<J=-O$g=y5_w;?KU@7
z#EH#!|E(PKyY)ZUgM9`=uGychnvEgs-cyU+)SvMKq96b}4H@pM%ZzP;RI>N&)i($i
ziYl#{(;31NtNeb%(1<WW9LqEjF{)K>x~_<7Ma;2`0e4_Mwdk-fBRfT`>Kh?K%&pJB
z*cgEgVBDVxh~Zuz`3E>=ppi&x5vP@49I;zcai5}Xa%YZXL>N+cODnh0k#NiaPFlA_
zTH1$aV<iy<Yd7#VT!SKl0~4<oj^z&mFF6ftf!g~V_=x1#qaORp;J^}u8M>7EuY<a3
zPsY;`Fu)m$Ds#@|eyb(Q6qj+ndJudcp}T*;$H*2ajhTaVi9R-bDfUGLpnB!=8>x?B
zsj~k1$VYnbxeJ`}TDN*ndrP~3n2_#Z^`b@*X<4Dglhqk>a;5qs;)z)gD!^qH46mnM
zQZM>pLLkvjFdEN82s~SvTL7$(<8u+W192AD&DvL?=ecMa`qDCopu*28Ko&ZpdENef
zUHK{KMJ!IMlGU^8Cp`#C=#MQZ7#}F@4bS-sG=!PXl(KUnHZ}#35)PC@Z*Fox=!cI+
znUC6C1g+ly<)M#0*ESTnVjr1OUcZ%GE*Ps^tgit{r}%n5222DrfbRuVu2*H0@wv1)
zO<xrA$$Oina;fWkr<d$peha5Tuz~N(?`c<p9Cxh2w?h7saK2q|O{jm0i)lO4(X997
z^F0X21W#<J)?B#b1~vY0?>LTI7cB8L!b|JWkT8B7yj4!a4?u54TTTVoRBF0)P27zD
zGln#RhzYFP!}35d;A0|F)E<41fkyy0WV<vnu$6m4$!vY9tiekqB57T9MJbv1F~@tA
zn)YkdxI8l5W_?cPwi3yn>h#Sx>QA|a37Ibxb;Pf&u5>Zh<&mw3vzKCzpZl-2)s3d6
zz|ynZ=eBStxB2g(SM;>92XE++s&Nm*!lJSWb0$!C3bOZE@W8j!pU(>xpROSCctfvm
z#O^IEAixnJTG|Cgub=pPUglrydngL38HD2Dtz$xym<x+Yov3U5^Z*3e+^sW|E5fWv
zufww^>Lh%IzT$XpNGGkUj<;{10suryw;IGoZ8EpQX~3UpCh<W@apgm|M2}AeQG%D<
zr#hzTi-0@&E&mhi@E@0jHR{^(1dm6`zQovaETLdi@&ffnB+Mwl*w^Moo5Wsz-HT~q
zZMUJ@LYjM?vk6(#*EO$lBVDy9zt5L~)==nZD8flY{J2jD8|Ky{NTZtCCn1?==O0#d
z;L7%mRu0cOH?UgVymSDMEqPG!w;F1$J|Tg6-6auDk8U{EW3<$5nZ)fH&7vR>r7{`{
zT{O+iNZt)+*sBCB`(on#11{s}QQUjY_j_fw97)cDKTnyRDX59y$iQt+nKs%TmB97-
z`%|B;Q~z@Jn!E+{px46jJww`fpumD~q@;Ca(;hi3LX-N?wkiEM&I*h0RKGH-2z_MX
zSkB_;DBAX}g90!ZA63+M+gdbNn@UYtZ(MQmkp~%miB6jU!_up_m9u07;WdL;fE7AQ
zaI-*NtrwQoYcZW@4^c#M{1W-&c^cmrN>z`QhXJ~%r3@k+5Uv+*_{pP*xns$n3Er0B
zdl2GLqa5cGe^evFy%>2Pd61+I`awX-iKwtl`s>#A^GF~RQ9xZE>g_G;tB-P?dP~_B
zw{p-e8*P<NJ1V%6sW3Hk1Bq>l=bhcqeBOnN3Hk|DVyYwa*bU2BrG6gR5QFtr20(6<
z^BpH4%dunL!3g$`H}=J3-NXP3mU&$*7_>bT<gm8y8bSdB)f8!daTQqysvi^+0Iu1M
zPhB5-P$d=m<(M-~@!etPnAtu^C@?9T$gyT;*`gBOw|R!n_^Ou!zQebc8wGpsO~{eq
zes&_K8EE5){03l?-pf5jfuX@u<#3%j=s>2+%jW`I6S#rAI5!qwFObq`m#}162Xj!4
z#g<M#4sNDA``9W@=+2^n=O7-jz-H{H10*P}Bo2C5_FPAR9$B(gn31p&2q0chXO?TA
z)L-6X)JO2i0x!c7JDcYgFd+xc`5j!5t*#ND6{e_;ZaJ!$)ryvH-ZiOG7a|?D@%f&s
zXPS8SrA!CwRWzFGTB&^Y>nK?83LbdZlCzv3gMa56LcQo2dXRTNf{Hg3V>BA|?4xG@
z;{qEjVB^ab4MmUgWjVvk;M4|+)@4%ujMV_!=kzC<!f_u5a9<aCp>i*BEO6x}<llb;
zgYbK_dcs%S!_gqK&ypp1#Z5>+{MwBUMtw2g=b@Qe@MC@7N)~ir<@PyHk0nEn6!5ks
z#;v8>3`Gyw7m4H^@pgw`i!3l0K;RjG#-s^gQlvtj6(_~VjPZ--lf;%)ysd6sf+nEs
zp}eDc)j*3!3es(s(Y4trs9HLf{B7}{u%|*4FYdV)+nx@9Y0qfCA~?aq@F!c28D+SG
zJUFucu(HjFbJ<r7dIydJ3nh_RfR!>D65W#<gBHQ81uG#GLdf|C8m$Wj3a=$U$;4fv
zmd$4^0{8&*)OSmab53dkvpI+%vSnh&(AR&sg9fyu+8HHZ11AO`+My%WT(vx<hQ%6v
z0jUn}hG?u%eTzk6?Kn0Jbb$OL4VlRIDVmnE$FHxJo6;-_`s||(S^)592`H79z5q!J
z#F9s~S$Z><w%82Ipm(O|>Nad*)G8dWlNINzbJFTeuWDo^Lx;OtNMfV!rU#jZ>Tb~c
zUyhp}8VYIn1O&VY;IlPE1<`rMhh>kh79ZCVk0&=@eehoL1XwGMYyH2MM}R>|_QTc9
zCwk!xo6OvnpWn?(_OiI4$tVbKu2w8o!nZ$NbhOFn1F4~&%LUNMT{W0q!{YVp_vnsn
z<MV2xBhkaB>oZnBUqJ{VCA|5pVCSii(u$IsSF#_}O}`R{LVBzfe2)4KoG<gq_t4hT
zb3ciZ_f^9hZP+P<j(eOexl4c-*&GGjf-6(6xFK+Val`y9$0Hdv;%bo|DBxJefBMQN
zD_K&~&&|zqpJv{Qp+leY2m8zg|EL#uM3%a5W6!;$Sk4vCHma+#Clr2iqqZ?peTOge
zs2-FMUZvHi)ZpyA%h+xqB)+bJmx{wLa<G9u<=px$r9uXXAao6HNsQKq7D*IqNnO81
zi(SNv`>3e~)Ph5_F)?MfymD8GMR}N&)n~H{Uo2CxeNPTx>OSbVT^MTDyIkU&w?O}b
z*>myZq(k~Uzk8bW43$O>W=wEh=uqd)b`a=-e!Nr6cf(ZpY1n>#=8}?Gi{E$HCxX2k
zw1MrH8fp2NDdon$K*nE7cQI3;U~QQ%?^?v#vck4k$4qDr2ayb;oC4eN4l=)b9(7QT
zZyA-WeDypgBwfc@#80hTnAmU`WSVQiF#&<w>aZfq*Z??5hctC$Bi-g`zS$F-1`2;`
zZm@B`-qps|7SW<{FV1&3u%_lt^5iNq!rwBV+s9*JZf`h|VJB4~Fv(%qsH<cz$fObu
z*zyiJ$}}5PQw0rlSqgUtq;V4nNjDdgX!?$-wp8)ZxYH(~fs$r{z!E|C%<zGH{m*@s
zrI9My`ukLT&Ksq^qXaEB2IWNn;34ovS=N_ryuiqMUu{zK>Mc@MdW3jw=n6a8qCuZ7
z6-!$xCei7mElnShb@A`KM<m)8hC)Xf^3M&vy>fp;Oaz~YL>lB;FBHfu6!d=|vLfXB
zC@*w-DB;chm6Qlh^?{za8j9wua`E9#$ER{3ec@-{v+yD6VO2#!DPIz66coAu4)j3;
z&1hY~bSdFQ0-2{cm72npQZZV!NaR7Q!XYuT3}%C7wYz9n{7}RP15>{pde)y=bA+1D
z*2XTF3%${S`VpRnji9=3PMcJ6Bt#Q)Tf~{C^+Cgn!G&c&c42w6r&6XGH!?gc_E2;O
ze=#kgbh>zv1mngZ*2)`uP<+@vdbEHMi7fxJ!nao<^(yOBW_CONt$)OD7Q{JB!1jZ6
zRIt(mmc<Wpr<A~#-siqc^f3ytrJnl=X8ZYx!e_#pVFIl^IGQ(9pS8FyxlGoYg}!5}
z^!n@&DHz#`qsth>$tnC|J;;<sI+BcZ^peSu*l^*ZlnIYt4|H9@w4tYJ#w?o)JI-%&
zyX~7nBYb*!@&MgvVMzf&;IJfL*naE;=Sg<N&%)8{*LJ70VH%yDTJ%7p6T=633Bq@1
zR}}F}zcCoquBXD-_PcHD8afV#7S-j^mGyzOye@++F>=E>amk;!pOjSU{ok#Q<@AgO
zT?SB)rfCp2e)dNPyyRPcn5Zw$>m!Hm{oZy-$`0ku0hO6G=B%Mvh61)KB#GTD-<lqe
z0oJZVc`;X$o1?8CF2bufXTi}wKr#|PJ}HFJ^l)N8rCP{vR*2wRJ!@AN;tTkKHb2sa
zOnu4PX5a(wa=(fo15Xf*L+1D%QjJ*p$#1f5YGqG1YM9^8UTWtjoFfUQMCk?p4$<n?
zNf0~S?0=bw+n@d>LF?D(?&5Ptvd<we58@}6DG34d4vEz$7R@fKrO@z1r0pPrDl`rC
zB4vKrmpPq%>k{YWPAYA9aH8k{o3R@Tif`mZ5%f<SXMuxZXJYs6o|g-w%a<Z6xj)qh
zjyi$dvyUa*Xt>#d!9~pi?nJ_;U;7>PXC3QE-~I|ji{DqDsix8c<*X~%JS?NLn#I^G
zg#vH*N!aYIl=Z$<t^x4ZTh*_k(W2?Az8c4^Q|Vm=0fjiYi$dhr!X3T6bU_lVA~^JS
zE-We;o~=xQ?$}Z$7?h34p9L?Yuw@87qeijk5mJzCp%<L<8RP^QA+xTD-I`;8<vUf?
z2EZ~6{A5FLAMM`JPh$ucnURxW@R;A5-0=I%r!IUzs;Yt_axQXT6l944i;^POjdKmy
zyF`|mix^$(82#jakL+sGbQIkU&V`W>&_60ZmjL=4@?6F~B}&0tuqf?T>vV^rp&arA
zpslu7*DFg;0?(1dg_cv~9k2tSgDjUDhS!nQ#L76PUPQ$3CokO%yil@;_<td5Zc?EF
z3r!dy9>INKNcd^)TEu7Sd1ABN1i%7Q$-YKuuvlSi{6s`z6MWLtmKn%3i#oA0pc{Mo
zco{s?(UZw-9|LS%XXFsXRXY+<77?fi%H-f+!Hbq7IhlBU6oQ*=O97@!63SmWy4}cD
z@QXN+J*+%ELHIlOmH2U-gYoSKGrV-MP}s}sUb43hm{)s8mh;av5v<bH8_Vw#7mY|v
zFsCdXw=_BK-VY}tRu{e}W>dkq(Z#+$R1*MbVqf-K$zQ|X^ih}{NzfJs`Vm$U21PCq
zU`n1tNtn&o3ESe5329ofFm>fvHv+k*vhSWu{HaH5&n42M(Wwirj3d~9`MlCTsbsY#
z6u?%yx)-0`g**<uRN-2g{CF6z^nwJW<6oc}g<rct0!rfl9_PVz@+9xw4J`<sN{)3u
z*-A=6Rmv(o-yfJ-&%9PbDUGnYt3+vUY;ap#(s)8rPs){iKmH1D>EhSCWXcZ^`~_fi
z#tr0Z1k3;%0Q?oGLmY6Yg0H9I!}Bw`luvNTHwJ-auZJ<f#MBE=vtToJc{=>uu(xiC
z_G_pVhGc!C(`YBcR>OaMkzM)LHm(z9zr+7=@r~*D_0kJO)`8G)mT~4Au?CM(dHRy4
zY=f>$-A;f{Rg2ADcpayf)YFZ6u!;6{s8Ya!p};_r!$~38HSNL+pYFJfXTp-A>|UtX
zcv`%kA8rfZZw@_Yk?mNHEyr#LO-Y`=3TTix)DCI5%R6{nvY95P$)xy&8SqN9JG^O4
z;MO~H$n><*axuLLL!69k%lhZ707+(4^{b#Q;o9_h-^4h)-+oL6Mz}Q!Uxrqs+e3mr
zu|_(}>y$W`9bO!bl@)FT_ezD*unE--Ifj}LiHkY4S;_%VCY^60GZWq;0b0^V8&h&B
zhMPatbJEb^m0Ul4H@DEJZ%&k{9^<^1wuIA=S?iYOwDGb7S9;)%ohI1GbF%04Vrz}_
zUdhwE0meg->)Nj$ieJa1^mG38L&50)eD8K}jv6hQS%3otFlA|bG*S|m{d=ZY=bR|;
zaK4>maEluiK;fFA6u60HK%VB>iZ0LEoav8*Y4xVSM!FEgM>`*gfVF^2&s!JaqFegj
zdtcYg_hI+H1^BLIp0+k%!*BQOAMHI)%y?WvnkII`BJR!n{sk6jOX5oM2DYWe&F1+z
zcMeZ?vjU)7x`R+GA@$x{KhI2w!r=wrBNa$=(rA}<qdt35Tet-vDF6`fM#|kv)(lEF
zdzt(*!;H#W{uR~Di&SYGfF=l<rAZiWhT5Ull6o8X3~{6XeWPK&_U7K{OAryl42y9G
zXgekZR}=CR3rqM|RR(QMOV>|6wwuXW4SAO5i3E`SDTR@9#paB<WI6e?9HV(7LjBGy
zww%MK_znuX04C|Bsj8g%#p_vf@7oY^H`e<l>CgR$TGSkE$oO6n@}CmeaSm;r$gOF`
z`{0{sZ@hv2ts|ka-5p+HKsiq@9nypxVo4`W<)_c2iw3C3i60_<1IrSg2KpL6GTAZ4
zZ5x{K3q9$&1#x4TXGY59o^wn0Ph`rC7qEnZSd0!`wn^)3>D2=)Y|jIJ4FVRH<m<=z
z+~2)#-K5%RIrsrpjV6f+hu@(t?=?t8b5?p)-yK3c`m(w=B{H(nfT&pP4&6)Vl}N+=
zs}qz|fwSS`xZp=;BOOb)J?I_0Cw>Md8h{p@Pr@rfWj>>8<xJR*{E)?j4@X(qsw;Zv
zfSVB5)p`B66UX(9zLthX6$V(Ki5B~jb)NxV_5$2qi4+6=h|CBth#+nAEe>{?`<X8b
zTl(_=0)r0JzD5R+JJMo%cv<audZ-^6S98Q*o$j}6n%g^EK=gwOz@$D?a!LNWTvS??
zpt~?mPx`JN<4Z3w7#@ddrv?@O{tG6@Cv<46ZU552i>VwV-n#tFpf(ziK+OV(&C`-3
z<rw$##VOxRA7dN8FVs=e9H8R}Z{avVf*W=s(+RAd3v?K~%ourRVTr^a;^Lfyd_741
zB+j-M^BI~m`Qrzvzuw?dxWi)LOu80f&mUtO52GX!v4I{h(Ra^5K%z7rGRMJ>Sk7zp
zBkz?p%wM``WaE}yc_+baM1gXKBCsV3vdj<7v7)tshl&9GjB`Ax=Ew(n2!q*<cTX)2
z0sMvg;p;^WBQxQjM$DA3Nu*{&{v;;%0zE?ak<lv3#Wi}M8dEq>BU^r0yR`PM*6~#`
zJBx0oZH!epRp<0_xb8zGi(Q;-DTC0;(uML(8XNRl++|83QXprOy5(cwOQ1Y#@7HP6
zL5hT}Uq~V^hQ;OwGBa|{rd>OBf^ZNWvL7|^n?4SR>Q?MIr`hG3{&{ixnU6nl%pPsB
zT()Q$^+p~}t~B9^6~2^$+7ae6xkRrqs<%arskw^-b3Z(w_%1x?aHcIk;sdoU_9%65
z3rj|%?8%1edf!FfW87wAwIUKg25rgS)%^*4x`J>lGW4rkbYUmQuUwj`InRkwOdvO$
z=AJm+QqQBVP@4lGQnuGviJlTcioQfIF#AYk2YyTebU)G!rRE`sAGl1meKw56Fv9oL
zeP8GBw^|}2N)D|;k>SH~x<T)7Pt@ziem>hE@=l#bA)i}BkuNXVCPG6GT|gD<>wHo!
z;1w_^WJJw+wrTW%zX6sNqPRWPmZa8RIm3Xhy2|QnY^Vbi^VfK;_K$vx(rAB0<LHo#
zQF>zY>%%YokCM%*{4%wnxqvMf^WxXMiy;vf(&7?!kpq(nK0z8mXqs(5x!NlAQz8;1
z8KwF*C2w8TxbsKEJLx_P%A~~(<Apw3ott&x$CE3~*gWe(=ol-&RR1_XLgh1#t8zLO
zTgn^i=<=8bWK=8k(e{Bw%VS>K%l-^h_NOs=_ZEqervsz?H|2xep`bpA*i9%Jd+-ek
zvZ=+sQ6m3ZG6SxMzJZyfFem*%*V6MoPgzO;==;cGA(tuY4||+SlScE_ptE9z-q}u1
zd&!?lm{iB|Ec6Nl-Ev@iydhpQ%vtR|9fPE*x#u`g;hV>uLO)^K*ZLHYeh+4Keq>EY
z{^W&qJwz~adUMklhCy%M46|^0vXkwr4sj)s5TF>jiyiIvl0&CcY)^mHb0ufhWq;Yk
zv?-8@CKW_Zj9+?Ns2p{lxTWr+aKu-GYZrZ)D}VH<boyvN_tdMpiQ-zC6jMB`T%K=Y
z1CoCgR5PHi(ms_0)3AB6nY%vPn;;Yup!qF;%I#<-n};J|!;RQxYFffCpD(Qodp!Us
zlsR>H+JtnNGuX1~WX5xmg?;rCwPsr{yrf;Z#_x3&8=Dy3fJFb^r?bH|GoZ*b7e+{<
zt01{)sED39R)pQWMYH&cuo`5LSFX&2BCH<rZ0#EdFIe~Uw|wrVmhrc0oz;cG3AF|&
zSzztZiue4nwwWfz*r_KUYcVco6_cmZ#ysDM9f4-dh|%FPcT6qi`X`V<Cu7W#qB>d4
z4nw56?7FXIYZ$m{cs&tYRj{;YeIo*UhukzbVfC)<+;W6|u0=kHXfmEzLmxquKtu4i
zw|FHYb-iyoQFF<^ev5Bn>}39A4inzV<R*EUOSrU|X2S|=W5uHMS#6d*J65aYP{LF-
zN)+6v_6hph83D(s&JOT<>nreqtftM-c5OkkNmyan+8|NIu4EbcmLQJyuvy4RlE`vP
zxNx~$xT$n=x|-CrZyjhV6+KmWK2^Z7iti;sQjIhQu;h;Y9^ZJ1yOuy~;l>&vnJ-;l
z$v(!FZFf90JkER6DnktS(drg>pZts~z-5WU`~IX2x|PhZAH%lu**%K)-L*DERYC{c
zhwqh5z<+E(%NWMOHJ~Lu<>21GYWsRTETB<Y2Q749)HX1c(PK6)Fk{*^Iwvn~y=Cho
z!fmR)I}YEmB?Y@iNERfD>RDQ4JE$luzV4m1Xm?<Ny}d1{n>Thkptmq)nuY!od?sz9
z$wV1Wlzrf0jJ?Oto}T@=w|A1&jIY)n#`gGgFVe`@#;b&5+6)>+ma}}bzW%wi0$6Fx
zb*Wl}E+8cye=vpY46GjB3CKlHRFI(~2foddR)6Dq%ZNpiN5EI`<2?5jeoKhN;`8I=
z9Yw}iKe+>0rMDg~__R%agPMy^@y`QsxZ-exk*mBPeHD2QK2`fTtLAW$s{GDV6|0Vl
zIlig05}VpC&x3A@D#8o^mK~eYW!`L_SroX-^d7q-oeTTLnf3^?jJ8u?wPAYahJcwe
z^$h4{^I)+3uy8`h0a!9IjdWe;FpYz>h&Q;_<~i0*Dz=L;(bbnMxxO@Xe#PXbV$?VY
zX*JrnlPVPRNP%I((W4LCKHw)QLEbkr9p9Wr4Mn@p;*p9AexWy#3LBv!(FI_NR-mM1
zPX+oQ74y)tYB2d!Zc=b92}$Y_=CqQf=HL=rf(~6+cH!ScG{-@MI)z)JwfbN&-gHCA
z)wWe<R_=|}#^?U^t(X*#-O1_C^Eg|(ZFg;@JAP+Q3#V`l2?Uo&1{n8i%a+?mojivD
zXxY<DPxHygc+Vu3`n=N|3tL!h9LJ6YULxV_sRBI<5p6tX8h+^VMHXHQm)g&)<gtAn
z9@D1gCQG7NSVU)Jy<RObQQtSz2=?&cn0Qw=ai+xoE}4}s^lH0pFzfA*d|sy*W%W)e
z`v;?d;CEjrTD!x<xY}0~*~8}z1aXN&)J{efrtx=K2lreDT8q{CCgLl4tp*!&m7y9f
z(RW-S+UWsG=Ap$^(JE`usOgN;H{1Qj5|g;%$nV~LaH6xU!JUkK#agj%(^Tp2u%O;M
z<roKjc;Bcf^g5Svd}Agm^W2PlA<vRT|MAKfv}AP+TSK<3=#*cOH?59V!Q!2m9ThL*
zeOX>RQ1&5ueV)-sNWaKD{Z>kM&QL|_Vf<DMbM-|D<wO*?XLMkFb7Y?nE0J@@i!Ir-
zyH_WMbHQ`WJ}d|MwGP#&^NL+Hi|n-)wX9Q=p0sZ1kh!W3uHQuqMj{6QFR$7&gxyEc
zB_DI^c}Zp}%|(APl{+NHlo`Y}Behjb`>l6!D6sob%jIKLe?-+tpog+DUrFbL+0y>~
zFuSmTyD6(zm6j|&_U-4ncY!I8Xvz;Mm}0Ne!vo;1!c_A-tqEIg;^^!pNqQgHF&O29
z^Z7p(>R|zNK^^X&?<UYsUzmTX*<`dAdC@}`6@J)Tc)}u6FXNQ7Js;ngy{W`C+*5Ry
z%bpUzzn1k*#o$Fj-JvWe+>?aP_j%Q9%C6zX*RyM$($^2~$a}F3e}EQEIhQGs06#84
za{q)~Lz8+xE27vol8&baZ<Hbrx|dQGnv6l?bRIQU9Cc)7s8>(iJ`5VreIS8K?rdl&
zlKPOvTjj&u&>t#69kw&i4Zu1|`GeeGH$0vDmG7e#O6&r~wfMk?T|@b?aU`=53rk7J
zrEEt=XKqe_dDrG;KyAVn4-x#k2zhaVqpvTi1=;S|>riz(GCnh*r%^Vzsc<M0>rln5
zJ?3txEn7r_>6lNs$m-Ny^)Bm1`ZodhbOWar&I~4{$Q@(AmN`}a0GnpL<`zt1RlKr&
zBSD6WA_hPBF*qjDMbpRMrL7MN<5l^|gGHl>{(;om?!`dIicjN#(ge$08xp9`M$F=q
zI9A(Yw0OMvh56jZKCa+;_Ruo9k`8r*_71O|tNC!U1`Z0Gs+oF!rRnKlysO)r)S^Zx
z!@95xCNXV~w)d691?6Tfy`;XcLM4KHrXzxqCb8zRH176b7~dn%o(CVL)Y|IS3nQe!
zwKpRXbU1i$o@dgDN4~!~v-~HXqH;@G{RBqWStF>rE-b!jTZq^>9zHBu;|f+)1PO5B
zQr$~LtA5Roc%eE@f{XGq8@nGRp=RIcwIj^s9||GCEjech2@(lbvf!$h6O(pM>0#0g
z)!THzA-K|hbIC<tMW}!;#Qo}fR$T@yS-32;3&Q9zU3dkx(h);8$UKgnJd{qA3?QBS
z@WItgzZJdPR)XcnRQ=cj@1RSZt(jRds_p(i7kX=B(Pex<;n4R6&d%t&xw}E=ZV{V(
zGGi{^mQH+scI2tExxPY{Aw}Ps9@H&<Vz8!{8US8w&yjR-E57BGN9bKT@S7Tn%|G;A
z?2n+waI9EHZMOHMqTP;AuK0MAmhb`{kz;1Vy6O`cu{bh6au>0UsSaw<Gv}%~{jf$*
zR@byrz8WC`PoAd~cIHuYR}XCAsSdEY5KFZa0+42zf?#14CCU`maqQ_zm%w5LVCb0W
z%lfDSg}_fSvtTgMM+Ly^?ioL>d9cz>G0q-UzQuw`CwTc~T%X$;+A+R8<Mr@ymm$PW
zz*FzSriQe2;?G8(Y0eq;zA7kDNioRI)>sI&gcO>a6*sM@VaOENXRdr>q@Gcef9R6|
zNcLKL{lEN11Dj;doO!;9{g7qE;`j<Vx3Cm)-RC1Z-sjMM-|MYan|)3C34EI4_ftLJ
zepU>dxE7~C1umz=5x3@rocR08oWJ`WE$&!|cT*nH$ezuYcG536g6QnJDs$D#V?q0)
zHv?HzugieJ5qe8>Bv&upQ7cr9aObcr_*1xZxCRMs2O(0@!4e9FJfTv8tOdmRy;cmU
z5nt{@lV|b#`=n89WecMa4A2%Cr7)TFUN}`)3tAaz`ji>ak+g!!#B7$bowOJx(ScaN
z1k~IFzb7%!L}c+NnBoH8LGS`VxTFuL#~z;3=u<C7VnBUqNv1r63iKku(-cwZI74V`
z1=d6h(UOIkvZg|aju}D$;5z_cXMT9JUfnF5;AYCTk4J0*a2rsEP7KiJAA)pD%;f4-
zGCYdg7Y!^M2uJCGb<{sSzaRGt@zK7y8@<cDTj3jF<s8g%ddbYN?bC^zo6aGR7tjIJ
zxb5%vliHP22L)~fHB_8>P7>##d1;`;@m1WJ_c?;mk?4heek{CCyq#Q<6t@XpPYJ$L
z1eP7Za@YP<+mZU1FSq?}_TwdL@A2BRn(Ce6Ekj-dD(*o}N}vVwr<ozuQbGZ}g$dF3
zdlwdHTLW&yK#@n!P>{>sukC5?&G3XEsDGw_q6)$GDIuVvzdEv<bl5j~znM|I0PUr5
z-_v|cnuNlG1e~P#g=HeOv@Rb8RSgHPUz{%-%xp(f1q|Mm0xuPzey;@4rXKp*eV5#=
zX-$2%+9Xfz%QuD+shUHgY(n@y4V6Wh=;Mf35d?HN39Pj{`3FzXE0a)X`#X)a)6fPV
zh92MFv>yZt_18S3BZ<7{5dzGcCTn`7_GWtfwME*8OamRDN{%t0H)%%+lDOB}(wLNe
zx+?diI~)YSot4*q6{nfRV2w@EDwZyY;FIzbTj09PPfVI8#8z)BP0Rrhpl-Hlv(YBH
zd#DCmUYJaB*4b0tjK$4azB98c83&yLU;*BbH>R<;G8mZn%(pR>ZAd7HOTPMVw8o-t
zNbo#8B%Q25u)p|=Y!~DF<z{-x_<}w1QlMn&PoXO1IwKb(cM*e<K#fS@2%tI3AcKpY
z9jzvr;{j2#APGZ9k(c*`Ab0qE6MX;$g$45U<SR~Rk%ih)Al1y}SA~%jVDxKUAK{(e
zddDi{?KCKOLv)Z9IU&?ijEO1V4dmi;pO=1j0aWhv?>jXDZgw8;P4RBb+?3_SY*xQO
z+CwMCg7b)_h-oedRNCL_kvrDYTuSeMO1$lN@%F#LzQOluQx2Azfjo3Z5kG>Tt_wX<
z?{i?7(Ys32HpRQ$<JsMXjUn6+efM&wDT-JRK$LK7{EZvzQVwlt*zoP<YWXA=;^tze
zce&uA4-cJ^r7?pt9UX2fW4<_R_4})~U0hM{r=fTiZ@g7d0y4)P7iJ5&+9n8|mj~!X
z?_UC<nBu-6`@$RL$A<{SO-fv_eCEdSWKi?OPgLd6Xzmdm5Zl+32OS{6v4<J-O<2!p
z0_JxR-ij=2a4ONU5R&`Z*v<6igRuv=H0FXB&_gShDD9VquXyk6GfcNTvC4xzPBXU(
zZCkpXSaYyXM^|(g+yRFz-KUSSf!V`{_ABkpAKFj0EhU`Ja!k`PqL#ZC4|UN_Q*^8_
z+9)|#0KeZ`xVO{^g6lm?ie?^HCO>uQFJ1AZ0v>6R8!`dOekc03aVps{?kNgER4<TG
zW$;%}VlM-p(gQ@x>mWM6C*I4fZmWCJCH%)-s2J)37&<|~fEn9OsT`=3Qyr8v^f90+
zlL)2%asOiC{90ts5sA9eI-~@3iB^ONP?N|<qD$$L>Uqrg!=Siue!Sd<UbPr`>2#&p
z?IddQp|a|8Mq|}Iu}yf*?L}@Lo1@@Bu2JeswG@PtrX%*yK=nFDi*RJMqUrV6f@ZdB
ze=me!urSr8;7<{%_81Sc$2E~kiNQ1RV{g5CLaXy>w*u25-4h`V;P~?qn9z&kYw5Qr
zd}A&mxp&Es@vUl4v;m0s8-NOrYcCqd5h|7Bg|;2%_1;U^ma(@CVLoFiL<MNc_yoKO
zO{z?xY+3VqU&X<#<B86~Prr&mc7h8x=2HNSzHYB&sAFC%M;cnxri`ek4>i?)nSHMn
z9`qO#_kkWM>8b|pXt8kH++%{aXkC3EY;EMJ%V2F7vkpCWTm=;a@G*B&f6LxUHa%!X
zFP!v&`{^y+8Px)-a=Nx=b8E(EprfW50jwgJj!nh0Dtn%yV&?%EA{&QCN%LFaV<$Wm
zc#Eg^E99qY=#BZmhH(R)PjaeVXEP0x?aW9Gp;@-Q289Djx4yjmm-_r2JReJKp36L4
zmqib9tsQP2rzBRoQ(vRFMgsc!B~}+|RZWxGmI^$qBdPRHHZdYApm8r(PF~1XJu?Kn
z4sT!iMumO`dumg7&eAc_ngHY{zSd;ak|jx5WMG-7pDrm_{gKz24l_&_CUvqeEmX%_
z-{xt@6omU%<hpaEywXA2#viC~wUmnBaZVSP<BP&nj?L>6MUj6N4(R;)zFhu9^tKRg
zxe*w|LEfs(CwTh7t0S9*7nb75pcU6V{Ju>#z*5wQp>2tNB-KFWeOwN6&naJ;nhgQ%
z@`e7TDJ3$zRdY5V>KR=xbGLqpwHim^Mr=ANzS|LD$v1Lw%VaF)DCzeP^{FA|s6+O#
zIfCy~ZrotM=Y{2O`HU!X3mqZ-_tq>)!VsXT>Vz;_r>?q>kVy4e<Boco?O>eX#>S4?
z0lpol18$GDJ<w-0NUEPnFEQxL5vQMwMc~q(lgV;5m_bq7YJ(PBwMk<t19)&ksrOW#
z>RxqBG%`3HbLR_yBb(Iwxcf)Z5R#-!+|v&YXOF-0Hz<h&N?uHHp@@qp_-|r;l#rsn
zJ$N?5zizi~3}8c7PEhr!A_A24++O_LB~~=bfvG{hJSK8M50LHi3}yEhyZ!c@w!|nv
zb(Yk~?<t#HKZ((+#FN;R{bW^x3_(fx>N-wz>GzqwCoIQ|a)T?CJV9PW-%?oP3`mXr
zx<sj?h?M!S`sZ=|P>7f3BOWOg&JRh})zd}!&T}KGh?%3tJRLsZ{$`c3_y3hhCPdA|
z{$9|obV{BpT+mBZGHpnJ{bQ=JO5tsbklb+SL3y+3m7%<?*GWlj2V?2!){l}>(@Sdh
zx~<J6^LQHb_nC>VFA5sM0er31HAJ<JRA33qIVt7wN!O>ULw~C6*Z%J$Mx-`)av59)
z@ErPDX77A3yQ|i6F)c09$%FAn#LIkfDB!1%>?%xO!yx9ASHGlwnv-8+&+4WVGt7%7
zNhgL3@`OTTe!lWBM9u;W5TAt!T5H~L$}a+Hgxx(!>n_fHM?VN8XkSucel~iu_Q6@Z
zs_dsNGuMghIQLY)o_&UA30t#u_@Vs9AO=|^TB1`Mo~gMLgNO7p`-~?bRgwAZrlE*Y
zYWm$knXp60hi`bEcCx2ovRSPyJt%WcMs9(n+=KuHQ$E)Z>GSk_M5bXxMr~lvF}iGV
zlF)TZ?Rv@Bw|+s{4SQ>}swY<aDuAm3=A>1?pT?2*L(P>{BRO=HE)!GqwGbpoTN^+6
zW5aAE8P~U+3r^81Z|yqHRv2<{_&xfpQO@_e>%RKSNI+1vB$yRm2ID$tjuW_yD1Nc)
zH@+}BtY6l_kJ1r9mL7Z8wAW?Rb3rUsWKv-5ceyLrP?Kj$nM$MK`HQSfshhTS{+El-
zLq5_6#WFIlF#eAD?0Z!^mLp8rFM^UgJ}O~*p+}cTOYpYgqf3*5Oz>-Q!gTc6W?K)j
zy$?7@9VT|jw_NsBRm{=?T|zmozZpSv`XWcI=0C!b@H?kX*rb>r1wU^at2`IRD^yBR
ztr=28mkYLo%K^bu5%0QzB>Mr&3%?3`_+%uC)Q(x^F85oS?&&bhMn}93XDP;l@f4br
zc#B#1sPXJ^b1`yy#EYiIZ_dAhi6U~wxW2Kh-q=^wZya*kT{TvH#=-5_{n#2ATE2|K
z*4E=0dWms_t=utcL(^cLjyyHm?OF7~s_Kp2naycR&L-o;A_@{+0|3d&dMUW!DsjF+
z&m4Pc6shM<F0Og-MhVNG6J5O(M0emfhop+B>1J%hqgY9Grx=Kh(kj*aCOam;uNgEE
z3w+`BtQpZ2J5EWfXff+c){D*7ob*(fmYO-k&cr_uzw*NmmP^6y4><DuB&%l9E4ZTD
z@`6reSm=`p;kzpTlNv#zPqd2Q<WzZ5-qI@#C1J@O)hf2zXnwUFtU&*1grhz}!01az
z{8=zPP%cyC21Z}dR9Ol7J~HML**z_lX`mwKqO^J;+Sah=;ST7fBf*1ezjAQ$ue46i
zAw3UrdrLvW6R_FEH?!zf7a*6qkNL70<D<`Ar&@bp<!JHx8~!quU$#l#mLy8uuxfD_
zuNtd;m=|;K&1V^_KF_a?s!M6@XxR*&35lh;^38k}q`1w`!bFvPDjbc^kMi=_6Hye=
zcFWVAMlote)#<uOAgRKNkGD1DWcVfdh#>TrkPvo1gW^Wm^*p}h4^=X0sl_Mwz{k9c
zzJ?vw&lWFa)$0A0vmnt*8oD29ggWo}UKe)&OaMv2#7$xC-D&-oi!>~%_Ca|YZ^=5g
z%eVFetsr!U^{$8le6Nu2({BQ}-y+aQc=`97#6>RcY0DHb^Gd=iyQ`ZIYLR9XUnr{=
zvR^2%{ifW8tl5E<e_<E8R)3s8eH^=bXJ>YJ+$DCfFVbLra@3^?6@r;a2yoSq-T`!&
zC{WZfIyw|oKZmu4PI0xWPd*}kT`^aC_-aC(jCBe;UvLLr0`z(7y<F{f(bDZ6bojQ}
zZ%0urj$a-Gs{EXL^$`<^E~q*oW8FcnP(3!Ob&$1|aPuJcD@Rl<7kdOPfv4|)L+Zt&
zORnvu<ME7%zNSX!`<#>4MXUlB-L0d<?jK};V+nUETj?10Ldx%huFvZ&f_HZd(P;oH
z+9wlTxl=?^95JeF9hsbMb0M~gyVpCnX268JfE@wud>6Z7Qk@AcumItzU%r#;m@3Pf
z&#UBI);`h{&rnQ_zI?orcqAf@MIA>H&h;rtzc!7YZY-_5NPa=b>T`wO;dn20ewsM<
zLmwJR@(bSs(5dfsr35?!HSfTQAlbjpol%{lbH=HwBoZm9mmgbMT!G2bOtRxE*f*ts
zMv=?7t)()h#w)Z*m+ZDQLOD#6t*@yN6P%pKB7|=LUJyAj+NVo%vQ;e<@UkIL)wCla
zoITlpDSnXtOvCe>-MD#aNiDs4kXvL!sY&+=)PdS^Gf$l832EM%#DdJ$G|ne`maXyi
zVV8~414#seaUOQ8$>+Q>pHA7Ved`Q61-9^-F4Uw+kY!#lDds)eS-E8Ng$}fnfB4Ea
zCzwP-b`ll9ryhC>Z^LvauL1JKF8$bEH~CGpM(zIGX^~7&aP9&n%Wp-NpsbV(dJ^VG
zzMj@!21hX$)xP`IMqFw^uv#ajVYvvWo*v3bN{ym>1qr$G<BAeDAsf7u&bvTbSL44b
z(_*(Cdx0*j&DdY;YVgph^*cMYPw-o6PTk{;$B81>H@P=L`z5ICh+$x>c4HNqobHB#
zuPtkhG09kM58+%j;ChrkLK*zlN+$ASwTySU1mKmac2wzfd*9OZoQ-`ByapHMbXipX
z@o4yPvI2D3qXe!MSU`rmG76F!*C{iaIb~%WY`F`n#AfjK@FPOfOE3th9@fkrYq|Fn
z7NY2sZOO-jBpKJUol(&=A5dV_gV6b<kE9-!wXP9kX7a&um-*De>mQ`JsY2~ea?X}I
z`)F@-Bw~qc(yi7XK95mVW7wweY{~F|ex1Z2B+TzHqvMr5A|!hfZPaPP|M4Z@wKUx}
zPo1n9cqx8*Nb{-!TeQ2nI+}FceHXRUTIlL1pWJ`R8Z?H2#5zHxmv@8FXLcEcSRcYs
zn9D;vBv;*Y@kL>FRRcw&+?z+@<jne5rqN3chjPl7VWfw9adyIAa=H-n$Cg7$aimyq
za{ord{d+E6f|6_zzV>_M+*>Nd9O#aBH2_N$BWnP;&ZG#iI_C&TCbph1jj8;Sg<?k(
zZMHpZ8g-@zjNQGHv8_@G7T?*>P8RW4pU<oret5DLXqg@+r<@s-w`ac9rQ!R+%vkkM
zcM5mHP)N_=OQ`N7{wcF`h~Nr&=v6`;jKx7_V)Q9}>{R^~q00X~2_(wEcuZMjPx+dF
z9JKuMwx?^f@dcwP-;VIdl~vWNEeVd>tgzG-_s$4x=|w7)aQeL(nwyiKR4Wp>leQbm
zIEK-&{N%zy5u@2<SACprOtPnllgAw3n9=m3jm_#a>0mQcI(ndwVC&;$chr*#>(c9J
zjE<!7_D8kd_;E(qXz;)lrp`>CfodjZY_rMoB><3*`ji@x`8$a^s&Uf@Jf_<v$&~2K
znSPH1Y$Y*{C6UC7Xc!fG&ZQ(ye?kVlfDU}X#8te+uh_yrLTzN3MbH39r+iX7DV6Z$
z{t9hp((^Oo@S$Zf2n%Eaoe|gO5)HKUxaZxEA6*C-eRcKZv7dnhmi+CUv9De^O{3r9
z!4xlIw$X>=PF_;%_B)CTvLf<wDe+Qs#qaInaY_=J@+F%c74ayH&T(3zz{CY3;j^-z
z#~10Y?;1Pt{d<TGFHhp2KdF!LH4+*(vGwib-pG*#d1$Y_-s~+b(ZYx<5%ZSp%J0H?
ztQP~QBn2&>cK}N^Auo)NLk)eH>@?T{^x8UM?N8Ztt$}pjdC99`MZ|q{nb<+xoS3J&
zdC^81hKOwyxo1Q9n|KyN1?j5r+(SRRWQ^9Hsc6pnsS(rT$CkW5eeL~M@@}q&woYHK
zoKhNrlR8jn@@hsLuo_<60xgKex#0V)lmfjIpT&hL6WdV=;RT;zFRK|(nO?6dCTz>m
zqq~*OUcq7Ry46HcZ;#J5yf?eiEjN5>*fM(O`^pD%!id+gqjnjy{iX?bJ7^)c&0k_s
zWH3;d?`c8!eEq)$(oJ98-)9HajRPdN9kbB`?q&W3N+D$cnLt1i*8Q=T+OSRYzLXeZ
zNke7y?$z^MoPuZGOjffnO9-1#|1iLIlZ4cvOj~vBe*V3A!dAoFcLs&Jg#Lw{pnI4w
zJj@>;arW+`X(%0%dU&g_pJNGa#{$xqkbr^Ps+~&AW~yru9<I7cPpTV6p!$~)aQLAK
z5+%&_<RV~F_dcPQ>gJ<##i!oG6EhT<>+8y1j@}`c@_Uc3^>Y)i2KO?SxCh-&Rq<8X
zL4CD%T{Uuvv*$f1cnjIth}$<Q+HP+k7NQJTzeC+H0Wr|Bb}?7BB~&vcAo*-MrD1kE
zL~L9NC#e;$q&%K7xN!wZ$3gJ)w}v??K(G}ZzUw3H>|*ZM{NDc#@AqWs;YIE<94e{M
zR0?KPI>(*jTmPoB32j!Bm5}orBkf+yU2tHVu+!;7kt*%*g=FB>FYSYR@$4_d`-nt5
zvz+{Lt`KU##KIcjH@CtZEfSfxr@pDNDM9>*@xHlA`;K+^19@WNXqLybS#M_kDKjBD
z+#0YP+ohI$P3tO!dBKOhEpeBcwkR;TBYoeSIU`M$+I2B^)UFBfPY;-W_8er=|51OH
z`@8G$qi>mI?Ljj;i1phcsKnKFAKuGNGKDV>pSSYz17#ufqmoDMT8oi4IU7&zLeMC`
z2yA1j1|po@Qa%v?S>3U0`~b!+OyiJMnwA&s*824{!dSZY8gWyLO@LpfKsTqWtnRzw
z`x;~tQ_CxR<^8J_ifVZ)tzPlJ0*)AQ=k(@3viiSR?1rf^aP=(ouE(>pNK{%(05T@<
zlke78;cF^6Szit<3{fU{li%BnzsD5`fa4+CuN!_keS<n<)FevUBn_qEq&`xk@rKVL
z0gyZ~pQH>wpG3fjFC_fj<xgpKqjJb2$nw_~34pcm<97TWxuOz;;wB;}nIQpkgF;z;
zhSI|xQo~gj34oJGOp4FKl4~qKB{hP6p$`}Y3<;B{6#B;&1Ax3R`JfKB7nUUd-Mubv
zU~|^MBtB<^%GhB7uomy#$6Lcqf=v!FPDEwmNt~KVUt~1)2Y9x6m;juD_Z()0OA3It
zf&P$Oh`34AGJ&cLnc7Z%zF`7zEPT9|2~s*IN0=H!;wlo|ur*Ns7Wih&FagLrj}M1U
zvc1lQ)-jNpsK_Meb41*Z=W2!nz$y$UBqvNso~I<EtNVi8pTb?I6NqA&E919yX0q&t
z0>CkN4_jVR*bt&E18*vqoCMJyZp<b|aadXp;8hM0fTKxH$?~UFvXi7g>V$kL{{_X2
zfX`F-Y!iT2K12YHK}GL0_W-+<u5(TjZMnb`VxaD(ERz@WX*MuwX@~$EgGNP;nv_I7
z$6Ip~ufAK8OH?4Kxh8OxcPMWH@XCh*Kt=*T%iL79=tQfB^n^;n*3zqZ1SP4P{B)@J
zIfVeg0FW_t+sM#Fr%Hmg48f8T*wvVu4R)n9mq!pzkAJhmjUTjvrX?BxG6-`m11&Ea
z&YSD%ntIKGAi1z{#UmIuq)Y%(4?r-#kn3U%07H15ggyz$J5Kv@U!<&(E~)9;q>-RO
zl3epOW~5zTT@V0y)B5x9dCG10rkBrV9<K4S{v<G0=O;@F1)gJc{QMi~&l{5l<;)5@
zO2s<&L6Xj|`Gx>t(9|i5=Q9*xX~;H!FBBAjCVycn^moL}km9mDHRW>fC4HgkGB*_(
zweyBM2Db2)@!A6NVhMoJ0PvSGq;wc2E=|RzMeCQTz=ceYOj?c|yjQr8`-<_7X(+=v
zX=uVomL&md_0i+C=JFUy!!X1`CsFxhg96Z`WsV}DQM}d5y^)-hxKFo;kar4+fQ(Y8
zpFPlBRR{nbC}c8BqDwJ>D#FDajyRDXlRSQ2(WIFL!Z{d1hXw^88Rp+6HE%ZgS>?ux
zXzGn@Xnc!D5hDD2cn@<#p6v?`KnKq(Wp0D?GP2kaIyjvS9#%eyE4mVutkenT&k70v
zMifK;JM8_1^;PpwORluvj*AUma**U}7<LBc(yS?<0dn+PNV0j&%PpOX(9m_L3`Lzc
zd`a=ym`);scg!1X3YHImm5}|3Ru6ods8DmoX>qC0mS>#QtvF1WKLN+Q#ie<`A&@zw
z2UBLajWl`swLO{|SM%0M_Lih=n)&Mn5>Eykf-3OL?(2$jLZ~sqc~}X;4PLUm=1jTP
zmR&F~H}*sP45S~u2e*6<3;Tp7WtYz)gV@ofh>SF)8vf>8DnZLn|1+I3!voovJH6>^
z&Ls)ZJ_#!k8(gmLCTk-A7zzYHfMqg_J{N2878s&H3K!2Knh!<hDzbQip+^D4>VOWY
z!gGh@`N$wt6ur&4b0D29rc*@?ka@pIAZ`?tk@?6S-zl0g=>hWDq5Y!SA~bsh>^zQ2
z86A+Fig%)Xp|cGWZQeXD-kQH5NYc7Ae8mjGIqHU>0AyYd%F-?jWL=Hk(4NS{kUChS
zl#Dq8)RS(OWDo!X;nVOyPmhm@K5{c=rZodAUKmbc_-W2V0_G%C;h7^c;m;w&QA|yV
zw*0J2*L<`ghO~TVqAeHz$<K%H_oRIdsk>?LiWl}Qm719|F9Uebpj<)u`Lg_sD$h9k
z-oXGUYzeX;xT2V~n8d_|T|kOnm!C1wmYaU72`Uq9-YPt&2ULXRvOUGWq5n+xAmz{3
z0<-*dk*3_sND_INnY8#h^scSWuAa_fZV`x|4mwFudnBe-v-x;X{I+P)oVa4g;vO0R
z@Nv){5YNmY0OPH>0O)HToRdYasSuv%-exap+wdp1V+aaVe)Lw=(DkK%<*OS*uWtuJ
z+amKnNml3PI8#c40+7k<OmP(^Fh2uDdLRSE0Dnk_C0kPX$y>B)gHrU?<Dm<h4PS3M
z_caeLDl6Z0gzO2z*i(?2fOEhq$YDPnT*T*aAwi0^coov6cvGUy*|{Qb58BofumVty
zsXT7#HD#4mW_Q!z(%Y1Kb%7?8Gz*9mn7{`rKjw~AsQAO;d%1r_Qx)f{a6ehNFm|#0
z0RKl!mkl@qOo#r6bN~t8w8{_0J|AIvMEOL~_#P$UR3HGNz&vo?tLgt`;u*<9h@;7J
zgc(#X6krHxJvIlPgg0A^ZaElNdwRX<N``KAIZ9X!J^uYbshn`;m}(0aN1=doF!JN=
zzpU=V5P%H^z=*Oz=A=Rt$?K~i9|oO+G5;F&?>Ee1Ib@RwbwgBSkcO#<F|+el*!EG-
zMIetbq4zV*M=cA!WScq-QH{aBA1sS8vopdG=<Tkc7uE3m5%YkSSZ)S>c9G$iL|bkz
zA)JD}-kgd2bn}C5LqLB8FG-1J&NXvrc%y37tJqJolXSf?%)*=7ol>yjCDL>R(GRe2
z6Z$#mO2&PBh|xiMej(^iw0hT=scjNYXJ!T627#Rnq}W7KDDk@<2?iU5<T{C1OYRvt
z4-@d*%lH|%{7inA8<MW5Jw-L8$O6-EgTBAS><Ke?V@6L?KmeK~;;~Tt#pRaVLS+rm
zqKuMWr?bJkD+5OE#j~S&n*#%o2k;9?t>!1f)P$6>^&yVA<l85_V2;K(0Y(F<yBP4Q
zD(+X|-DF@m7WMI94<@qjcgaU!$@wQ5!)`f_3<y9@1Ll$HLK>cbzf)gOb6NYR#k(s-
zMh56V3;QMp-G`-}D9Z#qcOtHI=s<{=Pq(%~cNn}b4E4X$kbV{fKsw=765{BIwZD=(
z^HjP}b(yV_7@l1sEDM1q;hFF9Bw{~%A!&h8)xy+OTsh2~e%2;(rl4o~katuJc2UY8
z0A%^sG0Z8hju&Hti1;SlkgFeMh%=0-kh5^ZWk{at{p44a6Q({NH}_@#O-af}G9`dr
z<ZyYv(DFwz9F4ES{={YV?pVvft+#yskZmzM$4iQq3g=@W0IKMb@f|Cy6LR_?gxy^?
zkWRHPMm8lBdN=2kEPPN02w0(SGTzC<@U%W>)bp#s>@Y`034E9L>y8<Ue#kh0`l~KQ
zlzydkV2jVP;^zX7pOK<$FZcC?s-ge@Ql`U(BV0u2TaxniL{}6iw1mp>vP68okz|{N
zlwaMKR}0^NCP%P(POdwHxUx+`<;=p1+~8z28!Z<g1_I#eWtNBoKs8_v)%lHg>&^`;
zJ*MV~Fo;Z6v!w7t03ch<crtbJwxf&cJorlMKmh7F34;jm{CnK|WWfv3uefX+JiC$s
zu;${yEK$0D4y-5ZQSbEP7=ts(E+rf*1p<(jR)_NJ<)wv})JasLRZ+98_P7&eQRepi
zC_gFUc(y!50CFm{3_3d_jk%{!x)JKlX@b(k0I)M6KjZA1mH$QnbouEFU-B1tVd6&f
zAZY>kNt&_)B!@(yonZoyq&NiO$B?AHDy!RfUBFevj|V$mC#4&y)ilvkfdF&~yE%mb
zsE(llCcaS@^k@k;ctH|q^`wdW6jIM~bxra!1OU<xym*@do{3&Fziu~Y?Q%BTuCB)b
zSmG%ETkv<auKb|-HK8ZjWl{EJ@aYK?-j*{BySU1`6He*{pZCDmWG$N#ME}hI$j~S<
zL5+n0&q2Q8(5B`AY4wwfhC_I!0nQp7ZT5gy2mtl1m2!0}-ZdKU-h}t^2Fpam3`+^`
z+Ncyme|Y4Bg1!b2xcr2ErmrCYkm2y;=NpUnzsw^=R6tyDHK%2+1$_*9I1K#_-1B1j
zzgv^bGBp(a?1`_hwyFWfpTo!JE@$rHO<(kGBjw1z@<$-YP+xDrPwuqG&vG>c0J`NT
z%`o2i3iN*oiC^(Lo3vtTb%{aY`<3uVb$3%R{XqaI0h&zssUa60H+CZ#*=~eaqAuqi
z66wMugR4jYbl(LhkS%l)et#0bzsX=#==_4KEN(O4C%gMv5~9b=LaImr%%q(%&!gF@
zLD^owyFX^c^W_XbA2+#q)YXRXvEhZ-a~BbSZY&+|PwC0@D$AjlAluCgWw>XH-(QBz
zrhP1b%!Kn734pFIrTk1l<HbXyU}mZWBd?+FLkMpKt?A9&HfogufWj3=Za9Y<n{>8u
zct{iqk6#G@=-Lo9)WL?AZxr;p{CuLHJa#1lU{*IzRVc>Ut`DeRY%LK0v+sc|w1I%+
zFk2yu9O3aR5dhuyQ@6Q)nGHSb1L_o<3=4oGG9n}NY`;N~Ya)c{Giq33xj{_wZa+`T
z%D=hWT5#yT!4m0(qRc6T9^<zffRdEL(0C4~OlDza{J1<cKwi0{(pt0r&V0@n#-_36
z_fVnSB$DONVSv9=S3V&<*!+X_emW8AoMouw7D8r1YJ%8M1OS#B>bSQJMcF39p!L8A
z080<RkRix<&oDNTA?XXq&k2lM06<p$d_&t7F|1w*Ln}veqlyv&kh&)uJ!ce4l*m33
zK8=8`xBzqjzzRcP^n_{goq3$UsYC#D0Kh5$aH1hE+H1hppGOXt2!Nviz!`Y=ho;e`
z^XN_*{S!w(S3CfgKXH3#?NfhR^U0!rs6T1=;k5JF`@~Ieux7YJaF1Dy>&l;3UN-ru
zC+^s}bm!e?6@{D@>OWzq%jN}X1O)=H{PD%VvwrEnnb5iLV7*^=+K@G}Q7kufccBr`
z4H1B>1Xj#FaJ-QTGbV-F=lx_%|Dyf(YR88mpF!R?!{K<Dgclirp@$rM-GdKR^w0aZ
zb^Qwu-=~4!0oi4G<#B~90&WIC+V&&pH&QdR);ay~Kdb3qaG*YIK$kX5r8^C!ab=+#
zeIo$80RVdpN8C)?p8Ck+Rgp(F*QFQyLw(o`Kby_ue~elX42d9dFaVOWLI5~(jI(`q
z>-YQTZ~q}lH1`|elN@onfAv{R08&mZwX9jTJ?oJ>?4J2Q{r%4u9lDQGfY%{!nMF@%
zDEdbL7z}{U(*Ma`Jjb!)bM6VnAOG{(218C*UMz;r8v&4{L;w3^Ys`;tvyZ}t)Y5Uz
zTBEyaFyNH{faMEsw_lhGA3W;VFVZJUuQMDUi~w+O09FDB^#H<i2OqO`FT34N{p1H$
z?7uCw*7Y`9b<xb_dhSJc1WO43SP1}50RY#YecIai%xF8(T4g1UF0tO`HBn(h3&!sf
zL?r-VB`+@|ZAqljdjBu(wvIPd*@^%A$FBZ~7glA;|ILcb^CJK(9sslabbZZMCkcCg
z{j`<-n}=MEKKE`|^3wq<+j&7Wug{7rmaRhK;RXR9fxqN(i?tK_!wf!PwDG=2t^R#;
zT>VJ^<tzZW9(ou86*AYY<{aq_1AtWk;Bwwg2i+H9nalaopD(id$rH#(6;g@tY?QZK
z0)S+9$bwg71b{;WAOjF~FjZ5soOJGmB!rv)r6DBbc^BUqT_gZb#7_c0+-H)LqKdLY
zUl~e9CVmf%VJk06_5&~oJx3k@*5JK60Qg9sN{-UB9g3WXQ9%*te-F=(@dGfZ4@Lm!
z0k8(W*~g4-)oGXdj@;{t0>b3sy8L|j4%rB5h6%v>aD(-k@Qp~mujJs09l|0Y<V2)2
z!*`eqTr*4n)}UA2#;_xub*F<-ulepzHUXQ||B;EF83EuB0a%SW&2|QYN;IzIyK1gF
z%C*&A#+a}tF(e-qv4OE^Lj>R$#@9iAib0p|Rq#!@S!jN)Ith+7Ju>yLH$k;S0pKV$
zA^<R<ucMbl^thrW^ZUa1BSrA)ko*w<1_vPLFpTp`NWx1*C4B3O?^hfuDUS+6at7EF
zyeg!Rh49m%5}(IVmSVIm8Mpi?09iYXWGO7#Jf>0rmX|0m6n?rOsi6jdA?V-8x$U=#
z?MnzS^Vy*j$5oP25<~X7f<v-?n*nGt!lq&PJ13wL8U~sB2`$DoMMkJoH#-|Vrc(U>
z7@ivw6o8EF!*|*H93Zn)caz7olxXvERCRtvLTKDnxVS_uGd)1~>4E@|i!RtO4Z6+|
zOnirgor_*g)6u6G5QLXdvI4`Isl!oxZ}bQNg9DHOhVP)|CS|xu7$9<<MJEeKobc6s
ztA;4eTW1z2OwDTwnwX6WV+i~_l6`Cb;cGquBv!g>hw#;{@F;>cl^e>y9F-*!U>N{_
zA-v}u&Lgjz#wVF(LKu|x@uXa8@Ob;A;YFLXX_|37yG#;&MnHEH0Fs*p74}6>lLsnI
zg{C>;gtSQJf8oYl4nMPSNaH(i1f{09oQbmCVDc<-=znG2CArG}d|Am=kwo=yLpD2q
z8zZQL01)r0#&ciE>Q>X8#eHlHnjKWn3pHsc(<+&#!iF^hzyJVb0uWOwWnL%Dm_iYo
zj~!KpU`-d+)tEz|vpy&Qp?f?k^NjGpT*}aEWLZHYijm51gK*gOHhKBE2EZqSP6N!!
z`IOi$zz%ynD_Ir@u~F0G3OJ?bHX!_vm)MK|Fc?8)HJpB2sJUdglS;qp<A_Um>5w^`
zA)2%X&uzUHoFQ~tyd}fVBph|ZLEY7uL%A^^M>pB#Er@z@33JZy%7`HJ6x=@q;J%J2
zPL@7J0U`_#GS}lz&7GZ6+cMWzXMxHDp7OvnxxdW-1b~=Ndrb0elWpEy$IlUW-NzRf
zZ5~J&W;UmpMHL8usN@GokSQ!vN!1X9AMe^~?=!z`a-~C$Vr$|l34X8bZVCiIUQcjR
zGXY#~$({FU!bn-D<)be%+cBiq*u$*8%Ol$`fqFnPlpdD3o@QnLZq1D)+U$`Q^>~Tn
z%$?m4X$%a&>0xu~powwB2HE_+ksU&esorq}GAalF09X=a9*!z9q#R~`)zfLJGCyx#
zqRnFxfP4yDD*8rxz?%b*dtj*SPh@*VPx6HlBDH!TQ>Kto_Ns+}kk=T7q@WzlWAXi?
zQhC{hhT$QR`CiIL&8znyBTYH1RwOujRY;ct+*85}2X}=Vz4@Ic1kxNWSJa{?sTM}U
z7N#1|r?9mm@Kp)F%>cw=gE_D7^Fq3$TIKaA)+PTuPd@MS@xz%3JhS%K1?8tR*95%5
zd&iQ#ea1dTmf5X%>be?pNg@R(#+Gv?g2mnB4nPpeoZEK*z?8mnAbJC4*dDd$=~Z+g
zhP)?*hP#gC3VK(_Z#w|l3(P?)?i8{iz2U5{hw5$4WhM1fc9}{zi=UH%^3$=B(3{oc
znbTK%m(nELav9qF+%$edNeqK&JpVB{UV`3M6wAaL&f%??kw)*zfop?sQOEP_2xvMt
z0QpSE3Tsj!w<Y~n1JGQRMaF>x+{4maFHzr6bR`diXsjjYaud?izFE)&JOe<2;5G8o
z$xxh7V9Yj#d^~w-x&YhB<FX`&X&@LgK_#XZ`=HM)f4nt!rJeNM)O58iw}%!VF=VWL
zg|$wfM~{Fm7yx<m_Y64jb8`i2hW}WRHR>Tr94?b|bH4=7Q9nGt%Bl`J{}P5&BQ?--
zxK|Ce0*1IIt<1yNY3_+j{d&1|5WNp0dMuHk)EEHZY{&^ThO}@+tA*8o2I#-54kHLj
zls+IkY$3rAzx4oAydVySk9q)!H*%-^m7s?`VdWHRUbOl&DtkS_ciwP|3;}?=@OUx#
z>11xz)0E4CAM-T^{eRf<CCV^^>{^8Yz}!_w;gx0ekOR^a`sch|iWOf|^s?t8&ocm7
z-CJNd*a!d>F-<r_tvVh*w}dlinmLXZjyQAZ?t%}WF??$i09ajU<>w*CDd#yV<ZDB=
zojrlbcTtPk^zOOBo84R7yMCQQ;{g=_xh2J@99~7g75Zac>LQk2--4*y3zTI9(014`
zCcE$`WC}0>K+7*=!XgXPn{e(0%*_~np7vcAnnEwZP<ckayutHi4tIS+X#IZuE<a$4
zHJ+T+u;EJ{?#l%z(3@7rU*s+1<<iUX{ZY{tD=*VlfdF(@<#?_d;C~%|pX0nVVt4`N
ziVFOnbi85cK8oMpAv3AF;?Bc#H3GWA0q9bL!MPP^;giwgmqW<UM{c~&@!3Ai(_Vq&
zXF<lev|X*4`Bsqt=w`xkf07Z#5c2TxXzLT&08nhkPtLVo;Qw77yOzu|MFODv92ysC
z(5A;SS6IA(_kYZQS;#?@`BnH}2Fb;FAxuKHd`19RQ~(M;p34!(jpg1<&rsRh<W;cn
z36=nWmRvl|Yqxlz4Z&u_5$?da0bdCKn2l<NEe<b~fvzfiUg_#Lw7TTe8v$T&`Tqe>
WTlh~mDa^?L0000<MNUMnLSTXw@N$3v

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/seed.png
new file mode 100644
index 0000000000000000000000000000000000000000..dad99e5b3a515cd288935997e72a37043bedb186
GIT binary patch
literal 2826
zcmcguTWB0r7~W7#dZD2uAW|DVPQY6|J7;ERXJ@8elXN$2R@@r5D@}_JIdkSrGGuqo
zI5Wv^(g$NusTZWaND&dCAT2_vFBKGQLEqGessSJRplDu-ctc7BC7#*KG?Ao<R$Z8#
znKS?SFW>+D|M_1SIdpLQ)?Hf@iNyB8aK6OvAi6ep^8a9V_E&z};td}S5{Yd+(bbW7
z{f#^M+M-h)4M&TQ8iZAo*kUG4)~g<uP9*mA*F8)oX$VX@?zmau#}6(Fz_GHzk#rFi
zy&RozhG%_xc=k}4%uW*B68awo`|1W)P^BRT^=icpjCxjR=r#Crv@8msArekzg~7-m
z7%h%~9P=qqlL!)oWRTI5lBy^wdI-o!Mj}d!k_;u)K#Cz{K<g)PYrbV0rTl@GE&i4j
zCc@A&M6p(@C2Of9^T$O=*L4xeqAWu$0fQMg#C7NfeQgbS8W7*{LWj8^(uhqq6=ntQ
zX)}bX7prxH7EBy4v5q}aN}?#FhM+}aId96ZG>ltBq!n7FZWwS`DVFsnSjd72wub8X
z^9lnT+F~)bv8pfCYHT71ho*TLEkIV44$3ng6-zW=Q$C?X)7;Izb~Hg)qBro|z;-U)
z*z6fOpW=}DWyUJ)ERVF~1+tWs!Tm=Z*J8Ecfyi2G1I^=*W(A&d1tJB?dYPwOLPlEK
zgJc7trf88_jy<zdG=<8NZlpOoQY%C`-z*&Bb%iZr*vzkDj+Rr!<5cwAaRJ0RFmkNI
zd~TR~ms-AF$mK?SW;+%BAt)W(4+=v$Rnk=z%1No=Zn0<-+#tj*p@n=_;ISqh$1+Sw
zQ8ZOkp{=VJrc}j(CQa*5vDAztA*{$qZST)BG8OSB+TScCixIBlhI<xGBOOaR)D(+A
z6DtUss!m}lqnN1-#wt}}ZIAg5uV!3Xt~K(?;u^J7DwClag$mUzNU(yTmgZ`8iBR2C
zGHJ^sQOz`HXbd|6&+$yF3J=q#T2B=RG?-^#5>-@IAQ2m=CA5~ERq)u5<<|b%1m#L^
z!jh)-fZ1UU`*d)eW4A5~#WkI0?lkq6x$j{g^F~JfAS>8DtAdy@AY=f0Ud16e3S69a
ztyZ&$QzfivC&1G;he)A_nw%L>Q;7{FS)owZRNgTOwRKBUbfRl*h*v@sR|its)$vat
zYQaw?uscrqF(BSTFp`y$Q;MxYi{LbrBqa?sNzFjpl2pz(&c6&V_okO?1aqU*|KniD
zx(rw+=@BntlB^AyMSW)(2bS|Jb^$aP_wU$SmvQEXn$-WEBr!Uoo9#yYYbR>H=bK0#
zh^n)3iW#f*oQ-mjA8Q8hxN#5uTivo{pWSNLjrv9-@MW_~dx;M~(PKP$@t1gZqb{#h
zpHF62h3`-BsqT|Pey}{cg<M}+>i=lKeE#vSmyNM6J5G0lM|SS`?$gq57k_&5kEi!5
zn^OZF3%%!melPvi{I^Tn&VP<(PW7F+nmE;W?AqCHJ_cQ2@4VeTcXaNR%e{j=U6<x}
z_4e(3_TKIRb@$zGpWQU}+VAh2Tw1EV3r=<7N_WR|cP#9l`{DS>MKN{z*UE*Fx8C1$
z5+;sr{Y5|V;a&G>s9W3lVCRM1`7f??Trc&XyE4$zwd1A1#f~R>=br4`F{yv{qG_Uq
nJ*O{UyL4vLfnIbqam-BEuRe3nf_&TYXj&}{9m=2EKQ{j-Tw#(&

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/stage-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..484b4726603eed07836c35f7227ed5cd68617c93
GIT binary patch
literal 169
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ0#6smkO<D?1PRu~iUv|lD8v-!
zhHCA@^<H<+yR2lK@@n}B#{ct!vuv4}UHL4uY!2{QlvXmx8f@--`2Xu}9v+2RLg@yR
zmRhd)Vt@E~Img;PPCPuTcbzomPCTWNZNlQ_oY2z7zz{ZFkS}7(_h~@889ZJ6T-G@y
GGywpUN;S;@

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/stage-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..cfae4038297a798aeb07b6ca015170ee48e018fe
GIT binary patch
literal 196
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJZci7-kO<D?1PRu~iUv|l2*TNt
zWyf}-Kg+ND^_e2^;lHKoF2$;oMGR-2ySK8RV2s}@DRF-Na+@ETW&h5oosxA76A5@z
zq{1vQ@rH`w#M=3B#~rp=rex}L9OwDP$$hezh1>I9o7TJ!d#5x${A}G47N@ANTl%1U
lYH!<t433^Q22Mo=hRk_ltBUm-9D&Ya@O1TaS?83{1OSc(L-POt

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/stage-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4e2ac9a39949770ee9b543fbbd5aa072924c515
GIT binary patch
literal 243
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJU7jwEArYL(2@<S}6%C}Az=X3c
z%Z}|vf8+)18+4w{GIp4DxW<R~zVSgG<!Nr)zMRlcDt#E{zKMBXm9fFR_<qSRC-@HM
z%8I5s^fg$rxCLLVc+@lNW=jD}p_M`CL>bl>ZW3%p28+5U9$J2baY;m*udXZKjymz#
z6PI*Oe9I8<r+H1&#U+v50lr~>M2{q=9p>ad>CLUfv0dQ&tPgvqG(P-n-NF{9sIXi5
npnPg?+kp&@o;C(fMFs{FYt484ZWlFyzF_cl^>bP0l+XkK9;H{`

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/stage-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..31054ca2c5ce29cacccc61534279da36f89f79f8
GIT binary patch
literal 359
zcmV-t0hs=YP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003lNkl<ZSPAV_
zJq`gu6n-nBAR11h<_0P!&^Um`1+)^`R-$nNl_O{*qEM*RDjGq#yiC5#?qnr1Z$=>*
z&6~gX{mt$oiock^zb9~5Q|9BL;?vCJy_!a7Z2ZJ%q>>T9;kdq3WSC>Wq&3_UlQHpP
zT678#%;YM>=?XdnO15ofD4#(0O2i_V{L!Z*oMi(k?~YSIB77{rXSDrpis+Gsgvsd&
zKmfwsQ8|B(<gr@|U{b`)gb)EysNdGHZ&qsoOgi5a;SGT6?4lqc5bGw9_Z-f+LIf&<
z<9YBVvISsr2tc*%4R$UsA{eL((0Ew<BD(bAto1{PhR{_k0QZh66($yNIx9+4sQ}R*
zN7>z{E7{kuDp8)kCPep}Zf&+c<C&hvQA{8v5EF1n;0+O)c1PUS5!e6#002ovPDHLk
FV1my}nn?fv

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/stage-5.png b/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/stage-5.png
new file mode 100644
index 0000000000000000000000000000000000000000..91014722a87cad3fdf4fa55203481c7d0b6e5fed
GIT binary patch
literal 545
zcmV++0^a?JP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80005#Nkl<ZSPAWw
zJxc>Y5Qg6iHhxrspyChE#y=pIVv#bIf|aHcY%FYTEG!IIMQr@2B$gIpBLq7u8*Q`_
z6$EXRD+J>{*(`S?A=x{Fh1@`HXJ>cjoqcC^BW3bm7#KWL?N86r4$#@$*pq}#ckRjA
z1$Aoxx%IfMCkYUQp#1u`BAU?wU0brYf&JD!J_+>sY$~iO0HE|P6^#Qre&09NoB2vr
zDjX=V7XNR~cWdocy1kdmo2mt4k=Nd=1bE4S!;&jSw4<};l>mXm4F!Oa#PW$mLcxf%
z^CV%XBrw$(u64C*3F;?$km|KICj|`f;+-`0WfRi4l$*A}Kl3&T{G8qj>uGVdW{m5&
zFU;Ep#12C)Buu!uPdO4%MnD=5>gfYYfxrs$+Ou>NN{b)T@sMdskCJ%z0H-=MrJxr8
z1q=Zkfo@7uz4iyUo?X6i8lg9S@6ovxZjW1Ibha+xlP^>AI1s%Mw<QHm)B~go0DX|Z
zl;&m{x4_uTlTmrt=PO;WVRImNwJK&|V$^p3<BI`L@d^^#s|lNvU{38B0k51Ve}M2s
zQYXNR*b7OWKrg_Fkt%^W{WRilBvk^?PwkP5tH%F?ohJS!z6BtZ!ga&lTLcyk8+|*P
jXIjQU#z4kE0tS8n(Fe@Hi*B9>00000NkvXXu0mjfBZlsE

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/stage-6.png b/Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/stage-6.png
new file mode 100644
index 0000000000000000000000000000000000000000..96853e9790360317b587e6cb3bfd275d17d08c75
GIT binary patch
literal 625
zcmV-%0*?KOP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006wNkl<ZSPAWv
zv1=4T6vp44rij`YBB)sT2iW*eL@Xs;OhAHGkyEg+wXqP)VJFy_OBwBq1Z&GQX%s=5
zgs3Rm=$$BL-5-xHGv^(%cY9avz}>uk`)0mxzVFSN)niNrj=!*+Ei{k0-EhnQ2jf}4
z;dTgBSqKM50{eN{4r{0HTi&?f_4&uJF8^Ytd|V$Y`lCjFsz0;#AxM1eiGv^Pn32!U
z^wyJul!*7f?SCpI0MOOx-c13>PI(?c21Hta%ofiVwS^KBQ2?oZd$ZMjCm}G+U%xvz
zL~ot-YT2N*srk^?RFOP?xb0QVDfb#sz{msM?z#e0O+*2aT0db1*zJpEvnO3@p0VN5
zBL_!ztkQ_pQ*O|lRDedpV|<m@fZ#U-@ElSi1BrNa?}nQb=i@j@fR67hTP6!)AWknp
z6w>MATLI}SD`^r*0x{G0T0unKW68pg&=Zhhpc<pB7mj#Y`d?Q3YMZ?)EC3u5a|dSE
z|AuGs&vwn8|1Q+|Y}UD!K0T<V-vPim1*hDcH`58R;LUp{&UXQDBxlwyeJp=lN<b3Q
zQ0jC#AFua5c_R|5Sy6^HT31G5=pN8UC;|vK;MHrhmpA=8pxZD^=W8$KkqN|$xg9s&
zdZzWX+Fq3jJicc+J%9}xTh+j!UfKikiQ`xe80V_Ql?edG>Bk+F2q3?J&z)9OZLUN>
z-UEpW&80wSR2oM|T|j-Sd#C80Z((V7ridSe=Q^qts1>Lc7(s!5ege`M_{G(!00000
LNkvXXu0mjf06ZYa

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/dead.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3896d57c122b38ca7f2104763ae3e971726c959
GIT binary patch
literal 317
zcmV-D0mA-?P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800035Nkl<ZSPAWt
zJqp4=5QU@I+Spj7vq>q$1K4;5kLVd}yg<OxCY7lIB0{jRiax^&Z}X2@Sj>XV+qbhb
zvtRT)TSmYL7y%<-1dKorfz5WABZX1Z)l;oGAL(kb>RyZDtm|BJoAkKJgcq(C@0UYg
z)6Ch!V^f^%cgGRDpDY$eF$|%DP*>wOje93Yv*-|)d2EiR^x*|7znmjI-v(1D3zxS=
zfJPEuyi=4odGLXq!_4MWxm8Gf8V*=H6k{T~Ci!iH(9d-U6z95U4@xJt`A*Vn)A}c5
zB45b}pD$yC2MYXQKXi2xK#|A~rB*DukRSs>)fX$V+9flLfDteP|3u&kq4H?TP^e6y
P00000NkvXXu0mjf+8Ttw

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/harvest.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a2a7d37478ed70411c96a7ec13c09eae8fd3998
GIT binary patch
literal 440
zcmV;p0Z0CcP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004hNkl<Zc%1E(
zF;Buk7>1t;B`qePCep#U5PtwGlbuZb0VFOY?EDDAk8mep<R36~V|8#u;=({p#2B!K
z*3{vsob(E8EcYgt>)qGO`+o2DUC!`4k7MHGsO(yR7N7-a0a}0-aEO5R$c^P$70Zer
z0z>s2w?}ULSoe&qwMs-*d>=9$X!SQ4`NRKfnb;o+^4iLcZ>{^(sI7K8li%L>%eF2^
zmlGItM0Tyd8~2)?A<u)3ATK)(<jztAW&4BL%#EK4YKN31*mk1V+#GInMMkGp=ruj#
z=F5#M7b0e2r_P520Qm1PE~Z87Y{K?PI3Q!t@r=ryAaC^rc@%(YJ7AYm!?YcuAe$pq
z0vSmu8eL&^vcDVyby!Z|`30(%u$s*%n2?uDhyqxJ;@h7C#Wcs>YnU{j+=NL<5>bmt
z?AuljGu{l_$|1*9*y#YkYxn@y@D{4$pI4s2)QvfZ#ry|Ls`B?*vOiz{r@-DOJQSsA
i_I1l5*U-?=0Qd#^m#q?n0Ye4=0000<MNUMnLSTYM&dgE(

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/meta.json
new file mode 100644
index 00000000000..65cf434c0a6
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/meta.json
@@ -0,0 +1,52 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3 and modified by slarticodefast",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce",
+      "delays": [
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ]
+      ]
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    },
+    {
+      "name": "stage-4"
+    },
+    {
+      "name": "stage-5"
+    },
+    {
+      "name": "stage-6"
+    },
+    {
+      "name": "slice"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce.png
new file mode 100644
index 0000000000000000000000000000000000000000..73e458d8323eee85d5d7fcb11dae6c77cb798d9e
GIT binary patch
literal 1288
zcmV+j1^4=iP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000EfNkl<Zc%1E8
zK~Eb;7=3FSvBH@(wc~`+SP&FqE1+0a(}Sf74&eqjZb;mE;^0gFL@!)8a4CmMNV!Ey
zrEqHx&`Lf4s!Tz`fmT7=f{Tk|ds)lKHj~4!gAEjWmo-!BeHUyq^S$Rc-_FkZ`y@&!
z+8Hj<0z{+j4e*E-P>bc|Wz%z_!`l=9lA95!(b&<^(MzAz86ZM{6}S>{8kw3wsh|NM
z0DytODwP$2?N{?Sjm<UG!edz#@a*w69SE%Q9dsbDN}oO6rmjT1rMs#Tzf{oh{_P@?
zn-M9w8Ij(<UBuD5U+Ts*1JjqlMFED}u0)&$Up(hy%&dYL^iNDfRtOH)m+DsfG&Uzy
zv$H%i{y1tbp6LwepO{8uY6gX!mCFLOJR(yw=%1K28@6c_c2;Z|W59F<6n0i1e=*)z
zfd5Ogp_@WBwFh7cpN)(|IasYrbuv7TzgCvmm{@c1OdDXg0JAua%}LoroMuz=h)m6(
z!^=J|>%ec{&GRwM#xrez-2$w@h`;@+ezUW}Yv~+dr+}Nl4n9i;+|SNZH}L^yyFN#G
zfmXFV{_%g)QX@G36)?+h$^e7dJ2(PaVFwU)7&(Xhl)(M2HAb|8zbOOmXJ;t@xQP$m
zo+xC6pj6NxD+IDa(BWl!fFa1+6NQc>pLbIuTFKwg0Pgx3afcVsidDeZg%YX&fM6g1
z^*}{vI0Vp106<20jZ#5_o@PR<n$T+gx`WWe@&dj1-c5Yy><$6|BR|j}Q#VML8+s}M
zJ(YmEsWL(I7?6HKF8dn6&?NM95<Q=Pb$07)3=#ZN?GGY9e;cL#a34<@S0YXyjlIOZ
z2VoqpF9Bd_2!M<7$i0BC3&<DQUjU&{0J)<a6RQw@MvsgwUYi9X`0Fl#)7YHkE-%oB
z<pr8q+d%Nea}?EGoa8c`*xM6DrL@n<^>h+QGeI8oA~^I3RP~4n0uT&Mf`mNy{ml>8
zeRpB}m-c|aJHD1&i8%F#`;b}NfIr*^Z%-5eAS(nU<UwYOjjfdS>sCTfC!wd=|GZ&#
z6jZmq2XMY}jd0uiS8jsFY0n?-gEBaRN@*YW9)#H~M<pPi5|nj-3=Kh3D`%oUuvL(I
z*$U;0sFe0`lFI-9GHV-%j5X!Kt@8it)8J`rPRgeCpr?~K$z^bSn1ZYj93Q5T{*_%*
znXM1#@B#<xTYR38p2ob+?jWjKzPWEMfWP5wu&U+ZCO&xNUcQ-hb_e<EN{OXl?IUPc
z=m}p9J)J~0wP*R*+G_r54X8~;9Z9|c8P3*1863GZUr#43t^RHDH_QM-1OQaSY&EJ{
z9>q(6ckAA{i4U2z4IZNrk0}18j>1L&L&&4CmjHmGx{I#R6aLzOaqzI~>9CdjrXGfj
zfPemY{uq4KDXUeF#jW6%oYGjE!!ba#0MT#^5G_D7+TMUWSsk_$mVOquvpii35es1Y
z60o~GZ3T9g=S^pT-Q{Vsu)92OIs@!3Pn(6^<@q~T9k#nXf9I;h!utaNvDIPW{Q(!n
z++_Yud4=@{{8u2pKi~>D{Q*vYfYToU!08Wg`U9N)0H;5|=?`%F1DyT<r$4~y58yEx
y@rdGg`U9*8ary)PM`-)fm}7uw0ix0N27CllzHKQhA5(4s0000<MNUMnLSTaY&|XUb

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/seed.png
new file mode 100644
index 0000000000000000000000000000000000000000..66d13dc00c68a38d663d0e97c72b9cf4f02e17ca
GIT binary patch
literal 427
zcmV;c0aX5pP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004UNkl<Zc%1E)
zziYx!5XZl-KL~-i)DDUu2~^^c&8=kUCb;##@E>sQA5h%=FPvKF7O1P6L!?3^CA3o)
zLu@eRb%;+CZM{e(9o{Vu?k@NJ+`Y#U#yLlxc9N^Q1dsp{;6DJIQIZ&A=vfB8saD|l
z0e(9Hp#C^u06<xCBmiNirUKOp%xfFKVEfcmjKewHmdypk-sUKjjHR`DmcjM&(;xGi
zH3I-J4(BQG!}DH<OcM~MmrFbSPcI&tHDfgiie-L;dbtEsQ&H^ND0Xd_nwnnCGDZ~^
zMxKD%vN?d2*yY`DBQE?$16UXFIu;6=0sxqWF^v1sR*vHbF#ifbbT7oC*9oGvxYw~Z
zAhJw>JOR<!$Hc|ORUHLQ!7PkdK7%ZIAb_w&Kf&<UMWm#ke#QwJ{p3J-B7oxu=>l3#
zAr;&$delcqEk1pFC)XtHf%eE_jvtW4r;9JNN8WK(F{P*wC)Jj}<q|*wNPxTnz5(uO
Vk6kh`0mA?Q002ovPDHLkV1h6Wxn}?X

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/slice.png b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/slice.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ef34d39ae2bec6e8ea912d5ca4846f8b5568890
GIT binary patch
literal 378
zcmV-=0fqjFP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003&Nkl<Zc%1E*
zv1-Cl6o$W}62U-M<4{~%DA-W~8N0f6@gW>C)F*Js(1+;aGdLDXH!Bo$D<w-_z`<gB
zJKWr891^jj9qxg{O-SzjzyIWLxe=ul=Zwl()h&PpumBdo0$2bGPzE3(2j!b9iVIQk
zdsKSZIBEr^4b-%O8m|FAV42KH=hO}r+P)vJ;l2i~)Xu=sqw94_*D9>Qe9~9O)q_KJ
z-KuCYlLJSOk6+LfoxoldC<Ji54!1#&6EQBE0v|tl(NR5}=m#vqHh}yIV42J$j(VBE
zwje;ax)B|&;PpEXzfTnQfa`U18T~*DzC6>dZk`WU8-P)r?7c<UhGbUi9zcqY<s!m-
z(g$?YT}7XTi^WmTe0MPhE^or40FW-IOk<f6?=)J@_4VBoW&a(80H=umy%k#k3vi0~
Y1$lO7+q!9PHUIzs07*qoM6N<$f<`=|AOHXW

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..f926a279dc341f418328f357cfd06e297b045e95
GIT binary patch
literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJR8JSjkO<D?1PRu~iUv|lD8v+}
z14Y`0|1%b^FS9=KiLsF7Oi|R2d7To@`|l~biB@KDSTQ`Smhhctx}$XCgK14CV)n{0
uCdRM_YAd`6EHYtnb51Z}X$$6HU~qWH|NHygg{eRb89ZJ6T-G@yGywomx-m2W

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..4213fc32253074ffa600dbf8160dcf99334f93a0
GIT binary patch
literal 177
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ3QrfukO<D?1PRu~iUv|l$V7uO
zi_UhVKkc5G+l~LQCrZrEGdUr6LhSI36Mc(!CMQfgq_b%CQw49)N$d(Q68E)U+)~0K
zd`2k7M29QEM6dKo*JgoB6<@1ZTuzn>Y;BtGDe&h-0SVqlAW@~rz_56dl%zXv{vV(l
O7(8A5T-G@yGywqa(mK)r

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..69b583f4e413fb00c6df44ce360107a31cbe280f
GIT binary patch
literal 291
zcmV+;0o?wHP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002$Nkl<Zc${NA
zaNq#LKmw)#wSCk9qYfB#z^DU89Wd$uQXEkE)!{!baa?j_I{@9l?Bfpq+qn-gVpH?!
z5(5Le9K{Z3=RUxgeH`J4uXh+25*DL63Z`bNC8}Cd0VBQ!N%nDv|6lJgFf53L_%LCy
z!~X@b2N)9;JN)NXVPKeQiSW7DYlr`@L`e?`ylDX00tN<%Ltu_TmOHc7;s3SU5SpqE
zzy=n?Vg|WM@BzjL&mlC`9RTw+vKXHpraE#gC&~dZ-y-{(l2nflSO_V&dOZTdxX!@9
pU`Z`&5dd#47zLwX6pR9T005l_WEYdsFz)~W002ovPDHLkV1gf~Z@&Nl

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..c496143bf673afc991370599be685ea9e5e498da
GIT binary patch
literal 326
zcmV-M0lEH(P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003ENkl<Zc${NA
zaNq#LKmw)#wSCk9qYfB#z^DU89Wd$uVjPft+~GemjZF@hJTZU~TXmd$+~NOJ%L9zK
z_}CnQOP&zG83GB55kC5Q2bGU(@z*=#Th741z`%ko0QapW!qNq?5DO9(JN#b|dw>z0
zCf9NX1{_g<4A3n>4hfj}mopCkoh%_@r+$;>AiRk%`?$mZpKnmb7Q`N4<W_;u35y;6
zo3T3lml0!NxOEqT%~(lGjCdU|)$#!2^1=g*k^QKKe!YWm%({IH3{PGm@Vb4ZSWjdW
z{CvZ}z%GIaa&++IFv5W{wxmS?Mj}K94}M25Fz_=lF#N`?hEz+D0l^R$1*2dTi~?E%
Y00*#uA<3kC(EtDd07*qoM6N<$f;tt0o&W#<

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-5.png b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-5.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f9dc48217dadd897156301db815ae99f7dd2d2a
GIT binary patch
literal 360
zcmV-u0hj)XP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003mNkl<Zc%1E(
zv1-FG5Qcx1(2}&oOQ+6;u35e5G1|f4-BX{WQ+I=hK0;Sz@=ItanM0vLj+?}w4sIgF
zwqg+|S?&jO)*bTy=}urKguo?rby0T$AOHd&00JNYAAq#r+KzoSSKUXf?{}OQT)#zv
zxz>FUuKJLi9Y}I>qEa5OZR1j&Zw>&XcH(f_$e3nvW02%rXR%=Ic&<6%7=f*}iQS2P
zezxU0cz86M)B^LL4==EjmoP23-Yk!ESuEIX*u*5~dbZ^{n2rIpFwY;94?t%Gw)UfV
ze&zc8#dM*R0HWqy)c{siXRoROTn__yjbO6`ZthLXZG~&D??yl{9UpSvs|u<H<Yf4M
zoa_JqeD0or0Kl%lE+>M8Yp&H-)yWTi8}R4=i9{m(w|)Uja*eR_cr@Ao0000<MNUMn
GLSTYuJ)r{t

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-6.png b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-6.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7a3cb45531a7bc433aaeb954f4b0e86c252838f
GIT binary patch
literal 398
zcmV;90df9`P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800041Nkl<Zc%1E(
zF-`(O6o$VQC4dpEBq6c!1hjNhc>@v~6M7CoI0U^3B{!g&j@APhV=PP-3uOh?EFojD
z3_Hs1&c=pjzGO0)d71hDdGBr3lTva_PL8VX3^)VMfHU9>I0Hot^k+hub6PAbUIZ`g
zcif)|HR?z&Yn^5yD{dn*1HEzbqWSdq+7zBo|1S=3`gddh+D<IGdWOj$7U+$IdbpRK
zIqO(E5~@+J?(bOyA&+IdvD6ZnXfeI+4&#@f-+<n4M?y84O(<O^2e+RreBWv!w+Z{R
zI0Gh=f%L9!WAWZtsFp8Otqz0%EMJom2Gr`%^7EVXpadqm6y0HxYJk-f&;f039YFak
zJUAb1@@|i@euldF%qG;SH%&zws8&k*QA8Xp831_M+`%=xXI%K!lpelNwF_8&Y^m%l
seJfah?czCDo3JQpwYG^n91aJ-4{Lj&O}9lK`~Uy|07*qoM6N<$f;@(%(*OVf

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/dead.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a1e5735cd8f286cdfbb1b189ede7e41d816a118
GIT binary patch
literal 581
zcmV-L0=oT)P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006ENkl<Zc%1E0
zOHUJF6g|_rkwW6MQzGGEx<UCpxWj;P0Snj~*MtSeH7gfJ6WvK-*!UkXjV7dt2sAMW
z18t`~J0u!AE{1ct-^^zXi3=0wY<eH(-tXKq1u|sFkl|m!^5Wx2=g(K3MoG@Ir6;Lc
zuN}$UR?9J%n7C&UJ<m%$Fn)Ku*ZZj*I-j4Nj%*we&}cLbVyo3kJwVRyknHPxY;?rR
z5dr10XAo@;kdp*$WuHfAe*5Uyx<dpsn=ON=9hje+i8Ln(+R8qU(EOr%D^)WD3=WnJ
zqIO_xWZ2*&L0j1m+D8C@^$%6y@UY|#5wNwjZ4iSXNDY(o@WFlKpG;fXFBRRm?v;eY
z!``jEw+je@wn5z4si%fFzidlQi=eISQ*bxx3V+Y{VS@<hc4PAHw><zr6kQ$3g<h!$
z02ms&jY6RyecH-C1?O{l;hdhH^%me>4*7?Tc$vjM!uJo1oYoWT)sMze8ZTeJb+mgo
z802%YmVy5GGVOr2Z)R#TIy>(m3@@a{&sVy1fIFBcq1_V)Zua#70362w0JyGuC1C$R
zM7?^m>J0Q3P`NWKeO{_X+j1L3K&|!}0MO}#0Dx-slaT1n$w~Yj!|+040H{<d0DyY^
ztMqlQYXI=`$9IVx1`CfS|19?}V&%oE11JXo;BaH@TEDhgf46q+*$f#n{NMNmHB|)s
T^?>;h00000NkvXXu0mjf&TtA;

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/harvest.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0417c69c0ecee1f04cc91c01228db449c9be68c
GIT binary patch
literal 1208
zcmV;p1V{UcP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000DkNkl<Zc%1E)
z-%nd*7{@=SFxX0eK!2Q`vH{D0@@q_SSKfH%A7Bh5-g&VYi6O=fV_bCE^v=zAJFWmP
z;NA-(F~P;ibdW`-Ft)aA!<Ox|jJBJQtx)=U(Vn+&*WxtUoqTW3d*0`HpXd91zUQ1A
z?aGxa0K`W}gdX%$cjlZn{q|epjpIEW96hI@!2EDT=tlzB-v304kB$g`P^bRPr!wc+
zy=pnn?%M#KT)ZIqPjs^sUIF0E6MY2yUb0_)F04aOE?y8l{oVYw6qfmmx5B7#bx+p3
z9RXlw_>{Qz(FY=XseHc{;8yew0DWDZ%nY9rdVYtlP&>E7D-0AHs5v*oQ2>s2ha>?j
z-rwC>k$?5<X%RAl{IVLQE|VfJ3i|*yfS%5Fg1VQb+Yv%Wkls)SL7$i2P={>L8|sib
z*4k1V9~}{DjhW$7W%u#>4=}ejIqEaY>c|N!M^+F*&=+dwdLm8ceu`a66PS7L9iiv4
z<nzbm1oHV~9PbXvQP0lJBZQ#0D@4=dY^i2fCp*a$y4}ITy%i2VO36BsfW>xpZXTn#
zmF9p4-RGeOjjLx*i!Pr|&{dD&_wen~3a^AZF#H~7=jP>v`noy^_?noVo9BtE37f~u
z?2Sd58|<uRx5?`UZ62N8X0JRupiUsOo+6Unre$lBNB1{?PL{(F;@KTE-5|5JN;>H!
zmP~SJW1V!;%fQ&A_Vm(c!ti_e;pzgJL=#Wl9)b-H7VbvraoFj<JgH?rJ}rXv4P3hy
zrEW9LH;X$Aj!$Xw85kIw)Xc|eT7yB11_w_)K9-|VULN~eYY7zg!n?a%Ut6Qiqsz5L
z{y}nszEC?0Yiq=kCg#>AZ2^NEg_kI1nuH%F7@C;Y2F4~ew9;E?vlh9WAZD6G5+*Uz
z1W`!3_b^c?s0TRgv~wr3F4vZQ%>f@v;S~-$?X(39n(Yo&6DGB`8UO~zr?kx0rfe$m
z`APzTMkj;gQ`+5Biox+I&2YN`IO+??f&fRoI;#njYw1lnf#szLk?b}As|l0uZrx;P
zVp`i3@-u>}T7@KVpt$tb*A?=MXJg6I_yAu0;wx=vVp{VYsz<eNXkuD3T#cwP!{x53
z+TGx+Byh;>DkRnv#?~0{0WdT^rQLbBQLLh<P!#2IqKvc^)06@11xetb!(L>%TevFY
zlZxEc6$KidWu&c`br0pL<LOi-0g)>-)`|~~rd6ulOOa)tO1j#;1!vuXN&+>uLKBzW
zUUA@giY)sq(pF3rp{o9Cd#92>c4xP&>5tcMR1(=kk!9aMK~=3n68QPXA^<LX0|0)v
zLnb{>k!4?IJyj92psKEF!M3gXd%71+x=I8s`zTsvHOMOuYA#=zUR4X~iU~L4F#y&d
zmA+h-BGs1l$ECPs-|z9YvIal>`iIP^RRp#wLTo&P-XkqQxdlg>JOI3Q@+G<Vr*fvY
zrcmZYYfD)zHD5(~-vUL5X8jePfA{r&@!@=NIDh&3(*J-3zw^IcU)0%s>|-DQZ~P6j
Wx<N*2C<%!G0000<MNUMnLSTX!sZ3-5

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/meta.json
new file mode 100644
index 00000000000..cb53758e1cc
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/meta.json
@@ -0,0 +1,41 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3 and modified by slarticodefast",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    },
+    {
+      "name": "stage-4"
+    },
+    {
+      "name": "stage-5"
+    },
+    {
+      "name": "stage-6"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6ab15f164ce273e522ac19c0ecdfc516af0d3ee
GIT binary patch
literal 993
zcmV<710MW|P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000B1Nkl<Zc%03b
zO=w(I6vuz}&6~;0yfLYRY0^|lvuLr?W+6f=iVHthCAbiaAlRk22!dIZN)}OQs0Aq!
zi;J#8B(^2AlnQPPQ^7h(sT)HwB7_?2OiU)pBpK8B$jrUR#nY7H*m*Ot!~>VZgL}{a
zcmMai$9+mf*vYVVRQ>+|fQUSFcnS0MRZkPE*8eX6T!<?*Cs(V#ts^LXF?3&48_ZW@
zb$4`40NvmBKv8qu718~D()9Lw%3L24-QOqW)ig3W@xUB_(#WR|hpKf1=GrCE{qO%J
z>SlB8(m$R{gS`S!8a^j~uPF_mlUiD;);TMsFjv16xiyJ8`kY(n)+B3l<3tX<g#Yjh
zl&8Oky<PYp@1St|B0<xI@9dBQw$}R24pr6i)B}=8fHqjKzoihN5FcmPQ!kT`-ynbH
zG<HrQzs-UO!Ez_7bK?M*E2AQb#1>4o@YaM!kMR3+96dH7n->PjG(+xo90WoqPm%vN
z4jr9jFAh>Zu$Lz;CzT!>5p(k<zE938fZ~NSRju{};5&XoiMV+-2jK`9fvg2<pM6Z`
zG4QwSq3I6%G%||5JS@KBCltm|{QR^41mF3fstcZa0HFA4OfnX%uS2vI7P1!YQL~k^
zOAri0u4K^~F#zm-?M;Hc1FCrbBMJ5nG~NRM*%16Z4^1Hufo#qo0s-yjg?kVR!?THL
zWdvG}y+N>dKml8MTMndqVls0_5$hDPS%^kqK5NktHLR>aunC+9lq=BnO|q)swj9XJ
z!~Qm5Y0-5+1jGm;P!vVjf%LM1ir0#6*j^_Zf#N1uHl#Ov6tp2*u<&b5bI1j0b%d@P
z)p!4I;n@LWV0P7}qCuk&f!LFpRLRB|7tqwBTrWUNGjxP1qzVD{wN%Iy{bUxw;3FJ?
zyGshAA0a@Y1X|!1Ld@m-bnn^ZZl#HR;Syq?%@GcKSD*cL0ptsCuLwS+aI6Xoi}0%i
zaUw9a5WqCze?0(!0Hl?}yx0_VfEjT(qSg_C{mq*kOw_-7&j3F>6O)w!q{PqD<e4Ib
zUlfi5iA;n;6OD<3$Jfvp(70nac?=e9Z1CeogmyL>)doB|U<A@cc*R~LO@xE?27-kK
zwt1_oy?UZMCd(C@6gJBh8-v1qc4()_vE+2a_Im;l13k$p^<grhQiM6I{-7s0r3|W}
z4^Q0y&(GX%uy>P_DkZxB=q9&q`+>&)3r1rv)_nzU=u-NqW5@pucO2kP`LAALHbPz%
P00000NkvXXu0mjfG4REd

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/seed.png
new file mode 100644
index 0000000000000000000000000000000000000000..de775fe7ac9e55debb33d73fa01a9f019ea844bc
GIT binary patch
literal 406
zcmV;H0crk;P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800049Nkl<Zc%1E)
zA#cK95Qd*`8OcORNv4{qWh9^2=P;F>#$bv;p|Si7{t3w(y3G`3Vo6OC>{7u5g!;}5
zR#+L=jinQP%_Z&S-lun8uT@!=QKc>_b*}+xfEwUG09;Cvlv0ef&bp4nEJ^q-0z8DF
z0+1}ZQXR03q3bx@4u^%&HU@ye^Tg{_Nhp<40F1THbhCLhuj9G^tfL43F9_7B+M*F0
zs%=??*PrKeI<AXt%nsu00By_KwK}hL6w$UU)=^Y=|Cq#QAn?2_KWFXxd(k$glyPZ*
zt;tp|g8|z2c^i#(5c!;0lAI5q=v3ddT0HjqyslPX@}=_^1Hk^%Uxy)2%O!V>23Nfv
z@pLLS{4qdYdGp^&^cKvLgf5?5xX;b}P-WUL1}Iy6k*4CBq7h8uSV>RyB29@m8zyml
zatlI<4tx|8?Rcp<2)_k?smlKcYJeJ`2B;k19fNOop)w!wjQ{`u07*qoM6N<$g00TA
A?EnA(

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/stage-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..efdf35bb125abfdc8bb6dbfbb91d9c1f54ed2509
GIT binary patch
literal 391
zcmV;20eJq2P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003_Nkl<Zc%1E#
z%}T>S5XXNt)|e(J)LwjpzJT|>gd%v5f)xb|^-{1s`GF@39{U77N6y|0BH~H3)>KfV
z)qW5Un~e#nXimB8z%tD4{AYeMo3U-1G;Jo;?g~HwC;$bZ02F`%2m`blJ6@^)%lW0L
z3Dxr2zrjwbn~8@A0AAepsR@Rb1>n57`)Bb&As>m`NBa@Yacw(RBLG;mOaSUz8&ey3
z{%z}E&jV;w)?;~n=Q$EPPtiDM%*E=)HlXVw>9kfB4Km{0(B}d87z_chOd}}LJ`|Hq
zG?7!Uh#}-gWG$(^IBN#*u?_rgLSveGm<s^MpZv{r0a&msAifc)4S#n4aD8(LfHt`U
zVE8F~PU`{Cedqx2+P?ze%YO$LkM2c-S&=&)+yXH2?`18iee8CAsBGH~&gx3mOX5q#
ltXC=~(?~CmGG)q?eFNROrPhssOBDbB002ovPDHLkV1mh)r|$p&

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/stage-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c9d20af4cb0fca267ba449432729b8279823af0
GIT binary patch
literal 641
zcmV-{0)G98P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006=Nkl<Zc%1E)
zO-~b16o#K$=m(u?2j~ZFaEB}X9sL(&=c0s-k(6jjOk)BGH8epKHnc1%8~%bD)~?*D
zL<LG)%2Ya?eo+J01$HRH0#_`YcXKoEdGE|~&zwm{?C$PzpK{#m(`^77zy`1ZYyca;
z1^|ZtHZsp<q^h_nmQGm8ZHvCAjJVJgH-5L5&p!@GuI0txzLiu$h7~`W=c-;<oR@>w
zcLFdPCQ`!KsCLckbUk!UlZ$YGNF)fr`tup-_xp&aG9o%2;Ap>$skn(oFYA?xj-0s4
zznXm_J#HuS*$oRu^#6z~+ENw8>*Da}ghx}8RI4@4hg_&$7saxU(*cUlPc-1WcG`{f
zQ>i*#me)QPOg#u(cI^8B(&eV#*?{U{ZZ#)hU<N7`oqDH5-7wLAHhKJT63ydfA`+x-
zG%#B|#zr+XWrVuXu=3Gp2mno0EH4rX5*$}KuIQBYD#^EbVKhw4<{6`!MmQX>x@!SA
z9D+`(#o}f`c-&6nsf^e=EE0dQES7TH;;h#rxw0-op>aUay>L*gof1zi3jm|pBDt0q
zoo0*ag^VawYRtXK3$Lp7n@z9xi}~!j5Dsw@U~V-hO1g2|oZQe-?!7o|H<0qm(^Tcw
zto##N+$@OGb_0OpihdISKnzs@Xt(zOXms}hNGD?Q<-43nCt`AXAtTa>n9OeNh<+X5
z%ic!-%Jr`RIERk`_*VR6-6OlTBhrbO?7x2)7{Y!i<bx9v?z#@@U-r(v{&4GOY0H+a
b|4+XGCtnd7`iSu;00000NkvXXu0mjf3<4?Q

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/stage-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcec67f1e4d4e18bc44995c654aa102e1832f486
GIT binary patch
literal 809
zcmV+^1J?YBP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80008;Nkl<Zc%1E)
zO>Y`k6o#McxCFz%VB!Raz$(9mKhXSyN)>Wq{MCiiMGZ&^UAT!qVymK}>LxpjKah>3
zDC<U5s;Y~~wfP({*fYS;I3K4Adx)p8Xm(zdcXKs!=gfJ|d(M@v+TGpdGBtLo*+&2)
zfDyn5U<7axz}nJ+tbem8mjdwJ*I!+jI5#^Z06P!TL%|BmOH#~b1z>%4Ms^;grI^bM
zjd1~73+m|p30mecI}c9-*A^G#Mkquvmys!52Vf_ck=-YcW&I4yd3QS&qg1Vvo1KwZ
zG{TgwQ>q%n@-u$^p=Ftf2;rd4R4_;}mz8$cLIB&c=yZDkRH_E1-y$BJ9>i9v222a_
z=rl+6-;^r`a#M&$BSQgP4rKEMRc<v<CnvNllTx)#IG_^>_-OX~bh<VG@n{66T1Ou%
zu4DCV#5=(sum9r9`zz|R94IU=$)v91_jrj%BZLD1lp5pZ-aaSqPRQm9>dE{)0Vq`r
zKHL<y1GNTStIG$EmyqAfUaiiJfHv6wK6O{TUwD}R;js&74BY)gDN0r2%mIUJzMvZB
z5db2mGZDY_v06u|jV*Q1JmjcjV)pu6(?d7|vbMM&k;xEk%cPjgNMU(tFgxSm?q7Rv
z-{k;+-{S=!sQGx^IONLvw{*Ha<~Fxo)l6!B-d*vaYZIpq_<R7gyA~)22X#c?b}Z(0
z;C%m3igL}M-RV%S{cD0n2<su5w#|Xj{IsD0M;(*qu}L;xP@H+-oUXQIQm!>PG)*_a
zo%<{5`ODv!+uT-@T7cBXma5bnq&Bt`z{J(70BD-V{OTiRzkNf<@Bbu!K=YBw7gVp`
z2Vna86aaIpkJRr6`(%ImSt$iQ+jav0ydN(EaNK(ZK<mw)0Hl)%S>D`M>10Cge7mC3
z$%JU$#$f-v_FBIJpvDdWcvX5a_{ZumPgOdZkkrPOa=rsl&b2(9Ovv>BG&}HL>qYw9
nSZ7WD_-yF$9BHJH{y+K$BxGzl6@JV700000NkvXXu0mjfba;cz

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/stage-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d471502ab5c6d2f157b518fc649841239a15027
GIT binary patch
literal 835
zcmV-J1HAl+P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80009DNkl<Zc%1E)
z&u$u56vlrSI|0KmGyF-5fe^JypP<i>efkn@Hy(ErEXz`rdeaUY4_?Jy`3dUmt4e-?
zs*03VnxyeCLrO5rfDMi<`F1f348@TX$&wf4+aS)l=iKjn=VJzOaB#p)B6g#<&k4*4
z%n5udfxV4&xo?{CMhN^`Gv$}13bxz4&ih%6e);jcZ)Gx(AQ?|!)M_G(|Ga9*6fszq
zRLaE<Hrv}+m%5hWVYMo@SAUSIvV^AUe6zMDK2$TMKwi@+<Z`rqZyejMR%IcZrBW)A
zS2YeB?xl@Fg$|t{UoI{4F^Wwo(DpqfkkfSbO;g%#llJL=3j`-!pT63|s9WM`ttLIc
zOE@h+!)XQzm5Nx89?96*`IU-IDX_P(F7tW@O-a%Ax&Ty4MRJ;st|Vy<Px$-oI{+?_
zM5hI~TOKLoxC~EEXB7Ko)sXe-+StIMnHQt-{r>Dv2E!p=-~WoNlBRRq=V-K!yq;m<
z?3{XaO^WyL$J2(e8!mFWK&4!yI~Z{2xb!szqi%`qYE>3;IbJyq`=%-Vo`-)toG2hf
z;E`N>iQ)Mfw%eq0+{bpCZ0_uePS3|MO`)cjKtTI+!1GtH$MORhbxSn=Y4OL)m%QtG
z7<EhZ`hy@TCLXliCTd#a-reGafZcFu_k1d)BFWovR;(@Y?8RTKSX%->j)Y4qDo0+I
zyq+PON?p3s%_lpe<#hm1(@6l@UKjuPgq)_2SM$bpCj_GV3z1cnndVXk295qoE<-A@
z6jlJi`ZOiQk?(Qn1jF7dM-*r{P2Rk9FzS{_#N#s!lcSgraO8U^;|rz{P8?MXf|^#R
z%jV9m_^&x*04vs(cs+9XRoL9w6)msB$2^ZOE`n1(Mb=`wlVQgM0KO>XN9=>5;^&`@
z8-=QbljT)?Djz~gr2)vQ>P+sAmH~oc{m`6I0x<%oE-VD0+qWhU$uM?nF+3xt@*yVq
z*&eaT@vJs6un7MZKmPu~wZ7%9!s92uO|JmpPWsb6ud8;BIp+9(<6p%?L$Qczs5Jlp
N002ovPDHLkV1kl7l*Rx6

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/stage-5.png b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/stage-5.png
new file mode 100644
index 0000000000000000000000000000000000000000..bee9bd6b93d4069f9ee6d2913f41de08b30b6446
GIT binary patch
literal 994
zcmV<810DQ{P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000B2Nkl<Zc%1E)
zO-~zF6o#K`2zWfkGah3~1A_vatokRY`a3EV`mrgrQb2f@9gT_9m=#XbMfdpul@Jo!
z6jiF!AT`BcU`!|&n;BOXh19-X%$En(X(J(_s+`TtoVn-R_q^x5M^~(`uXCLiyVl+R
za{!*@a&j%dB(DX)YW|VDduM`j<=`s!r?>rM@sp2bqF+IcD@^CV6u!SOGb@t-QZiwV
zc1`vymy?E(VRG)i_-1BSYHEUX+Ti{9Inga9!a!CtxScVmI`zQ!bbdh&8)?Q(lXrBD
z9jo%UiF}53_V)o88#Vbij71ozI&~xlgPIZXwa9Q*KgCH6FunXZsHVN*{fgx>G&Tl6
z@cjnHIsjz#3|b=2F9#LY@=H<(!JuZKt8q$Bjq1@^N5#)y{KO=1$27^NQfzE)Quu5}
zzBe{THl^|X=8HE1h_qn(;iC9)XPe=80)Vn*f$)|H!H}v3YkLGpq6b3YlB2{Gwrh31
z+t}dVa-nPgBMkU-CKZKo(_}D}LI}b0?JdsF6XaHk;@i)^kPwQpIWiidyfI+YR8-Q5
zeoC(n7)d6AjS4ffG7(SkQGPK3DArDA*|HEqP_`_pjzih9$gLE`;b{$UEB<;u7l?9L
z*Ikx?sX{@Nj*h80HSFKd$m$td-X>4y7o;ohT2QP%PkMdyu3$`#x3?k;01PM!09rE1
z&(&jOAWAzz@sO%=(XXH<`Y9d0;<n;4;EOw}8LZ`(T<v(;h=D60_lUU+>{%8kjRt#O
zb)iWH^$ck>&f)nPrK97Ho}M^0j!tcID@EZ;B&%o8RfQ9$&Tgf`ueQyEX@&rHEsG=D
zVcaxP`{GP37sL-QUoz!Y=SxjX>73Xh#qFZ>t-WQbr2D_>#SCgj+dQ$N47B$XU?`dF
zNG`!UmP%w;T{gdEKJ<15%3iS%2KFl!C2Nm+%LNhdk9(ov5mWnIp8!srdPwml^DAy=
zjP{t~6LDF*F>n<ur5olyN8TL?5{IB5S9~H`trn{fm*j_!zlwlJr8EFC1MbF656Qwx
zF~~nTcVBGn?*`%x29c(@L4RDF1MpkJ4ifvmhUfDEUABf}cg@i)CIHau9l0Klz`mZa
zINx_G=B<gv=!<m@xLZBlbHqgWp3&2t0RHqSYI@`Jq8Vzy_q}d;Yg#QXTAlZj*Uj!Z
zS~7gE*{7WVu8RTT--;i6`oWc6wf@N-tgJ>w2#_6kyXRHK-q?-Z*#F!90zKEX6y-QJ
QmH+?%07*qoM6N<$f-W4~*#H0l

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/stage-6.png b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/stage-6.png
new file mode 100644
index 0000000000000000000000000000000000000000..502f27714c1e1b7dd7acfc8770bcf75e77d71057
GIT binary patch
literal 1003
zcmV<H0~Gv;P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000BBNkl<Zc%1E4
z&2Ac36#gzr<nTAZ3^PMFW>6ZO{%n#*sMJS@+(+obRU(&e-N4qY8f;a5fw-^WZme#)
zYAjW4gRxcaq&S9Q7*ZLds#3UJ%-rE#7^o|?%A!6Sxc8iU?)kp&oD1ae@DQTyZC03)
zO5>B-mqgtErcz<=t`-rC5!~O{kbH~mpju;jRmFqP7RSfL#r{^66-^Ue*O?0}TNVnc
zieqYD<!=1&)l>H2ojYjR%j0i~i>~W{F&%}xAqDMy{sqerhRG_!npIqw?4Vj>x~Ag(
z#s)ck>0i7o9++XEkT;;Fk`e>^TUEBI>nK|m-cePwD2+_S5jWeu|8DVWj72hFYP!6q
z85p^J470yuy<R7?XaRsDey>yl0G!wqj4fwuAp_^GgXd2h3;+yGhnh;DGajRPb{2_N
zM%>2UW`+G7W04H>Tn87I34HXy`_QvF95ouOH*i2;ppZ9k>yI%+wD(F@c$OnBTNZkw
zF<O*Lj9rO=N4q=Z{Ph6Gl%h8rqD3hRd2_BW_(aSyz!7_+OH7g(G&`N8=%oS<sx@}h
zXfS0Zj<RLJ%;kJEu7i&2;_>cIh@?d+x}GO9@X|(;QcU7$Xz3Js{VocM68iTxD{OzO
z#v%&{XO>bBLeLTzc)Ytq&b&SVfB|^6RgKhleS4cUJ00`}4!qGN3V8#Qz{lU0bGH|Q
z<vn&2m}<IaSvddY1<IBMBbx&WFlScc0031{@Z+mjxHTR{>T4<r{=A)lnoQt@O|hEx
z83^AOO~><w5B9sGBRt>?Ogq?T;FQ{MUJr3PJHw2@)O2YgW=)igF`schUA;jcC)CEd
z=b>CGP9-?8eNES_5|Z%*9@e+X_dorNhxKj3sRw{uHiPcKK_PFzOs69Y5G7NURLFog
zx`e6eVFS0?_Ot-r!N;^M(K%}j1g2(0{#J;Ea>)V$BnEf`uLTY4GZ1v}dc97P@r0BN
z01|OOApwIk=p&s>MHZkbY3Xb(n*kupGTXp0An4!)n$8-hcy6BHGbGw12zn&Q(z2&u
z!vX-zX)0cjiYFysW+e_aq6c!BdD*ySZ~M&7f(;Ac7doB`01}q|Z~y@K^|#<<BLv>X
z#oQ&_PlEYvFL((Jq4=<X8^NI)gh^|0FDAr@{xI2+95FKGRNCiX-UKcCh7oBk?oEUk
z(a&wNB*%nJFBSKtAEUQnZ(Rby{}n&^^y8?>`p@ji*Wb!x2mpHepMCyYXRqzruI>MA
Ze*s|I@@E1qo2>u<002ovPDHLkV1kLX)lmQd

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json
index 37bc00be888..16f3df4df6f 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/produce.png
index 61e3fb4eaf83cd02127d145ed9ee47d1e2ac6869..655628bc8819a23c9c44919eca3c1d78744ccfe6 100644
GIT binary patch
delta 694
zcmV;n0!jV11I-1HBYy&vNkl<Zc%1E)F=!KE6vuxF!f~A{At47XS3?Fvij=rWD=u1>
zNQ2@cLKX)nk<!H}LnarIQV=`11f&Q>X=x~E3l&;v5yDXn8G3}C9a7RBcCkl5at_z~
zOwyzYtx|`)<+%I4@BY8{-v1uwSy@@(Ji~jg>Ro^?Ko{VD0Drh}nnUB0W41S7HC?Ng
zWnMm=_xuw8S2%tzB%YOa>-Q+vVPa;~?i9q+$tWJ59J2wu0gIt<2qowUD?w-7ulBNM
z9Ml16dXZ{b1~?I<Er6S~E9_T$Iouto+jF_EkA<~q?u<NU=*mR^-h6mYY4;CED~LK1
zPRxwjjrZPwMSr9}Dl*;NIN)a`OHXi(+2tu_m#0`*n<lKr*_XefZT?_B_nJp{pP}hR
zk`H5;X6sJWRUny4*gl^vXp^agedG2e22_je`;tR^WIh*4k}Se%9NowgR^y@~-+#Sh
zbK?Ld2#c#l0A4)!bd2O!3*0K~6?*VT4yl%9Y8^im4u4Up$U<DxivmcJEUw*(vA?CD
z8(GnkrLB*=N@tt4p{WPlN|>expU);XtN@Pb)WI0*OE~}m(g*`^|K<|_bR!EmUg)R-
zjS#V6g-S(cK(&PPUDvCFF^q3H0adBUNRm}|E$rlRE1F5q9Rp}N2{Y+Ak7;_)^dg0w
zJllqh5`TnkLniaqslfVD4!_#V=WIcobF1Q>i}Xju=h!UT4kFhBl4J=pMf#&GuI7&f
z9W&;>l*F0n)sXOnrspxu=GnIe$fV~y$yCDjA)`?g26Qv44c8}5IHs)~My;ZwNtjF}
zYyh9n#v8EOz7(9#b+6DP5;+q<Gmu)L+NhRgF)w&d5<V3`BS@?0MEFbqe>2YgholS8
c1?U3&25>YycMB_d+5i9m07*qoM6N<$f+d+jv;Y7A

delta 414
zcmV;P0b%~l1-Ao`BYy#YNkl<ZSPAWtKS~2Z6vm&hN&JJxLXm)=MLHV~;03JgynrBf
zDLhAtbT(eVLJ%)tkptMIOQ9eJF@;ei#stRw^73uQB|AH*(#(U|nVos_z2AH@A|ZkU
z!GYjFa3DCaU<a1wtzW$q<J!}%%Uqh?$t+yj5-Dyg!g59XpMQ?_zwaW0u8w^{ya4vk
z#H>|Sm<0f0M|%FdE%J1o??x^_<wT1Q-b6|}aho{6(-Q(N&;jNGqI2hlh$vw9jf+!L
zySho>Ah>a$88|5#irHa10Lagly_!8vilkEj(RzNB`(jg~bzP+c%;j6KVa9+lFk<wT
z??5I11kR6-%ztgaiJ=tAl7NgS93K=$40|Ho2lo{?0U%O76tlXgVu0Y|i#D-3jnRjW
zc@-!=jOTifZh)C@U@EI4h^_4YFTg_STwWLU_(ZM)5P=JY$%zS)CEkD06`#{1(+dEJ
zfItrrT*a)Q?O4mRp8LH4xPc)2Pxros)BD1Ia3DCaFc$~@02G9Cm;QKkumAu607*qo
IM6N<$f^?$6CjbBd

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/dead.png
new file mode 100644
index 0000000000000000000000000000000000000000..00d4f1dfc2c30157b31942b2ca4e9904ca87126f
GIT binary patch
literal 555
zcmV+`0@VG9P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80005<Nkl<Zc%1E)
zv1$TA5Qb-iodHFwKrDq6N-E1>VUfl{L_#2fjj68j1%!pXz@@m#Z4MMfBwS%*h=o|D
zG?0L$5nF{=7=%d?c3DsFyj6)Qoa(sUyZL7Rnb{?X2#2(jgL*##{09J^+hVud_4JdP
zRl&Q=J+Z$}CX*Y#-8uuNK~Z+j7(>RGa!YLu5C{aps_G*0(0mM+Z_n^#JSahI4KSTf
zAd@eNv_}Sg7)Ile)ygYU>=mG9RYZiXPE$N5^ahCx`l`QE1K@gd{TJiUrS*i~P>Nm&
zpw(##y$c#8;ft86uk8U^ohGJJIpyf~29QqWh^#la>2$KPciq070T^TW{qYWRpYx1Z
zRb9-3npHt3SSNFxgxo^&F+>J^$m;7`%xMyOF;5xDYGpEv#^JSevlLlDqXYmzcCK14
zp1UA2=&!VyJQKLtrP^e~?MCEu7}cx_E=D5&_#Mf!Q@_XpV+=#{F#rHOHeNPn!gB_A
zk(ma?#b^Wtjgmkh2$_6|_`hbN`isRP0RYb<*|i9{o~A*O>)mVD@#^|kypz{VgJSq1
zrgR=`lwh56JD~kLtEyurUm|<C4-_;?dhI#_0LacwgF05b@9bR6hn)fJQOjWKoLE&I
t)2SShk7_q_mEbSz;Fr=Pz!BgG@B`rr`!wzt#3ld$002ovPDHLkV1ieC`p*CW

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/harvest.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbedf85611616adde31482d19df2cbc01818b887
GIT binary patch
literal 717
zcmV;;0y6!HP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80007%Nkl<Zc%1E)
zUuaTM9LK+B8w`v7jKHGsrFxJVJxNcJLX73h7+6XKK`}xL*~N!}54{v28ORAGW%M4{
zBoIO*7+3URjvn?<ZqE~9YcZSUG8p^yAoot)@y~UTJ@|vmy`1~|o!{r2-=A|B5uu+l
z)K~8Vfd2ttL^PPmWHe3U&)Fzoky$$(tJNwT?|BCjAt!a~yqz2=1bl9i0v4IMxt(~{
zL*aR7uIVEINWnA%fMVtW))u_j+}wgz2+aWgoQ(jWxUr*t1AzYeGkiaBPwRBr0F-zu
z@i#B)0RSJ~-(~<{I+lX>AvEQKunI(uOP_RzNws8i_~OjX?PS<L(0S^3+fyQT1W>cw
za`<0yV@GJ?=5`u0|3){}(GtKtTd2i){V_z&TiS6u#iSGix+_s(4!q!1GMUC<ycJd_
zZPrno)b|5_&ZasCfYQ6y9f5@a<E}7vcdHm)jbg&L2)*HS+ezHqP63O|>Q~FN9xASX
z0nd8cmZcD2rI1%4w!i&Axl|DvD}A7T)c_El2UYSfG2vUp@M^SeZx8}Jxv{`j3VBov
z_falYz-N-eIQnxo5+&l+nLD_8H;PM_FQQugg9|sGxAG4rx)F6cjQlwpnV0oy6|9{f
zYS;zo%@my+JC422ub{I$!cxSAU)vGkBD!uwN|Gf)PCA<$g~JzThI6MN1=Gy<b-$r2
z@|h$nmns;!GK-~%OKns_A)-T%EX$B(8OCWH$+8UZl%ABa>1(4TdMkR0P4gr2LqwfJ
zkO(=+;fph%cKRua2Q=1vz0}(%((`@5;fpgqH%Y)j)+;a~=K%0==%?BrI!Q->=2a^q
z1=A{6vwloUvF06UCBhK=OX>TibO0~_7y$eQE?{W0fxxXE00000NkvXXu0mjfYW7E4

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/meta.json
new file mode 100644
index 00000000000..01be1e7dc4c
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/meta.json
@@ -0,0 +1,32 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3 and modified by slarticodefast",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/produce.png
new file mode 100644
index 0000000000000000000000000000000000000000..aee68431aabbc177425dca6b42acd360d2987b0e
GIT binary patch
literal 512
zcmV+b0{{JqP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80005UNkl<Zc%1E)
zu}fP)9LGP`T%jZwX#xQaDikLN(L$DNr9%e^!Lc1gK^n*qhvMWAGWZARAf`)72OS(j
zS{!Y&2P|~RB#26UAecgIg3y!e(mbCccrQ^x%KMJL-+TA{-1m;V6XkN5Ug}9t-8}#g
zzys)efNV9bdj^oLru9{{*)>GR0J(_`;j0CR#DZNxbd>;rb!v4wggXG|EVI?Lj>Ljo
zMVkQJUJ5sf2$S2eZFp8`01$}<u}&>~wE#!!NyaiIZuieB4RRA3;z0nM5N%_CqxGcS
zAIp^NM0~Y?k+~}XDWzWd`JNxymxRJ2c0Dw^&7aW*7i%f%=O;|(_F0|$h*HW3z-SLh
zDRt}8f2X-qq3{S(haYHN`jJu^?Sp#(q?G!3Xb6CX`Byi3_2OFqo*oAoSjv-3j8pjZ
z9sje|!zG}U62Iye(cwX6-b|BBjNb`yv6iCr^}zne#2i4HeDn`Or?wL0-|gA;wqYBh
z6B(ZaN-0s8D~i<CYref$w#}W1i1;R7b{36i?+U=F-xbZkQXaTYLBuyZ8Om%4oGQ!}
z1;E1RSzSLr0U(^%wd-zWd=5O8`ujoR0eAra1;Ag8c(+>B@in{v0000<MNUMnLSTY8
CU*)g>

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/seed.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe7c87282098725c2ec838ea0e8d949d97063fb8
GIT binary patch
literal 2832
zcmcImU5wOJ6z)P;{$wK>HY?GjlnCg0r?)@TX)6Q5%)*XwU|l9*jWOZQy|=T?&a|cN
z?#!+x@{cCG7~{)E6BAy92T2Ssh(?W=7~w^OMjnkZK_VCuABZNbw=<nGm|b=inWWS9
z_T2OHo$s7`-W=MsbJdEqD>#l@RT#_<vpXMM%evWrFg5iDyDj$yUkW&G<)hKn#ZAB4
z$JTzaOC#Y(@dXpRwG<+5nWh>wk4baf=B*76;V~NWWm>VFtnmB!&jj8kSz&Lw2#a2h
zj@pA$KHW35tAwY<ut9{aTlmcllPRdt5b=##)d|c-R%q%q*>kik3Vc%}9LoyZB7^)$
zafr{kKIOF(1Q<e@&lo95Q&kN<!^=>HB20^t3?$8jswrjo_$M%HKC#T<{EpZbd&>%=
zVd$BnSg+SpbtUEc6;Uz_Lxi#@%YaFMVA2Uu131C@wuU?nuy1>z?K*s<5tZHXFe@-m
zTOriEM6DCVFfqWy2J%EH1*4Fff&?dW-nd_F8Yft!Ra&D?7%*8Wk@ZI1&<#f2IaDW~
z?=rxkEfy0Sv-(o2B_@J!V1k7a12U_0P@43pI7|a~+{biag1NcA9Ze7p(>r)BU^^3U
zZuZQaPf_UlCD*OCvpm#}mzSlK%x~IjJH)LAPes<^4K$BJniW{eRR9$r>m^Ay6_$0W
zA4(>KEzzP&Y-_SpG!39sk_=PPO_=V7@*PpeH-bVmuQ0);<@z<m(6Vc&LPgK12z-(Q
zGv`)apBZM}DV^(uTyDsBExXD-1j9SG^M!$&CK;Lr<doEOw^%d_P7opo(?UKguvk;J
zO-xJIkfCD)G!5$@t*L2X5S#(JE>lB62B8?W_vc+a9`PsI-zp{IVy5Gcdn&Y4%Q6&T
zQA~l3RT=0KAwYpDmUM#Bn$ZG}d9&NMSv8|-r`E_T!ZeoC5W+OkfS#rqhQF!+17ip@
zZ0Kc$SW;R;QOz`IXb#!|%kgAfg?s4!_^E31P3D;hM-`P7aKr{mgm~GW1&;+;j`!C`
zDN}k6mb9z~t`*jiPq$SVcJs1OoYQ&NnV^1$`yTQUYh=_9vV!HiH9lbsAG$p9ysC{+
z6u3CykhobSsS@V26QGHEL!>E&2DNeq7-b0pHLbEtD>4L`vYde#qDt)6hPV@=c6G>#
zsTl3*_%9H}@Z(YBR46+J#QO-wfDn~6g#aR37BCFPw6dl#R}F|P*&>i+GWQDRu2O%%
z!QgorFi+AWUL+)$8#F?FyMqIrJWE{Qn~eK^?9I!#g*B-b`m-_a0VPR{j_6jq5&zkV
zTJQN5k~^a6Y@TA~Y&~b89Aw9u$vSS*ga1{xjP1Mk+jXP9(G0v}R%tJ>0VsM*CNK7q
z%x=_SmFly}?9{2>&a$cQ+d_U@X=FLRH8ZpI%je3+UR-*@+;_R_WDo!R>W7aU32vVm
zQ*ZBnqZ@T^djI3ae{L`jgC9RV!}YIv`?zuFbk6}pc=DA;Hg+4_mDOs%U0M{LxUp<n
z=Xx(+?Ypv0-OqjW(=Awh;z0GS&leq=IX`iI(a)cJx4y5Z>uB%yj~}@4D!I5uefo>n
z-s}J1=I-&O{9irfv9HU0-8X-|#*vF?UDt{w(+2nQwc|^ky|nJ?xq};e_};_cEIw^=
v=N{sJ@Tb>&bz$G>y*o}`KN$Oc_5%0L>l=@5SzB2d&8&riUHK2U?>qE2rw@{%

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/stage-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..abdff1afc7ba31192be65e059714371267b2ae1a
GIT binary patch
literal 353
zcmV-n0iOPeP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003fNkl<Zc%1E)
zv1)`s5QhIf0!ONJcWKh!6Ql~bo!Eo}!Dp}uh=t%21T19Bdj`QK%^_)K!Dk8S(`QnI
z6}cE!jKpStSS)sD{%>b?aRoDDO>I_ncK{B+0XP5$-~a$zjZJE;tqJNf;xMg5-b#Lc
zAkm-mJkJ`xNCjdQ{4k%YMF398d6qd~X@O07D|!FE{Y#2@706r3bs6#g<=Z?~!R%+%
zWPrSt+&2!>O5EMvASoJgc>6@&%6SmX{OdRzubGJO^tfXp0ukYOzvZE?S!ZI1Xf(GO
zV(d|>weGGN0I1C8q-eSW7ps7W4xouy<Qj%)B~<1!0QAjO<`0?!!0YA%bs0@+i51{-
z*G5UvbYPe3Psv%Bs@XK!g8$I!{{jc#035&<CA70GP`tC@00000NkvXXu0mjfCMlZ)

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/stage-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab44f97970d619210ff15ac61917e247dab35678
GIT binary patch
literal 425
zcmV;a0apHrP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004SNkl<Zc%1E4
zF>8ZR5WW`*p;Nb{6uRdJlum+fAxjAe{)Q|CaR~Se0uJJs-ypbj3DV^rIQ18F4;0tX
zz1Km`hBSFmU(gJG@KE&K-RIqR=MzK(U1HE_^q#;q5V%pjlu}l5;%64E3>1gYP18JU
z+c*PB=#VOSRcMtUT25(Ypjbq+#=WdXzztFX0I+s9?Pb8vECK-7=DYG<2ek-ry}ABR
zA0yrP^$4)oY%dm{50~j+Eic=A*DZl#sM`^Z39$0_=fNVHQQeMEPQt1v0;2$<zHR4o
zKq~`&X3;nw>bPi@0Y9@S2^|{06~S8>#eQbdeqh^+#pC@QxIro=Uq8*KA`zWjlld(n
zBD}tg2oV7hVg5X%V^`kCHi)S7%}b~brBX^rLWgWG768THkA(-o>i;i5wz<f8!1iJh
zEvE$Vr+OxHO8xJH?{Yq96FB^8h8v_MvBUjqcOy7!=b$V>8|eH{+7svr^aOqZOD5!i
TJpOC?00000NkvXXu0mjfCP=vr

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/stage-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ab196981f4da03918b99c98a77b98fb9ca54119
GIT binary patch
literal 556
zcmV+{0@MA8P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80005=Nkl<Zc%1E4
zv1;2;6g}4jI)*MuDP%X9Jt|0aF``p(;%|^CArB7*eSyG(dBITY8|<1wAQ+QH#+vd0
z#&ZP0TQC{2<#sSnbzD75vP0d$XA(R;opbL!_v#WeW0xrGlzlJYe-Ln>I~a{dnLpx&
z7JEiOx^vSswRbnpK)+SxEaYj}ssyr8X3q%7kv7Y5ZKHnPN`Pn%2>^UCpy|&`I9HS0
zB616GLyG|*n$6?quituHJa5ClKFwVUtqFDHo)M6$f9d`RFo4@%7X)17<pz*318!)s
zBkkC1m3o(^pWmm0Q!@~|-1z$}n#~jMIMU{ir59xB4y^!XsOaH4lE}69q|Lq<5Rk1!
zwR!ZfPpNp`)?QR3%k#hut(Y7Do_ar01+OiEIO`Bl<1~XUqJA5x9M?E{_yRd@vuRGW
zSs>j$kaZOITUD;qyNLvHTw`(8p>?A;R~xRv4J|&NebAmSGPoWa^^zM}+;3I+_+~-w
zNPFY8DzgA(GDTdecj@HQAw+XX#mCopD!!`#6<NPkWzPu6GXjccbBN}UWTVWLdY5FQ
z%%V9YH6in6Bh`e<CR1d~0+-uPVbz#h?E@-G;LqPriAf>{fV;wTJRj1KDquBg1yzQm
u_kA%SU2CpFTY`UuoiC+(0eb;^0lxu%)$;}gGf(#b0000<MNUMnLSTY16!u#H

literal 0
HcmV?d00001


From 061fb3c56dc6232b36d38250d980d0788abed1e9 Mon Sep 17 00:00:00 2001
From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Sun, 8 Sep 2024 09:22:27 +0300
Subject: [PATCH 114/366] Metamorphosis - FoodSequence 3 (#31012)

* setup some data

* cheeseburger recipe

* Update FoodSequenceSystem.cs

* finalize cheseburger recipe

* remove fun

* return old taco sprites

* full foodsequence data refactor

* return tacos

* well done

* add cutlets to burger

* chickenburger recipe

* +2 burger recipes

* more fun

* Update brain.png

* some slice produce added

* documentation

* watermelon

* skewer work

* flipping

* tomato

* skewer watermelon

* Update skewer.yml

* oopsie, ok, im go to sleep

* fix checks

* Update produce.yml

* screwed

* cheeeeeeeese

* all cooked meat added

* produce added

* aaaaand suppermatter

* key to Tag

* More

* proto string remove

* raw snail

* fix

* Update FoodMetamorphableByAddingComponent.cs

* fixes

* fix3

* fififififx
---
 .../EntitySystems/ClientFoodSequenceSystem.cs |   1 +
 .../EntitySystems/FoodSequenceSystem.cs       | 176 ++++-
 .../FoodMetamorphableByAddingComponent.cs     |  17 +
 .../FoodSequenceElementComponent.cs           |  13 +-
 .../FoodSequenceStartPointComponent.cs        | 126 +++-
 Content.Shared/Nutrition/Events.cs            |   8 +
 .../FoodMetamorphRules/FoodMetamorphRule.cs   | 218 ++++++
 .../FoodSequenceElementPrototype.cs           |  39 ++
 .../Prototypes/MetamorphRecipePrototype.cs    |  32 +
 .../nutrition/components/food-sequence.ftl    |   1 +
 Resources/Prototypes/Body/Organs/human.yml    |  35 +-
 .../Prototypes/Entities/Mobs/NPCs/animals.yml |  46 ++
 .../Objects/Consumable/Food/Baked/cake.yml    |   4 +
 .../Objects/Consumable/Food/burger.yml        |  22 +-
 .../Objects/Consumable/Food/ingredients.yml   |  10 +-
 .../Entities/Objects/Consumable/Food/meat.yml | 496 ++++----------
 .../Objects/Consumable/Food/produce.yml       | 647 +++++++-----------
 .../Objects/Consumable/Food/skewer.yml        |  51 +-
 .../Entities/Objects/Consumable/Food/taco.yml |  19 +-
 .../Objects/Specific/Hydroponics/leaves.yml   |  14 -
 .../Recipes/Cooking/food_sequence_element.yml |  80 +--
 .../Recipes/Cooking/meal_recipes.yml          |  30 +-
 .../Recipes/Cooking/sequence_metamorph.yml    | 125 ++++
 Resources/Prototypes/tags.yml                 |  24 +
 .../Mobs/Species/Human/organs.rsi/brain.png   | Bin 461 -> 471 bytes
 .../Consumable/Food/burger.rsi/meta.json      |  11 +-
 .../Consumable/Food/burger.rsi/screwed.png    | Bin 0 -> 895 bytes
 .../bun_bottom.png                            | Bin
 .../bun_top.png                               | Bin
 .../Food/burger_sequence.rsi/cheese.png       | Bin 0 -> 302 bytes
 .../Food/burger_sequence.rsi/meta.json        |  20 +
 .../Food/skewer.rsi/skewer-tomato.png         | Bin 0 -> 233 bytes
 .../Food/skewer.rsi/skewer-watermelon.png     | Bin 0 -> 331 bytes
 .../Consumable/Food/taco.rsi/meta.json        |   2 +-
 .../Food/taco_sequence.rsi/cheese.png         | Bin 0 -> 267 bytes
 .../Food/taco_sequence.rsi/meta.json          |  23 +
 .../Consumable/Food/taco_sequence.rsi/rat.png | Bin 0 -> 364 bytes
 .../Food/taco_sequence.rsi/tacoshell_back.png | Bin 0 -> 171 bytes
 .../taco_sequence.rsi/tacoshell_forward.png   | Bin 0 -> 293 bytes
 .../Hydroponics/pineapple.rsi/slice.png       | Bin 426 -> 381 bytes
 40 files changed, 1331 insertions(+), 959 deletions(-)
 create mode 100644 Content.Shared/Nutrition/Components/FoodMetamorphableByAddingComponent.cs
 create mode 100644 Content.Shared/Nutrition/FoodMetamorphRules/FoodMetamorphRule.cs
 create mode 100644 Content.Shared/Nutrition/Prototypes/MetamorphRecipePrototype.cs
 create mode 100644 Resources/Prototypes/Recipes/Cooking/sequence_metamorph.yml
 create mode 100644 Resources/Textures/Objects/Consumable/Food/burger.rsi/screwed.png
 rename Resources/Textures/Objects/Consumable/Food/{burger.rsi => burger_sequence.rsi}/bun_bottom.png (100%)
 rename Resources/Textures/Objects/Consumable/Food/{burger.rsi => burger_sequence.rsi}/bun_top.png (100%)
 create mode 100644 Resources/Textures/Objects/Consumable/Food/burger_sequence.rsi/cheese.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/burger_sequence.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-watermelon.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/taco_sequence.rsi/cheese.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/taco_sequence.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Consumable/Food/taco_sequence.rsi/rat.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/taco_sequence.rsi/tacoshell_back.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/taco_sequence.rsi/tacoshell_forward.png

diff --git a/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs b/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs
index 452bb552de6..343fd159e14 100644
--- a/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs
+++ b/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs
@@ -47,6 +47,7 @@ private void UpdateFoodVisuals(Entity<FoodSequenceStartPointComponent> start, Sp
 
             //Set image
             sprite.LayerSetSprite(index, state.Sprite);
+            sprite.LayerSetScale(index, state.Scale);
 
             //Offset the layer
             var layerPos = start.Comp.StartPosition;
diff --git a/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs
index 8045f54f0d1..f43b80bc79e 100644
--- a/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs
@@ -2,9 +2,16 @@
 using Content.Server.Nutrition.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Interaction;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.Nutrition;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.Nutrition.Prototypes;
 using Content.Shared.Popups;
+using Content.Shared.Tag;
+using Robust.Server.GameObjects;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
 
 namespace Content.Server.Nutrition.EntitySystems;
 
@@ -13,12 +20,19 @@ public sealed class FoodSequenceSystem : SharedFoodSequenceSystem
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly MetaDataSystem _metaData = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly TagSystem _tag = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<FoodSequenceStartPointComponent, InteractUsingEvent>(OnInteractUsing);
+
+        SubscribeLocalEvent<FoodMetamorphableByAddingComponent, FoodSequenceIngredientAddedEvent>(OnIngredientAdded);
     }
 
     private void OnInteractUsing(Entity<FoodSequenceStartPointComponent> ent, ref InteractUsingEvent args)
@@ -27,42 +41,124 @@ private void OnInteractUsing(Entity<FoodSequenceStartPointComponent> ent, ref In
             TryAddFoodElement(ent, (args.Used, sequenceElement), args.User);
     }
 
-    private bool TryAddFoodElement(Entity<FoodSequenceStartPointComponent> start, Entity<FoodSequenceElementComponent> element, EntityUid? user = null)
+    private void OnIngredientAdded(Entity<FoodMetamorphableByAddingComponent> ent, ref FoodSequenceIngredientAddedEvent args)
+    {
+        if (!TryComp<FoodSequenceStartPointComponent>(args.Start, out var start))
+            return;
+
+        if (!_proto.TryIndex(args.Proto, out var elementProto))
+            return;
+
+        if (!ent.Comp.OnlyFinal || elementProto.Final || start.FoodLayers.Count == start.MaxLayers)
+        {
+            TryMetamorph((ent, start));
+        }
+    }
+
+    private bool TryMetamorph(Entity<FoodSequenceStartPointComponent> start)
     {
-        FoodSequenceElementEntry? elementData = null;
-        foreach (var entry in element.Comp.Entries)
+        List<MetamorphRecipePrototype> availableRecipes = new();
+        foreach (var recipe in _proto.EnumeratePrototypes<MetamorphRecipePrototype>())
         {
-            if (entry.Key == start.Comp.Key)
+            if (recipe.Key != start.Comp.Key)
+                continue;
+
+            bool allowed = true;
+            foreach (var rule in recipe.Rules)
             {
-                elementData = entry.Value;
-                break;
+                if (!rule.Check(_proto, EntityManager, start, start.Comp.FoodLayers))
+                {
+                    allowed = false;
+                    break;
+                }
             }
+            if (allowed)
+                availableRecipes.Add(recipe);
         }
 
-        if (elementData is null)
+        if (availableRecipes.Count <= 0)
+            return true;
+
+        Metamorf(start, _random.Pick(availableRecipes)); //In general, if there's more than one recipe, the yml-guys screwed up. Maybe some kind of unit test is needed.
+        QueueDel(start);
+        return true;
+    }
+
+    private void Metamorf(Entity<FoodSequenceStartPointComponent> start, MetamorphRecipePrototype recipe)
+    {
+        var result = SpawnAtPosition(recipe.Result, Transform(start).Coordinates);
+
+        //Try putting in container
+        _transform.DropNextTo(result, (start, Transform(start)));
+
+        if (!_solutionContainer.TryGetSolution(result, start.Comp.Solution, out var resultSoln, out var resultSolution))
+            return;
+
+        if (!_solutionContainer.TryGetSolution(start.Owner, start.Comp.Solution, out var startSoln, out var startSolution))
+            return;
+
+        _solutionContainer.RemoveAllSolution(resultSoln.Value); //Remove all YML reagents
+        resultSoln.Value.Comp.Solution.MaxVolume = startSoln.Value.Comp.Solution.MaxVolume;
+        _solutionContainer.TryAddSolution(resultSoln.Value, startSolution);
+
+        MergeFlavorProfiles(start, result);
+        MergeTrash(start, result);
+        MergeTags(start, result);
+    }
+
+    private bool TryAddFoodElement(Entity<FoodSequenceStartPointComponent> start, Entity<FoodSequenceElementComponent> element, EntityUid? user = null)
+    {
+        // we can't add a live mouse to a burger.
+        if (!TryComp<FoodComponent>(element, out var elementFood))
+            return false;
+        if (elementFood.RequireDead && _mobState.IsAlive(element))
+            return false;
+
+        //looking for a suitable FoodSequence prototype
+        ProtoId<FoodSequenceElementPrototype> elementProto = string.Empty;
+        foreach (var pair in element.Comp.Entries)
+        {
+            if (pair.Key == start.Comp.Key)
+            {
+                elementProto = pair.Value;
+            }
+        }
+        if (!_proto.TryIndex(elementProto, out var elementIndexed))
             return false;
 
         //if we run out of space, we can still put in one last, final finishing element.
-        if (start.Comp.FoodLayers.Count >= start.Comp.MaxLayers && !elementData.Value.Final || start.Comp.Finished)
+        if (start.Comp.FoodLayers.Count >= start.Comp.MaxLayers && !elementIndexed.Final || start.Comp.Finished)
         {
             if (user is not null)
                 _popup.PopupEntity(Loc.GetString("food-sequence-no-space"), start, user.Value);
             return false;
         }
 
-        if (elementData.Value.Sprite is not null)
-        {
-            start.Comp.FoodLayers.Add(elementData.Value);
-            Dirty(start);
-        }
+        //Generate new visual layer
+        var flip = start.Comp.AllowHorizontalFlip && _random.Prob(0.5f);
+        var layer = new FoodSequenceVisualLayer(elementIndexed,
+            _random.Pick(elementIndexed.Sprites),
+            new Vector2(flip ? -1 : 1, 1),
+            new Vector2(
+                _random.NextFloat(start.Comp.MinLayerOffset.X, start.Comp.MaxLayerOffset.X),
+                _random.NextFloat(start.Comp.MinLayerOffset.Y, start.Comp.MaxLayerOffset.Y))
+        );
+
+        start.Comp.FoodLayers.Add(layer);
+        Dirty(start);
 
-        if (elementData.Value.Final)
+        if (elementIndexed.Final)
             start.Comp.Finished = true;
 
         UpdateFoodName(start);
         MergeFoodSolutions(start, element);
         MergeFlavorProfiles(start, element);
         MergeTrash(start, element);
+        MergeTags(start, element);
+
+        var ev = new FoodSequenceIngredientAddedEvent(start, element, elementProto, user);
+        RaiseLocalEvent(start, ev);
+
         QueueDel(element);
         return true;
     }
@@ -77,16 +173,27 @@ private void UpdateFoodName(Entity<FoodSequenceStartPointComponent> start)
         if (start.Comp.ContentSeparator is not null)
             separator = Loc.GetString(start.Comp.ContentSeparator);
 
-        HashSet<LocId> existedContentNames = new();
+        HashSet<ProtoId<FoodSequenceElementPrototype>> existedContentNames = new();
         foreach (var layer in start.Comp.FoodLayers)
         {
-            if (layer.Name is not null && !existedContentNames.Contains(layer.Name.Value))
-            {
-                content.Append(Loc.GetString(layer.Name.Value));
-                existedContentNames.Add(layer.Name.Value);
-            }
+            if (!existedContentNames.Contains(layer.Proto))
+                existedContentNames.Add(layer.Proto);
+        }
+
+        var nameCounter = 1;
+        foreach (var proto in existedContentNames)
+        {
+            if (!_proto.TryIndex(proto, out var protoIndexed))
+                continue;
 
-            content.Append(separator);
+            if (protoIndexed.Name is null)
+                continue;
+
+            content.Append(Loc.GetString(protoIndexed.Name.Value));
+
+            if (nameCounter < existedContentNames.Count)
+                content.Append(separator);
+            nameCounter++;
         }
 
         var newName = Loc.GetString(start.Comp.NameGeneration.Value,
@@ -97,19 +204,25 @@ private void UpdateFoodName(Entity<FoodSequenceStartPointComponent> start)
         _metaData.SetEntityName(start, newName);
     }
 
-    private void MergeFoodSolutions(Entity<FoodSequenceStartPointComponent> start, Entity<FoodSequenceElementComponent> element)
+    private void MergeFoodSolutions(EntityUid start, EntityUid element)
     {
-        if (!_solutionContainer.TryGetSolution(start.Owner, start.Comp.Solution, out var startSolutionEntity, out var startSolution))
+        if (!TryComp<FoodComponent>(start, out var startFood))
+            return;
+
+        if (!TryComp<FoodComponent>(element, out var elementFood))
+            return;
+
+        if (!_solutionContainer.TryGetSolution(start, startFood.Solution, out var startSolutionEntity, out var startSolution))
             return;
 
-        if (!_solutionContainer.TryGetSolution(element.Owner, element.Comp.Solution, out _, out var elementSolution))
+        if (!_solutionContainer.TryGetSolution(element, elementFood.Solution, out _, out var elementSolution))
             return;
 
         startSolution.MaxVolume += elementSolution.MaxVolume;
         _solutionContainer.TryAddSolution(startSolutionEntity.Value, elementSolution);
     }
 
-    private void MergeFlavorProfiles(Entity<FoodSequenceStartPointComponent> start, Entity<FoodSequenceElementComponent> element)
+    private void MergeFlavorProfiles(EntityUid start, EntityUid element)
     {
         if (!TryComp<FlavorProfileComponent>(start, out var startProfile))
             return;
@@ -124,7 +237,7 @@ private void MergeFlavorProfiles(Entity<FoodSequenceStartPointComponent> start,
         }
     }
 
-    private void MergeTrash(Entity<FoodSequenceStartPointComponent> start, Entity<FoodSequenceElementComponent> element)
+    private void MergeTrash(EntityUid start, EntityUid element)
     {
         if (!TryComp<FoodComponent>(start, out var startFood))
             return;
@@ -134,5 +247,16 @@ private void MergeTrash(Entity<FoodSequenceStartPointComponent> start, Entity<Fo
 
         foreach (var trash in elementFood.Trash)
             startFood.Trash.Add(trash);
+        }
+    }
+
+    private void MergeTags(EntityUid start, EntityUid element)
+    {
+        if (!TryComp<TagComponent>(element, out var elementTags))
+            return;
+
+        EnsureComp<TagComponent>(start);
+
+        _tag.TryAddTags(start, elementTags.Tags);
     }
 }
diff --git a/Content.Shared/Nutrition/Components/FoodMetamorphableByAddingComponent.cs b/Content.Shared/Nutrition/Components/FoodMetamorphableByAddingComponent.cs
new file mode 100644
index 00000000000..01704041d07
--- /dev/null
+++ b/Content.Shared/Nutrition/Components/FoodMetamorphableByAddingComponent.cs
@@ -0,0 +1,17 @@
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Nutrition.Components;
+
+/// <summary>
+/// Attempts to metamorphose a modular food when a new ingredient is added.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedFoodSequenceSystem))]
+public sealed partial class FoodMetamorphableByAddingComponent : Component
+{
+    /// <summary>
+    /// if true, the metamorphosis will only be attempted when the sequence ends, not when each element is added.
+    /// </summary>
+    [DataField]
+    public bool OnlyFinal = true;
+}
diff --git a/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs b/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs
index 1fc8aeec0a2..35d8a86988c 100644
--- a/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs
+++ b/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs
@@ -1,23 +1,24 @@
 using Content.Shared.Nutrition.EntitySystems;
-using Robust.Shared.Serialization;
-using Robust.Shared.Utility;
+using Content.Shared.Nutrition.Prototypes;
+using Content.Shared.Tag;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Nutrition.Components;
 
 /// <summary>
-/// Tndicates that this entity can be inserted into FoodSequence, which will transfer all reagents to the target.
+/// Indicates that this entity can be inserted into FoodSequence, which will transfer all reagents to the target.
 /// </summary>
 [RegisterComponent, Access(typeof(SharedFoodSequenceSystem))]
 public sealed partial class FoodSequenceElementComponent : Component
 {
     /// <summary>
-    /// the same object can be used in different sequences, and it will have a different sprite in different sequences.
+    /// The same object can be used in different sequences, and it will have a different data in then.
     /// </summary>
     [DataField(required: true)]
-    public Dictionary<string, FoodSequenceElementEntry> Entries = new();
+    public Dictionary<ProtoId<TagPrototype>, ProtoId<FoodSequenceElementPrototype>> Entries = new();
 
     /// <summary>
-    /// which solution we will add to the main dish
+    /// Which solution we will add to the main dish
     /// </summary>
     [DataField]
     public string Solution = "food";
diff --git a/Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs b/Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs
index b8186fdaf09..36136095f5c 100644
--- a/Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs
+++ b/Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs
@@ -1,7 +1,11 @@
 using System.Numerics;
 using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.Nutrition.Prototypes;
+using Content.Shared.Tag;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
 
 namespace Content.Shared.Nutrition.Components;
 
@@ -15,7 +19,7 @@ public sealed partial class FoodSequenceStartPointComponent : Component
     /// A key that determines which types of food elements can be attached to a food.
     /// </summary>
     [DataField(required: true)]
-    public string Key = string.Empty;
+    public ProtoId<TagPrototype> Key = string.Empty;
 
     /// <summary>
     /// The maximum number of layers of food that can be placed on this item.
@@ -24,43 +28,141 @@ public sealed partial class FoodSequenceStartPointComponent : Component
     public int MaxLayers = 10;
 
     /// <summary>
-    /// Start shift from the center of the sprite where the first layer of food will be placed.
+    /// Can we put more layers?
+    /// </summary>
+    [DataField]
+    public bool Finished;
+
+    /// <summary>
+    /// list of sprite states to be displayed on this object.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public List<FoodSequenceElementEntry> FoodLayers = new();
+
+    public HashSet<string> RevealedLayers = new();
+
+
+    /// <summary>
+    /// solution where reagents will be added from newly added ingredients
+    /// </summary>
+    [DataField]
+    public string Solution = "food";
+
+    #region name generation
+
+    /// <summary>
+    /// LocId with a name generation pattern.
     /// </summary>
     [DataField]
     public Vector2 StartPosition = Vector2.Zero;
 
     /// <summary>
-    /// Shift from the start position applied to each subsequent layer.
+    /// the part of the name generation used in the pattern
     /// </summary>
     [DataField]
     public Vector2 Offset = Vector2.Zero;
 
     /// <summary>
-    /// Can we put more layers?
+    /// content in the form of all added ingredients will be separated by these symbols
     /// </summary>
     [DataField]
-    public bool Finished;
+    public string? ContentSeparator;
+
+    /// <summary>
+    /// the part of the name generation used in the pattern
+    /// </summary>
+    [DataField]
+    public LocId? NameSuffix;
+
+    #endregion
+
+    #region visual
 
     /// <summary>
     /// list of sprite states to be displayed on this object.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public List<FoodSequenceElementEntry> FoodLayers = new();
+    public List<FoodSequenceVisualLayer> FoodLayers = new();
 
-    public HashSet<string> RevealedLayers = new();
+    /// <summary>
+    /// If true, the generative layers will be placed in reverse order.
+    /// </summary>
+    [DataField]
+    public bool InverseLayers;
 
+    /// <summary>
+    /// target layer, where new layers will be added. This allows you to control the order of generative layers and static layers.
+    /// </summary>
     [DataField]
-    public string Solution = "food";
+    public string TargetLayerMap = "foodSequenceLayers";
 
+    /// <summary>
+    /// Start shift from the center of the sprite where the first layer of food will be placed.
+    /// </summary>
     [DataField]
-    public LocId? NameGeneration;
+    public Vector2 StartPosition = Vector2.Zero;
 
+    /// <summary>
+    /// Shift from the start position applied to each subsequent layer.
+    /// </summary>
     [DataField]
-    public LocId? NamePrefix;
+    public Vector2 Offset = Vector2.Zero;
 
+    /// <summary>
+    /// each layer will get a random offset in the specified range
+    /// </summary>
     [DataField]
-    public LocId? ContentSeparator;
+    public Vector2 MaxLayerOffset = Vector2.Zero;
 
+    /// <summary>
+    /// each layer will get a random offset in the specified range
+    /// </summary>
     [DataField]
-    public LocId? NameSuffix;
+    public Vector2 MinLayerOffset = Vector2.Zero;
+
+    [DataField]
+    public bool AllowHorizontalFlip = true;
+
+    public HashSet<string> RevealedLayers = new();
+
+    #endregion
+}
+
+/// <summary>
+/// class that synchronizes with the client
+/// Stores all the necessary information for rendering the FoodSequence element
+/// </summary>
+[DataRecord, Serializable, NetSerializable]
+public record struct FoodSequenceVisualLayer
+{
+    /// <summary>
+    /// reference to the original prototype of the layer. Used to edit visual layers.
+    /// </summary>
+    public ProtoId<FoodSequenceElementPrototype> Proto;
+
+    /// <summary>
+    /// Sprite rendered in sequence
+    /// </summary>
+    public SpriteSpecifier? Sprite { get; set; } = SpriteSpecifier.Invalid;
+
+    /// <summary>
+    /// Relative size of the sprite displayed in FoodSequence
+    /// </summary>
+    public Vector2 Scale { get; set; } = Vector2.One;
+
+    /// <summary>
+    /// The offset of a particular layer. Allows a little position randomization of each layer.
+    /// </summary>
+    public Vector2 LocalOffset { get; set; } = Vector2.Zero;
+
+    public FoodSequenceVisualLayer(ProtoId<FoodSequenceElementPrototype> proto,
+        SpriteSpecifier? sprite,
+        Vector2 scale,
+        Vector2 offset)
+    {
+        Proto = proto;
+        Sprite = sprite;
+        Scale = scale;
+        LocalOffset = offset;
+    }
 }
diff --git a/Content.Shared/Nutrition/Events.cs b/Content.Shared/Nutrition/Events.cs
index abba2583ba4..d15fcbbf1e3 100644
--- a/Content.Shared/Nutrition/Events.cs
+++ b/Content.Shared/Nutrition/Events.cs
@@ -1,5 +1,8 @@
 using Content.Shared.Chemistry.Components;
 using Content.Shared.DoAfter;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.Prototypes;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Nutrition;
@@ -67,3 +70,8 @@ public record struct SliceFoodEvent();
 public sealed partial class SliceFoodDoAfterEvent : SimpleDoAfterEvent
 {
 }
+
+/// <summary>
+///    Raised on FoodSequence start element entity when new ingredient is added to FoodSequence
+/// </summary>
+public record struct FoodSequenceIngredientAddedEvent(EntityUid Start, EntityUid Element, ProtoId<FoodSequenceElementPrototype> Proto, EntityUid? User = null);
diff --git a/Content.Shared/Nutrition/FoodMetamorphRules/FoodMetamorphRule.cs b/Content.Shared/Nutrition/FoodMetamorphRules/FoodMetamorphRule.cs
new file mode 100644
index 00000000000..9e59573ff85
--- /dev/null
+++ b/Content.Shared/Nutrition/FoodMetamorphRules/FoodMetamorphRule.cs
@@ -0,0 +1,218 @@
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Destructible.Thresholds;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Tag;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Nutrition.FoodMetamorphRules;
+
+/// <summary>
+/// abstract rules that are used to verify the correct foodSequence for recipe
+/// </summary>
+[ImplicitDataDefinitionForInheritors]
+[Serializable, NetSerializable]
+public abstract partial class FoodMetamorphRule
+{
+    public abstract bool Check(IPrototypeManager protoMan, EntityManager entMan, EntityUid food, List<FoodSequenceVisualLayer> ingredients);
+}
+
+/// <summary>
+/// The requirement that the sequence be within the specified size limit
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class SequenceLength : FoodMetamorphRule
+{
+    [DataField(required: true)]
+    public MinMax Range;
+
+    public override bool Check(IPrototypeManager protoMan, EntityManager entMan, EntityUid food, List<FoodSequenceVisualLayer> ingredients)
+    {
+        return ingredients.Count <= Range.Max && ingredients.Count >= Range.Min;
+    }
+}
+
+/// <summary>
+/// A requirement that the last element of the sequence have one or all of the required tags
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class LastElementHasTags : FoodMetamorphRule
+{
+    [DataField(required: true)]
+    public List<ProtoId<TagPrototype>> Tags = new ();
+
+    [DataField]
+    public bool NeedAll = true;
+
+    public override bool Check(IPrototypeManager protoMan, EntityManager entMan, EntityUid food, List<FoodSequenceVisualLayer> ingredients)
+    {
+        var lastIngredient = ingredients[ingredients.Count - 1];
+
+        if (!protoMan.TryIndex(lastIngredient.Proto, out var protoIndexed))
+            return false;
+
+        foreach (var tag in Tags)
+        {
+            var containsTag = protoIndexed.Tags.Contains(tag);
+
+            if (NeedAll && !containsTag)
+            {
+                return false;
+            }
+
+            if (!NeedAll && containsTag)
+            {
+                return true;
+            }
+        }
+
+        return NeedAll;
+    }
+}
+
+/// <summary>
+/// A requirement that the specified sequence element have one or all of the required tags
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class ElementHasTags : FoodMetamorphRule
+{
+    [DataField(required: true)]
+    public int ElementNumber = 0;
+
+    [DataField(required: true)]
+    public List<ProtoId<TagPrototype>> Tags = new ();
+
+    [DataField]
+    public bool NeedAll = true;
+
+    public override bool Check(IPrototypeManager protoMan, EntityManager entMan, EntityUid food, List<FoodSequenceVisualLayer> ingredients)
+    {
+        if (ingredients.Count < ElementNumber + 1)
+            return false;
+
+        if (!protoMan.TryIndex(ingredients[ElementNumber].Proto, out var protoIndexed))
+            return false;
+
+        foreach (var tag in Tags)
+        {
+            var containsTag = protoIndexed.Tags.Contains(tag);
+
+            if (NeedAll && !containsTag)
+            {
+                return false;
+            }
+
+            if (!NeedAll && containsTag)
+            {
+                return true;
+            }
+        }
+
+        return NeedAll;
+    }
+}
+
+/// <summary>
+/// requirement that the food contains certain reagents (e.g. sauces)
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class FoodHasReagent : FoodMetamorphRule
+{
+    [DataField(required: true)]
+    public ProtoId<ReagentPrototype> Reagent = new();
+
+    [DataField(required: true)]
+    public MinMax Count;
+
+    [DataField]
+    public string Solution = "food";
+
+    public override bool Check(IPrototypeManager protoMan, EntityManager entMan, EntityUid food, List<FoodSequenceVisualLayer> ingredients)
+    {
+        if (!entMan.TryGetComponent<SolutionContainerManagerComponent>(food, out var solMan))
+            return false;
+
+        var solutionMan = entMan.System<SharedSolutionContainerSystem>();
+
+        if (!solutionMan.TryGetSolution(food, Solution, out var foodSoln, out var foodSolution))
+            return false;
+
+        foreach (var (id, quantity) in foodSoln.Value.Comp.Solution.Contents)
+        {
+            if (id.Prototype != Reagent.Id)
+                continue;
+
+            if (quantity < Count.Min || quantity > Count.Max)
+                break;
+
+            return true;
+        }
+
+        return false;
+    }
+}
+
+/// <summary>
+/// A requirement that there be X ingredients in the sequence that have one or all of the specified tags.
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class IngredientsWithTags : FoodMetamorphRule
+{
+    [DataField(required: true)]
+    public List<ProtoId<TagPrototype>> Tags = new ();
+
+    [DataField(required: true)]
+    public MinMax Count = new();
+
+    [DataField]
+    public bool NeedAll = true;
+
+    public override bool Check(IPrototypeManager protoMan, EntityManager entMan, EntityUid food, List<FoodSequenceVisualLayer> ingredients)
+    {
+        var count = 0;
+        foreach (var ingredient in ingredients)
+        {
+            if (!protoMan.TryIndex(ingredient.Proto, out var protoIndexed))
+                continue;
+
+            var allowed = false;
+            if (NeedAll)
+            {
+                allowed = true;
+                foreach (var tag in Tags)
+                {
+                    if (!protoIndexed.Tags.Contains(tag))
+                    {
+                        allowed = false;
+                        break;
+                    }
+                }
+            }
+            else
+            {
+                allowed = false;
+                foreach (var tag in Tags)
+                {
+                    if (protoIndexed.Tags.Contains(tag))
+                    {
+                        allowed = true;
+                        break;
+                    }
+                }
+            }
+
+            if (allowed)
+                count++;
+        }
+
+        return count >= Count.Min && count <= Count.Max;
+    }
+}
diff --git a/Content.Shared/Nutrition/Prototypes/FoodSequenceElementPrototype.cs b/Content.Shared/Nutrition/Prototypes/FoodSequenceElementPrototype.cs
index 931d8a35327..c888e9d883f 100644
--- a/Content.Shared/Nutrition/Prototypes/FoodSequenceElementPrototype.cs
+++ b/Content.Shared/Nutrition/Prototypes/FoodSequenceElementPrototype.cs
@@ -1,3 +1,42 @@
+using Content.Shared.Tag;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Nutrition.Prototypes;
+
+/// <summary>
+/// Unique data storage block for different FoodSequence layers
+/// </summary>
+[Prototype("foodSequenceElement")]
+public sealed partial class FoodSequenceElementPrototype : IPrototype
+{
+    [IdDataField] public string ID { get; private set; } = default!;
+
+    /// <summary>
+    /// sprite options. A random one will be selected and used to display the layer.
+    /// </summary>
+    [DataField]
+    public List<SpriteSpecifier> Sprites { get; private set; } = new();
+
+    /// <summary>
+    /// A localized name piece to build into the item name generator.
+    /// </summary>
+    [DataField]
+    public LocId? Name { get; private set; }
+
+    /// <summary>
+    /// If the layer is the final one, it can be added over the limit, but no other layers can be added after it.
+    /// </summary>
+    [DataField]
+    public bool Final { get; private set; }
+
+    /// <summary>
+    /// Tag list of this layer. Used for recipes for food metamorphosis.
+    /// </summary>
+    [DataField]
+    public List<ProtoId<TagPrototype>> Tags { get; set; }  = new();
+}
+
 using Content.Shared.Tag;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
diff --git a/Content.Shared/Nutrition/Prototypes/MetamorphRecipePrototype.cs b/Content.Shared/Nutrition/Prototypes/MetamorphRecipePrototype.cs
new file mode 100644
index 00000000000..977cb7a74d9
--- /dev/null
+++ b/Content.Shared/Nutrition/Prototypes/MetamorphRecipePrototype.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Nutrition.FoodMetamorphRules;
+using Content.Shared.Tag;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Nutrition.Prototypes;
+
+/// <summary>
+/// Stores a recipe so that FoodSequence assembled in the right sequence can turn into a special meal.
+/// </summary>
+[Prototype]
+public sealed partial class MetamorphRecipePrototype : IPrototype
+{
+    [IdDataField] public string ID { get; private set; } = default!;
+
+    /// <summary>
+    /// The key of the FoodSequence being collected. For example “burger” “taco” etc.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<TagPrototype> Key = string.Empty;
+
+    /// <summary>
+    /// The entity that will be created as a result of this recipe, and into which all the reagents will be transferred.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId Result = default!;
+
+    /// <summary>
+    /// A sequence of rules that must be followed for FoodSequence to metamorphose into a special food.
+    /// </summary>
+    [DataField]
+    public List<FoodMetamorphRule> Rules = new();
+}
diff --git a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
index 36f2004b1b7..75be4336102 100644
--- a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
+++ b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
@@ -7,6 +7,7 @@ food-sequence-burger-suffix = burger
 food-sequence-burger-content-raw-meat = raw
 food-sequence-burger-content-carp = carpo
 food-sequence-burger-content-bear = bear
+food-sequence-burger-content-crab = crabs
 food-sequence-burger-content-penguin = peng
 food-sequence-burger-content-chiken = chiken
 food-sequence-burger-content-duck = duck
diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml
index 5b073446010..dd8526be990 100644
--- a/Resources/Prototypes/Body/Organs/human.yml
+++ b/Resources/Prototypes/Body/Organs/human.yml
@@ -70,11 +70,8 @@
       - people
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-brain
-        sprite:
-          sprite: Mobs/Species/Human/organs.rsi
-          state: brain
+      Burger: Brain
+      Taco: Brain
   
 - type: entity
   id: OrganHumanEyes
@@ -98,13 +95,6 @@
   components:
   - type: Sprite
     state: tongue
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-tongue
-        sprite:
-          sprite: Mobs/Species/Human/organs.rsi
-          state: tongue
 
 - type: entity
   id: OrganHumanAppendix
@@ -132,13 +122,6 @@
   components:
   - type: Sprite
     state: ears
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-ears
-        sprite:
-          sprite: Mobs/Species/Human/organs.rsi
-          state: ears
 
 - type: entity
   id: OrganHumanLungs
@@ -228,13 +211,6 @@
     groups:
     - id: Food
     - id: Drink
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-stomach
-        sprite:
-          sprite: Mobs/Species/Human/organs.rsi
-          state: stomach
 
 - type: entity
   id: OrganHumanLiver
@@ -253,13 +229,6 @@
     groups:
     - id: Alcohol
       rateModifier: 0.1 # removes alcohol very slowly along with the stomach removing it as a drink
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-liver
-        sprite:
-          sprite: Mobs/Species/Human/organs.rsi
-          state: liver
 
 - type: entity
   id: OrganHumanKidneys
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index e05975f75de..b45d8e01b12 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1767,6 +1767,11 @@
     interfaces:
       enum.SurgeryUIKey.Key:
         type: SurgeryBui
+  - type: FoodSequenceElement
+    entries:
+      Taco: RatTaco
+      Burger: RatBurger
+      Skewer: RatSkewer
 
 - type: entity
   parent: MobMouse
@@ -1820,6 +1825,9 @@
         Base: dead-1
       Dead:
         Base: splat-1
+  - type: Item
+    size: Tiny
+    heldPrefix: 1
 
 - type: entity
   parent: MobMouse
@@ -1846,6 +1854,44 @@
         Base: dead-2
       Dead:
         Base: splat-2
+  - type: Item
+    size: Tiny
+    heldPrefix: 2
+
+- type: entity
+  name: cancer mouse
+  description: Toxic. Squeak!
+  parent: MobMouse
+  id: MobMouseCancer
+  components:
+  - type: Sprite
+    color: LightGreen
+  - type: PointLight
+    color: LightGreen
+    radius: 5
+    energy: 5
+    netsync: false
+  - type: RadiationSource
+    intensity: 0.3
+  - type: Bloodstream
+    bloodReagent: UnstableMutagen
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 3
+        - ReagentId: Uranium
+          Quantity: 10
+  - type: Butcherable
+    spawned:
+    - id: FoodMeatRat
+      amount: 1
+    - id: SheetUranium1
+      amount: 1
+  - type: Damageable
+    damageContainer: Biological
+    damageModifierSet: Zombie
 
 - type: entity
   name: lizard #Weh
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
index 922d4938885..2e23ab4e69a 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -784,3 +784,7 @@
   - type: Tag
     tags:
     - Slice
+  - type: FoodSequenceElement
+    entries:
+      Taco: Suppermatter
+      Burger: SuppermatterBurger
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
index 8009779a36d..282bf14aadb 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
@@ -37,17 +37,19 @@
   - type: Sprite
     drawdepth: Mobs
     noRot: true
-    sprite: Objects/Consumable/Food/burger.rsi
+    sprite: Objects/Consumable/Food/burger_sequence.rsi
     layers:
     - state: bun_bottom
   - type: FoodSequenceStartPoint
-    key: burger
-    maxLayers: 20
+    key: Burger
+    maxLayers: 10
     startPosition: 0, 0
-    offset: 0, 0.1
-    nameGeneration: food-sequence-standart-gen
-    nameSuffix: food-sequence-burger-suffix
+    offset: 0, 0.07
+    minLayerOffset: -0.05, 0
+    maxLayerOffset: 0.05, 0
+    nameGeneration: food-sequence-burger-gen
   - type: Appearance
+  - type: FoodMetamorphableByAdding
   - type: SolutionContainerManager
     solutions:
       food:
@@ -64,7 +66,7 @@
   components:
   - type: Food
   - type: Sprite
-    sprite: Objects/Consumable/Food/burger.rsi
+    sprite: Objects/Consumable/Food/burger_sequence.rsi
     layers:
     - state: bun_top
   - type: SolutionContainerManager
@@ -76,11 +78,7 @@
           Quantity: 3.3 # 1/2 of a bun
   - type: FoodSequenceElement
     entries:
-      burger:
-        final: true
-        sprite:
-          sprite: Objects/Consumable/Food/burger.rsi
-          state: bun_top
+      Burger: BunTopBurger
   
 # Base
 
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
index 06fff118d19..af313f89eb5 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -524,11 +524,8 @@
     - Slice
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-cheese
-        sprite:
-          sprite: Objects/Consumable/Food/ingredients.rsi
-          state: cheesewedge
+      Taco: CheeseTaco
+      Burger: CheeseBurger
 
 - type: entity
   name: chèvre log
@@ -680,6 +677,9 @@
       reagents:
       - ReagentId: CocoaPowder
         Quantity: 2
+  - type: Tag
+    tags:
+      - Ingredient
 
 - type: entity
   parent: BaseFoodCondimentPacket
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index d363b9b56db..6b7dc94b070 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -106,13 +106,6 @@
     graph: MeatSteak
     node: start
     defaultTarget: meat steak
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-raw-meat
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: plain
   - type: Tag
     tags:
     - Meat
@@ -157,13 +150,6 @@
         reagents:
         - ReagentId: CarpoToxin
           Quantity: 5
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-carp
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: fish
   - type: Extractable
     juiceSolution:
       reagents:
@@ -199,13 +185,6 @@
     graph: Bacon
     node: start
     defaultTarget: bacon
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-carp
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: bacon
 
 - type: entity
   name: raw bear meat
@@ -230,14 +209,6 @@
     graph: BearSteak
     node: start
     defaultTarget: filet migrawr
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-bear
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: bear
-
 
 - type: entity
   name: raw penguin meat
@@ -262,13 +233,6 @@
     graph: PenguinSteak
     node: start
     defaultTarget: cooked penguin
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-penguin
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: bird
 
 - type: entity
   name: raw chicken meat
@@ -295,13 +259,6 @@
     graph: ChickenSteak
     node: start
     defaultTarget: cooked chicken
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-chiken
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: bird
 
 - type: entity
   name: raw duck meat
@@ -326,13 +283,6 @@
     graph: DuckSteak
     node: start
     defaultTarget: cooked duck
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-penguin
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: bird
 
 - type: entity
   name: prime-cut corgi meat
@@ -358,13 +308,6 @@
     price: 750
   - type: StealTarget
     stealGroup: FoodMeatCorgi
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-corgi
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: corgi
 
 - type: entity
   name: raw crab meat
@@ -389,13 +332,6 @@
     graph: CrabSteak
     node: start
     defaultTarget: cooked crab
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-crab
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: crab
 
 - type: entity
   name: raw goliath meat
@@ -419,13 +355,6 @@
     graph: GoliathSteak
     node: start
     defaultTarget: goliath steak
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-goliath
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: goliath
 
 - type: entity
   name: dragon flesh
@@ -453,13 +382,6 @@
       reagents:
       - ReagentId: Ichor
         Quantity: 10
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-dragon
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: dragon
 
 - type: entity
   name: raw rat meat
@@ -480,13 +402,6 @@
   - type: SliceableFood
     count: 3
     slice: FoodMeatCutlet
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-rat
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: plain
 
 - type: entity
   name: raw lizard meat
@@ -511,13 +426,6 @@
     graph: LizardSteak
     node: start
     defaultTarget: lizard steak
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-lizard
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: lizard
 
 - type: entity
   name: raw plant meat
@@ -527,13 +435,6 @@
   components:
   - type: Sprite
     state: plant
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-plant
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: plant
 
 - type: entity
   name: rotten meat
@@ -557,13 +458,6 @@
           Quantity: 4
         - ReagentId: Fat
           Quantity: 4
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-rotten
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: rotten
 
 - type: entity
   name: raw spider meat
@@ -584,13 +478,6 @@
   - type: SliceableFood
     count: 3
     slice: FoodMeatSpiderCutlet
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-spider
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: spider
 
 - type: entity
   name: raw spider leg
@@ -608,13 +495,6 @@
           Quantity: 10
         - ReagentId: Fat
           Quantity: 3
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-spider
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: spiderleg
 
 - type: entity
   name: meatwheat clump
@@ -633,13 +513,6 @@
         reagents:
         - ReagentId: UncookedAnimalProteins
           Quantity: 1
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-clump
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: clump
 
 - type: entity
   name: raw snake meat
@@ -660,13 +533,6 @@
           Quantity: 10
         - ReagentId: Toxin
           Quantity: 2
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-snake
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: snake
 
 - type: entity
   name: raw xeno meat
@@ -694,13 +560,6 @@
   - type: SliceableFood
     count: 3
     slice: FoodMeatXenoCutlet
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-xeno
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: xeno
 
 - type: entity
   name: raw rouny meat
@@ -730,13 +589,6 @@
     graph: RounySteak
     node: start
     defaultTarget: rouny steak
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-xeno
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: xeno
 
 - type: entity
   name: killer tomato meat
@@ -751,13 +603,6 @@
     slice: FoodMeatTomatoCutlet
   - type: StaticPrice
     price: 100
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-tomato
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: tomato
 
 - type: entity
   name: salami
@@ -803,13 +648,6 @@
     state: clown
   - type: SliceableFood
     slice: FoodMeatSalamiSlice
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-clown
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: clown
 
 - type: entity
   name: meatball
@@ -823,13 +661,6 @@
     - Meat
   - type: Sprite
     state: meatball
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-raw-meat
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: meatball
 
 - type: entity
   name: slimeball
@@ -846,13 +677,26 @@
     - Meat
   - type: Sprite
     state: slime
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-slime
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: slime
+
+- type: entity
+  name: raw snail meat
+  parent: FoodMeatRawBase
+  id: FoodMeatSnail
+  description: Improved with salt.
+  components:
+  - type: Sprite
+    state: snail
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 15
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 3
+        - ReagentId: Fat
+          Quantity: 3
+        - ReagentId: Water
+          Quantity: 4 #It makes saline if you add salt!
 
 # Cooked
 
@@ -918,10 +762,8 @@
     node: meat steak
   - type: FoodSequenceElement
     entries:
-      burger:
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: plain-cooked
+      Burger: MeatSteak
+      Taco: MeatSteak
 
 - type: entity
   name: bacon
@@ -955,8 +797,8 @@
     node: bacon
   - type: FoodSequenceElement
     entries:
-      Burger: MeatBacon
-      Taco: MeatBacon
+      Burger: MeatBecon
+      Taco: MeatBecon
 
 - type: entity
   name: cooked bear
@@ -988,11 +830,8 @@
     node: filet migrawr
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-bear
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: product-cooked
+      Burger: MeatBearBurger
+      Taco: MeatBear
 
 - type: entity
   name: penguin filet
@@ -1023,11 +862,8 @@
     node: cooked penguin
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-penguin
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: bird-cooked
+      Burger: MeatPenguinBurger
+      Taco: MeatPenguin
 
 - type: entity
   name: cooked chicken
@@ -1058,11 +894,8 @@
     node: cooked chicken
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-chiken
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: bird-cooked
+      Burger: MeatChicken
+      Taco: MeatChicken
 
 - type: entity
   name: fried chicken
@@ -1093,11 +926,8 @@
           Quantity: 5
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-chiken
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: chicken-fried
+      Burger: MeatChicken
+      Taco: MeatChicken
 
 - type: entity
   name: cooked duck
@@ -1128,11 +958,8 @@
     node: cooked duck
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-duck
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: bird-cooked
+      Burger: MeatDuck
+      Taco: MeatDuck
 
 - type: entity
   name: cooked crab
@@ -1163,11 +990,8 @@
     node: cooked crab
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-crab
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: crab-cooked
+      Burger: MeatCrabBurger
+      Taco: MeatCrab
 
 - type: entity
   name: goliath steak
@@ -1196,11 +1020,8 @@
     node: goliath steak
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-goliath
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: goliath-cooked
+      Burger: MeatGoliathBurger
+      Taco: MeatGoliath
 
 - type: entity
   name: rouny steak
@@ -1233,11 +1054,8 @@
     node: rouny steak
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-xeno
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: rouny-cooked
+      Burger: MeatXeno
+      Taco: MeatXeno
 
 - type: entity
   name: lizard steak
@@ -1269,11 +1087,8 @@
     node: lizard steak
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-lizard
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: lizard-cooked
+      Burger: MeatLizardBurger
+      Taco: MeatLizard
 
 - type: entity
   name: boiled spider leg
@@ -1298,11 +1113,8 @@
           Quantity: 5
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-spider
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: spiderleg-cooked
+      Burger: MeatSpiderBurger
+      Taco: MeatSpider
 
 - type: entity
   name: meatball
@@ -1326,10 +1138,37 @@
           Quantity: 5
   - type: FoodSequenceElement
     entries:
-      burger:
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: meatball-cooked
+      Burger: MeatBall
+      Taco: MeatBall
+
+- type: entity
+  name: boiled snail
+  parent: FoodMeatBase
+  id: FoodMeatSnailCooked
+  description: Improved with salt.
+  components:
+  - type: Tag
+    tags:
+    - Cooked
+    - Meat
+  - type: Sprite
+    layers:
+    - state: snail-cooked
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 15
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 3
+        - ReagentId: Protein
+          Quantity: 3
+        - ReagentId: Water
+          Quantity: 4 # makes saline if you add salt!
+  - type: FoodSequenceElement
+    entries:
+      Burger: MeatSnail
+      Taco: MeatSnail
 
 # Cutlets
 
@@ -1356,12 +1195,10 @@
           Quantity: 3
         - ReagentId: Fat
           Quantity: 2
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: cutlet
+  - type: Construction
+    graph: Cutlet
+    node: start
+    defaultTarget: cutlet
 
 - type: entity
   name: raw bear cutlet
@@ -1387,14 +1224,10 @@
           Quantity: 3
         - ReagentId: Fat
           Quantity: 2
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-bear
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: cutlet
-          color: brown
+  - type: Construction
+    graph: BearCutlet
+    node: start
+    defaultTarget: bear cutlet
 
 - type: entity
   name: raw penguin cutlet
@@ -1418,14 +1251,10 @@
           Quantity: 3
         - ReagentId: Fat
           Quantity: 2
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-penguin
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: cutlet
-          color: white
+  - type: Construction
+    graph: PenguinCutlet
+    node: start
+    defaultTarget: penguin cutlet
 
 - type: entity
   name: raw chicken cutlet
@@ -1449,14 +1278,10 @@
           Quantity: 3
         - ReagentId: Fat
           Quantity: 2
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-chiken
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: cutlet
-          color: white
+  - type: Construction
+    graph: ChickenCutlet
+    node: start
+    defaultTarget: chicken cutlet
 
 - type: entity
   name: raw duck cutlet
@@ -1480,14 +1305,10 @@
           Quantity: 3
         - ReagentId: Fat
           Quantity: 2
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-duck
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: cutlet
-          color: white
+  - type: Construction
+    graph: DuckCutlet
+    node: start
+    defaultTarget: duck cutlet
 
 - type: entity
   name: raw lizard cutlet
@@ -1514,14 +1335,10 @@
           Quantity: 3
         - ReagentId: Fat
           Quantity: 2
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-lizard
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: cutlet
-          color: pink
+  - type: Construction
+    graph: LizardCutlet
+    node: start
+    defaultTarget: lizard cutlet
 
 - type: entity
   name: raw spider cutlet
@@ -1544,13 +1361,10 @@
           Quantity: 3
         - ReagentId: Fat
           Quantity: 2
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-spider
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: spidercutlet
+  - type: Construction
+    graph: SpiderCutlet
+    node: start
+    defaultTarget: spider cutlet
 
 - type: entity
   name: raw xeno cutlet
@@ -1575,13 +1389,10 @@
         reagents:
         - ReagentId: SulfuricAcid
           Quantity: 20
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-xeno
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: xenocutlet
+  - type: Construction
+    graph: XenoCutlet
+    node: start
+    defaultTarget: xeno cutlet
 
 - type: entity
   name: raw killer tomato cutlet
@@ -1598,13 +1409,6 @@
     color: red
   - type: StaticPrice
     price: 30
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-tomato
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: salami-slice
 
 - type: entity
   name: salami slice
@@ -1627,13 +1431,6 @@
           Quantity: 1
         - ReagentId: Protein
           Quantity: 1
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-salami
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: salami-slice
 
 # Cooked
 
@@ -1658,12 +1455,13 @@
           Quantity: 2
         - ReagentId: Protein
           Quantity: 2
+  - type: Construction
+    graph: Cutlet
+    node: cutlet
   - type: FoodSequenceElement
     entries:
-      burger:
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: cutlet-cooked
+      Burger: MeatCutlet
+      Taco: MeatCutlet
 
 - type: entity
   name: bear cutlet
@@ -1689,13 +1487,13 @@
           Quantity: 2
         - ReagentId: Protein
           Quantity: 2
+  - type: Construction
+    graph: BearCutlet
+    node: bear cutlet
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-bear
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: cutlet-cooked
+      Burger: BearCutletBurger
+      Taco: BearCutlet
 
 - type: entity
   name: penguin cutlet
@@ -1719,13 +1517,13 @@
           Quantity: 2
         - ReagentId: Protein
           Quantity: 2
+  - type: Construction
+    graph: PenguinCutlet
+    node: penguin cutlet
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-penguin
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: cutlet-cooked
+      Burger: PenguinCutletBurger
+      Taco: PenguinCutlet
 
 - type: entity
   name: chicken cutlet
@@ -1749,13 +1547,13 @@
           Quantity: 2
         - ReagentId: Protein
           Quantity: 2
+  - type: Construction
+    graph: ChickenCutlet
+    node: chicken cutlet
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-chiken
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: cutlet-cooked
+      Burger: ChickenCutlet
+      Taco: ChickenCutlet
 
 - type: entity
   name: duck cutlet
@@ -1779,13 +1577,13 @@
           Quantity: 2
         - ReagentId: Protein
           Quantity: 2
+  - type: Construction
+    graph: DuckCutlet
+    node: duck cutlet
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-duck
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: cutlet-cooked
+      Burger: DuckCutlet
+      Taco: DuckCutlet
 
 - type: entity
   name: lizard cutlet
@@ -1810,13 +1608,13 @@
           Quantity: 2
         - ReagentId: Protein
           Quantity: 2
+  - type: Construction
+    graph: LizardCutlet
+    node: lizard cutlet
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-lizard
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: cutlet-cooked
+      Burger: LizardCutletBurger
+      Taco: LizardCutlet
 
 - type: entity
   name: spider cutlet
@@ -1839,13 +1637,13 @@
           Quantity: 1
         - ReagentId: Protein
           Quantity: 1
+  - type: Construction
+    graph: SpiderCutlet
+    node: spider cutlet
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-spider
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: cutlet-cooked
+      Burger: SpiderCutletBurger
+      Taco: SpiderCutlet
 
 - type: entity
   name: xeno cutlet
@@ -1868,10 +1666,10 @@
           Quantity: 1
         - ReagentId: Protein
           Quantity: 1
+  - type: Construction
+    graph: XenoCutlet
+    node: xeno cutlet
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-xeno
-        sprite:
-          sprite: Objects/Consumable/Food/meat.rsi
-          state: xenocutlet-cooked
+      Burger: XenoCutlet
+      Taco: XenoCutlet
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index 101639a3b31..b2b18b8c9cd 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -164,13 +164,6 @@
   - type: Tag
     tags:
     - Vegetable
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-pea
-        sprite:
-          sprite: Objects/Specific/Hydroponics/laughin_pea.rsi
-          state: produce
 
 - type: entity
   name: tower-cap log
@@ -233,7 +226,7 @@
   - type: Produce
     seedId: nettle
   - type: MeleeChemicalInjector
-    transferAmount: 3 #To OD someone you would need 2 nettles and about 6-7 hits, the DOT is likely to crit them if they are running away with almost no health
+    transferAmount: 3 #TODO someone you would need 2 nettles and about 6-7 hits, the DOT is likely to crit them if they are running away with almost no health
     solution: food
     pierceArmor: false
   - type: Extractable
@@ -309,11 +302,8 @@
     - Banana
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-banana
-        sprite:
-          sprite: Objects/Specific/Hydroponics/banana.rsi
-          state: produce
+      Burger: Banana
+      Taco: Banana
 
 - type: entity
   name: mimana
@@ -353,11 +343,8 @@
     - Fruit
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-mimana
-        sprite:
-          sprite: Objects/Specific/Hydroponics/mimana.rsi
-          state: produce
+      Burger: Mimana
+      Taco: Mimana
 
 - type: entity
   name: banana peel
@@ -505,11 +492,8 @@
         Quantity: 2
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-carrot
-        sprite:
-          sprite: Objects/Specific/Hydroponics/carrot.rsi
-          state: produce
+      Burger: CarrotBurger
+      Taco: Carrot
 
 - type: entity
   name: cabbage
@@ -538,11 +522,8 @@
     - Vegetable
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-cabbage
-        sprite:
-          sprite: Objects/Specific/Hydroponics/cabbage.rsi
-          state: produce
+      Burger: CabbageBurger
+      Taco: Cabbage
 
 - type: entity
   name: garlic
@@ -573,11 +554,8 @@
     - Vegetable
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-garlic
-        sprite:
-          sprite: Objects/Specific/Hydroponics/garlic.rsi
-          state: produce
+      Burger: GarlicBurger
+      Taco: Garlic
 
 - type: entity
   name: lemon
@@ -612,11 +590,8 @@
     - Fruit
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-lemon
-        sprite:
-          sprite: Objects/Specific/Hydroponics/lemon.rsi
-          state: produce
+      Burger: Lemon
+      Taco: Lemon
 
 - type: entity
   name: lemoon
@@ -650,11 +625,8 @@
     - Fruit
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-lemon
-        sprite:
-          sprite: Objects/Specific/Hydroponics/lemoon.rsi
-          state: produce
+      Burger: Lemoon
+      Taco: Lemoon
 
 - type: entity
   name: lime
@@ -680,11 +652,8 @@
     - Fruit
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-lemon
-        sprite:
-          sprite: Objects/Specific/Hydroponics/lime.rsi
-          state: produce
+      Burger: Lime
+      Taco: Lime
 
 - type: entity
   name: orange
@@ -709,52 +678,8 @@
     - Fruit
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-orange
-        sprite:
-          sprite: Objects/Specific/Hydroponics/orange.rsi
-          state: produce
-
-- type: entity
-  name: extradimensional orange
-  parent: FoodProduceBase
-  id: FoodExtradimensionalOrange
-  description: You can hardly wrap your head around this thing.
-  components:
-  - type: FlavorProfile
-    flavors:
-      - truenature
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 14
-        reagents:
-        - ReagentId: Haloperidol
-          Quantity: 5
-        - ReagentId: Nutriment
-          Quantity: 5
-        - ReagentId: Vitamin
-          Quantity: 4
-  - type: Sprite
-    sprite: Objects/Specific/Hydroponics/extradimensional_orange.rsi
-    scale: 0.5,0.5
-  - type: Produce
-    seedId: extradimensionalOrange
-  - type: PotencyVisuals
-    minimumScale: 0.5 # reduce this in size because the sprite is way too big
-    maximumScale: 1
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: JuiceOrange
-        Quantity: 10
-  - type: Tag
-    tags:
-    - Fruit
-  - type: FoodSequenceElement
-    entries:
-      Burger: ExtradimensionalOrangeBurger
-      Taco: ExtradimensionalOrange
+      Burger: Orange
+      Taco: Orange
 
 - type: entity
   name: pineapple
@@ -832,11 +757,8 @@
     - Vegetable
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-potato
-        sprite:
-          sprite: Objects/Specific/Hydroponics/potato.rsi
-          state: produce
+      Burger: Potato
+      Taco: Potato
 
 
 - type: entity
@@ -895,11 +817,9 @@
     - Vegetable
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-tomato
-        sprite:
-          sprite: Objects/Specific/Hydroponics/tomato.rsi
-          state: produce
+      Skewer: TomatoSkewer
+      Burger: Tomato
+      Taco: Tomato
 
 - type: entity
   name: blue tomato
@@ -947,11 +867,8 @@
     - Vegetable
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-tomato
-        sprite:
-          sprite: Objects/Specific/Hydroponics/blue_tomato.rsi
-          state: produce
+      Burger: BlueTomato
+      Taco: BlueTomato
 
 - type: entity
   name: blood tomato
@@ -997,11 +914,9 @@
     - Vegetable
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-tomato
-        sprite:
-          sprite: Objects/Specific/Hydroponics/blood_tomato.rsi
-          state: produce
+      Skewer: TomatoSkewer
+      Burger: BloodTomato
+      Taco: BloodTomato
 
 - type: entity
   name: eggplant
@@ -1062,11 +977,8 @@
     - Fruit
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-apple
-        sprite:
-          sprite: Objects/Specific/Hydroponics/apple.rsi
-          state: produce
+      Burger: Apple
+      Taco: Apple
 
 - type: entity
   name: golden apple
@@ -1105,11 +1017,8 @@
     - Fruit
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-apple
-        sprite:
-          sprite: Objects/Specific/Hydroponics/golden_apple.rsi
-          state: produce
+      Burger: GoldenApple
+      Taco: GoldenApple
 
 - type: entity
   name: cocoa pod
@@ -1143,13 +1052,6 @@
   - type: Tag
     tags:
     - Fruit
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-cocoa
-        sprite:
-          sprite: Objects/Specific/Hydroponics/cocoa.rsi
-          state: produce
 
 - type: entity
   name: ear of corn
@@ -1190,11 +1092,9 @@
         Quantity: 2
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-corn
-        sprite:
-          sprite: Objects/Specific/Hydroponics/corn.rsi
-          state: produce
+      Burger: Corn
+      Taco: Corn
+      Skewer: CornSkewer
 
 - type: entity
   name: corn cob
@@ -1217,13 +1117,6 @@
         reagents:
         - ReagentId: Cornmeal
           Quantity: 10
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-corn
-        sprite:
-          sprite: Objects/Specific/Hydroponics/corn.rsi
-          state: produce
 
 - type: entity
   name: onion
@@ -1255,13 +1148,6 @@
   - type: Tag
     tags:
     - Vegetable
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-onion
-        sprite:
-          sprite: Objects/Specific/Hydroponics/onion.rsi
-          state: produce
 
 - type: entity
   name: red onion
@@ -1293,13 +1179,6 @@
   - type: Tag
     tags:
     - Vegetable
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-onion
-        sprite:
-          sprite: Objects/Specific/Hydroponics/onion_red.rsi
-          state: produce
 
 - type: entity
   name: chanterelle cluster
@@ -1320,13 +1199,6 @@
   - type: Tag
     tags:
     - Vegetable
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-mushroom
-        sprite:
-          sprite: Objects/Specific/Hydroponics/chanterelle.rsi
-          state: produce
 
 # Slices
 
@@ -1372,11 +1244,8 @@
     - Slice
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-pineapple
-        sprite:
-          sprite: Objects/Specific/Hydroponics/pineapple.rsi
-          state: slice
+      Burger: PineappleSliceBurger
+      Taco: PineappleSlice
 
 - type: entity
   name: onion slice
@@ -1406,11 +1275,8 @@
     - Slice
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-onion
-        sprite:
-          sprite: Objects/Specific/Hydroponics/onion.rsi
-          state: slice
+      Burger: OnionSliceBurger
+      Taco: OnionSlice
 
 - type: entity
   name: red onion slice
@@ -1440,11 +1306,8 @@
     - Slice
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-onion
-        sprite:
-          sprite: Objects/Specific/Hydroponics/onion_red.rsi
-          state: slice
+      Burger: OnionRedSliceBurger
+      Taco: OnionRedSlice
 
 - type: entity
   name: chili pepper
@@ -1452,34 +1315,32 @@
   id: FoodChiliPepper
   description: Spicy, best not touch your eyes.
   components:
-    - type: FlavorProfile
-      flavors:
-        - spicy
-    - type: SolutionContainerManager
-      solutions:
-        food:
-          maxVol: 18
-          reagents:
-            - ReagentId: Nutriment
-              Quantity: 4
-            - ReagentId: CapsaicinOil
-              Quantity: 10
-            - ReagentId: Vitamin
-              Quantity: 4
-    - type: Sprite
-      sprite: Objects/Specific/Hydroponics/chili.rsi
-    - type: Produce
-      seedId: chili
-    - type: Tag
-      tags:
-      - Vegetable
-    - type: FoodSequenceElement
-      entries:
-        burger:
-          name: food-sequence-burger-content-chili
-          sprite:
-            sprite: Objects/Specific/Hydroponics/chili.rsi
-            state: produce
+  - type: FlavorProfile
+    flavors:
+      - spicy
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 18
+        reagents:
+          - ReagentId: Nutriment
+            Quantity: 4
+          - ReagentId: CapsaicinOil
+            Quantity: 10
+          - ReagentId: Vitamin
+            Quantity: 4
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/chili.rsi
+  - type: Produce
+    seedId: chili
+  - type: Tag
+    tags:
+    - Vegetable
+  - type: FoodSequenceElement
+    entries:
+      Taco: ChiliPepper
+      Burger: ChiliPepper
+      Skewer: ChiliPepperSkewer
 
 - type: entity
   name: chilly pepper
@@ -1487,32 +1348,30 @@
   id: FoodChillyPepper
   description: Icy hot.
   components:
-    - type: FlavorProfile
-      flavors:
-        - spicy
-        - cold
-    - type: SolutionContainerManager
-      solutions:
-        food:
-          maxVol: 18
-          reagents:
-            - ReagentId: Nutriment
-              Quantity: 4
-            - ReagentId: Frostoil
-              Quantity: 10
-            - ReagentId: Vitamin
-              Quantity: 4
-    - type: Sprite
-      sprite: Objects/Specific/Hydroponics/chilly.rsi
-    - type: Produce
-      seedId: chilly
-    - type: FoodSequenceElement
-      entries:
-        burger:
-          name: food-sequence-burger-content-chilly
-          sprite:
-            sprite: Objects/Specific/Hydroponics/chilly.rsi
-            state: produce
+  - type: FlavorProfile
+    flavors:
+      - spicy
+      - cold
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 18
+        reagents:
+          - ReagentId: Nutriment
+            Quantity: 4
+          - ReagentId: Frostoil
+            Quantity: 10
+          - ReagentId: Vitamin
+            Quantity: 4
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/chilly.rsi
+  - type: Produce
+    seedId: chilly
+  - type: FoodSequenceElement
+    entries:
+      Taco: ChillyPepper
+      Burger: ChillyPepper
+      Skewer: ChillyPepperSkewer
 
 - type: entity
   name: aloe
@@ -1543,11 +1402,8 @@
     - Vegetable
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-aloe
-        sprite:
-          sprite: Objects/Specific/Hydroponics/aloe.rsi
-          state: produce
+      Taco: Aloe
+      Burger: Aloe
 
 - type: entity
   name: poppy
@@ -1582,11 +1438,8 @@
     - Flower # TODO add "RedFlower" or "Poppy" tag, when other color flowers will be
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-poppy
-        sprite:
-          sprite: Objects/Specific/Hydroponics/poppy.rsi
-          state: produce
+      Taco: Poppy
+      Burger: Poppy
 
 - type: entity
   name: lily
@@ -1617,11 +1470,8 @@
     - Flower
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-lily
-        sprite:
-          sprite: Objects/Specific/Hydroponics/lily.rsi
-          state: produce
+      Taco: Lily
+      Burger: Lily
 
 - type: entity
   name: lingzhi
@@ -1650,11 +1500,8 @@
     grindableSolutionName: food
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-mushroom
-        sprite:
-          sprite: Objects/Specific/Hydroponics/lingzhi.rsi
-          state: produce
+      Taco: Lingzhi
+      Burger: Lingzhi
 
 - type: entity
   name: ambrosia vulgaris
@@ -1696,11 +1543,8 @@
     - Ambrosia
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-ambrosia
-        sprite:
-          sprite: Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi
-          state: produce
+      Taco: AmbrosiaVulgaris
+      Burger: AmbrosiaVulgarisBurger
 
 - type: entity
   name: ambrosia deus
@@ -1740,11 +1584,8 @@
     - Ambrosia
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-ambrosia
-        sprite:
-          sprite: Objects/Specific/Hydroponics/ambrosia_deus.rsi
-          state: produce
+      Taco: AmbrosiaDeus
+      Burger: AmbrosiaDeusBurger
 
 - type: entity
   name: galaxythistle
@@ -1774,11 +1615,8 @@
     - Fruit # Probably?
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-galaxy
-        sprite:
-          sprite: Objects/Specific/Hydroponics/galaxythistle.rsi
-          state: produce
+      Taco: Galaxythistle
+      Burger: GalaxythistleBurger
 
 - type: entity
   name: glasstle
@@ -1845,11 +1683,8 @@
     - Galaxythistle
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-glasstle
-        sprite:
-          sprite: Objects/Specific/Hydroponics/glasstle.rsi
-          state: produce
+      Taco: Glasstle
+      Burger: GlasstleBurger
 
 - type: entity
   name: fly amanita
@@ -1878,11 +1713,8 @@
   - type: BadFood
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-mushroom
-        sprite:
-          sprite: Objects/Specific/Hydroponics/fly_amanita.rsi
-          state: produce
+      Taco: FlyAmanita
+      Burger: FlyAmanita
 
 - type: entity
   name: gatfruit
@@ -1914,11 +1746,53 @@
     - Fruit # It's in the name
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-gatfruit
-        sprite:
-          sprite: Objects/Specific/Hydroponics/gatfruit.rsi
-          state: produce
+      Taco: Gatfruit
+      Burger: GatfruitBurger
+
+- type: entity
+  name: capfruit
+  parent: FoodProduceBase
+  id: FoodRealCapfruit
+  description: A soft but smooth gun-shaped fruit.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - plastic
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 10
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 5
+        - ReagentId: Sulfur
+          Quantity: 5
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/capfruit.rsi
+  - type: Produce
+    seedId: realCapfruit
+  - type: Food
+    trash:
+    - RevolverCapGun
+  - type: Tag
+    tags:
+    - Fruit
+  - type: FoodSequenceElement
+    entries:
+      Taco: Capfruit
+      Burger: CapfruitBurger
+
+- type: entity
+  name: capfruit
+  parent: FoodRealCapfruit
+  id: FoodFakeCapfruit
+  suffix: Fake
+  components:
+  - type: Produce
+    seedId: fakeCapfruit
+  - type: Food
+    trash:
+    - RevolverCapGunFake
 
 - type: entity
   name: rice bushel
@@ -1971,11 +1845,8 @@
     - Vegetable
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-soy
-        sprite:
-          sprite: Objects/Specific/Hydroponics/soybeans.rsi
-          state: produce
+      Taco: Soybeans
+      Burger: SoybeansBurger
 
 - type: entity
   name: spaceman's trumpet
@@ -2006,11 +1877,8 @@
     program: 56
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-soy
-        sprite:
-          sprite: Objects/Specific/Hydroponics/soybeans.rsi
-          state: produce
+      Taco: SpacemansTrumpet
+      Burger: SpacemansTrumpetBurger
 
 - type: entity
   name: koibean
@@ -2041,11 +1909,8 @@
     - Vegetable
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-koibean
-        sprite:
-          sprite: Objects/Specific/Hydroponics/koibean.rsi
-          state: produce
+      Taco: Koibean
+      Burger: KoibeanBurger
 
 - type: entity
   name: watermelon
@@ -2144,110 +2009,9 @@
     - Slice
   - type: FoodSequenceElement
     entries:
-      burger:
-        name: food-sequence-burger-content-watermelon
-        sprite:
-          sprite: Objects/Specific/Hydroponics/watermelon.rsi
-          state: slice
-
-- type: entity
-  name: holymelon
-  parent: [FoodProduceBase, ItemHeftyBase]
-  id: FoodHolymelon
-  description: The water within this melon has been blessed by some deity that's particularly fond of watermelon.
-  components:
-  - type: Item
-    size: Small
-  - type: FlavorProfile
-    flavors:
-      - holy
-      - watermelon
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 25
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 10
-        - ReagentId: Vitamin
-          Quantity: 5
-        - ReagentId: Holywater
-          Quantity: 10
-  - type: Sprite
-    sprite: Objects/Specific/Hydroponics/holymelon.rsi
-  - type: Produce
-    seedId: watermelon
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Wine
-        Quantity: 20
-  - type: Damageable
-    damageContainer: Biological
-  - type: DamageOnHighSpeedImpact
-    minimumSpeed: 0.1
-    damage:
-      types:
-        Blunt: 1
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 1
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: desecration
-      - !type:SpillBehavior
-        solution: food
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-  - type: SliceableFood
-    count: 5
-    slice: FoodHolymelonSlice
-  - type: Tag
-    tags:
-    - Fruit
-
-- type: entity
-  name: holymelon slice
-  parent: ProduceSliceBase
-  id: FoodHolymelonSlice
-  description: Juicy golden and red slice.
-  components:
-  - type: Item
-    size: Tiny
-  - type: FlavorProfile
-    flavors:
-      - holy
-      - watermelon
-  - type: Sprite
-    sprite: Objects/Specific/Hydroponics/holymelon.rsi
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 2
-        - ReagentId: Vitamin
-          Quantity: 1
-        - ReagentId: Holywater
-          Quantity: 2
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Wine
-        Quantity: 4
-  - type: Tag
-    tags:
-    - Fruit
-    - Slice
-  - type: FoodSequenceElement
-    entries:
-      Burger: HolymelonSliceBurger
-      Taco: HolymelonSlice
-      Skewer: HolymelonSliceSkewer
+      Burger: WatermelonSliceBurger
+      Taco: WatermelonSlice
+      Skewer: WatermelonSliceSkewer
 
 - type: entity
   name: grapes
@@ -2310,6 +2074,10 @@
   - type: Tag
     tags:
     - Fruit
+  - type: FoodSequenceElement
+    entries:
+      Taco: Berries
+      Burger: BerriesBurger
 
 - type: entity
   name: bungo fruit
@@ -2339,6 +2107,10 @@
   - type: Tag
     tags:
     - Fruit
+  - type: FoodSequenceElement
+    entries:
+      Taco: Bungo
+      Burger: Bungo
 
 - type: entity
   name: bungo pit
@@ -2423,8 +2195,8 @@
     - Vegetable
   - type: FoodSequenceElement
     entries:
-      Taco: WorldPea
-      Burger: WorldPeaBurger
+      Taco: Pea
+      Burger: Pea
 
 - type: entity
   name: pumpkin
@@ -2536,3 +2308,70 @@
     - CottonBoll
   - type: Extractable
     grindableSolutionName: food
+
+- type: entity
+  name: cherry
+  parent: FoodProduceBase
+  id: FoodCherry
+  description: Juicy red cherry with a pit inside.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - cherry
+  - type: Food
+    trash:
+    - TrashCherryPit
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 8
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 3
+        - ReagentId: Vitamin
+          Quantity: 3
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/cherry.rsi
+  - type: Produce
+    seedId: cherry
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: JuiceCherry
+        Quantity: 5
+  - type: Tag
+    tags:
+    - Fruit
+  - type: FoodSequenceElement
+    entries:
+      Taco: Cherry
+      Burger: Cherry
+
+- type: entity
+  name: cherry pit
+  parent: FoodInjectableBase
+  id: TrashCherryPit
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/cherry.rsi
+    state: pit
+  - type: Item
+    sprite: Objects/Specific/Hydroponics/cherry.rsi
+    heldPrefix: pit
+  - type: Tag
+    tags:
+    - Recyclable
+    - Trash
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 1
+        reagents:
+        - ReagentId: Toxin
+          Quantity: 1
+  - type: Extractable
+    grindableSolutionName: food
+  - type: Seed
+    seedId: cherry
+  - type: SpaceGarbage
+  - type: BadFood
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
index 64b8c288af3..a42f3e22a18 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
@@ -43,7 +43,42 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Food/skewer.rsi
-    state: skewer
+    state: 
+    layers:
+    - state: skewer
+    - map: ["foodSequenceLayers"]
+  - type: LandAtCursor
+  - type: Fixtures
+    fixtures:
+      fix1: 
+        shape: !type:PolygonShape
+          vertices:
+            - -0.40,-0.20
+            - -0.30,-0.30
+            - 0.50,0.10
+            - 0.40,0.20
+        density: 20
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Piercing: 6
+  - type: ThrowingAngle
+    angle: 245
+  - type: EmbeddableProjectile
+    offset: -0.15,0.0
+  - type: MeleeWeapon
+    wideAnimationRotation: -120
+    damage:
+      types:
+        Piercing: 8
+    angle: 0
+    animation: WeaponArcThrust
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
   - type: Tag
     tags:
     - Trash
@@ -174,6 +209,14 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 12
+        canReact: false # Dont want cause reactions inside skewers after merging ingredients
+        maxVol: 0
+  - type: FoodSequenceStartPoint
+    key: Skewer
+    maxLayers: 4
+    startPosition: -0.27, -0.19
+    inverseLayers: true 
+    offset: 0.2, 0.1
+    nameGeneration: food-sequence-skewer-gen
+    contentSeparator: ", "
+    allowHorizontalFlip: false
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml
index 9df2f3039e9..f34e7a8365c 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml
@@ -10,7 +10,7 @@
     storedRotation: -90
   - type: Food
   - type: Sprite
-    sprite: Objects/Consumable/Food/taco.rsi
+    sprite: Objects/Consumable/Food/taco_sequence.rsi
     layers:
     - state: tacoshell
   - type: SolutionContainerManager
@@ -19,8 +19,19 @@
         maxVol: 10
         reagents:
         - ReagentId: Nutriment
-          Quantity: 6.66 # Just using the same values as the bun values, since the recipe for taco shells is roughly the same as buns.
-# Base
+          Quantity: 6.66
+  - type: FoodSequenceStartPoint
+    key: Taco
+    maxLayers: 3
+    startPosition: -0.15, 0
+    offset: 0.15, 0
+    minLayerOffset: 0, 0
+    maxLayerOffset: 0, 0.05
+    nameGeneration: food-sequence-taco-gen
+    contentSeparator: ", "
+  - type: Appearance
+  
+# Old tacos
 
 - type: entity
   parent: FoodInjectableBase
@@ -167,4 +178,4 @@
     state: softtaco
   - type: Tag
     tags:
-      - Meat
+      - Meat
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml
index 6bef30e8c7e..65dd7b8a47d 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml
@@ -17,13 +17,6 @@
         reagents:
         - ReagentId: THC
           Quantity: 15
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-cannabis
-        sprite:
-          sprite: Objects/Specific/Hydroponics/cannabis.rsi
-          state: produce
 
 
 - type: entity
@@ -118,13 +111,6 @@
 #         Quantity: 1
         - ReagentId: Psicodine
           Quantity: 0.6
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-rainbow-cannabis
-        sprite:
-          sprite: Objects/Specific/Hydroponics/rainbow_cannabis.rsi
-          state: produce
 
 - type: entity
   name: dried rainbow cannabis leaves
diff --git a/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml b/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml
index 43d6fe8852b..d843e7b985b 100644
--- a/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml
+++ b/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml
@@ -67,10 +67,10 @@
   - Cooked
   - Meat
 
-# Bacon
+# Becon
 
 - type: foodSequenceElement
-  id: MeatBacon
+  id: MeatBecon
   sprites:
   - sprite: Objects/Consumable/Food/meat.rsi
     state: bacon-cooked
@@ -276,7 +276,7 @@
   tags:
   - Cooked
   - Meat
-
+  
 # Snail meat
 
 - type: foodSequenceElement
@@ -575,28 +575,6 @@
   tags:
     - Fruit
 
-# Extradimensional Orange
-
-- type: foodSequenceElement
-  id: ExtradimensionalOrange
-  name: food-sequence-content-orange
-  sprites:
-  - sprite: Objects/Specific/Hydroponics/extradimensional_orange.rsi
-    state: produce
-  scale: 0.5,0.5
-  tags:
-    - Fruit
-
-- type: foodSequenceElement
-  id: ExtradimensionalOrangeBurger
-  name: food-sequence-burger-content-extradimensional-orange
-  sprites:
-  - sprite: Objects/Specific/Hydroponics/extradimensional_orange.rsi
-    state: produce
-  scale: 0.5,0.5
-  tags:
-    - Fruit
-
 # Potato
 
 - type: foodSequenceElement
@@ -774,38 +752,6 @@
   - Fruit
   - Slice
 
-# Holymelon
-
-- type: foodSequenceElement
-  id: HolymelonSliceBurger
-  name: food-sequence-burger-content-holymelon
-  sprites:
-  - sprite: Objects/Specific/Hydroponics/holymelon.rsi
-    state: slice
-  tags:
-  - Fruit
-  - Slice
-
-- type: foodSequenceElement
-  id: HolymelonSlice
-  name: food-sequence-content-holymelon
-  sprites:
-  - sprite: Objects/Specific/Hydroponics/holymelon.rsi
-    state: slice
-  tags:
-  - Fruit
-  - Slice
-
-- type: foodSequenceElement
-  id: HolymelonSliceSkewer
-  name: food-sequence-content-holymelon
-  sprites:
-  - sprite: Objects/Consumable/Food/skewer.rsi
-    state: skewer-holymelon
-  tags:
-  - Fruit
-  - Slice
-
 # Chili pepper
 
 - type: foodSequenceElement
@@ -1110,26 +1056,6 @@
   tags:
   - Vegetable
 
-# World Pea
-
-- type: foodSequenceElement
-  id: WorldPea
-  name: food-sequence-content-world-pea
-  sprites:
-  - sprite: Objects/Specific/Hydroponics/world_pea.rsi
-    state: produce
-  tags:
-  - Vegetable
-
-- type: foodSequenceElement
-  id: WorldPeaBurger
-  name: food-sequence-burger-content-world-pea
-  sprites:
-  - sprite: Objects/Specific/Hydroponics/world_pea.rsi
-    state: produce
-  tags:
-  - Vegetable
-
 # Cherry
 
 - type: foodSequenceElement
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index f3176cc5e7a..bcf491ee51b 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -57,7 +57,7 @@
     FoodTomato: 1
     FoodOnionSlice: 2
 
-- type: microwaveMealRecipe
+- type: microwaveMealRecipe #Added to metamorph recipes
   id: RecipeBrainBurger
   name: brain burger recipe
   result: FoodBurgerBrain
@@ -76,7 +76,7 @@
     FoodMeat: 1
     ClothingHeadHatCatEars: 1
 
-- type: microwaveMealRecipe
+- type: microwaveMealRecipe #Added to metamorph recipes
   id: RecipeCheeseburger
   name: cheeseburger recipe
   result: FoodBurgerCheese
@@ -86,7 +86,7 @@
     FoodMeat: 1
     FoodCheeseSlice: 1
 
-- type: microwaveMealRecipe
+- type: microwaveMealRecipe #Added to metamorph recipes
   id: RecipeChickenSandwich
   name: chicken sandwich recipe
   result: FoodBurgerChicken
@@ -115,7 +115,7 @@
     FoodBreadBun: 1
     FoodMeatCorgi: 1
 
-- type: microwaveMealRecipe
+- type: microwaveMealRecipe #Added to metamorph recipes
   id: RecipeCrabBurger
   name: crab burger recipe
   result: FoodBurgerCrab
@@ -140,7 +140,7 @@
     CrayonGreen: 1
     Flare: 1
 
-- type: microwaveMealRecipe
+- type: microwaveMealRecipe #Added to metamorph recipes
   id: RecipeDuckBurger
   name: duck sandwich recipe
   result: FoodBurgerDuck
@@ -1968,3 +1968,23 @@
     FoodTomato: 1
     FoodCabbage: 1
     FoodOnionSlice: 2
+
+- type: microwaveMealRecipe
+  id: RecipeTacoBeef
+  name: beef taco recipe
+  result: FoodTacoBeef
+  time: 10
+  solids:
+    FoodTacoShell: 1
+    FoodMeatCutlet: 1
+    FoodCheeseSlice: 1
+
+- type: microwaveMealRecipe
+  id: RecipeTacoChicken
+  name: chicken taco recipe
+  result: FoodTacoChicken
+  time: 10
+  solids:
+    FoodCroissantRaw: 1
+    FoodButterSlice: 1
+    ShardGlass: 1
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Cooking/sequence_metamorph.yml b/Resources/Prototypes/Recipes/Cooking/sequence_metamorph.yml
new file mode 100644
index 00000000000..95f1c97a229
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Cooking/sequence_metamorph.yml
@@ -0,0 +1,125 @@
+# rules for transferring recipes from microwaveMealRecipe
+# 1) leave room for variation. If the original recipe calls for 2 pieces of meat, allow players to put in 2-3 pieces.
+# 2) max SequenceLength must be 1 element greater than the minimum ingredient set requires. This will allow you to put 1 poison fly or 1 other ingredient in different recipes and the recipes will still be valid.
+
+- type: metamorphRecipe
+  id: FoodBurgerCheese
+  key: Burger
+  result: FoodBurgerCheese
+  rules:
+  - !type:SequenceLength
+    range:
+      min: 3
+      max: 4
+  - !type:IngredientsWithTags # 1 meat cutlet
+    tags:
+    - Cooked
+    - Cutlet
+    - Meat
+    count:
+      min: 1
+      max: 2
+  - !type:IngredientsWithTags # 1 cheese
+    tags:
+    - Cheese
+    count:
+      min: 1
+      max: 2
+  - !type:LastElementHasTags # last bun
+    tags:
+    - Bun
+
+- type: metamorphRecipe
+  id: FoodBurgerChicken
+  key: Burger
+  result: FoodBurgerChicken
+  rules:
+  - !type:SequenceLength
+    range:
+      min: 2
+      max: 3
+  - !type:IngredientsWithTags # 1 chicken meat
+    tags:
+    - Cooked
+    - Cutlet
+    - Meat
+    - Chicken
+    count:
+      min: 1
+      max: 2
+  - !type:FoodHasReagent # 5 +- 2 mayo
+    reagent: Mayo
+    count:
+     min: 3
+     max: 7
+  - !type:LastElementHasTags # last bun
+    tags:
+    - Bun
+
+- type: metamorphRecipe
+  id: FoodBurgerCrab
+  key: Burger
+  result: FoodBurgerCrab
+  rules:
+  - !type:SequenceLength
+    range:
+      min: 3
+      max: 4
+  - !type:IngredientsWithTags # 2 crab meat
+    tags:
+    - Cooked
+    - Meat
+    - Crab
+    count:
+      min: 2
+      max: 3
+  - !type:LastElementHasTags # last bun
+    tags:
+    - Bun
+
+- type: metamorphRecipe
+  id: FoodBurgerDuck
+  key: Burger
+  result: FoodBurgerDuck
+  rules:
+  - !type:SequenceLength
+    range:
+      min: 3
+      max: 4
+  - !type:IngredientsWithTags # 1 duck meat
+    tags:
+    - Cooked
+    - Cutlet
+    - Meat
+    - Duck
+    count:
+      min: 1
+      max: 2
+  - !type:IngredientsWithTags # 1 cheese
+    tags:
+    - Cheese
+    count:
+      min: 1
+      max: 2
+  - !type:LastElementHasTags # last bun
+    tags:
+    - Bun
+
+- type: metamorphRecipe
+  id: FoodBurgerBrain
+  key: Burger
+  result: FoodBurgerBrain
+  rules:
+  - !type:SequenceLength
+    range:
+      min: 2
+      max: 3
+  - !type:IngredientsWithTags # 1 brain
+    tags:
+    - Brain
+    count:
+      min: 1
+      max: 2
+  - !type:LastElementHasTags # last bun
+    tags:
+    - Bun
\ No newline at end of file
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index bdebdccf58e..a31608a26d5 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -226,6 +226,9 @@
 - type: Tag
   id: Burnt
 
+- type: Tag
+  id: Brain
+
 - type: Tag
   id: BrassInstrument
 
@@ -247,9 +250,18 @@
 - type: Tag
   id: Bucket
 
+- type: Tag
+  id: Burger
+
 - type: Tag
   id: BulletFoam
 
+- type: Tag
+  id: Burnt
+
+- type: Tag
+  id: Bun
+
 - type: Tag
   id: BypassDropChecks
 
@@ -371,6 +383,9 @@
 - type: Tag
   id: Chicken
 
+- type: Tag
+  id: Cheese
+
 # Allowed to control someone wearing a Chef's hat if inside their hat.
 - type: Tag
   id: ChefPilot
@@ -435,6 +450,9 @@
 - type: Tag
   id: Cow
 
+- type: Tag
+  id: Crab
+
 - type: Tag
   id: Crayon
 
@@ -1257,6 +1275,12 @@
 - type: Tag
   id: TabletopBoard
 
+- type: Tag
+  id: Taco
+
+- type: Tag
+  id: Taco
+
 - type: Tag
   id: TabletopPiece
 
diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/brain.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/brain.png
index 04d04890f6b4a831e8889c40f264d284b61fca71..c4b6ac6385d2d3eeeb485c475383ca34afa5fcdb 100644
GIT binary patch
delta 446
zcmV;v0YU!F1J?tPBYyw^b5ch_0Itp)=>Px$kx4{BR9J=WlRZl#VGw|y6@`PSg_R!(
zxEM5g2a0xzD5!-Ws9bkf9QQwLyuyFrRoD0vtgO}ELd}vWi>oAYHM&OK#0_5JSY<gu
zWY@D0e4lcdcjkF#7*Hq_ijR&K_Q9XId1<JxJc<2W-w0i&Mt^<K#I?m40r)mM%+`*@
z*pQAEX+%mz0C}xUAc571DTy?-voJlt=Jr10vm@Z%BBdf(JID7QUjY#35<tR8)CEmk
zm>wWw9?+y+fqP5FJOCi}r5|xF$s~6H7#-~5_vDzoRO?>?O`z<RI6pZe7Vq(6(Y6k<
zc8(~ZwYC!lvVV3Cr{GY%zX;ktm_X6J!8kOiK0FZZ>gLokDclrjZfy1?YR&gjdz|O*
z-&SCG-_VvpDwQh9bP_@EJP)_z($|?FZ=V5hcAXF0IFvw5;+LlRyA=_-;}HxiMfq<V
zpBilRn2u9$LJ7S3egT#earxZa!ku@A9@DWh7S?f@l{d8c_E+#6D``_RQda<e^RWEa
o1ZpfL;{IyF{9d6@C=~C4M}4}b>3dWZdH?_b07*qoM6N<$g6^x)3;+NC

delta 436
zcmV;l0ZabZ1I+`FBYy#uNkl<Zc%1E%K}#D^5P-iG147h8Pc<gc#bBcrDtc=v7PJSO
z(v;rXgZMwZ*n|I|o_g^oc=D{?J(y%kEQ@PN($zF;nrz|*n>amXX`z%|4S0FqahNyr
zy%`1+3WY+UxM#Gm55By4E0N*uU$OPwz0h^~3<pizdG}fXK7XX2ad2d@w5X#+N0D|5
zKyE7&NZ|AGD~XQ9$gIw@f0*NC`Z>5wq}`%ySNOR09sqG_01`%GC}?74b)J%W!kBgm
zZj+LE0zl%)Q^cuJ${z#pVquEyl_mLKtv?AgfsWVa;@c^S<YPY;pO~a<SBL}J!x(X(
zY*%pV4!!FiL4W%P6KJ^&jIRd0n;YU&(|or~>Ww<%qvO6rzj?Nh<)V5$Sb@!)p>2Y6
zyFK#7Jc8hP9&X!Z_ECzeeGb6+&uZYtp#=I8pES+it%xw4jAB>?I=?0uiP-1~9jESu
z61esK0&Jv`GB@*pEAI+Dp<|UStg{YVMRV|1@GrKCrY&X^E&=@JVY$-;`fQ|<{%XSf
eUZGGZ0Dc3ZO{M9W6`O_t0000<MNUMnLSTaNPu1E0

diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/burger.rsi/meta.json
index 2ad83dfc3c6..42c8c461e98 100644
--- a/Resources/Textures/Objects/Consumable/Food/burger.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/burger.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept and potato1234x at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, ian.png created by EmoGarbage, mothroach.png created by TurboTracker",
+  "copyright": "Taken from tgstation and modified by Swept and potato1234x at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, ian.png created by EmoGarbage, mothroach.png created by TurboTracker, screwed by TheShuEd",
   "size": {
     "x": 32,
     "y": 32
@@ -28,12 +28,6 @@
     {
       "name": "bun"
     },
-    {
-      "name": "bun_top"
-    },
-    {
-      "name": "bun_bottom"
-    },
     {
       "name": "c"
     },
@@ -161,6 +155,9 @@
         ]
       ]
     },
+    {
+      "name": "screwed"
+    },
     {
       "name": "spell"
     },
diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/screwed.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/screwed.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9a33730f64b8ff6690009ed779c62ce2425f6bf
GIT binary patch
literal 895
zcmV-_1AzRAP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px&IY~r8R9J=WmP<?%Q51$hTI5w)+9Ho4S_#w#(#i%+Fosw)J{HD}H72q!(Zq-v
zqYD-;O^h3(#>8MWabaQtZrBJLgAWwNM>H)OMFCL+0g;Ajq4qT{CNr@L?G!O=_*XOM
z-h2N4o^$TG7Z$L9c}B`?7uFOZ{%LzKn7qH#*%I%yYbdoC0MKo$z}?gVM8#x<B&E2f
z2vH`^HtNaPP)XqNYh_%tTX8pa(CCS(7NJ^zOzv=1lj7+IKyTD5<APTJz~>d{8JbWn
zLX!-6sl|Z5y$gWcolXGKs;grD0UWMs_S!Ym)=AO=PH(?;9-!1>K)10%v5&R1A$SFX
z9nTTG0%I+0%9y{sOR0~479gW%XhPY&Xt(0?3S?}kj0wGHx5mt$69Ml=uAN+5xQRwj
zRB<W``F^K8hFG@CHBerD;R`@*?ZFvSp*jMoC5IFdvJg2XzZ1*kwl!z*1-wgZYY&R`
z^~bq*xnWun39Hmub@UuSI48XxAm#0O))(nmo;&r|+)rbfbPoCv%TH03H$qEmD|a8Y
zara&aCypJSmMiH-lw~`D2k7)%VSSNKv3Cyov8~#HXq3{?(%Q;q=QaRdK6^2vKUIC8
z+366krLHBYU4&t{4*-)f7l3Y!M3`;!0Fc=k0-$SMJ^<_ddT!plJ|j=U8fbPp#NxaH
z(zIF%OlfNL#vmR!BuGKC(;@oI6?`qppszOv!Vp>&0U%hm2!OAKZUB}{ND&FUq_xJO
zs49VRBd~V+3iM?e2p<EgoXrL^hNo`Jr9F;lThoYXGl5`;?n$Zt|Hv8#;G;>Z1+l~o
zfUjRVW%~-B0$>WS2H>{OvI*dQL*xDFc;ZIDt#P^n!4Ol?h}sP$jfAJ5Zp)=Tp9gL<
z<>y&37wYKwJOn_*9|j;RTiUs0zjP@zxTQN`_dqHi#((nsNmpDBRh@8I@d1|*jPT=|
zKkmFK!K-|K82`!lntiTBzLS2CR25suGX&9@t%NeuF-XOaDN~Ev)6e*5kXOT#JnR+b
z_CX?Jm(45!tSrb!mmWbYO1I%aB%3#*Q)mJcc(<Nd>b`nr;J*lvF;|b$1uS6R@e7CS
VLl+j{RSy6F002ovPDHLkV1i+?lIH*b

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/bun_bottom.png b/Resources/Textures/Objects/Consumable/Food/burger_sequence.rsi/bun_bottom.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Food/burger.rsi/bun_bottom.png
rename to Resources/Textures/Objects/Consumable/Food/burger_sequence.rsi/bun_bottom.png
diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/bun_top.png b/Resources/Textures/Objects/Consumable/Food/burger_sequence.rsi/bun_top.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Food/burger.rsi/bun_top.png
rename to Resources/Textures/Objects/Consumable/Food/burger_sequence.rsi/bun_top.png
diff --git a/Resources/Textures/Objects/Consumable/Food/burger_sequence.rsi/cheese.png b/Resources/Textures/Objects/Consumable/Food/burger_sequence.rsi/cheese.png
new file mode 100644
index 0000000000000000000000000000000000000000..2678c7f7d66e5c00a671293216b3923075c02af1
GIT binary patch
literal 302
zcmV+}0nz@6P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#=t)FDR9J=Wlg$pnKoo^fwWP|zUu@c?B@)Dv*YFs29>Qa>6eLy>HWC&@LqzId
zEu_s<io57S;(o~_bMKtFIVYI`7=~e(e@CK-hOM#<07k@ed-JpQ@lL5dAk9`NA^=F%
z6sUU2t#fa5=HiM?_evd$5JhA}ETr|%UT2dN03fX^2v<nq=>~4m#8*we(U;=cIshQ9
z$-x>}=PsVwNh`7&H|_nZ0{~D*q_K1ZnQ7Qli)kGstLN_J!!}q0$Ku^ni)sB>7Gl8~
zctuR>N8oP&cz!Qit9q8x6VJ>A{R=V-!!SR=1JGMVE&R~V1ONa407*qoM6N<$g5CFh
AnE(I)

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/burger_sequence.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/burger_sequence.rsi/meta.json
new file mode 100644
index 00000000000..2b9671e9b42
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Food/burger_sequence.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd. Bun taken from tgstation and modified by Swept and potato1234x at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, and edited by TheShuEd",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "bun_top"
+    },
+    {
+      "name": "bun_bottom"
+    },
+    {
+      "name": "cheese"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato.png
new file mode 100644
index 0000000000000000000000000000000000000000..46bbdc372dd99b0977ad790927057fe4ca5fa2ee
GIT binary patch
literal 233
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}i#=T&Ln2z=
zUNYosau8^JD4*of(J8%Z?H<O9uM61y6B1Kbif`Edz$UHV!P#|%heizdrZ0XA&;I_k
z{qrVc1tq0V=`&3w_(FO9N;fQ%Kl}d4w1C&KEGzyB)r+|PiEO;KJL318zj@wT4_94^
zN&1|dAfv{l`gQf`gvi#^f}|+NTa~+-3unA|b~EHaiOuudlOO*TX)OJ5^~bcIRr(w1
g_LlDG=-@cOuFS4qcHB=n80cIEPgg&ebxsLQ0A7V*jQ{`u

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-watermelon.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-watermelon.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e0146459e2978bbcf74d6579fae3f53615b0aad
GIT binary patch
literal 331
zcmV-R0kr;!P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$1xZ9fR9J=Wl(7oJFc60Ss8}d=l;TjQK7<rHJNg2Bi!S;Ex(Ggmi=(4+K}TOe
z5OlFPc4{e}LkzC%rPRTE5H3sZ{`_|dU@#aAn)orui$JXx_9BoUgJ>Gk*=|{Y7s<lp
zfF1*A3FtH-Xje9or6S69azH2h2M*-vcfW7o=2|USS~8A00M~`u0xVa?MK0s@#VM;H
zK(%01K!^-Nw+%hcA#q3q0FWbXPpRdXpo-7?(EbZpL+HmK1R-W0|274G5Lp7$989`0
zs@K4QCE&h=7!MO52<7^)E9<);I06)Y49ZjB_WX*#F@eac=hYIR@FI}q%GOvea9KB#
d*I+RG2X9}&UMX!F9{vCT002ovPDHLkV1nx1h7$k)

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json
index 3e028b55c93..fc2a8349af4 100644
--- a/Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json
@@ -29,4 +29,4 @@
       "name": "rattaco"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Consumable/Food/taco_sequence.rsi/cheese.png b/Resources/Textures/Objects/Consumable/Food/taco_sequence.rsi/cheese.png
new file mode 100644
index 0000000000000000000000000000000000000000..59c459e0c2958ff5fb0cce6c3f3b645d49f79027
GIT binary patch
literal 267
zcmV+m0rdWfP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px##Ysd#R9J=WkueIwFcd&vv>=q?V8;%25!_2%yojf$;7#-tcJ>%uJ2-afSO+Oi
zg*ZjD2sY^?{5K|_{~ielf*=V0OqnNo?2gG8`EoVme%+6Xa0)PT0QD%)x3hDEb%2ov
zarQcEtCRCfSOpk)Q+KGvPBnE0KoDonFEKcv%o82>QvjCR1Jz}t!^r!HX{(cU#Gn8p
ze;1m&F!Ek8VE-NJ_sI7MBkZI7l==ENc<<oBe#E;_Jqom+0$9lfK@bE1;0dw)TJlY1
R{^|e#002ovPDHLkV1fuMZLk0U

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/taco_sequence.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/taco_sequence.rsi/meta.json
new file mode 100644
index 00000000000..7704812eedf
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Food/taco_sequence.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd, rat Taken from https://github.com/tgstation/tgstation/commit/e15c63d100db65eaaa5231133b8a2662ff439131#diff-8dd94e19fdb2ff341b57e31bce101298 and edited by TheShuEd",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "tacoshell_back"
+    },
+    {
+      "name": "tacoshell_forward"
+    },
+    {
+      "name": "cheese"
+    },
+    {
+      "name": "rat"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Food/taco_sequence.rsi/rat.png b/Resources/Textures/Objects/Consumable/Food/taco_sequence.rsi/rat.png
new file mode 100644
index 0000000000000000000000000000000000000000..6dde4d798921467871f8440679abb3dce9fb8797
GIT binary patch
literal 364
zcmV-y0h9iTP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$CP_p=R9J=Wl`%`iFcims2ERg=LIyWC(ItcQbGSHqh>IVkg9uj6S-9CRP$)Na
z5zgth8&bM-5JFcuhqIv^3QdB7kl&Vu_x|tyl9xgx5{U$mW!W~%vh7dnDIE9;19V+S
zk|Y2qrMOaO%<dkjs%moHLm%<^?G3BVlKYo8lu~x@seW}$hj5MnR+}X!N9R^N&vO9k
zx^{980Y@;jf82pTD_|%>DMjD+_FGXD&iTAMFm?_*_W+m2DcAGG<h;%Wd?zl1z!<~n
z$Gej_cuc`QgLqk%6zjFKA*U(WcQ3>)+!$lugI_IROxv~qG);rn8Yv}@vkRwJ5CV=M
zO;amAjNY?H9`6neNGXHjojUO4)ZPQFb&xm&{)|RNMIw>N|K$_^;BkkMP*xoP0000<
KMNUMnLSTZc9hnaR

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/taco_sequence.rsi/tacoshell_back.png b/Resources/Textures/Objects/Consumable/Food/taco_sequence.rsi/tacoshell_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..7cd31d3b691a6ceb57b9c21c9352df72f94b6076
GIT binary patch
literal 171
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}sh%#5ArY;~
z2@<S}6GVEN0u8v_tP+;ADQZ7^`Tu!p{jmj0fAuy3f#bzD+83V%9c8>B<FrP3#Vdv)
z8OKug39mTRqAVIj93~4SBq-R4u-UM<$vOlV{1^HDzp?DF2FTP8%nUJG6b^1byX892
OLIzJ)KbLh*2~7ZynL8-}

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/taco_sequence.rsi/tacoshell_forward.png b/Resources/Textures/Objects/Consumable/Food/taco_sequence.rsi/tacoshell_forward.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c517b8dc2101a069577827c9f5148306e5d8bdf
GIT binary patch
literal 293
zcmV+=0owkFP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#-$_J4R9J=Wl(7oJKoCSnv9eLiBaK$}3Vwxs#8UhNYyZSru(C<vR|qyjut^gR
zD@|c1tkp_9;c^?Wa$mDKlFUtJjsS|HD2np$G^8(35!07QXD8NSnv#vFh{@U<08pNM
z?`H;B+}a$*M3^s+FeZAh*-RZ1mC?DIS4}`xNl*grm-<Xd@fzUHId<2SJK2P!ipm67
zbh{aOpIfc3A2o#H?TU(+vNS<|I7OBwBH_X05p)i`3GiXc(gf#A8vuePUxyIn@~|Hh
r0Nig+bbBrDEHhi2YX6`VMfo3ICMBAJfRKM<00000NkvXXu0mjf#VvPr

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/slice.png b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/slice.png
index 1c4d96d8e15220bde23385b76203d23ffc3d1d70..50882ec82034aaf2cb1f386cdf7453f86fb141c6 100644
GIT binary patch
delta 355
zcmV-p0i6D-1N{P!BYyw^b5ch_0Itp)=>Px$H%UZ6R9J=WlrfINFc3vQ_G%Th1uGg3
zKoe>jZjl4zAS;f*F(_#0xCJ#;8V*1ckpck{&QO>b+esW}w_Lw2_So~s^Cv(c5D5Ht
z27M2RA|(J|Uq1kV^0G4a`DoMYPUaItj|0(tOI32IBx{bnZ-0p%2Q&6B0z{D#L<aB}
zEK1aRdE3=QuqXj|tk!)*bUs(xB_cl?-+cVtc)qJ8&P`WxaXOlbCevSu_;3km6?Qse
zxX6r4uX_+5&jDzyK;5J^P7mnM%%Vhj;Bz*w#p-LiKkQcZ6YzRwy&|<&q-rumk&<rE
zN<?{C)mqg{z+7;V4Mcuc&Mt4e_d#2fH6?(o-fopmrw3#O%Xgm2Xxg~RKsl-+Ut4G0
zc>T4m`&dl_pG-XjOS-D}7SJZ937@2aKp+s%c>-`slIX-9vD^Rv002ovPDHLkV1kX*
BnR@^L

delta 401
zcmV;C0dD^N0;&U$BYy#LNkl<Zc%1E&F>-@25Jf-2lPKdNCrD44G-+~&6m)5P5T7B(
zaFK?NTezX2F^wmkXVNgZ$k<?uO+h4!1dwptMXwW}{a?FZ01k)azvEq^h}h0ZU;DRj
z)^*umM5&C3j%iDr@ep)OiOPuj_Uer80F@Ed`*`phHl3sXe18RC?#3tsR7M0p07M3p
z37sJm)*}$xS#xrc0e;Yamlvp33941{TY!gyb*(x;$CSEGE%E~5V+{bfdCEKh*ewIP
zx_@lMr}IW+^3bbeXF#?dP_vcdQn+PIyA_Ow@UCCZH}La{nZ&#HTqFZ60ZVblLx{W>
ztTi!-sSx>rYJa~;7&y(}gwcRXyvWp}CS<2|*O(wO95xFT(mu}0Ko@K}S0?3csa8qv
zsMJ1FVLd>MhppDO+ARMM-yJi}USb}BR*c;R>Xb4YjEAWAG3tE`#(~3T(d-!rs*d%q
vxO#uK8pRm#Q3fQtWiV*OR@mWiI3!=P&AK@EF02{=015yANkvXXu0mjf=UTj!


From e83da97ae872c598b2cc87ef708af5aa6c381dbb Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 00:40:11 -0400
Subject: [PATCH 115/366] hm!

---
 .../EntitySystems/FoodSequenceSystem.cs       |  14 +-
 .../FoodSequenceElementComponent.cs           |  21 +--
 .../FoodSequenceStartPointComponent.cs        |  15 +-
 .../FoodSequenceElementPrototype.cs           |  39 -----
 .../nutrition/components/food-sequence.ftl    |   1 -
 Resources/Prototypes/Body/Organs/human.yml    |   7 -
 .../Prototypes/Catalog/uplink_catalog.yml     |  27 ----
 .../Objects/Consumable/Food/produce.yml       |   7 -
 .../reinforcement_teleporter.yml              |   4 +-
 .../Objects/Specific/Hydroponics/leaves.yml   |  37 +----
 Resources/Prototypes/Hydroponics/seeds.yml    |   2 -
 .../Entities/Mobs/NPCs/mutants.yml            | 146 +-----------------
 .../Recipes/Cooking/meal_recipes.yml          |  20 ---
 Resources/Prototypes/Store/categories.yml     |  17 +-
 .../Objects/Weapons/Projectiles/cult.yml      |   9 +-
 Resources/Prototypes/tags.yml                 |   6 -
 16 files changed, 19 insertions(+), 353 deletions(-)

diff --git a/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs
index f43b80bc79e..ae8215ac6ae 100644
--- a/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using System.Text;
 using Content.Server.Nutrition.Components;
 using Content.Shared.Chemistry.EntitySystems;
@@ -115,14 +116,8 @@ private bool TryAddFoodElement(Entity<FoodSequenceStartPointComponent> start, En
             return false;
 
         //looking for a suitable FoodSequence prototype
-        ProtoId<FoodSequenceElementPrototype> elementProto = string.Empty;
-        foreach (var pair in element.Comp.Entries)
-        {
-            if (pair.Key == start.Comp.Key)
-            {
-                elementProto = pair.Value;
-            }
-        }
+        if (!element.Comp.Entries.TryGetValue(start.Comp.Key, out var elementProto))
+            return false;
         if (!_proto.TryIndex(elementProto, out var elementIndexed))
             return false;
 
@@ -138,7 +133,7 @@ private bool TryAddFoodElement(Entity<FoodSequenceStartPointComponent> start, En
         var flip = start.Comp.AllowHorizontalFlip && _random.Prob(0.5f);
         var layer = new FoodSequenceVisualLayer(elementIndexed,
             _random.Pick(elementIndexed.Sprites),
-            new Vector2(flip ? -1 : 1, 1),
+            new Vector2(flip ? -elementIndexed.Scale.X : elementIndexed.Scale.X, elementIndexed.Scale.Y),
             new Vector2(
                 _random.NextFloat(start.Comp.MinLayerOffset.X, start.Comp.MaxLayerOffset.X),
                 _random.NextFloat(start.Comp.MinLayerOffset.Y, start.Comp.MaxLayerOffset.Y))
@@ -246,6 +241,7 @@ private void MergeTrash(EntityUid start, EntityUid element)
             return;
 
         foreach (var trash in elementFood.Trash)
+        {
             startFood.Trash.Add(trash);
         }
     }
diff --git a/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs b/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs
index 35d8a86988c..af1d2832bdd 100644
--- a/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs
+++ b/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs
@@ -22,23 +22,4 @@ public sealed partial class FoodSequenceElementComponent : Component
     /// </summary>
     [DataField]
     public string Solution = "food";
-}
-
-[DataRecord, Serializable, NetSerializable]
-public partial record struct FoodSequenceElementEntry()
-{
-    /// <summary>
-    /// A localized name piece to build into the item name generator.
-    /// </summary>
-    public LocId? Name { get; set; } = null;
-
-    /// <summary>
-    /// state used to generate the appearance of the added layer
-    /// </summary>
-    public SpriteSpecifier? Sprite { get; set; } = null;
-
-    /// <summary>
-    /// If the layer is the final one, it can be added over the limit, but no other layers can be added after it.
-    /// </summary>
-    public bool Final { get; set; } = false;
-}
+}
\ No newline at end of file
diff --git a/Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs b/Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs
index 36136095f5c..4e53c6ccd4b 100644
--- a/Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs
+++ b/Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs
@@ -33,15 +33,6 @@ public sealed partial class FoodSequenceStartPointComponent : Component
     [DataField]
     public bool Finished;
 
-    /// <summary>
-    /// list of sprite states to be displayed on this object.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public List<FoodSequenceElementEntry> FoodLayers = new();
-
-    public HashSet<string> RevealedLayers = new();
-
-
     /// <summary>
     /// solution where reagents will be added from newly added ingredients
     /// </summary>
@@ -54,13 +45,13 @@ public sealed partial class FoodSequenceStartPointComponent : Component
     /// LocId with a name generation pattern.
     /// </summary>
     [DataField]
-    public Vector2 StartPosition = Vector2.Zero;
+    public LocId? NameGeneration;
 
     /// <summary>
     /// the part of the name generation used in the pattern
     /// </summary>
     [DataField]
-    public Vector2 Offset = Vector2.Zero;
+    public LocId? NamePrefix;
 
     /// <summary>
     /// content in the form of all added ingredients will be separated by these symbols
@@ -165,4 +156,4 @@ public FoodSequenceVisualLayer(ProtoId<FoodSequenceElementPrototype> proto,
         Scale = scale;
         LocalOffset = offset;
     }
-}
+}
\ No newline at end of file
diff --git a/Content.Shared/Nutrition/Prototypes/FoodSequenceElementPrototype.cs b/Content.Shared/Nutrition/Prototypes/FoodSequenceElementPrototype.cs
index c888e9d883f..931d8a35327 100644
--- a/Content.Shared/Nutrition/Prototypes/FoodSequenceElementPrototype.cs
+++ b/Content.Shared/Nutrition/Prototypes/FoodSequenceElementPrototype.cs
@@ -1,42 +1,3 @@
-using Content.Shared.Tag;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
-
-namespace Content.Shared.Nutrition.Prototypes;
-
-/// <summary>
-/// Unique data storage block for different FoodSequence layers
-/// </summary>
-[Prototype("foodSequenceElement")]
-public sealed partial class FoodSequenceElementPrototype : IPrototype
-{
-    [IdDataField] public string ID { get; private set; } = default!;
-
-    /// <summary>
-    /// sprite options. A random one will be selected and used to display the layer.
-    /// </summary>
-    [DataField]
-    public List<SpriteSpecifier> Sprites { get; private set; } = new();
-
-    /// <summary>
-    /// A localized name piece to build into the item name generator.
-    /// </summary>
-    [DataField]
-    public LocId? Name { get; private set; }
-
-    /// <summary>
-    /// If the layer is the final one, it can be added over the limit, but no other layers can be added after it.
-    /// </summary>
-    [DataField]
-    public bool Final { get; private set; }
-
-    /// <summary>
-    /// Tag list of this layer. Used for recipes for food metamorphosis.
-    /// </summary>
-    [DataField]
-    public List<ProtoId<TagPrototype>> Tags { get; set; }  = new();
-}
-
 using Content.Shared.Tag;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
diff --git a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
index 75be4336102..bf8b73f51b6 100644
--- a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
+++ b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
@@ -12,7 +12,6 @@ food-sequence-burger-content-penguin = peng
 food-sequence-burger-content-chiken = chiken
 food-sequence-burger-content-duck = duck
 food-sequence-burger-content-corgi = corgi
-food-sequence-burger-content-crab = crabs
 food-sequence-burger-content-goliath = goli
 food-sequence-burger-content-dragon = dragon
 food-sequence-burger-content-rat = rat
diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml
index dd8526be990..1440330b24e 100644
--- a/Resources/Prototypes/Body/Organs/human.yml
+++ b/Resources/Prototypes/Body/Organs/human.yml
@@ -106,13 +106,6 @@
     - state: appendix
     - state: appendix-inflamed
       visible: false
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-appendix
-        sprite:
-          sprite: Mobs/Species/Human/organs.rsi
-          state: appendix
 
 - type: entity
   id: OrganHumanEars
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 9fe3e394af2..2865bfce0d8 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -94,19 +94,6 @@
   categories:
     - UplinkWeaponry
 
-- type: listing
-  id: UplinkThrowingKnivesKit
-  name: uplink-knives-kit-name
-  description: uplink-knives-kit-desc
-  icon: { sprite: /Textures/Objects/Storage/boxicons.rsi, state: throwing_knives }
-  productEntity: ThrowingKnivesKit
-  discountCategory: rareDiscounts
-  discountDownTo:
-    Telecrystal: 3
-  cost:
-    Telecrystal: 6
-  categories:
-    - UplinkWeaponry
 
 - type: listing
   id: UplinkGlovesNorthStar
@@ -783,17 +770,6 @@
   categories:
   - UplinkDeception
 
-- type: listing
-  id: UplinkMobCatMicrobomb
-  name: uplink-mobcat-microbomb-name
-  description: uplink-mobcat-microbomb-desc
-  icon: { sprite: /Textures/Mobs/Pets/cat.rsi, state: syndicat }
-  productEntity: MobCatSyndy
-  cost:
-    Telecrystal: 1
-  categories:
-  - UplinkDeception
-
 - type: listing
   id: UplinkCyberpen
   name: uplink-cyberpen-name
@@ -1408,7 +1384,6 @@
     Telecrystal: 2
   categories:
   - UplinkWearables
-  - UplinkWearables
 
 - type: listing
   id: UplinkgClothingThievingGloves
@@ -1420,10 +1395,8 @@
     Telecrystal: 2
   cost:
     Telecrystal: 4
-    Telecrystal: 4
   categories:
   - UplinkWearables
-  - UplinkWearables
 
 - type: listing
   id: UplinkClothingOuterVestWeb
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index b2b18b8c9cd..df24879c2af 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -716,13 +716,6 @@
   - type: Tag
     tags:
     - Fruit
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-pineapple
-        sprite:
-          sprite: Objects/Specific/Hydroponics/pineapple.rsi
-          state: produce
 
 - type: entity
   name: potato
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
index c1011952f78..832bf0fe745 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
@@ -1,3 +1,5 @@
+
+
 - type: entity
   parent: BaseItem
   id: ReinforcementRadioSyndicate
@@ -55,7 +57,7 @@
     selectablePrototypes: ["SyndicateMonkeyNukeops", "SyndicateKoboldNukeops"]
 
 - type: entity
-  parent: ReinforcementRadio
+  parent: ReinforcementRadioSyndicate
   id: ReinforcementRadioSyndicateSyndiCat
   name: syndicat reinforcement radio
   description: Calls in a faithfully trained cat with a microbomb to assist you.
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml
index 65dd7b8a47d..8c29b5d6753 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml
@@ -37,13 +37,6 @@
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/tobacco.rsi
     state: dried
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-cannabis
-        sprite:
-          sprite: Objects/Specific/Hydroponics/tobacco.rsi
-          state: dried
 
 - type: entity
   name: ground cannabis
@@ -72,13 +65,6 @@
       - Smokable
   - type: Item
     size: Tiny
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-cannabis
-        sprite:
-          sprite: Objects/Misc/reagent_fillings.rsi
-          state: powderpile
     
 - type: entity
   name: rainbow cannabis leaves
@@ -141,13 +127,6 @@
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/rainbow_cannabis.rsi
     state: dried
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-rainbow-cannabis
-        sprite:
-          sprite: Objects/Specific/Hydroponics/rainbow_cannabis.rsi
-          state: dried
 
 - type: entity
   name: ground rainbow cannabis
@@ -181,13 +160,6 @@
   - type: Construction
     graph: smokeableGroundCannabisRainbow
     node: groundRainbow
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-rainbow-cannabis
-        sprite:
-          sprite: Objects/Specific/Hydroponics/rainbow_cannabis.rsi
-          state: powderpile_rainbow
 
 - type: entity
   name: tobacco leaves
@@ -245,11 +217,4 @@
     tags:
       - Smokable
   - type: Item
-    size: Tiny
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-tobacco
-        sprite:
-          sprite: Objects/Misc/reagent_fillings.rsi
-          state: powderpile
+    size: Tiny
\ No newline at end of file
diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index 03d28127a60..1be95490dcc 100644
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -323,8 +323,6 @@
     - extradimensionalOrange
     - lemon
     - lime
-  mutationPrototypes:
-    - extradimensionalOrange
   harvestRepeat: Repeat
   lifespan: 55
   maturation: 6
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml
index b3de9e01910..fa4452f911e 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml
@@ -195,148 +195,4 @@
 #      name: ghost-role-information-giant-spider-vampire-name
 #      description: ghost-role-information-giant-spider-vampire-description
 #      rules: No antagonist restrictions. Just don't talk in emote; you have telepathic chat.
-#    - type: GhostTakeoverAvailable
-
-- type: entity
-  parent: SimpleMobBase
-  id: MobMouseCancer
-  name: Cancer Mouse
-  description: Oh hey Civvie...
-  components:
-  - type: Sprite
-    drawdepth: SmallMobs
-    sprite: Mobs/Animals/mouse.rsi
-    layers:
-    - map: ["enum.DamageStateVisualLayers.Base"]
-      state: mouse-0
-      color: greenyellow
-  - type: DamageStateVisuals
-    rotate: true
-    states:
-      Alive:
-        Base: mouse-0
-      Critical:
-        Base: dead-0
-      Dead:
-        Base: splat-0
-  - type: PointLight
-    color: greenyellow
-  - type: RadiationSource
-    intensity: 5
-    slope: 0.5
-  - type: Damageable
-    damageContainer: Biological
-    damageModifierSet: CancerMouse
-  - type: GhostRole
-    makeSentient: true
-    name: ghost-role-information-cancer-mouse-name
-    description: ghost-role-information-cancer-mouse-description
-  - type: GhostTakeoverAvailable
-  - type: CombatMode
-  - type: MovementSpeedModifier
-    baseWalkSpeed : 3.5
-    baseSprintSpeed : 3.5
-  - type: InputMover
-  - type: MobMover
-  - type: Reactive
-    groups:
-      Flammable: [Touch]
-      Extinguish: [Touch]
-  - type: Physics
-    bodyType: KinematicController
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeCircle
-          radius: 0.2
-        density: 30 #Bulky by mouse standards...
-        mask:
-        - SmallMobMask
-        layer:
-        - SmallMobLayer
-  - type: MobState
-  - type: MobThresholds
-    thresholds:
-      0: Alive
-      40: Critical
-      80: Dead
-  - type: Item
-    size: Normal
-  - type: Stamina
-    critThreshold: 80
-  - type: MeleeWeapon
-    hidden: true
-    soundHit:
-        path: /Audio/Weapons/bladeslice.ogg
-    angle: 0
-    animation: WeaponArcClaw
-    damage:
-      types:
-        Slash: 5
-        Piercing: 3
-  - type: Body
-    prototype: Rat
-    requiredLegs: 1 # TODO: More than 1 leg
-  - type: Hunger # probably should be prototyped
-    thresholds:
-      Overfed: 200
-      Okay: 150
-      Peckish: 100
-      Starving: 50
-      Dead: 0
-    baseDecayRate: 0.01666666666
-  - type: Thirst
-    thresholds:
-      OverHydrated: 600
-      Okay: 450
-      Thirsty: 300
-      Parched: 150
-      Dead: 0
-    baseDecayRate: 0.1
-  - type: Appearance
-  - type: Puller
-    needsHands: false
-  - type: Vocal
-    sounds:
-      Male: Mouse
-      Female: Mouse
-      Unsexed: Mouse
-    wilhelmProbability: 0.001
-  - type: Tag
-    tags:
-      - CannotSuicide
-      - DoorBumpOpener
-      - FootstepSound
-      - Recyclable
-  - type: NoSlip
-  - type: MobPrice
-    price: 100 # rat wealth
-  - type: FelinidFood
-  - type: CanEscapeInventory
-  - type: Extractable
-    grindableSolutionName: food
-  - type: Bloodstream
-    bloodReagent: Radium
-    bloodMaxVolume: 70
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 2
-        - ReagentId: Radium
-          Quantity: 70
-  - type: Butcherable
-    spawned:
-    - id: FoodMeatRat
-      amount: 1
-  - type: Grammar
-    attributes:
-      proper: true
-      gender: male
-  - type: IntrinsicRadioReceiver
-  - type: IntrinsicRadioTransmitter
-  - type: ActiveRadio
-    channels:
-    - Common
+#    - type: GhostTakeoverAvailable
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index bcf491ee51b..c48684fce55 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -1901,26 +1901,6 @@
   solids:
     FoodDoughTortillaFlat: 1 # one third of a standard bread dough recipe
 
-- type: microwaveMealRecipe
-  id: RecipeTacoBeef
-  name: beef taco recipe
-  result: FoodTacoBeef
-  time: 10
-  solids:
-    FoodTacoShell: 1
-    FoodMeatCutlet: 1
-    FoodCheeseSlice: 1
-
-- type: microwaveMealRecipe
-  id: RecipeTacoChicken
-  name: chicken taco recipe
-  result: FoodTacoChicken
-  time: 10
-  solids:
-    FoodTacoShell: 1
-    FoodMeatChickenCutlet: 1
-    FoodCheeseSlice: 1
-
 - type: microwaveMealRecipe
   id: RecipeTacoFish
   name: fish taco recipe
diff --git a/Resources/Prototypes/Store/categories.yml b/Resources/Prototypes/Store/categories.yml
index 16612c7c721..4b2976200f4 100644
--- a/Resources/Prototypes/Store/categories.yml
+++ b/Resources/Prototypes/Store/categories.yml
@@ -89,25 +89,10 @@
   name: store-category-pointless
   priority: 10
 
-- type: storeCategory
-  id: UplinkDeception
-  name: store-category-deception
-  priority: 10
-
-- type: storeCategory
-  id: UplinkChemicals
-  name: store-category-chemicals
-  priority: 11
-
-- type: storeCategory
-  id: UplinkDisruption
-  name: store-category-disruption
-  priority: 12
-
 - type: storeCategory
   id: UplinkSales
   name: Sales
-  priority: 10
+  priority: 11
 
 #revenant
 - type: storeCategory
diff --git a/Resources/Prototypes/WhiteDream/Entities/Objects/Weapons/Projectiles/cult.yml b/Resources/Prototypes/WhiteDream/Entities/Objects/Weapons/Projectiles/cult.yml
index 03514fae809..08008a3c5fc 100644
--- a/Resources/Prototypes/WhiteDream/Entities/Objects/Weapons/Projectiles/cult.yml
+++ b/Resources/Prototypes/WhiteDream/Entities/Objects/Weapons/Projectiles/cult.yml
@@ -1,12 +1,12 @@
-- type: entity
+- type: entity
+  parent: BaseBulletTrigger
   id: ProjectileGauntlet
   name: gauntlet
   description: Oh no.
-  parent: BaseBulletTrigger
   categories: [ HideSpawnMenu ]
   components:
   - type: PointLight
-    color: Red
+    color: "#FF0000"
     radius: 2.0
     energy: 5.0
   - type: Projectile
@@ -16,5 +16,4 @@
         Blunt: 50
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
-    layers:
-    - state: gauntlet_echo
\ No newline at end of file
+    state: gauntlet_echo
\ No newline at end of file
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index a31608a26d5..46a2f5f70e0 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -223,9 +223,6 @@
 - type: Tag
   id: BoxHug
 
-- type: Tag
-  id: Burnt
-
 - type: Tag
   id: Brain
 
@@ -1278,9 +1275,6 @@
 - type: Tag
   id: Taco
 
-- type: Tag
-  id: Taco
-
 - type: Tag
   id: TabletopPiece
 

From 6688126bb9736fd963cf2bb6827d345eabca9781 Mon Sep 17 00:00:00 2001
From: Ubaser <134914314+UbaserB@users.noreply.github.com>
Date: Tue, 13 Aug 2024 21:08:40 +1000
Subject: [PATCH 116/366] Add capfruit, a gatfruit mutation. (#30850)

* add base

* add fake suffix and flavor fix

* address some reviews

* parent it

* fix test fail

* add FoodSequence support and address small review
---
 .../nutrition/components/food-sequence.ftl    |   1 +
 Resources/Locale/en-US/seeds/seeds.ftl        |   2 +
 .../Objects/Consumable/Food/produce.yml       |  48 +++++++++++++++
 .../Objects/Specific/Hydroponics/seeds.yml    |  19 ++++++
 Resources/Prototypes/Hydroponics/seeds.yml    |  55 ++++++++++++++++++
 .../Hydroponics/capfruit.rsi/dead.png         | Bin 0 -> 1311 bytes
 .../Hydroponics/capfruit.rsi/harvest.png      | Bin 0 -> 1713 bytes
 .../Hydroponics/capfruit.rsi/meta.json        |  29 +++++++++
 .../Hydroponics/capfruit.rsi/produce.png      | Bin 0 -> 2278 bytes
 .../Hydroponics/capfruit.rsi/seed.png         | Bin 0 -> 1351 bytes
 .../Hydroponics/capfruit.rsi/stage-1.png      | Bin 0 -> 1184 bytes
 .../Hydroponics/capfruit.rsi/stage-2.png      | Bin 0 -> 1512 bytes
 12 files changed, 154 insertions(+)
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/dead.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/harvest.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/produce.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/seed.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/stage-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/stage-2.png

diff --git a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
index bf8b73f51b6..555d58a804e 100644
--- a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
+++ b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
@@ -51,6 +51,7 @@ food-sequence-burger-content-ambrosia = ambro
 food-sequence-burger-content-galaxy = galaxy
 food-sequence-burger-content-glasstle = glass
 food-sequence-burger-content-gatfruit = gat
+food-sequence-burger-content-capfruit = cap
 food-sequence-burger-content-rice = rice
 food-sequence-burger-content-soy = soy
 food-sequence-burger-content-koibean = koi
diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl
index cf6ab6e373c..8235f748f60 100644
--- a/Resources/Locale/en-US/seeds/seeds.ftl
+++ b/Resources/Locale/en-US/seeds/seeds.ftl
@@ -130,3 +130,5 @@ seeds-cotton-name = cotton
 seeds-cotton-display-name = cotton plant
 seeds-pyrotton-name = pyrotton
 seeds-pyrotton-display-name = pyrotton plant
+seeds-capfruit-name = capfruit
+seeds-capfruit-display-name = capfruit tree
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index df24879c2af..9203265fde7 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -1787,6 +1787,54 @@
     trash:
     - RevolverCapGunFake
 
+- type: entity
+  name: capfruit
+  parent: FoodProduceBase
+  id: FoodRealCapfruit
+  description: A soft but smooth gun-shaped fruit.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - plastic
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 10
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 5
+        - ReagentId: Sulfur
+          Quantity: 5
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/capfruit.rsi
+  - type: Produce
+    seedId: realCapfruit
+  - type: Food
+    trash:
+    - RevolverCapGun
+  - type: Tag
+    tags:
+    - Fruit
+  - type: FoodSequenceElement
+    entries:
+      burger:
+        name: food-sequence-burger-content-capfruit
+        sprite:
+          sprite: Objects/Specific/Hydroponics/capfruit.rsi
+          state: produce
+
+- type: entity
+  name: capfruit
+  parent: FoodRealCapfruit
+  id: FoodFakeCapfruit
+  suffix: Fake
+  components:
+  - type: Produce
+    seedId: fakeCapfruit
+  - type: Food
+    trash:
+    - RevolverCapGunFake
+
 - type: entity
   name: rice bushel
   description: Can be ground into rice, perfect for pudding or sake.
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
index 25209a50507..510876e1275 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -666,3 +666,22 @@
       seedId: pyrotton
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/pyrotton.rsi
+
+- type: entity
+  parent: SeedBase
+  id: RealCapfruitSeeds
+  name: packet of capfruit seeds
+  description: "Is it real, or is it fake?"
+  components:
+    - type: Seed
+      seedId: realCapfruit
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/capfruit.rsi
+
+- type: entity
+  parent: RealCapfruitSeeds
+  id: FakeCapfruitSeeds
+  suffix: Fake
+  components:
+    - type: Seed
+      seedId: fakeCapfruit
diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index 1be95490dcc..74dfe306c0e 100644
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -1411,6 +1411,61 @@
   packetPrototype: GatfruitSeeds
   productPrototypes:
     - FoodGatfruit
+  mutationPrototypes:
+    - fakeCapfruit
+    - realCapfruit
+  lifespan: 65
+  maturation: 25
+  production: 25
+  yield: 1
+  potency: 10
+  growthStages: 2
+  idealLight: 6
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 5
+      PotencyDivisor: 20
+    Sulfur:
+      Min: 1
+      Max: 5
+      PotencyDivisor: 20
+
+- type: seed
+  id: fakeCapfruit
+  name: seeds-capfruit-name
+  noun: seeds-noun-seeds
+  displayName: seeds-capfruit-display-name
+  plantRsi: Objects/Specific/Hydroponics/capfruit.rsi
+  packetPrototype: FakeCapfruitSeeds
+  productPrototypes:
+    - FoodFakeCapfruit
+  lifespan: 65
+  maturation: 25
+  production: 25
+  yield: 1
+  potency: 10
+  growthStages: 2
+  idealLight: 6
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 5
+      PotencyDivisor: 20
+    Sulfur:
+      Min: 1
+      Max: 5
+      PotencyDivisor: 20
+
+- type: seed
+  id: realCapfruit
+  name: seeds-capfruit-name
+  noun: seeds-noun-seeds
+  displayName: seeds-capfruit-display-name
+  plantRsi: Objects/Specific/Hydroponics/capfruit.rsi
+  packetPrototype: RealCapfruitSeeds
+  productPrototypes:
+    - FoodRealCapfruit
   lifespan: 65
   maturation: 25
   production: 25
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/dead.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5ac23c72273e5c26044c22a39e6ca8ba27306d0
GIT binary patch
literal 1311
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P;
zT0k}j5QD&_;K@Lev%n*=n1MlK76>znTPbd0U|>$m42dX-@b$4u&d=3LOvz75)vL%Y
z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq
z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3
znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z
z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv
z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8
zASV+PvQ{~XdFi%F6}l;@X^EvdB}#V1si`S8`VbYUIw7K{2HNOjvD*gZW2?xZ)Z+Y{
zQc#%N8JU^bfWrYr6cPFm9T8Y{Ad8~w2*}7U$p@yUqReE^ypq(Sf+Aqbg4hVP54Q?*
zvk;bt=4F=H89@y|6Gqa76f;(iMJ46=McE<XSbzi}PHCtSkl;j0nUG`;4tij^x8t(W
zhvy+XuHfvxKwxII@N{tuiQs%2x{>RUfq?JPje36@nik|W)io|?UUYx;gYYd6Rw$Ib
zxN-E|DbYAf=b-ajSPzz17FX{4{^?!R)KC5853b8vyxHzQ+wJl^&2(%1bHRbp51%H*
zac@aH;xfNs_SaQv%wkLe6W^-}c~0)QC-b1ylV$%}&kN?;<-HCn_+IjMNY9XUov792
z6tyV&PKnXFxexdRyZ61DHZ%0{?Sm(mD!J%BING<o_$t#22k#B%KJO`VIG(t_^oUM?
z;;*yq0@WRBPv)>XI801qOv?GO?9c4Ez7Dnh9gi*6-Dlb>YISd$*x81cAHJ6HA2L{z
z7e8$&r_w227Y$~Pz3N3m$qgMr=a_c=VzA^Ei1lYE5<2j9xns^}3r>aKh82<1Lhmz&
z3;N|d8r|0Xno#ew*kk3FN2?Cb|IAmx{_jqsc&JwO)Yv6rYe9vRr>mdKI;Vst0K!zd
AF#rGn

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/harvest.png
new file mode 100644
index 0000000000000000000000000000000000000000..a39a7943eee3c8fedadb1e56d2428dff924e371c
GIT binary patch
literal 1713
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P;
zT0k}j5QD&_;K@Lev%n*=n1MlK76>znTPbd0U|>$m42dX-@b$4u&d=3LOvz75)vL%Y
z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq
z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3
znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z
z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv
z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8
zASV+PvQ{~XdFi%F6}l;@X^EvdB}#V1si`S8`VbYUIw7K{2HNOjvD*gZW2?xZ)Z+Y{
zQc#%N8JU^bfWrYr6cPFm9T8Y{Ad8~w2*}7U$p@yUqReE^ypq(Sf+Aqbg4hVP54Q?*
zvk;bt=4F=H89@y|6Gqa76f;(iMJ46=McE<XSbzi}PHCtSkl;j0nUG`;4tij^x8t(W
zhvy+XuHfvxKn4b;Q=Tr4ArYK!r^I^%7m6G|f9Tekvqp#hbtcVl>1fjt*4*GBb;jIT
zK*{li<BNmSIhdM-7Ts%EBFA)axxyD!5jH_KN0wPj0w%B+t>ox#Ee?2{`nLE<`Ocoo
z_oc7b%Ko@}|L@%Dy5}|TzyA@`^qk1U)3fK?gF|mzcYQ9iHJ5m9{BW7i`2?SX6`wa{
zhCWNnY3k)K|IzdI*Yzb|kL%Ct<$C^fs{YNZ=`Y`Ydlt8^*4-|3UEbTXvZo90f4zBT
z-r=cIC7%w8dj5@=`15Ds${Vs1Ht+RkxgCFUOX~dB+TY)BHSFh}yJMlB_G)P(W8v_x
zwc!`^t+iJ@NjR<gQ!;)+N@VY!zJAZr-?~31dv%Ai$pj~yfBAj;cF~$G|2Iwv|0U{@
zp5hXBtS$7s^#TEjPg;FEKDJ#yBK`!v-MRbHwGd^7Mo|Zc+JgGMAy>C%edy)?zW3PH
zH!_S8tG~QTTga#sAUEM_|924=3!4RB%1ijP-Yz-SG1qqS>Fw6b8u%8hIHCRf)1CCS
z-`*{hWMyEEwM~|i`IXqURkkptA#2{e&YuhZ{Jpe@?YLz+(;)^XXAY}R`C;WIkF3Pk
z+zaEclnb%D>bH(FBWglz>9=Lej>KCp`StSR3X^N{6Zf)bO)<T*v$R>6*<!<XDbe%y
zr3Grt4_;K}Q7Pfk*#6+gZl(h-ek>F-TX^+NiMkNy)yY~8Ter@?*65OJupq&oS4M6f
z!-9W5ubAeV{t0-wUQI7sI&VqPEx|2IG{e}0nmZX;tMeXl9kA#)Z+ms7!-i+;+Go}8
zyEy9#(_AO11kRt^ELK)u?B5l<cjnp^ORh)zo4ww|Zd88b?XUV@bq{Nnv)NrMFv%Bi
zsAha%$-47}FXOXU+pEjwwB()BIJ8z}=eLv7W20-gePK0Z_<PJ*L&9V|>swaFhPuz+
z--skRUfevL%j=-iW7mnjXBC$;I{$XLrz_gEuw?xaht9_Ta~k(Ee{-9lG~G}SR9$$w
L`njxgN@xNA#372J

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/meta.json
new file mode 100644
index 00000000000..037593e1245
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, redrawn by Ubaser.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/produce.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4c043f889fd9dea70381c4a599ee3af57475a36
GIT binary patch
literal 2278
zcmZ`)3piA1A0LG@NTsy7P7_NPbH>;(!_2r0QHV*ILCubtGa8LK)65wrxi8=6vdfA^
zLn1}@V#+3~qOVO;8?hU?u1cbdjY_)t&WzIKY2W90-}9dT`ThQv-}`@`lM&#*Rv&GQ
zMxjvpKHfAs^2Dg7jyAGNVq>47P#VYi9v%Tc9v+wgF~s8wKorU*H$HcR4Y*^`6{`8z
z!o%!xzH*C;peQx%;KXXn%B=>MPZhm>^17<8KB0HQat&C)JIcd4+-+&fT%CF_ZO~@T
z8n3HeO_`nE9g_{~N0;4r+%fsAVQANrx}iDe<2N3LnI_yvC5FTLOP5!$e#+E+6Ex;l
zn#2b;;Z4n5@2sHabSLINc=PL~iLS26cGma~QDq%}To_$mepmWdaVYz;!YKcnrrrXv
zxT!z&QakbB&d{?ra?4W<)>xC@og|Jt1<&(r+GbOF+fUJXzKjV$HQnEf(PEYkhKB^3
zcgqv`*+x6_JWG5wFmog$)MJ_5mwq_6^@erq@LgTD-hN*@H@WHY-BE!xw0rRn^b;fc
z`Y%~#E;W5>>66iovB})+zhi(h%ze7YXdt@l9z0UNvu-@ap>Ea|#{d$mb$`~WiP<9?
zbVL4j{PTL_lX8NYJ@AY2sntT!nPtHQ^qDIG!~#F~^se^cw6Zrn(vv3TcdUC_>Ywx;
zdDwR{V^VLP0BXr;U{I6GNAV)f_19YS^P%hu)dq<P7NeurS-*|Xu|OwO?y6H*BIh>`
zWccv>{7@^Ay$&)}qitgzvd$HGGbJdLuAypbpyVarpir|T`9Tbr;pa=@Kv6h07YYY)
zvM7<7<su^?+b9rbV`NbRp@bwOW7P-}vR9b_EJh81x0A69zW|H}BnB}KI6MxIrJykw
zjEk7dBhhJI@9D@J8M_UJMI-=-iHX6**yA8^1Yk!b5&=8`AP{U3gso(!5N6A4g_7md
zPCoddffA0GFM|1y5To+T4u_;L8H-f~ni<o1ayc_`L{hOp9fivQKmiy93SkLghqD8|
z#)J91j~NOj@8v**0aRZQ8vd&^9}&#?4pGWehUD|UJ|t0&I<5rf0-pc?0v_*ViznC;
zh`>yJNct{Z4hiPN0#Gg7Og(A^-30LGRux_)fq<`4mLy;cBgj~pEf?gmr2-gB5s4wL
zlmof|)1c4E)7H;@x&U7Z@1iQ2#H51~NFY_oPH`l-sFnE4_)-690^@6hPmNy^0=7Xg
zgtU{G&+!q$pjaeET1y@8L%4rOeCg|B>`g*GO!?s83-c$ePmYG<CWd1m@%A9~G0bTA
zuZZ_vruF=!JEvP;tv%BF6toL4bB`!!8-q+&<koHQp}7Sy=04uc+-T@F|J{q`>S9-?
zSu~o~P5RMecN%L>zchJApGq1nprja380M}!wlOfb|0w0eKnpSM(J8MEgs!nCw|8`q
z$@aQ$rrx=08%u+Gw??isYp>1z`GlS`u5g{~Y^~lU{9(7pj}je!A1=OIRPo#J^FLNq
zgkR}#Fh4nP^%YvsPFra0-KM9j_-U0?yVhFi8W)}ZYHXuj=k0Dn*p<MEV59%t3gfK%
zeeVx1E;=kC&~~_#usnbCYdJK_IfoQ=fT<mEZtg>wNi>MAm6kTkAEwLcOS}5^v|5`@
zg-|;PUVF!Tm~mxorBp6+(-L09+WXQfQrPH=a7H+jT_V}ss*M*3LyYty`HM0<GzKhY
zF)6{yBn!>1=rdY=zaBnY^Dt}s9jE8r=_w~#%iu!#h6gA5+iS0)hl&e}&(#b)*u!?x
z*X*Ze{Wy4|F*<DBvT7a1{o47V`kjNy&Lc|(b@$#{q2p}s8)F2nbW(&ZJz~AZAUaCh
zD#n~S8dPiLnelQUpfbHxnG{vHLb<Tbl6K#s;+%*jUuRfG04VMhv+A4?-=ob#Rtd{c
zeXo=Mvsh}=#grR+Z@*R}2-M!Mn5_{Ek&V+MbJ9?q^vzaPjRwBt9$HcLc<7yrf*!Yn
z&x5wbJl6^b8*5r}D)8uY?kL>Bpua*-Mf%xYw%WRPc&$aLGQ_>?dg*`v`P(D8o^?CK
zvpI65(~UF3&04I!#<~g9$zQnN%l8kp%&q^Y;cb||0=RzB(|Pjzkk!rc7pa3#LxEjS
z|8BeSD;E-$JhnToRdzefbYyAZ)Y!n{SjdpHIFRa`=hgD<Y1Ff9O7cA7wXAkU4wMRS
zW{u7I^D6FTuKc@L2fB`{UU0<EHd_9Q`lp#_tRbngNl{g(>AU-xhSK-KDos2dyj3ti
zE*{ueAC?!m;Lw5fP?LT|#PTjw$$c|r?TTFMpg9dM91ry2wp^B^`%iouo1__!@I=Hj
zb+W-H_W8$F`if0rC#NoYR^+v&q0XK<+k8)Qe;_d-Ya3KdFC5)zEOX2*jf!N^R$uRK
zeQe%VJ$~Tk)NP2kPbVocP7}O&)O(-X#9P1Y5}O=2E%f5pn>mk)7KHt^;5l_LPV?H-
cFjbzsueXY9!gy$(p!#q5c>2>$xPPDWe-~AwmH+?%

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/seed.png
new file mode 100644
index 0000000000000000000000000000000000000000..021f448ed76efcf112c7301bc3b20a06fa2c4087
GIT binary patch
literal 1351
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P;
zT0k}j5QD&_;K@Lev%n*=n1MlK76>znTPbd0U|>$m42dX-@b$4u&d=3LOvz75)vL%Y
z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq
z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3
znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z
z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv
z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8
zASV+PvQ{~XdFi%F6}l;@X^EvdB}#V1si`S8`VbYUIw7K{2HNOjvD*gZW2?xZ)Z+Y{
zQc#%N8JU^bfWrYr6cPFm9T8Y{Ad8~w2*}7U$p@yUqReE^ypq(Sf+Aqbg4hVP54Q?*
zvk;bt=4F=H89@y|6Gqa76f;(iMJ46=McE<XSbzi}PHCtSkl;j0nUG`;4tij^x8t(W
zhvy+XuHfvxKwxG~@N{tuiQr65kYHV`XduM|Bn~JZ@L2OVt#0c7qeogL<M!5^Zs=#5
zxjnUv^Wrlj!Pg8EtmNe6*a8a+*@T6K*O<ujv){0oe`VhPBeT4>cssH+IW;yjCvlo_
zrz~kbcxe8<KMa?Tw6JiSHFI=+{8*eE`svBbXtoK;4vLJ$EMcu4O)Az5DV91bCZ1u8
z=9t7B+2bo0scSSlgZ;oG(diEj3X^L2idj561=3EQ<K>p@le0Wh@bO<bn}D?Bfh!F~
z+=dMr><4Q2jW5_L%zOCva50a*-nzsGf`KVFHkB~>aQRFY;&QQMNYOfzZZNxM5w}EL
zeJy`khr#dg83rd!F7h2nGddwCQ-9ycgPB{Sh%vBJKxqDiH?4USy<?2K1T+uwU-Fp3
zoM0x9{bPCm5qHjus)}p$8Z6nwc{lwz-Y?Iy+-$3Gs##!H!n8&i#^lF~JGaWrmt0%~
e4M~UX0t^hcD{~X=--k7U3NcStKbLh*2~7ZHeykz@

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/stage-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..b62b6da82abed83ef60aba96a544194d32934cc4
GIT binary patch
literal 1184
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P;
zT0k}j5QD&_;K@Lev%n*=n1MlK76>znTPbd0U|>$m42dX-@b$4u&d=3LOvz75)vL%Y
z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq
z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3
znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z
z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv
z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8
zASV+PvQ{~XdFi%F6}l;@X^EvdB}#V1si`S8`VbYUIw7K{2HNOjvD*gZW2?xZ)Z+Y{
zQc#%N8JU^bfWrYr6cPFm9T8Y{Ad8~w2*}7U$p@yUqReE^ypq(Sf+Aqbg4hVP54Q?*
zvk;bt=4F=H89@y|6Gqa76f;(iMJ46=McE<XSbzi}PHCtSkl;j0nUG`;4tij^x8t(W
zhvy+XuHfvxKw!q&>FMGa62Y0AAi=s=(Ljm`OgP)JOq$jIUtYkzL8njauD!vu!!<s<
z_l*zoC{J_S_T~81x}>dv;jtku5*9BKO-_`gv<F@{lUdfN({9P&_Bg=HIx$_ndWUjG
zI=9?pN4^8fzEea_c23X;_6%^D$b4^awSQCSjj5B~GDLhhobl$Euvn_f8kXSJg^hA<
zcjoUe=+xO9VbH6tQxtc0ZsWtx)-6tPifnD%(*^znUd!O<X*-a?F+qTdVaY>7-D5uG
Q5unn+)78&qol`;+02Q-t3;+NC

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/stage-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..62c5d75920cf37545ca3aa7ebe8c57d82010e46f
GIT binary patch
literal 1512
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P;
zT0k}j5QD&_;K@Lev%n*=n1MlK76>znTPbd0U|>$m42dX-@b$4u&d=3LOvz75)vL%Y
z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq
z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3
znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z
z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv
z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8
zASV+PvQ{~XdFi%F6}l;@X^EvdB}#V1si`S8`VbYUIw7K{2HNOjvD*gZW2?xZ)Z+Y{
zQc#%N8JU^bfWrYr6cPFm9T8Y{Ad8~w2*}7U$p@yUqReE^ypq(Sf+Aqbg4hVP54Q?*
zvk;bt=4F=H89@y|6Gqa76f;(iMJ46=McE<XSbzi}PHCtSkl;j0nUG`;4tij^x8t(W
zhvy+XuHfvxKn4aTMo$;VkO<DV(+s_t9R*s|l`blAN^IEJp`jJFXlVpTmqt>0YG$UY
zm?rB%FP$T&F2yIPFN%ohoGQW8v_ON+XQ6<i=fccI_YWQEb^HEKNvw#u+}e7#_4~K8
z?>=^M`mN8Uvu=La{}TOP2GeD4*9**=J=f4WdrHW0hD(Lk&srV2voHNSnAoz!KmE1Q
z{*sW%lKYEGLfzWhecmjM5PY_^bp4K?YrWgAeckucAxW_|sMaRl*!V+X*UzH0^`(1s
z#AoKXJh^aW&%QZa8H>DjDzzTk?BmxHep@(@_w<7++cYe=GBmS<W%|^aRPNoL*~h@v
zdFI|E2Mwuiu2lldRWzO+_-*t?Wr6jgYi~q0+`H(z)7D$MfFrSU-Hgog@Z&t3vFS~Y
z@ln}Px7Fk8<NZa0js$ub1~~nW^Y}5Tr$xqQ$#a<iE}qaA#ll|Gr4RX5?7c6fuUa^b
zfuZck;m{{K0?a(jGR{@!jyl`Dm%O7>vNuO^V)%R8OOK1SOZxgQW}TUO|N9Q6%>oMN
znq)t7zgfv*=ACs`m%(D@n+Xv*dHa};80=;JHfw%OeEWxDrKx*j^iF;~8@nK8pJ;&4
z6}kPA1=rZs7RW11GD&XaG-1wK&+Bqvn*CI-n?GxQH*zT0Z#`bLGv@951LnVeGx`5#
zo-Z8F<I_EbOa5U+kjmu0FWTc)H~?V-KkGe)&hKnS7Q)`@pi<V;)z4*}Q$iB}`rrt;

literal 0
HcmV?d00001


From ce5a4e5a2482f55ca7e01d22f0b48916bcf06231 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 00:44:40 -0400
Subject: [PATCH 117/366] hm

---
 .../Objects/Consumable/Food/ingredients.yml   |  7 ---
 .../Objects/Consumable/Food/produce.yml       | 55 -------------------
 2 files changed, 62 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
index af313f89eb5..ffb52a7b0ff 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -493,13 +493,6 @@
   - type: SliceableFood
     count: 3
     slice: FoodCheeseSlice
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-cheese
-        sprite:
-          sprite: Objects/Consumable/Food/ingredients.rsi
-          state: cheesewheel
 
 - type: entity
   name: cheese wedge
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index 9203265fde7..d9978289fff 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -1787,54 +1787,6 @@
     trash:
     - RevolverCapGunFake
 
-- type: entity
-  name: capfruit
-  parent: FoodProduceBase
-  id: FoodRealCapfruit
-  description: A soft but smooth gun-shaped fruit.
-  components:
-  - type: FlavorProfile
-    flavors:
-      - plastic
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 10
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 5
-        - ReagentId: Sulfur
-          Quantity: 5
-  - type: Sprite
-    sprite: Objects/Specific/Hydroponics/capfruit.rsi
-  - type: Produce
-    seedId: realCapfruit
-  - type: Food
-    trash:
-    - RevolverCapGun
-  - type: Tag
-    tags:
-    - Fruit
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-capfruit
-        sprite:
-          sprite: Objects/Specific/Hydroponics/capfruit.rsi
-          state: produce
-
-- type: entity
-  name: capfruit
-  parent: FoodRealCapfruit
-  id: FoodFakeCapfruit
-  suffix: Fake
-  components:
-  - type: Produce
-    seedId: fakeCapfruit
-  - type: Food
-    trash:
-    - RevolverCapGunFake
-
 - type: entity
   name: rice bushel
   description: Can be ground into rice, perfect for pudding or sake.
@@ -1851,13 +1803,6 @@
           Quantity: 10
   - type: Produce
     seedId: rice
-  - type: FoodSequenceElement
-    entries:
-      burger:
-        name: food-sequence-burger-content-rice
-        sprite:
-          sprite: Objects/Specific/Hydroponics/rice.rsi
-          state: produce
 
 - type: entity
   name: soybeans

From 134f648763a56db0ebd72edab878121e63d23f04 Mon Sep 17 00:00:00 2001
From: RumiTiger <154005209+RumiTiger@users.noreply.github.com>
Date: Thu, 29 Aug 2024 04:30:58 +0300
Subject: [PATCH 118/366] Cherry (#28962)

* Add files via upload

* Update produce.yml

* Update produce.yml

* Update seeds.yml

* Update flavor-profiles.ftl

* Update flavors.yml

* Update meal_recipes.yml

* Update food_produce.yml

* Update meta.json

* Update seeds.yml

* Update botany.yml

* Delete Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json

* Create meta.json

* Delete Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json

* Create meta.json

* Update produce.yml

* Update produce.yml

* Update produce.yml

* Update food_produce.yml

* Update food_produce.yml

* Update produce.yml

* Apply suggestions from code review

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Update seeds.yml

* Update juice.yml

* Update juice.ftl

* Update seeds.ftl

* Update seeds.yml

* Update cargo_botany.yml

* Update cargo_botany.yml

* Update cargo_botany.yml

* Update cargo_vending.yml

* Update cargo_vending.yml

* Update seeds.yml

* Update seeds.yml

* Update meta.json

* Update produce.yml

* Cherry Tree

* Alphabetical order

* Update food_produce.yml

* Update food-sequence.ftl

* Update food-sequence.ftl

* Update produce.yml

* Update produce.yml

* Update food-sequence.ftl

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
---
 .../Locale/en-US/flavors/flavor-profiles.ftl  |   1 +
 .../nutrition/components/food-sequence.ftl    |  77 +++++
 .../reagents/meta/consumable/drink/juice.ftl  |   3 +
 Resources/Locale/en-US/seeds/seeds.ftl        |   2 +
 .../Prototypes/Catalog/Cargo/cargo_botany.yml |   2 +-
 .../Catalog/Fills/Crates/botany.yml           |   1 +
 .../VendingMachines/Inventories/seeds.yml     |   1 +
 .../Random/Food_Drinks/food_produce.yml       | 172 +++++++++---
 .../Objects/Specific/Hydroponics/seeds.yml    |  10 +
 Resources/Prototypes/Hydroponics/seeds.yml    | 264 ++++++++++--------
 .../Reagents/Consumable/Drink/juice.yml       |   9 +
 .../Recipes/Cooking/meal_recipes.yml          |  18 +-
 .../Specific/Hydroponics/cherry.rsi/dead.png  | Bin 0 -> 3331 bytes
 .../Hydroponics/cherry.rsi/harvest.png        | Bin 0 -> 3494 bytes
 .../Specific/Hydroponics/cherry.rsi/meta.json |  44 +++
 .../Specific/Hydroponics/cherry.rsi/pit.png   | Bin 0 -> 2856 bytes
 .../Hydroponics/cherry.rsi/produce.png        | Bin 0 -> 2998 bytes
 .../Specific/Hydroponics/cherry.rsi/seed.png  | Bin 0 -> 3139 bytes
 .../Hydroponics/cherry.rsi/stage-1.png        | Bin 0 -> 2932 bytes
 .../Hydroponics/cherry.rsi/stage-2.png        | Bin 0 -> 2974 bytes
 .../Hydroponics/cherry.rsi/stage-3.png        | Bin 0 -> 3052 bytes
 .../Hydroponics/cherry.rsi/stage-4.png        | Bin 0 -> 3292 bytes
 .../Hydroponics/cherry.rsi/stage-5.png        | Bin 0 -> 3412 bytes
 .../Hydroponics/cherry.rsi/stage-6.png        | Bin 0 -> 3434 bytes
 24 files changed, 434 insertions(+), 170 deletions(-)
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/dead.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/harvest.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/pit.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/produce.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/seed.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-3.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-4.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-5.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-6.png

diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
index ed9656f27cf..543e9be50d0 100644
--- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
@@ -123,6 +123,7 @@ flavor-complex-meatballs = like meatballs
 flavor-complex-nettles = like nettles
 flavor-complex-jungle = like jungle
 flavor-complex-vegetables = like vegetables
+flavor-complex-cherry = like cherries
 # use it when there multiple types of veggies
 
 ## Complex foodstuffs (cooked foods, joke flavors, etc)
diff --git a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
index 555d58a804e..0e2f83e0c78 100644
--- a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
+++ b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
@@ -3,6 +3,83 @@ food-sequence-no-space = You can't put any more!
 food-sequence-standart-gen = {$prefix}{$content}{$suffix}
 
 food-sequence-burger-suffix = burger
+# GENERAL
+
+food-sequence-content-chicken = chicken
+food-sequence-content-duck = duck
+food-sequence-content-crab = crabs
+food-sequence-content-dragon = dragon
+food-sequence-content-snake = snake
+food-sequence-content-xeno = xeno
+food-sequence-content-rouny = rouny
+food-sequence-content-tomato = tomato
+food-sequence-content-salami = salami
+food-sequence-content-slime = slime
+food-sequence-content-clown = clown
+food-sequence-content-pea = pea
+food-sequence-content-bungo = bungo
+food-sequence-content-banana = banana
+food-sequence-content-mimana = mimana
+food-sequence-content-lemon = lemon
+food-sequence-content-lemoon = lemoon
+food-sequence-content-lime = lime
+food-sequence-content-orange = orange
+food-sequence-content-potato = potato
+food-sequence-content-apple = apple
+food-sequence-content-cocoa = cocoa
+food-sequence-content-corn = corn
+food-sequence-content-chili = chili
+food-sequence-content-chilly = chilly
+food-sequence-content-mushroom = shrooms
+food-sequence-content-aloe = aloe
+food-sequence-content-poppy = poppy
+food-sequence-content-lily = lily
+food-sequence-content-soy = soy
+food-sequence-content-cheese = cheese
+food-sequence-content-chevre = chèvre
+food-sequence-content-tofu = tofu
+food-sequence-content-brain = brain
+food-sequence-content-tongue = tongue
+food-sequence-content-ears = ear
+food-sequence-content-stomach = stomach
+food-sequence-content-liver = liver
+food-sequence-content-clump = clump
+food-sequence-content-raw-meat = raw meat
+food-sequence-content-meat = meat
+food-sequence-content-carp = carp meat
+food-sequence-content-bear = bear meat
+food-sequence-content-penguin = penguin meat
+food-sequence-content-corgi = corgi meat
+food-sequence-content-goliath = goliath meat
+food-sequence-content-rat = rat
+food-sequence-content-lizard = lizard meat
+food-sequence-content-plant = plant meat
+food-sequence-content-rotten = rotten meat
+food-sequence-content-spider = spider legs
+food-sequence-content-carrot = carrot
+food-sequence-content-cabbage = cabbage
+food-sequence-content-garlic = garlic
+food-sequence-content-pineapple = pineapple
+food-sequence-content-onion = onion
+food-sequence-content-ambrosia = ambrosia
+food-sequence-content-galaxy = galaxythistle
+food-sequence-content-glasstle = glasstle
+food-sequence-content-gatfruit = gatfruit
+food-sequence-content-koibean = koibean
+food-sequence-content-watermelon = watermelon
+food-sequence-content-cannabis = cannabis
+food-sequence-content-rainbow-cannabis = rainbow cannabis
+food-sequence-content-tobacco = tobacco
+food-sequence-content-hamster = hamster
+food-sequence-content-suppermatter = suppermatter
+food-sequence-content-capfruit = capfruit
+food-sequence-content-berries = berries
+food-sequence-content-spacemans-trumpet = spacemans trupmet
+food-sequence-content-cherry = cherry
+
+# BURGERS
+
+food-sequence-burger-gen = {$content}burger
 
 food-sequence-burger-content-raw-meat = raw
 food-sequence-burger-content-carp = carpo
diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl
index 3f968421d06..810f3d12f51 100644
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl
@@ -36,3 +36,6 @@ reagent-desc-juice-tomato = Tomatoes made into juice. What a waste of good tomat
 
 reagent-name-juice-watermelon = water melon juice
 reagent-desc-juice-watermelon = The delicious juice of a watermelon.
+
+reagent-name-juice-cherry = cherry juice
+reagent-desc-juice-cherry = Tasty cherry juice, sweet and tangy.
diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl
index 8235f748f60..466924ae2a4 100644
--- a/Resources/Locale/en-US/seeds/seeds.ftl
+++ b/Resources/Locale/en-US/seeds/seeds.ftl
@@ -132,3 +132,5 @@ seeds-pyrotton-name = pyrotton
 seeds-pyrotton-display-name = pyrotton plant
 seeds-capfruit-name = capfruit
 seeds-capfruit-display-name = capfruit tree
+seeds-cherry-name = cherry
+seeds-cherry-display-name = cherry tree
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
index a6671ff0998..0a24240e7d0 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
@@ -34,7 +34,7 @@
     sprite: Objects/Specific/Hydroponics/apple.rsi
     state: seed
   product: CrateHydroponicsSeeds
-  cost: 550
+  cost: 600
   category: cargoproduct-category-name-hydroponics
   group: market
 
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
index f10fd010f64..a708b02610e 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
@@ -95,3 +95,4 @@
       - id: GrapeSeeds
       - id: WatermelonSeeds
       - id: PeaSeeds
+      - id: CherrySeeds
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
index 05e3ae0eb0e..90379550d8a 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
@@ -8,6 +8,7 @@
     CarrotSeeds: 5
     CabbageSeeds: 5
     ChanterelleSeeds: 5
+    CherrySeeds: 5
     ChiliSeeds: 5
     CornSeeds: 5
     EggplantSeeds: 5
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml
index a889b939bde..c8c86e3d647 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml
@@ -10,47 +10,137 @@
       - state: green
       - sprite: Objects/Specific/Hydroponics/onion_red.rsi
         state: produce
-  - type: RandomSpawner
-    prototypes:
-      - WheatBushel
-      - OatBushel
-      - Sugarcane
-      - Nettle
-      - FoodBanana
-      - FoodCarrot
-      - FoodCabbage
-      - FoodGarlic
-      - FoodLemon
-      - FoodLime
-      - FoodOrange
-      - FoodPineapple
-      - FoodPotato
-      - FoodTomato
-      - FoodEggplant
-      - FoodApple
-      - FoodCocoaPod
-      - FoodCorn
-      - FoodOnion
-      - FoodOnionRed
-      - FoodMushroom
-      - FoodChiliPepper
-      - FoodChillyPepper
-      - FoodAloe
-      - FoodPoppy
-      - FoodLingzhi
-      - FoodAmbrosiaVulgaris
-      - RiceBushel
-      - FoodSoybeans
-      - FoodKoibean
-      - FoodWatermelon
-      - FoodGrape
-      - FoodBerries
-      - FoodBungo
-      - FoodPeaPod
-      - FoodPumpkin
-      - CottonBol
-    chance: 0.8
-    offset: 0.0
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: ProduceTable
+      prob: 0.8
+
+#Tables
+- type: entityTable
+  id: ProduceTable
+  table: !type:GroupSelector
+    children:
+    #Common
+    - !type:GroupSelector
+      weight: 100
+      children:
+      - id: WheatBushel
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: OatBushel
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: Sugarcane
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: Nettle
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodBanana
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodCarrot
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodCabbage
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodGarlic
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodLemon
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodLime
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodOrange
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodPineapple
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodPotato
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodTomato
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodEggplant
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodApple
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodCocoaPod
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodCorn
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodOnion
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodOnionRed
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodMushroom
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodChiliPepper
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodChillyPepper
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodAloe
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodPoppy
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodLingzhi
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodAmbrosiaVulgaris
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: RiceBushel
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodSoybeans
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodKoibean
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodWatermelon
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodGrape
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodBerries
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodBungo
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodPeaPod
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodPumpkin
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: CottonBol
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodCocoaBeans
+        amount: !type:RangeNumberSelector
+          range: 1, 5
+      - id: FoodCherry
+        amount: !type:RangeNumberSelector
+          range: 1, 5
     #rare
     rarePrototypes:
       - FoodBlueTomato
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
index 510876e1275..090f8f67af6 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -685,3 +685,13 @@
   components:
     - type: Seed
       seedId: fakeCapfruit
+
+- type: entity
+  parent: SeedBase
+  name: packet of cherry seeds
+  id: CherrySeeds
+  components:
+    - type: Seed
+      seedId: cherry
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/cherry.rsi
diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index 74dfe306c0e..1111343d34f 100644
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -20,11 +20,11 @@
     Nutriment:
       Min: 1
       Max: 20
-      potencyDivisor: 20
+      PotencyDivisor: 20
     Flour:
       Min: 5
       Max: 20
-      potencyDivisor: 20
+      PotencyDivisor: 20
 
 - type: seed
   id: meatwheat
@@ -98,11 +98,11 @@
     Nutriment:
       Min: 1
       Max: 20
-      potencyDivisor: 20
+      PotencyDivisor: 20
     Oats:
       Min: 5
       Max: 20
-      potencyDivisor: 20
+      PotencyDivisor: 20
 
 - type: seed
   id: banana
@@ -127,11 +127,11 @@
     Vitamin:
       Min: 1
       Max: 4
-      potencyDivisor: 25
+      PotencyDivisor: 25
     Nutriment:
       Min: 1
       Max: 2
-      potencyDivisor: 50
+      PotencyDivisor: 50
 
 - type: seed
   id: mimana
@@ -154,11 +154,11 @@
     MuteToxin:
       Min: 1
       Max: 5
-      potencyDivisor: 20
+      PotencyDivisor: 20
     Nutriment:
       Min: 1
       Max: 2
-      potencyDivisor: 50
+      PotencyDivisor: 50
 
 - type: seed
   id: carrots
@@ -180,15 +180,15 @@
     JuiceCarrot:
       Min: 1
       Max: 5
-      potencyDivisor: 20
+      PotencyDivisor: 20
     Oculine:
       Min: 2
       Max: 6
-      potencyDivisor: 20
+      PotencyDivisor: 20
     Vitamin:
       Min: 1
       Max: 4
-      potencyDivisor: 25
+      PotencyDivisor: 25
 
 - type: seed
   id: laughinPea
@@ -215,15 +215,15 @@
     Nutriment:
       Min: 1
       Max: 3
-      potencyDivisor: 7
+      PotencyDivisor: 7
     Sugar:
       Min: 1
       Max: 10
-      potencyDivisor: 5
+      PotencyDivisor: 5
     Laughter:
       Min: 1
       Max: 10
-      potencyDivisor: 5
+      PotencyDivisor: 5
 
 - type: seed
   id: lemon
@@ -249,11 +249,11 @@
     Nutriment:
       Min: 1
       Max: 5
-      potencyDivisor: 20
+      PotencyDivisor: 20
     Vitamin:
       Min: 1
       Max: 4
-      potencyDivisor: 25
+      PotencyDivisor: 25
 
 - type: seed
   id: lemoon
@@ -275,11 +275,11 @@
     Vitamin:
       Min: 1
       Max: 4
-      potencyDivisor: 25
+      PotencyDivisor: 25
     Milk:
       Min: 8
       Max: 20
-      potencyDivisor: 5
+      PotencyDivisor: 5
 
 - type: seed
   id: lime
@@ -304,11 +304,11 @@
     Nutriment:
       Min: 1
       Max: 5
-      potencyDivisor: 20
+      PotencyDivisor: 20
     Vitamin:
       Min: 1
       Max: 4
-      potencyDivisor: 25
+      PotencyDivisor: 25
 
 - type: seed
   id: orange
@@ -334,11 +334,11 @@
     Nutriment:
       Min: 1
       Max: 5
-      potencyDivisor: 20
+      PotencyDivisor: 20
     Vitamin:
       Min: 1
       Max: 4
-      potencyDivisor: 25
+      PotencyDivisor: 25
 
 - type: seed
   id: extradimensionalOrange
@@ -421,15 +421,15 @@
     Nutriment:
       Min: 1
       Max: 20
-      potencyDivisor: 20
+      PotencyDivisor: 20
     Water:
       Min: 1
       Max: 4
-      potencyDivisor: 25
+      PotencyDivisor: 25
     Vitamin:
       Min: 1
       Max: 2
-      potencyDivisor: 50
+      PotencyDivisor: 50
 
 - type: seed
   id: potato
@@ -451,11 +451,11 @@
     Nutriment:
       Min: 1
       Max: 10
-      potencyDivisor: 10
+      PotencyDivisor: 10
     Vitamin:
       Min: 1
       Max: 4
-      potencyDivisor: 25
+      PotencyDivisor: 25
 
 - type: seed
   id: sugarcane
@@ -480,7 +480,7 @@
     Sugar:
       Min: 4
       Max: 5
-      potencyDivisor: 5
+      PotencyDivisor: 5
 
 - type: seed
   id: papercane
@@ -571,15 +571,15 @@
     Nutriment:
       Min: 1
       Max: 7
-      potencyDivisor: 14
+      PotencyDivisor: 14
     Vitamin:
       Min: 1
       Max: 3
-      potencyDivisor: 33
+      PotencyDivisor: 33
     Water:
       Min: 1
       Max: 4
-      potencyDivisor: 25
+      PotencyDivisor: 25
 
 - type: seed
   id: blueTomato
@@ -605,15 +605,15 @@
     Nutriment:
       Min: 1
       Max: 5
-      potencyDivisor: 20
+      PotencyDivisor: 20
     SpaceLube:
       Min: 5
       Max: 15
-      potencyDivisor: 10
+      PotencyDivisor: 10
     Vitamin:
       Min: 1
       Max: 4
-      potencyDivisor: 25
+      PotencyDivisor: 25
 
 - type: seed
   id: bloodTomato
@@ -639,11 +639,11 @@
     Blood:
       Min: 1
       Max: 10
-      potencyDivisor: 10
+      PotencyDivisor: 10
     Vitamin:
       Min: 1
       Max: 4
-      potencyDivisor: 25
+      PotencyDivisor: 25
 
 - type: seed
   id: eggplant
@@ -668,11 +668,11 @@
     Nutriment:
       Min: 1
       Max: 10
-      potencyDivisor: 10
+      PotencyDivisor: 10
     Vitamin:
       Min: 1
       Max: 4
-      potencyDivisor: 25
+      PotencyDivisor: 25
 
 - type: seed
   id: cabbage
@@ -693,11 +693,11 @@
     Nutriment:
       Min: 1
       Max: 10
-      potencyDivisor: 10
+      PotencyDivisor: 10
     Vitamin:
       Min: 1
       Max: 4
-      potencyDivisor: 25
+      PotencyDivisor: 25
 
 - type: seed
   id: garlic
@@ -718,15 +718,15 @@
     Nutriment:
       Min: 1
       Max: 10
-      potencyDivisor: 10
+      PotencyDivisor: 10
     Vitamin:
       Min: 1
       Max: 4
-      potencyDivisor: 25
+      PotencyDivisor: 25
     Allicin:
       Min: 1
       Max: 8
-      potencyDivisor: 25
+      PotencyDivisor: 25
 
 - type: seed
   id: apple
@@ -750,11 +750,11 @@
     Nutriment:
       Min: 1
       Max: 10
-      potencyDivisor: 10
+      PotencyDivisor: 10
     Vitamin:
       Min: 1
       Max: 4
-      potencyDivisor: 25
+      PotencyDivisor: 25
 
 - type: seed
   id: goldenApple
@@ -810,11 +810,11 @@
     Nutriment:
       Min: 1
       Max: 10
-      potencyDivisor: 20
+      PotencyDivisor: 20
     Cornmeal:
       Min: 5
       Max: 15
-      potencyDivisor: 10
+      PotencyDivisor: 10
 
 - type: seed
   id: onion
@@ -840,15 +840,15 @@
     Nutriment:
       Min: 1
       Max: 10
-      potencyDivisor: 10
+      PotencyDivisor: 10
     Vitamin:
       Min: 1
       Max: 4
-      potencyDivisor: 25
+      PotencyDivisor: 25
     Allicin:
       Min: 1
       Max: 4
-      potencyDivisor: 25
+      PotencyDivisor: 25
 
 - type: seed
   id: onionred
@@ -872,15 +872,15 @@
     Nutriment:
       Min: 1
       Max: 10
-      potencyDivisor: 10
+      PotencyDivisor: 10
     Vitamin:
       Min: 1
       Max: 4
-      potencyDivisor: 25
+      PotencyDivisor: 25
     Allicin:
       Min: 1
       Max: 4
-      potencyDivisor: 25
+      PotencyDivisor: 25
 
 - type: seed
   id: chanterelle
@@ -905,7 +905,7 @@
     Nutriment:
       Min: 1
       Max: 25
-      potencyDivisor: 25
+      PotencyDivisor: 25
 
 - type: seed
   id: eggy
@@ -929,7 +929,7 @@
     Egg:
       Min: 1
       Max: 10
-      potencyDivisor: 10
+      PotencyDivisor: 10
 
 - type: seed
   id: cannabis
@@ -956,7 +956,7 @@
     THC:
       Min: 1
       Max: 10
-      potencyDivisor: 10
+      PotencyDivisor: 10
 
 - type: seed
   id: rainbowCannabis
@@ -981,27 +981,27 @@
     SpaceDrugs:
       Min: 1
       Max: 15
-      potencyDivisor: 10
+      PotencyDivisor: 10
     Lipolicide:
       Min: 1
       Max: 15
-      potencyDivisor: 10
+      PotencyDivisor: 10
     MindbreakerToxin:
       Min: 1
       Max: 5
-      potencyDivisor: 20
+      PotencyDivisor: 20
     Happiness:
       Min: 1
       Max: 5
-#     potencyDivisor: 20
+#     PotencyDivisor: 20
 #   ColorfulReagent:
 #     Min: 0
 #     Max: 5
-#     potencyDivisor: 20
+#     PotencyDivisor: 20
     Psicodine:
       Min: 0
       Max: 5
-      potencyDivisor: 33
+      PotencyDivisor: 33
 
 - type: seed
   id: tobacco
@@ -1026,7 +1026,7 @@
     Nicotine:
       Min: 1
       Max: 10
-      potencyDivisor: 10
+      PotencyDivisor: 10
 
 - type: seed
   id: nettle
@@ -1052,7 +1052,7 @@
     Histamine:
       Min: 1
       Max: 25
-      potencyDivisor: 4
+      PotencyDivisor: 4
 
 - type: seed
   id: deathNettle
@@ -1077,11 +1077,11 @@
     SulfuricAcid:
       Min: 1
       Max: 15
-      potencyDivisor: 6
+      PotencyDivisor: 6
     FluorosulfuricAcid:
       Min: 1
       Max: 15
-      potencyDivisor: 6
+      PotencyDivisor: 6
 
 - type: seed
   id: chili
@@ -1106,15 +1106,15 @@
     CapsaicinOil:
       Min: 1
       Max: 10
-      potencyDivisor: 10
+      PotencyDivisor: 10
     Nutriment:
       Min: 1
       Max: 4
-      potencyDivisor: 25
+      PotencyDivisor: 25
     Vitamin:
       Min: 1
       Max: 4
-      potencyDivisor: 25
+      PotencyDivisor: 25
 
 - type: seed
   id: chilly
@@ -1137,15 +1137,15 @@
     Frostoil:
       Min: 1
       Max: 10
-      potencyDivisor: 10
+      PotencyDivisor: 10
     Nutriment:
       Min: 1
       Max: 4
-      potencyDivisor: 25
+      PotencyDivisor: 25
     Vitamin:
       Min: 1
       Max: 4
-      potencyDivisor: 25
+      PotencyDivisor: 25
 
 - type: seed
   id: poppy
@@ -1169,11 +1169,11 @@
     Nutriment:
       Min: 1
       Max: 2
-      potencyDivisor: 50
+      PotencyDivisor: 50
     Bicaridine:
       Min: 1
       Max: 20
-      potencyDivisor: 5
+      PotencyDivisor: 5
 
 - type: seed
   id: aloe
@@ -1195,11 +1195,11 @@
     Aloe:
       Min: 1
       Max: 10
-      potencyDivisor: 10
+      PotencyDivisor: 10
     Dermaline:
       Min: 1
       Max: 10
-      potencyDivisor: 10
+      PotencyDivisor: 10
 
 - type: seed
   id: lily
@@ -1223,11 +1223,11 @@
     Nutriment:
       Min: 1
       Max: 2
-      potencyDivisor: 50
+      PotencyDivisor: 50
     Bicaridine:
       Min: 1
       Max: 20
-      potencyDivisor: 5
+      PotencyDivisor: 5
 
 - type: seed
   id: lingzhi
@@ -1249,11 +1249,11 @@
     Ultravasculine:
       Min: 1
       Max: 20
-      potencyDivisor: 5
+      PotencyDivisor: 5
     Epinephrine:
       Min: 1
       Max: 20
-      potencyDivisor: 5
+      PotencyDivisor: 5
 
 - type: seed
   id: ambrosiaVulgaris
@@ -1277,23 +1277,23 @@
     Nutriment:
       Min: 1
       Max: 2
-      potencyDivisor: 10
+      PotencyDivisor: 10
     Bicaridine:
       Min: 1
       Max: 5
-      potencyDivisor: 20
+      PotencyDivisor: 20
     Kelotane:
       Min: 1
       Max: 5
-      potencyDivisor: 20
+      PotencyDivisor: 20
     Desoxyephedrine:
       Min: 1
       Max: 10
-      potencyDivisor: 10
+      PotencyDivisor: 10
     Vitamin:
       Min: 1
       Max: 2
-      potencyDivisor: 50
+      PotencyDivisor: 50
 
 - type: seed
   id: ambrosiaDeus
@@ -1315,19 +1315,19 @@
     Nutriment:
       Min: 1
       Max: 2
-      potencyDivisor: 10
+      PotencyDivisor: 10
     Omnizine: # Don't kill me
       Min: 1
       Max: 3
-      potencyDivisor: 35
+      PotencyDivisor: 35
     SpaceDrugs:
       Min: 1
       Max: 5
-      potencyDivisor: 20
+      PotencyDivisor: 20
     Desoxyephedrine:
       Min: 1
       Max: 10
-      potencyDivisor: 10
+      PotencyDivisor: 10
 
 - type: seed
   id: galaxythistle
@@ -1351,7 +1351,7 @@
     Stellibinin:
       Min: 1
       Max: 25
-      potencyDivisor: 4
+      PotencyDivisor: 4
 
 - type: seed
   id: glasstle
@@ -1396,11 +1396,11 @@
     Amatoxin:
       Min: 1
       Max: 25
-      potencyDivisor: 4
+      PotencyDivisor: 4
     Nutriment: ## yumby :)
       Min: 1
       Max: 5
-      potencyDivisor: 20
+      PotencyDivisor: 20
 
 - type: seed
   id: gatfruit
@@ -1477,11 +1477,11 @@
     Nutriment:
       Min: 1
       Max: 5
-      potencyDivisor: 20
+      PotencyDivisor: 20
     Sulfur:
       Min: 1
       Max: 5
-      potencyDivisor: 20
+      PotencyDivisor: 20
 
 - type: seed
   id: rice
@@ -1505,11 +1505,11 @@
     Nutriment:
       Min: 1
       Max: 20
-      potencyDivisor: 20
+      PotencyDivisor: 20
     Rice:
       Min: 5
       Max: 20
-      potencyDivisor: 20
+      PotencyDivisor: 20
 
 - type: seed
   id: soybeans
@@ -1534,7 +1534,7 @@
     Nutriment:
       Min: 1
       Max: 2
-      potencyDivisor: 50
+      PotencyDivisor: 50
 
 - type: seed
   id: spacemansTrumpet
@@ -1556,11 +1556,11 @@
     Nutriment:
       Min: 1
       Max: 5
-      potencyDivisor: 50
+      PotencyDivisor: 50
     PolypyryliumOligomers:
       Min: 1
       Max: 15
-      potencyDivisor: 5
+      PotencyDivisor: 5
 
 - type: seed
   id: koibean
@@ -1583,11 +1583,11 @@
     Nutriment:
       Min: 1
       Max: 5
-      potencyDivisor: 20
+      PotencyDivisor: 20
     CarpoToxin:
       Min: 1
       Max: 4
-      potencyDivisor: 30
+      PotencyDivisor: 30
 
 - type: seed
   id: grape
@@ -1608,11 +1608,11 @@
     Nutriment:
       Min: 1
       Max: 5
-      potencyDivisor: 20
+      PotencyDivisor: 20
     Vitamin:
       Min: 1
       Max: 4
-      potencyDivisor: 25
+      PotencyDivisor: 25
 
 - type: seed
   id: watermelon
@@ -1635,15 +1635,15 @@
     Nutriment:
       Min: 1
       Max: 10
-      potencyDivisor: 10
+      PotencyDivisor: 10
     Water:
       Min: 1
       Max: 10
-      potencyDivisor: 10
+      PotencyDivisor: 10
     Vitamin:
       Min: 1
       Max: 5
-      potencyDivisor: 20
+      PotencyDivisor: 20
 
 - type: seed
   id: holymelon
@@ -1725,11 +1725,11 @@
     Vitamin:
       Min: 1
       Max: 4
-      potencyDivisor: 25
+      PotencyDivisor: 25
     Nutriment:
       Min: 1
       Max: 2
-      potencyDivisor: 50
+      PotencyDivisor: 50
 
 - type: seed
   id: berries
@@ -1751,11 +1751,11 @@
     Nutriment:
       Min: 2
       Max: 5
-      potencyDivisor: 30
+      PotencyDivisor: 30
     Vitamin:
       Min: 1
       Max: 4
-      potencyDivisor: 40
+      PotencyDivisor: 40
 
 - type: seed
   id: bungo
@@ -1780,11 +1780,11 @@
     Nutriment:
       Min: 5
       Max: 10
-      potencyDivisor: 20
+      PotencyDivisor: 20
     Enzyme:
       Min: 5
       Max: 10
-      potencyDivisor: 20
+      PotencyDivisor: 20
 
 - type: seed
   id: pea
@@ -1811,11 +1811,11 @@
     Nutriment:
       Min: 1
       Max: 3
-      potencyDivisor: 33
+      PotencyDivisor: 33
     Vitamin:
       Min: 1
       Max: 2
-      potencyDivisor: 50
+      PotencyDivisor: 50
 
 - type: seed
   id: worldPea
@@ -1903,11 +1903,11 @@
     PumpkinFlesh:
       Min: 1
       Max: 20
-      potencyDivisor: 5
+      PotencyDivisor: 5
     Vitamin:
       Min: 1
       Max: 5
-      potencyDivisor: 20
+      PotencyDivisor: 20
 
 - type: seed
   id: cotton
@@ -1932,7 +1932,7 @@
     Fiber:
       Min: 5
       Max: 10
-      potencyDivisor: 20
+      PotencyDivisor: 20
 
 - type: seed
   id: pyrotton
@@ -1955,8 +1955,34 @@
     Fiber:
       Min: 5
       Max: 10
-      potencyDivisor: 20
+      PotencyDivisor: 20
     Phlogiston:
       Min: 4
       Max: 8
-      potencyDivisor: 30
+      PotencyDivisor: 30
+
+- type: seed
+  id: cherry
+  name: seeds-cherry-name
+  noun: seeds-noun-seeds
+  displayName: seeds-cherry-display-name
+  plantRsi: Objects/Specific/Hydroponics/cherry.rsi
+  packetPrototype: CherrySeeds
+  productPrototypes:
+    - FoodCherry
+  harvestRepeat: Repeat
+  lifespan: 55
+  maturation: 6
+  production: 6
+  yield: 5
+  potency: 10
+  idealLight: 6
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 3
+      PotencyDivisor: 30
+    Vitamin:
+      Min: 1
+      Max: 3
+      PotencyDivisor: 40
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml
index c42791fa8fe..59d6063e78e 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml
@@ -143,3 +143,12 @@
   metamorphicMaxFillLevels: 4
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
+
+- type: reagent
+  id: JuiceCherry
+  name: reagent-name-juice-cherry
+  parent: BaseJuice
+  desc: reagent-desc-juice-cherry
+  physicalDesc: reagent-physical-desc-sweet
+  flavor: cherry
+  color: "#84031a"
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index c48684fce55..9bca33fbbf5 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -948,15 +948,15 @@
     FoodBerries: 3
     FoodPlateTin: 1
 
-#- type: microwaveMealRecipe
-#  id: RecipeCherryPie
-#  name: cherry pie recipe
-#  result: FoodPieCherry
-#  time: 15
-#  solids:
-#    FoodDoughPie: 1
-#    FoodCherry: 3 #cherries don't exist yet
-#    FoodPlateTin: 1
+- type: microwaveMealRecipe
+  id: RecipeCherryPie
+  name: cherry pie recipe
+  result: FoodPieCherry
+  time: 15
+  solids:
+    FoodDoughPie: 1
+    FoodCherry: 5
+    FoodPlateTin: 1
 
 - type: microwaveMealRecipe
   id: RecipeFrostyPie
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/dead.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5667d27219d356dd872977bbc6bd1b83daf00b8
GIT binary patch
literal 3331
zcmV+e4gB(nP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004XF*Lt006O%
z3;baP000U}X+uL$b5ch_AW20-HZeIiHZ3wPF#rHaiJen-Sd;e_KHv9c4^~3h@UfR{
zfdC>StO&>uS)ve<0AYj>5<ta;hzeE|6%m|BRm6hT3P_!Z;-DzFXF-aHT8mX&IPM?Z
zr?q{0@9pjT*ZaKZoag+`dCw1k5fUbm=Avo<IZ}l@I@lkNPe{bcy?_E0NZ<q@5a!Fm
zX9dLo0Pq8Ocz$%SKl}l&ZvX-SaMdm(635~HgSt>AR{$W90N^4L=L-RlQUJ&<RLB$n
z$QS^yQ?q0W0F(d#Y<YY_A^@rl0POThJ_P{Ssgv9n0NA1&sR#g#0RWjOM<fD3y8vKS
zfl@32z`_8atUw|z1i-EVfLXROM*@Jo1ps!ASdb4uU;u!bLM+SxAUFa5Lmm^&10YNT
zpfJ+E;Hh75g}6uo0Km(Y&6i8kGZeU$&>DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH
z15C~g000{K(ZT*WKal6<<l*LK=WOrv#iIUe@NXhMA@Se-yo>?_01!^k@7iDG<<<jm
z#{sZ)ziX*m0NPdnXy5r=GusKES_;s5`HOit{6HR_p-{*?9UKY^3+*Lhp}jEUi$4D|
z;cwuJe)jx89{$^U@Bnd|K$)$;ql5i%VQzM=QjX`#1VS-x_va)2$Ay3Wjw#XNG_hPP
z6^ij#iMUWAO~-k;QjtU<$(7;~>3=fuAC~<IlXndOtcFj(PPPZN%WS}Y?g0Xe4p`E5
z06>28EsPoqkpK{9G%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5
z!4#~(4xGUqyucR%VFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9
z;1XPc>u?taU>Kgl7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZ
zqynizYLQ(?Bl0bB6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>X
zmZEFX8nhlgfVQHi(M#xcbO3#dj$?q)F%D*o*<oCahecqCSQ;kB7GvdDHCB%`V;xvG
zb`=}Io?-6@Bm#?o6YL0Hgb>1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1
z#CT#lv5;6stS0Uu9wDA3UMCI{Uz12A4#|?_P6{C<kTOXNNoz>kNG+sOq(0IRX`D<Z
z>yT~9-sA|ffUF>wk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>L
zsh-pbs)#zDT1jo7c2F-<hp7`Zb($s3n-)XMq%EV>(3)vyY4>O^>2$gY-Gd%Qm(Z8e
zYv>2*=jns=cMJ`N4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^
zd=-((5|uiYR+WC0=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=<EaVM7OT~%9aX!jHm=T6
zcT$f~&rx5azF+-<`eO~UhJ{9;hDf7SW4Fc`jUg7sGG*~tLe_Ft1M4hnm`!3^via;x
zb_M$zb}xHOQ$usAW~^qBW}W77%>fR^vEcAI*_=wwA<hlXdo2SkKP|D=YOQ9ieyum!
zdfL9)V(oJ67VYcW?{#pUK%Fd|^*U`j_jL)nHo8%|g}U2y&+0zYW9xb83H8eL4(Z*|
zNA+#=qxBc+@7C|pA2%>G2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~
z?uTdNHFy_3W~^@<VyraYW!!5#VPa`A+oZ&##pJ#z&6I1JX1dX|({#+t$SmBf*sRIy
zjyctwYo1}g*}U8QjfJH}oW)9uHjBrW+LnCF1(r>g_pF#!K2~{F^;XxcN!DEJEbDF7
zS8PxlSDOr*I-AS3sI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{
z%p4LO);n}Nd~$Sk%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X;
zpL)xc<r?m~(zVm|qno>%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_
zkmoO6c3xRt`@J4dvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~
ze%5}Oeh2)X`#bu}{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg
z6+#RN4Ot&@lW)Km@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnW
zh~P(Th`1kV8JQRPeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmh
zY-8-3xPZ8-xPf?w_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C
z%bs^USv6UZd^m-e5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3h
zINdvaL;7fjPeygdGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eT
zPi8AClMUo~=55LwlZVRp<RkfW^V=0{g-p?-v{J564i-!=s4I9|7+ZL_NWDl})HB~^
z{_6Q73xXDWy^yd_xUjR>xOiFd;3B_8yA~shQx|tGF<nx+WO!-t(tXQl%d(dJP~uop
zRq|?i-13f6gVLp?Lo0$;G?l58$;)o8^jf)N6=9WRRqtw-)mv77Di@VstZ=NTuK2J<
zxaQ(lPG8l0^?7aD+TKdH%I)h&>!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1`
z^^VQ7&C1OKHDNXFTg<ks+w!3{qxO28e_hK~{jICFzS$<)*1z3%d-D#19Thv?@09Gk
zwJUg6YrRE%^={Jcg58fAVjH@@=6>C{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk
z9!NTH<(q(S+MDf~ceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-<f~6^$6=oc`MR7zjdrF
zqivu)p}p_ujH8_$UL8lixBq_cG2>%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8z
zO#GQ^T~S@VXG71PKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S
z_si{9Jg#)~P3t?+@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZW
zdXIRo{Jz@#>IeD{>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl
z9~%uCz4Bzvli{bbrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f&
zAH2?aJ@Kaet<Kwh@3`-}-^aZlnJD}~{!sJL`eVnZ&`<Y1=Y0PBFZYD=`z=Q}&j0`b
zAY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*m;eA5aGbhPJOBUy32;bRa{vGf
z6951U69E94oEQKA0whU9K~z|U?Uuc36LA>FKi?vug`@_hfexZWmP}bhgM$cda6Si}
z8W5*C*1<{W>Y%HW2>k<+PQH+I2`JI6Q$+$+90DndX@yD$ABW4`<;>;fQXvR=;D+A|
z&+~a+e<w3znld+4>ob7=9-vszzzWu;kiuV-oSDS1lam3e?wN`OS+!xl_EO$G!x>N4
z&<IFEPb0|%n3EI94mdgYPB$X%V(}jUjF=Gu{0mM_mh9lu+J?cC(EuY;U>p4qTEgrA
zfp5_Fd}}w}V4J82%XQPwv-DYt+T-OZ0D3F8l$VwA!MfTor4krj@3lmz7$G`(e@mP$
z(C<tT>d--uk`Qof0aih^AxdMVV6Kgd1=+3ZZvSuXx*ppBs_ePm77H@38<vmzVPgY$
zL!`CfhI{!KmFp%C!jn>7=FJBpqBKZirJ#3FuA7{kER_K0Pfcq9YVSuYou~`6DfCKo
zjfdcp9jM(N&p5=0KuDnjbk|2G_#oSNy5|qZ)e0Im?FKy{;7-X>UY4AP)}ecS`{Qt9
zQMO_~My*FdzK>4a?=&(L;Kj|X0lNF9$=ByA_UqFQjeRIw3hty5VTdjuuRml-XPR8T
zu>znA_jcj~07_??R#^*L%QJres@sNM4J7BW^(&~c59f3ZXovDwS&JTGBUA9BomD#1
z?A@}rpW)fXhj92U*j+r&`j^K5`fl%lY@aic9?pKtX8<#R8Njpw{s4y@wl_Jegiinf
N002ovPDHLkV1fY6P^ka_

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/harvest.png
new file mode 100644
index 0000000000000000000000000000000000000000..16a55ee65fd323912735078d9fc52967762072df
GIT binary patch
literal 3494
zcmV;X4O#MuP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004XF*Lt006O%
z3;baP000U}X+uL$b5ch_AW20-HZeIiHZ3wPF#rHaiJen-Sd;e_KHv9c4^~3h@UfR{
zfdC>StO&>uS)ve<0AYj>5<ta;hzeE|6%m|BRm6hT3P_!Z;-DzFXF-aHT8mX&IPM?Z
zr?q{0@9pjT*ZaKZoag+`dCw1k5fUbm=Avo<IZ}l@I@lkNPe{bcy?_E0NZ<q@5a!Fm
zX9dLo0Pq8Ocz$%SKl}l&ZvX-SaMdm(635~HgSt>AR{$W90N^4L=L-RlQUJ&<RLB$n
z$QS^yQ?q0W0F(d#Y<YY_A^@rl0POThJ_P{Ssgv9n0NA1&sR#g#0RWjOM<fD3y8vKS
zfl@32z`_8atUw|z1i-EVfLXROM*@Jo1ps!ASdb4uU;u!bLM+SxAUFa5Lmm^&10YNT
zpfJ+E;Hh75g}6uo0Km(Y&6i8kGZeU$&>DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH
z15C~g000{K(ZT*WKal6<<l*LK=WOrv#iIUe@NXhMA@Se-yo>?_01!^k@7iDG<<<jm
z#{sZ)ziX*m0NPdnXy5r=GusKES_;s5`HOit{6HR_p-{*?9UKY^3+*Lhp}jEUi$4D|
z;cwuJe)jx89{$^U@Bnd|K$)$;ql5i%VQzM=QjX`#1VS-x_va)2$Ay3Wjw#XNG_hPP
z6^ij#iMUWAO~-k;QjtU<$(7;~>3=fuAC~<IlXndOtcFj(PPPZN%WS}Y?g0Xe4p`E5
z06>28EsPoqkpK{9G%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5
z!4#~(4xGUqyucR%VFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9
z;1XPc>u?taU>Kgl7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZ
zqynizYLQ(?Bl0bB6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>X
zmZEFX8nhlgfVQHi(M#xcbO3#dj$?q)F%D*o*<oCahecqCSQ;kB7GvdDHCB%`V;xvG
zb`=}Io?-6@Bm#?o6YL0Hgb>1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1
z#CT#lv5;6stS0Uu9wDA3UMCI{Uz12A4#|?_P6{C<kTOXNNoz>kNG+sOq(0IRX`D<Z
z>yT~9-sA|ffUF>wk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>L
zsh-pbs)#zDT1jo7c2F-<hp7`Zb($s3n-)XMq%EV>(3)vyY4>O^>2$gY-Gd%Qm(Z8e
zYv>2*=jns=cMJ`N4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^
zd=-((5|uiYR+WC0=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=<EaVM7OT~%9aX!jHm=T6
zcT$f~&rx5azF+-<`eO~UhJ{9;hDf7SW4Fc`jUg7sGG*~tLe_Ft1M4hnm`!3^via;x
zb_M$zb}xHOQ$usAW~^qBW}W77%>fR^vEcAI*_=wwA<hlXdo2SkKP|D=YOQ9ieyum!
zdfL9)V(oJ67VYcW?{#pUK%Fd|^*U`j_jL)nHo8%|g}U2y&+0zYW9xb83H8eL4(Z*|
zNA+#=qxBc+@7C|pA2%>G2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~
z?uTdNHFy_3W~^@<VyraYW!!5#VPa`A+oZ&##pJ#z&6I1JX1dX|({#+t$SmBf*sRIy
zjyctwYo1}g*}U8QjfJH}oW)9uHjBrW+LnCF1(r>g_pF#!K2~{F^;XxcN!DEJEbDF7
zS8PxlSDOr*I-AS3sI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{
z%p4LO);n}Nd~$Sk%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X;
zpL)xc<r?m~(zVm|qno>%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_
zkmoO6c3xRt`@J4dvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~
ze%5}Oeh2)X`#bu}{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg
z6+#RN4Ot&@lW)Km@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnW
zh~P(Th`1kV8JQRPeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmh
zY-8-3xPZ8-xPf?w_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C
z%bs^USv6UZd^m-e5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3h
zINdvaL;7fjPeygdGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eT
zPi8AClMUo~=55LwlZVRp<RkfW^V=0{g-p?-v{J564i-!=s4I9|7+ZL_NWDl})HB~^
z{_6Q73xXDWy^yd_xUjR>xOiFd;3B_8yA~shQx|tGF<nx+WO!-t(tXQl%d(dJP~uop
zRq|?i-13f6gVLp?Lo0$;G?l58$;)o8^jf)N6=9WRRqtw-)mv77Di@VstZ=NTuK2J<
zxaQ(lPG8l0^?7aD+TKdH%I)h&>!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1`
z^^VQ7&C1OKHDNXFTg<ks+w!3{qxO28e_hK~{jICFzS$<)*1z3%d-D#19Thv?@09Gk
zwJUg6YrRE%^={Jcg58fAVjH@@=6>C{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk
z9!NTH<(q(S+MDf~ceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-<f~6^$6=oc`MR7zjdrF
zqivu)p}p_ujH8_$UL8lixBq_cG2>%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8z
zO#GQ^T~S@VXG71PKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S
z_si{9Jg#)~P3t?+@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZW
zdXIRo{Jz@#>IeD{>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl
z9~%uCz4Bzvli{bbrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f&
zAH2?aJ@Kaet<Kwh@3`-}-^aZlnJD}~{!sJL`eVnZ&`<Y1=Y0PBFZYD=`z=Q}&j0`b
zAY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*m;eA5aGbhPJOBUy32;bRa{vGf
z6951U69E94oEQKA0>?>2K~z|U?UpfUQ&AL#zblGq)0Rl+CcKixDF{Mw65Q0mA%$0m
z+UHb)gC*b~b#oH8(xrsDm{`HQLJ)*@a1jTQj-6Zr4_s<}DC*OI(Bp7!)5N~KCbf{I
zXSt7a&%OVD&VTQ@&xi<vv{M5`2TmtV8e?MpaaA+RMgSvs`>W`o6%dgYVEcCqc-_d_
z*$H)K5mSpN-7OiDbOwwu9e}2$SrVdS1D(u+_X;XG4I{7f;z<j*8%|;cI>0MN2!Rms
zOAcfaa=>LEf**f?9QaF)5CJKzMqJf;Ch(6LCZPBZ+-d+JFb@3E$+`!m;l;H8vNpbn
zm`Z%<dnRCNMs?jn*n#pC6rKYO8!&9YclCSp46q4=2q_>!T6^?Mz*LO*vkriehr*g>
zT=#%H_%jad0F%Hd6e>`;W#>wcRw)gHbS*>jA*>jP5E|ewIk+nU#SJK52U0*27>8mN
z%2(KzB(fW%m2~~K#hN~db*Kb>$uZ=>T?t^z0!4P^7I;t9=a(Fn0U!(B8z^pA@DOMc
zn`!bb@C0`;fCk2&a}1MEShtz(0(pD-)8Nhrs{OE5=H_ch$u>26qIek+C1?dL+qG$g
zNN+-U3iyCt!`&7T{+y$?WK#*Y1IKmAo(Qyp+s;JcBh+sIS@35a+|^*8$S}sAaR9V}
zY2Z$m7Tz}jP!bcs4op{}Hid$;1J4H<n^$l+1_EH^XaG65_Y4_H!KL?(aaS#%ZA^Rt
z?su+@!%BP&q4N<D5!hC6fN#HbbQc5d2Wgbt*g^1amfVQqUa&_fiETK4PF)Kxt#7Y8
z_6QC=yoTLOM0j}B$j>H>q%{2T+hnjKNszSBr>~G1(($PFU%zCTAszRmIEo!f0ujNx
zXe2YVe-JH+L>Z1v0)Xm;2k<?FjCG7<S@`^<?|u621IKLx|1Ccua6;gOz`zOo1-W7<
U*j=$segFUf07*qoM6N<$f)*f(-2eap

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json
new file mode 100644
index 00000000000..35c8da9203a
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json
@@ -0,0 +1,44 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068 and remade by RumiTiger",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    },
+    {
+      "name": "stage-4"
+    },
+    {
+      "name": "stage-5"
+    },
+    {
+      "name": "stage-6"
+    },
+    {
+        "name": "pit"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/pit.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/pit.png
new file mode 100644
index 0000000000000000000000000000000000000000..12219e50679331f74d10e17388dd55bb90feca2f
GIT binary patch
literal 2856
zcmV+@3)l3CP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004XF*Lt006O%
z3;baP000U}X+uL$b5ch_AW20-HZeIiHZ3wPF#rHaiJen-Sd;e_KHv9c4^~3h@UfR{
zfdC>StO&>uS)ve<0AYj>5<ta;hzeE|6%m|BRm6hT3P_!Z;-DzFXF-aHT8mX&IPM?Z
zr?q{0@9pjT*ZaKZoag+`dCw1k5fUbm=Avo<IZ}l@I@lkNPe{bcy?_E0NZ<q@5a!Fm
zX9dLo0Pq8Ocz$%SKl}l&ZvX-SaMdm(635~HgSt>AR{$W90N^4L=L-RlQUJ&<RLB$n
z$QS^yQ?q0W0F(d#Y<YY_A^@rl0POThJ_P{Ssgv9n0NA1&sR#g#0RWjOM<fD3y8vKS
zfl@32z`_8atUw|z1i-EVfLXROM*@Jo1ps!ASdb4uU;u!bLM+SxAUFa5Lmm^&10YNT
zpfJ+E;Hh75g}6uo0Km(Y&6i8kGZeU$&>DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH
z15C~g000{K(ZT*WKal6<<l*LK=WOrv#iIUe@NXhMA@Se-yo>?_01!^k@7iDG<<<jm
z#{sZ)ziX*m0NPdnXy5r=GusKES_;s5`HOit{6HR_p-{*?9UKY^3+*Lhp}jEUi$4D|
z;cwuJe)jx89{$^U@Bnd|K$)$;ql5i%VQzM=QjX`#1VS-x_va)2$Ay3Wjw#XNG_hPP
z6^ij#iMUWAO~-k;QjtU<$(7;~>3=fuAC~<IlXndOtcFj(PPPZN%WS}Y?g0Xe4p`E5
z06>28EsPoqkpK{9G%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5
z!4#~(4xGUqyucR%VFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9
z;1XPc>u?taU>Kgl7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZ
zqynizYLQ(?Bl0bB6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>X
zmZEFX8nhlgfVQHi(M#xcbO3#dj$?q)F%D*o*<oCahecqCSQ;kB7GvdDHCB%`V;xvG
zb`=}Io?-6@Bm#?o6YL0Hgb>1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1
z#CT#lv5;6stS0Uu9wDA3UMCI{Uz12A4#|?_P6{C<kTOXNNoz>kNG+sOq(0IRX`D<Z
z>yT~9-sA|ffUF>wk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>L
zsh-pbs)#zDT1jo7c2F-<hp7`Zb($s3n-)XMq%EV>(3)vyY4>O^>2$gY-Gd%Qm(Z8e
zYv>2*=jns=cMJ`N4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^
zd=-((5|uiYR+WC0=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=<EaVM7OT~%9aX!jHm=T6
zcT$f~&rx5azF+-<`eO~UhJ{9;hDf7SW4Fc`jUg7sGG*~tLe_Ft1M4hnm`!3^via;x
zb_M$zb}xHOQ$usAW~^qBW}W77%>fR^vEcAI*_=wwA<hlXdo2SkKP|D=YOQ9ieyum!
zdfL9)V(oJ67VYcW?{#pUK%Fd|^*U`j_jL)nHo8%|g}U2y&+0zYW9xb83H8eL4(Z*|
zNA+#=qxBc+@7C|pA2%>G2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~
z?uTdNHFy_3W~^@<VyraYW!!5#VPa`A+oZ&##pJ#z&6I1JX1dX|({#+t$SmBf*sRIy
zjyctwYo1}g*}U8QjfJH}oW)9uHjBrW+LnCF1(r>g_pF#!K2~{F^;XxcN!DEJEbDF7
zS8PxlSDOr*I-AS3sI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{
z%p4LO);n}Nd~$Sk%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X;
zpL)xc<r?m~(zVm|qno>%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_
zkmoO6c3xRt`@J4dvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~
ze%5}Oeh2)X`#bu}{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg
z6+#RN4Ot&@lW)Km@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnW
zh~P(Th`1kV8JQRPeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmh
zY-8-3xPZ8-xPf?w_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C
z%bs^USv6UZd^m-e5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3h
zINdvaL;7fjPeygdGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eT
zPi8AClMUo~=55LwlZVRp<RkfW^V=0{g-p?-v{J564i-!=s4I9|7+ZL_NWDl})HB~^
z{_6Q73xXDWy^yd_xUjR>xOiFd;3B_8yA~shQx|tGF<nx+WO!-t(tXQl%d(dJP~uop
zRq|?i-13f6gVLp?Lo0$;G?l58$;)o8^jf)N6=9WRRqtw-)mv77Di@VstZ=NTuK2J<
zxaQ(lPG8l0^?7aD+TKdH%I)h&>!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1`
z^^VQ7&C1OKHDNXFTg<ks+w!3{qxO28e_hK~{jICFzS$<)*1z3%d-D#19Thv?@09Gk
zwJUg6YrRE%^={Jcg58fAVjH@@=6>C{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk
z9!NTH<(q(S+MDf~ceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-<f~6^$6=oc`MR7zjdrF
zqivu)p}p_ujH8_$UL8lixBq_cG2>%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8z
zO#GQ^T~S@VXG71PKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S
z_si{9Jg#)~P3t?+@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZW
zdXIRo{Jz@#>IeD{>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl
z9~%uCz4Bzvli{bbrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f&
zAH2?aJ@Kaet<Kwh@3`-}-^aZlnJD}~{!sJL`eVnZ&`<Y1=Y0PBFZYD=`z=Q}&j0`b
zAY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*m;eA5aGbhPJOBUy32;bRa{vGf
z6951U69E94oEQKA07*$iK~z|U?be|Y03ZxQ(X@wSG4^2pJ2WN?QBlE<&*jO4ZFMGF
z*8u<k0000009C-w=@p}NC`y3iTd7Nuf=2`Z00000z6U($xC`Cpw@$bK0000<MNUMn
GLSTXt@?t^&

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/produce.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d48f86f868b93304e7ae184f8d15d7cf932e109
GIT binary patch
literal 2998
zcmV;n3rX~eP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004XF*Lt006O%
z3;baP000U}X+uL$b5ch_AW20-HZeIiHZ3wPF#rHaiJen-Sd;e_KHv9c4^~3h@UfR{
zfdC>StO&>uS)ve<0AYj>5<ta;hzeE|6%m|BRm6hT3P_!Z;-DzFXF-aHT8mX&IPM?Z
zr?q{0@9pjT*ZaKZoag+`dCw1k5fUbm=Avo<IZ}l@I@lkNPe{bcy?_E0NZ<q@5a!Fm
zX9dLo0Pq8Ocz$%SKl}l&ZvX-SaMdm(635~HgSt>AR{$W90N^4L=L-RlQUJ&<RLB$n
z$QS^yQ?q0W0F(d#Y<YY_A^@rl0POThJ_P{Ssgv9n0NA1&sR#g#0RWjOM<fD3y8vKS
zfl@32z`_8atUw|z1i-EVfLXROM*@Jo1ps!ASdb4uU;u!bLM+SxAUFa5Lmm^&10YNT
zpfJ+E;Hh75g}6uo0Km(Y&6i8kGZeU$&>DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH
z15C~g000{K(ZT*WKal6<<l*LK=WOrv#iIUe@NXhMA@Se-yo>?_01!^k@7iDG<<<jm
z#{sZ)ziX*m0NPdnXy5r=GusKES_;s5`HOit{6HR_p-{*?9UKY^3+*Lhp}jEUi$4D|
z;cwuJe)jx89{$^U@Bnd|K$)$;ql5i%VQzM=QjX`#1VS-x_va)2$Ay3Wjw#XNG_hPP
z6^ij#iMUWAO~-k;QjtU<$(7;~>3=fuAC~<IlXndOtcFj(PPPZN%WS}Y?g0Xe4p`E5
z06>28EsPoqkpK{9G%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5
z!4#~(4xGUqyucR%VFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9
z;1XPc>u?taU>Kgl7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZ
zqynizYLQ(?Bl0bB6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>X
zmZEFX8nhlgfVQHi(M#xcbO3#dj$?q)F%D*o*<oCahecqCSQ;kB7GvdDHCB%`V;xvG
zb`=}Io?-6@Bm#?o6YL0Hgb>1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1
z#CT#lv5;6stS0Uu9wDA3UMCI{Uz12A4#|?_P6{C<kTOXNNoz>kNG+sOq(0IRX`D<Z
z>yT~9-sA|ffUF>wk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>L
zsh-pbs)#zDT1jo7c2F-<hp7`Zb($s3n-)XMq%EV>(3)vyY4>O^>2$gY-Gd%Qm(Z8e
zYv>2*=jns=cMJ`N4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^
zd=-((5|uiYR+WC0=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=<EaVM7OT~%9aX!jHm=T6
zcT$f~&rx5azF+-<`eO~UhJ{9;hDf7SW4Fc`jUg7sGG*~tLe_Ft1M4hnm`!3^via;x
zb_M$zb}xHOQ$usAW~^qBW}W77%>fR^vEcAI*_=wwA<hlXdo2SkKP|D=YOQ9ieyum!
zdfL9)V(oJ67VYcW?{#pUK%Fd|^*U`j_jL)nHo8%|g}U2y&+0zYW9xb83H8eL4(Z*|
zNA+#=qxBc+@7C|pA2%>G2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~
z?uTdNHFy_3W~^@<VyraYW!!5#VPa`A+oZ&##pJ#z&6I1JX1dX|({#+t$SmBf*sRIy
zjyctwYo1}g*}U8QjfJH}oW)9uHjBrW+LnCF1(r>g_pF#!K2~{F^;XxcN!DEJEbDF7
zS8PxlSDOr*I-AS3sI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{
z%p4LO);n}Nd~$Sk%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X;
zpL)xc<r?m~(zVm|qno>%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_
zkmoO6c3xRt`@J4dvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~
ze%5}Oeh2)X`#bu}{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg
z6+#RN4Ot&@lW)Km@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnW
zh~P(Th`1kV8JQRPeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmh
zY-8-3xPZ8-xPf?w_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C
z%bs^USv6UZd^m-e5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3h
zINdvaL;7fjPeygdGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eT
zPi8AClMUo~=55LwlZVRp<RkfW^V=0{g-p?-v{J564i-!=s4I9|7+ZL_NWDl})HB~^
z{_6Q73xXDWy^yd_xUjR>xOiFd;3B_8yA~shQx|tGF<nx+WO!-t(tXQl%d(dJP~uop
zRq|?i-13f6gVLp?Lo0$;G?l58$;)o8^jf)N6=9WRRqtw-)mv77Di@VstZ=NTuK2J<
zxaQ(lPG8l0^?7aD+TKdH%I)h&>!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1`
z^^VQ7&C1OKHDNXFTg<ks+w!3{qxO28e_hK~{jICFzS$<)*1z3%d-D#19Thv?@09Gk
zwJUg6YrRE%^={Jcg58fAVjH@@=6>C{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk
z9!NTH<(q(S+MDf~ceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-<f~6^$6=oc`MR7zjdrF
zqivu)p}p_ujH8_$UL8lixBq_cG2>%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8z
zO#GQ^T~S@VXG71PKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S
z_si{9Jg#)~P3t?+@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZW
zdXIRo{Jz@#>IeD{>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl
z9~%uCz4Bzvli{bbrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f&
zAH2?aJ@Kaet<Kwh@3`-}-^aZlnJD}~{!sJL`eVnZ&`<Y1=Y0PBFZYD=`z=Q}&j0`b
zAY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*m;eA5aGbhPJOBUy32;bRa{vGf
z6951U69E94oEQKA0M|)GK~z|U?Uk_#!Y~kqzeu47-CPS6T#K$gfvbz759Ht*xH@+6
zEnEfHLWMqpAcAlX(on=D7bOn4C0TO+m;Z7(BO-*1K~VJw5CI}U1o#Jl#OLsIXXMrb
zV3vCXFx%SgYgaqa6Q>i`<neL940F3zPc-j0u-G7n_3QSo_5&F0IIhw{0FL>Ec{{fG
zR`<p!kII26Eo4?qI6tlcc12MNuM(6=M%IidlT4jM4RC5|3(-Z-iQfafhejOqZD;`b
sAnN=VsJq}>5quUzfCvx)B0z9}Cn#__lkH}3H2?qr07*qoM6N<$f^r<DDgXcg

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/seed.png
new file mode 100644
index 0000000000000000000000000000000000000000..b246d45d844ef386730ba85c3215e0c34c996034
GIT binary patch
literal 3139
zcmV-J47~G+P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004XF*Lt006O%
z3;baP000U}X+uL$b5ch_AW20-HZeIiHZ3wPF#rHaiJen-Sd;e_KHv9c4^~3h@UfR{
zfdC>StO&>uS)ve<0AYj>5<ta;hzeE|6%m|BRm6hT3P_!Z;-DzFXF-aHT8mX&IPM?Z
zr?q{0@9pjT*ZaKZoag+`dCw1k5fUbm=Avo<IZ}l@I@lkNPe{bcy?_E0NZ<q@5a!Fm
zX9dLo0Pq8Ocz$%SKl}l&ZvX-SaMdm(635~HgSt>AR{$W90N^4L=L-RlQUJ&<RLB$n
z$QS^yQ?q0W0F(d#Y<YY_A^@rl0POThJ_P{Ssgv9n0NA1&sR#g#0RWjOM<fD3y8vKS
zfl@32z`_8atUw|z1i-EVfLXROM*@Jo1ps!ASdb4uU;u!bLM+SxAUFa5Lmm^&10YNT
zpfJ+E;Hh75g}6uo0Km(Y&6i8kGZeU$&>DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH
z15C~g000{K(ZT*WKal6<<l*LK=WOrv#iIUe@NXhMA@Se-yo>?_01!^k@7iDG<<<jm
z#{sZ)ziX*m0NPdnXy5r=GusKES_;s5`HOit{6HR_p-{*?9UKY^3+*Lhp}jEUi$4D|
z;cwuJe)jx89{$^U@Bnd|K$)$;ql5i%VQzM=QjX`#1VS-x_va)2$Ay3Wjw#XNG_hPP
z6^ij#iMUWAO~-k;QjtU<$(7;~>3=fuAC~<IlXndOtcFj(PPPZN%WS}Y?g0Xe4p`E5
z06>28EsPoqkpK{9G%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5
z!4#~(4xGUqyucR%VFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9
z;1XPc>u?taU>Kgl7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZ
zqynizYLQ(?Bl0bB6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>X
zmZEFX8nhlgfVQHi(M#xcbO3#dj$?q)F%D*o*<oCahecqCSQ;kB7GvdDHCB%`V;xvG
zb`=}Io?-6@Bm#?o6YL0Hgb>1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1
z#CT#lv5;6stS0Uu9wDA3UMCI{Uz12A4#|?_P6{C<kTOXNNoz>kNG+sOq(0IRX`D<Z
z>yT~9-sA|ffUF>wk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>L
zsh-pbs)#zDT1jo7c2F-<hp7`Zb($s3n-)XMq%EV>(3)vyY4>O^>2$gY-Gd%Qm(Z8e
zYv>2*=jns=cMJ`N4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^
zd=-((5|uiYR+WC0=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=<EaVM7OT~%9aX!jHm=T6
zcT$f~&rx5azF+-<`eO~UhJ{9;hDf7SW4Fc`jUg7sGG*~tLe_Ft1M4hnm`!3^via;x
zb_M$zb}xHOQ$usAW~^qBW}W77%>fR^vEcAI*_=wwA<hlXdo2SkKP|D=YOQ9ieyum!
zdfL9)V(oJ67VYcW?{#pUK%Fd|^*U`j_jL)nHo8%|g}U2y&+0zYW9xb83H8eL4(Z*|
zNA+#=qxBc+@7C|pA2%>G2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~
z?uTdNHFy_3W~^@<VyraYW!!5#VPa`A+oZ&##pJ#z&6I1JX1dX|({#+t$SmBf*sRIy
zjyctwYo1}g*}U8QjfJH}oW)9uHjBrW+LnCF1(r>g_pF#!K2~{F^;XxcN!DEJEbDF7
zS8PxlSDOr*I-AS3sI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{
z%p4LO);n}Nd~$Sk%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X;
zpL)xc<r?m~(zVm|qno>%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_
zkmoO6c3xRt`@J4dvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~
ze%5}Oeh2)X`#bu}{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg
z6+#RN4Ot&@lW)Km@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnW
zh~P(Th`1kV8JQRPeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmh
zY-8-3xPZ8-xPf?w_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C
z%bs^USv6UZd^m-e5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3h
zINdvaL;7fjPeygdGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eT
zPi8AClMUo~=55LwlZVRp<RkfW^V=0{g-p?-v{J564i-!=s4I9|7+ZL_NWDl})HB~^
z{_6Q73xXDWy^yd_xUjR>xOiFd;3B_8yA~shQx|tGF<nx+WO!-t(tXQl%d(dJP~uop
zRq|?i-13f6gVLp?Lo0$;G?l58$;)o8^jf)N6=9WRRqtw-)mv77Di@VstZ=NTuK2J<
zxaQ(lPG8l0^?7aD+TKdH%I)h&>!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1`
z^^VQ7&C1OKHDNXFTg<ks+w!3{qxO28e_hK~{jICFzS$<)*1z3%d-D#19Thv?@09Gk
zwJUg6YrRE%^={Jcg58fAVjH@@=6>C{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk
z9!NTH<(q(S+MDf~ceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-<f~6^$6=oc`MR7zjdrF
zqivu)p}p_ujH8_$UL8lixBq_cG2>%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8z
zO#GQ^T~S@VXG71PKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S
z_si{9Jg#)~P3t?+@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZW
zdXIRo{Jz@#>IeD{>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl
z9~%uCz4Bzvli{bbrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f&
zAH2?aJ@Kaet<Kwh@3`-}-^aZlnJD}~{!sJL`eVnZ&`<Y1=Y0PBFZYD=`z=Q}&j0`b
zAY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*m;eA5aGbhPJOBUy32;bRa{vGf
z6951U69E94oEQKA0bfZ(K~z|U?Upf1!$1_r|0jNe1P2LJX<WsraFUOZfUEc&f}<83
zh0swl6m%C?#rO?^flgw_CP+{mq)r_R*QFOu4edLr#NqzS3&+d7-~I3IaZCt-CbiaR
zbpv1k48VT?Sf?a0#&B_PD17cA$x<we@|T@%2uhRFa=@`{_}p6<=MtkRCe2B5U@ms~
za3^**Hc{pU0Q`uKWy7&-ynT)VKmcH?1gO+<+qL75g8}wC9Tj4!$XjrHds7vcD|IXz
z{j0FDzU8*bg{8<2jG|ZoQ1=;Uy(65TTtgk#1<*c(Qukr^OZ=XbWa;Vv<m%Ppd)qGf
z>sBp<jtgW5)YSvP(@S1`52q7y!CwQY3gW0LJe*E&+Na(5I*|^c>~g9LK^!5d$^Eli
zpfkB_OcYVKfKg9%nHPBec!$rurCkuvaKPstOR|*og!Z||%DjL}$YthPZU78`0caXv
d25?M*?LcXZU;qFB07*qoM6N<$f<&%DV1oSb@G$@Y

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..21053aed961e7007ded1ce66fb670e7126b3a8af
GIT binary patch
literal 2932
zcmV-)3ybuLP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004XF*Lt006O%
z3;baP000U}X+uL$b5ch_AW20-HZeIiHZ3wPF#rHaiJen-Sd;e_KHv9c4^~3h@UfR{
zfdC>StO&>uS)ve<0AYj>5<ta;hzeE|6%m|BRm6hT3P_!Z;-DzFXF-aHT8mX&IPM?Z
zr?q{0@9pjT*ZaKZoag+`dCw1k5fUbm=Avo<IZ}l@I@lkNPe{bcy?_E0NZ<q@5a!Fm
zX9dLo0Pq8Ocz$%SKl}l&ZvX-SaMdm(635~HgSt>AR{$W90N^4L=L-RlQUJ&<RLB$n
z$QS^yQ?q0W0F(d#Y<YY_A^@rl0POThJ_P{Ssgv9n0NA1&sR#g#0RWjOM<fD3y8vKS
zfl@32z`_8atUw|z1i-EVfLXROM*@Jo1ps!ASdb4uU;u!bLM+SxAUFa5Lmm^&10YNT
zpfJ+E;Hh75g}6uo0Km(Y&6i8kGZeU$&>DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH
z15C~g000{K(ZT*WKal6<<l*LK=WOrv#iIUe@NXhMA@Se-yo>?_01!^k@7iDG<<<jm
z#{sZ)ziX*m0NPdnXy5r=GusKES_;s5`HOit{6HR_p-{*?9UKY^3+*Lhp}jEUi$4D|
z;cwuJe)jx89{$^U@Bnd|K$)$;ql5i%VQzM=QjX`#1VS-x_va)2$Ay3Wjw#XNG_hPP
z6^ij#iMUWAO~-k;QjtU<$(7;~>3=fuAC~<IlXndOtcFj(PPPZN%WS}Y?g0Xe4p`E5
z06>28EsPoqkpK{9G%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5
z!4#~(4xGUqyucR%VFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9
z;1XPc>u?taU>Kgl7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZ
zqynizYLQ(?Bl0bB6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>X
zmZEFX8nhlgfVQHi(M#xcbO3#dj$?q)F%D*o*<oCahecqCSQ;kB7GvdDHCB%`V;xvG
zb`=}Io?-6@Bm#?o6YL0Hgb>1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1
z#CT#lv5;6stS0Uu9wDA3UMCI{Uz12A4#|?_P6{C<kTOXNNoz>kNG+sOq(0IRX`D<Z
z>yT~9-sA|ffUF>wk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>L
zsh-pbs)#zDT1jo7c2F-<hp7`Zb($s3n-)XMq%EV>(3)vyY4>O^>2$gY-Gd%Qm(Z8e
zYv>2*=jns=cMJ`N4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^
zd=-((5|uiYR+WC0=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=<EaVM7OT~%9aX!jHm=T6
zcT$f~&rx5azF+-<`eO~UhJ{9;hDf7SW4Fc`jUg7sGG*~tLe_Ft1M4hnm`!3^via;x
zb_M$zb}xHOQ$usAW~^qBW}W77%>fR^vEcAI*_=wwA<hlXdo2SkKP|D=YOQ9ieyum!
zdfL9)V(oJ67VYcW?{#pUK%Fd|^*U`j_jL)nHo8%|g}U2y&+0zYW9xb83H8eL4(Z*|
zNA+#=qxBc+@7C|pA2%>G2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~
z?uTdNHFy_3W~^@<VyraYW!!5#VPa`A+oZ&##pJ#z&6I1JX1dX|({#+t$SmBf*sRIy
zjyctwYo1}g*}U8QjfJH}oW)9uHjBrW+LnCF1(r>g_pF#!K2~{F^;XxcN!DEJEbDF7
zS8PxlSDOr*I-AS3sI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{
z%p4LO);n}Nd~$Sk%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X;
zpL)xc<r?m~(zVm|qno>%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_
zkmoO6c3xRt`@J4dvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~
ze%5}Oeh2)X`#bu}{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg
z6+#RN4Ot&@lW)Km@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnW
zh~P(Th`1kV8JQRPeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmh
zY-8-3xPZ8-xPf?w_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C
z%bs^USv6UZd^m-e5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3h
zINdvaL;7fjPeygdGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eT
zPi8AClMUo~=55LwlZVRp<RkfW^V=0{g-p?-v{J564i-!=s4I9|7+ZL_NWDl})HB~^
z{_6Q73xXDWy^yd_xUjR>xOiFd;3B_8yA~shQx|tGF<nx+WO!-t(tXQl%d(dJP~uop
zRq|?i-13f6gVLp?Lo0$;G?l58$;)o8^jf)N6=9WRRqtw-)mv77Di@VstZ=NTuK2J<
zxaQ(lPG8l0^?7aD+TKdH%I)h&>!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1`
z^^VQ7&C1OKHDNXFTg<ks+w!3{qxO28e_hK~{jICFzS$<)*1z3%d-D#19Thv?@09Gk
zwJUg6YrRE%^={Jcg58fAVjH@@=6>C{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk
z9!NTH<(q(S+MDf~ceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-<f~6^$6=oc`MR7zjdrF
zqivu)p}p_ujH8_$UL8lixBq_cG2>%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8z
zO#GQ^T~S@VXG71PKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S
z_si{9Jg#)~P3t?+@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZW
zdXIRo{Jz@#>IeD{>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl
z9~%uCz4Bzvli{bbrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f&
zAH2?aJ@Kaet<Kwh@3`-}-^aZlnJD}~{!sJL`eVnZ&`<Y1=Y0PBFZYD=`z=Q}&j0`b
zAY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*m;eA5aGbhPJOBUy32;bRa{vGf
z6951U69E94oEQKA0Fp^WK~z|UWBmXBKf^!*rUA8m)B&Ro7<Is?14bP%>VQ!PFfcH%
zkgJiAkrBdJ$nc+mfq{`Bo`Hd!w#Cp50XTR!zz(R~0HNE-)K75~Jb6!<eu_dM*PP)$
z4+jIollKh&WAzvq$uWbG+*UDTSjB&aPj3+de8LR>S9Or=2(leOEimBOaMS^#4j6U7
efI9#H*>xSmMZJ}Q00000NkvXXu0mjfLSTY=hKQ*E

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..8073923cd65b3ba98fd8eaeb8b416a21fc2680f5
GIT binary patch
literal 2974
zcmV;P3t{w$P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004XF*Lt006O%
z3;baP000U}X+uL$b5ch_AW20-HZeIiHZ3wPF#rHaiJen-Sd;e_KHv9c4^~3h@UfR{
zfdC>StO&>uS)ve<0AYj>5<ta;hzeE|6%m|BRm6hT3P_!Z;-DzFXF-aHT8mX&IPM?Z
zr?q{0@9pjT*ZaKZoag+`dCw1k5fUbm=Avo<IZ}l@I@lkNPe{bcy?_E0NZ<q@5a!Fm
zX9dLo0Pq8Ocz$%SKl}l&ZvX-SaMdm(635~HgSt>AR{$W90N^4L=L-RlQUJ&<RLB$n
z$QS^yQ?q0W0F(d#Y<YY_A^@rl0POThJ_P{Ssgv9n0NA1&sR#g#0RWjOM<fD3y8vKS
zfl@32z`_8atUw|z1i-EVfLXROM*@Jo1ps!ASdb4uU;u!bLM+SxAUFa5Lmm^&10YNT
zpfJ+E;Hh75g}6uo0Km(Y&6i8kGZeU$&>DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH
z15C~g000{K(ZT*WKal6<<l*LK=WOrv#iIUe@NXhMA@Se-yo>?_01!^k@7iDG<<<jm
z#{sZ)ziX*m0NPdnXy5r=GusKES_;s5`HOit{6HR_p-{*?9UKY^3+*Lhp}jEUi$4D|
z;cwuJe)jx89{$^U@Bnd|K$)$;ql5i%VQzM=QjX`#1VS-x_va)2$Ay3Wjw#XNG_hPP
z6^ij#iMUWAO~-k;QjtU<$(7;~>3=fuAC~<IlXndOtcFj(PPPZN%WS}Y?g0Xe4p`E5
z06>28EsPoqkpK{9G%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5
z!4#~(4xGUqyucR%VFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9
z;1XPc>u?taU>Kgl7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZ
zqynizYLQ(?Bl0bB6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>X
zmZEFX8nhlgfVQHi(M#xcbO3#dj$?q)F%D*o*<oCahecqCSQ;kB7GvdDHCB%`V;xvG
zb`=}Io?-6@Bm#?o6YL0Hgb>1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1
z#CT#lv5;6stS0Uu9wDA3UMCI{Uz12A4#|?_P6{C<kTOXNNoz>kNG+sOq(0IRX`D<Z
z>yT~9-sA|ffUF>wk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>L
zsh-pbs)#zDT1jo7c2F-<hp7`Zb($s3n-)XMq%EV>(3)vyY4>O^>2$gY-Gd%Qm(Z8e
zYv>2*=jns=cMJ`N4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^
zd=-((5|uiYR+WC0=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=<EaVM7OT~%9aX!jHm=T6
zcT$f~&rx5azF+-<`eO~UhJ{9;hDf7SW4Fc`jUg7sGG*~tLe_Ft1M4hnm`!3^via;x
zb_M$zb}xHOQ$usAW~^qBW}W77%>fR^vEcAI*_=wwA<hlXdo2SkKP|D=YOQ9ieyum!
zdfL9)V(oJ67VYcW?{#pUK%Fd|^*U`j_jL)nHo8%|g}U2y&+0zYW9xb83H8eL4(Z*|
zNA+#=qxBc+@7C|pA2%>G2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~
z?uTdNHFy_3W~^@<VyraYW!!5#VPa`A+oZ&##pJ#z&6I1JX1dX|({#+t$SmBf*sRIy
zjyctwYo1}g*}U8QjfJH}oW)9uHjBrW+LnCF1(r>g_pF#!K2~{F^;XxcN!DEJEbDF7
zS8PxlSDOr*I-AS3sI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{
z%p4LO);n}Nd~$Sk%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X;
zpL)xc<r?m~(zVm|qno>%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_
zkmoO6c3xRt`@J4dvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~
ze%5}Oeh2)X`#bu}{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg
z6+#RN4Ot&@lW)Km@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnW
zh~P(Th`1kV8JQRPeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmh
zY-8-3xPZ8-xPf?w_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C
z%bs^USv6UZd^m-e5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3h
zINdvaL;7fjPeygdGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eT
zPi8AClMUo~=55LwlZVRp<RkfW^V=0{g-p?-v{J564i-!=s4I9|7+ZL_NWDl})HB~^
z{_6Q73xXDWy^yd_xUjR>xOiFd;3B_8yA~shQx|tGF<nx+WO!-t(tXQl%d(dJP~uop
zRq|?i-13f6gVLp?Lo0$;G?l58$;)o8^jf)N6=9WRRqtw-)mv77Di@VstZ=NTuK2J<
zxaQ(lPG8l0^?7aD+TKdH%I)h&>!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1`
z^^VQ7&C1OKHDNXFTg<ks+w!3{qxO28e_hK~{jICFzS$<)*1z3%d-D#19Thv?@09Gk
zwJUg6YrRE%^={Jcg58fAVjH@@=6>C{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk
z9!NTH<(q(S+MDf~ceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-<f~6^$6=oc`MR7zjdrF
zqivu)p}p_ujH8_$UL8lixBq_cG2>%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8z
zO#GQ^T~S@VXG71PKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S
z_si{9Jg#)~P3t?+@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZW
zdXIRo{Jz@#>IeD{>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl
z9~%uCz4Bzvli{bbrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f&
zAH2?aJ@Kaet<Kwh@3`-}-^aZlnJD}~{!sJL`eVnZ&`<Y1=Y0PBFZYD=`z=Q}&j0`b
zAY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*m;eA5aGbhPJOBUy32;bRa{vGf
z6951U69E94oEQKA0KZ8@K~z|U?Uu0$!axj$zlg&XI#iqladmU`X^!qfXP=@|!ByJ#
zQ;HPYEe@?OkOR9UQwSva?!O=IL{(WcHmh!T00(dY2XFuf0Jhdf5t)+~1%whTFKfC2
z@3eL^!0)v2xfEt4{s$nPC@mBj#Co{~Lzq1PNcBMT0C})2heQuFH)NRRJl3`ub_Gg^
z7nBT!2`w_43T6eWD|*~PKSCa$A8jTyE6|+o@Oi;uDV+CohB@NjatCk#2Ur{63!gtL
UvqXg&g8%>k07*qoM6N<$g5JuLX#fBK

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..09a351404e2545c8f36ec155f8df775dc8ecf989
GIT binary patch
literal 3052
zcmV<I3lsE-P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004XF*Lt006O%
z3;baP000U}X+uL$b5ch_AW20-HZeIiHZ3wPF#rHaiJen-Sd;e_KHv9c4^~3h@UfR{
zfdC>StO&>uS)ve<0AYj>5<ta;hzeE|6%m|BRm6hT3P_!Z;-DzFXF-aHT8mX&IPM?Z
zr?q{0@9pjT*ZaKZoag+`dCw1k5fUbm=Avo<IZ}l@I@lkNPe{bcy?_E0NZ<q@5a!Fm
zX9dLo0Pq8Ocz$%SKl}l&ZvX-SaMdm(635~HgSt>AR{$W90N^4L=L-RlQUJ&<RLB$n
z$QS^yQ?q0W0F(d#Y<YY_A^@rl0POThJ_P{Ssgv9n0NA1&sR#g#0RWjOM<fD3y8vKS
zfl@32z`_8atUw|z1i-EVfLXROM*@Jo1ps!ASdb4uU;u!bLM+SxAUFa5Lmm^&10YNT
zpfJ+E;Hh75g}6uo0Km(Y&6i8kGZeU$&>DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH
z15C~g000{K(ZT*WKal6<<l*LK=WOrv#iIUe@NXhMA@Se-yo>?_01!^k@7iDG<<<jm
z#{sZ)ziX*m0NPdnXy5r=GusKES_;s5`HOit{6HR_p-{*?9UKY^3+*Lhp}jEUi$4D|
z;cwuJe)jx89{$^U@Bnd|K$)$;ql5i%VQzM=QjX`#1VS-x_va)2$Ay3Wjw#XNG_hPP
z6^ij#iMUWAO~-k;QjtU<$(7;~>3=fuAC~<IlXndOtcFj(PPPZN%WS}Y?g0Xe4p`E5
z06>28EsPoqkpK{9G%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5
z!4#~(4xGUqyucR%VFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9
z;1XPc>u?taU>Kgl7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZ
zqynizYLQ(?Bl0bB6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>X
zmZEFX8nhlgfVQHi(M#xcbO3#dj$?q)F%D*o*<oCahecqCSQ;kB7GvdDHCB%`V;xvG
zb`=}Io?-6@Bm#?o6YL0Hgb>1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1
z#CT#lv5;6stS0Uu9wDA3UMCI{Uz12A4#|?_P6{C<kTOXNNoz>kNG+sOq(0IRX`D<Z
z>yT~9-sA|ffUF>wk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>L
zsh-pbs)#zDT1jo7c2F-<hp7`Zb($s3n-)XMq%EV>(3)vyY4>O^>2$gY-Gd%Qm(Z8e
zYv>2*=jns=cMJ`N4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^
zd=-((5|uiYR+WC0=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=<EaVM7OT~%9aX!jHm=T6
zcT$f~&rx5azF+-<`eO~UhJ{9;hDf7SW4Fc`jUg7sGG*~tLe_Ft1M4hnm`!3^via;x
zb_M$zb}xHOQ$usAW~^qBW}W77%>fR^vEcAI*_=wwA<hlXdo2SkKP|D=YOQ9ieyum!
zdfL9)V(oJ67VYcW?{#pUK%Fd|^*U`j_jL)nHo8%|g}U2y&+0zYW9xb83H8eL4(Z*|
zNA+#=qxBc+@7C|pA2%>G2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~
z?uTdNHFy_3W~^@<VyraYW!!5#VPa`A+oZ&##pJ#z&6I1JX1dX|({#+t$SmBf*sRIy
zjyctwYo1}g*}U8QjfJH}oW)9uHjBrW+LnCF1(r>g_pF#!K2~{F^;XxcN!DEJEbDF7
zS8PxlSDOr*I-AS3sI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{
z%p4LO);n}Nd~$Sk%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X;
zpL)xc<r?m~(zVm|qno>%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_
zkmoO6c3xRt`@J4dvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~
ze%5}Oeh2)X`#bu}{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg
z6+#RN4Ot&@lW)Km@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnW
zh~P(Th`1kV8JQRPeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmh
zY-8-3xPZ8-xPf?w_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C
z%bs^USv6UZd^m-e5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3h
zINdvaL;7fjPeygdGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eT
zPi8AClMUo~=55LwlZVRp<RkfW^V=0{g-p?-v{J564i-!=s4I9|7+ZL_NWDl})HB~^
z{_6Q73xXDWy^yd_xUjR>xOiFd;3B_8yA~shQx|tGF<nx+WO!-t(tXQl%d(dJP~uop
zRq|?i-13f6gVLp?Lo0$;G?l58$;)o8^jf)N6=9WRRqtw-)mv77Di@VstZ=NTuK2J<
zxaQ(lPG8l0^?7aD+TKdH%I)h&>!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1`
z^^VQ7&C1OKHDNXFTg<ks+w!3{qxO28e_hK~{jICFzS$<)*1z3%d-D#19Thv?@09Gk
zwJUg6YrRE%^={Jcg58fAVjH@@=6>C{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk
z9!NTH<(q(S+MDf~ceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-<f~6^$6=oc`MR7zjdrF
zqivu)p}p_ujH8_$UL8lixBq_cG2>%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8z
zO#GQ^T~S@VXG71PKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S
z_si{9Jg#)~P3t?+@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZW
zdXIRo{Jz@#>IeD{>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl
z9~%uCz4Bzvli{bbrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f&
zAH2?aJ@Kaet<Kwh@3`-}-^aZlnJD}~{!sJL`eVnZ&`<Y1=Y0PBFZYD=`z=Q}&j0`b
zAY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*m;eA5aGbhPJOBUy32;bRa{vGf
z6951U69E94oEQKA0S!q+K~z|U?Uk)g13?spze5PF7%)}Xn(_j?K~+6L^%Y1kBiE4h
z6^bFNscIdrFHi*7sx?JGUCl-8W?KU0PMd9-%t=Pfoy@u4%$*;Z8Hd!#L9-`-1dsp{
zz)=E7+O(-mPqOWp+t2$K{7EvwD9RxQ;Ps0u!31N3F@i7z+EFe$0Q6AExB3OD!5RSo
zvRf4LDq$N!UYEk9Q}>J+#uoqrv{+(ch*kXt06-L2wR+XDNX3<)gR=W_^}phSCID`L
z51@dnOSD?UVhP!+KRN994%}U1t2MOF%Ax1E{~d@1=y(3Ta(a39`NbSU0LI-1`2O4k
u&M)Y{J-U6|JFssZ-*1=z5<mjjw|)RTR8QmTYP1so0000<MNUMnLSTZ85yi9s

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..825696232871445954b2d53e2d2fad8938900f33
GIT binary patch
literal 3292
zcmV<23?uW2P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004XF*Lt006O%
z3;baP000U}X+uL$b5ch_AW20-HZeIiHZ3wPF#rHaiJen-Sd;e_KHv9c4^~3h@UfR{
zfdC>StO&>uS)ve<0AYj>5<ta;hzeE|6%m|BRm6hT3P_!Z;-DzFXF-aHT8mX&IPM?Z
zr?q{0@9pjT*ZaKZoag+`dCw1k5fUbm=Avo<IZ}l@I@lkNPe{bcy?_E0NZ<q@5a!Fm
zX9dLo0Pq8Ocz$%SKl}l&ZvX-SaMdm(635~HgSt>AR{$W90N^4L=L-RlQUJ&<RLB$n
z$QS^yQ?q0W0F(d#Y<YY_A^@rl0POThJ_P{Ssgv9n0NA1&sR#g#0RWjOM<fD3y8vKS
zfl@32z`_8atUw|z1i-EVfLXROM*@Jo1ps!ASdb4uU;u!bLM+SxAUFa5Lmm^&10YNT
zpfJ+E;Hh75g}6uo0Km(Y&6i8kGZeU$&>DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH
z15C~g000{K(ZT*WKal6<<l*LK=WOrv#iIUe@NXhMA@Se-yo>?_01!^k@7iDG<<<jm
z#{sZ)ziX*m0NPdnXy5r=GusKES_;s5`HOit{6HR_p-{*?9UKY^3+*Lhp}jEUi$4D|
z;cwuJe)jx89{$^U@Bnd|K$)$;ql5i%VQzM=QjX`#1VS-x_va)2$Ay3Wjw#XNG_hPP
z6^ij#iMUWAO~-k;QjtU<$(7;~>3=fuAC~<IlXndOtcFj(PPPZN%WS}Y?g0Xe4p`E5
z06>28EsPoqkpK{9G%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5
z!4#~(4xGUqyucR%VFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9
z;1XPc>u?taU>Kgl7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZ
zqynizYLQ(?Bl0bB6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>X
zmZEFX8nhlgfVQHi(M#xcbO3#dj$?q)F%D*o*<oCahecqCSQ;kB7GvdDHCB%`V;xvG
zb`=}Io?-6@Bm#?o6YL0Hgb>1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1
z#CT#lv5;6stS0Uu9wDA3UMCI{Uz12A4#|?_P6{C<kTOXNNoz>kNG+sOq(0IRX`D<Z
z>yT~9-sA|ffUF>wk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>L
zsh-pbs)#zDT1jo7c2F-<hp7`Zb($s3n-)XMq%EV>(3)vyY4>O^>2$gY-Gd%Qm(Z8e
zYv>2*=jns=cMJ`N4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^
zd=-((5|uiYR+WC0=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=<EaVM7OT~%9aX!jHm=T6
zcT$f~&rx5azF+-<`eO~UhJ{9;hDf7SW4Fc`jUg7sGG*~tLe_Ft1M4hnm`!3^via;x
zb_M$zb}xHOQ$usAW~^qBW}W77%>fR^vEcAI*_=wwA<hlXdo2SkKP|D=YOQ9ieyum!
zdfL9)V(oJ67VYcW?{#pUK%Fd|^*U`j_jL)nHo8%|g}U2y&+0zYW9xb83H8eL4(Z*|
zNA+#=qxBc+@7C|pA2%>G2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~
z?uTdNHFy_3W~^@<VyraYW!!5#VPa`A+oZ&##pJ#z&6I1JX1dX|({#+t$SmBf*sRIy
zjyctwYo1}g*}U8QjfJH}oW)9uHjBrW+LnCF1(r>g_pF#!K2~{F^;XxcN!DEJEbDF7
zS8PxlSDOr*I-AS3sI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{
z%p4LO);n}Nd~$Sk%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X;
zpL)xc<r?m~(zVm|qno>%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_
zkmoO6c3xRt`@J4dvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~
ze%5}Oeh2)X`#bu}{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg
z6+#RN4Ot&@lW)Km@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnW
zh~P(Th`1kV8JQRPeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmh
zY-8-3xPZ8-xPf?w_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C
z%bs^USv6UZd^m-e5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3h
zINdvaL;7fjPeygdGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eT
zPi8AClMUo~=55LwlZVRp<RkfW^V=0{g-p?-v{J564i-!=s4I9|7+ZL_NWDl})HB~^
z{_6Q73xXDWy^yd_xUjR>xOiFd;3B_8yA~shQx|tGF<nx+WO!-t(tXQl%d(dJP~uop
zRq|?i-13f6gVLp?Lo0$;G?l58$;)o8^jf)N6=9WRRqtw-)mv77Di@VstZ=NTuK2J<
zxaQ(lPG8l0^?7aD+TKdH%I)h&>!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1`
z^^VQ7&C1OKHDNXFTg<ks+w!3{qxO28e_hK~{jICFzS$<)*1z3%d-D#19Thv?@09Gk
zwJUg6YrRE%^={Jcg58fAVjH@@=6>C{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk
z9!NTH<(q(S+MDf~ceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-<f~6^$6=oc`MR7zjdrF
zqivu)p}p_ujH8_$UL8lixBq_cG2>%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8z
zO#GQ^T~S@VXG71PKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S
z_si{9Jg#)~P3t?+@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZW
zdXIRo{Jz@#>IeD{>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl
z9~%uCz4Bzvli{bbrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f&
zAH2?aJ@Kaet<Kwh@3`-}-^aZlnJD}~{!sJL`eVnZ&`<Y1=Y0PBFZYD=`z=Q}&j0`b
zAY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*m;eA5aGbhPJOBUy32;bRa{vGf
z6951U69E94oEQKA0sTotK~z|U?Upe}8&Md?e_wG>l&aXJAUJ2SljzbVgM-kqlbjCD
zr;8E~1Q7zKbW*`hN^=N8_ZB*I=^|v(C9@F7qL`MHxP2YoC1+wV@0lxc$hW-v9`C;I
z_r3SO@13YB{j^to&HfSqhHMv#$kPi>Q9xKrrfiN^Y&FmTXsnm-qEyTyB{V2Pn2Y@-
zdjRVl0ALf9EfF$kP%u;B3Xp;F51<0Pb&BYwfuIOv%vOgvq;?NrV4@B14(W1EJpzPt
zh<6A<0i|L<f&zqd50Y2h0Gy5>C_>p(ufYM-fZ9Efg$N)6tO4Ih^wGtfMd-~Mf94IE
zUq%>0{S)N)J&-kE<vWNLK|g8A0Iikj&KcxCfPapRkD|Z-!tpM6+otluW%t<j8i<oO
zH2{)dM!e53K8og74Vb^@CPWtz3MDg!xfr5^PK?0y4eWeL5=Z+GUD*Y7>jSZ<ylo`h
z2Y(M88-{8fiFW{2q0xw}0y=46Gj_7^_!InJXti#@+N(~z6?a;@z90(7(S<&`FH&#C
zogl`BTN8G@wA!ra>$rTEJg>ZS?!@km2u!8x3r)WfK&tgt9i)F7c7XBcp<0KD5&KWC
zXMlE_o_zkhJ!!z3HGSZr4qWY78UWy9PWf}2_^+n`gs%t9sZ{&G|FXXS6%POg00V%&
a1N;M{UBgLLol#Q&0000<MNUMnLSTX-qBy(&

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-5.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-5.png
new file mode 100644
index 0000000000000000000000000000000000000000..038eff2fb2c088f051c1c2593c538faf844ba557
GIT binary patch
literal 3412
zcmV-a4Xg5rP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004XF*Lt006O%
z3;baP000U}X+uL$b5ch_AW20-HZeIiHZ3wPF#rHaiJen-Sd;e_KHv9c4^~3h@UfR{
zfdC>StO&>uS)ve<0AYj>5<ta;hzeE|6%m|BRm6hT3P_!Z;-DzFXF-aHT8mX&IPM?Z
zr?q{0@9pjT*ZaKZoag+`dCw1k5fUbm=Avo<IZ}l@I@lkNPe{bcy?_E0NZ<q@5a!Fm
zX9dLo0Pq8Ocz$%SKl}l&ZvX-SaMdm(635~HgSt>AR{$W90N^4L=L-RlQUJ&<RLB$n
z$QS^yQ?q0W0F(d#Y<YY_A^@rl0POThJ_P{Ssgv9n0NA1&sR#g#0RWjOM<fD3y8vKS
zfl@32z`_8atUw|z1i-EVfLXROM*@Jo1ps!ASdb4uU;u!bLM+SxAUFa5Lmm^&10YNT
zpfJ+E;Hh75g}6uo0Km(Y&6i8kGZeU$&>DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH
z15C~g000{K(ZT*WKal6<<l*LK=WOrv#iIUe@NXhMA@Se-yo>?_01!^k@7iDG<<<jm
z#{sZ)ziX*m0NPdnXy5r=GusKES_;s5`HOit{6HR_p-{*?9UKY^3+*Lhp}jEUi$4D|
z;cwuJe)jx89{$^U@Bnd|K$)$;ql5i%VQzM=QjX`#1VS-x_va)2$Ay3Wjw#XNG_hPP
z6^ij#iMUWAO~-k;QjtU<$(7;~>3=fuAC~<IlXndOtcFj(PPPZN%WS}Y?g0Xe4p`E5
z06>28EsPoqkpK{9G%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5
z!4#~(4xGUqyucR%VFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9
z;1XPc>u?taU>Kgl7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZ
zqynizYLQ(?Bl0bB6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>X
zmZEFX8nhlgfVQHi(M#xcbO3#dj$?q)F%D*o*<oCahecqCSQ;kB7GvdDHCB%`V;xvG
zb`=}Io?-6@Bm#?o6YL0Hgb>1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1
z#CT#lv5;6stS0Uu9wDA3UMCI{Uz12A4#|?_P6{C<kTOXNNoz>kNG+sOq(0IRX`D<Z
z>yT~9-sA|ffUF>wk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>L
zsh-pbs)#zDT1jo7c2F-<hp7`Zb($s3n-)XMq%EV>(3)vyY4>O^>2$gY-Gd%Qm(Z8e
zYv>2*=jns=cMJ`N4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^
zd=-((5|uiYR+WC0=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=<EaVM7OT~%9aX!jHm=T6
zcT$f~&rx5azF+-<`eO~UhJ{9;hDf7SW4Fc`jUg7sGG*~tLe_Ft1M4hnm`!3^via;x
zb_M$zb}xHOQ$usAW~^qBW}W77%>fR^vEcAI*_=wwA<hlXdo2SkKP|D=YOQ9ieyum!
zdfL9)V(oJ67VYcW?{#pUK%Fd|^*U`j_jL)nHo8%|g}U2y&+0zYW9xb83H8eL4(Z*|
zNA+#=qxBc+@7C|pA2%>G2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~
z?uTdNHFy_3W~^@<VyraYW!!5#VPa`A+oZ&##pJ#z&6I1JX1dX|({#+t$SmBf*sRIy
zjyctwYo1}g*}U8QjfJH}oW)9uHjBrW+LnCF1(r>g_pF#!K2~{F^;XxcN!DEJEbDF7
zS8PxlSDOr*I-AS3sI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{
z%p4LO);n}Nd~$Sk%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X;
zpL)xc<r?m~(zVm|qno>%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_
zkmoO6c3xRt`@J4dvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~
ze%5}Oeh2)X`#bu}{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg
z6+#RN4Ot&@lW)Km@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnW
zh~P(Th`1kV8JQRPeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmh
zY-8-3xPZ8-xPf?w_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C
z%bs^USv6UZd^m-e5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3h
zINdvaL;7fjPeygdGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eT
zPi8AClMUo~=55LwlZVRp<RkfW^V=0{g-p?-v{J564i-!=s4I9|7+ZL_NWDl})HB~^
z{_6Q73xXDWy^yd_xUjR>xOiFd;3B_8yA~shQx|tGF<nx+WO!-t(tXQl%d(dJP~uop
zRq|?i-13f6gVLp?Lo0$;G?l58$;)o8^jf)N6=9WRRqtw-)mv77Di@VstZ=NTuK2J<
zxaQ(lPG8l0^?7aD+TKdH%I)h&>!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1`
z^^VQ7&C1OKHDNXFTg<ks+w!3{qxO28e_hK~{jICFzS$<)*1z3%d-D#19Thv?@09Gk
zwJUg6YrRE%^={Jcg58fAVjH@@=6>C{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk
z9!NTH<(q(S+MDf~ceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-<f~6^$6=oc`MR7zjdrF
zqivu)p}p_ujH8_$UL8lixBq_cG2>%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8z
zO#GQ^T~S@VXG71PKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S
z_si{9Jg#)~P3t?+@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZW
zdXIRo{Jz@#>IeD{>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl
z9~%uCz4Bzvli{bbrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f&
zAH2?aJ@Kaet<Kwh@3`-}-^aZlnJD}~{!sJL`eVnZ&`<Y1=Y0PBFZYD=`z=Q}&j0`b
zAY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*m;eA5aGbhPJOBUy32;bRa{vGf
z6951U69E94oEQKA0vkz0K~z|U?Upf%6G0Tme<KzOB8oN(qV-l*A=d@A)9-K*Ouc8b
z5(WY`!n!EPnNC>2<U6dLwQ`*nS1Si;?zlq&mqK_JZ#G%IO|sd$BNq9?F!N?--uus+
z_ui}#5!Q(-YqkDA5I{s0wkohKgcKoN-Husi#29l%5rFw*gpm%}N9-QN4JW@TCs2mf
zt{_6pbA$O{#3o<|Zr+E3W9{)5d!jypOiziA04DCjcmjaf0Suo3o+ITUWEV*wLIC16
zZ0~{{AdH~@0%Hg2`t4neyAt^9S_NEPx*|ht0_>?6ztY|&F!e$JL-h1<8-s^1LP*^h
zOu2F@WI+a`2$|lkZK->Eft&k?giRn)PuZ3>BK@9^=jyLSpr9xxK#KGNgtuy_7a(DC
zN_0lVrRVw5Fa<n!6%KJ17->vAxC<|z0N<UfeRXcG0zjUY+gTn10G=v}8}2>>B@;K`
z)^+%C2>e#V;d|)&GsDYJy%1#@cm>FK0ynN{c1#U++}C0)=*%xf)jR<37~;r{1F#7u
zCqdb1J7;D}u~H?J*P`vw9IsV0T14%)0AOd!OatxR7b#s|wy%f_eU94?E5+UU2;?W+
z+4{?v{3Bl;ft*DD>r6g5)qePGbzRl7U;*ykuD`c-41`VO<W%dx!7+>{?oC(`wLQ?k
z--TaCDtN%nJA^-zg?q}dGz~8sYyT_W5ZDmd5Li2bKk@KWkM1+12><{907*qoM6N<$
zf^)FZ?;rJ2p=Ia3l7%|x)p}w8;NfjiFa}14VI+ZiDff%WxdHf-E71Jaa*SQY+k4t|
qovuXqKdkT9@&SMWfB}HM1NaO4ZsN5EByQ*c0000<MNUMnLSTX`lxy_>

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-6.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-6.png
new file mode 100644
index 0000000000000000000000000000000000000000..5bd86228a2c7d68b080e4b06ee7a63f63fb41b74
GIT binary patch
literal 3434
zcmV-w4VChVP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004XF*Lt006O%
z3;baP000U}X+uL$b5ch_AW20-HZeIiHZ3wPF#rHaiJen-Sd;e_KHv9c4^~3h@UfR{
zfdC>StO&>uS)ve<0AYj>5<ta;hzeE|6%m|BRm6hT3P_!Z;-DzFXF-aHT8mX&IPM?Z
zr?q{0@9pjT*ZaKZoag+`dCw1k5fUbm=Avo<IZ}l@I@lkNPe{bcy?_E0NZ<q@5a!Fm
zX9dLo0Pq8Ocz$%SKl}l&ZvX-SaMdm(635~HgSt>AR{$W90N^4L=L-RlQUJ&<RLB$n
z$QS^yQ?q0W0F(d#Y<YY_A^@rl0POThJ_P{Ssgv9n0NA1&sR#g#0RWjOM<fD3y8vKS
zfl@32z`_8atUw|z1i-EVfLXROM*@Jo1ps!ASdb4uU;u!bLM+SxAUFa5Lmm^&10YNT
zpfJ+E;Hh75g}6uo0Km(Y&6i8kGZeU$&>DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH
z15C~g000{K(ZT*WKal6<<l*LK=WOrv#iIUe@NXhMA@Se-yo>?_01!^k@7iDG<<<jm
z#{sZ)ziX*m0NPdnXy5r=GusKES_;s5`HOit{6HR_p-{*?9UKY^3+*Lhp}jEUi$4D|
z;cwuJe)jx89{$^U@Bnd|K$)$;ql5i%VQzM=QjX`#1VS-x_va)2$Ay3Wjw#XNG_hPP
z6^ij#iMUWAO~-k;QjtU<$(7;~>3=fuAC~<IlXndOtcFj(PPPZN%WS}Y?g0Xe4p`E5
z06>28EsPoqkpK{9G%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5
z!4#~(4xGUqyucR%VFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9
z;1XPc>u?taU>Kgl7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZ
zqynizYLQ(?Bl0bB6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>X
zmZEFX8nhlgfVQHi(M#xcbO3#dj$?q)F%D*o*<oCahecqCSQ;kB7GvdDHCB%`V;xvG
zb`=}Io?-6@Bm#?o6YL0Hgb>1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1
z#CT#lv5;6stS0Uu9wDA3UMCI{Uz12A4#|?_P6{C<kTOXNNoz>kNG+sOq(0IRX`D<Z
z>yT~9-sA|ffUF>wk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>L
zsh-pbs)#zDT1jo7c2F-<hp7`Zb($s3n-)XMq%EV>(3)vyY4>O^>2$gY-Gd%Qm(Z8e
zYv>2*=jns=cMJ`N4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^
zd=-((5|uiYR+WC0=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=<EaVM7OT~%9aX!jHm=T6
zcT$f~&rx5azF+-<`eO~UhJ{9;hDf7SW4Fc`jUg7sGG*~tLe_Ft1M4hnm`!3^via;x
zb_M$zb}xHOQ$usAW~^qBW}W77%>fR^vEcAI*_=wwA<hlXdo2SkKP|D=YOQ9ieyum!
zdfL9)V(oJ67VYcW?{#pUK%Fd|^*U`j_jL)nHo8%|g}U2y&+0zYW9xb83H8eL4(Z*|
zNA+#=qxBc+@7C|pA2%>G2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~
z?uTdNHFy_3W~^@<VyraYW!!5#VPa`A+oZ&##pJ#z&6I1JX1dX|({#+t$SmBf*sRIy
zjyctwYo1}g*}U8QjfJH}oW)9uHjBrW+LnCF1(r>g_pF#!K2~{F^;XxcN!DEJEbDF7
zS8PxlSDOr*I-AS3sI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{
z%p4LO);n}Nd~$Sk%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X;
zpL)xc<r?m~(zVm|qno>%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_
zkmoO6c3xRt`@J4dvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~
ze%5}Oeh2)X`#bu}{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg
z6+#RN4Ot&@lW)Km@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnW
zh~P(Th`1kV8JQRPeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmh
zY-8-3xPZ8-xPf?w_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C
z%bs^USv6UZd^m-e5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3h
zINdvaL;7fjPeygdGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eT
zPi8AClMUo~=55LwlZVRp<RkfW^V=0{g-p?-v{J564i-!=s4I9|7+ZL_NWDl})HB~^
z{_6Q73xXDWy^yd_xUjR>xOiFd;3B_8yA~shQx|tGF<nx+WO!-t(tXQl%d(dJP~uop
zRq|?i-13f6gVLp?Lo0$;G?l58$;)o8^jf)N6=9WRRqtw-)mv77Di@VstZ=NTuK2J<
zxaQ(lPG8l0^?7aD+TKdH%I)h&>!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1`
z^^VQ7&C1OKHDNXFTg<ks+w!3{qxO28e_hK~{jICFzS$<)*1z3%d-D#19Thv?@09Gk
zwJUg6YrRE%^={Jcg58fAVjH@@=6>C{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk
z9!NTH<(q(S+MDf~ceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-<f~6^$6=oc`MR7zjdrF
zqivu)p}p_ujH8_$UL8lixBq_cG2>%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8z
zO#GQ^T~S@VXG71PKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S
z_si{9Jg#)~P3t?+@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZW
zdXIRo{Jz@#>IeD{>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl
z9~%uCz4Bzvli{bbrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f&
zAH2?aJ@Kaet<Kwh@3`-}-^aZlnJD}~{!sJL`eVnZ&`<Y1=Y0PBFZYD=`z=Q}&j0`b
zAY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*m;eA5aGbhPJOBUy32;bRa{vGf
z6951U69E94oEQKA0*gsRK~z|U?Uu1`(@+q`e}_OcHLZf83`h(p3sc2}n2;E{Fa}kf
zDl<kMm>5vmm=J$K6fqH48dVBRu%b>VV<#4ifu%$dh~i=ismE{^CltqVT2PkW^6dBS
z-S_$Kd-p7=$~^7dT+xB^d5a>FIiHm^X^H}(o3mw9@=72gDcJb)A3i&x^!=scG1oKv
zChX76z__U@(y^~(fQ=CraRtIR(5^XH;@Jo_&EljF%_T6tN!p^sHVr_<$12c=gI_?+
z*JE3kj^t(-W)q=Mg~l$H>VbnF+F~~Z0;s<wEd>cG?Q9(tCLkSA=?Lth975|J)L#LS
zJ1qM1kv%V60D8axWdVrMG)7kZToDe_UI7xQ??89WK@Y)8V(Uv#Z$fv&eABf6h!HA~
zCC+IXFxou}*j<ChI|pCz;8ke620nQij)B*A80jU$ikt$Wh7tgK(7Npai}oHy&{}oR
zBOfaeZbRuJv^Frk1b%XkS#Ab2bm9?0jBwLMR&}rySAT%%py$LAXs<fi#6Keb8yu!+
zAa!c`-oTDnW7ovU2jG^IN!)p;nVu0G2hQq}g$Sh1ZGjjig8E13-eq(ouK@>6WD!Zb
zqY;Pu+0AJ7%P2soL3h&vuRr(sK9G2-`&db$5%?r4+={_8Ax$w&01sZEmlgo4v4I8d
zd<A$oJ?2yb<2RzJ!al>6%eS8y8zNx27&uHRLFRS*1S7EzS1;St*0#?LyJJCcC~zH5
zGF9dA9nl{N49oEJeLmQ!uH&pgpT9!6WaCNgRKH~9l8wVsoWxF40#zlvAzChtgy<x4
z%ka-i0PynqBltdmvQI2m*!uEp<~TET!vA4&|1Ccwa7N&az}yM^1_S>1Yi8Njo&W#<
M07*qoM6N<$g6|%8f&c&j

literal 0
HcmV?d00001


From 1472b312c9517d0bd2be97d6e903af52a4e6194a Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 00:51:51 -0400
Subject: [PATCH 119/366] hehe

---
 .../Random/Food_Drinks/food_produce.yml       | 173 +++++-------------
 1 file changed, 42 insertions(+), 131 deletions(-)

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml
index c8c86e3d647..8e70dd2bbdf 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml
@@ -10,137 +10,48 @@
       - state: green
       - sprite: Objects/Specific/Hydroponics/onion_red.rsi
         state: produce
-  - type: EntityTableSpawner
-    table: !type:NestedSelector
-      tableId: ProduceTable
-      prob: 0.8
-
-#Tables
-- type: entityTable
-  id: ProduceTable
-  table: !type:GroupSelector
-    children:
-    #Common
-    - !type:GroupSelector
-      weight: 100
-      children:
-      - id: WheatBushel
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: OatBushel
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: Sugarcane
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: Nettle
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodBanana
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodCarrot
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodCabbage
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodGarlic
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodLemon
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodLime
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodOrange
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodPineapple
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodPotato
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodTomato
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodEggplant
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodApple
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodCocoaPod
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodCorn
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodOnion
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodOnionRed
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodMushroom
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodChiliPepper
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodChillyPepper
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodAloe
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodPoppy
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodLingzhi
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodAmbrosiaVulgaris
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: RiceBushel
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodSoybeans
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodKoibean
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodWatermelon
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodGrape
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodBerries
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodBungo
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodPeaPod
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodPumpkin
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: CottonBol
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodCocoaBeans
-        amount: !type:RangeNumberSelector
-          range: 1, 5
-      - id: FoodCherry
-        amount: !type:RangeNumberSelector
-          range: 1, 5
+  - type: RandomSpawner
+    prototypes:
+      - WheatBushel
+      - OatBushel
+      - Sugarcane
+      - Nettle
+      - FoodBanana
+      - FoodCarrot
+      - FoodCabbage
+      - FoodGarlic
+      - FoodLemon
+      - FoodLime
+      - FoodOrange
+      - FoodPineapple
+      - FoodPotato
+      - FoodTomato
+      - FoodEggplant
+      - FoodApple
+      - FoodCocoaPod
+      - FoodCorn
+      - FoodOnion
+      - FoodOnionRed
+      - FoodMushroom
+      - FoodChiliPepper
+      - FoodChillyPepper
+      - FoodAloe
+      - FoodPoppy
+      - FoodLingzhi
+      - FoodAmbrosiaVulgaris
+      - RiceBushel
+      - FoodSoybeans
+      - FoodKoibean
+      - FoodWatermelon
+      - FoodGrape
+      - FoodBerries
+      - FoodBungo
+      - FoodPeaPod
+      - FoodPumpkin
+      - CottonBol
+      - FoodCherry
+    chance: 0.8
+    offset: 0.0
     #rare
     rarePrototypes:
       - FoodBlueTomato

From 48255dbb07bfc7e589d18799d607455251e9bf70 Mon Sep 17 00:00:00 2001
From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Date: Tue, 3 Sep 2024 06:33:44 -0400
Subject: [PATCH 120/366] Add Snails (#30765)

* add snails

* scuffix

* migrate

* mo-grate

* oopsied the ftls

* Revert "oopsied the ftls"

This reverts commit 0d3c6c17f31ec904679d6a48799cea71e77c1f99.

* the curse of staging the wrong file, resolved.

* Snoth

* fix my dumbs

* reviews 1

* anti space technology

* salt hurty

* spelling

* Its a slotherhouse out here

* sequencing

* cooked snail

* volfix

* speed reversal
---
 .../Mobs/Systems/MobStateActionsSystem.cs     |  21 +-
 .../ghost/roles/ghost-role-component.ftl      |   9 +
 .../nutrition/components/food-sequence.ftl    |   1 +
 Resources/Locale/en-US/species/species.ftl    |   6 +-
 .../Prototypes/Entities/Mobs/NPCs/space.yml   | 205 +++++++++++++++++-
 .../Entities/Objects/Consumable/Food/meat.yml |  63 ++++++
 .../Entities/Objects/Consumable/Food/soup.yml |  30 +++
 Resources/Prototypes/GameRules/events.yml     |  42 ++++
 .../Recipes/Cooking/meal_recipes.yml          |  23 ++
 .../Textures/Mobs/Animals/snail.rsi/dead.png  | Bin 0 -> 441 bytes
 .../Textures/Mobs/Animals/snail.rsi/meta.json |  32 +++
 .../Textures/Mobs/Animals/snail.rsi/snail.png | Bin 0 -> 1344 bytes
 .../Textures/Mobs/Animals/snail.rsi/snoth.png | Bin 0 -> 1532 bytes
 .../Mobs/Animals/snail.rsi/snothdead.png      | Bin 0 -> 503 bytes
 .../Mobs/Animals/snail.rsi/spacedead.png      | Bin 0 -> 478 bytes
 .../Mobs/Animals/snail.rsi/spacesnail.png     | Bin 0 -> 1390 bytes
 .../Consumable/Food/bowl.rsi/escargot.png     | Bin 0 -> 392 bytes
 .../Consumable/Food/bowl.rsi/meta.json        |   5 +-
 .../Consumable/Food/meat.rsi/meta.json        |   8 +-
 .../Consumable/Food/meat.rsi/snail-cooked.png | Bin 0 -> 290 bytes
 .../Consumable/Food/meat.rsi/snail.png        | Bin 0 -> 307 bytes
 21 files changed, 439 insertions(+), 6 deletions(-)
 create mode 100644 Resources/Textures/Mobs/Animals/snail.rsi/dead.png
 create mode 100644 Resources/Textures/Mobs/Animals/snail.rsi/meta.json
 create mode 100644 Resources/Textures/Mobs/Animals/snail.rsi/snail.png
 create mode 100644 Resources/Textures/Mobs/Animals/snail.rsi/snoth.png
 create mode 100644 Resources/Textures/Mobs/Animals/snail.rsi/snothdead.png
 create mode 100644 Resources/Textures/Mobs/Animals/snail.rsi/spacedead.png
 create mode 100644 Resources/Textures/Mobs/Animals/snail.rsi/spacesnail.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/bowl.rsi/escargot.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/meat.rsi/snail-cooked.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/meat.rsi/snail.png

diff --git a/Content.Shared/Mobs/Systems/MobStateActionsSystem.cs b/Content.Shared/Mobs/Systems/MobStateActionsSystem.cs
index 5e631719864..9419daf3481 100644
--- a/Content.Shared/Mobs/Systems/MobStateActionsSystem.cs
+++ b/Content.Shared/Mobs/Systems/MobStateActionsSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Actions;
+using Content.Shared.Actions;
 using Content.Shared.Mobs.Components;
 
 namespace Content.Shared.Mobs.Systems;
@@ -14,9 +14,26 @@ public sealed class MobStateActionsSystem : EntitySystem
     public override void Initialize()
     {
         SubscribeLocalEvent<MobStateActionsComponent, MobStateChangedEvent>(OnMobStateChanged);
+        SubscribeLocalEvent<MobStateComponent, ComponentInit>(OnMobStateComponentInit);
     }
 
     private void OnMobStateChanged(EntityUid uid, MobStateActionsComponent component, MobStateChangedEvent args)
+    {
+        ComposeActions(uid, component, args.NewMobState);
+    }
+
+    private void OnMobStateComponentInit(EntityUid uid, MobStateComponent component, ComponentInit args)
+    {
+        if (!TryComp<MobStateActionsComponent>(uid, out var mobStateActionsComp))
+            return;
+
+        ComposeActions(uid, mobStateActionsComp, component.CurrentState);
+    }
+
+    /// <summary>
+    /// Adds or removes actions from a mob based on mobstate.
+    /// </summary>
+    private void ComposeActions(EntityUid uid, MobStateActionsComponent component, MobState newMobState)
     {
         if (!TryComp<ActionsComponent>(uid, out var action))
             return;
@@ -27,7 +44,7 @@ private void OnMobStateChanged(EntityUid uid, MobStateActionsComponent component
         }
         component.GrantedActions.Clear();
 
-        if (!component.Actions.TryGetValue(args.NewMobState, out var toGrant))
+        if (!component.Actions.TryGetValue(newMobState, out var toGrant))
             return;
 
         foreach (var id in toGrant)
diff --git a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
index 4e6ec1f1886..1d7742690d1 100644
--- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
+++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
@@ -10,6 +10,15 @@ ghost-role-information-mouse-description = A hungry and mischievous mouse.
 ghost-role-information-mothroach-name = Mothroach
 ghost-role-information-mothroach-description = A cute but mischievous mothroach.
 
+ghost-role-information-snail-name = Snail
+ghost-role-information-snail-description = A little snail who doesn't mind a bit of space. Just stay on grid!
+
+ghost-role-information-snailspeed-name = Snail
+ghost-role-information-snailspeed-description = A little snail with snailborn thrusters.
+
+ghost-role-information-snoth-name = Snoth
+ghost-role-information-snoth-description = A little snoth who doesn't mind a bit of space. Just stay on grid!
+
 ghost-role-information-giant-spider-name = Giant spider
 ghost-role-information-giant-spider-description = This station's inhabitants look mighty tasty, and your sticky web is perfect to catch them!
 
diff --git a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
index 0e2f83e0c78..970ea4dfc82 100644
--- a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
+++ b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
@@ -76,6 +76,7 @@ food-sequence-content-capfruit = capfruit
 food-sequence-content-berries = berries
 food-sequence-content-spacemans-trumpet = spacemans trupmet
 food-sequence-content-cherry = cherry
+food-sequence-content-snail = snail
 
 # BURGERS
 
diff --git a/Resources/Locale/en-US/species/species.ftl b/Resources/Locale/en-US/species/species.ftl
index 9278267cc44..bfebc705c56 100644
--- a/Resources/Locale/en-US/species/species.ftl
+++ b/Resources/Locale/en-US/species/species.ftl
@@ -11,4 +11,8 @@ species-name-moth = Moth Person
 species-name-skeleton = Skeleton
 species-name-vox = Vox
 species-name-ipc = IPC
-species-name-shadowkin = Shadowkin
\ No newline at end of file
+species-name-shadowkin = Shadowkin
+
+## Misc species things
+
+snail-hurt-by-salt-popup = The salty solution burns like acid!
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
index 2c49fafec5c..5f5fc184688 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -386,4 +386,207 @@
   parent: MobCobraSpace
   suffix: "Salvage Ruleset"
   components:
-    - type: SalvageMobRestrictions
\ No newline at end of file
+    - type: SalvageMobRestrictions
+
+- type: entity
+  parent: SimpleSpaceMobBase
+  id: MobSnail
+  name: snail
+  description: Revolting unless you're french.
+  components:
+  - type: Body
+    prototype: Mouse
+  - type: GhostRole
+    makeSentient: true
+    allowSpeech: false
+    allowMovement: true
+    name: ghost-role-information-snail-name
+    description: ghost-role-information-snail-description
+    rules: ghost-role-information-freeagent-rules
+  - type: GhostTakeoverAvailable
+  - type: Sprite
+    drawdepth: SmallMobs
+    sprite: Mobs/Animals/snail.rsi
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: snail
+  - type: Item
+    size: Tiny
+  - type: NpcFactionMember
+    factions:
+      - Mouse
+  - type: HTN
+    rootTask:
+      task: MouseCompound
+  - type: Physics
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.2
+        density: 100
+        mask:
+        - SmallMobMask
+        layer:
+        - SmallMobLayer
+  - type: MobState
+  - type: Deathgasp
+  - type: MobStateActions
+    actions:
+      Critical:
+      - ActionCritSuccumb
+      - ActionCritFakeDeath
+      - ActionCritLastWords
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      10: Critical
+      20: Dead
+  - type: MovementSpeedModifier
+    baseWalkSpeed : 2
+    baseSprintSpeed : 3
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: snail
+      Critical:
+        Base: dead
+      Dead:
+        Base: dead
+  - type: Food
+  - type: Thirst
+    startingThirst: 25  # spawn with Okay thirst state
+    thresholds:
+      OverHydrated: 35
+      Okay: 25
+      Thirsty: 15
+      Parched: 10
+      Dead: 0
+    baseDecayRate: 0.04
+  - type: Hunger
+    currentHunger: 25   # spawn with Okay hunger state
+    thresholds:
+      Overfed: 35
+      Okay: 25
+      Peckish: 15
+      Starving: 10
+      Dead: 0
+    baseDecayRate: 0.1
+  - type: Extractable
+    grindableSolutionName: food
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 3
+  - type: Butcherable
+    spawned:
+    - id: FoodMeatSnail
+      amount: 1
+  - type: Tag
+    tags:
+    - Trash
+    - VimPilot
+    - ChefPilot
+    - Meat
+  - type: CombatMode
+    combatToggleAction: ActionCombatModeToggleOff
+  - type: Bloodstream
+    bloodMaxVolume: 30
+    bloodReagent: Cryoxadone
+  - type: CanEscapeInventory
+  - type: MobPrice
+    price: 50
+  - type: BadFood
+  - type: NonSpreaderZombie
+  - type: PreventSpiller
+  - type: FireVisuals
+    sprite: Mobs/Effects/onfire.rsi
+    normalState: Mouse_burning
+  - type: Temperature
+    heatDamageThreshold: 500
+    coldDamageThreshold: 0
+  - type: Reactive
+    reactions:
+    - reagents: [TableSalt, Saline]
+      methods: [Touch, Ingestion, Injection]
+      effects:
+      - !type:HealthChange
+        scaleByQuantity: true
+        damage:
+          types:
+            Caustic: 1
+      - !type:PopupMessage
+        type: Local
+        visualType: Large
+        messages: [ "snail-hurt-by-salt-popup" ]
+        probability: 0.66
+    
+- type: entity
+  parent: MobSnail
+  id: MobSnailInstantDeath
+  suffix: Smite
+  components:
+  - type: MobStateActions
+    actions:
+      Alive:
+      - ActionSmite
+      Critical:
+      - ActionCritSuccumb
+      - ActionCritFakeDeath
+      - ActionCritLastWords
+  - type: Godmode
+  - type: MovementAlwaysTouching
+
+- type: entity
+  parent: MobSnail
+  id: MobSnailSpeed
+  suffix: Speed
+  components:
+  - type: GhostRole
+    name: ghost-role-information-snailspeed-name
+    description: ghost-role-information-snailspeed-description
+    rules: ghost-role-information-freeagent-rules
+  - type: Sprite
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: spacesnail
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: spacesnail
+      Critical:
+        Base: spacesnaildead
+      Dead:
+        Base: spacesnaildead
+  - type: MovementSpeedModifier
+    baseWalkSpeed : 5 #he go fast, also they cant slip so its probably fine.
+    baseSprintSpeed : 7
+#  - type: ActiveJetpack # I think this will need a custom component to not make tests angry.
+  - type: MovementAlwaysTouching
+
+- type: entity
+  parent: MobSnail
+  id: MobSnailMoth
+  name: Snoth
+  components:
+  - type: Body
+    prototype: Mothroach
+  - type: GhostRole
+    name: ghost-role-information-snoth-name
+    description: ghost-role-information-snoth-description
+    rules: ghost-role-information-freeagent-rules
+  - type: Sprite
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: snoth
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: snoth
+      Critical:
+        Base: snothdead
+      Dead:
+        Base: snothdead
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index 6b7dc94b070..0feeb9c3903 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -698,6 +698,35 @@
         - ReagentId: Water
           Quantity: 4 #It makes saline if you add salt!
 
+- type: entity
+  name: raw snail meat
+  parent: FoodMeatRawBase
+  id: FoodMeatSnail
+  description: Improved with salt.
+  components:
+  - type: Sprite
+    state: snail
+  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Consumable/Food/meat.rsi
+      state: snail
+    entries:
+      burger:
+        name: food-sequence-content-snail
+      taco:
+        name: food-sequence-content-snail
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 15
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 3
+        - ReagentId: Fat
+          Quantity: 3
+        - ReagentId: Water
+          Quantity: 4 #It makes saline if you add salt!
+
 # Cooked
 
 - type: entity
@@ -1170,6 +1199,40 @@
       Burger: MeatSnail
       Taco: MeatSnail
 
+- type: entity
+  name: boiled snail
+  parent: FoodMeatBase
+  id: FoodMeatSnailCooked
+  description: Improved with salt.
+  components:
+  - type: Tag
+    tags:
+    - Cooked
+    - Meat
+  - type: Sprite
+    layers:
+    - state: snail-cooked
+  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Consumable/Food/meat.rsi
+      state: snail-cooked
+    entries:
+      burger:
+        name: food-sequence-content-snail
+      taco:
+        name: food-sequence-content-snail
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 15
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 3
+        - ReagentId: Protein
+          Quantity: 3
+        - ReagentId: Water
+          Quantity: 4 # makes saline if you add salt!
+
 # Cutlets
 
 # Raw
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
index 5c2a87c2b11..d5cb4311c46 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
@@ -1227,3 +1227,33 @@
     - Fruit
     - Soup
 # Tastes like bungo, hot curry.
+
+- type: entity
+  name: escargot
+  parent: FoodBowlBase
+  id: FoodSoupEscargot
+  description: A creamy and rich bowl of snails, bon appetit!
+  components:
+  - type: FlavorProfile
+    flavors:
+      - creamy
+      - slimy
+  - type: Sprite
+    layers:
+    - state: bowl
+    - state: escargot
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+          - ReagentId: Nutriment
+            Quantity: 6
+          - ReagentId: Vitamin
+            Quantity: 6
+          - ReagentId: Allicin
+            Quantity: 3
+  - type: Tag
+    tags:
+    - Meat
+    - Soup
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 8a9c4880884..50cca47ccb4 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -248,6 +248,48 @@
     - id: MobMothroach
       prob: 0.008
 
+- type: entity
+  id: SnailMigrationLowPop
+  parent: BaseStationEventShortDelay
+  components:
+  - type: StationEvent
+    startAnnouncement: station-event-vent-creatures-start-announcement
+    startAudio:
+      path: /Audio/Announcements/attention.ogg
+    weight: 6
+    duration: 50
+  - type: VentCrittersRule
+    entries:
+    - id: MobSnail
+      prob: 0.02
+    - id: MobSnailSpeed
+      prob: 0.002
+    - id: MobSnailMoth
+      prob: 0.002
+
+- type: entity
+  id: SnailMigration
+  parent: BaseStationEventShortDelay
+  components:
+  - type: StationEvent
+    startAnnouncement: station-event-vent-creatures-start-announcement
+    startAudio:
+      path: /Audio/Announcements/attention.ogg
+    earliestStart: 15
+    weight: 6
+    duration: 50
+    minimumPlayers: 30
+  - type: VentCrittersRule
+    entries:
+    - id: MobSnail
+      prob: 0.02
+    - id: MobSnailSpeed
+      prob: 0.002
+    - id: MobSnailMoth
+      prob: 0.002
+    - id: MobSnailInstantDeath
+      prob: 0.00001 #  ~ 1:2000 snails
+
 - type: entity
   id: PowerGridCheck
   parent: BaseGameRule
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 9bca33fbbf5..5206421630b 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -896,6 +896,29 @@
     FoodBungo: 2
     FoodChiliPepper: 1
 
+- type: microwaveMealRecipe
+  id: RecipeBoiledSnail
+  name: boiled snail recipe
+  result: FoodMeatSnailCooked
+  time: 5
+  reagents:
+    Water: 10
+  solids:
+    FoodMeatSnail: 1
+
+- type: microwaveMealRecipe
+  id: RecipeEscargotSoup
+  name: escargot recipe
+  result: FoodSoupEscargot
+  time: 10
+  reagents:
+    Water: 5
+  solids:
+    FoodBowlBig: 1
+    FoodOnionSlice: 1
+    FoodButter: 1
+    FoodMeatSnailCooked: 1
+
 #Pies
 
 - type: microwaveMealRecipe
diff --git a/Resources/Textures/Mobs/Animals/snail.rsi/dead.png b/Resources/Textures/Mobs/Animals/snail.rsi/dead.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdaecdab58b41dd322d8fadc8c6793d6ff97e814
GIT binary patch
literal 441
zcmV;q0Y?6bP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004iNkl<ZSi|j;
z%_~Gv7{-5BL(Z6K%-l27+(=20QetBx5lUTK%keK*Qnu9nE5_177FNp6;%3Ecl#h{2
zS1}_>=15J~g1PxfjGLA7Tb=WsxAQzb?>V5+Xf&Gtj!{qZiaqGR-7jtJ8(|GJ)Fa+M
zG(wwc(q@_n5&dN7&l0GKpB?5Y6g>bkGKmmTl&XYEqM=^#$>|xoJ1j2Cw<uK!oy3nu
zaCVqSsR{t4^J9R(#7DffdEZ-`_dl+GZ9r9_Q1lQYN=7C*I68f)zZ$Cb0Jx6rTiKj(
zadm_1*#5=U4OTX1xQ_j$iO5e9$jBsxqDOa!MMlDPsl@%`6Y=Jzz=-SEerLOh>)3uG
zCFw~EdRI4tdZ<UZIMM6JqvBoU@#ZGtu@)}Nw@i)oA!P!i`amKj0q98!0Iu&USlOHr
zDuLmF7`uCAB5$s#iO-H(7?CPe6|q(s2%nS`0Exzs-*97LIGEr1_W8TBx#_NN&8JhX
jj4tmOXfzs)<_n$yx1y4cok~nK00000NkvXXu0mjf8+FbJ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Animals/snail.rsi/meta.json b/Resources/Textures/Mobs/Animals/snail.rsi/meta.json
new file mode 100644
index 00000000000..ca42ca9eed3
--- /dev/null
+++ b/Resources/Textures/Mobs/Animals/snail.rsi/meta.json
@@ -0,0 +1,32 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by Kezu (discord) & IProduceWidgets (github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "snail",
+      "directions": 4
+    },
+    {
+      "name": "dead"
+    },
+	{
+      "name": "spacesnail",
+      "directions": 4
+    },
+    {
+      "name": "spacedead"
+    },
+    {
+      "name": "snoth",
+      "directions": 4
+    },
+    {
+      "name": "snothdead"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Mobs/Animals/snail.rsi/snail.png b/Resources/Textures/Mobs/Animals/snail.rsi/snail.png
new file mode 100644
index 0000000000000000000000000000000000000000..26d112c57ff45285972eb3913188be343bc782c0
GIT binary patch
literal 1344
zcmV-G1;6@<P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000FCNkl<Zc-rln
zPe>eB9LK-opVe6%WMqtX)v#a^Ljy@A=CDwLSgbU#3Bl4F%^^n#c<@rlDb#~02$G|L
z3ca)-ITS2uLa--$5Y&>2tFCCbuDZKA?#}LeyJlx!4|c~{|L&->4ek5Dusd&Net*96
zoA-9-J%GdEa5x+ehm#*0ub(k1?f*6ZhdL^la~onPv3fymN1re^+|8c9_|<4rSKbx0
z3e}Z&=xb}vN%-4uhEWg!dOU6h08Nec0Dvz(zl5KESwxS=&7Myz3xyEi#rMDA)3(nL
zUY<AFG(yqW2KH>+XDJ53YVw~nU&6(D3aP4k&v|qUlfM%LBP#3`p|7o(?N1&6rhSWO
zYOF^v6oC~HELDIk%g_jgtKs5-W5LKOWLXBVZ0p^ZB`03L8iPxbjkeO#QhcOT!yj19
zY0rluD<_M^yPx+)#vxV7kg8<d8yP=v+)k*z`}hSTDn!u<QFKDrGthM%E=2~_VV?k0
z2Ph?Y`}n@m_V)38NK&P7ybw@I003Lt+enZEG8r8u#YG54RLiz3381Pfw0Hu(KW1{v
z|F1tGl{=uSs_n_Es)}Glg;ef9CX+!bl|m}Dg9J^&rO1|Ju-svN^|8WwA9|ogw~RKa
zsv3jeP2k7bNI^z{9*>*36d77P0RYe$LwQ*-wqi-kov`JAM|)dY^Oehxs$|nBphDB)
z2(GQ6YjDzb5k`Ak*$=M{cD4^X-Io2ASan=iR})AklMSiVx}aRB+cQ*LgxVS<FxuP7
z3L!%8Lyyt-Wbw@}*#AR_=^0(u^|Zs`5H`ab#R4EO0GUiC4X^@rgFq&uZ%{(2OG-<N
z1)-?u{Z8ssb}V&*U4xUtMtIYm*3;{h5KuxuDM6AFq|@)$Ho}|kLfrkX!AW6#BUBrW
zX#ybxlq3+<v{Q*Moc0+!DzHNSC)giHq5X3>91e%W;cz${4u`|x{C}}?&i-Ft4{(-1
z?GoUFOCA8`hP&Bu`yZ-pORvTIy)8M8zy4{;cnNv+(TFfN+|8~&8WHRkdcTk3;yO10
z`n@ge+D(r!FRu}bes2piJEJ6lsi7}f_WOBpoZWtJ3ll{rB&P@fsBvFGKfv-8p~y<|
zOS3bW_AO%Cw+KoJMA3Ob{c7ccu}utk&s?e#172pfd06t45+kmq*%@5B={XSBsRb}6
z?+>h^qw|h2KW`RcV!+GFoRV=}`_N0c8XC`h_gxK*XdilM?3XzuObmFLIr(5jMN?xv
zIy&#bA6T^{LS7ZHG&^I=$!8ydtO#Z*{wYHMIco^cirJRg2LK~^b8M6nEX~f~Tq=O-
zfIqMbQFOwk$e8vm8cxjT>}SP4j}`y?nUg=tj@f56mTBK2T#5`)biyB4&1=C%UKQX{
z<Qx$~;jpntA?v)VS~1SoqAJ2$+qnJY&6!7p+fUvI;jL|G(Y<QR`l6ITDt90lQ4tD<
zbCS<@t<Z@AJRO@7G(rs#f)N#3atBhm15#xLf)N$BZqy+fBP^asq+_v|Z9`xz7DGId
zNJnFY-MUe?dlM=vAeB3yC3g^vs7CS{p?ErW@<@<Z1+-qTL}*h*i2!5ECV#iR9->1B
zbP5vJkfJ2un_oEBiOR0QNx?V2fD|PG64wBoLUic3+g@*oV2&-csiO6IWnQ*V4AMLU
zyMI;2gHHF60ozdlN6ktf7Z;x~=5RP14u`|x9M0cE3b_aITYQ250000<MNUMnLSTZ5
CNNG3#

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Animals/snail.rsi/snoth.png b/Resources/Textures/Mobs/Animals/snail.rsi/snoth.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e634d12655de5080e995d123eaa6630d3ab1839
GIT binary patch
literal 1532
zcmV<Y1q1qtP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000HUNkl<Zc-rln
zUu;uV9LGQXyL($YcDHVG9TRY)!=ahW0?B|xL@J69jS+ogLF1c=F~&%IGBF_-ABc%B
z#wd|Dg&2)yidCbDVTnpy6$hQ&9E^6e?Rwd|^|syG>%;7I9VjidON{69baU?MIp5#+
z{?0kK_Z$!i1OkCTAP@-tmzYYa^!_XRbf;_sU@o=5ho`>3rp{vrx3R{tRA*jW;K^48
zOqCS6Qp34#N3W^VdvCj;VgE}Xn<{2NK|ngQNc~zFbU5|(1>@eq-FJcs5;Gc7jkV&z
zuhejU@De+B-A`<M#JHDCX+)xN?&@1#mWHx~KHIlJ-}yin17|}#)Yop5e>OPEzU>`+
z_r)-84vw3unX)hL>eN>T4=@xA(cacdBpT=SZ-OOju$I%gq9_cU4RO*x!hOB#k?dB|
z*+owJm&B}B6kxonV^(oF@ShpL<5r9^o6SaxyPnaBa8Y?Fn9HdwTi~RBghr*7!^ixj
zvx^))=BH7q<)nWE*;4&UOUtqJq~j{G>_C<s<Z^j(xf~w1f|jFt2531r<nt0!XE|}i
z2f&FVK4R)DhkV|$JHKfYv=jh|t5=y%&6CgPuv*MS;%eD#l{ExZRi#z3bI9i<yO6_f
zvyffLameSTbrIA#wd%pEs)`D@Bs=+ho=hf#*<@xhpU2}?$~K|w3G0b2x4!?;UcUU{
zccX02){T7n(K$XCj+<5^1D@^MpnKd3$+>v|a=MOGV<9n{E_)KTmfN}9)__Zvcz8z#
zE{C1D)B-k(mG14EklPyc_s#^XZbGuQhN01k>uRg&5a{3Asc*k~9mAKRv^Khy#$#rY
za4dmSve8)Qpnq@Ys+iE<zk_HZMUCA`?HW5HmlFg+(X!hym-_>|)l84KnQ$yg=!!}>
zmZZnqOr1+&Q(OJ2y~17?o1&@SK_r@Bb}mEb?KjtVSsC!xlhyBOZ=j{YiBq;SuVo32
zN0DWT!Si8O<LSS5CTQy4+o=OIHPm6XTDUMaRlWZL*Bc7|V$iCwQpaldFAxX>0)apv
z5C{YUfj}S-{0F(^Z)l&s_J}_5$5jAoB$?d&EYG}gwkqG|-hOVoZgJL<NoxSKHP@AV
z4xl0i96iue^bzvqPku5LOt?6@^i{UrtyIN?Lhy;dw!SvE-)02=Pr52<z|jLe`j*~4
zV_!a*($KV2QD^VI{Gk5J$fWU`<EH}^G2!{gyNv+v_O|fU(a%lGb;+^=mqP}iaf6p%
z&kdGrg1MaF$A$w81w#x4LugtGS#}h;|I5fE+qyh#>+*2?bf8H1tptDkbiinLxxt0t
zH7#Z68XFF<rMK^zthnh6SRVZ7L>S-Rea5xNtxymUtI2cMrWVY4j>E_N+}5Zt6;mrQ
z&*+7=P8{)(H(5CU+a!${v(a}XuF~Gt${k(Z_|FU&*QI1aNf|IU95D9e3qzoANa1>%
zIN~z|-zqn1s}THhZJL&1Y&bwghJcoX(TOm!?7-tz7z&1rPL|i%vvng=u^IBFrDGy*
zy|9~~Z(_4@B|nFvy!FCv0P-daQ?VKLY~5IN7^9$NC>S!ba&#hG(t(YVGQi_jicE;c
zVnpI9F3E0mKB=bZ@isFRn;{aP<Km_1icEsXPX|mFFHIAP&oLF7p~u_Iq?$GYcS&|4
zag}H+Rup`xXN7KPz^em4nUX2ZFd-6GNv5;7Bs;D(P9kv?%>_<}jYvYHVXaJeM^nY$
z0lGVyXjm%~NoY77HZ<2#`n%RRaY=TP=`4}BY6PE5X}mgc<CUPK-Qj2rXwxdzWz7|W
zmu^>B*Hp_wI*Zd`XFg@(s~^WJwgfI)PW3GvEjS%E7SdVPHPvzjh+I~e4o79Of9suA
zN!Ce~c@KDc-)3VuNsh;h?n$kG@5wi;l`Fpf|J(b(^o(Ydr^AV&daey_<NBR}i(<!E
iAP@)y0)aqq9sUGS38O*fN3Bf&0000<MNUMnLSTXwLH4Ks

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Animals/snail.rsi/snothdead.png b/Resources/Textures/Mobs/Animals/snail.rsi/snothdead.png
new file mode 100644
index 0000000000000000000000000000000000000000..72962396080de32bfb39adf1f8f753592b023091
GIT binary patch
literal 503
zcmV<T0SNwyP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80005LNkl<ZSi|j<
zO=}ZD0EVBjwcXvA*3GU_H%5?B5GzRW1N0~srBuB52c&owQE2J4p!Fmkt%85ROKI`a
zyP%gC3jsq@3n6LE#;zKZ3DLS9YKBy)*hWvz0|WE@zP$4R8jVJy`QH)SnSAH+VA$H8
zm`#ax4eZ*E_`u1t#2tsY<6xTBFNXeE0!{IyOqyK20D$M(n5Ko4H6~_LV(#9RF#qlY
z0NsYkdi4|6A3PUrC-AfQ(8Xc;k_n3C04ZxKiIK4xk=(zR>gPIZ<$#Vz507q~3;)Uy
zEM?M2Sp&dd&H^YCt&EJ#h}+XIM9j5W$gYqnRJnQeMA()AxemE}0n@bbT$@*K7B~8T
z7;4UGWg)x5nPZ+RzcbPKCkc42O)g)cFPXq|q2&8i>J6esmooBr{8H$}4CY_H<#_)=
z>W!~lo0{jqKAXFvr*@ve<g=8h)TA;|EC)(Fx+k)67orfcc2iuFo7O%VA7a%H+P?#(
zZYaGE=oF~Z6gLjr9E$hwrQRT7b#dYJ5mx<=d=ni2JiK+D*Ndf{Kf}@Cqw4%B%jHdD
tMk1!_POrJ;9`~Q7h5qw38jWTvz5_|2tTBNTu1Ej?002ovPDHLkV1l&E@+klS

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Animals/snail.rsi/spacedead.png b/Resources/Textures/Mobs/Animals/snail.rsi/spacedead.png
new file mode 100644
index 0000000000000000000000000000000000000000..37cbde99fb0509fcf8b66ef84a77da00a0f9f6b4
GIT binary patch
literal 478
zcmV<40U`d0P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004{Nkl<ZSi|j<
zKS)AR6vn?BHI$g8;tRDJ%_u0*Gy>rb4nfuuEeZ<K*dK_Z<t3Ojw1^FD(vw;WTAYM}
zK%%6gpd}i6(O{rM64el=sYic^(5R*RgA3=LdoJI{J)8@0I2;b=zr!jib_Hd6yFcCt
zv!5EMsYF~9MF>KRx^fLB`jcmJ1!bB`U6Cs&)3#EgZKXu6piDzES^9MoLjUYL@wwC$
z4b5a#6W;MnDp~FHt1Zaq^LTnFt1$qqC66$_H2kUdCLN}mbeKNIRU3FL-(pJgp-FE-
zWN-pgk`Dl|pI!e{>xkvZ5|WuxDB^J0PfDQ(OGsvpSdOZm0$o>#+HFom69FU_cW{1?
zfkxYmm8}>i#};6)*f5%n!WSJtn_z%aD8gxLRqvl%UZYJgz!H*K)nmx49_n@n5KRQs
z+*|RUNjHo}9oX|dbb2GonLHd35dd(S+JifD!G81)#QmKloi)O2b*i~nanH0JtX2b!
zrXJcRJvxMXRTuyq5fODGtJNEb`#aVCNoS4k&K7&`zBTXdGs7$GGH^H?4(AJA0AypH
Ux`ylM1ONa407*qoM6N<$f>Dpl#sB~S

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Animals/snail.rsi/spacesnail.png b/Resources/Textures/Mobs/Animals/snail.rsi/spacesnail.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a2d97c62220c1da37ebdff0cdc6d4b514d214d2
GIT binary patch
literal 1390
zcmV-!1(EuRP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000FwNkl<Zc-rln
zUrbY19LK+H(Q(C6QlU7hGfQ+GZ0InERTHwBG#N4N!!|XMCF=U*19WV0A(MhAA+s-v
zu!k)H|7>oH(PSCMKf&YzN(zj?2IG%t+-6XFt5$47OBFnO&>mWqrnl{Fd^n%vr01O5
z`}_UQ_nv$1&HWvK!C){L3<iS{J-1KnB9Yq3_8(6S@>otX{r7pqw$!}JU#u~t#Bx&W
ziWX?KdJ@{sNumHR`Uil4AHGhG0J7(fw`|`Z()%l9T0J2X-Lhl|pxrlyf~M10c4dV2
zUAgoNJb>sJ<YEWEW&3^%k6*{W?C)q99>0z)+xJs(q(r9GlY*wxII^P<g5ad3<@{l!
zXXr%7AWDD^_e}_b6Z(7|-g_&H7Ja@Bg5X4l`=;bqKRrW-eQOuvtB>ut)P4vY$ARNG
zG#qTBB1k5{)-^kyJ59yt&yKL)OYMiSb<Ix61xQtD@a;Fhqq5%oOptUHEyo&qk*d^4
zC&0AV1px5-rvU){&3srpcw9=Ry)JMZN829HBU*M_i$upDYQd1bnM)ohfWDn-==0~M
zTKCX36rONn$t*zbj!L=^p1tKJ05F`p65r?Vc<K0^i9U!~2t@~bAWcn-HJjjl<feT}
zl^SieU8tUNC*>&+X`z$!DF6WS%}b$FE{36K4J}ILVi;>Sq0W?-lsCeI1s+lT340Hy
zGvyJ(=6v`A0Sx}*#Ok+~&KXk3@uA^;)B&Wbbwu)+aOKP8$l$`m|Ly!=(!U5jCBQ5p
zP$=XW`d6U+vm}-qDn9%^9~280KJ)+haZENu-2zpuBeD*D=$Z5BKv<cPzkzoCZzSXD
zSGA7F+WBF4yi*AHd<gh_@OY<UTTfy+X})_s8H0}$N3#7h7z_r3!C){L3<iV2U@$^+
z^oiUvAeCJp#{B{F5t^e<<emYk>?T}*))g(UtiP^y0g<1@*L`+8Z2JB2)2`RzBV;^r
zrHFB2Fc>g0GD`b87imbb&qbZx5+1-|H<4gHQAD!axky9o*>ee+yu4fh$4Rsz$i)nv
z=Xvb57Gbxw2!h~*ea}gBF4BalU#MG7OEBnoaM(>G)aFZr-*Xaz;G}W!JP(7x@Y1Y^
zS%B;fd+FdS>&@tC^Ws=TFDmQJ5CkWxN*m$U<`Re9L{#cbnlc9f`PCcoFH#{k`kQ&E
z)R}PDO~kFuB~_)35CkVG>&-aU(2JfnFDmQJRD|pedr3lOKzDaH0)8*81E3;=vMP(i
zT8jbw%{=;>d91Y<;uhdVd#kdzu;anOhsGB0ducsx0j9k!SZzjRs5P*Zl)-8<0syXF
z{4rwCfps}>435VwfMakRfps|%#SF$`wHaY4DMN-@1FOv#)n<vPW<YJlDOhbrtlnsb
zrKAi4UFXnzp%LZVsxj$yq3NLjl{%CDf9$RY_uP{xwq1_<DN$^@EW78P#Ms@r)VE5V
ziKd4FCfzQSZ>vW0g+>f?or9&M468SqVYL}iTX8BX`%wib)9Ok7`cl*!E~S0t+p4i7
zM~6=@*5HHk^~lUrL8;_`r%wO?<JZRU$>F|)JSNXp6q0vz?>@g|3*hzoasU1!{CTto
zXFjUMgWK0|^z?zS3pUhqDyq#AQ3Y6M$|JUcbS%>r(!Su}^<U&dmXe0FG!BZC6g(yi
z;F`FRu)&9lpwX_xLfI3{&dgwH$`3L#h3+GxRD>XRCi-x&z!O!nR2I$PgLT_Ldf2h~
wc4SDErJXM;9VsrBF=j9r3<iV2V7!|D0a}e-+jrlX{Qv*}07*qoM6N<$g5Kk*Hvj+t

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/escargot.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/escargot.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ae8f5af72e06f8f27c653e62071026eeaf80753
GIT binary patch
literal 392
zcmV;30eAk1P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003`Nkl<ZSi|j;
zPbh<79LGPe9I%zVdDE-7$jI&-<me!q%MMGFqp-4rgOfAmqWmd2SSh(~lO(6*Vw_~L
z+QHPj!>f(Fu>&55<!Llaa`Svn&-4BLp5LG6_dK9bC=?3Ce@FYxq05a?0pOk5)ylQ3
z?Eo;e5c_f5+G<AeG%o-Ou{%=PJpD5sQjr?~vbKZY+bN>SfYboi_pY!qAyFQuwPW?$
zf@&&>c`GdPR#=>@rDgJ^?F#@*-NnIq7J%tsH--D6)cd+xh$aI(9v7G#Ii&8ah-td9
zG9mG`sH!9Q=)Ampqp==<m)AE;-BmIUxB-|L+-G^VSNhlw&vM=5Zw4Tjb1L3M)mi1O
zupr^cpa6!?fP^FWp7A!)JGauOr(OSK1JD{4wLf`;*PCO)@EO=~8-Tf$QzA#hrQ~s2
mcC81uH1)p~3WY-PQ{DkY2!x;hGZKgZ0000<MNUMnLSTY!4ZGw3

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json
index 8e2c4444fc4..d6c3ed76766 100644
--- a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Fills created by potato1234_x",
+  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. escargot from tgstation at https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955. Fills created by potato1234_x",
   "size": {
     "x": 32,
     "y": 32
@@ -66,6 +66,9 @@
           0.1
         ]
       ]
+    },
+	{
+      "name": "escargot"
     },
     {
       "name": "eyeball"
diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json
index 824d3b96812..4ad75849d1a 100644
--- a/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept, potato1234x and deltanedas at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa",
+  "copyright": "Taken from tgstation and modified by Swept, potato1234x and deltanedas at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, snail by IproduceWidgets (github) and Kezu (discord)",
   "size": {
     "x": 32,
     "y": 32
@@ -152,6 +152,12 @@
     },
     {
       "name": "slime"
+    },
+	{
+      "name": "snail"
+    },
+	{
+      "name": "snail-cooked"
     },
     {
       "name": "snake"
diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/snail-cooked.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/snail-cooked.png
new file mode 100644
index 0000000000000000000000000000000000000000..81d8f43bbf9b7ee265b0be9927c9f7d29482de52
GIT binary patch
literal 290
zcmV+-0p0$IP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002#Nkl<ZSi|j;
zy^6v>6h==Voe_&D_=8b|R4LL6DfSucd<LJy+V@Ez*jsGl!eSImKrDg@Y$1$A%%Hm>
zx>()=12f+YbM74&5ClOG1VMN+!JwgnK|}qXzg;jH_WxWw9r+4iGVH5zT<7;NUX}aJ
z3INL_$8T1cE!IXUEwgU*gkjmJ?7;SDvP^R3-}}2R^HsU$wlB#}=K!AD#%bkj;uOQO
zi|#BN$3hqR?*hC|UCTee3UN6f2d+N1iBp_b4FHuLbP<m*pOFKEQKq{Nql_?G-MmDx
o4<DB_jDCuBFO{Du2!imCGYFSfQ?&%<QUCw|07*qoM6N<$g2y>|EC2ui

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/snail.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/snail.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3c7ffcef5080cc864319a50041473bf5376867d
GIT binary patch
literal 307
zcmV-30nGl1P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002`Nkl<ZSi|kp
z!Ab%_9LMqR#s&%H<T{IB;7th65roj)!(M!We2PH427*tK;9b<4FCcjA+AZ)<VOxpX
z#ioPIB3p@~$NvY0`7^`(fB(yX5JCtc#GZ|s6*Fp9OuXKkeywP_)sh)Bf?tj8*`N^^
zyH?Nt;%pP%t(MHu!6yJ;-%0$G%hhequ_3ukny2S6%G2ci1n2cOt?~uAOq#QsduOKs
z`n93~I8hz|laIG(5CE+e&SHx4Gyr)&0l>@q?B8$zca!kDpb&-IU|ajCWec;Ib9}0!
z;K$cF0P1jkZ+Fx1;X??7D>q?mU+To(UtebBX9^+2T0fd+RvTEp{N4Zn002ovPDHLk
FV1f>BkY4}*

literal 0
HcmV?d00001


From 6ef3af2a1a9fc689290707bbbadaf172c8d706cb Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 01:01:50 -0400
Subject: [PATCH 121/366] herrrr

---
 .../Entities/Objects/Consumable/Food/meat.yml | 63 -------------------
 Resources/Prototypes/GameRules/events.yml     | 46 +++++++++++---
 2 files changed, 38 insertions(+), 71 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index 0feeb9c3903..6b7dc94b070 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -698,35 +698,6 @@
         - ReagentId: Water
           Quantity: 4 #It makes saline if you add salt!
 
-- type: entity
-  name: raw snail meat
-  parent: FoodMeatRawBase
-  id: FoodMeatSnail
-  description: Improved with salt.
-  components:
-  - type: Sprite
-    state: snail
-  - type: FoodSequenceElement
-    sprite:
-      sprite: Objects/Consumable/Food/meat.rsi
-      state: snail
-    entries:
-      burger:
-        name: food-sequence-content-snail
-      taco:
-        name: food-sequence-content-snail
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 15
-        reagents:
-        - ReagentId: UncookedAnimalProteins
-          Quantity: 3
-        - ReagentId: Fat
-          Quantity: 3
-        - ReagentId: Water
-          Quantity: 4 #It makes saline if you add salt!
-
 # Cooked
 
 - type: entity
@@ -1199,40 +1170,6 @@
       Burger: MeatSnail
       Taco: MeatSnail
 
-- type: entity
-  name: boiled snail
-  parent: FoodMeatBase
-  id: FoodMeatSnailCooked
-  description: Improved with salt.
-  components:
-  - type: Tag
-    tags:
-    - Cooked
-    - Meat
-  - type: Sprite
-    layers:
-    - state: snail-cooked
-  - type: FoodSequenceElement
-    sprite:
-      sprite: Objects/Consumable/Food/meat.rsi
-      state: snail-cooked
-    entries:
-      burger:
-        name: food-sequence-content-snail
-      taco:
-        name: food-sequence-content-snail
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 15
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 3
-        - ReagentId: Protein
-          Quantity: 3
-        - ReagentId: Water
-          Quantity: 4 # makes saline if you add salt!
-
 # Cutlets
 
 # Raw
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 50cca47ccb4..dd8ec8cc1e7 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -1,22 +1,53 @@
 - type: entity
-  id: AnomalySpawn
+  id: BaseStationEvent
   parent: BaseGameRule
+  abstract: true
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: GameRule
+    delay:
+      min:  10
+      max:  20
+
+- type: entity
+  id: BaseStationEventShortDelay
+  parent: BaseGameRule
+  abstract: true
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: GameRule
+    delay:
+      min:  10
+      max:  20
+
+- type: entity
+  id: BaseStationEventLongDelay
+  parent: BaseGameRule
+  abstract: true
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: GameRule
+    delay:
+      min:  40
+      max:  60
+
+- type: entity
+  id: AnomalySpawn
+  parent: BaseStationEventLongDelay
   categories: [ HideSpawnMenu ]
   components:
   - type: StationEvent
     weight: 8
-    startDelay: 30
     duration: 35
   - type: AnomalySpawnRule
 
 - type: entity
   id: BluespaceArtifact
-  parent: BaseGameRule
+  parent: BaseStationEventLongDelay
   categories: [ HideSpawnMenu ]
   components:
   - type: StationEvent
     weight: 8
-    startDelay: 30
     duration: 35
   - type: BluespaceArtifactRule
 
@@ -250,12 +281,11 @@
 
 - type: entity
   id: SnailMigrationLowPop
-  parent: BaseStationEventShortDelay
+  parent: BaseGameRule
   components:
   - type: StationEvent
-    startAnnouncement: station-event-vent-creatures-start-announcement
-    startAudio:
-      path: /Audio/Announcements/attention.ogg
+    startAnnouncement: true
+    startDelay: 10
     weight: 6
     duration: 50
   - type: VentCrittersRule

From b46f7c051d92c93cdd7bd57ef2452364d5f83f3d Mon Sep 17 00:00:00 2001
From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Wed, 14 Aug 2024 16:04:00 +0300
Subject: [PATCH 122/366] Custom Taco & Kebabs - FoodSequence 2 (#30905)

* control layer ordering

* sprite update

* taco!

* taco naming gen

* fix separator naming

* some proto fixes

* default naming separation

* fix taco naming

* rat update

* hamsterburger

* organs taco

* remove from spawners

* fixes

* fix separators and lemons

* Update food-sequence.ftl

* randomization offset

* fix

* kebabs refactor

* fix

* skewer weapon

* Update food_single.yml

* Update migration.yml

* suppermatter

* hamlet centered

* hamsburger

* Update dead-0.png

* 20 -> 4 burger layers max

* Update burger.yml

* canReact: false

* capfruit update

* Update burger.yml

* Update burger.yml

* Update produce.yml

* some fixes

* Update Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* chicken

* Update food-sequence.ftl

* documentation

* fixes

* Update meat.yml

* Update meat.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 .../EntitySystems/ClientFoodSequenceSystem.cs |  15 ++-
 .../EntitySystems/FoodSequenceSystem.cs       |   7 ++
 .../FoodSequenceElementComponent.cs           |   7 ++
 .../FoodSequenceStartPointComponent.cs        |   3 +
 .../nutrition/components/food-sequence.ftl    |  27 +----
 Resources/Migrations/migration.yml            |  36 ++++++
 .../Random/Food_Drinks/food_single.yml        |   8 --
 .../Prototypes/Entities/Mobs/NPCs/animals.yml |  17 +++
 .../Objects/Consumable/Food/burger.yml        |   6 +-
 .../Objects/Consumable/Food/ingredients.yml   |  18 +++
 .../Entities/Objects/Consumable/Food/meat.yml |  15 +++
 .../Objects/Consumable/Food/skewer.yml        | 106 +-----------------
 .../Entities/Objects/Consumable/Food/taco.yml |   6 +-
 .../Recipes/Cooking/meal_recipes.yml          |  92 ---------------
 .../Textures/Mobs/Pets/hamlet.rsi/dead-0.png  | Bin 19319 -> 393 bytes
 .../Textures/Mobs/Pets/hamlet.rsi/splat-0.png | Bin 19333 -> 507 bytes
 .../Consumable/Food/skewer.rsi/meta.json      |  76 ++-----------
 .../Food/skewer.rsi/skewer-bluepepper.png     | Bin 0 -> 274 bytes
 .../Food/skewer.rsi/skewer-corn.png           | Bin 0 -> 346 bytes
 .../Food/skewer.rsi/skewer-corn1.png          | Bin 292 -> 0 bytes
 .../Food/skewer.rsi/skewer-corn2.png          | Bin 315 -> 0 bytes
 .../Food/skewer.rsi/skewer-meat-alpha.png     | Bin 0 -> 243 bytes
 .../Food/skewer.rsi/skewer-meat-alpha1.png    | Bin 228 -> 0 bytes
 .../Food/skewer.rsi/skewer-meat-alpha2.png    | Bin 285 -> 0 bytes
 .../Food/skewer.rsi/skewer-meat-alpha3.png    | Bin 218 -> 0 bytes
 .../Food/skewer.rsi/skewer-meat-alpha4.png    | Bin 222 -> 0 bytes
 .../Food/skewer.rsi/skewer-meat.png           | Bin 0 -> 268 bytes
 .../Food/skewer.rsi/skewer-meat1.png          | Bin 250 -> 0 bytes
 .../Food/skewer.rsi/skewer-meat2.png          | Bin 276 -> 0 bytes
 .../Food/skewer.rsi/skewer-meat3.png          | Bin 210 -> 0 bytes
 .../Food/skewer.rsi/skewer-meat4.png          | Bin 241 -> 0 bytes
 .../Food/skewer.rsi/skewer-mushroom.png       | Bin 0 -> 247 bytes
 .../Food/skewer.rsi/skewer-mushroom1.png      | Bin 218 -> 0 bytes
 .../Food/skewer.rsi/skewer-mushroom2.png      | Bin 220 -> 0 bytes
 .../Food/skewer.rsi/skewer-mushroom3.png      | Bin 221 -> 0 bytes
 .../Food/skewer.rsi/skewer-mushroom4.png      | Bin 220 -> 0 bytes
 .../Food/skewer.rsi/skewer-pepper.png         | Bin 0 -> 267 bytes
 .../Food/skewer.rsi/skewer-pepper1.png        | Bin 241 -> 0 bytes
 .../Food/skewer.rsi/skewer-pepper2.png        | Bin 249 -> 0 bytes
 .../Food/skewer.rsi/skewer-pepper3.png        | Bin 249 -> 0 bytes
 .../Food/skewer.rsi/skewer-pepper4.png        | Bin 250 -> 0 bytes
 .../Consumable/Food/skewer.rsi/skewer-rat.png | Bin 0 -> 433 bytes
 .../Food/skewer.rsi/skewer-rat1.png           | Bin 394 -> 0 bytes
 .../Food/skewer.rsi/skewer-rat2.png           | Bin 400 -> 0 bytes
 .../Food/skewer.rsi/skewer-snake.png          | Bin 0 -> 383 bytes
 .../Food/skewer.rsi/skewer-snake1.png         | Bin 382 -> 0 bytes
 .../Food/skewer.rsi/skewer-snake2.png         | Bin 412 -> 0 bytes
 .../Food/skewer.rsi/skewer-tail-cooked.png    | Bin 0 -> 512 bytes
 .../Food/skewer.rsi/skewer-tail-cooked1.png   | Bin 449 -> 0 bytes
 .../Food/skewer.rsi/skewer-tail-cooked2.png   | Bin 445 -> 0 bytes
 .../Food/skewer.rsi/skewer-tail.png           | Bin 0 -> 519 bytes
 .../Food/skewer.rsi/skewer-tail1.png          | Bin 459 -> 0 bytes
 .../Food/skewer.rsi/skewer-tail2.png          | Bin 452 -> 0 bytes
 .../Food/skewer.rsi/skewer-tomato1.png        | Bin 189 -> 0 bytes
 .../Food/skewer.rsi/skewer-tomato2.png        | Bin 190 -> 0 bytes
 .../Food/skewer.rsi/skewer-tomato3.png        | Bin 190 -> 0 bytes
 .../Food/skewer.rsi/skewer-tomato4.png        | Bin 189 -> 0 bytes
 .../Consumable/Food/taco.rsi/beeftaco.png     | Bin 303 -> 0 bytes
 .../Food/taco.rsi/beeftacosupreme.png         | Bin 307 -> 0 bytes
 .../Consumable/Food/taco.rsi/chickentaco.png  | Bin 308 -> 0 bytes
 .../Food/taco.rsi/chickentacosupreme.png      | Bin 309 -> 0 bytes
 .../Consumable/Food/taco.rsi/fishtaco.png     | Bin 286 -> 0 bytes
 .../Consumable/Food/taco.rsi/meta.json        |  21 +---
 .../Consumable/Food/taco.rsi/rattaco.png      | Bin 329 -> 0 bytes
 .../Consumable/Food/taco.rsi/tacoshell.png    | Bin 283 -> 0 bytes
 .../Food/taco.rsi/tacoshell_back.png          | Bin 0 -> 171 bytes
 .../Food/taco.rsi/tacoshell_forward.png       | Bin 0 -> 294 bytes
 67 files changed, 141 insertions(+), 319 deletions(-)
 create mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-bluepepper.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn1.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn2.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha1.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha2.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha3.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha4.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat1.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat2.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat3.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat4.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom1.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom2.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom3.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom4.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper1.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper2.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper3.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper4.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat1.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat2.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-snake.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-snake1.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-snake2.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked1.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked2.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail1.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail2.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato1.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato2.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato3.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato4.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftaco.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftacosupreme.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentaco.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentacosupreme.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/fishtaco.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/rattaco.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell_back.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell_forward.png

diff --git a/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs b/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs
index 343fd159e14..4019184af33 100644
--- a/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs
+++ b/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
 using Robust.Client.GameObjects;
+using Robust.Shared.Utility;
 
 namespace Content.Client.Nutrition.EntitySystems;
 
@@ -38,21 +39,25 @@ private void UpdateFoodVisuals(Entity<FoodSequenceStartPointComponent> start, Sp
             if (state.Sprite is null)
                 continue;
 
-            counter++;
-
             var keyCode = $"food-layer-{counter}";
             start.Comp.RevealedLayers.Add(keyCode);
 
-            var index = sprite.LayerMapReserveBlank(keyCode);
+            sprite.LayerMapTryGet(start.Comp.TargetLayerMap, out var index);
+
+            if (start.Comp.InverseLayers)
+                index++;
 
-            //Set image
+            sprite.AddBlankLayer(index);
+            sprite.LayerMapSet(keyCode, index);
             sprite.LayerSetSprite(index, state.Sprite);
             sprite.LayerSetScale(index, state.Scale);
 
             //Offset the layer
             var layerPos = start.Comp.StartPosition;
-            layerPos += start.Comp.Offset * counter;
+            layerPos += (start.Comp.Offset * counter) + state.LocalOffset;
             sprite.LayerSetOffset(index, layerPos);
+
+            counter++;
         }
     }
 }
diff --git a/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs
index ae8215ac6ae..731166ace44 100644
--- a/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs
@@ -1,4 +1,5 @@
 using System.Numerics;
+using System.Numerics;
 using System.Text;
 using Content.Server.Nutrition.Components;
 using Content.Shared.Chemistry.EntitySystems;
@@ -121,6 +122,12 @@ private bool TryAddFoodElement(Entity<FoodSequenceStartPointComponent> start, En
         if (!_proto.TryIndex(elementProto, out var elementIndexed))
             return false;
 
+        if (TryComp<FoodComponent>(element, out var elementFood) && elementFood.RequireDead)
+        {
+            if (_mobState.IsAlive(element))
+                return false;
+        }
+
         //if we run out of space, we can still put in one last, final finishing element.
         if (start.Comp.FoodLayers.Count >= start.Comp.MaxLayers && !elementIndexed.Final || start.Comp.Finished)
         {
diff --git a/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs b/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs
index af1d2832bdd..a3955001328 100644
--- a/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs
+++ b/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Nutrition.Prototypes;
 using Content.Shared.Tag;
@@ -22,4 +23,10 @@ public sealed partial class FoodSequenceElementComponent : Component
     /// </summary>
     [DataField]
     public string Solution = "food";
+
+    /// <summary>
+    /// state used to generate the appearance of the added layer
+    /// </summary>
+    [DataField]
+    public SpriteSpecifier? Sprite;
 }
\ No newline at end of file
diff --git a/Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs b/Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs
index 4e53c6ccd4b..d13c0994ef6 100644
--- a/Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs
+++ b/Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs
@@ -111,6 +111,9 @@ public sealed partial class FoodSequenceStartPointComponent : Component
     [DataField]
     public Vector2 MinLayerOffset = Vector2.Zero;
 
+    /// <summary>
+    /// LocId with a name generation pattern.
+    /// </summary>
     [DataField]
     public bool AllowHorizontalFlip = true;
 
diff --git a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
index 970ea4dfc82..35aa7531f03 100644
--- a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
+++ b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
@@ -83,48 +83,23 @@ food-sequence-content-snail = snail
 food-sequence-burger-gen = {$content}burger
 
 food-sequence-burger-content-raw-meat = raw
+food-sequence-burger-content-meat = meaty
 food-sequence-burger-content-carp = carpo
 food-sequence-burger-content-bear = bear
 food-sequence-burger-content-crab = crabs
 food-sequence-burger-content-penguin = peng
-food-sequence-burger-content-chiken = chiken
-food-sequence-burger-content-duck = duck
 food-sequence-burger-content-corgi = corgi
 food-sequence-burger-content-goliath = goli
-food-sequence-burger-content-dragon = dragon
 food-sequence-burger-content-rat = rat
 food-sequence-burger-content-lizard = lizzy
 food-sequence-burger-content-plant = plant
 food-sequence-burger-content-rotten = trash
 food-sequence-burger-content-spider = web
-food-sequence-burger-content-clump = clump
-food-sequence-burger-content-snake = snake
-food-sequence-burger-content-xeno = xeno
-food-sequence-burger-content-tomato = tomato
-food-sequence-burger-content-salami = salami
-food-sequence-burger-content-clown = clown
-food-sequence-burger-content-slime = slime
-
-food-sequence-burger-content-pea = pea
-food-sequence-burger-content-banana = banana
-food-sequence-burger-content-mimana = mimana
 food-sequence-burger-content-carrot = carro
 food-sequence-burger-content-cabbage = cabba
 food-sequence-burger-content-garlic = garli
-food-sequence-burger-content-lemon = lemon
-food-sequence-burger-content-orange = orange
 food-sequence-burger-content-pineapple = pine
-food-sequence-burger-content-potato = potato
-food-sequence-burger-content-apple = apple
-food-sequence-burger-content-cocoa = cocoa
-food-sequence-burger-content-corn = corn
 food-sequence-burger-content-onion = oni
-food-sequence-burger-content-mushroom = shroom
-food-sequence-burger-content-chili = chili
-food-sequence-burger-content-chilly = chilly
-food-sequence-burger-content-aloe = aloe
-food-sequence-burger-content-poppy = poppy
-food-sequence-burger-content-lily = lily
 food-sequence-burger-content-ambrosia = ambro
 food-sequence-burger-content-galaxy = galaxy
 food-sequence-burger-content-glasstle = glass
diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml
index 7b5b87d7865..ca24012e956 100644
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@@ -270,3 +270,39 @@ BookChefGaming: BookHowToCookForFortySpaceman
 
 #2024-06-29
 IntercomAssesmbly: IntercomAssembly
+
+# 2024-07-7
+SignScience1: SignScience
+SignScience2: SignScience
+SignXenobio2: SignXenobio
+SignXenolab: SignXenobio
+SignToxins2: SignToxins
+SignMinerDock: SignShipDock
+SignChemistry1: SignChem
+SignChemistry2: SignChem
+SignCourt: SignLawyer
+SignAtmosMinsky: SignAtmos
+SignDrones: SignMaterials
+SignShield: null # what was this even for?
+SignHydro2: SignHydro1
+SignHydro3: SignHydro1
+
+# 2024-07-27
+LogicGate: LogicGateOr
+
+# 2024-08-11
+FoodTacoBeef: FoodTacoShell
+FoodTacoChicken: FoodTacoShell
+FoodTacoFish: FoodTacoShell
+FoodTacoBeefSupreme: FoodTacoShell
+FoodTacoChickenSupreme: FoodTacoShell
+FoodTacoRat: FoodTacoShell
+
+FoodMeatHumanKebab: FoodKebabSkewer
+FoodMeatLizardtailKebab: FoodKebabSkewer
+FoodMeatRatKebab: FoodKebabSkewer
+FoodMeatRatdoubleKebab: FoodKebabSkewer
+FoodMeatSnakeKebab: FoodKebabSkewer
+FoodMeatHawaiianKebab: FoodKebabSkewer
+FoodMeatKebab: FoodKebabSkewer
+FoodMeatFiestaKebab: FoodKebabSkewer
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml
index 193a3a7db3a..11abd00b275 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml
@@ -30,9 +30,6 @@
       - FoodBurgerChicken
       - FoodBurgerDuck
       - FoodBurgerCheese
-      - FoodMeatHawaiianKebab
-      - FoodMeatKebab
-      - FoodMeatFiestaKebab
       - FoodNoodlesBoiled
       - FoodNoodles
       - FoodNoodlesCopy
@@ -77,11 +74,6 @@
       - FoodBurgerSpell
       - FoodBurgerSuper
       - FoodBurgerCrazy
-      - FoodMeatHumanKebab
-      - FoodMeatLizardtailKebab
-      - FoodMeatRatKebab
-      - FoodMeatRatdoubleKebab
-      - FoodMeatSnakeKebab
       - FoodPizzaArnoldSlice
       - FoodPizzaCorncobSlice # Nyanotrasen - Corncob Pizza
       - FoodTacoRat
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index b45d8e01b12..a9cad4d7a70 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1828,6 +1828,10 @@
   - type: Item
     size: Tiny
     heldPrefix: 1
+  - type: FoodSequenceElement
+    sprite:
+      sprite: Mobs/Animals/mouse.rsi
+      state: dead-1
 
 - type: entity
   parent: MobMouse
@@ -1857,6 +1861,10 @@
   - type: Item
     size: Tiny
     heldPrefix: 2
+  - type: FoodSequenceElement
+    sprite:
+      sprite: Mobs/Animals/mouse.rsi
+      state: dead-2
 
 - type: entity
   name: cancer mouse
@@ -3463,6 +3471,15 @@
   - type: FireVisuals
     sprite: Mobs/Effects/onfire.rsi
     normalState: Mouse_burning
+  - type: FoodSequenceElement
+    sprite:
+      sprite: Mobs/Animals/hamster.rsi
+      state: dead-0
+    entries:
+      burger:
+        name: food-sequence-burger-content-hamster
+      taco:
+        name: food-sequence-content-hamster
 
 - type: entity
   name: pig
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
index 282bf14aadb..58eb02f595a 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
@@ -33,6 +33,8 @@
   name: bottom bun
   description: It's time to start building the burger tower. 
   components:
+  - type: Item
+    size: Normal #patch until there is an adequate resizing system in place 
   - type: Food
   - type: Sprite
     drawdepth: Mobs
@@ -40,6 +42,7 @@
     sprite: Objects/Consumable/Food/burger_sequence.rsi
     layers:
     - state: bun_bottom
+    - map: ["foodSequenceLayers"]
   - type: FoodSequenceStartPoint
     key: Burger
     maxLayers: 10
@@ -54,6 +57,7 @@
     solutions:
       food:
         maxVol: 5
+        canReact: false # Dont want cause reactions inside burgers after merging ingredients
         reagents:
         - ReagentId: Nutriment
           Quantity: 3.3 # 1/2 of a bun
@@ -980,4 +984,4 @@
   - type: Tag
     tags:
     - Meat
-    
\ No newline at end of file
+    
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
index ffb52a7b0ff..041dbd84767 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -569,6 +569,15 @@
   - type: Tag
     tags:
     - Slice
+  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Consumable/Food/ingredients.rsi
+      state: chevredisk
+    entries:
+      burger:
+        name: food-sequence-content-chevre
+      taco: 
+        name: food-sequence-content-chevre
 
 - type: entity
   name: tofu
@@ -617,6 +626,15 @@
   - type: Tag
     tags:
     - Slice
+  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Consumable/Food/ingredients.rsi
+      state: tofu
+    entries:
+      burger:
+        name: food-sequence-content-tofu
+      taco: 
+        name: food-sequence-content-tofu
 
 - type: entity
   name: burned mess
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index 6b7dc94b070..8d650f26652 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -629,6 +629,15 @@
     damage:
       types:
         Blunt: 2
+  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Consumable/Food/salami.rsi
+      state: salami
+    entries:
+      burger:
+        name: food-sequence-content-salami
+      taco:
+        name: food-sequence-content-salami
 
 - type: entity
   name: meat clown
@@ -1086,6 +1095,9 @@
     graph: LizardSteak
     node: lizard steak
   - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Consumable/Food/meat.rsi
+      state: lizard-cooked
     entries:
       Burger: MeatLizardBurger
       Taco: MeatLizard
@@ -1612,6 +1624,9 @@
     graph: LizardCutlet
     node: lizard cutlet
   - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Consumable/Food/meat.rsi
+      state: cutlet-cooked
     entries:
       Burger: LizardCutletBurger
       Taco: LizardCutlet
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
index a42f3e22a18..abafdb33593 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
@@ -1,40 +1,6 @@
 # When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_single.yml
-# Base
-
-- type: entity
-  parent: FoodInjectableBase
-  id: FoodSkewerBase
-  abstract: true
-  components:
-  - type: Food
-    trash: 
-    - FoodKebabSkewer
-  - type: Sprite
-    sprite: Objects/Consumable/Food/skewer.rsi
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 10
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 8
-  - type: Item
-    size: Small
-    storedRotation: -90
-
 # Kebabs
 
-# Thoughts on custom kebab system. Kebab items are separated into layers. Only
-# cutlets and specific items should be put on skewers, which is why i've tagged the cutlets
-# among other reasons. The system would specify between large and small skewer items, since
-# there is only so much space the sprite can hold. There are four "spots" on the skewer for
-# items, which means only 2 large items at a time can be on one. For examplehe thought it
-# you can put two lizard tails on a skewer with two cutlets inbetween.
-# This system of layers and spots also means that skewers can be progressively "eaten", meaning
-# that layers are made invisible as it gets eaten.
-
-# NOTE: Rats take up spots 2 and 4 and tails take up 1 and 3. This is important for sprite layering.
-
 - type: entity
   name: skewer
   parent: BaseItem
@@ -83,75 +49,9 @@
     tags:
     - Trash
     - Skewer
-
-# Custom Kebab Example
-
-- type: entity
-  name: Hawaiian kebab
-  parent: FoodSkewerBase
-  id: FoodMeatHawaiianKebab
-  description: A delicious kebab made of pineapple, ham and green peppers.
-  components:
-  - type: Sprite
-    layers:
-      - state: skewer
-      - state: skewer-meat-alpha1
-        color: yellow
-      - state: skewer-meat-alpha2
-        color: brown
-      - state: skewer-meat-alpha3
-        color: green
-      - state: skewer-meat-alpha4
-        color: brown
-  - type: Tag
-    tags:
-    - Meat
-    - Fruit
-
-- type: entity
-  name: meat kebab
-  parent: FoodSkewerBase
-  id: FoodMeatKebab
-  description: Delicious meat, on a stick.
-  components:
-  - type: Sprite
-    layers:
-      - state: skewer
-      - state: skewer-meat1
-      - state: skewer-meat2
-      - state: skewer-meat3
-      - state: skewer-meat4
-  - type: Tag
-    tags:
-    - Meat
-
-- type: entity
-  name: human kebab
-  parent: FoodMeatKebab
-  id: FoodMeatHumanKebab
-  description: Human meat. On a stick!
-
-- type: entity
-  name: lizard-tail kebab
-  parent: FoodMeatKebab
-  id: FoodMeatLizardtailKebab
-  description: Severed lizard tail on a stick.
-  components:
-  - type: Sprite
-    layers:
-      - state: skewer
-      - state: skewer-tail1
-
-- type: entity
-  name: rat kebab
-  parent: FoodMeatKebab
-  id: FoodMeatRatKebab
-  description: Not so delicious rat meat, on a stick.
-  components:
-  - type: Sprite
-    layers:
-      - state: skewer
-      - state: skewer-rat1
+  - type: Food
+    trash: 
+    - FoodKebabSkewer
   - type: SolutionContainerManager
     solutions:
       food:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml
index f34e7a8365c..2a83b14d037 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml
@@ -9,13 +9,17 @@
   - type: Item
     storedRotation: -90
   - type: Food
+    transferAmount: 3
   - type: Sprite
     sprite: Objects/Consumable/Food/taco_sequence.rsi
     layers:
-    - state: tacoshell
+    - state: tacoshell_back
+    - map: ["foodSequenceLayers"]
+    - state: tacoshell_forward
   - type: SolutionContainerManager
     solutions:
       food:
+        canReact: false # Dont want cause reactions inside tacos after merging ingredients
         maxVol: 10
         reagents:
         - ReagentId: Nutriment
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 5206421630b..5ad493a6515 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -1764,98 +1764,6 @@
     Nitrogen: 10
     Plasma: 10
 
-# Kebabs
-- type: microwaveMealRecipe
-  id: RecipeMeatKebab
-  name: meat kebab recipe
-  result: FoodMeatKebab
-  time: 5
-  solids:
-    FoodMeatCutlet: 3
-    FoodKebabSkewer: 1
-
-- type: microwaveMealRecipe
-  id: RecipeHawaiianKebab
-  name: Hawaiian kebab recipe
-  result: FoodMeatHawaiianKebab
-  time: 5
-  solids:
-    FoodChiliPepper: 1
-    FoodMeatCutlet: 1
-    FoodPineappleSlice: 1
-    FoodKebabSkewer: 1
-
-- type: microwaveMealRecipe
-  id: RecipeFiestaKebab
-  name: fiesta kebab recipe
-  result: FoodMeatFiestaKebab
-  time: 5
-  solids:
-    FoodChiliPepper: 1
-    FoodCorn: 1
-    FoodMeatCutlet: 1
-    FoodTomato: 1
-    FoodKebabSkewer: 1
-
-- type: microwaveMealRecipe
-  id: RecipeRatKebab
-  name: rat kebab recipe
-  result: FoodMeatRatKebab
-  time: 10
-  solids:
-    FoodMeatRat: 1
-    FoodKebabSkewer: 1
-
-- type: microwaveMealRecipe
-  id: RecipeDoubleRatKebab
-  name: double rat kebab recipe
-  result: FoodMeatRatdoubleKebab
-  time: 20
-  solids:
-    FoodMeatRat: 2
-    FoodKebabSkewer: 1
-
-- type: microwaveMealRecipe
-  id: RecipeHumanKebab
-  name: human kebab recipe
-  result: FoodMeatHumanKebab
-  time: 15
-  solids:
-    TorsoHuman: 1
-    FoodKebabSkewer: 1
-
-- type: microwaveMealRecipe
-  id: RecipeLizardKebab
-  name: lizard kebab recipe
-  result: FoodMeatLizardtailKebab
-  time: 15
-  solids:
-    FoodMeatLizard: 1
-    FoodKebabSkewer: 1
-
-- type: microwaveMealRecipe
-  id: RecipeSnakeKebab
-  name: snake kebab recipe
-  result: FoodMeatSnakeKebab
-  time: 15
-  reagents:
-    Wine: 5
-  solids:
-    FoodMeatSnake: 1
-    FoodKebabSkewer: 1
-
-- type: microwaveMealRecipe
-  id: RecipeFoodMealSoftTaco
-  name: soft taco recipe
-  result: FoodMealSoftTaco
-  time: 10
-  solids:
-    FoodDoughSlice: 1
-    FoodTomato: 1
-    FoodOnionSlice: 2
-    FoodCheeseSlice: 1
-    FoodMeatCutlet: 1
-
 - type: microwaveMealRecipe
   id: RecipeFoodBakedChevreChaud
   name: chevre chaud recipe
diff --git a/Resources/Textures/Mobs/Pets/hamlet.rsi/dead-0.png b/Resources/Textures/Mobs/Pets/hamlet.rsi/dead-0.png
index cea6149d7eca6c30707a84c927e3e394c049c32b..b039878382953dea274e53f140b31715c1ad17ad 100644
GIT binary patch
delta 367
zcmV-#0g(RpmH~+akR*Qrb5ch_0Itp)=>Px$LrFwIR9J=Wl&??2KorM6H;N-!rcfhY
z#t(zQU<QU{f*_EX1r{8JWEMh#=Py7I6csq+1OyZsyN$pFR3*tA-5#R30io?~fFR*M
zve$Rt&%JjoI2;bge@EHASX=NU>3MJ$S?`gAXB%GiqqHr=NEm;~QKW_nWQRk%=1JHU
z&dy)a9SsLFVk?nLTj;j~xjJn~*cBdMvOTMQL~Xu@?r3gKN`&3SX(f_rS)CpefJ#wO
z%0~l{Qa-&S^`iiQ&5gR%C{m9mEs?{WaR6?g1@NqbbF(!7`t5*lZA&iidzlic0%}ev
zh`UfJs)2;zql{+>H^HMYv_-n9#b5OYGLsW=NxASYGPT}dWqI*S?bE{&ruN$cX&9Mu
zAs*4*{_ZCU+dJ^1pNMX1xjy#UzCf7^YZx~BUqf1A|IIlZ4u|6}@&=8keqNn0Y!Cnd
N002ovPDHLkV1lmcq38er

literal 19319
zcmeI4e~es39l&4tVSh-mKuKF9x@=W2@NVbLydN{m-opK8xdyMC?ICTW$h?_(cMEsB
z%kCa`tx+kclplX6F@m%S6bwXBek7s=qb&i!7-Ec(pd!X7n1DpkAVrD6@7sNQyEk|D
zdaP?=%-iH{cji0a@67vrzw@0Ro9vAvTQ6F@>Wo!}VXWRVG`J1kQ{mr=_rU+^o;`2C
z+sg9L&Z=R&_q6bDnQ_N~^@g!!Utx4dZO8D(vZ6HE!)3`=Ju{PKXl)p|3uek(T%~F$
zUyT)tz3JC}a5$YR$lmm2&M+D-52*3N(4LCgzGv&G*mIR&GJQdQRc<B=1}0UFr)DN6
ziq-5)Z@O+b3!lU4OgdF>QoE`*-4}M4+A%zm8Yop%%IR@Ufm|=;u^!9uJli`jg^}fC
z5Xlf^Vv@B{*2bymmCmn%Pq~T=vfBnXN8LfGH$7gfm9v@5^z?MkH0dc-#xfRTEQ4?c
zV-s4K)!oG!pD~NojSVABJA<k!Dur^bP%5TEyWB5L)q2zEu%p>m^jwqW*^Y|Uh#gSO
z%<yu?>Oq->l%$x|DNj`<>O+$vqbAg(D%Pr?XDz5#9xv5O)$!6IUCxRZ?HGJAJUrX?
zg5#Z>T(IkEZPPV?AVRvJW_5ITS!K4VYH6w>)TV3TQ8q60^tD3Ja?Tt}p=8mqtC_+g
zYN4c|Ru6@ShjQ?&*@24UwNhoYRGP>)qHLszFf}kxkE+x;mlcY#G+q5@E~Bfo{N1vq
z26;{8F@g}XEE9X97S1{rgygO^{YE2AeYhkG!S1FyF_CLpY}A5q_Ogz1F0!%+HEguC
z)NR1jk-Wy2WTm}rn;j{#L8&syYx%+?A5)ofaV(c<RkpR94XEruX`)ntVW~XHWfrPl
zP;0OxroxEsD+*NwKUCZN1751n*?vAYx3(#mDCDipw7;J@WRp!8?H{oEaDSicxDM*;
zV=mrIbD3~<Lc><?k@KVaM#_;TQIOfzsF4s{VGLQurJ)y<G<^jBgsYInh)od_9h$a~
z@;xWurmGyMVVVoaGZ`n2V79=D+nt)WcmS4tQ%d4DOjF;ICd32r5pe}}tWHg1kGp{d
zrUey|X)9o6U^_OZ#PXTzb!eJ+#6tmNrgB9PnHGRX*i2CzNEc(jL(?|L5(QkD%*HA*
z9T057gK&wFtq|&zwF6|Si;<~3+wShDJxRcS76;QJiV$A`AK_7tV;pc|;SPaN+X6>X
zh-T$Cfhb5)z9*qWOjzJ_%9={-DeQ9-$)N5=WpWBLh%t&0VTcgcDQkwYR5o|Q;ERCJ
zE(ITxLMh~82tMU?*Nsd`68K;hoY$O<U1BXP+i|EXU=u`|IRv}53E?gkaT!rWbr>Nc
zpuX)h66O#Z0qIf>kwkExNMTYQL^*`pf}7MK7-LHy;MC!$AxSW9sQ}z4qkK)fltUzk
z9K<|kGD}53d>@Li1P~u%$7NopNmcs7mlEOsLcUg(Qq<*j*3qcD#ac1JZ3&r)*$(P%
zQdOK#Y(c(;wK1BF-C7$JSH2W5WgtSDqwZ3KC}~T~X%NPBw^=KKE#C$=22K>$oO{^h
z4&*~BX<%8MZgEsVJx4-<b`^~lu&%KVl<P2?o5bVMiVmv)G8yH}fz_TWE<2p)0k$xq
z5ZAT~zN~M|ID++t21q%C2<-VCn|3fPRIn7l0HdV(?ngaVfHOs7H(CE^!N!Xt8zL?U
zT+{Y}f-e*^eJ6nFiC~wxgpH(b6xL}@x$Bz5aRV@F!zzm?F{vdLhYcjP>9Lnu-KZ-m
z5Olfe`Ecy8ZAX~Qfylr_1TtKJB|SD--6)e5_o?fdn8AL-4qV6@*!E1t9oSAvIJjHK
z-bd?317yKA8Me8M!=$jK4f_|1NYf*>1yd3FT*6*-o>9gW7?!Z3mGJo75+?UtX<E`z
zJTx14$6iw5bl4-|AmRJS7c#I+9)Pc<V+XJe@?iqFJ`&&@MJ?x;6QF4<a4gAe@Co)Q
zHysY!P1qJw)5Wfk2)5%MV@o&2DV$4%WxAjS!wXZ32LJ<ta3BzdsDk6$LT9E%?cB3i
z`#~@6Bp05IhljIUiq#s2gWi_GeE4t$AO%A~KIAf!P#4b1+{Pw#A*cgb3LxTqnA>js
z#5-5Lb()JzH+u)u3!mt)@(~Su9KW<Q#@S|UUPqTy3UJ58C)(OH9p$^e4`EIqa3C%f
z0!MMjCNN9kkzmuV2!owMql*R1%<F2X5T1y4&po=<PsH2R)pKiGC*t~TRGC+*D!gmy
zO*b!FX0NXr$KU7>T)(r)auMER<wbZEqF|EGscj8wRx{UVP?+z|r6HK7zIY$g<EpsG
zRZ7E3y}{!8)lyKK<`va92A2#=x!`G7ovWssUwDFa#RpY>&41<r#xPZ$r_8`{sp)as
zF?|}qtU_>#vW16W8{717n*;Sn3?HTqaQkHz$zm^yUAW9@Yp}TfT$D?=Vq1y_TEi3L
zyf~(0KGPgdvqB%y|FYATmIWJN-j&l9yF&aw@La>6b2DKxyUx#?x$xpR3t1P^0Iz2|
zNX7H&S~1gTzaz|^6I1o}9!BuWSmFOjwOy>M?u=J$7wf7m%}a}gS|09t>I2oP+qA;l
z?Z*A<cK9Mj<z2@iu)ol&b&Zk2jGEXnSb+Q2YMB2C^i<c;1q&+fTuiY|5GgiX)%KN1
zeer74!WS~|T~KEB%b<Dd+U%;+%@3_7>ZVoAR?>+EB)*v7isz$A6I>dQ_+o-9o{uI?
zaA`o|iwUlHKAJSar2&aACb;7HXwn3i1|+_i;ELy?NfTTekoaPPE1r)gO>k*I;)@Bc
zcs`mm!KDF-FDAI+`DoGvmj)!hnBa=%qe&B78j$#6f-9bnCQWc@K;nxDu6RD0G{L0-
zi7zI&;`wOO1eXRRzL?;O=c7pzTpE!0VuCB4k0woUX+YwO39fiPnl!<s0f{drxZ?R}
z(gc?VB)*v7isz$A6I>dQ_+o-9o{uI?aA`o|iwUlHKAJSar2&aA#^PGl`gtW)gx^$}
zh96JL{r=^f;fI$}Vrbj2VeI*^VO)E?Vf^DAcz@Y2rjTL0a)n`JZ#Rr}rCUG!<IRS#
ztgvOUZ*=B2uYT>}i=Vh~?Nf)JJFtJvfdi{nZvNDnj~!aO?yT$IT7KvRv)FUp{pmyJ
zpHJ7GO%Ac_Ia6!a-S)sEH!a_~;foXZ=5LreYwt%U@BZ@RpD91_*T1~*_6si@y}bXK
zTe9ETd&ltc<HqWd^RFGcWZyY|d}EhCaogYCKIQbuUH3kEWA29MPJMOP$1h)h?urxH
z%5SZ`@ajtH&6OwjKlReHXTLad+|xII^2GE#dmkLT^R=Fn>52`d58jP_{z!V}+>Jju
z_~d7w+q~uzZ{Iue&mZnv@qj?aclV$0{4J-hdH$KhU-{WL-)H>lcds0I?V{10$LFrd
z|9by2Blja>SeO3csax+Wu6g`VCm(;;m6twr=52fby#BYvZO0uvZ}mO5-v8w1w|(iS
zkBvR}ko)aBx3AA#aPik)`rd|vM_>QK-yeDQ;fD|Z;=+TkA6Osop3mL=#6AByY4G&b
zUp>w+c5i%iy2y{7@r@JifAvi@sNR3d?QFyLr%$?R-F-(7*hBA}cBQfUu4VR-!^_|L
dfbrso4uAibM~*xb{xsH>O<M;a=)dB+e*+0$B$WUF

diff --git a/Resources/Textures/Mobs/Pets/hamlet.rsi/splat-0.png b/Resources/Textures/Mobs/Pets/hamlet.rsi/splat-0.png
index f9ab920ac6855d9d6cdef79d484c9412175d325d..3f11164a42b9ac5b8ee630786b740adeab285fdd 100644
GIT binary patch
delta 482
zcmV<80UiE@mjU|&kR*Qrb5ch_0Itp)=>Px$wMj%lR9J=Wl(9=AQ4oi}mpr58Sty)(
z5Wy&jccf56O>+<|?hmjDr<OK?ts=PBT3cKp*QKzt6jZcW71Tn+;xr!aDS{C}glG|C
z#v)`fxEnVd*U0;-W#`TOes5-W!C){L-U}9p1yXCC3VJXV*PegHV+RE<GlA;{I+%)U
zNk(4_0jxRNHIa#H*Hlmw`d`EWlF<TdXtFtBb?Ff&<1jlL1CP#l5%LQZPtvmfYf7>?
z;p|SsW9fa~j(D0#^*rHZ95xr*$>t>RPE>7EvLh@2gKdiT4}}WxNFrZ)kjg4!^JxIS
zkBqsav8w3!jzE8oMdl{z0N6bjT8|<e)W_U-@6H*afd|(>Svb_00-$)3X87AEiPNWQ
zcl0-)x|D)a7ZM*8`}ajO@TIYt!`o}}P5p%IEh0mCSG+7-3%)y0W^v&U$}VuzP#Wjq
z?X_#-@^cXsY}k9gxo;8ZQ?Wo45LSxImTs=<egp8Jq5oQwV*5gvo|)upqR-6<x&wiK
z7?#IIkFPjv{EYH<8SIX5MXWsgYT`8+@G~@bEd1#5FZ16Fyfk8gvOGHUmbk%SFc<)y
Y0d(S@1T;dW)c^nh07*qoM6N<$f~I5PZU6uP

literal 19333
zcmeI44Qw366@WKDiwOlHPzkg|y&6R=g7xjp?9c3RcCdX(W55s+BNCuZW@l#YQ|!Cr
z?i~N{mxiVgKtQX40MU>NN-0SEr9o;?fe0*qq_i}usun1U2&zRJm9!v8D++ykKlXWi
z-nhqARjak+yPJ9Q-pqb)=FOWq>9(!9=o=?2{L(^A(@yAFnOY6+vEaYu^YB_2AO8T}
zj?1lFSJ1TMPYM1PX!qWCnx^&W>AtnawY?W6cy_3biL58vMu&3HTGNutMstjBl*O1Q
z`_q~B*7u%yt~Hhx?X8zty+&`YTMndGj_2i?@r(NS_(txE)@2<FlcNbRFeHmCHaawz
zDI`YQTT6Bm@HwcCx5i3MiW}QoJA)2mYkOD4y0dv1v)XK(8@3a3+%{x6j_I5e!v?bA
z28k0x$0T7I2@}UEf2|!0;Zrg%{KV?iib{7-YHuAV7ITSsd}L&#ZG^OC^Zjw;x^CRS
zag23np%=z7MK-Eu3TKv$RPCf>f#=h?Vmh0N1$LR29WJ)Fwgw$d{Z*c8C^ywnrchxA
z6yu{T7e{SIyq=QaQ#!ff{9tKlg2&~c9Fm!00rXH^z1%>ym@N!s=jd`uJZHz?liuE`
zzUz*6XsB-2h2ru}fS`i3u4bWcEGOfuWg$D9=W_Wbc$72iJ$*6lPdjIZr9d+0*yU(?
z4z)m1Rx3?~vWJrJtcmWtWW{X0FPk0gD9^H0RfMtb?$WG^ef_d@Mr20{XC>pR%Cx_y
zt;rNC$_{M66hcVHP9MSv3&E7Uyhgv=NKx<2inKpgRVTV(>&WdxFr8@v;j;~tFpRQ|
znwF{!SUQ3g*}SaOwym)vc*4)-hgh*AJ;eHDJeTQD#-}T5T24)<M0a*Dn}=b^4w8)5
ztFEh+%JSi0Mt5eoEPx*hHU0rFmDX$*>z`R$6%3|3&<fhs<yvI9NnG01jXH5xr)}Am
z(b?(Rcm++ygVhNQr+cqBzfxZgIU>u`A~8K`gL5V^hA3mxz>8Aoo&hi1mIiW(Ne!1b
zXc`&Pb1a|fwzRCWX~r!_cNwv`YjP}^*{Es6e6Z~4LJ+TPntDj+Fdv9#5SwEQHEJ3=
z%=QtO=9E`VBj441(=st7$a8I{LDR$`j^VqmE^Y2tOmjfPO;=Lv3mapvLDMF~!tj~Y
zT@%ZSX`f&n9)t;On9?vBWo-djYGXr}j%hY`)Q%wFKg7T^ugnln0w3;Bhhgk9f^dUC
zsENQ)6lSyZsz4+JDbEqmAttVGHOiU_>`3e}-4K4sjZ$Y6R*>sbY!KHV#BG$di?NU<
zvx3Q20YaNJ`CP%JG;9o$Pdd$YqbmjRJ+KPStFFc-vF6CMENXK|f=D%nVB6GTx(i8c
zmq;QToFUw&p6R(Hh#|BBq)9PE5Y9XzxK5d0i6PA7Os5vX7$a@~rv^t2LBeH7`rt-U
ziPyAAF+?zkL9XNKE|L`>o(DzP0*HsPWxGzJK~;F%6T-m%fp{&El+<P=)|F8=i?wt)
zGX+E@*R+i0235(VCpgS&aAVbUliVnUDKMjcF!`DdL=ucV6IlCJW%4oRV4YbIw5Xsy
zLXGAj(x;9kAd1?OR(6?YB@5D*w&j{kCl0G@yAY}k-KEU6U`wWwi3V4rj}aymCZB18
zFH6}IGhkDoz9B6_ICi{-O<Ndt6NuL^z)Ix%_eb5IhQz;|@|8X!$c~s{!i@8MTQ@zR
z;Bo2dp5?<DG9VS4N4BRLh0T;vX4^WkY#)r8uoW7V=oAUbAj_jBJ@S628np!lf;Q6~
z56%XrX>r}PU}j*#eG%-Ef*zTyYSa~odDM1v>_Spt`Zg?WY&yDR7UX;aPS@zj$*yYD
zHxT5qkc+wu7KJHHNHP!+x<gC^OA-2<N5VMEsOw5FEFkR^@c0aIojJD9k+38S%=*re
z_dPhmwF$`fJ<ssC@R81Z@U^f^A958B7J%&;9GoL5vW~a_s>XZ^3D*RlV2?80VvrL;
z?n-qV+guosGdr$3e`Aco;gKWV1~nL75Lz4n=o16`+`ura;EYx8U{kK0d0?tNjfEYz
zf&*-CZ=xqtC^9&W^`tt2hf4z~8#XD!U`R){!6Cncp}2+#t|goxieNu*{nD{?ruy`e
zt75v^JD9G2?2?R7j38f!vr#1*s}t_Z<E$|@tD}qaX}E}DgEeicj*?h7#CM2pky6Aq
z0k93BgksYt%;p}%#p<)vF*B>HmFeKvIyUosSvt0^kyp*Eoj$gfu8eXlUy#9tNPBDb
zMr7)aseDGQoK#B}D+$Jf%cc$<+*e3g<TGlghc%^{EH_BccIW&M%u=7bkC6eHnd82r
zY^Bs-Zv8^mFOIOh?Cgh|fcf0Ql&#KGQ_a_3AWiW>fo=M19zdQiA^usqX-GqdNC^?w
z^G)4`1A{=s^t~Vx{wy9K34#-d!j02^&jSJLa_@YAW%{M)h*yVGt@vMZ+Wewm15TUk
zp6~y_bLB-iGZI##>+Hyx3~qN55OpC8uu`;xlhv%c={Zwwzcz@TgTtlv4u*}&h@;@O
zqFO6fRo8{9){0ftY0XPB>0$?5$dm@ERM%()SJ354(lzjHiR`c~i$H#%R;wDT(xY;4
zZ7L0yq=g{<6X>a=qYCOOuA57-Mo>{KyQ=1Ujnd{-u7z(+;0v4h)HgP>_O+>9r<ot7
zpQxEu6<bj!3Xt$(ge#nnB8_k<K*Ea=u5dnzG{U6-2`@&t!ucrD2$upRycppM=c7m?
zTndozVuUN4k0On5DL}%D5w37PiZsHd00}QfxWf4;(g>FVB)k~m3g@FpBU}oQ@M453
zoR1=na4A5-ixIAHK8iHLr2q*pM!3THDAEX*0wlZ`;R@%YNF!Vdknm!JE1Zuajc_SI
z!iy2Ea6XDO!leKSFGje+`6$u|mjWcb7~u-%qevrM3Xt$(ge#nnB8_k<K*Ea=u5dnz
zG{U6-2`@&t!ucrD2$upRycmjW;q-4H$qfAP(Fpv)(UM0~55un`#rVqAy_z<@RMR%!
zplN^q6yD#}v|&Tj{<J~U5_fCb;_Ua=Ppr_i1^aqZoqeOPAH3_i3%<-wduiFlf4evF
z^bK1-+0xRp)mwVQ^1+=gd-g2balsRt4zAAaYT34N^28JO?cKBYl2uQ>uxrbvmbZ62
z^!Bdh0}sZw{^qOO$If_r$>R3zThG7i>bnlS_0hF&O}_B{Ki_&`+avpadDCluY+2B?
zdC~KS*Qee&|CO=Vc1~`6(Vx8K@JZW`efgma_v^20Ipvr$orQPwp1$|RA3p!!(l<sI
zP5j`mJ3d~t_o%yfOstq#fUml7=@)+d)Khfi)^Gmop8GEB+Vk`6$31%P&fOo6U3r0&
z@7@3H1Fw%y-2AyNarMPd++wfycb|3Voymv)e2afz%Q5$)`WAev<J8^nC59*XyRWXh
z{-<lMIe6e4?SaQ%N~ZIV<mGY2E3A(mJ9_i3^{+m#_q46&_GF*Ce)#s6_kZu${ioiR
z+`D^;7=7o2cfayA{kreATZ{dZFX>&j=-E#n_clL!^+&&_$sPNw^IrVN`3EnZIQuWB
zKKtuV^ZoSVC(rm~({JAa;i1@v_g~hzVdC=1r{3H+_WUw&%uP2x@#&${uTMO!!7o)D
zN*(_2ihB+p+Ww;tj*tK3izk_9q&jcA?wJic@si2O<l1cmf7t%$wV%BC3;pOT?eW4J
zulC(;CPvQHuDc_-a@CD*rhj+xd54!RI_f*xSI=vC?KZkZ+qM5!r?jW80q?_)Xf3}e
K^;p-2E&l?VaZPpr

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json
index f52afc92a70..d4e98e98bd8 100644
--- a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json
@@ -11,91 +11,37 @@
       "name": "skewer"
     },
     {
-      "name": "skewer-meat1"
+      "name": "skewer-meat"
     },
     {
-      "name": "skewer-meat2"
+      "name": "skewer-meat-alpha"
     },
     {
-      "name": "skewer-meat3"
+      "name": "skewer-mushroom"
     },
     {
-      "name": "skewer-meat4"
+      "name": "skewer-pepper"
     },
     {
-      "name": "skewer-meat-alpha1"
+      "name": "skewer-bluepepper"
     },
     {
-      "name": "skewer-meat-alpha2"
+      "name": "skewer-tomato"
     },
     {
-      "name": "skewer-meat-alpha3"
+      "name": "skewer-corn"
     },
     {
-      "name": "skewer-meat-alpha4"
+      "name": "skewer-tail"
     },
     {
-      "name": "skewer-mushroom1"
+      "name": "skewer-tail-cooked"
     },
     {
-      "name": "skewer-mushroom2"
+      "name": "skewer-rat"
     },
     {
-      "name": "skewer-mushroom3"
-    },
-    {
-      "name": "skewer-mushroom4"
-    },
-    {
-      "name": "skewer-pepper1"
-    },
-    {
-      "name": "skewer-pepper2"
-    },
-    {
-      "name": "skewer-pepper3"
-    },
-    {
-      "name": "skewer-pepper4"
-    },
-    {
-      "name": "skewer-tomato1"
-    },
-    {
-      "name": "skewer-tomato2"
-    },
-    {
-      "name": "skewer-tomato3"
-    },
-    {
-      "name": "skewer-tomato4"
-    },
-    {
-      "name": "skewer-corn1"
-    },
-    {
-      "name": "skewer-corn2"
-    },
-    {
-      "name": "skewer-tail1"
-    },
-    {
-      "name": "skewer-tail2"
-    },
-    {
-      "name": "skewer-tail-cooked1"
-    },
-    {
-      "name": "skewer-tail-cooked2"
-    },
-    {
-      "name": "skewer-rat1"
-    },
-    {
-      "name": "skewer-rat2"
-    },
-	{
-      "name": "skewer-snake1"
+      "name": "skewer-snake"
     },
     {
       "name": "skewer-watermelon"
diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-bluepepper.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-bluepepper.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a4809ef4aee620b9fbca6df8bb0f8b0a654828b
GIT binary patch
literal 274
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}XFOdTLn2y}
z6C_v{Cy4Yk1sZU%Nf=C8teHLk;D3W<oElYYdrwJ3{PdfcBPMLgXHk8&?_u+_oAoKD
z=g0i)_vbE^4UoKcFrhqy|L~scxBg2?NJ#j_&pdG8=>O?D>>DO5&I~%v*H$`h8;|6r
z?UIrbHzdsD_Z~lRAmGS>0|L&QB2$(&CLixJyt1Z}k^i%my`mc%5U{hePdcll&81-H
z*09X?{RwXdo)ovn-79&TtxdkHvNrpho{*5RV&Ab3^Bd0y$im#ciIKs{ME~G>%LjXa
P{$lWS^>bP0l+XkKK*?tm

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d23efa6cd3451cd2af9073f57957efaa81a0c22
GIT binary patch
literal 346
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<BAzaeArY;~
z2@<S}6GVEN0u3%PDzB8{ld)(xwB1bWcm0<b@jG);r?&EJ?whZE%SJ6owjuB5-N`&W
zVQK6CP0nV!$+rQh?EfDz=H^XHc@NKZKFf2>E%pD+8#g3cn!7UJGt788DT{|^d;goX
zfUS>Gc5HgB-F%>b%l~)Fj8ta27D@g1d-Bcy$=d%VQ%WQx*S-05YQf`UXA4rVhqJkz
z`_J>duQnwC2t2ZCy|(OBX+Q8%TUcV}kN-w8k$)Q<y(Z6nc;Xem#x(7nda5UbRjd;}
zU##X4-X?0u<+Z^e#^Ot7<HV_rIj1EhBqSm{t}=8#=I6OAG2gDUZFyahPI`iZGE3a@
pr3Y^sc%R%_1NJ<Z+rb4447>h?ugnnbYX=4vgQu&X%Q~loCIBkyk?{Zk

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn1.png
deleted file mode 100644
index e1f8ec3cebf00b5a49b470896680ee087727a013..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 292
zcmV+<0o(qGP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002%Nkl<ZScPL4
z1*2dTjCjCE%K$iV-~bBW+NkXR(Q{pJJC{`!GBD9A20)hIJ;}geW%lYnvN&BF0J8k~
zEd~Z<OB;qehnm5BHa0c};h<vLI{;?6q#6Um?IXJxRINA}uI&2CAn+sYzq_dnZPUQ-
zPiFt0T=~x+qr(WcRL6}QOfz!+XE=B4BUlYhL*Vq435;C)e;JOf{=gum$quHGEmv|~
z%1F}?sO(+>ro*+`{=a<mi-Db+iQ(SOuW-vjG~Ke{z1`99)DN>91ZWxsuhY`tY?!6U
qmXCr_FbYP&C>RB!VBi4*0|NkEt5boTjy7ok0000<MNUMnLSTYIr+*j#

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn2.png
deleted file mode 100644
index 8dc4eec7c3a95cc428a19c75941bdae76766d59b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 315
zcmV-B0mS}^P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800033Nkl<ZScPL4
z1*2dTjDk@x3PwC&Bqab295{f&w>B#KfAm}z+>B+Fg$%QfpC>6ynaGU+kmYwzGB8+~
zz4}kC8Du*EWcl-33=GPaHVk(THG}zVY-|j|LB+Ip0L*epH3o*;M|Lx)T5&R5+4Yq{
z;78hjcT*XX9Y9hV`2ET3|C1~K8Dw-A!ItW{af4|_&i@SOj(r5HNosvcl9?oh!09U!
z7`gcWG8|d`fk8@>9ZVxzuH?FuB+E&5z~-a(7$$5hVic5MVYqPU69XeF14WjD01GLK
zVR8I{VH)GpC(-cKPp;)4KvD?2PD_KcVU|*2`6w6#qhJ&aJYZm8006x0SE(EYE$#pS
N002ovPDHLkV1kmAe0u-@

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha.png
new file mode 100644
index 0000000000000000000000000000000000000000..c35173308fc6de6f8b92a42991a88bab0d0263cf
GIT binary patch
literal 243
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ydu{YLn2z=
zPBi2?q9EW}FSh=H@1C%CN-uniI1g^gd@H87O-P{S=BW*9CuiNPR0#h0KbcK{#ZjPc
z?lq~{>#leHuV4OjYuKFUoa<Pk7i@L2OkXmEf#G;zL&m*E-3i5RnygW;tKa>$%RL~b
zvGjn%=AKWvw|4~EbiAlLXW3;qsW`8S`Bi7j)@f6MUhGwFX}I^hgzY!Wz2Dz8{?FU2
r6T`?Lp)LRP^)9<p!aytkP3AwlAmy{Gs>gSr!x=nX{an^LB{Ts53#??3

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha1.png
deleted file mode 100644
index 97e0d482fb0c70d3811900bb0cc4232efb9f9e24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 228
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ)t)YnArY-_CpvN+QQ%>?d{qC7
z`roksN-z9>bvo_+_9|EKi&j&>iAheo?#6vvvYf|5phZ%Nqe<b*qHA4CMQUEf+5S;E
zZ|U44I8X2_vxl4$!~4IL_rJ>u?B@k?=LIzt%B+7mXE)a@_6a4kmNh;-y=hC>Kd0Bv
zl6wy3-kzXlA7rbv<=ToVO^+=SVy_n)o!x&R>UY}DS|jJz3{BzZK2^@!UBT)oz~cCW
cpP`0f4QtBh&5|LXfX-&{boFyt=akR{0HaZ05C8xG

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha2.png
deleted file mode 100644
index 8d729f22e1ab49445da56a56a69261828a55d832..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 285
zcmV+&0pk9NP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002wNkl<ZScUDB
zF$#k~5JhL>fG5z_9K%a^7;hqY5DPEi1*~HyD0ZR<YbMMl22+F;){tgi^Veebt$$Gv
z1VIq~jdJx95h(TCW?2?m*A+a^1K;-#?R`0`0G5yAXx44p!Y~ZfG!5D2@C^AhO~lf^
z?;!{RlS~vv))t%_nCF?guKSSh5ApK@e3Nr#S$4C{J6}N<hWo0iEK5j|1d5{I=c{er
zxq-T_-)ok~acuG^&JDb(z9ZtQwT7yyfD;i-+Hh`w?;8=7)*3hImT8(=zk<_#M0uXm
j{*8~w1wjym{{sLI`Jj2z;=_Y*00000NkvXXu0mjf_ltY<

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha3.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha3.png
deleted file mode 100644
index 3f62a05be5995fe78a93c15f6e2afc36f927ec01..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 218
zcmV<0044v4P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80001?Nkl<ZScUD=
zu?Ykr5CzcL!^qs+CM?5Z?8QC|Y{Agf8Vt+@LGW0QJ(kPdS@x27i6-(tqXHp>5JIkK
zt&LjixMO&1^}rsUbB0n1>?Jto8>YbPYPb*rQc9TY^#bScV|}#1Z@Bj!U0~_{#`wHD
zYwg@<twBop+#5Lb-sjFahsmCnenE_Jgb;u+_AP<6Gy$d5b`CejpvF%KA^!&eZ`JHe
U&->Q<eE<Le07*qoM6N<$f+bmCoB#j-

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha4.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha4.png
deleted file mode 100644
index 4753c6a2f2763152cc39b64069a2150307e189a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 222
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJrJgR1ArY-_FBx(jQ4nCgP?((j
z>&v%!=O(}K-Q(7mxOVSUgVQWRW(%TI6B3^{swn-a?@?$GaN_uQIV#(udGq3Vx&Z~6
ztXXT1|K7E(Yw>}C%jZAj-d?wS>$i_W>u)l(T0PHGwcz2ta9udL$LjF++H_5WmX7U$
zP6y@~pH7_<=OmQuves1RG?S)k-=B~A0ba2W_kK@4_w@C-k}v6;?``9`75|Ad>|y*{
W8m@bgW0NJ&!3>_RelF{r5}E*x`dtG6

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8989e080af28de252ba02a378ca741c7cad4da7
GIT binary patch
literal 268
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}$2?seLn2z=
zPBP>=<RIYsziWc7>h%pD+0^8Ydg(tBy>!&*M&ykSr$xQjytuUa71q7YQ%rvBwPCie
z>bd6BRe#?b^C)mMDg3c2Irk#+oW_^><y-%3Ia<5fIioXA`sdn+MP_1uBa-(=G<PhR
zlJt}%e}U%r&9l__^ZW`LZ$+p?F5Od8x`JVW_^jh?9d`Qu%3A8qr!IHYvL7^OU^wb9
zu~#|calu}hg}uq?EaEfzO&;oQ@8$g9^}+8O_x>V%`RVII=K*d1Fn<rjrTUm-Npt10
QfIedIboFyt=akR{0OAd7!~g&Q

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat1.png
deleted file mode 100644
index 8f1ae81e9b643a4fb447c69ac0cb8af24c02efd6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 250
zcmV<W00sYvP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002NNkl<ZScUD9
zF$%&!5JmrrkS!(Gu<-^)k7A`4@e1j*40aYaqL65#wPIoA0mRsD3K`kek&wn}x0(mb
zhn?bmhJhdmLMZ5*(kq`*Q`ZXNck<H~kIfFv673N3d$z=-H0Z_}`^6eW1f`Uld*47^
z&RI;7C(peXu+k(g6w6nK!hUyrdw<w<^P3GK%Ex`O$#d^FV99!lOdLU%6>is~%U}iO
zLrwU~O)Y^>3FW(hg;&n<QC<b{3W6XAg76;zZ=2v;#yDrvasU7T07*qoM6N<$g3&f>
Am;e9(

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat2.png
deleted file mode 100644
index 1dbc77d261e473efd745f5069a5b8c53eb54b736..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 276
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ+nz3tArY;~60D08M0%P64K6fH
zob~Phew)Al_nW_$oZ-SEDN$<NX*9cY*0le7x3Hh7+grnYc>dCZ|Kme<{#Repuci2*
zy#Dt8?YsGnVrsuPJ4Saf`*m-7mynWjB%k%DV#Dbo0bia4HyC&5uwOjQE5Yf;c$7he
z>Hq)#=?sYhbIup1upj?xRLf?dmST5Qu^{8ApGEcQkIXz>uf!5&MI3Ni$(-Q$*STYE
z<Kw&jZNJU^8!{#43oNi;arnr)nP+a_E)R?8fom0*j@oYO@7!1e_5qjM!2`@}Y-|ii
Xo|YTl`nMts=uHMsS3j3^P6<r_ToZ6q

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat3.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat3.png
deleted file mode 100644
index 39f488801859ff3e6f89f4322fb70e0028701ebc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 210
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJnVv3=ArY;~60D08M0%P64Y=GG
zEg$@U`ttw(clp2ldk-Wlg)*P`bp5osflSoS$&FHd3MUy2POsnh```lIBaCG%v9b+0
zmOaZ>GhfiXU-XCJD4zo7pa1{md!Acv`p^C_JoMccUuJ^?AK$6Z*qW|A_ws>8pZ5Q!
zc_se;7f5QiZVEc!v8pcM!eO2MT^_ssfowmhAraHi*vQCWch~d!`F6nxKu0ooy85}S
Ib4q9e0GC`=zW@LL

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat4.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat4.png
deleted file mode 100644
index a9f8ad789f77eeddb0a03703185ace66aa39694d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 241
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ9iA?ZArY;~60D08M0%P64Y=G6
zYDipp@c!Sn{|Y|d=0*=EF+~0;`|jB0tX*z&;gVp_51swL-my1t6JVbsmVLW3)K--t
zouff#D|fkjA&V|U7<)qvKa&sN)E<M=@9*0<3bQA${{R2q{ov^@lK=LvDq8MobwFyl
zg12MBPR7Uo<(=N}yos+jHu(4FxIn4k?kX>aYZ?hDDJ{|GKE6{w?4K8wb-Q~5_k0zN
m7m0lfTHm_^9mmQ81Pry0!e6qPtzHQ91B0ilpUXO@geCxdM_k7M

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b007414bb0d3aa13950c0f585a23d5c7b6e338a
GIT binary patch
literal 247
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}8$DedLn2y}
z6C_v{Cy4Yk1sZU%Nf=C8_3%I=Gtcwoq5snp5)yX&`yuTdQf;ry%*@=}+{_%wm!K5N
zyy@wzO))&DwYdLp-nemMs%0df!I`YomdLulAI;lZ?yc;Z-G5K{HlxmytQN~8$HH&*
zD+Eqn^qj_g<Hik%mgX)=NeKywKD~^8`bUnt_U$cj*tB~6+sla+M@?AI&7U;)-~7hL
n#>BH%XQ#9t(11Jc0RzKaDZR~WyDvom9nawD>gTe~DWM4fMKoYa

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom1.png
deleted file mode 100644
index e2747afae3d4ad0d496227c39822d4d2c3531ca1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 218
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJg`O^sArY;~60D08M0%PU*?P8Y
z`+uO3ndkZP(Esck*W3R)CUEs0|F+8q4>IbUcgbc~h+e08`sju=n?Be}OH0Shd&XyQ
zCM&fil5df4)pDaeyDEOY^G@092N=!>a(8Y1@7yZ!@)1Ko0XMs7v##~71wZ!-$cuN`
zoE3h!wbqJf{fuP?eg<#4d{A-2vsb>eZrgIX9n^q2CD1{_z`%fkfk{Vi^HeX12SCR%
Nc)I$ztaD0e0stAQQJ4S#

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom2.png
deleted file mode 100644
index 505d9599e145811350f75a13a7953eec353a2560..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 220
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ#hxyXArY;~60D08M0%P64IVKn
zZ)JLLpplv9`SQ^J>>JnH|2rmd^&Y?3?Slsy*W0OOSu)%#@{QDMOP$*K|K^Pw9IqD7
zV&>T#C7C#_`9;gUl|8fj?<ue7Z;j$>V4R^WCX)WYo$Fz5+A2#1kvoSRk0zY%)64j$
zf8@C96uVWbhq8Z{NW>ZXHhx~7vb@<j;q2AfA)AxI?%;Aes3FnT(AdbxaI8~r^NQ~)
R1%b|G@O1TaS?83{1OS{;SFiv8

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom3.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom3.png
deleted file mode 100644
index e9cbf32606fda377fd506d9868ab60a238cb5685..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 221
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJC7v#hArY;~60D08M0%P64Y=G6
zIxxEhy|piRz;O6y=GFg>Z(jHBH+0$hz4>fGL4m?)ZJ#As4%=dar*$Vrrar7UGc((y
zqkfvPEply-!D+`5r}rVp&bq&!_?AJe$n=oR#swC??L#`AyihsKxZr^ppB7tmS&8H4
zdPO_EqBpI~lVWRg=kp!bUZz>_Z_1mJ0**C1t0u1zfV*ZxLt`T&L)TZm&Bt0#oCCU-
N!PC{xWt~$(69AXmS3Lj#

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom4.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom4.png
deleted file mode 100644
index 78f86e3a7b0d721634e5e5224993b25f9addc6b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 220
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ#hxyXArY;~60D08M0%P64Y=G6
zYDj!+5DaIKu_$PG_-D(j{|eu}9=|WK=+^IpS+X)RE2PqVcBo9yy*}k>QbbtfkNLg5
zy{`n@E;F`8uI({6?O5XUKIGV0_xFK!8FgAj4#;d=VDZ~Ngd=@R;8n&255)Mi*rLly
z96#49+UaH8;%2v~EzX_KcUXIwX2HKHZ%PU{*6ggByh;(`j)x76jf@QbiF%taWQjim
PI+wxI)z4*}Q$iB}BtumC

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb1a0af50dfc12c055fa684f0f0de9eff18a8107
GIT binary patch
literal 267
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}M?GB}Ln2y}
z6C_v{Cy4Yk1sZU%Nf=C8teHLk;D3W<oElYYdrwJ3{PdfcBPMLgXHk8&&#~y&qyHzS
z+3)-$KVR&XRl>!G>v<L}{Kun{Yx`ePLPEkXe&&G#NB>XPVc#%e@ykp5e0e6lk2f+f
z4KdtgXkd_ISJmIxxUi$KQL!y$^9e8J<9)Kp6|*KV@E2c<+$;eyKt@K!!>oIaM#B#Y
z#<=B6Cr)ROIKk7%%+7b<rugRW2h*O%+qzGyggMvEjDdm8!eCu<>D>aLhZsCv{an^L
HB{Ts5WX)m~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper1.png
deleted file mode 100644
index dac4665696b06a993817114e6065c652e1da60df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 241
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ9iA?ZArY;~60D08M0zR?c=R)z
zxRw6Fz9*BZEB2aOD$kml<q|VqJZ#u}{f&gma{Yh(IX@?B3+TnlY<Te@ob6&jJ=?Tx
zavRnzU+<If;L(5XX~_%Qnf2b@KBDmRpDJ^(v#7E(GxOnRi@!@qNOS>l(u>J#eX`ca
zKA0#n%CRomoYwfZw4h*tzlcLk55xM)mmc&j^yZMUC}23ZZ$>Q3cANjNEO*_o=W;u!
k0dZkdV1u-QfdK=<q#Xw9N=qa-fPP@`boFyt=akR{0Ne>&6951J

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper2.png
deleted file mode 100644
index 670b66ff9fefb4150c3a5e9b76d456c215848049..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 249
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ1D-C9ArY;~60D08M0%P64K6fH
zob@gJt?>`}V<wD8eX<uDv4!mmw)kogc$qPM{Y^s;zxY4$H$SO||9gDZIh0+;>d#b1
zlPmKZm#$^cdHqsbSYpSI|BtR7cJgJ9xwXC1@zY;#wq<QvZf0z3ZD-xz8yXmh0P&Fr
zSDde!6uh}%*tVRL^Mir-TvP6xea+3xezqaKOdb7#4@#q?{;@c`6|g9Hz%ZxQa5qO@
s<-e=NAzRbIj^uJXs3GCj(Adbx(4l6qPBehO5$G2NPgg&ebxsLQ02E4J)c^nh

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper3.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper3.png
deleted file mode 100644
index 3c8b115ee833976f97520506ec9d01b0c2163aa7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 249
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ1D-C9ArY;~60D08M0%P64Y=HF
z5>(U~Hhq))!=F5>VbS$lD|#BIz85)}W;pS2!{+O6Bvh8`|Lf2BIa&Mv$LvMRn8jrO
zol=l`b^gGmYs}leewoV26Z5D3WDx_m<t)9ow~r|N{HMws>@2D*&CGoG+2ZdK5)xfN
zoaABFy~d>A%?-o0<(!-!48-S}a_96lH#471n<&aEAg_Gj^%j#)LJT_<3mzO`wD_G=
sCV1!5pViM#80ABqdGG)u8yg!#?G%G`eB39afqr4|boFyt=akR{03otq&j0`b

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper4.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper4.png
deleted file mode 100644
index d0d8caae3e072029623138f50287635a5c021f1d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 250
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJgPtyqArY;~60D08M0%P64Y=G6
zYDi=p=s5pxO)cC1!!y(ttk`I#m7MU@+SN4O_~B%m>a%^0MZX^XKQYaI=O_93Vy~<c
zE<Rk(vuNQz9-Um<glPZxnFkIW{XcybU&2B4%FO#}Y$w0#OU{s5C2><iLc&ab@9_f%
z0*)LwAmD7u{=k>{c%N)?#jFVo{KXd|Hy?N<D<iYw8N;4HhL46!d;Gi?=P@aWFtPK=
vG;G#S6F;bXet#9;`h5^rDo7a^7yv!OWU#Jv-PC<R&oFqp`njxgN@xNAjv-%@

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat.png
new file mode 100644
index 0000000000000000000000000000000000000000..10d7501bc3cbd18e8f4abbf77247bf489e650563
GIT binary patch
literal 433
zcmV;i0Z#sjP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$Ye_^wR9J=WlQB!fKp2Lf1XoL!E>a5JoOH}kuHX+4LKi!@ii=a}@95+rN=HE)
z?b78a91d9orBFAQ>y)i@{~SunwKYxapvyfF$Q^h0KKJDdcsw4D=bs7o-Jp~bcWjKw
zJws%%Gzjuz4)zU?qG%&$UBr<ryx`6PIpH{SVvGrtQgU;C!fCxhv)Pnw6)F^P%e@|M
zt)*J6u8T;TrkvIrynnqGTxmhLE!-FrTpk}0MG@9ok|e=ei?x<otwtDzv|6ndiAtry
zL-NM$%Li$iZuHDf0$F%APLjmECDZAYIF5<q7_Bwsav6a6e7;<h$rMr81K0OY0YJOm
zmcd{^zuyNyYYi+uMX6L;+0*Ow=yW>3_P+#jDv&jkJ9l;{OeT{+YmL^L@p#N|IAk;$
zF`LbnRRWgbKQ-;%h{(#5ad&kg?t3PzloF+sbh};oe14Ro9@r_=4bH<Aaz%b6;PH4o
bp1<T9j=QyAQ5za$00000NkvXXu0mjfP0GF=

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat1.png
deleted file mode 100644
index 3e41b5ea868c858d9733e12f54d3ad117a643aaf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 394
zcmV;50d@X~P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003|Nkl<ZScUDB
zF-wL(7{?!@HFI&&guXzH4x!Ko2;A}uL`#$SIou;~3?guHaS=fp90S3iq2+aQ6Zebf
zsgujzH_(K4xgR{-`FMB#|J^+b5{X2zZ<ICl9miqfb6J)<*Jtc&=;4~;wr&5?nHmvH
zDytdTAr3;0p$Qy!cXbBmrx)P5F69;*5RZE*zS(TRG|j0I)^#0;zka-o?-tbnilh7c
zn``!dd_sb4+k#;j^xm>8YCX?`BuU13RaKE0Y|)Ia>u|7CTwGMxB^g0sj6Bal(=^Ht
z!!VA)7R8Z&)xhn;6B+S+pQULEaU4?~h2i@uR8{>kCyF8nf`IzCk=ZA}i%HB~9x-T|
zMnPeWx~?J1GAN1y`o14e3E|?~igq^mEsMdy+7SEPFt!+B7_ztLN9xZmLQ#mLD1R@5
oCir#1mLHZxB9TZW`vU+z0VYSK!V#6U@c;k-07*qoM6N<$g5;8}>i_@%

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat2.png
deleted file mode 100644
index 36f7c5bfdbfb5c2b0bd50e38d0309e42cde202b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 400
zcmV;B0dM|^P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800043Nkl<ZScUDA
zF-wI|6vvO!n!Lp&L}+WO(IFK20D-vV&>AgG;^%N`iNZ06##~%PkOr5a5NvDF$xYmE
zoLg7!vu9mf-~GWsy<YwQI37VFkw_$xtw#}QfNk4^zb=Ym_BlenwknFyt6@hZ+_J16
zIa3i%QY=|SU?v>6HG&ej@9Ojrj`okiaUAknhyE1c+dU0$ng$HRn2M0D>uC7v$Fpee
zh&l~N`}2c6`f>~`%aR_kOw$BaRl)PTH3?nU;jVmv>!&wBnd!_339xW>jlp~u+O`GP
zb!lZ;2CLPIt`Ea7?qM=Z*f;~1w+~dr_kEHi3B++s*D)BrKZT}gYtKYc1VIqc^CdGd
zc7P2NfAeIQKwZ}g24huK1!<Z>p6Af_{n#ahg>M?##o)ip7vtvQjPU177>`(C7?StL
ud$ME(My8>B@Ep7lFY+$|iA1uU0Kg~FU$tNN=It>60000<MNUMnLSTZeWVJN_

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-snake.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-snake.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad93db93542359a87ffa654ab2e742c9ad6f8de1
GIT binary patch
literal 383
zcmV-_0f7FAP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$IY~r8R9J=Wlp$}zKorOSw=9q#s)}k5hz40s)gee~meZ}|15{S^6HHa|0gy%G
znjq$;7;-@%ma3boXhO|Rz!65aggZ72_jB(q@9zKZ{oerwgTZj`5S^qn^u>D9Mc*kg
zU97aukUXj;JW(b9j>&ijz{a*@!gD#E=dW5q9#j+hPKja90sur=K_=rJs=7G{yMch|
zVnt@l_A!pKf{X^X&fR(f0Kjwkw>ZiQ;<+4o5-7idwt-?sg{(Zv3IgoSS=9|j1N*r4
zuf&XsJPE{k|I^UF_$97ZnTEa?_AI=-e`<}Sk_Xbz7crwhR%dluT9crpSXL`J?X%od
z?Y&kDP7Nr9<VhfA%eM0Gc-0haOXu(-?s@yDP}R+C1V|B9r-k*V3(w`sm;VVdqrV!{
dU@#ai;R|^fbl{^f6M+B#002ovPDHLkV1i~9sqz2-

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-snake1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-snake1.png
deleted file mode 100644
index a3a7ce808b90cf6755134369fed90f0a9e5e1088..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 382
zcmV-^0fGLBP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$I7vi7R9J=Wlp&A8FcioCy%0zcQ$sBX#DW}Ea|n`|OZ6uC0FzVu1g9qX0LY!j
zEkWQ;amWh-ahckwi6zYR1a#rpK&>;^pL=c7_kVr=S3sdq{C9|qOGDS@hvNtnBgJa7
zf10D$cJf!sIFMnvI0MjeN*TAz3~%orjY3}97BDeV%*Gl3z>5;HT%3^?<yBY*0#=(n
zS#Jkb>_rKgPxXiATNeNTmYMyDy(l4;nIR6G+ABygAprP{a#6V#B?P#bGcQWar+T#}
z6`xTa2M)jQf9Tp(EL}zD+I%+Fu>1OH9LZKa5V|(^8EtgCHtaV}LaQ$zsukS!S?t~S
zUP=pY4Jd@ffy39^LG5>xIt8cHxc-P2KEHG1McIu2AwnDWaX5}(nOQA)C-{s$G^RqK
cP$&T47p`A);D$9GT>t<807*qoM6N<$g8KlV0ssI2

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-snake2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-snake2.png
deleted file mode 100644
index aac0763b6ee1ce9ad725868083b1c69eb7962b84..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 412
zcmV;N0b~A&P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$R!KxbR9J=Wlp$}zKorOSw=9q#s;FuZ2!e!DI0Q)zIZY)Wpt6cjfU4vJAd4n5
zO%OO#sU#H@q^hV25->Nhb!l0baW{h5{oJK}_kQ>8-UAd0g+lS)Au>U;$$*EEj<%6t
zu@0p6$axhF7*oc96w}cKKofDoc(0RUzS>ENyod(0jRgIc1^}>JpG-#=WasOr*b@X6
z>wqjb^{=(%`efK`%H;lCz-F}aRJ~4GTIZFRO$Pj@7%71`G2l7ow+-j39oZgE@Enup
z-!0cC0PvS;R8mZGi_Iwa9Fxo5KX6AI+Kh6oQ7b*XD#`8PB-N642aGA>AFWrGm`w(}
z-_o!@W(Xr4Z^2qfLg?qb8rk`ZVYgW+QdOac2^2+&kIiy@;yET?ZtB9*QF@HpjPf`!
zkY5V`?2j3;^Yu9bxrElJA&hkNI;n8-hhQ@*JbV-iMUi(%ypJ=dS*NT30000<MNUMn
GLSTY^%Cf}(

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b02bb0166baa7e16944b6d06467261bf134ba25
GIT binary patch
literal 512
zcmV+b0{{JqP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$x=BPqR9J=Wlg~>VK@@<$g%TGO0znd2VRtWf4<3T_q+mcuPC*a3=3g*>f#?1O
z6?$z?J!zpi_8>&4xs+rNJ*0&a17;^Gfq(-^F4IG^i>+=q{RM^2cN*S2-hA`k3}`eO
zjpl#Hm?!CA+g0J(7n1zS;=P>1<MXJNWm$ht;9%QTww1<lvmCu{lV4fHw$cDNZZ^t0
zJO6|)BtRs1^sbv&|4~xH>BTJ>A;||Lh7*M^<bz%Cg=BAYm0mDnXKOtSD_=;?K3~U*
zBnrUS8~H+#Sul8Z@-`|~tCZAi-vH<ZBjpQ;-Mzwbv+QiGV|T9rRGdU&i`wlrwMt2a
zt*^KG0N;pI%SCpbC43>(aH80CmZCBBf)S?|w|uy~`89zc2p9|o)GDRB#f^HaukMOe
z%S9De<N2!-qfjV3xR)r<Y&P*ckMVdMiZByVww2~(^YY$ka=9F)Y0~L*m`<m}9X^);
zK%>zhl}h1xUKHDZ@>mTgip+w+-sURxR-ZTTKN`SX2mh47_adfgMzLzSsKS}oTYa9s
zIF4=iZwth+v9_#ckMM_I?ys`3wjBEiH5!fPpXLj%PqTfg?-jNH0000<MNUMnLSTY1
CN9r2@

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked1.png
deleted file mode 100644
index 02e8069f3dab7bfc186c4c4d1ae7d6840b66aaca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 449
zcmV;y0Y3hTP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004qNkl<ZScUDA
zF-t;G6vxklFrgrj==BQJr5qX}nhFvEo1}(Tze0V2<~~6}YfViW<k%1><Xghm&|pEB
zpf4)|q2T3m<9~QpEPca!MH1ZKbUn)X|L!?gQYaJ(#jw$W<nOG;g*;zBzSH9LSl@5<
za^-Gs!!SI1`4&KU)R>@He2TKC7Kh_AKuuCA-?1E!g4xSjU*3pcfs2PXis06En_fQz
zhYXqmYMV<lRJYr-wlXKn0`=1Ub63Q-0J%3pqsXX62l?}Ev)%0t;eOAxy4~i$Xzhuo
z0}-4dA|-sUz_Kh3lA|wFnq2P{$)r=X9vg?Gz?5*7Yr;e@#hb=UFag`Psnu$+L{D?A
zP-%)@kxV)zym}m-<h5inNr41R)1*WqL5|}{5pqTNaUPqEzSZcuPT_Evs?{oWIvtYX
zfdoLYSfo%W#3GWd<$0b6!twa9nzO50?msB_M*`nPa61V`FLw@!{iB>VDEL<dyjYl>
r6z(JZ@|XKlATg9+g+ihDUl7qJ?yR$YZK@b000000NkvXXu0mjf9qrE>

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked2.png
deleted file mode 100644
index f40274d08bd928ef413b47c6cd5f3326a303e474..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 445
zcmV;u0Yd(XP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004mNkl<ZScUDA
zF-t;G6vxj6F`*!k$X<cEltV*AQ$a#tlhn}aSEx_W+$TtAt*J?a92)|Kd`tKm8Y~DC
z^kqdL6qw76|G^W6N%0JXxW7TJ=RMB<ch9|#3<iV2U@#bljY9tRN>q!-)x#StOpW$v
z?PiKf)|O@cnYKcB*czuubdu614u|7EKustVZ&?nAVEUq>`nUcazVrK63S!r8lV096
zhkQ2$)HW8Usp>Xqb$M3G8uh~6lV=g1><Ep5BZ~I3XP?b>w$^p$IoGOglLNz*N1hHu
zu!e|N3FSBr2g&Gjr8+<87D*)&v=$kIq{fu6mSe(1FvaWIvo`_Pb*a&4utZmLl`GYC
zw@50P(EXYm9A{NL9`}+@%C>Ea#bVTIwM2wEB78ZI>{`#!ghC+-1Oikpm#N)ulh<$-
zz)wD(C%@m%BEsg<98Uz{xO_O8)5{xv|1W~S2nZsA-3b`IoH-=+4l|y|{i8rX=4U2!
n=MoO|$qfV~h7xS}-w@FU%rUclE;86o00000NkvXXu0mjf`WVKa

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail.png
new file mode 100644
index 0000000000000000000000000000000000000000..555e8678b5eea60dfe629c35df133a9343a071d5
GIT binary patch
literal 519
zcmV+i0{H!jP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$!AV3xR9J=Wlh11tQ51#02imbAo6-JAN~Q^=?PS+VjB!=6FI{yplD|t`b{Q;~
zmBxju(2!E3rPWoV1J)*+83?n<!okILQQr_S>5Sq+a6WkOxZHQoc?T|}q@<*z{O_nF
zO*N+~`tG?t%j-+O^t^h}ie_04Rsj%+o}tuqsaOLwrz&Q_WN~eQ?m>^`^(D-L3Bcmo
zLe%%^=rf+{14IT-UcOhii38k;GjM$|z;k_qVL&(z@mzmu3ZCmzuG<8|fX$r^0G>R3
zEI&=nbP#I*ZhqvsK1SA{dDx7GHJpY3d^x>RlY%<2&7BRMmRy~EooXW1K&#zS4W}VG
zdM(;KY$`3R@m!y991;wJsHT(qV+NyZj@=%mN>TE5PHIk7M1)eMD5XkKM1*6vN8ZlK
ztkeGRdglDt1o~c|ZR;W3cU@JuZ$)*T$VxdcM%JL!p4bA@Vty{e#o(Oq`!{yC_GZpc
zw1$)G1TY$pcvP=QI1Vwg2IacVWv9<+=S%^KgcBQ>6o32i4aVJjWactaZGU%PR<|w8
zg2`p4&+~(4Dv7Wr(H7jc$J~4(a``*rf0ewQllZQbl$4ZzkRQf5wa`X>8m9mN002ov
JPDHLkV1g0(^Xvcs

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail1.png
deleted file mode 100644
index c8033c05bd064107cda0044a9ca98f5ffae672d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 459
zcmV;+0W|)JP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004!Nkl<ZScUDA
z%}WA77{=d$(vmLrZMYUu=`F*)PT^fTc`*FDs-s6K$Wz&&lPE@nl6A@wGVNj@UOXfn
zCZ5R|Hrj$+2npr~%g)TZ`##S;J3|_cMxz-t%!&S1VuQ<ZtM*DWOVi(;IXTRz-o`{g
z+&NdT5o4ca+Xf)+^?PY*agqwDq7cU%U`_Ine-!3`G<bD%&CKFp$gY7#r70SBUOLq4
z_QcpK1+0alLGj$m&aznB-rMATQ_6vD1M-W|$UWw!^l@4>OD2*c<EK)cnFVEHFw#$p
z*UQh$k%3G$!yqK1m!dEth0Q4-C8Qvc$vLLkZqQ||NDGm9?hDRx><Mfx%yD6iI%+>%
z+1pbkZ##i%t4d*GjS3e9<{vk{{1zlK7xHoZ8YCrahS#7`mxn6N8|uBkQEYWrz31o{
znvWA`ciXfcjc`N@acsW(T$M_>vgmIm?AU-={QT~W+`}W}ae35QJQnAHup!cbiG$QW
zvl5m#ItAu)Y*mI&Ir&ZePr+szjIu_f(flij=mQMbwa_VyDt7<?002ovPDHLkV1kDu
B)UyBp

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail2.png
deleted file mode 100644
index 0227fd5470feba58d4a993571b259c22b7c3ed68..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 452
zcmV;#0XzPQP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004tNkl<ZScUDA
z%}WA77{=cL(~>UsZMYUu=`F*)PT^fTc`*FDs-s6K$Wz&&lO#rjl6A@wGVNj@UOXfn
zCZ54}S+J-!L5TUmvNQ9}%=7HCGo;aIG#ZUYGiU_#H{<J)eKabsG`%?0W9#@JEx2ur
z`_)@Ya~TOCde-~|0dbGdLz4>=luPE7IQjr%%)`Z_G6&e;)#0`Hi#Tx9N_Dky>!n4V
zc1N{8O95lSNI=b7-d<8;Te};wYs$6*2Y(SZa*etub(AtUOT-f@<EKJZSOqyT80n@Z
ztHozqCLHNZT0n@SXHghoVQUIV2`Mm~oNemO8eLZMG#{Rm-oT8+nZV&f9}n87qxRL4
zxjnJ1?<hCQ6f#yRcb*fzF~clyBC|oS#IHe8Tr)fdjX2#@s^3uO{f(k4JGKp|O|91n
zG}}#Di-aYjg*Xo1eYQ-6Y*Eechp=hDDt>l%O0J<{ay#ATSS%Wo{*a;4fQkL&p6G`#
uqi(@B_ZUUfWk1D#1rFO_lr{evBKiPP5w*}aHLHUF0000<MNUMnLSTYtq{+1a

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato1.png
deleted file mode 100644
index 39399183ee2d95a6ec6a11b9fb99a3fa6334802a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ7Ec$)kcie~3D(64B0Wuk4%r0{
z4luT9S2g`llsMwf=Ch@&!6WWL{lp(K2EQ-&tnJCk$@x;sz_BONf;H#ov&G*f<XEfz
zxlc=8xb<mx+`r@tg6T}rYd-w5KJ0E%IjjA^(Mc<N6x?fS{>z>TzrVG6;<d8Ara%KO
jw}TpB8wL0!BqSJYjI|0`U5e6x?qTqB^>bP0l+XkKVcAAM

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato2.png
deleted file mode 100644
index c3d3a70e02aad8564de33cfc6a9aecd206d7f1c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 190
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJR!<klkcie~3D(64B0Wuk23&2t
z76lI&4vX3z{BOYXNSJxX3Q-27%Ete$kBSex@i*RPv}xnUi`N+yKBPSq+3<9B|Gnf2
zkrzMbOW5jM+4Ses>3SZkM?MMNqW9|4e|RjhTh)5t=%kfB3hp&E|7FjF-{0CjF)FPe
mWRKfH4GGr65(Wka3=CZFwF<9oUi1#=AO=rYKbLh*2~7ZrqDh|s

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato3.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato3.png
deleted file mode 100644
index 1edf8de4c9fcdc7648be0061b260a89c71ea5df1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 190
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJR!<klkcie~3D(64B0Wuk23&3j
zH55c;ED9PPcFlWGFTwUvlhJ3%E76nOfAodsGpE(h+BkJ$Z*T8DK88kf?&S@-_iMh$
z9bW8k{{Iw<hSm_?@VI};7X;IpqSt)*XMNb+D@R?OMQ@r<DvRZ#$G_hv?EAGYwnt=F
hBFruZCN?%UhMRM=3U5zMp8|9cgQu&X%Q~loCIHmoL@xjU

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato4.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato4.png
deleted file mode 100644
index cc79b96e784c76cc60859968042a76f17e759b2c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ7Ec$)kcie~3D(64B0Wuk23&3j
zH6&P@#bhiB8Xk7ddr&XI_A!%jM!`(YN#Z}^RqWW${4+_`R+g5Qu9anA$`|uvjNbS2
zg>9RA<GlZw4;jQ_gu>(gC0`IsXNq3);h*(k_oy3v`Yd|Wd{S8~A3gs4K4IUlb+J7r
kMTdd5EKX2iW@BSxSP`LB_{c+~4(J{RPgg&ebxsLQ04HicrvLx|

diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftaco.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftaco.png
deleted file mode 100644
index 36e605235b5993578cf56840cb42f74e8972b411..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 303
zcmV+~0nq-5P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002?Nkl<ZScPL?
z7zLwX6pVsVFu;J398Lc}hW~&5{3(N^q%_0x=T8~VpS{VTrTUFQ(d;Y9<}s0?_}LAc
z|LB$%*S=&hG*)L&Q1@Zjx>WT4{ZrikNp%F#mPdxF{)agN7yW+@2T6_~Is_yor5Spg
z#o<23MKdrkFeqI5%aCNvM3f_lasYa;W22)|&O!J#CJf2*e=*EWWFyKEL?xQ7OGW={
zseWU)cAJY~$p!(2n1BxqFg`XqCh{wTx&#x$%@_X|j^4#@2T=~#vEKOqhxdON1O!<a
zh^3oL&N8S=Ffq(K`j4!fHVQ_;C>RB!U=)lT008pMpG64@mz4kj002ovPDHLkV1l}8
BfIa{K

diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftacosupreme.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftacosupreme.png
deleted file mode 100644
index 4db06131dce7e2f745568d4a6f0d1c1ccd2ccec3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 307
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJU!E?GArY;~2@<S}6GVEN0u2r{
zOqB8cZ{PO6{@)+X<|Ru^4u5{`FZoTr;-JET-xCj7|1ynyCdfPQ?uMWL|0n;bPq8uz
z5k2?+{DBYqpLv|E4?2^gboA4sThn<?*iD}@CGAD7So>#5yEbD3Ao!D>pm0mjg<Z00
z!{a6Wa}rlv)kv%eyLZgs{R{i1XTqXPM<V2=7V#b0ZkU(=1T$uzI5r{Wtc!t42Up`-
zZ`c3XE9;VXl+Er=Jjuq`Hlu-`$H30aO6`+&^DY+Q!)L|+OZ444n$I4{cVpwdAOG9G
z*GsUlL`rllo$Y<jXoa_dpeQfYi(GC8Pp~oE>6^3g;Tf$kU??zny85}Sb4q9e0G()r
AO#lD@

diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentaco.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentaco.png
deleted file mode 100644
index 014e20c0e96aefc2e7f7135cc4fa58815e276643..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 308
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ-<~dxArY;~2@<S}6GVEN0u2r{
zOqB8cZ{PO6{@)+X<|Ru^4u5{`FL`eM-jfTK{_1tS_(uEWGsB6Ce%$1p{r|-@@$36i
z3{1k(0|LG$-q;oL<^SK{JO4dPSuRd<Z(H@R-I7WCZ#^HoXP<%<i;C(}$*S2$AKD#v
zH8wCX(1`hUx*$1NG_X(M6yuA7eZ75Nmh2C2&oH<nqMZ~_fAx4lN*ar!yTH_pZF-`A
z*8}Z-cq>=0O;wsjB8kb);J}X?FK$OKm3Y$QEGaiP_Uwae71HZvT`UuhS3UkOfA4>y
zfIv#3!nCwqA37VoPt7=}R?8Y`nG5zIm)k)N2}=fstI7)wg!cYh0SpEPPgg&ebxsLQ
E0H<SwZvX%Q

diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentacosupreme.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentacosupreme.png
deleted file mode 100644
index ac07ed66b23d391c249f50a619299249f198cdb0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 309
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJKb|g*ArY;~2@<S}6GVEN0u2r{
zOqB8cZ{PO6{@)+X<|Ru^4u5{`FZoTr;-JET-xCj7|1ynyCdfPQ?uMWL|0n;bPq8uz
z5k2?+{DBYqpLv|E4?2^gboA4sThn<?*iD}@CGAD7So>#5yEbD3Ao!D>pm0mjg<Z00
z!{a6Wa}rlv)kyrXqpJO&S}m*N=T0uhB%OXQOZJDiXMj{2L>T8M?AW-nE5SoRlqq_8
z*T3sQe~%TsH4{HPiI<7TkWpSDp(f|c<<I+glqPxc<j=dWEWzbsnQ*-7@qhVy{}TlS
zQW6!WrS1CA>3Gg!isRw+z1u94!CvHYJE$S?iGg9qrP&{%{CtIh;lSYO>gTe~DWM4f
DruKs)

diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/fishtaco.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/fishtaco.png
deleted file mode 100644
index 4a2a6055234cfd987914d15b9d79ec33f83adfec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 286
zcmV+(0pb3MP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002xNkl<ZScPL?
z7zLwX6pVsVFu;J398Lc}hW~&5{3(N^q%_0x=T8~VpS{VT|MC@sOc5hl<`E5^-LU!p
z|6}-nWI8fb70zdvEAanG-~azKvmDtnT=b&<tN-6W#Z7%j;IkBk{{R2~qW`P^Gt3nr
z$`MS&T8<p&*yyN~a}fSbTZUMM5Qx63O#~f5RHE6sRP?`=>NkdKx49UWY!G0G3HZPO
z<71<lFEB93I(0KV-dD;Xm-ZE}9Yi@`$9m)cAKw3A5D;WxAePp8eS_i6`>zZ}<>ckG
kQ7{Td!6+C7qhRC!0KPrHzdt#tZ~y=R07*qoM6N<$f+7}!E&u=k

diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json
index fc2a8349af4..70d759b93fb 100644
--- a/Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json
@@ -1,32 +1,17 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Added by Phunny",
+  "copyright": "Original sprite by Phunny, redrawn by TheShuEd",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "tacoshell"
+      "name": "tacoshell_back"
     },
     {
-      "name": "beeftaco"
-    },
-    {
-      "name": "beeftacosupreme"
-    },
-    {
-      "name": "chickentaco"
-    },
-    {
-      "name": "chickentacosupreme"
-    },
-    {
-      "name": "fishtaco"
-    },
-    {
-      "name": "rattaco"
+      "name": "tacoshell_forward"
     }
   ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/rattaco.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/rattaco.png
deleted file mode 100644
index f80673f6a685cd9786f0c9bbf1d7fa7f196a0d04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 329
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFba6OIEF;DCMQU+E=~~XX$mwr
z&@fTP_rHDH|N4J_G@F+!F**GCxxeJO`Fl?;So*8i@!}iplg|tvZe6kbxxLZ<o4m9C
zznCU|eP4=!NmzP7!1u%(yF$MF{~LVgf8k7bu?EXWAQclAuKJ(Ycfj@k{KFsr|Cixg
zB<pCvBH`^NAt@mtp`yA}vTF9xhjzzZ&nM40bpQwq%HPE-l4-omcw*XOc55>$t*0^|
zhcqw$S~E$e(fs0prux|_>dn($nYU$c-zhOIM<Aht^9RH8<i+7{*C%V}>!;7KF4w!W
zX36#Sk`mfl25*$LuD*-N|MUOwZ+jl5CLNw5m&Eg17tRQbi}MTXlZN@6tIeK)VY$)<
V(S(VT>wrPT;OXk;vd$@?2>|nika++A

diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell.png
deleted file mode 100644
index 63a396484ce9a4922224beaf9fafacbec44afd63..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 283
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJN1iT@ArY;~2@<S}6GVEN0u2r{
zOqB8cZ{PO6{@)+X<|Ru^4u5{`FL`eM-jfTK{_1tS_(uEWGsB6Ce%$1p{r|-@@$36i
z3{1k(0|LG$-q;oL<^SK{JO48uHKd#8`~%53Y>NpBnze9yq|CYRp9+(9l+EsL6mj1m
zuv#EVlDX^Yjf^11K*a{RH#c6am{QC$Y0@R0wqvhUTA2bn(_RN%{2#UIzQnq_&ypfG
zIW{P&Jz!?;>F-xl3lw_VAp5%ae|^ROc1MQ^t&I}5VxIFI-g-NR=ibHjCr_n9y~5>o
c@B|Y>qhjZoITL0AJ<Gu0>FVdQ&MBb@01fMadH?_b

diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell_back.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..979a8a92d8114e28d279275fdcafa9294c85e8cf
GIT binary patch
literal 171
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}sh%#5ArY;~
z2@<S}6GVEN0u8v_tP+;EeD13J^}q7we8Y^Db;$`p5Mc7#Yg46&CBtlIk5ZOU8HY~g
z70(!oWDmOdvQJ=MA;rYQv!wk{L;Hah%o$AY=0Eype<2TSCXXxwLsGQD!OQv!P5>=r
N@O1TaS?83{1OT<2H^Kk_

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell_forward.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell_forward.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d01f637fec56b1bb4ef33e003baf45bede70907
GIT binary patch
literal 294
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}4?JBQLn2y}
z6C_v{Cy4Yk1sZU<StY21J^bJQ@V}wS=k+R4_Id|gdXE0LZ~I^W?~f)k2pI8BUObaI
zq0PSj-xSB7pjnDqPi2~yEHRnGU(BQ0cR;e`#WdkXk`gDnh4v^mybG@BQxH!mWzad7
zc(CuCMv2rjj-o|O=^O`mV$F_otY<vBRX=c1V@QMPxqtOM|NlRDCdS5ED&NL#zI{T<
zf<-sOCtYH^CeWa|3@Bg_v-|AP0|yQ`i0~#)X8N$J?0D7V|2#k-fA4>yfI!MYZ{_BW
iCEX(80bt)uWM=sJa#oXj+dGiQ89ZJ6T-G@yGywq6Kymc|

literal 0
HcmV?d00001


From 46fa0b9453c9a6e862c6c5f8d9c7754a685c0c8c Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 01:11:48 -0400
Subject: [PATCH 123/366] more foodsequence...

---
 .../Nutrition/Components/FoodSequenceElementComponent.cs   | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs b/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs
index a3955001328..af1d2832bdd 100644
--- a/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs
+++ b/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs
@@ -1,4 +1,3 @@
-using System.Numerics;
 using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Nutrition.Prototypes;
 using Content.Shared.Tag;
@@ -23,10 +22,4 @@ public sealed partial class FoodSequenceElementComponent : Component
     /// </summary>
     [DataField]
     public string Solution = "food";
-
-    /// <summary>
-    /// state used to generate the appearance of the added layer
-    /// </summary>
-    [DataField]
-    public SpriteSpecifier? Sprite;
 }
\ No newline at end of file

From b6dd9e6da798574ed029b9757631b8169176b3d5 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 01:23:51 -0400
Subject: [PATCH 124/366] hm

---
 .../EntitySystems/FoodSequenceSystem.cs       |  9 +-------
 .../Prototypes/Entities/Mobs/NPCs/animals.yml | 17 --------------
 .../Objects/Consumable/Food/ingredients.yml   | 18 ---------------
 .../Entities/Objects/Consumable/Food/meat.yml | 23 -------------------
 .../Objects/Consumable/Food/skewer.yml        | 12 ++++------
 5 files changed, 6 insertions(+), 73 deletions(-)

diff --git a/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs
index 731166ace44..b9774a73e52 100644
--- a/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs
@@ -1,5 +1,4 @@
 using System.Numerics;
-using System.Numerics;
 using System.Text;
 using Content.Server.Nutrition.Components;
 using Content.Shared.Chemistry.EntitySystems;
@@ -122,12 +121,6 @@ private bool TryAddFoodElement(Entity<FoodSequenceStartPointComponent> start, En
         if (!_proto.TryIndex(elementProto, out var elementIndexed))
             return false;
 
-        if (TryComp<FoodComponent>(element, out var elementFood) && elementFood.RequireDead)
-        {
-            if (_mobState.IsAlive(element))
-                return false;
-        }
-
         //if we run out of space, we can still put in one last, final finishing element.
         if (start.Comp.FoodLayers.Count >= start.Comp.MaxLayers && !elementIndexed.Final || start.Comp.Finished)
         {
@@ -262,4 +255,4 @@ private void MergeTags(EntityUid start, EntityUid element)
 
         _tag.TryAddTags(start, elementTags.Tags);
     }
-}
+}
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index a9cad4d7a70..b45d8e01b12 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1828,10 +1828,6 @@
   - type: Item
     size: Tiny
     heldPrefix: 1
-  - type: FoodSequenceElement
-    sprite:
-      sprite: Mobs/Animals/mouse.rsi
-      state: dead-1
 
 - type: entity
   parent: MobMouse
@@ -1861,10 +1857,6 @@
   - type: Item
     size: Tiny
     heldPrefix: 2
-  - type: FoodSequenceElement
-    sprite:
-      sprite: Mobs/Animals/mouse.rsi
-      state: dead-2
 
 - type: entity
   name: cancer mouse
@@ -3471,15 +3463,6 @@
   - type: FireVisuals
     sprite: Mobs/Effects/onfire.rsi
     normalState: Mouse_burning
-  - type: FoodSequenceElement
-    sprite:
-      sprite: Mobs/Animals/hamster.rsi
-      state: dead-0
-    entries:
-      burger:
-        name: food-sequence-burger-content-hamster
-      taco:
-        name: food-sequence-content-hamster
 
 - type: entity
   name: pig
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
index 041dbd84767..ffb52a7b0ff 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -569,15 +569,6 @@
   - type: Tag
     tags:
     - Slice
-  - type: FoodSequenceElement
-    sprite:
-      sprite: Objects/Consumable/Food/ingredients.rsi
-      state: chevredisk
-    entries:
-      burger:
-        name: food-sequence-content-chevre
-      taco: 
-        name: food-sequence-content-chevre
 
 - type: entity
   name: tofu
@@ -626,15 +617,6 @@
   - type: Tag
     tags:
     - Slice
-  - type: FoodSequenceElement
-    sprite:
-      sprite: Objects/Consumable/Food/ingredients.rsi
-      state: tofu
-    entries:
-      burger:
-        name: food-sequence-content-tofu
-      taco: 
-        name: food-sequence-content-tofu
 
 - type: entity
   name: burned mess
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index 8d650f26652..ce226b71a6c 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -629,15 +629,6 @@
     damage:
       types:
         Blunt: 2
-  - type: FoodSequenceElement
-    sprite:
-      sprite: Objects/Consumable/Food/salami.rsi
-      state: salami
-    entries:
-      burger:
-        name: food-sequence-content-salami
-      taco:
-        name: food-sequence-content-salami
 
 - type: entity
   name: meat clown
@@ -1094,13 +1085,6 @@
   - type: Construction
     graph: LizardSteak
     node: lizard steak
-  - type: FoodSequenceElement
-    sprite:
-      sprite: Objects/Consumable/Food/meat.rsi
-      state: lizard-cooked
-    entries:
-      Burger: MeatLizardBurger
-      Taco: MeatLizard
 
 - type: entity
   name: boiled spider leg
@@ -1623,13 +1607,6 @@
   - type: Construction
     graph: LizardCutlet
     node: lizard cutlet
-  - type: FoodSequenceElement
-    sprite:
-      sprite: Objects/Consumable/Food/meat.rsi
-      state: cutlet-cooked
-    entries:
-      Burger: LizardCutletBurger
-      Taco: LizardCutlet
 
 - type: entity
   name: spider cutlet
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
index abafdb33593..7687b41447a 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
@@ -63,15 +63,14 @@
 
 - type: entity
   name: double rat kebab
-  parent: FoodMeatKebab
+  parent: FoodKebabSkewer
   id: FoodMeatRatdoubleKebab
   description: A double serving of not so delicious rat meat, on a stick.
   components:
   - type: Sprite
     layers:
       - state: skewer
-      - state: skewer-rat1
-      - state: skewer-rat2
+      - state: skewer-rat
   - type: SolutionContainerManager
     solutions:
       food:
@@ -83,7 +82,7 @@
 
 - type: entity
   name: fiesta kebab
-  parent: FoodSkewerBase
+  parent: FoodKebabSkewer
   id: FoodMeatFiestaKebab
   description: Always a cruise ship party somewhere in the world, right?
   components:
@@ -97,15 +96,14 @@
 
 - type: entity
   name: snake kebab
-  parent: FoodSkewerBase
+  parent: FoodKebabSkewer
   id: FoodMeatSnakeKebab
   description: Snake meat on a stick. It's a little tough.
   components:
   - type: Sprite
     layers:
       - state: skewer
-      - state: skewer-snake1
-      - state: skewer-snake2
+      - state: skewer-snake
   - type: SolutionContainerManager
     solutions:
       food:

From c6fc9bf71eb31a369f059bc05730be7ac8f1dfb6 Mon Sep 17 00:00:00 2001
From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Sun, 8 Sep 2024 09:22:27 +0300
Subject: [PATCH 125/366] Metamorphosis - FoodSequence 3 (#31012)

* setup some data

* cheeseburger recipe

* Update FoodSequenceSystem.cs

* finalize cheseburger recipe

* remove fun

* return old taco sprites

* full foodsequence data refactor

* return tacos

* well done

* add cutlets to burger

* chickenburger recipe

* +2 burger recipes

* more fun

* Update brain.png

* some slice produce added

* documentation

* watermelon

* skewer work

* flipping

* tomato

* skewer watermelon

* Update skewer.yml

* oopsie, ok, im go to sleep

* fix checks

* Update produce.yml

* screwed

* cheeeeeeeese

* all cooked meat added

* produce added

* aaaaand suppermatter

* key to Tag

* More

* proto string remove

* raw snail

* fix

* Update FoodMetamorphableByAddingComponent.cs

* fixes

* fix3

* fififififx
---
 .../EntitySystems/ClientFoodSequenceSystem.cs |   1 -
 .../EntitySystems/FoodSequenceSystem.cs       |  12 +++--
 .../FoodSequenceElementComponent.cs           |   2 +-
 .../FoodSequenceStartPointComponent.cs        |   5 +--
 .../FoodSequenceElementPrototype.cs           |   9 +---
 .../nutrition/components/food-sequence.ftl    |   2 +-
 .../Entities/Objects/Consumable/Food/meat.yml |   8 ++++
 .../Recipes/Cooking/meal_recipes.yml          |  42 +++++++++++++-----
 Resources/Prototypes/tags.yml                 |  15 +++++++
 .../Consumable/Food/taco.rsi/beeftaco.png     | Bin 0 -> 303 bytes
 .../Food/taco.rsi/beeftacosupreme.png         | Bin 0 -> 307 bytes
 .../Consumable/Food/taco.rsi/chickentaco.png  | Bin 0 -> 308 bytes
 .../Food/taco.rsi/chickentacosupreme.png      | Bin 0 -> 309 bytes
 .../Consumable/Food/taco.rsi/fishtaco.png     | Bin 0 -> 286 bytes
 .../Consumable/Food/taco.rsi/meta.json        |  18 ++++++--
 .../Consumable/Food/taco.rsi/rattaco.png      | Bin 0 -> 329 bytes
 .../Food/taco.rsi/tacoshell_back.png          | Bin 171 -> 0 bytes
 .../Food/taco.rsi/tacoshell_forward.png       | Bin 294 -> 0 bytes
 18 files changed, 82 insertions(+), 32 deletions(-)
 create mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftaco.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftacosupreme.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentaco.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentacosupreme.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/fishtaco.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/rattaco.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell_back.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell_forward.png

diff --git a/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs b/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs
index 4019184af33..c708c6fe7d2 100644
--- a/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs
+++ b/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs
@@ -1,7 +1,6 @@
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
 using Robust.Client.GameObjects;
-using Robust.Shared.Utility;
 
 namespace Content.Client.Nutrition.EntitySystems;
 
diff --git a/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs
index b9774a73e52..d084dcf943b 100644
--- a/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs
@@ -116,8 +116,14 @@ private bool TryAddFoodElement(Entity<FoodSequenceStartPointComponent> start, En
             return false;
 
         //looking for a suitable FoodSequence prototype
-        if (!element.Comp.Entries.TryGetValue(start.Comp.Key, out var elementProto))
-            return false;
+        ProtoId<FoodSequenceElementPrototype> elementProto = string.Empty;
+        foreach (var pair in element.Comp.Entries)
+        {
+            if (pair.Key == start.Comp.Key)
+            {
+                elementProto = pair.Value;
+            }
+        }
         if (!_proto.TryIndex(elementProto, out var elementIndexed))
             return false;
 
@@ -133,7 +139,7 @@ private bool TryAddFoodElement(Entity<FoodSequenceStartPointComponent> start, En
         var flip = start.Comp.AllowHorizontalFlip && _random.Prob(0.5f);
         var layer = new FoodSequenceVisualLayer(elementIndexed,
             _random.Pick(elementIndexed.Sprites),
-            new Vector2(flip ? -elementIndexed.Scale.X : elementIndexed.Scale.X, elementIndexed.Scale.Y),
+            new Vector2(flip ? -1 : 1, 1),
             new Vector2(
                 _random.NextFloat(start.Comp.MinLayerOffset.X, start.Comp.MaxLayerOffset.X),
                 _random.NextFloat(start.Comp.MinLayerOffset.Y, start.Comp.MaxLayerOffset.Y))
diff --git a/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs b/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs
index af1d2832bdd..50bc786129c 100644
--- a/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs
+++ b/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs
@@ -22,4 +22,4 @@ public sealed partial class FoodSequenceElementComponent : Component
     /// </summary>
     [DataField]
     public string Solution = "food";
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs b/Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs
index d13c0994ef6..c87110287ad 100644
--- a/Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs
+++ b/Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs
@@ -111,9 +111,6 @@ public sealed partial class FoodSequenceStartPointComponent : Component
     [DataField]
     public Vector2 MinLayerOffset = Vector2.Zero;
 
-    /// <summary>
-    /// LocId with a name generation pattern.
-    /// </summary>
     [DataField]
     public bool AllowHorizontalFlip = true;
 
@@ -159,4 +156,4 @@ public FoodSequenceVisualLayer(ProtoId<FoodSequenceElementPrototype> proto,
         Scale = scale;
         LocalOffset = offset;
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Nutrition/Prototypes/FoodSequenceElementPrototype.cs b/Content.Shared/Nutrition/Prototypes/FoodSequenceElementPrototype.cs
index 931d8a35327..a3448715e4a 100644
--- a/Content.Shared/Nutrition/Prototypes/FoodSequenceElementPrototype.cs
+++ b/Content.Shared/Nutrition/Prototypes/FoodSequenceElementPrototype.cs
@@ -1,7 +1,6 @@
 using Content.Shared.Tag;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
-using System.Numerics;
 
 namespace Content.Shared.Nutrition.Prototypes;
 
@@ -19,12 +18,6 @@ public sealed partial class FoodSequenceElementPrototype : IPrototype
     [DataField]
     public List<SpriteSpecifier> Sprites { get; private set; } = new();
 
-    /// <summary>
-    /// Relative size of the sprite displayed in the food sequence.
-    /// </summary>
-    [DataField]
-    public Vector2 Scale { get; private set; } = Vector2.One;
-
     /// <summary>
     /// A localized name piece to build into the item name generator.
     /// </summary>
@@ -41,5 +34,5 @@ public sealed partial class FoodSequenceElementPrototype : IPrototype
     /// Tag list of this layer. Used for recipes for food metamorphosis.
     /// </summary>
     [DataField]
-    public List<ProtoId<TagPrototype>> Tags { get; set; } = new();
+    public List<ProtoId<TagPrototype>> Tags { get; set; }  = new();
 }
diff --git a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
index 35aa7531f03..36383a2c247 100644
--- a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
+++ b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
@@ -7,7 +7,7 @@ food-sequence-burger-suffix = burger
 
 food-sequence-content-chicken = chicken
 food-sequence-content-duck = duck
-food-sequence-content-crab = crabs
+food-sequence-content-crab = crab
 food-sequence-content-dragon = dragon
 food-sequence-content-snake = snake
 food-sequence-content-xeno = xeno
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index ce226b71a6c..6b7dc94b070 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -1085,6 +1085,10 @@
   - type: Construction
     graph: LizardSteak
     node: lizard steak
+  - type: FoodSequenceElement
+    entries:
+      Burger: MeatLizardBurger
+      Taco: MeatLizard
 
 - type: entity
   name: boiled spider leg
@@ -1607,6 +1611,10 @@
   - type: Construction
     graph: LizardCutlet
     node: lizard cutlet
+  - type: FoodSequenceElement
+    entries:
+      Burger: LizardCutletBurger
+      Taco: LizardCutlet
 
 - type: entity
   name: spider cutlet
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 5ad493a6515..c10943c4031 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -1832,6 +1832,26 @@
   solids:
     FoodDoughTortillaFlat: 1 # one third of a standard bread dough recipe
 
+- type: microwaveMealRecipe
+  id: RecipeTacoBeef
+  name: beef taco recipe
+  result: FoodTacoBeef
+  time: 10
+  solids:
+    FoodTacoShell: 1
+    FoodMeatCutlet: 1
+    FoodCheeseSlice: 1
+
+- type: microwaveMealRecipe
+  id: RecipeTacoChicken
+  name: chicken taco recipe
+  result: FoodTacoChicken
+  time: 10
+  solids:
+    FoodTacoShell: 1
+    FoodMeatChickenCutlet: 1
+    FoodCheeseSlice: 1
+
 - type: microwaveMealRecipe
   id: RecipeTacoFish
   name: fish taco recipe
@@ -1881,20 +1901,20 @@
     FoodOnionSlice: 2
 
 - type: microwaveMealRecipe
-  id: RecipeTacoBeef
-  name: beef taco recipe
-  result: FoodTacoBeef
-  time: 10
+  id: RecipeCroissant
+  name: croissant recipe
+  result: FoodBakedCroissant
+  time: 5
   solids:
-    FoodTacoShell: 1
-    FoodMeatCutlet: 1
-    FoodCheeseSlice: 1
+    FoodCroissantRaw: 1
+    FoodButterSlice: 1
 
 - type: microwaveMealRecipe
-  id: RecipeTacoChicken
-  name: chicken taco recipe
-  result: FoodTacoChicken
-  time: 10
+  id: RecipeThrowingCroissant
+  name: throwing croissant recipe
+  result: WeaponCroissant
+  secretRecipe: true
+  time: 5
   solids:
     FoodCroissantRaw: 1
     FoodButterSlice: 1
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 46a2f5f70e0..655b80267ad 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -226,6 +226,9 @@
 - type: Tag
   id: Brain
 
+- type: Tag
+  id: Brain
+
 - type: Tag
   id: BrassInstrument
 
@@ -250,6 +253,9 @@
 - type: Tag
   id: Burger
 
+- type: Tag
+  id: Burger
+
 - type: Tag
   id: BulletFoam
 
@@ -259,6 +265,9 @@
 - type: Tag
   id: Bun
 
+- type: Tag
+  id: Bun
+
 - type: Tag
   id: BypassDropChecks
 
@@ -383,6 +392,9 @@
 - type: Tag
   id: Cheese
 
+- type: Tag
+  id: Cheese
+
 # Allowed to control someone wearing a Chef's hat if inside their hat.
 - type: Tag
   id: ChefPilot
@@ -450,6 +462,9 @@
 - type: Tag
   id: Crab
 
+- type: Tag
+  id: Crab
+
 - type: Tag
   id: Crayon
 
diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftaco.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftaco.png
new file mode 100644
index 0000000000000000000000000000000000000000..36e605235b5993578cf56840cb42f74e8972b411
GIT binary patch
literal 303
zcmV+~0nq-5P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002?Nkl<ZScPL?
z7zLwX6pVsVFu;J398Lc}hW~&5{3(N^q%_0x=T8~VpS{VTrTUFQ(d;Y9<}s0?_}LAc
z|LB$%*S=&hG*)L&Q1@Zjx>WT4{ZrikNp%F#mPdxF{)agN7yW+@2T6_~Is_yor5Spg
z#o<23MKdrkFeqI5%aCNvM3f_lasYa;W22)|&O!J#CJf2*e=*EWWFyKEL?xQ7OGW={
zseWU)cAJY~$p!(2n1BxqFg`XqCh{wTx&#x$%@_X|j^4#@2T=~#vEKOqhxdON1O!<a
zh^3oL&N8S=Ffq(K`j4!fHVQ_;C>RB!U=)lT008pMpG64@mz4kj002ovPDHLkV1l}8
BfIa{K

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftacosupreme.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftacosupreme.png
new file mode 100644
index 0000000000000000000000000000000000000000..4db06131dce7e2f745568d4a6f0d1c1ccd2ccec3
GIT binary patch
literal 307
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJU!E?GArY;~2@<S}6GVEN0u2r{
zOqB8cZ{PO6{@)+X<|Ru^4u5{`FZoTr;-JET-xCj7|1ynyCdfPQ?uMWL|0n;bPq8uz
z5k2?+{DBYqpLv|E4?2^gboA4sThn<?*iD}@CGAD7So>#5yEbD3Ao!D>pm0mjg<Z00
z!{a6Wa}rlv)kv%eyLZgs{R{i1XTqXPM<V2=7V#b0ZkU(=1T$uzI5r{Wtc!t42Up`-
zZ`c3XE9;VXl+Er=Jjuq`Hlu-`$H30aO6`+&^DY+Q!)L|+OZ444n$I4{cVpwdAOG9G
z*GsUlL`rllo$Y<jXoa_dpeQfYi(GC8Pp~oE>6^3g;Tf$kU??zny85}Sb4q9e0G()r
AO#lD@

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentaco.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentaco.png
new file mode 100644
index 0000000000000000000000000000000000000000..014e20c0e96aefc2e7f7135cc4fa58815e276643
GIT binary patch
literal 308
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ-<~dxArY;~2@<S}6GVEN0u2r{
zOqB8cZ{PO6{@)+X<|Ru^4u5{`FL`eM-jfTK{_1tS_(uEWGsB6Ce%$1p{r|-@@$36i
z3{1k(0|LG$-q;oL<^SK{JO4dPSuRd<Z(H@R-I7WCZ#^HoXP<%<i;C(}$*S2$AKD#v
zH8wCX(1`hUx*$1NG_X(M6yuA7eZ75Nmh2C2&oH<nqMZ~_fAx4lN*ar!yTH_pZF-`A
z*8}Z-cq>=0O;wsjB8kb);J}X?FK$OKm3Y$QEGaiP_Uwae71HZvT`UuhS3UkOfA4>y
zfIv#3!nCwqA37VoPt7=}R?8Y`nG5zIm)k)N2}=fstI7)wg!cYh0SpEPPgg&ebxsLQ
E0H<SwZvX%Q

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentacosupreme.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentacosupreme.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac07ed66b23d391c249f50a619299249f198cdb0
GIT binary patch
literal 309
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJKb|g*ArY;~2@<S}6GVEN0u2r{
zOqB8cZ{PO6{@)+X<|Ru^4u5{`FZoTr;-JET-xCj7|1ynyCdfPQ?uMWL|0n;bPq8uz
z5k2?+{DBYqpLv|E4?2^gboA4sThn<?*iD}@CGAD7So>#5yEbD3Ao!D>pm0mjg<Z00
z!{a6Wa}rlv)kyrXqpJO&S}m*N=T0uhB%OXQOZJDiXMj{2L>T8M?AW-nE5SoRlqq_8
z*T3sQe~%TsH4{HPiI<7TkWpSDp(f|c<<I+glqPxc<j=dWEWzbsnQ*-7@qhVy{}TlS
zQW6!WrS1CA>3Gg!isRw+z1u94!CvHYJE$S?iGg9qrP&{%{CtIh;lSYO>gTe~DWM4f
DruKs)

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/fishtaco.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/fishtaco.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a2a6055234cfd987914d15b9d79ec33f83adfec
GIT binary patch
literal 286
zcmV+(0pb3MP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002xNkl<ZScPL?
z7zLwX6pVsVFu;J398Lc}hW~&5{3(N^q%_0x=T8~VpS{VT|MC@sOc5hl<`E5^-LU!p
z|6}-nWI8fb70zdvEAanG-~azKvmDtnT=b&<tN-6W#Z7%j;IkBk{{R2~qW`P^Gt3nr
z$`MS&T8<p&*yyN~a}fSbTZUMM5Qx63O#~f5RHE6sRP?`=>NkdKx49UWY!G0G3HZPO
z<71<lFEB93I(0KV-dD;Xm-ZE}9Yi@`$9m)cAKw3A5D;WxAePp8eS_i6`>zZ}<>ckG
kQ7{Td!6+C7qhRC!0KPrHzdt#tZ~y=R07*qoM6N<$f+7}!E&u=k

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json
index 70d759b93fb..71bda2cd422 100644
--- a/Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json
@@ -1,17 +1,29 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Original sprite by Phunny, redrawn by TheShuEd",
+  "copyright": "Added by Phunny",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "tacoshell_back"
+      "name": "beeftaco"
     },
     {
-      "name": "tacoshell_forward"
+      "name": "beeftacosupreme"
+    },
+    {
+      "name": "chickentaco"
+    },
+    {
+      "name": "chickentacosupreme"
+    },
+    {
+      "name": "fishtaco"
+    },
+    {
+      "name": "rattaco"
     }
   ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/rattaco.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/rattaco.png
new file mode 100644
index 0000000000000000000000000000000000000000..f80673f6a685cd9786f0c9bbf1d7fa7f196a0d04
GIT binary patch
literal 329
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFba6OIEF;DCMQU+E=~~XX$mwr
z&@fTP_rHDH|N4J_G@F+!F**GCxxeJO`Fl?;So*8i@!}iplg|tvZe6kbxxLZ<o4m9C
zznCU|eP4=!NmzP7!1u%(yF$MF{~LVgf8k7bu?EXWAQclAuKJ(Ycfj@k{KFsr|Cixg
zB<pCvBH`^NAt@mtp`yA}vTF9xhjzzZ&nM40bpQwq%HPE-l4-omcw*XOc55>$t*0^|
zhcqw$S~E$e(fs0prux|_>dn($nYU$c-zhOIM<Aht^9RH8<i+7{*C%V}>!;7KF4w!W
zX36#Sk`mfl25*$LuD*-N|MUOwZ+jl5CLNw5m&Eg17tRQbi}MTXlZN@6tIeK)VY$)<
V(S(VT>wrPT;OXk;vd$@?2>|nika++A

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell_back.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell_back.png
deleted file mode 100644
index 979a8a92d8114e28d279275fdcafa9294c85e8cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 171
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}sh%#5ArY;~
z2@<S}6GVEN0u8v_tP+;EeD13J^}q7we8Y^Db;$`p5Mc7#Yg46&CBtlIk5ZOU8HY~g
z70(!oWDmOdvQJ=MA;rYQv!wk{L;Hah%o$AY=0Eype<2TSCXXxwLsGQD!OQv!P5>=r
N@O1TaS?83{1OT<2H^Kk_

diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell_forward.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell_forward.png
deleted file mode 100644
index 4d01f637fec56b1bb4ef33e003baf45bede70907..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 294
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}4?JBQLn2y}
z6C_v{Cy4Yk1sZU<StY21J^bJQ@V}wS=k+R4_Id|gdXE0LZ~I^W?~f)k2pI8BUObaI
zq0PSj-xSB7pjnDqPi2~yEHRnGU(BQ0cR;e`#WdkXk`gDnh4v^mybG@BQxH!mWzad7
zc(CuCMv2rjj-o|O=^O`mV$F_otY<vBRX=c1V@QMPxqtOM|NlRDCdS5ED&NL#zI{T<
zf<-sOCtYH^CeWa|3@Bg_v-|AP0|yQ`i0~#)X8N$J?0D7V|2#k-fA4>yfI!MYZ{_BW
iCEX(80bt)uWM=sJa#oXj+dGiQ89ZJ6T-G@yGywq6Kymc|


From 3f02c79fa62eb4d7de053f3181962c9f858d7c42 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Mon, 8 Jul 2024 11:03:53 +0200
Subject: [PATCH 126/366] Improve throwing precision (#29726)

* improve throwing precision

* remove debugging logs

* minor fixes

* f

* Update Content.Shared/Throwing/LandAtCursorComponent.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
---
 .../Throwing/ThrownItemVisualizerSystem.cs    |  1 -
 Content.Server/Hands/Systems/HandsSystem.cs   | 12 +--
 Content.Server/Lube/LubedSystem.cs            |  2 +-
 .../EntitySystems/ContainmentFieldSystem.cs   |  2 +-
 .../Hands/Components/HandsComponent.cs        |  6 +-
 Content.Shared/Throwing/BeforeThrowEvent.cs   |  6 +-
 .../Throwing/LandAtCursorComponent.cs         | 12 +++
 Content.Shared/Throwing/ThrowingSystem.cs     | 80 +++++++++++++------
 Content.Shared/Throwing/ThrownItemSystem.cs   |  2 +-
 .../Prototypes/Entities/Objects/Fun/darts.yml |  1 +
 .../Objects/Specific/Janitorial/janitor.yml   |  1 +
 .../Guns/Ammunition/Projectiles/toy.yml       | 37 ++++++---
 .../Entities/Objects/Weapons/Melee/knife.yml  | 12 +++
 .../Entities/Objects/Weapons/Melee/spear.yml  |  1 +
 .../Objects/Weapons/Throwable/bola.yml        |  8 ++
 .../Objects/Weapons/Throwable/clusterbang.yml |  2 +
 .../Weapons/Throwable/throwing_stars.yml      |  1 +
 17 files changed, 134 insertions(+), 52 deletions(-)
 create mode 100644 Content.Shared/Throwing/LandAtCursorComponent.cs

diff --git a/Content.Client/Throwing/ThrownItemVisualizerSystem.cs b/Content.Client/Throwing/ThrownItemVisualizerSystem.cs
index b25b4fbb7de..28a07ae94a7 100644
--- a/Content.Client/Throwing/ThrownItemVisualizerSystem.cs
+++ b/Content.Client/Throwing/ThrownItemVisualizerSystem.cs
@@ -59,7 +59,6 @@ private void OnShutdown(EntityUid uid, ThrownItemComponent component, ComponentS
         if (length <= TimeSpan.Zero)
             return null;
 
-        length += TimeSpan.FromSeconds(ThrowingSystem.FlyTime);
         var scale = ent.Comp2.Scale;
         var lenFloat = (float) length.TotalSeconds;
 
diff --git a/Content.Server/Hands/Systems/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs
index 23b503caefd..c68d367d0ce 100644
--- a/Content.Server/Hands/Systems/HandsSystem.cs
+++ b/Content.Server/Hands/Systems/HandsSystem.cs
@@ -233,17 +233,11 @@ hands.ActiveHandEntity is not { } throwEnt ||
             var distance = Math.Clamp(length, minDistance, hands.ThrowRange);
             direction *= distance / length;
 
-            var throwStrength = hands.ThrowForceMultiplier;
+            var throwSpeed = hands.BaseThrowspeed;
 
             // Let other systems change the thrown entity (useful for virtual items)
             // or the throw strength.
-            var itemEv = new BeforeGettingThrownEvent(throwEnt, direction, throwStrength, player);
-            RaiseLocalEvent(throwEnt, ref itemEv);
-
-            if (itemEv.Cancelled)
-                return true;
-
-            var ev = new BeforeThrowEvent(throwEnt, direction, throwStrength, player);
+            var ev = new BeforeThrowEvent(throwEnt, direction, throwSpeed, player);
             RaiseLocalEvent(player, ref ev);
 
             if (ev.Cancelled)
@@ -253,7 +247,7 @@ hands.ActiveHandEntity is not { } throwEnt ||
             if (IsHolding(player, throwEnt, out _, hands) && !TryDrop(player, throwEnt, handsComp: hands))
                 return false;
 
-            _throwingSystem.TryThrow(ev.ItemUid, ev.Direction, ev.ThrowStrength, ev.PlayerUid);
+            _throwingSystem.TryThrow(ev.ItemUid, ev.Direction, ev.ThrowSpeed, ev.PlayerUid, compensateFriction: !HasComp<LandAtCursorComponent>(ev.ItemUid));
 
             return true;
         }
diff --git a/Content.Server/Lube/LubedSystem.cs b/Content.Server/Lube/LubedSystem.cs
index c2d15c8a284..3c536dcceb2 100644
--- a/Content.Server/Lube/LubedSystem.cs
+++ b/Content.Server/Lube/LubedSystem.cs
@@ -43,7 +43,7 @@ private void OnHandPickUp(EntityUid uid, LubedComponent component, ContainerGett
         var user = args.Container.Owner;
         _transform.SetCoordinates(uid, Transform(user).Coordinates);
         _transform.AttachToGridOrMap(uid);
-        _throwing.TryThrow(uid, _random.NextVector2(), strength: component.SlipStrength);
+        _throwing.TryThrow(uid, _random.NextVector2(), baseThrowSpeed: component.SlipStrength);
         _popup.PopupEntity(Loc.GetString("lube-slip", ("target", Identity.Entity(uid, EntityManager))), user, user, PopupType.MediumCaution);
     }
 
diff --git a/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs b/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs
index 561db76a470..9488cc24e4d 100644
--- a/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs
@@ -37,7 +37,7 @@ private void HandleFieldCollide(EntityUid uid, ContainmentFieldComponent compone
             var fieldDir = Transform(uid).WorldPosition;
             var playerDir = Transform(otherBody).WorldPosition;
 
-            _throwing.TryThrow(otherBody, playerDir-fieldDir, strength: component.ThrowForce);
+            _throwing.TryThrow(otherBody, playerDir-fieldDir, baseThrowSpeed: component.ThrowForce);
         }
     }
 
diff --git a/Content.Shared/Hands/Components/HandsComponent.cs b/Content.Shared/Hands/Components/HandsComponent.cs
index a7464e5bac7..f61e0600436 100644
--- a/Content.Shared/Hands/Components/HandsComponent.cs
+++ b/Content.Shared/Hands/Components/HandsComponent.cs
@@ -39,11 +39,11 @@ public sealed partial class HandsComponent : Component
     public bool DisableExplosionRecursion = false;
 
     /// <summary>
-    ///     The amount of throw impulse per distance the player is from the throw target.
+    ///     Modifies the speed at which items are thrown.
     /// </summary>
-    [DataField("throwForceMultiplier")]
+    [DataField]
     [ViewVariables(VVAccess.ReadWrite)]
-    public float ThrowForceMultiplier { get; set; } = 10f; //should be tuned so that a thrown item lands about under the player's cursor
+    public float BaseThrowspeed { get; set; } = 10f;
 
     /// <summary>
     ///     Distance after which longer throw targets stop increasing throw impulse.
diff --git a/Content.Shared/Throwing/BeforeThrowEvent.cs b/Content.Shared/Throwing/BeforeThrowEvent.cs
index f949c16b0ea..00a1a90b74c 100644
--- a/Content.Shared/Throwing/BeforeThrowEvent.cs
+++ b/Content.Shared/Throwing/BeforeThrowEvent.cs
@@ -5,17 +5,17 @@ namespace Content.Shared.Throwing;
 [ByRefEvent]
 public struct BeforeThrowEvent
 {
-    public BeforeThrowEvent(EntityUid itemUid, Vector2 direction, float throwStrength,  EntityUid playerUid)
+    public BeforeThrowEvent(EntityUid itemUid, Vector2 direction, float throwSpeed,  EntityUid playerUid)
     {
         ItemUid = itemUid;
         Direction = direction;
-        ThrowStrength = throwStrength;
+        ThrowSpeed = throwSpeed;
         PlayerUid = playerUid;
     }
 
     public EntityUid ItemUid { get; set; }
     public Vector2 Direction { get; }
-    public float ThrowStrength { get; set;}
+    public float ThrowSpeed { get; set;}
     public EntityUid PlayerUid { get; }
 
     public bool Cancelled = false;
diff --git a/Content.Shared/Throwing/LandAtCursorComponent.cs b/Content.Shared/Throwing/LandAtCursorComponent.cs
new file mode 100644
index 00000000000..f8e99e2fc87
--- /dev/null
+++ b/Content.Shared/Throwing/LandAtCursorComponent.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Throwing
+{
+    /// <summary>
+    ///     Makes an item land at the cursor when thrown and slide a little further.
+    ///     Without it the item lands slightly in front and stops moving at the cursor.
+    ///     Use this for throwing weapons that should pierce the opponent, for example spears.
+    /// </summary>
+    [RegisterComponent, NetworkedComponent]
+    public sealed partial class LandAtCursorComponent : Component { }
+}
diff --git a/Content.Shared/Throwing/ThrowingSystem.cs b/Content.Shared/Throwing/ThrowingSystem.cs
index 7d94ada924d..56bbf4c2bf3 100644
--- a/Content.Shared/Throwing/ThrowingSystem.cs
+++ b/Content.Shared/Throwing/ThrowingSystem.cs
@@ -1,13 +1,12 @@
 using System.Numerics;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Camera;
+using Content.Shared.CCVar;
 using Content.Shared.Database;
+using Content.Shared.Friction;
 using Content.Shared.Gravity;
-using Content.Shared.Hands.Components;
-using Content.Shared.Hands.EntitySystems;
-using Content.Shared.Interaction;
 using Content.Shared.Projectiles;
-using Content.Shared.Tag;
+using Robust.Shared.Configuration;
 using Robust.Shared.Map;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
@@ -31,7 +30,10 @@ public sealed class ThrowingSystem : EntitySystem
     /// The minimum amount of time an entity needs to be thrown before the timer can be run.
     /// Anything below this threshold never enters the air.
     /// </summary>
-    public const float FlyTime = 0.15f;
+    public const float MinFlyTime = 0.15f;
+    public const float FlyTimePercentage = 0.8f;
+
+    private float _frictionModifier;
 
     [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly SharedGravitySystem _gravity = default!;
@@ -40,13 +42,23 @@ public sealed class ThrowingSystem : EntitySystem
     [Dependency] private readonly ThrownItemSystem _thrownSystem = default!;
     [Dependency] private readonly SharedCameraRecoilSystem _recoil = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly IConfigurationManager _configManager = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        Subs.CVar(_configManager, CCVars.TileFrictionModifier, value => _frictionModifier = value, true);
+    }
 
     public void TryThrow(
         EntityUid uid,
         EntityCoordinates coordinates,
-        float strength = 1.0f,
+        float baseThrowSpeed = 10.0f,
         EntityUid? user = null,
         float pushbackRatio = PushbackDefault,
+        float? friction = null,
+        bool compensateFriction = false,
         bool recoil = true,
         bool animated = true,
         bool playSound = true,
@@ -58,7 +70,7 @@ public void TryThrow(
         if (mapPos.MapId != thrownPos.MapId)
             return;
 
-        TryThrow(uid, mapPos.Position - thrownPos.Position, strength, user, pushbackRatio, recoil: recoil, animated: animated, playSound: playSound, doSpin: doSpin);
+        TryThrow(uid, mapPos.Position - thrownPos.Position, baseThrowSpeed, user, pushbackRatio, friction, compensateFriction: compensateFriction, recoil: recoil, animated: animated, playSound: playSound, doSpin: doSpin);
     }
 
     /// <summary>
@@ -66,14 +78,18 @@ public void TryThrow(
     /// </summary>
     /// <param name="uid">The entity being thrown.</param>
     /// <param name="direction">A vector pointing from the entity to its destination.</param>
-    /// <param name="strength">How much the direction vector should be multiplied for velocity.</param>
+    /// <param name="baseThrowSpeed">Throw velocity. Gets modified if compensateFriction is true.</param>
     /// <param name="pushbackRatio">The ratio of impulse applied to the thrower - defaults to 10 because otherwise it's not enough to properly recover from getting spaced</param>
+    /// <param name="friction">friction value used for the distance calculation. If set to null this defaults to the standard tile values</param>
+    /// <param name="compensateFriction">True will adjust the throw so the item stops at the target coordinates. False means it will land at the target and keep sliding.</param>
     /// <param name="doSpin">Whether spin will be applied to the thrown entity.</param>
     public void TryThrow(EntityUid uid,
         Vector2 direction,
-        float strength = 1.0f,
+        float baseThrowSpeed = 10.0f,
         EntityUid? user = null,
         float pushbackRatio = PushbackDefault,
+        float? friction = null,
+        bool compensateFriction = false,
         bool recoil = true,
         bool animated = true,
         bool playSound = true,
@@ -91,9 +107,10 @@ public void TryThrow(EntityUid uid,
             physics,
             Transform(uid),
             projectileQuery,
-            strength,
+            baseThrowSpeed,
             user,
-            pushbackRatio, recoil: recoil, animated: animated, playSound: playSound, doSpin: doSpin);
+            pushbackRatio,
+            friction, compensateFriction: compensateFriction, recoil: recoil, animated: animated, playSound: playSound, doSpin: doSpin);
     }
 
     /// <summary>
@@ -101,23 +118,27 @@ public void TryThrow(EntityUid uid,
     /// </summary>
     /// <param name="uid">The entity being thrown.</param>
     /// <param name="direction">A vector pointing from the entity to its destination.</param>
-    /// <param name="strength">How much the direction vector should be multiplied for velocity.</param>
+    /// <param name="baseThrowSpeed">Throw velocity. Gets modified if compensateFriction is true.</param>
     /// <param name="pushbackRatio">The ratio of impulse applied to the thrower - defaults to 10 because otherwise it's not enough to properly recover from getting spaced</param>
+    /// <param name="friction">friction value used for the distance calculation. If set to null this defaults to the standard tile values</param>
+    /// <param name="compensateFriction">True will adjust the throw so the item stops at the target coordinates. False means it will land at the target and keep sliding.</param>
     /// <param name="doSpin">Whether spin will be applied to the thrown entity.</param>
     public void TryThrow(EntityUid uid,
         Vector2 direction,
         PhysicsComponent physics,
         TransformComponent transform,
         EntityQuery<ProjectileComponent> projectileQuery,
-        float strength = 1.0f,
+        float baseThrowSpeed = 10.0f,
         EntityUid? user = null,
         float pushbackRatio = PushbackDefault,
+        float? friction = null,
+        bool compensateFriction = false,
         bool recoil = true,
         bool animated = true,
         bool playSound = true,
         bool doSpin = true)
     {
-        if (strength <= 0 || direction == Vector2Helpers.Infinity || direction == Vector2Helpers.NaN || direction == Vector2.Zero)
+        if (baseThrowSpeed <= 0 || direction == Vector2Helpers.Infinity || direction == Vector2Helpers.NaN || direction == Vector2.Zero || friction < 0)
             return;
 
         if ((physics.BodyType & (BodyType.Dynamic | BodyType.KinematicController)) == 0x0)
@@ -136,16 +157,22 @@ public void TryThrow(EntityUid uid,
             Animate = animated,
         };
 
-        // Estimate time to arrival so we can apply OnGround status and slow it much faster.
-        var time = direction.Length() / strength;
+        // if not given, get the default friction value for distance calculation
+        var tileFriction = friction ?? _frictionModifier * TileFrictionController.DefaultFriction;
+
+        if (tileFriction == 0f)
+            compensateFriction = false; // cannot calculate this if there is no friction
+
+        // Set the time the item is supposed to be in the air so we can apply OnGround status.
+        // This is a free parameter, but we should set it to something reasonable.
+        var flyTime = direction.Length() / baseThrowSpeed;
+        if (compensateFriction)
+            flyTime *= FlyTimePercentage;
+
+        if (flyTime < MinFlyTime)
+            flyTime = 0f;
         comp.ThrownTime = _gameTiming.CurTime;
-        // TODO: This is a bandaid, don't do this.
-        // if you want to force landtime have the caller handle it or add a new method.
-        // did we launch this with something stronger than our hands?
-        if (TryComp<HandsComponent>(comp.Thrower, out var hands) && strength > hands.ThrowForceMultiplier)
-            comp.LandTime = comp.ThrownTime + TimeSpan.FromSeconds(time);
-        else
-            comp.LandTime = time < FlyTime ? default : comp.ThrownTime + TimeSpan.FromSeconds(time - FlyTime);
+        comp.LandTime = comp.ThrownTime + TimeSpan.FromSeconds(flyTime);
         comp.PlayLandSound = playSound;
         AddComp(uid, comp, true);
 
@@ -173,7 +200,12 @@ public void TryThrow(EntityUid uid,
         if (user != null)
             _adminLogger.Add(LogType.Throw, LogImpact.Low, $"{ToPrettyString(user.Value):user} threw {ToPrettyString(uid):entity}");
 
-        var impulseVector = direction.Normalized() * strength * physics.Mass;
+        // if compensateFriction==true compensate for the distance the item will slide over the floor after landing by reducing the throw speed accordingly.
+        // else let the item land on the cursor and from where it slides a little further.
+        // This is an exact formula we get from exponentially decaying velocity after landing.
+        // If someone changes how tile friction works at some point, this will have to be adjusted.
+        var throwSpeed = compensateFriction ? direction.Length() / (flyTime + 1 / tileFriction) : baseThrowSpeed;
+        var impulseVector = direction.Normalized() * throwSpeed * physics.Mass;
         _physics.ApplyLinearImpulse(uid, impulseVector, body: physics);
 
         if (comp.LandTime == null || comp.LandTime <= TimeSpan.Zero)
diff --git a/Content.Shared/Throwing/ThrownItemSystem.cs b/Content.Shared/Throwing/ThrownItemSystem.cs
index f607a2dc934..5f6dbbab35e 100644
--- a/Content.Shared/Throwing/ThrownItemSystem.cs
+++ b/Content.Shared/Throwing/ThrownItemSystem.cs
@@ -163,7 +163,7 @@ public override void Update(float frameTime)
                     LandComponent(uid, thrown, physics, thrown.PlayLandSound);
                 }
 
-                var stopThrowTime = (thrown.LandTime ?? thrown.ThrownTime) + TimeSpan.FromSeconds(ThrowingSystem.FlyTime);
+                var stopThrowTime = thrown.LandTime ?? thrown.ThrownTime;
                 if (stopThrowTime <= _gameTiming.CurTime)
                 {
                     StopThrow(uid, thrown);
diff --git a/Resources/Prototypes/Entities/Objects/Fun/darts.yml b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
index 4c7ae68420b..b02797917c6 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/darts.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
@@ -10,6 +10,7 @@
     offset: 0.0,0.0
   - type: ThrowingAngle
     angle: 315
+  - type: LandAtCursor
   - type: Fixtures
     fixtures:
       fix1:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index 2aee628394f..cb556c7d4d9 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -244,6 +244,7 @@
     embedOnThrow: True
   - type: ThrowingAngle
     angle: 0
+  - type: LandAtCursor
   - type: Ammo
     muzzleFlash: null
   - type: Projectile
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml
index 34a39c1583e..14595bd34a2 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml
@@ -4,12 +4,31 @@
   name: foam dart
   parent: BaseItem
   components:
-    - type: Tag
-      tags:
-        - BulletFoam
-        - Trash
-    - type: Ammo
-    - type: Sprite
-      sprite: Objects/Fun/toys.rsi
-      layers:
-        - state: foamdart
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PolygonShape
+          vertices:
+            - -0.05,-0.15
+            - -0.05,0.25
+            - 0.05,-0.15
+            - 0.05,0.25
+        density: 20
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
+  - type: Tag
+    tags:
+      - BulletFoam
+      - Trash
+  - type: Ammo
+  - type: Sprite
+    sprite: Objects/Fun/toys.rsi
+    layers:
+      - state: foamdart
+  - type: EmbeddableProjectile
+    removalTime: .2
+  - type: ThrowingAngle
+    angle: 180
+  - type: LandAtCursor
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index 1d9302305c3..c9613a68dfd 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -116,6 +116,14 @@
     attackRate: .6666
     damage:
       types:
+        Slash: 12
+  - type: EmbeddableProjectile
+    sound: /Audio/Weapons/star_hit.ogg
+  - type: LandAtCursor
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Slash: 10
         Slash: 9
   - type: ThrowingAngle
     angle: 225
@@ -182,6 +190,7 @@
         Slash: 5
   - type: DamageOtherOnHit
     staminaCost: 5
+  - type: LandAtCursor
   - type: EmbeddableProjectile
   - type: EmbedPassiveDamage
   - type: Sprite
@@ -306,6 +315,9 @@
     damage:
       types:
         Slash: 5
+  - type: EmbeddableProjectile
+    sound: /Audio/Weapons/star_hit.ogg
+  - type: LandAtCursor
   - type: DamageOtherOnHit
     ignoreResistances: true
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
index ca5efc2daf4..dcfd1537c79 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
@@ -9,6 +9,7 @@
   - type: EmbedPassiveDamage
   - type: ThrowingAngle
     angle: 225
+  - type: LandAtCursor
   - type: Tag
     tags:
     - Spear
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
index 7bbd0fe8935..f40f599e51c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
@@ -70,3 +70,11 @@
       Heat: 5
   - type: Ensnaring
     destroyOnRemove: true
+    freeTime: 2.0
+    breakoutTime: 3.5 #all bola should generally be fast to remove
+    walkSpeed: 0.7 #makeshift bola shouldn't slow too much
+    sprintSpeed: 0.7
+    staminaDamage: 55 # Sudden weight increase sapping stamina
+    canThrowTrigger: true
+    canMoveBreakout: true
+  - type: LandAtCursor
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml
index 36d4c947fcd..3f3ae0258d6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml
@@ -96,6 +96,7 @@
     damage:
       types:
         Blunt: 10
+  - type: LandAtCursor
   - type: Damageable
     damageContainer: Inorganic
   - type: EmitSoundOnTrigger
@@ -224,6 +225,7 @@
     damage:
       types:
         Blunt: 10
+  - type: LandAtCursor
   - type: EmitSoundOnTrigger
     sound:
       path: "/Audio/Effects/flash_bang.ogg"
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/throwing_stars.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/throwing_stars.yml
index 293d284d526..b6054124794 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/throwing_stars.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/throwing_stars.yml
@@ -31,6 +31,7 @@
         friction: 0.2
   - type: EmbeddableProjectile
     sound: /Audio/Weapons/star_hit.ogg
+  - type: LandAtCursor
   - type: DamageOtherOnHit
     damage:
       types:

From 4b73dce4c897d7d3c44037b9e59ad66b95b5ffb6 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 01:43:49 -0400
Subject: [PATCH 127/366] mew

---
 .../Objects/Consumable/Food/skewer.yml        |   8 +-
 .../Entities/Objects/Misc/paper.yml           |   1 +
 Resources/Prototypes/Hydroponics/seeds.yml    | 118 ------------------
 Resources/Prototypes/tags.yml                 |  15 ---
 4 files changed, 5 insertions(+), 137 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
index 7687b41447a..3f75a5c8c82 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
@@ -89,10 +89,10 @@
   - type: Sprite
     layers:
       - state: skewer
-      - state: skewer-pepper4
-      - state: skewer-corn2
-      - state: skewer-mushroom2
-      - state: skewer-tomato1
+      - state: skewer-pepper
+      - state: skewer-corn
+      - state: skewer-mushroom
+      - state: skewer-tomato
 
 - type: entity
   name: snake kebab
diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index cc12965a953..199b41a3bc4 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -354,6 +354,7 @@
   id: PenEmbeddable
   abstract: true
   components:
+  - type: LandAtCursor
   - type: DamageOtherOnHit
     damage:
       types:
diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index 1111343d34f..ea841919057 100644
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -52,32 +52,6 @@
       Max: 20
       PotencyDivisor: 20
 
-- type: seed
-  id: meatwheat
-  name: seeds-meatwheat-name
-  noun: seeds-noun-seeds
-  displayName: seeds-meatwheat-display-name
-  plantRsi: Objects/Specific/Hydroponics/meatwheat.rsi
-  packetPrototype: MeatwheatSeeds
-  productPrototypes:
-    - MeatwheatBushel
-  lifespan: 25
-  maturation: 6
-  production: 3
-  yield: 3
-  potency: 5
-  idealLight: 8
-  nutrientConsumption: 0.40
-  chemicals:
-    Nutriment:
-      Min: 1
-      Max: 20
-      PotencyDivisor: 20
-    UncookedAnimalProteins:
-      Min: 5
-      Max: 20
-      PotencyDivisor: 20
-
 - type: seed
   id: oat
   name: seeds-oat-name
@@ -370,36 +344,6 @@
       Max: 4
       PotencyDivisor: 25
 
-- type: seed
-  id: extradimensionalOrange
-  name: seeds-extradimensionalorange-name
-  noun: seeds-noun-seeds
-  displayName: seeds-extradimensionalorange-display-name
-  plantRsi: Objects/Specific/Hydroponics/extradimensional_orange.rsi
-  packetPrototype: ExtradimensionalOrangeSeeds
-  productPrototypes:
-    - FoodExtradimensionalOrange
-  harvestRepeat: Repeat
-  lifespan: 55
-  maturation: 6
-  production: 6
-  yield: 3
-  potency: 10
-  idealLight: 8
-  chemicals:
-    Haloperidol:
-      Min: 1
-      Max: 5
-      PotencyDivisor: 20
-    Nutriment:
-      Min: 1
-      Max: 5
-      PotencyDivisor: 20
-    Vitamin:
-      Min: 1
-      Max: 4
-      PotencyDivisor: 25
-
 - type: seed
   id: pineapple
   name: seeds-pineapple-name
@@ -1674,35 +1618,6 @@
       Max: 5
       PotencyDivisor: 20
 
-- type: seed
-  id: holymelon
-  name: seeds-holymelon-name
-  noun: seeds-noun-seeds
-  displayName: seeds-holymelon-display-name
-  plantRsi: Objects/Specific/Hydroponics/holymelon.rsi
-  packetPrototype: HolymelonSeeds
-  productPrototypes:
-    - FoodHolymelon
-  lifespan: 55
-  maturation: 12
-  production: 3
-  yield: 1
-  potency: 1
-  idealLight: 8
-  chemicals:
-    Nutriment:
-      Min: 1
-      Max: 10
-      PotencyDivisor: 10
-    Holywater:
-      Min: 1
-      Max: 10
-      PotencyDivisor: 10
-    Vitamin:
-      Min: 1
-      Max: 5
-      PotencyDivisor: 20
-
 - type: seed
   id: cocoa
   name: seeds-cocoa-name
@@ -1850,39 +1765,6 @@
       Max: 2
       PotencyDivisor: 50
 
-- type: seed
-  id: worldPea
-  name: seeds-worldpea-name
-  noun: seeds-noun-seeds
-  displayName: seeds-worldpea-display-name
-  plantRsi: Objects/Specific/Hydroponics/world_pea.rsi
-  packetPrototype: PeaSeeds
-  productPrototypes:
-    - FoodWorldPeas
-  lifespan: 25
-  growthStages: 3
-  maturation: 20
-  production: 6
-  yield: 3
-  potency: 25
-  idealLight: 8
-  harvestRepeat: Repeat
-  nutrientConsumption: 0.5
-  waterConsumption: 0.5
-  chemicals:
-    Happiness:
-      Min: 1
-      Max: 3
-      PotencyDivisor: 25
-    Nutriment:
-      Min: 1
-      Max: 3
-      PotencyDivisor: 20
-    Pax:
-      Min: 1
-      Max: 2
-      PotencyDivisor: 50
-
 - type: seed
   id: pumpkin
   name: seeds-pumpkin-name
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 655b80267ad..46a2f5f70e0 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -226,9 +226,6 @@
 - type: Tag
   id: Brain
 
-- type: Tag
-  id: Brain
-
 - type: Tag
   id: BrassInstrument
 
@@ -253,9 +250,6 @@
 - type: Tag
   id: Burger
 
-- type: Tag
-  id: Burger
-
 - type: Tag
   id: BulletFoam
 
@@ -265,9 +259,6 @@
 - type: Tag
   id: Bun
 
-- type: Tag
-  id: Bun
-
 - type: Tag
   id: BypassDropChecks
 
@@ -392,9 +383,6 @@
 - type: Tag
   id: Cheese
 
-- type: Tag
-  id: Cheese
-
 # Allowed to control someone wearing a Chef's hat if inside their hat.
 - type: Tag
   id: ChefPilot
@@ -462,9 +450,6 @@
 - type: Tag
   id: Crab
 
-- type: Tag
-  id: Crab
-
 - type: Tag
   id: Crayon
 

From 01375e36a8862fd5d18515cc9594c908dbe5dcdb Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 01:46:11 -0400
Subject: [PATCH 128/366] throwing update...

---
 Content.Server/Hands/Systems/HandsSystem.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Content.Server/Hands/Systems/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs
index c68d367d0ce..f8e0a94e81c 100644
--- a/Content.Server/Hands/Systems/HandsSystem.cs
+++ b/Content.Server/Hands/Systems/HandsSystem.cs
@@ -229,6 +229,9 @@ hands.ActiveHandEntity is not { } throwEnt ||
             if (direction == Vector2.Zero)
                 return true;
 
+            if (itemEv.Cancelled)
+                return true;
+
             var length = direction.Length();
             var distance = Math.Clamp(length, minDistance, hands.ThrowRange);
             direction *= distance / length;
@@ -237,6 +240,12 @@ hands.ActiveHandEntity is not { } throwEnt ||
 
             // Let other systems change the thrown entity (useful for virtual items)
             // or the throw strength.
+            var ev = new BeforeGettingThrownEvent(throwEnt, direction, throwSpeed, player);
+            RaiseLocalEvent(player, ref itemEv);
+
+            if (itemEv.Cancelled)
+                return true;
+
             var ev = new BeforeThrowEvent(throwEnt, direction, throwSpeed, player);
             RaiseLocalEvent(player, ref ev);
 

From f8d2a37011ca36887b7a3ece3fde2a5f26ea0aff Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 01:59:55 -0400
Subject: [PATCH 129/366] hm

---
 Content.Server/Carrying/CarryingSystem.cs                   | 2 +-
 Content.Server/Hands/Systems/HandsSystem.cs                 | 5 +----
 Content.Shared/Throwing/BeforeThrowEvent.cs                 | 6 +++---
 Resources/Prototypes/Entities/Mobs/NPCs/space.yml           | 1 -
 .../Prototypes/Entities/Objects/Weapons/Melee/knife.yml     | 1 -
 Resources/Prototypes/GameRules/events.yml                   | 4 +---
 6 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/Content.Server/Carrying/CarryingSystem.cs b/Content.Server/Carrying/CarryingSystem.cs
index 9b310aa40aa..72cfeff91d5 100644
--- a/Content.Server/Carrying/CarryingSystem.cs
+++ b/Content.Server/Carrying/CarryingSystem.cs
@@ -139,7 +139,7 @@ private void OnThrow(EntityUid uid, CarryingComponent component, ref BeforeThrow
 
             args.ItemUid = virtItem.BlockingEntity;
 
-            args.ThrowStrength *= _contests.MassContest(uid, virtItem.BlockingEntity, false, 2f)
+            args.ThrowSpeed *= _contests.MassContest(uid, virtItem.BlockingEntity, false, 2f)
                             * _contests.StaminaContest(uid, virtItem.BlockingEntity);
         }
 
diff --git a/Content.Server/Hands/Systems/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs
index f8e0a94e81c..054fb5b1a5d 100644
--- a/Content.Server/Hands/Systems/HandsSystem.cs
+++ b/Content.Server/Hands/Systems/HandsSystem.cs
@@ -229,9 +229,6 @@ hands.ActiveHandEntity is not { } throwEnt ||
             if (direction == Vector2.Zero)
                 return true;
 
-            if (itemEv.Cancelled)
-                return true;
-
             var length = direction.Length();
             var distance = Math.Clamp(length, minDistance, hands.ThrowRange);
             direction *= distance / length;
@@ -240,7 +237,7 @@ hands.ActiveHandEntity is not { } throwEnt ||
 
             // Let other systems change the thrown entity (useful for virtual items)
             // or the throw strength.
-            var ev = new BeforeGettingThrownEvent(throwEnt, direction, throwSpeed, player);
+            var itemEv = new BeforeGettingThrownEvent(throwEnt, direction, throwSpeed, player);
             RaiseLocalEvent(player, ref itemEv);
 
             if (itemEv.Cancelled)
diff --git a/Content.Shared/Throwing/BeforeThrowEvent.cs b/Content.Shared/Throwing/BeforeThrowEvent.cs
index 00a1a90b74c..5c6689d46d9 100644
--- a/Content.Shared/Throwing/BeforeThrowEvent.cs
+++ b/Content.Shared/Throwing/BeforeThrowEvent.cs
@@ -24,17 +24,17 @@ public BeforeThrowEvent(EntityUid itemUid, Vector2 direction, float throwSpeed,
 [ByRefEvent]
 public struct BeforeGettingThrownEvent
 {
-    public BeforeGettingThrownEvent(EntityUid itemUid, Vector2 direction, float throwStrength,  EntityUid playerUid)
+    public BeforeGettingThrownEvent(EntityUid itemUid, Vector2 direction, float throwSpeed,  EntityUid playerUid)
     {
         ItemUid = itemUid;
         Direction = direction;
-        ThrowStrength = throwStrength;
+        ThrowSpeed = throwSpeed;
         PlayerUid = playerUid;
     }
 
     public EntityUid ItemUid { get; set; }
     public Vector2 Direction { get; }
-    public float ThrowStrength { get; set;}
+    public float ThrowSpeed { get; set;}
     public EntityUid PlayerUid { get; }
 
     public bool Cancelled = false;
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
index 5f5fc184688..c8f0f84eb69 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -501,7 +501,6 @@
     price: 50
   - type: BadFood
   - type: NonSpreaderZombie
-  - type: PreventSpiller
   - type: FireVisuals
     sprite: Mobs/Effects/onfire.rsi
     normalState: Mouse_burning
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index c9613a68dfd..46c4d0e7b68 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -123,7 +123,6 @@
   - type: DamageOtherOnHit
     damage:
       types:
-        Slash: 10
         Slash: 9
   - type: ThrowingAngle
     angle: 225
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index dd8ec8cc1e7..5e543221625 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -302,9 +302,7 @@
   parent: BaseStationEventShortDelay
   components:
   - type: StationEvent
-    startAnnouncement: station-event-vent-creatures-start-announcement
-    startAudio:
-      path: /Audio/Announcements/attention.ogg
+    startAnnouncement: true
     earliestStart: 15
     weight: 6
     duration: 50

From 8ddb438fdef171694b9f018f505162d04a688cb0 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Wed, 17 Jul 2024 00:35:18 -0400
Subject: [PATCH 130/366] Sign Resprite (#29806)

* Redone signage

* Signs

* ok this thing now

* alright ig?

* big data

* cryo sign

* new sign
---
 Resources/Migrations/migration.yml            |   32 +
 .../Structures/Wallmounts/Signs/signs.yml     |  190 +--
 .../ServerInfo/Guidebook/Service/Chef.xml     |    1 -
 .../Structures/Wallmounts/signs.rsi/ai.png    |  Bin 400 -> 406 bytes
 .../Wallmounts/signs.rsi/ai_upload.png        |  Bin 0 -> 513 bytes
 .../Wallmounts/signs.rsi/anomaly.png          |  Bin 399 -> 515 bytes
 .../Wallmounts/signs.rsi/anomaly2.png         |  Bin 454 -> 0 bytes
 .../Wallmounts/signs.rsi/arcade.png           |  Bin 3131 -> 3126 bytes
 .../Wallmounts/signs.rsi/armory.png           |  Bin 391 -> 423 bytes
 .../Structures/Wallmounts/signs.rsi/ass.png   |  Bin 385 -> 519 bytes
 .../Wallmounts/signs.rsi/atmominsky.png       |  Bin 626 -> 0 bytes
 .../Structures/Wallmounts/signs.rsi/atmos.png |  Bin 486 -> 466 bytes
 .../Structures/Wallmounts/signs.rsi/bar.png   |  Bin 388 -> 398 bytes
 .../Wallmounts/signs.rsi/barbershop.png       |  Bin 444 -> 481 bytes
 .../Wallmounts/signs.rsi/biblio.png           |  Bin 339 -> 397 bytes
 .../Wallmounts/signs.rsi/bridge.png           |  Bin 484 -> 475 bytes
 .../Structures/Wallmounts/signs.rsi/cans.png  |  Bin 0 -> 445 bytes
 .../Structures/Wallmounts/signs.rsi/cargo.png |  Bin 352 -> 445 bytes
 .../Wallmounts/signs.rsi/cargo_dock.png       |  Bin 407 -> 476 bytes
 .../Wallmounts/signs.rsi/chapel.png           |  Bin 354 -> 533 bytes
 .../Structures/Wallmounts/signs.rsi/chem.png  |  Bin 431 -> 461 bytes
 .../Wallmounts/signs.rsi/chemistry1.png       |  Bin 450 -> 0 bytes
 .../Wallmounts/signs.rsi/chemistry2.png       |  Bin 401 -> 0 bytes
 .../Wallmounts/signs.rsi/cloning.png          |  Bin 418 -> 446 bytes
 .../Wallmounts/signs.rsi/commander.png        |  Bin 370 -> 434 bytes
 .../Wallmounts/signs.rsi/conference_room.png  |  Bin 356 -> 406 bytes
 .../Structures/Wallmounts/signs.rsi/court.png |  Bin 431 -> 0 bytes
 .../Structures/Wallmounts/signs.rsi/cryo.png  |  Bin 0 -> 3065 bytes
 .../Structures/Wallmounts/signs.rsi/data.png  |  Bin 0 -> 408 bytes
 .../Wallmounts/signs.rsi/deathsposal.png      |  Bin 461 -> 470 bytes
 .../Structures/Wallmounts/signs.rsi/dock.png  |  Bin 432 -> 477 bytes
 .../Structures/Wallmounts/signs.rsi/doors.png |  Bin 467 -> 480 bytes
 .../Wallmounts/signs.rsi/drama1.png           |  Bin 0 -> 627 bytes
 .../Wallmounts/signs.rsi/drama2.png           |  Bin 0 -> 588 bytes
 .../Wallmounts/signs.rsi/drama3.png           |  Bin 0 -> 578 bytes
 .../Wallmounts/signs.rsi/drones.png           |  Bin 405 -> 0 bytes
 .../Structures/Wallmounts/signs.rsi/eng.png   |  Bin 432 -> 418 bytes
 .../Wallmounts/signs.rsi/engine.png           |  Bin 471 -> 446 bytes
 .../Structures/Wallmounts/signs.rsi/eva.png   |  Bin 387 -> 517 bytes
 .../Wallmounts/signs.rsi/examroom.png         |  Bin 494 -> 490 bytes
 .../Structures/Wallmounts/signs.rsi/gravi.png |  Bin 458 -> 423 bytes
 .../Structures/Wallmounts/signs.rsi/hydro.png |  Bin 0 -> 479 bytes
 .../Wallmounts/signs.rsi/hydro1.png           |  Bin 428 -> 0 bytes
 .../Wallmounts/signs.rsi/hydro2.png           |  Bin 421 -> 0 bytes
 .../Wallmounts/signs.rsi/hydro3.png           |  Bin 448 -> 0 bytes
 .../Wallmounts/signs.rsi/interrogation.png    |  Bin 395 -> 441 bytes
 .../Wallmounts/signs.rsi/janitor.png          |  Bin 552 -> 434 bytes
 .../Wallmounts/signs.rsi/kitchen.png          |  Bin 0 -> 486 bytes
 .../Wallmounts/signs.rsi/laundromat.png       |  Bin 397 -> 467 bytes
 .../Structures/Wallmounts/signs.rsi/law.png   |  Bin 367 -> 396 bytes
 .../Structures/Wallmounts/signs.rsi/mail.png  |  Bin 346 -> 418 bytes
 .../Structures/Wallmounts/signs.rsi/mats.png  |  Bin 0 -> 391 bytes
 .../Wallmounts/signs.rsi/medbay.png           |  Bin 313 -> 533 bytes
 .../Structures/Wallmounts/signs.rsi/meta.json | 1372 +++--------------
 .../Wallmounts/signs.rsi/miner_dock.png       |  Bin 462 -> 0 bytes
 .../Wallmounts/signs.rsi/morgue.png           |  Bin 341 -> 535 bytes
 .../Structures/Wallmounts/signs.rsi/news.png  |  Bin 3095 -> 3096 bytes
 .../Wallmounts/signs.rsi/prison.png           |  Bin 320 -> 373 bytes
 .../Wallmounts/signs.rsi/psychology.png       |  Bin 582 -> 576 bytes
 .../Wallmounts/signs.rsi/reception.png        |  Bin 3103 -> 3069 bytes
 .../Wallmounts/signs.rsi/restroom.png         |  Bin 0 -> 515 bytes
 .../Structures/Wallmounts/signs.rsi/rnd.png   |  Bin 390 -> 448 bytes
 .../Structures/Wallmounts/signs.rsi/robo.png  |  Bin 413 -> 481 bytes
 .../Wallmounts/signs.rsi/salvage.png          |  Bin 3109 -> 3061 bytes
 .../Structures/Wallmounts/signs.rsi/sci.png   |  Bin 473 -> 570 bytes
 .../Wallmounts/signs.rsi/science1.png         |  Bin 516 -> 0 bytes
 .../Wallmounts/signs.rsi/science2.png         |  Bin 422 -> 0 bytes
 .../Wallmounts/signs.rsi/security.png         |  Bin 473 -> 426 bytes
 .../Wallmounts/signs.rsi/shield.png           |  Bin 402 -> 0 bytes
 .../Structures/Wallmounts/signs.rsi/space.png |  Bin 515 -> 527 bytes
 .../Wallmounts/signs.rsi/surgery.png          |  Bin 428 -> 430 bytes
 .../Wallmounts/signs.rsi/telecoms.png         |  Bin 466 -> 431 bytes
 .../Wallmounts/signs.rsi/toxins.png           |  Bin 424 -> 541 bytes
 .../Wallmounts/signs.rsi/toxins2.png          |  Bin 433 -> 0 bytes
 .../Structures/Wallmounts/signs.rsi/vault.png |  Bin 0 -> 458 bytes
 .../Wallmounts/signs.rsi/virology.png         |  Bin 468 -> 519 bytes
 .../Wallmounts/signs.rsi/xenoarch.png         |  Bin 0 -> 449 bytes
 .../Wallmounts/signs.rsi/xenobio.png          |  Bin 609 -> 490 bytes
 .../Wallmounts/signs.rsi/xenobio2.png         |  Bin 569 -> 0 bytes
 .../Wallmounts/signs.rsi/xenolab.png          |  Bin 408 -> 0 bytes
 .../Wallmounts/signs.rsi/zomlab.png           |  Bin 6115 -> 958 bytes
 Resources/Textures/Template/signs.png         |  Bin 0 -> 1013 bytes
 82 files changed, 295 insertions(+), 1300 deletions(-)
 create mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/ai_upload.png
 delete mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly2.png
 delete mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/atmominsky.png
 create mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/cans.png
 delete mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry1.png
 delete mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry2.png
 delete mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/court.png
 create mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/cryo.png
 create mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/data.png
 create mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/drama1.png
 create mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/drama2.png
 create mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/drama3.png
 delete mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/drones.png
 create mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/hydro.png
 delete mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/hydro1.png
 delete mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/hydro2.png
 delete mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/hydro3.png
 create mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/kitchen.png
 create mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/mats.png
 delete mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/miner_dock.png
 create mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/restroom.png
 delete mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/science1.png
 delete mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/science2.png
 delete mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/shield.png
 delete mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/toxins2.png
 create mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/vault.png
 create mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/xenoarch.png
 delete mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio2.png
 delete mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/xenolab.png
 create mode 100644 Resources/Textures/Template/signs.png

diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml
index ca24012e956..2e5d7693ad0 100644
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@@ -287,6 +287,38 @@ SignShield: null # what was this even for?
 SignHydro2: SignHydro1
 SignHydro3: SignHydro1
 
+# 2024-07-7
+SignScience1: SignScience
+SignScience2: SignScience
+SignXenobio2: SignXenobio
+SignXenolab: SignXenobio
+SignToxins2: SignToxins
+SignMinerDock: SignShipDock
+SignChemistry1: SignChem
+SignChemistry2: SignChem
+SignCourt: SignLawyer
+SignAtmosMinsky: SignAtmos
+SignDrones: SignMaterials
+SignShield: null # what was this even for?
+SignHydro2: SignHydro1
+SignHydro3: SignHydro1
+
+# 2024-07-7
+SignScience1: SignScience
+SignScience2: SignScience
+SignXenobio2: SignXenobio
+SignXenolab: SignXenobio
+SignToxins2: SignToxins
+SignMinerDock: SignShipDock
+SignChemistry1: SignChem
+SignChemistry2: SignChem
+SignCourt: SignLawyer
+SignAtmosMinsky: SignAtmos
+SignDrones: SignMaterials
+SignShield: null # what was this even for?
+SignHydro2: SignHydro1
+SignHydro3: SignHydro1
+
 # 2024-07-27
 LogicGate: LogicGateOr
 
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
index ceb9f94b580..35df7765a6e 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
@@ -244,6 +244,15 @@
   - type: Sprite
     state: ai
 
+- type: entity
+  parent: BaseSign
+  id: SignAiUpload
+  name: ai upload sign
+  description: A sign, indicating an AI is present.
+  components:
+    - type: Sprite
+      state: ai_upload
+
 - type: entity
   parent: BaseSign
   id: SignArcade
@@ -274,11 +283,11 @@
 - type: entity
   parent: BaseSign
   id: SignAnomaly
-  name: xenoarchaeology lab sign
+  name: xenoarcheology lab sign
   description: A sign indicating the xenoarchaeology lab.
   components:
   - type: Sprite
-    state: anomaly
+    state: xenoarch
 
 - type: entity
   parent: BaseSign
@@ -287,7 +296,7 @@
   description: A sign indicating the anomalous research lab.
   components:
   - type: Sprite
-    state: anomaly2
+    state: anomaly
 
 - type: entity
   parent: BaseSign
@@ -300,21 +309,38 @@
 
 - type: entity
   parent: BaseSign
-  id: SignAtmosMinsky
-  name: atmospherics sign
-  description: A sign indicating the atmospherics area.
+  id: SignBar
+  name: bar sign
+  description: A sign indicating the bar.
   components:
   - type: Sprite
-    state: atmominsky
+    state: bar
 
 - type: entity
   parent: BaseSign
-  id: SignBar
-  name: bar sign
-  description: A sign indicating the bar.
+  id: SignKitchen
+  name: kitchen sign
+  description: The heart of the home. And disease.
   components:
   - type: Sprite
-    state: bar
+    state: kitchen
+
+- type: entity
+  parent: BaseSign
+  id: SignTheater
+  name: theater sign
+  description: Would it even be Space Station without drama?
+  components:
+  - type: Sprite
+    layers:
+    - state: drama1
+      map: [ "base" ]
+  - type: RandomSprite
+    available:
+    - base:
+        drama1: null
+        drama2: null
+        drama3: null
 
 - type: entity
   parent: BaseSign
@@ -397,24 +423,6 @@
   - type: Sprite
     state: chem
 
-- type: entity
-  parent: BaseSign
-  id: SignChemistry1
-  name: chemistry sign
-  description: A sign indicating the chemistry lab.
-  components:
-  - type: Sprite
-    state: chemistry1
-
-- type: entity
-  parent: BaseSign
-  id: SignChemistry2
-  name: chemistry sign
-  description: A sign indicating the chemistry lab.
-  components:
-  - type: Sprite
-    state: chemistry2
-
 - type: entity
   parent: BaseSign
   id: SignCloning
@@ -428,19 +436,20 @@
   parent: BaseSign
   id: SignConference
   name: conference room sign
-  description: A sign indicating the conference room.
+  description: Where work happens.
   components:
   - type: Sprite
     state: conference_room
 
 - type: entity
   parent: BaseSign
-  id: SignCourt
-  name: court sign
-  description: A sign labelling the courtroom.
+  id: SignCryo
+  name: cryosleep sign
+  description: Just like that? You're gonna chicken out?
   components:
   - type: Sprite
-    state: court
+    state: cryo
+
 
 - type: entity
   parent: BaseSign
@@ -462,18 +471,27 @@
 
 - type: entity
   parent: BaseSign
-  id: SignDrones
-  name: drones sign
-  description: A sign indicating drones.
+  id: SignRestroom
+  name: restroom sign
+  description: A sign indicating where you go to... What do you do here again?
   components:
   - type: Sprite
-    state: drones
+    state: restroom
+
+- type: entity
+  parent: BaseSign
+  id: SignMaterials
+  name: materials sign
+  description: An omen to the juicy vault of steel, glass, and plastic that lays before you.
+  components:
+  - type: Sprite
+    state: mats
 
 - type: entity
   parent: BaseSign
   id: SignEngine
-  name: engine sign
-  description: A sign indicating the engine room.
+  name: power sign
+  description: Where the powa happens.
   components:
   - type: Sprite
     state: engine
@@ -547,7 +565,7 @@
   parent: BaseSign
   id: SignHead
   name: head sign
-  description: A sign with a hat on it.
+  description: An official sign indicating the dwellings of a Nanotrasen-certified head of department.
   components:
   - type: Sprite
     state: commander
@@ -559,25 +577,7 @@
   description: A sign indicating a hydroponics area.
   components:
   - type: Sprite
-    state: hydro1
-
-- type: entity
-  parent: BaseSign
-  id: SignHydro2
-  name: hydro sign
-  description: A sign indicating a hydroponics area.
-  components:
-  - type: Sprite
-    state: hydro2
-
-- type: entity
-  parent: BaseSign
-  id: SignHydro3
-  name: hydro sign
-  description: A sign indicating a hydroponics area.
-  components:
-  - type: Sprite
-    state: hydro3
+    state: hydro
 
 - type: entity
   parent: BaseSign
@@ -609,8 +609,8 @@
 - type: entity
   parent: BaseSign
   id: SignLawyer
-  name: lawyer sign
-  description: A sign labelling an area where the Lawyers work.
+  name: law sign
+  description: A sign indicating the presence of the (typically absent) rule of law.
   components:
   - type: Sprite
     state: law
@@ -642,15 +642,6 @@
   - type: Sprite
     state: medbay
 
-- type: entity
-  parent: BaseSign
-  id: SignMinerDock
-  name: miner dock sign
-  description: A sign indicating the miner dock.
-  components:
-  - type: Sprite
-    state: miner_dock
-
 - type: entity
   parent: BaseSign
   id: SignMorgue
@@ -743,36 +734,27 @@
 
 - type: entity
   parent: BaseSign
-  id: SignScience1
-  name: science sign
-  description: A sign indicating the science area.
+  id: SignServer
+  name: server sign
+  description: Ever heard of Big Data? This is it, chump. The biggest.
   components:
   - type: Sprite
-    state: science1
+    state: data
 
 - type: entity
   parent: BaseSign
-  id: SignScience2
-  name: science sign
-  description: A sign indicating the science area.
-  components:
-  - type: Sprite
-    state: science2
-
-- type: entity
-  parent: BaseSign
-  id: SignShield
-  name: shield sign
-  description: A sign with a shield.
+  id: SignCans
+  name: canisters sign
+  description: A sign indicating the auspicious presence of gas canisters.
   components:
   - type: Sprite
-    state: shield
+    state: cans
 
 - type: entity
   parent: BaseSign
   id: SignShipDock
-  name: docking sign
-  description: A sign indicating the ship docking area.
+  name: evac sign
+  description: A sign indicating the where the evac shuttle will (likely) arrive.
   components:
   - type: Sprite
     state: dock
@@ -817,12 +799,12 @@
 
 - type: entity
   parent: BaseSign
-  id: SignToxins2
-  name: toxins sign
-  description: A sign indicating the toxin lab.
+  id: SignVault
+  name: vault sign
+  description: A sign indicating the vault. Who knows what secrets lie inside?
   components:
   - type: Sprite
-    state: toxins2
+    state: vault
 
 - type: entity
   parent: BaseSign
@@ -969,29 +951,11 @@
   - type: Sprite
     state: xenobio
 
-- type: entity
-  parent: BaseSign
-  id: SignXenobio2
-  name: xenobio sign
-  description: A sign indicating the xenobiology lab.
-  components:
-  - type: Sprite
-    state: xenobio2
-
-- type: entity
-  parent: BaseSign
-  id: SignXenolab
-  name: xenolab sign
-  description: A sign indicating the xenobiology lab.
-  components:
-  - type: Sprite
-    state: xenolab
-
 - type: entity
   parent: BaseSign
   id: SignZomlab
   name: zombie lab sign
-  description: A sign indicating the zombie lab.
+  description: The final remains of a shut-down Nanotrasen research project that aimed to harness the powers of Romerol. I wonder how that went...
   components:
   - type: Sprite
     state: zomlab
diff --git a/Resources/ServerInfo/Guidebook/Service/Chef.xml b/Resources/ServerInfo/Guidebook/Service/Chef.xml
index 7d077ca269b..370c1db5c3f 100644
--- a/Resources/ServerInfo/Guidebook/Service/Chef.xml
+++ b/Resources/ServerInfo/Guidebook/Service/Chef.xml
@@ -51,7 +51,6 @@ Ask Botany for what you need, without a botanist, you may need to grow more plan
 <GuideEntityEmbed Entity="SignHydro1" Caption=" "/>
 <GuideEntityEmbed Entity="hydroponicsTray"/>
 <GuideEntityEmbed Entity="WheatBushel"/>
-<GuideEntityEmbed Entity="SignHydro2" Caption=" "/>
 </Box>
 ## Gathering Milk:
 Alt-Click on a Cow with a container in your hand. (Beakers, Buckets, Milk Jugs, ect.)
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/ai.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/ai.png
index 6cee540a6b2b727d219e49585e6395cebeaf0f46..e532ec039e84e8d2b1b2fb7892852f9b98749e39 100644
GIT binary patch
delta 380
zcmV-?0fYXK1C|4jBYyw^b5ch_0Itp)=>Px$P)S5VR9J;$U>NCu5uYTNvG;#!S@iAf
zR;+g6bO4vJ_kS)SaRv@v0g5gE@%aP8w|6hGIs&T$V3zYq$Wd%L419X=2&*GlaA`pH
z`Q1f6WLvBpw*_wAw|6fw<eA7enMwd>2p|LHxGfBK7x}<_Lw^h)Ry|Q6KyDNeqmL*D
zp!=jEEry{YEry`jkO%>i(f|x}%vyq>2AkNB2m!Lw05(8Q8XzhP(0$S|YYA3Iphp8S
zS&^(XfXy;o`UrsmPXk1S0HqGW2Zl~vKr1jbLI4?5q{T3#+I(POU|?XFeMEqvW7ZOs
zv_WcUksJc4Hgz8ul;gHAD93GqI|ODaIZ;J&2rw{EH#d-#24EpDU=BbBun-|9WN@~M
zh2+&4*tq#9a~Tr&_4O0OyN5T4Zx#Re`~kxO#QG3h^!)hz0jt`<*)c(O1jV*P0j{pu
aC;$Lc%#;2PWaqa40000<MNUMnLSTZ%SDY^Z

delta 374
zcmV-+0g3*W1CRrdBYy!`Nkl<Zc%1E)KW@S>6vn?+s3+*ijKpB+p_~B;E<lulfvE@R
z5OIQvfdepQ$PnQRq*Bj-u#}+^Gh<KCg$`9*k|vIy3GG0B%csaz{Q3Q{4RqW(cTE%4
zo8)xK0?$u@aSh|(dXt>q-anyK=CnAGz<BszG|_ANiBcK1tADwZ0Y8i}9(u+(jRwlR
zBnnDpAQF|zHG9uBFdFoY%EdYYei#?NBbip}>+S>l!x77X+BHBVFdFm`$rOv(v~o@)
zQ*8uo8&E1Mbi@8|ER5$VSj?us#!Oh(0FkKO`8knHS#9eafjVv{0(EW2jet`Z=t{4E
z+XdDsSO$cN_iqRQIu%vAUCmjiA^Ri*ep;|jIk4{ny}LZbWxa-h@-f^dRt7G)j+=0*
z0pR=6@xxfFE6xTYnSw}Y{c{6=`y1dKb{FL2busbW>ciRqk#NqjO=|xAS>Dm{1&N}Z
UI1{IdNB{r;07*qoM6N<$f`aX^cK`qY

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/ai_upload.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/ai_upload.png
new file mode 100644
index 0000000000000000000000000000000000000000..91256aa1df71351761153db05f3f6ef7c1ed1207
GIT binary patch
literal 513
zcmV+c0{;DpP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$yGcYrR9J=WS36F_KoET(6rn^!Q5vYANWlTp`Ude4taSDne1x1KbQVVlH%Q9?
zC|p1VO=Kk^ifBRsV|K^;nGHrlg4bBy-I@2^%-FJlzm6l*Vs|{*{}kc&{!Zg;2<VO{
z`|j`@r)PuK$#<Iy+trIELK8sb{fo<bEzc6n=C?sau9)@nlP2PrA0X#>meh&zEb$U@
za*DU*Co}}8phT)0o|KD}#E1n@LK~Tl&=;fP#6`}DOk@%Rt{AHTX$kom6Ol`>xB{l$
za}wL&x!@E)iB(ctuU%^g3rM31v$?(&>JR|RA_f4ArVF`%vWPL7F6t{_c1OuSP$7-t
z#u*p9Es((EOoc8|hxa`oO$2<khlWwoE^!5jTou8cQ;R|dQ7nMZLt6-%0UNomH3tch
zI+j$#CD2)cw#x0wV|)tuz?DUevWV-c=8p0#(f0X0kM|0&xk#hRxR*wiw$JZf@nQjG
z5#wel|4x(+X3%380vci;j1{<94!n-3uOa76`;D*S;ng)dy}noZp?G^;WA*q@e-$@c
zu-jDV^!nd=x!5q8F0k9^gZR6COjHrAvwwpBn*HM)K?MbQGiB6(00000NkvXXu0mjf
Dfhy=w

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
index e5b69da718ec6eba60f92fa196273f89c8c1f7f4..6b7361f21c23104e4436986be17713b0d964dc82 100644
GIT binary patch
delta 490
zcmV<G0Tup_1A_#RBYyw^b5ch_0Itp)=>Px$y-7qtR9J=WSG`WdFc3ZvLs6yvEC?Z$
zy$@h{$==6k=4^SAZkdzEV9#RZ0kTsGAr?p^1Y21+%Q5HVj%26=-_q9S=KFm2-N^y?
z>$vC(M(f>aDx&iBf#eDbh}OH)@_Gr2<zh5>+qBSpG^7Yp0DqF--`$KRM?5~gkRmQa
zf8d;4M;fv!1|8|ay`kp?1%%)dn$kd`axkUo2$JARvROwO5|!KU`@`18inIn(8ZgR$
zj<gjunSiW{EjgYNf8*L7wl*W~{ywlvP^7gbD$@GL!xNQ5k=9lm?w?G6DNU#Lp*;W~
zDgjFX67LV&&VR|NE=W{vy}{`YmH^jm)cR0-w17}OaeXM>hu|dK+-_hspLN!;_4?e6
zCiOk=_WlXS=Ocd-`f!aEs;z5MPW?p!u%2i#f8u3T+{q57{s6xyftv+t68ifPp%REj
zF-|yl?D_(SJmN!?0Ut<6na;-~8Sp`6K??RHbSGX`#bX^4QgQclv;eHDYq~_`mVk<L
z?*;5OlwLHrMq~?+I9meom5c)31Gskp7o*xx0&yF*O$)2}Ok8^kiOQjES~7N?FD9;t
g(d^#{y_)^w3tm_bx(dV=f&c&j07*qoM6N<$f^#S4`Tzg`

delta 373
zcmV-*0gC>E1djudBYy!_Nkl<Zc%1E4F>Zq}6n(9_WbaamAr}A<b?6yDLTSd1o^pVm
zpa;kSGI`9{ph$3xAh-fcr0iKLB}4Nqhaj*&Bpu3IY_Rp-v;95>81Ucm&^BSQTphaz
ze9k`_H5vyO%hmDu`+y?LS>mqmVLux+ns{m>DY6_<ELa9MQ-6t<*<0hBM;7y$ysmEx
zmVr7!t_k)I^o7<8RI!;#1R_MaE!C>^XWP7V-T@Nlf@PrGmMF6PLY!Nw)&`<jT!}jq
zM~&UwfSv&or#`0=*hip?7g-M1_c&Di5LU(M7;bKWGEfyyWpbYk=q7;Q^mD}l#)n8Z
z(FcqSbh&JLF>cW1I_|{)0Q{_XNM&*nx<G`gt(N2X>(z+YID{ll6`;RMWddj7sBxQ;
zw5kFkrZy0vTD5*5r7|(*G(G~#LG)hV62>swdSe5w@3E`E^*!uc=KT3@`G5f@rCY6j
T45emh00000NkvXXu0mjfsm!cw

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly2.png
deleted file mode 100644
index 73d94ac95e45de566b4003a5605a00de2f3c55ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 454
zcmV;%0XhDOP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$fJsC_R9J=WmN9C>FcgOWmMq;1p`albkdW!nGuTk<j2%7o06joYkOO4$m@zJf
z<P;^wzCZ^rf$UuZ>5x804vB49G9BuFQ4~G&e^1hr3=I13x@iiS%@+p~gSXe0T94Yn
z*?e)hUw$J`vrgt*3hbtLwGgAGN%Azq^GDbTAn_wSOrL6F8UZe8A8#*D7L2v$(gIM8
zi%n4(V-73FbwIRNfQ+x53+6Db`EJ_=s@dmh1~>G;r2v-#Zs=8ju5FPK0C3En%+)O@
zHbn_>zBN_>R72pn+_dDn#zp`()d@h&T3wCa0hq(UrNBB`RScQKu#Q&XQfPy;F2hkU
zE>AZ>kn%JGm!cAD9e{K#!>(JP1wfhY<LyPm-mhX4BO`#skE|JX0x)@wo22y?Bz}Z_
zyv5i1XQi*U^t-KE1FWMJ+|Vn_k6L;MsDECf)&R(i<c1!A(<MZ&V{aD`or4J;PyYpB
wrJej%2lcH0a49-h0ha>1hL}J9EFU!J2X6PK{}4FVF#rGn07*qoM6N<$g2_n27ytkO

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/arcade.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/arcade.png
index 9f36d43776ffe216cb3fec73d7ba255228a107be..7cb18443529fbb6b7988d25d9e9bc151055e5cf0 100644
GIT binary patch
delta 478
zcmV<40U`do7`7OYBe63>3V#8*Nkl<ZScUCZy=uZx6h19o141z!<0j}PK`=w(<`dY}
zJ#UaF$QxwuTA!esb!ef4Yz=fXqlzH-0CqZ(+?;c~HwkoTzv<rG%l*FdOAf$a$BlG2
znJvz35q-QqlU#QaxziuR{X?%Y`C+>O060@3NC8OR>yOC?qrinQPJgt&TOAvh6%n_b
zYRU32P9O?gE%Iycu_2Iv<fbAhupYQZt`gy171gSM;^UO{+*xY^0IHUoo~x*p100d5
z`;7%4X|W2_H7AaPb_i7K!Z;}rs-(K!&=OFmyr^D5fenH04PicYYKu^N#d4KHx~|^S
z@_=cLbG?Fsb_l3-(|^0#0uZ_(FbNf#18?tNkY@YKzD|u7g`AE%GXcIggf!b5*ErWJ
zd~Zl5q38jtV;h$rB?jN4Am+em(1j>)FP7kbH0T0AwbZ!#QuxGHJfAuxD{vnL?j=8p
zk8}4WG%iD_1us{5$z!zzNQBaPn(ZNslTt@jA%*}gSgvv{aZ`97g%sN`2l8KiGFzNS
zk59$F*~T~>caW}MD)RyBfx~tKR>!W@fK-HWg0n#d>}1sTV3L1-lGD+zk7ob)0jmA$
UD-)6l>;M1&07*qoM6N<$f*?ZN$N&HU

delta 482
zcmV<80UiFf7`qsdBMtxrXF*Lt006O%3;baPu^~kYe*hq3NK#Dz0D2|>0Dy!50Qvv`
z0D$NK0Cg|`0P0`>06Lfe02gqax=}m;000SaNLh0L01FZT01FZU(%pXi0000RbVXQn
zQ*UN;cVTj607GSLb9r+hQ*?D?X>TA@Z*OeDr{R1600BoyL_t(oh3(ccYlA=(2k^gJ
zhkS!Ne^~+<6!b$#>*5y7>e9V|4*3KQg}7&NO>lED!4Hu@G6<!a(r=KVn_c=252B&!
zX$ZdY-IM!ydhbrkvJ72@)B|oFFkdWd38$|UsWM=`SZ2w?H+K6&rO9<oh57SXint2+
z_}pMMek-i;(gd@Sd2!4MeY_8!?;PNSe&M)qe?Zyf!T?^H003qqlLO@Q!T?^Hz>pPe
zPsfY(G)9QV0qgS@wx=VTXtzJWwQMeD$O>KtPhtR0=)<*a1aSmiQ@L8g1aZXGHwJJ*
zpXFW41_1Uc3|RpH1aZV_=oujZT~oQGrhlUqK-snfz}2<Vh^}FJKqG)UaUUyC)QIvO
zND%<*io#lP{w$z<PY?hMBcu}&0N~qh{>>>b>@4_iGy>@KQc8$Qv;Re{Yk3>d13Cx%
Y0`B|4(ES~6X8-^I07*qoM6N<$g4z$qcmMzZ

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/armory.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/armory.png
index 671e57aa5cf295495ae5f9c8f377b847a3f772cb..3f237ec04663cd1dce749f3c7705b3232cacfa80 100644
GIT binary patch
delta 398
zcmV;90df9^1E&L!BYyw^b5ch_0Itp)=>Px$VM#<mR9J=WmoZYqFc3w*7!E)|<(ewB
zF5q*d&1B>gMU!!>bNB+(RMf60d;?R29TcIpc5MZif#2DZ^`F+eYZ>_KGE0L;V6J6!
zX1rK{BQQ4r9x9km07eEP3qa;i70gMm48$GxK)Un&{9H6?oquEJagn?)uBwEfdBIrG
zTrt4d^=M9qFZW`_<5CDQ04*Maq(C{SY5=tO;63&W#)J2_0Z7A1Fs*ZH(^za3ltkg*
zV!jEWmR11-W7!OsmMTe=gutcQ<g!17pd2Yl9f6X$cAh!{!Pu)Xr*(g`G9-~XfqZKf
z#5<?=yj3ayGJhPq9>Lhny9XA|13LhZo0tF88-N!m&I7UNJKs77;1d4yI+msvhya??
z0m0a-(n_z%RNIKeIgs0BoP=Z7uS!fYK-zlK2n^nfyWc7RiBfaP>-h01U_0UT0iaE)
soPx2Kn6cmaV-iDD@CO+4e*wTdO#Gy)!DZ)300000Ne4wvM6N<$f>`so0ssI2

delta 365
zcmV-z0h0cw1BU~UBYy!-Nkl<Zc%1E)L2AP=5Ji7Wjv<(XOb(C(ltQ5!L!o#V(@mCM
zW)qTK2n4bT1WFFj15^hQ=pN~!jOrNI_DE?%ssBc@Y&6fKKazk!|6Mm-A1pS9Q%ZoB
z=ZDr9tuGgw!|DC)70$V+;6#M+<h~VR)HR874$Ji}3ZTd{jDI`6xs96ng6hn`cPjEM
z^qCoVk54}fP~;hi=xj`$z4utnO8^Ld>AP&|3{(x-WKOMLR2~pR%AYecfX_@U*SjdQ
z_RfGzzM7Y3m0_(_2aN&{O=o2z*slQ`_gi@H;hY0A!+Q^7Oc>JwsR1Mq@Rk19oiYkw
zIxB+@QtCe%pk{8uR3)1*Re$3wsP6k$0Z2KHF9IMs?zgbkf`~%tNncuRWvDz*56;Y?
zZ;a7Q6$elaL_`5d;Hqt3sg^*zkh=M(0Ej5M3hEb_CSCnnK4{Pf7`T^%m5Zlq00000
LNkvXXu0mjfp|hf=

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/ass.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/ass.png
index 0dfa8a04f5cd9b305f3aa331f0894bd8c2e3a9ec..9d57ebe7e9a44b6ff917562f4475bd464aa620c3 100644
GIT binary patch
delta 494
zcmV<K0TKRz1BV2VBYyw^b5ch_0Itp)=>Px$!AV3xR9J=WSFvitFc7_#u7N;sGCEtp
zqcMRj#aq6>U9;y8{007l>|NV0$X2=(g7Ij`7LREN6#4<_P|lT4r?aIbbZFlaN$2=I
zo$gLPfWM9#$vB%YPM0EjTR*Z~cM`cjnZjT+KAZfw-vI!eIDZkW03;tzrkX8VMy-VD
zDsRkt{UHuD5k?PiJI|Jp_Hqu~bA!<ss_jO5_O|tHmgE569_ZpJD*;ptCE(UBCLj#F
z2GR3NRgX<;^ncC*!oY)~JZS4kD6JLcp;d%22u)(t^Tn8;Yh8A3EdWW1^1ue8x|YO#
z=YSQDfOCJ_?tiGg?HEK4P;#1HsvSwV-E%S2NdN~<L>PFG#C~nJfm0nYk=T+0ICwxs
z68rVeUE$;b1m-<g6Rs)%D_;`(jo+)4Vv2N?YveY$ufjP7kPK5yN;L_h2k?eN*M@-y
z*)pngp3dnJpj|o|QGi<O0e*@MMn0WWpj|qev$CKK7-yJLDZZ)zytt%VVHJe9BQ^ik
zIRG@SWgJU&g8f#X%@?Qe{z3hkJsY1N?@+uxY5jrG1IPUidi|kOaiK_8Irat`jGfV?
k8<T3gVY{PWZ_WPk1tfs&36viFUjP6A07*qoM6N<$f~r{JZ~y=R

delta 359
zcmV-t0hs=W1c3vPBYy!%Nkl<Zc%1E)v1-FG5QhJh4ta-oaw&L_Kz;~Ay?864qo>ZL
zQywCC&g3x^Z(dyJL&RXO&6K=BhHUAi;-smhlS4zO|HYPc+<n|hCjo>0yGAC1*?h6@
z6X5mvNgG4EIGZo_AL9+`rgaJ~I776XXd!M*PU@z`+vAH9fPXA9ME4V|&5e`iGs>8O
z-z1CdVC<SDCjePw5S;y(bAjkpf@u(88bp0u&@#|Xd)>5<N2f!rQ!-%<Ad3uXoM5?L
zY3)MKCzXSgfxIe>Hq@R$0!ZV;%FYJV2>^gq2`IX*Ms(3V;M(a-x{eYY_x(Qy=yM&P
z1polvx1Y$X5@2bZAg@XY&QLe)!8i1LEY~a28^U@IsGtg>8(fW5aEeHqF!cOyh*NM1
ziX!qcd<gD<?iGCMpKwJR0R(5xr$BH9?DRGlf0hp#^aT}ufgDP6C;b2b002ovPDHLk
FV1kRYrUd{1

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/atmominsky.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmominsky.png
deleted file mode 100644
index 3bd5488a62c6f8e7d6db00db244a86da7e62721e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 626
zcmV-&0*(ENP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<TBuPX;RCt`tmp@7aK@`Sc{#`&JMVizBwGb3*D;p1BW#I*a;3)*r
z16Wvj0Gm|SqF|wdwMDiF=mnx1_nX}>ybQaOnMou*2+Zs-^ZnkNH*Y3QS+V_ZfU~|#
zmLYO}DYak#i0^OIrPHo2B%X{?k$yU<f+z)`c(<7a;Ol4l{o^}d!+clPJARVE_3pH<
z$Ge#V)~bT2jDYdn5<fV3G;N4M1j6q(JEqSuJwCIRq@_B+Nk}o{aVAbM9Rc?3NG$|_
z#jq&6nSoG-Z#p7A5KaK@xi%z~PD~91@$p(iWK<sRU;r$>b@)&^#%Q#%Jn6I>MKo$g
zoZe%6ya)iiO{_56;}nJIB!zfVe0LpXCxFguA7f5XobzAq_Tm5r4)5m~la@eH0HG0}
zF&~&ie;xtbL!Aprkq=P-dZOzzz_8~CJB}fbV_B^T0%#Sb81=wD4LZ@7^}P%-Z#T?b
z)`#dVpy_I+ORpW;*$P>C1BV0HF#7T#h}ojd)3S>xItS)Ku#H<2``(iL`n9iSS2c`&
zlDRG!pIguipuKr2>)S{2`Fty**9&w1)8H}R12pzI4~DtJ;Z+;}7NHOTT%sC|^Ee(2
z;A0v}L-^WU0G~y5M3xQ^;~DmybI^_kpl8~{s<!SUU+|k6UP++<d2N@deYK$y#}lm-
zz`WnHcRb$nV@DnLu_P<q_iw2L{V~xHRqy!_i~4IeZ{o6S<^PU<0mcG7GlTPQ(*OVf
M07*qoM6N<$f>Q1j4gdfE

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos.png
index 9441b32827891b83ec11770bb1a94bba35f4739c..ae31db348b28b877966c3e870f97c66aae2efacf 100644
GIT binary patch
delta 441
zcmV;q0Y?7j1JVPKBYyw^b5ch_0Itp)=>Px$j7da6R9J=WmoZL-KoEw1jVF-eC0OVI
z+=if@g^EMazS5RMP;nNOyk_44v~UxO=M|m>8M3UiFf3b`=$}w5limN@8JGp&uj^ti
zxG!*yW%S(gUS5EGf%EMRuuHd__Xha*<RMr9GJm??ZcchR@_!Ilz6spURoMXmPKOpo
z*KEue-=zb9D=z?NP79M6nb<KK#)aT?DFx6?J}#)697$G8;x-r;-wZIP)1iebJLo1~
zJy%qMR8>EAWSbdXPtr{#i3Z>r_%!#B1_N-r_i2r>7(lxFP({rEDQXEqGN8&1NmhtJ
z#EmFb6#&e>4S()ENkb9?&>~z5whirF>n4XPyIFvsMx@Ga%!n=OfLzQcaRyu?yUxBC
zjiUoBExe{BM>z|&Xb~V))uiUC?8b}6wrK3m3kFECVsgAvdhIlGFz&oy0C!<dbR0`h
zz|{at50%k%&_N^ykjOQcX2tte{P+OeUB|)$-oJp?w=xx9#l0B-mg+B&ZgTX7kNwUc
j6B}Z?{UG13*}uL4Z?EjfaZ1wR00000NkvXXu0mjfAX3N}

delta 461
zcmV;;0W$v51LgyeBYy#{Nkl<Zc%1E)KW>9C6vn?)y+9^bk4!MJWh)1$6eUtm(6v%`
z58fkn%?T=jxB=PNm|*hgl?mkp=>T?trr<}ZIyB!BjIH;6`27oT(|^}$>cHXne))-m
z*XO5EAETRx<NM`7y&x^CS<XYx!HK<%LflUoNy`cWFJ=Lx!hgq#jh~qW7%CUOdEV`}
z0DxL%0D!f-fpR&?9tj{9zHtfwag-q71sDY4C;`d@Ktj4PYXBw%^7dJOaTg@?9IV|<
zvlhNJ#GNgGb~<#P3m>89T-{p~0BB-9w<5libqI8V1)L*o6H(_w93`Iz%LKdq7HVk#
zpkD#N*DE)1mw&?ArZqquHDA_ss>7jkAZ@FpmKosM*(K$`ltRzxhvPQ@bg5nIka|!5
z+Q>Qt0WS~_x}X|3)}nMnQW6Hd0Fwf>%uve=3<7Mw?Oi){Zjfhza=A&cvvEr6|73t+
z`7J3cfVtz?2AmWECWRS1X<3;8)O|+<CIJkcr)7l@O-5tt0x5#c*?nNR*4>cWh{$EA
z&}97?K=6p(8tuD90Yc9)(~qjqb8wnC^XGrdZ@TFNV)L;JSxBqh00000NkvXXu0mjf
DFuK!I

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/bar.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/bar.png
index e5fb2ab766ec9d9bc20e1325ca743d06dcb87ad8..8fdc8016af35f04020fb2b985d2e33c5f3615d67 100644
GIT binary patch
delta 372
zcmV-)0gL{G1C9fbBYyw^b5ch_0Itp)=>Px$NJ&INR9J=WmoaX_FcgOWR_(yhMqLUA
zhy-U~L9vu8aE4qVTee(*yF^O1o&h8dP*|dpAp-*)Xj0=ooBG)U2>$KqIsQM#)_XQ^
z>v}LH!zm8FjMg8tmlhzL;_&<q4Bp($+Zxz!X$TUaGapS}+<)DF^to(Eh)3NArj?g@
zWeuR4PYYm@NFx>mr6-%gWnN)XWPLmrGjd!KXAo)huQ{#$fJh@G@eyEAWJuzyk2&Vn
z04jtkTXPnG3?Xj^#~iRc11dy!Cb;HK05SyE9AIvNPu&5o8=x!4E@hbwpqg?aoa%rN
zUDp{X^9p5N^=(~nE@mgOn)eO>oHnDb1k26I)U3P!sCNSDFv@xF0Mv?2dG7$WD?BId
zt@w2e1Vewf;;&7E-RkeHSX&3$8VH8JF{jYT+tb$cn9F>a$Pn)KN9mqscYOn5ErutI
S6ZrxF0000<MNUMnLSTZ-lcJgc

delta 362
zcmV-w0hRua1B3&RBYy!)Nkl<Zc%1E)v2KGf5QeW+hrUCYkScYsCG!wSVPQk4BU5J7
z=ZKgyWsDG8mJE3aEZH*?eTQu65ZQ8RYU(phhwx9>n7dE*9lrr)-Mb#f7OXeBvrmHe
z)tfbk_2qiAJ0G7vfD4IA&M1NSw6H=vjRoOCLY<W;fV`<7et%h5*Ng)E6!@Ajpw0k!
zQ$dlW(DvPz`6vh>Zz^X9X8=YCY!CZy^IS+^l(>d-2jD_Nk)(R8b|MPG3)pM?w*bS$
zzH$brvr^ZAsqJBZn<6wJhI1G_qP{W`GD^_Ny#S^X8bBR^>i?Sp<V~e}zU@0Gk`xVr
z0;sc68x$83-D3d&9{&NK!gB`jIpawHeC&7<fNMdEB-N&5KD)xAicmS?uoEzDhyqa7
z8wH^rw|$4Yx}nU-)Y2R~TJf&{7$xW~V3Yuy>}&r0T0U#mClb<tQe>%cxc~qF07*qo
IM6N<$f^({(`~Uy|

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/barbershop.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/barbershop.png
index d196072a32b0e63fa87efd8d4abe329dc2e4701d..b01a82717f781ae49f7efa4628cc1d0b824c7884 100644
GIT binary patch
delta 455
zcmV;&0XY7=1K|UZB!2;OQb$4nuFf3k0004-Nkl<ZScUDEv1-FG5QeX%YamdZj?NbF
zXiOkW@s=lW*X(`+J%Qgqd)MX(x|uG8B0L(p#bas$g+72goss3UEX$%D+J7<f3EijD
z>Ffje>$=hzcl$%*%F*ldBkAi#=iJ|H;r4Dl+xg{u0sv?z2!9d)ov%0B_FWiwP?WW?
zQ+fVkxx&{yi0h#R)SV}>4`JXLJ5OR?yWS`OB@+nBxlYCajEhkS**VU42B1Pvn(BNq
zfGjl%rui`&fI14B&|3pg5Vp>(0c1_dc&7lk+hbmJ#y<vt=Z_JvO~S!%0i`UBI^$zr
zK~dIi9>~Yxynha4X#~f-0>(ufcC7XIl<g|)YyisPRQqfI`QF>uDH-Pg;{viY8ocvk
z_Spa?i#jhvVc<cQMr}gj7(=Wk8f70#MlC=R`@p#9lwQV#_G_rx@o207@H)v!WqQ3#
zr3EO;n%t2~X_F9li-kuwM=n6R`Kri&_1*r^g!d2f-$3kaeSLmF@$%H`4+bM}IiFy$
xTsb*&#s&5UJq>n7t{ao;{f+F7e!VsO*Eb=?$G7bF+_eAz002ovPDHLkV1gC1-G%@F

delta 418
zcmV;T0bTy#1H1!}B!3BTNLh0L01FZT01FZU(%pXi0000RbVXQnQ*UN;cVTj607GSL
zb9r+hQ*?D?X>TA@Z*OeDr{R1600BoyL_t(oh3(d{Zo)7S2H-zi2i|~AMMw;Zls*Ik
z7Pcy^EbJh4=o56PM0OTds%$Kz;vtBX3`i(U@CF&!(xqpa)_;IVoJ)nc#ThK!cRt&(
zk)|oi4C4;?_ki(amP<Gq^o-1a@nn`RANB~sC{uFVGSNI#&mt}YJ~m(Yd>Li}IG&5w
zdW#3(c<!HhYydxr(XP~#C>DUKdNzQndIGTk<m&w-1^@xl4)Bv0tKAlFjV1u#eZ4&T
z4#MaNs}&$GHGd^`JXg#ud=JRgUP@dDKu&C1CY~Rk06=;C3IkB6+QAC=-HuajDD)Uo
zJ6QL?wV@4=CvIZ}=pvdf=HduW7jyJGT`{h9TLfVQ+cE(_TvXZsj_1O*Op%0MN%Sov
z`kgM?m70ElT(LY-)c^#H?QeK4v;azdloBFS_Mgc0EF0&DJD_yHH)Afi(2-TD`~Uy|
M07*qoM6N<$f)ZS?`~Uy|

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/biblio.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/biblio.png
index ae86efe4965fb5557b56dd47f0748b3e2538d013..9c2f15e0483524605ea5fbbada0fa64d51f8cacb 100644
GIT binary patch
delta 371
zcmV-(0gV3B0*wQZBYyw^b5ch_0Itp)=>Px$M@d9MR9J;$U>NCu5uc=r6~ljOS#;+Z
zcDryoK*fsTKdTr61E(P6mVbZG!0`JOc1K`!0L*d;4PMG^hk_S3K4WzR6D|$Z@HsK&
zv5;cOzV`h@shhF8fnn9YgG8w%$pH)u3=B?{jyUD^weM$`v46XPA;YzSVbwm|>L_vm
z0|Ns?n3Fw*7|h43_8nx%a3$U>oN0hwV89(fRumAMz-Z<Gd})9#4xnZT40swCa0iea
z1%ygNZ0Uol4!~E;hB?_YWVkla&H=DumQYDIV>j`Rz*!yhsWUL}i&L*U{`m4U!>5}h
zRLArJL^}XI@oepD-w(&gd{Pr3*&zU{mXWJxr%FeX6CqWj0M;HDFbB{)1kmFgnTD}p
zAwX>NZNRf3&VuOsdj<x6aR{4O-(Ul<MEd<bcKN~CF+p|&<<>(0uCCcA003&)fs->1
RdN2S0002ovPDHLkV1iYwqFn$0

delta 313
zcmV-90mlA~1JeSKBYy!JNkl<Zc%1E)y$ZrG6orrC;5*o<AUGtDK12r>Hz|%z&f;@O
zXD3IIZY~Z!gn?vs(syvvsipNNY0?G<bEd$(-1Cw2Bn7<wT^(J+db4{pF<32TN)Kgm
zz1clZ{TsNDR_2Tn#P@*`qNf|eg~Wckv;s)76!CDN?9l>z8h@&j39u1BlBHmjAPPd9
zua~!a6ol9w4<;kgHR^UC58wfeW0)%n!ruUJA+2x5Rsa|!Uu!n^fYlMGwqFI<7+^nL
zBFR$y5sYFt069dPss&Kz0dfk^<T-8ypge3oo)lktzGjqw3t6evg*Lhg86}0`H*=>c
z;6fIL<u!l`j4~5|%9fU6_8K{Z2-X5%lvt;LQ3Bl6JwN{~_wsrIH{faf<yQL~00000
LNkvXXu0mjfInjs7

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/bridge.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/bridge.png
index e34d8cf8f2525741b100f6eb1014de7f4c7e0af2..838ffa7b24b6fb37acb20bd51e0d3f84f4ef2585 100644
GIT binary patch
delta 450
zcmV;z0X_cY1KR_TBYyw^b5ch_0Itp)=>Px$l}SWFR9J=WmoZMmFcgM=5UNlsqNoc@
zbjZK~y5<JW5u$9#8FGZ2A>E=JA>5!V2Vlqm6D*b0h$><!Lop4;iJu)0Nbpaw^6dZf
z^Rwdse_dxoFQ?1Z!Ishf;a=+13ou=-4%7KHF0b6t=552U-+#VJA*2A@+_||`4qg`l
zyr@#f?OvXx5a)dzC^N5%0PBs5x(Jl9edF~4P?hE7sQ$(PeD(myS+EKKoMt~J3q}Cl
z*>jm@p?4R|7k8M<oG(LBvdSNddw<(u`}Fu@7hF(DDO*j9p=5-#1YT5Wr<Zy@kZV8(
zf@-b>K!wmT*MA0}46eIeWB{3YnuMr}0BI5$Ly!PO18yAq3|>?r_L&q!Y|BL2hTJGk
zLc~4;z`kXJKOdovhm;qUsEYtuZUKM~E*gsxK`0^t=v1|CJPCjo)OzD0%S&bZv{Y&s
zt%HaUs%rC^v3e4UUqIOxQP#&AfGPu~GS0xzdww@iWjhEU-Un<*`##V%43n8-eAnyB
siz>8@e7Sz-k4YC|wEL&}e$D>%0qM}{g%`-a761SM07*qoM6N<$f}h&W761SM

delta 459
zcmV;+0W|*G1LOmcBYy#_Nkl<Zc%1E)F>ZrE5Ji8YC?{}9jpPDp5NEJtU%-fh!c`8C
z0&xP1!Uu3gL4n``Sjri!jI>3h)G2*}G)`eJ!FB?>3s#DF8pQ5s=I!kK0pMo;-R`;^
zR_lD<C&BYm(3+!lbG6R*FK?e<7Dma598AWKtq>1gL6`-KB!4sl@S_ZqvDfNzZxp$a
zV3~8D5PAT9lwq^o{kp%|?%+q67C`3}G>ynXT2=sN$LHaSd=^;D4{Jou^#J04umq5n
z6^bOpGH1B9g{e1!A7vnN5C^0Mpxpz^0z}S9sbz8#wJ2Ah*=(+D!L==<WmN;YwgqNU
z`>9q!8K8N(*MIkqi+#CP`zZn_UqO+C^*oTLC33Ks&%i9;+SY~Npa9Zjw>Og%Nr<$p
zu$a$u!|ADDv)$EFlTFAhkd~(soq8kXm|7K($>V@fBw?-jA_)-()PPVotqOGAZ5)tt
z^BDmQk<bW0cfJn}(C2eJ2*6K4<>-~N1P&6_Q2<~t2Sl2~2l$?VCJF!yD!?pG=D(Dt
ztj5&=&ii5N9p4Sr&<Sw<>D4inpOZiTEx*~#z5v`)xJ$h>xeovU002ovPDHLkV1j#+
B*vS9@

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/cans.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cans.png
new file mode 100644
index 0000000000000000000000000000000000000000..53cdbbb5c90e050ba1b4436e71db44fffdf2f450
GIT binary patch
literal 445
zcmV;u0Yd(XP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$cS%G+R9J=WS20e+Fc2INFCfK9p@0XFCJNkJT;&nhUP+rrr1D#UD2?v{P@JU{
z;R{C*?aAb9pS=zO38sl+JK5RU@x}rEIxc*ZTY<w;fu5v2mXp9%;Bb2btn&2Wg9hIB
zb`n+s6nuT39-Q#Jvy-@TJ>bi{s5|SpYAfe6t9&9bhm(L0V=tjq^JOeAHk?=S2xO%|
zR*IAHIjIm_atHvE++!~>_R=f;IYcW!Qky;?HS%H;twJ<`tQ5|Si@J*@z%BtWWn9!9
z+kk8W6qKa58S+~RsJ22@3XHu3fa8?|);1())v&gni6jp!0k#KHWH-SoK}zG9<Ht)7
zt-#nz=hu)^mS_S?INwB238>>y=JO6{&e_%{6QKT2=A(PF1FE(<2Ar=?CSZdvJMu}$
zHzMgg;DT1oi9#*}nb358h^(|WWLG#(#g7lb-E|1PFuZ*LFRu}&;z3UYLY#aKs;w|+
n``qvRF)>M`ho9j3HT%aW%=??Ofo!l+00000NkvXXu0mjfD(Jv1

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo.png
index bf0176ea97ecd8d2a47e095dba2082fae42236d8..0366a82ffa65b5fa94b2e2f5c7fa100be17d4169 100644
GIT binary patch
delta 420
zcmV;V0bBmy0=)x}BYyw^b5ch_0Itp)=>Px$cS%G+R9J=WSG{V(Fc7|$%qb$6jDZdw
zx_HSe6at2H%iuL$(-&|?`z<^hlD$t6FI_TZD0D2ri1r1pOBIZBO78sA6q*l=k#)ZB
zlTNym0RB5}PIdYoU|U2luQZocfbRj`^#KM-H6|~#hR-ir1b->OkUzL?V{(J-Zbyo^
zwf)e>$T|M30)7iUj!~3mBBx0hv@0M91BlWL^7WGCG)gnJ2zCgPFo5waX4&TJC41Ja
zyWoDLVCXnUeRad}vERenyFS_ltPqsRpPwE{VU#Tg><~!eDp@b0UBDd`mz*tta%vW&
z?R)D2&IziE&VMrDcowtPOeX@k<N$&YNMhSbD((swuZARi4{$M6xLHjQF-OE4<GFii
zZ&nkG=kB4;v`^VDrV80dJR`t3GLLDWdsFr{0pbu;vmupsB?U_?pt>L>Wm+u2)OAS>
zD9=c>O+kDfs0;CVpwJqIjw3#RP)Nc63a!b$zj-k!iydgp{sY_9?22#8>jhp_(5?;u
O0000<MNUMnLSTYPB)QN4

delta 326
zcmV-M0lEIY1K<LXBYy!WNkl<Zc%1E)u?oU45Qcxn7Z6+ohl2A#d;!5pIuttUB%Rz`
zd<q8_Hz#rGDmaKwVIi}dqu?Xxl%g4uUQ!jY|B{r1`#-LCy#kf~T{YW<<vP9l7|f?*
zqlfWuxlZq`+ZIx0PUb`c*XG0s(Xa)PGD9>wIsxogL$v!7<9{71fF7`jIKV6b00`s6
zcz)PzSn=vyfU@;<0QM{3rnqzfB4Iq|wk#U}06N`XzQ3GL`Say`V#jg<(B)$61@K%4
zMB?)q(Cfe_1HadXu7jx*0N0`94N!Cly$!%;9G3#12Mpr`husE5BCiRxClUw-i^4J4
zU7(w*mXtC>7(XZMB4q<8bM^62E0J&-R9;;W%|<V4Fkt)J0f>Zi7Z3?tEqA{DTVAQs
Y1IX`VC+9BnkpKVy07*qoM6N<$f|0b5xBvhE

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo_dock.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo_dock.png
index df7ee4cf112dfcf787a8e68e4b007f2cf8eb35e6..4b07e410e29efd308e689ed7baa58261a4b0d6a1 100644
GIT binary patch
delta 451
zcmV;!0X+Vf1Kb0UBYyw^b5ch_0Itp)=>Px$mPtfGR9J=WS37QlKoFfosS}|Hxr{{N
zB8?l)0EK%BYHk4~+=7~dK7~00O_~%gkWxk#TG<zH3TMaw3(PK9vXs0A4PMWC!~6i?
zuj6j)$L$8rOA)=j%ee*xY&URzdIWejjM?P15O6%nMMwo8`G4zrJ)0cyvENHYJPiGT
zM(#Qm*j}tmTILb#imLH<Jc-_!K>-xD7dOsOOqoZlbGyPH_019h08J#9>u+RjM6GkS
zH|_VHD}Z7s9rV8ISS(*!0;Zr+Gg<;<`N#W6o&@8$N3d%^2KtyW_bTMt0&Fkt6&Tto
z<XQs4G;6gQqJL{&MF5gh(z#$4A&s2VhKmcJV|7We1yJ&_HdF<>23*H#wHknY7vMPN
z7UbYMwq6WanPx*icN=~k4p4mx{yL`E71iWc(*>&r!Zd?0&6>yRI+oN9)2um9ud@XJ
zTqYc*0mp6ER-J-M0#p&E8B5UB1SEmKYzpWYF7rrgb36#UV71{AP;SFo2w0h>R#aUi
tfe*FlzYzo6>W2vxF`NAdL!V~<_y+nJ*U2Bf<ShUI002ovPDHLkV1l?>#Bcxr

delta 381
zcmV-@0fPSA1D6AkBYy#2Nkl<Zc${Nk7zHC8FcMPGJ9GJeN-QW&kHl*SUdi5>%m0hK
zU&wIz@&&Ri*VQ#(cq15(*AXm)47q&y0)ubfPO==Zd6GMWq+L8-H3S`iZXh-Qb0D%j
zv5qF%0h=eeGk69h;*^6~sH<y0tdXQS00y4iJ&(eNr4N|zVSjuDN8-$5BGm!t02V5`
zx(0CH;|eL7IAHsR`3wvU5TC<*4-=z{17N;IP6MQ*1Bx9$DIhr!q61iP57|UWatO#M
z8=~-$6CtvgZ(aoT9q{Dtd4|iEFTi~YW5bH;&6C_|R}djv0P`)f<uE{M8XzeIU=|@8
zj?5;f(jv+MxOOTbY5<}fKuL8>6$c<2<{6O4uzkaPl(c|Nj95pLR1Tn91WWO-8WNU8
zX;vA*EQeVnqil%c7??aMl@UqV5S0%pXcXik;5h-Eriue}bq&bQ1-iNh3~vai8SrNL
bC>R9*k|dwl&Ptjw00000NkvXXu0mjfPCc64

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/chapel.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/chapel.png
index 635f00ec536f7a9666c491dc4439f7cc9fbc3c86..a862131d76c7f6531e0dc2919cecfc912678e916 100644
GIT binary patch
delta 508
zcmV<Y0R#Tx0+j@iBYyw^b5ch_0Itp)=>Px$&q+i<R9J=WS4~U9Fc^OPVhYZoi1XrY
zpy%mnm(sxgLhtjmpWtrw)W5Lb(7!N9*~ODrK|xUQqJj<`Ql^J^n5jvccB#uy&<9GI
z<bC@*@0;{Z3;cD==>}^Juvrmap2(aj0ksC$(iX6?Zl63J0DtcfvIt24C*R&H+h_m8
z-T6=wF|QiTBJ#ZFrv#XS29dTciUqN=u>-%f2`sOcCOXFK8fRBGsdf@ZuWuMV0#CO%
z1`1?AjWDErc*Fq!c*H?S`?>a6Fc#45`KbqUQjwg`b9-w7R3RMgrk^`+U4V#bHz1&?
z18ciLr7G6}kAFBuk?L&Jz43fM#LGoa9nc}9{mj&=q<Q2z7%zcN1SdC%d};wY5&T{q
zGbJx9U=}bEK!XT0h?2qse5IX7FD`>eoW!RPY7MY@3(P$#GsaG(mfxFRqL0|tTVUe%
zMrH=OJs&iPKss)c1=AwKeF1=U++1IyI$#q<bwFK1wRPq5d{3x*B+FliMcrV#=_jer
zo2Nm9kdE!d{v>}9-#(6YeQ}+wAIEA$y1rO|Of#Te0(BP`h0dS%_YV&w+aG@mQW=N`
yK&3j}8J`8xaS;#XvETJ$B8sq2KZg2i_Ky$f4^UjzPI6lS0000<MNUMnLSTZwFzE^a

delta 328
zcmV-O0k{5@1mXgaBYy!YNkl<Zc%1E)zYc;h5XL`^gYV#M;?O322?iE6V;q^Bjn846
znHY_6V`1<iAi>!Q-+@gBQ&L3>*W#Z<zNMrzcfWksI{-TUyLxp8*1`5-lVG)&YjbE{
zu7mC6Fgzp8jz-A^XK;#<7Gh8rB+ZW4O_xRhv;79nc%(g33xA*suF4d$ZwdeazU#qv
zJ)02b4gf%spRAIT0Um9C^^Q^wvIDB+(gAfZj3ZJ!GQcz2ZAw7~P-lYRtg`o30JXM1
z(S~iP1F#xIHkZ#D!1U4?0q7>+M*wU-$E^UU!31Yz?d7xYdI;mFT!H4$q%QDXuS^Ks
zE}`J;ZvM;Z*g;ezfH00AI4ftrbU-Fe@)Nl;8keAA>BP~mZ2<_*jJrT^1{C@;U;i!d
a)aeS&q;JawR0B2u0000<MNUMnLSTXl%az3d

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/chem.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/chem.png
index 71739f2d4a8b65367b296586c317e55ce18b0ff8..f8b42e9e6a323013bebcb85d2358901151d60901 100644
GIT binary patch
delta 436
zcmV;l0Zaa`1I+`FBYyw^b5ch_0Itp)=>Px$he<?1R9J=Wm$6O6FcgM=5EJBlMI?%A
zz{N={a4WdX04Z*R%#jT!GC)eNkOh#g@X=5pT|w{)M-i+G!G3mPBO$@xMAl3Ee=qOZ
zae%+BD=N4V`*SLz7x`%Qasq6`{><`QWLXw%uC+#gdbL7W0e_77mfuC28y(cM72?|U
z0F`+mc4#U-3&1s>6M&N7J<3|mhDZX?R2*fk03Zp(%~EqSmWl!R3NpSY8Gy}v7%L){
z2*6}o2nOKN14gD4<7=qAJ#cx=u$sqeRuiT+4+1D_1;KmLybwEbOev@bd|8j-hCTpV
znGk@|v_SztDu1A<!j|Krop5SylT<8dlZpaJp{No_#UOZ3#sRtvQ2?#%Jk9pQJ&;0P
z0Q2oP4K=;G;zqtk^p?Q4``O~-?}AT@O5n@VEJ4>2jRu%zJRP^PgH#Ny?7VY%OE6?(
zH=^Pp<^XXjzTZ9|U$25D3DN289mm7dw^On64QQ>AuPs+e4xVMLptZKfe&>(L7$VyJ
eQ?6gLe|-R<X3kl6J-|u;0000<MNUMnLSTZ-P{n}&

delta 406
zcmV;H0crlt1Fr*+BYy#QNkl<Zc%1E)v1-Cl6o$W+;?}{*u`h5TWO51_0^%!3gpAE7
z?Q<v{brdRjg(74SC#Mj&FW}h8-Ng=aMT<?mC$Syszub@<&iU@2oO1&={de7!1q>(2
zu1bN|=U!or!iU32vU`8}Ak(?1xT_rc>uw>$Ls^nc=PbOb2!Fs|M)V)Mg)yZ7KP86!
z4uOM15>OEUKpcehwjBVHV9q$5iSmd57Ty#;jaVrSRC`Tg2LRrhF97&N;vDx?0P2tk
zV6YjTSibP43^t?R1ITnv(wO5fBm8AV(wK{9g*CunGa?Scldpc9&WM9h<bpLo(M}~U
zSOJ{dy^+)ftA94kbWXdah=Z^&2JcD$W&oAN*vNViNhe+<0CV_ULl*&5IgV=qI8Np&
zhfL?V%Aws-jMLfKdzV66wP75DWI8`|fhpc@DPZ3Lt50o{((WTP1<h)T8Xd#b4sc?r
z_ia7C-a@b0sSm(aj<^e4<-oc)=Ffl2Z@TFV@Ftb_vk#2%bN~PV07*qoM6N<$g1BqE
AjsO4v

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry1.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry1.png
deleted file mode 100644
index d1c1ac91845db8f6c6f9da96afa298ea80da4996..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 450
zcmV;z0X_bSP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004rNkl<Zc%1E5
zyK2KQ6g@3n1A*dnbhdy;69QR^w|s%SX3rn!3-SlryVhTj&2%Xg;W5xH9@7vg^aI>U
zsjBE{DRgMh63aL7Ial}iMi=<&xY7mYi)9y!<Yn`y<+;(3r;{0O@5aI8$NdffI-Q6!
z0i1k1nFW&rz+gDymr4=WsvpJ3-1T`%0Vd>Gg7s<|q9;s1S)?G8MHAsAV7;1xPzC_e
zL@3_^8#!NBb$hzz5Wf>mfQp>2O)(c(OTaVDv*ctzkw7ekFS%8KxXr+~0b|11gqI+<
z3LuoBEK(zRo+ZY$4OSD{vKGa0KQ!BevjFc#BtkZ5o+YU2)~i4C79bl`gpY`z9f$$v
zPAH?QTa-m=j9*khvpsm3O$TcUc=r>#o%|`seg3koJK)lQ<hZFcGJ2U%&Q9C`z`g#x
z1;`l_%6{C7+KBi&ZK|m)Zo=6qb-q}3`Tc`<nhnP1$2*$mC*^#gG~sc-!(cdya^xbE
s@!3EL<**QYFlpajwbRkBk7ob)0!JdbKXE&8qW}N^07*qoM6N<$g4h4d=Kufz

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry2.png
deleted file mode 100644
index f9864f7d44c4db3917a353bfc73d75faaa0e0f6a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 401
zcmV;C0dD?@P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800044Nkl<Zc${Nk
z80ml!mxQHz{C{d$a(w4Poc6HbvRq!>j6qmjfnv+wzI?#Iz`*bymm@G70JB^{-Hc+(
z85kHCcm>2@OstMz!lsEDJ}1^ZtPY?jz?ue#0qt2PaCYUiGxT*pdzJ}`rRaQ809jE`
zIqeKQ1SqkbYzI&i3{3|ZX^G<H)7$}}4)XALubg&<A=E*hehz5QGGSPK;30#NmM9#r
zKJXAFThhz{Fw3z4avd??iIAj%X!U`Ic;g#a=upi8=dQhGICt$e$(G;)10Dr~-vLHi
zq73a>CMab;I*l$5(?bj(m<Esw9b5oio|J-#tSCVD9dZaTFp!oT$gYmj`N(3V<P?Gq
zfR%9g;*^j)K7i3mwRDgFZ)6vS+?u5reE#r?;oPBBSo;T96XDyJ4;Xj_#K`s)GN_z(
v2G%#g3b1w-sNFGnc=Hs_-qC<}%|-zL{`QBbN)Q+!00000NkvXXu0mjf-jJ(`

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/cloning.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cloning.png
index ecbc9370c18388c9a0cce879589a1e6b8890cc5f..da9434fcfbbf4c7b43c757317aec2fcc794acf99 100644
GIT binary patch
delta 421
zcmV;W0b2f|1HJ>0BYyw^b5ch_0Itp)=>Px$cu7P-R9J=WS3OR{FckhkoFGkyNDN)T
zLnSVd1F(3^0W$OkS-3<dRwQzOPRLh)10Z!UEDT5;2);rYN`jL<|AeFs68)seO5U@-
z&+k3QHt^qZVl&S8Vlx!co46yni~?qSu?eGd1VPZ7Tq%We{eMo1AO%$9b9T|2yuwPp
zk|It`9rT$eJVuc*Bs}&aqx?;gGz!qcS=nfZ^!F05Pk0GPbJ=Kz^gpv16CO9hSY!+U
zAY_Q8c<khVd;dUkSR=q$xigD2m&V+7^>+$51V$HNtpOLR90UFZ+DU+EP*at={3&>+
zfEuL8Sp9S%)ql||1-}iuj?s(oD8P6gxSU@hnob5IT7P`vW%cZT9sqv!^{UF-)!yFs
z+bg2opMrH2Q2%zyUSz;hY`<;aS-l6iR?6OMz&87X2yjKfngSt16j^hiYDQ@;YrBvk
zfL$WJ|Mkri$uasWFh)Qrg=ji)=FkUeE}@hnZGZD(q8^Lr&HfG3)$E8bz6ZBo0hZ*D
P00000NkvXXu0mjfdSbsk

delta 393
zcmV;40e1er1EK?vBYy#DNkl<Zc%1E)y-ve06on6nm7x<OFJQ^?#AIbas`?5Ml`_Iu
z!E>}?q+=yeUx9_8>ckX9@(Xli>fWUc)=eEqo%kjx1363LANhVczP=97>%Z%)YQl8B
z+&2mEbRT<Tcn7ER<^J{h9jVD!!Ih90Z$@5-i>gIZlVPP7EPsG#onU-9^3FLAU39XY
zvBr+6(t)2!O@;^wl#sZ&5&(eDFLT%?-7x@w!<OvqBOVL^Z7mNK3xKS49pEY$V5Jv`
z)`@k&aUk#O8o-56LIP-ZQdj_hJ>!&k1adNf+-_ac*EIlHKiSR-NvMQmL9iTn9z5C?
z_ZR|*aH3;KE`O93qOJjykmU|&UMUW~3-aKBW5-m>0Zxf+6`;v=+zNoZ7!{z0+dI5`
zy!|Rj^j;S_C<olkr{L74;7Z6K$ASP-ljS!b1*A5C0AV>(dkYF*rAwYWAlAcTe;WW)
nVmVSm0vrFFKmRT7)$1Dw6PJ$WJEk500000<MNUMnLIPldP+zY1

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/commander.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/commander.png
index d66b76011f21742022054dc0d917975ce8432d4a..f98c0a440b208a57a1fff7fe64a2487a369a0429 100644
GIT binary patch
delta 409
zcmV;K0cQU40<r^;BYyw^b5ch_0Itp)=>Px$Y)M2xR9J=Wmpx9yKoEr=2t~*dmX!u7
zC|u+KX?=tE2$nnN3^_v15O-FNU~b@+1Eg>P6*SQ*7Li308a7&-{Yz#Okl;1;Xtg_^
zcV>3Hz+cyeZqOTzx2_y*o*t#XlmOmny!8gRxV{O<&fA7zvwwP%LP!C)bN}w1?3`=;
z`XYt6R84U4<u>bG=_b`hyn7GR5_J(HuL8{G3*($HEv>+mI{*NAwNITz4AV(swKy4I
zHeZ|^LJM#X2qOT8kjVvv6@X4uh@$|y8BT%FmZ1qkEYmDv01^P~pmj(gknO~wBIkha
zz_AGn89)bNlYbjd04Na7089`nDckYjVTfMecS8o?<9&_Q^U}T@pG#H%yx#e9I!RC$
z@t)0N&Bsnw1zE%prsXc?+!kZqwaEbDsb^!`${L`X;U?QTfT+9*zU6>S{P)eIA1^~?
zH*6b*Uf(}DwxYtcMBB&{@^@ZLL<q9?FR89(|M~<nqY|x=J52xT00000NkvXXu0mjf
Dt|hoF

delta 344
zcmV-e0jK`51M&ipBYy!oNkl<Zc%1E)F=_)b5Je}!#}Ldx#s|m=3@KFwbrxw{`U1wK
zaplsG6XXDygAC{%P7x&R#ad~k4JKrNr<Iuh7)f6XFzdhTskC5sJYRYY-rrtFJw_*Y
z$Mfau^8-Yr$s7@3`LY^?Sd@y02<#81CIIg&EDLL%n<`JJE`I>;EO=)h1K^znL<B_a
zf+(JWp=lH%f-&aqoaW4^0HX2OckPW)Z2=<Q7=#cYgpkG}k_F63)q(Y93*OnA)?Z6R
zV7=M?9ss~k7nnIar<EEYwt3iv5JFR8ssZ+g6L@FunzbaR8lcrEr@tM=Q>bbSdh@;;
zpyxTB1mL<@Oi@E30%lI*VM^9QtD`vHe`W?EN~Xq`6huT+T~h@hA}RZ0B1Y3(I+j$u
q1ykOA6+q7qN6p*t@Za)Tv%UeErgobM5?7`G0000<MNUMnLSTY*&zC9y

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/conference_room.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/conference_room.png
index c3d20f31b8761dbe49232a3212cf073ed169ea6c..0823ef39432adbe4d4a3f7d70238e8bffb4c8304 100644
GIT binary patch
delta 380
zcmaFDG>v(Jay<iMage(c!@6@aFBupZ13X<ELn2y}6C_?X2+miTzVUl~R^*qrZ^G7;
zJuG1WarG1n+4$lZyLA75{K<THd%6BbE2h=V3DZ7%o(Rmb<f*Cp$gx^^MnUF+w)35a
z{L7gyIJ!phT$OR&1XOeRkf2LD!`cHEiX4uwQDuJ35XDfxNXCJC{^TbNQA~?u9aaZO
zd}!)ujc8?M{mB#K^oVDDdFsPZ^WPkcPN=F~>EL4o+TND`K29jta$~~_fd`W(B!h53
z-)*N&sy_}~ILXTVtf6a*MBDD}8i{v$pBx_^E@IszWA;_VTH)$5=H{Y1Vik7||5#}z
z{~&A1<823YT}s3KH!`1KT++gDac6^wgO{J81k>hzjs-tBj;WiS7v|!evo=YwvXsp%
z&u)>9BHN!|zd9e@Jv>`tZPJ{;505{ygC!md$pf8m2*h7g)Vw*l=?zC$ZaY&<?B+lQ
YhDj3}d#u)G7BT>Vr>mdKI;Vst0R3#IGynhq

delta 330
zcmV-Q0k!^?1LOjbBYy!aNkl<Zc%1E4I}U<C6daB56x1XXn>^wfOymL>3JWR^VBr}o
zJb)F2g^>$TcnCM4FroGoHd=|Oxa__qF-E50x4aqNXBMEtzoXZ*V7=L0Z3q_gNXemm
zxZdophtma8<}7j|fw4DKiWoEnkut}AHDd{wF1HwaBjuVtD}Qo@V7lDegs>CP1{zDC
z0=G2Q0zRdkBZ!>=BJp(1ofPdJ&}}%=#$-34?>e>TrqC`yU483_P5Xe|14){3U$qy|
z#`xXQIpJ?Op>3M21=wuItq7<Fi^Bj(njsDY9E&r2*TJzkL&_XPqO@dP(MC;pCj}lp
zkfa%W*D1+~1ViF5(2i*&plUvG7?fZ8ngJ7&;#qM-0D#Hp{a$%&O8}8zPr>V!U5Bs#
cmUrlI17y8!23K}i(*OVf07*qoM6N<$f_B4_)Bpeg

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/court.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/court.png
deleted file mode 100644
index fbb8c50593e43a54c2f61f5a8d97fe98bdc090d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 431
zcmV;g0Z{&lP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<SVM#<mRCt`tm$7OBK@f&7U>gv`SZXI&h7d?+=Mz}li!a~{=o{Fl
z&J)<#1wu#}NT;QW&!GN?zYOci&F;?KWkAMtasTgTX7^@mNyYYm0p13qqm{_#^8LXJ
z0OIZLYtm?SqQwu}HQezY#0>z&JLivuJ=UN2H4`E;0v1p1uDAL7%AAWT!slKy`T5<)
zED;AV?6<D~^YKgSKUSOc_vzxhcmOF(L5#KH!2lGM!l9-DfFMIFMI{IfHGw&w+E4*t
z(Y(+~QFtwc*-;F!kkqIEw4n{Dhg^Wr(3$~+hSm(A2vKhU*N_HoNp8{5w0HwZaT>=V
z5Z(X~DYXcTHuX^~3z2DH?m6#zGXU54x`j|>{eb%-Djk3kC=I}EJfxu(cplK30=S|a
z)61>tTN9Z8=;hH)TZ9;pm%D)u;L^LNx1z~x7YzV$wB+iGiG;Y<%ln%5)hzE%mR9*u
Zd;%Sq$86x@y|e%T002ovPDHLkV1gIT!BhYM

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/cryo.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cryo.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a0fc6d71683852e419285e836efa71b6e34a3e1
GIT binary patch
literal 3065
zcmV<V3kLLwP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000U%X+uL$b5ch_
zAW20-HZeIiHZ3wPF#rHaiJg{rR8!d&htIt?y-<=6ij>f6Xi@@54ZTQ_E-Enz5K6$1
z03tR-RB%L5k){YTDBysjLy@r}iiH7DvFijGMAUI`6dRUFWUU$Bym{}<o8KSzerun-
z&)sM5eb%}Fko<!M!c15RfDEBn6yfK^h>eS9U<UyV@BjmB0N`-5vqBd5Mgo}veAtX^
znG^UIy}Aw{`THu<Ka9Zu|DTk(St2n2P?(J8^7z?Y85hYoJy)D1w@=BKwlq!7FiOrM
zS%NZFlXLPcTYUDJWe+*?GK4%C%X7}+W$@(OC*zGd626R)U>O(Z2>7`&z9wUXbV-Il
z#&6`Y8GKGQ04S2&F6MJnWNa;Ck|;8QE#r9r;7G||@X{|>%+C|c55>;RS}qbKr-&IQ
zTvLXPlM{>K&(BTgi^a?^4mXV>;xX8n8Ce|RasXz}{8<!vZ5gs6JJ>imI52H3ZN4bf
ze_i~WlJ|C&UW9+{8AKoW!}eExnGFE2re(F+`iE_46#!l90Z_aBhs|Iw0E)7{bq;-T
z9=d#9QpDmcXDh4R++0fmpKB>E=<oWU4u3;me9uz8-S6dLc=MAul5{acUN>%LdZt9g
z$j;($`3&Zthxi`{{&gM}5&R^+h%b~yM9Zd3AWW9ETgVfL1(`yIK=_}U_z%PWq}jQa
ziQ4!P(3V&Nr6C$XejWfQDiI(Fdt@un?|lo#M+5oIi_w{wo%_#%{(V=tO#a9gB!7-$
zM?^BX5>d|Vn*3S<G#~&)Km+PP8|VWQzy!9y5x4*k-~$3dD2N1cU@_o=6p#T#AQu#X
zwV)W3f~{aDs0MYQ5j2A~a2RxfW8gG62QGojU<BL&QZNplfGO|_%s>!?g~$*UQipUP
zL&zMmg;<aq<O2mm5l|eI2qi;8NCFi=>!4Do9IA%up=Rh?=qPj=x&RGBx1dpI68aT-
z2O}^EromdU5o`ssU{5#*j)WJ%$?!5bA1;Eoz?E<Vd=T!0Ps5ks5m*X8fu|9G5D_|}
zi!c!u!bU=ocq9oCA*+xQqylL`+K?WkAGwN1k*CO86b3~_F;GmD3(6lAh2o-?p;n<b
zqpDE{P@Skg)K%0dY6|rcO-5^?&C$;20CX%m8J&wRMpvMl&>iTr=n?cd`V|I)p<|3O
zju?MT93~aB0<#&j8`F+Cg&D?-VWzQItUA^l>xvD<a<F1-F}4bO5PK4P1v`#?gCpW}
zaJD#KTs%&QE5udcT5u<DS8x-!8N3qS5bul+#q;pX@n!f%d=GvIKaQUvC=-kcu7pTJ
zDq$_5lF&vtOSnsTK_n9Oh)%?CqJX%DSV=rYJWm`Yz9mseW+XN#fg~YqA?+ufBHbdr
zAd|^PWDjyYSxnwSZYG~0-zUFOpek4@1Ss$nRx8vfbShj?c&3O~G*t9dT&$R{SfO}C
zaY*s05?;wjiLJy@TBTH@bX4hv(zG&F*+w~3IYW7~a*Of><wq1O#faiV;Zcex`zU89
zV^oByPi0fN)OFNG>RIYI4MQ`g1<+DyrL=EogS06Xii({|v`U^zjmmKqDIK93(F5q|
z^fLNk`gQs{RV`IdRle#b)i%{Ds;|}NsClUI)k@Ub)kf6bsWa4l)YH_rsduU0(?DsM
zX@qO!YV6TCtMPOWZH~(v?wpc2hv(eZgf-1HBQ#fN?$aF5oYvCT^3%%Fs?s{6^;Da#
z?V+8jy+iwi_M{F~$4y6|vqR^k&SQoO!;_KDsATjprgSxR{dFa}^}2()GkV5)QF?`X
z?Rxk03HmJkB>f%wz4}uIItC#I1qQ7Kw+-=zEW;GTU55RJuZ@h2VvIHzbs0S}Rx=JT
z&Npr~zH34@aW`3J(qMAU6l2OVO*7qXdf5y%vo}jIt1%lghs_<#1?IcWhb_<+P8LFo
z28$a^64R5J!)#@aTGB0pEekEXET35!SjAgyv+B3{Xl-wuZrx~o$A)4PXj5p@WAm%6
znJw40#`fA=@?77!tLJvleQsxN$G6*KchjC~A7a13zSsVPgQJ7Uq0M2^(ZDg$vDWbh
zi^d9LZDyT!LOXdmt#&%*^w!zIS?qk+`4<<aOPWiI%cFV5^Z4@`=Z(4QxpG|VU8Qae
zw?wzSZc=w$caD35`vVVs51vPp$AqV;XR7Bx&u3oNULvm!uh(p6_Dc3CZ^YZryTp6Y
zhvF0EQ|)u#SI;-ux7Byb&)#o^-zk5ze~|w+{~G~X0o;J*fT=*oz?Ff0L8PDsLDfMI
zg3W?O!95{xNMOkJkh}8@=L_d|g@Vw4(Cwl3!i>X~g?%562@eae34a)26HyS+zks@6
z$%2*zuOhu7%OdYYnM6sVdZQJi6QY}=U&naIl*dS8tzuWkUW(I*6U24LW8<Uao8qSz
z`YhbJa6G|2p*Z3CBI8AQi!LnISe(B2_!7k>oFzvR(TOpMEs5_rp_~TJ^wNN(wM(bC
zZ0;`Z6P^ce2XB(^$}i_nB)KM)Cp}7bP2Qe7nc|*Ok@8f)7E}wKr~0SXrM^xJP1~RL
zDLp2=Jp-4Km~m7{5vB?IGPN`FGKaIwvx>8%%bb_(Ts9>N5;bK**^9Ef#WdN^)PTf9
zvR*Qp<CasC^CmYs_eh>{o-l7<x!Lkf%O~=E^S@q!TESh>TcBI8wqSIn=gRt3(5j`Y
zdRObOE?Pal#&6AmwS={4Ykw%TE-Wv6xh`g1Pmxy9nxe7we(PI{6^cd0H#WFzsN0Cz
zDA+i-Y3`<~O&?2mB^OJrODjs>Z{}{k_?699m0x|@lC)*8%%N=0R?Jr6*6Z8cw;d=~
zF3&F?+a9vLa|dHb$&Qyhm+ZVyVOLSNi?B<wOIjIR*<EE&wYBPfbxQR}jaN;3t!C|}
z+Sj{zyRYo=*wa?0RaaW~Zm(eP&3eE3&IY4~ihY=UIr|<qMmP3<&HB2zNu#N>>BD~E
ze(8aT1AWbo&CM;EEoH56tE6@EV8X%6-*|u1-NtOIZ>P7H9s-9XhaP{M`0e$>L5F*f
zu#U8SXZT%h2eqT56Y5;vIn|ZYCGC#u9zGg)w718lr{jCe@An_mJyvsE<#^c%!il02
zpHAkVoIaIx>gnm^(__6$dheWxJ#(!uyl?Pq(Ao3ne9xWf_v}A;-u3*k3(gmgUSwVD
zy5w-FbHIL};|Kd6ItCpEJBJ*Hx-UCj?irppeBz4xmD5+fub#UWaP88_{E^}7QP*$Y
zNVp-r$-DXJR{E{yw{vdK+*xxMeYfPE(!GlNn)e%iH2tw%>L5Kn>ODH}V8MesW8ASP
zKV|>)e!S=*`C-L`&P4Mg+egPHeJ3wJUif(YN!F8@r^P=j|6Kdb<k@$>c>FRj6+1Ql
zT=e|YubW?}zu5oM?q%<E*!2BZ8Lwtum%LGbbKouOZU4KNcM~(Y@3HSIKbU^#`55%^
z?x&1TpMC@Pg!B8y(K~nm00DhTL_t(oh3%I;YQsPfg<nEifgo5Z<<8(z2!os8&L?nM
z_qu^jpc|-98=t_PNfQV{r6HYF+Qwk;0hDT!mG?)p+7&L6SFKhny>DiJqyhfA?sPY&
z^JVSI=wtmV^?J~mhocD|pN7`vr~M89Y8iwSfSC_R6Kit-@ce)^1&DjqLoOnxyiYj=
zHoBY-jcYCgf|MDsk>>|m)7}Aq-z>C&SWQ7R9teHq_DD9j1}L{jEer*u6(CDuX@8m*
zf;j`C&OhK_4P2X>sx<?Aq(CzxeA>H$7_9+j&Y-$R&5Jw**XFK70_e*eFx&-v+Z9Z2
zCm~hFyTG+>o&gd-G#(&J;-59Z+HCLh{rq^@@!SbuF$<CAMPoYByue}>YR9YY8w1Fc
zB{5c;3IMR$RE=vBbq3%gWG7;mlaU0#B2;}DRpTick^ZYs=gT^Jelhy2w&`*{pnQK5
z>I3CDaN6(S`2jg<ozlEuwSgdIW#qarslGm?)zQsMvwwX9({PsVX!h5n00000NkvXX
Hu0mjfW6jpN

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/data.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/data.png
new file mode 100644
index 0000000000000000000000000000000000000000..03a801e48380a9f3987c13dc3a9e02e503f3e7c4
GIT binary patch
literal 408
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<L7py-ArY;~
z2@)?G1m`d5UGTd;E3)LtU%xeF4@(+A+&aHHHoH2zF5UlMJ_;W`{$75g71L_wglVTe
zI|Fkpd2Fh_ajjOKQINTy?R=+Ue`^HuvblZ=H!ta2W@Wi5@U$Uwxp0S3k4&w_;)b|{
zD~u+-Eg_{03y-AaCHEb&uY95s*r%q+btd<WBv4z!<rfd0Oq|T4-akj>sK+B`hP+12
zBTN##?;L^{&t7t{X;%9xGa+?X!;?cD5nr9vrHu?OsA&i3N>Acuv*GF}I<Vz3=Z8P%
z4>Ux{DV#pMh$D7h61#zc!y<)!@{_hc`fVEcW5bKai!VNf6f#&TOi}3c-H>A45U@za
z?4r<HkUJ&B#NyP$EH5&ouZ{?Fn&#LryE#j&_Q$X0habC-ORP<r^Yp;-{`nFtJ1kcO
z{YaUqm+%7^B4IlZ-ZXS9V>!CbnQ`5^n;HxZq8Z&=R-dz+4Gd}qPgg&ebxsLQ00>{K
Aj{pDw

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png
index 28975a1b12b7eb516409bfe62fd84cf92e4a0b63..1fa88f63afa4f524eba589a462e26b11a459faf4 100644
GIT binary patch
delta 445
zcmV;u0Yd)G1J(nOBYyw^b5ch_0Itp)=>Px$kV!;AR9J=WS21gYKotI3x&{KpbTnJQ
zQ6!M1xaAkvHM{f=+#hKEfqU1u7rIH8LJ>!yTO3mf6#4_~5T0DrJL7q^E$uhu<>`Ij
zz4z{&5BTdilQ|d5RiTUM`SHGy>q16u&gQthn)W8&@3sI?G=GU`6hP$D*}Qe}weNrh
zvGkeIctSsGBF;rG>Dc)x>j?!61!Vzi-+^rz007%Eu=br{1%y!s&ou!6o@*kEvS9@z
zX<m|sQHCVVmDUj+Lm4RCEQm{D{=Y95033ErH9$6{WDo%=WLgC@g<9n#C<~|(cFnyO
z0W64NTZZxp0DpdSC;Tx2`h*|oQ3I;IUyA_MitjAIwv4jjuplmXO}(G|RhypY?c2MD
z?gBj5tnHSBBxzpytG4X@Dx^giM%mH54;*sOU%hR$(B_v4NYWfEh>!X{e*=;&Lz`ck
z0zT)bfFef3ye+DM#&7k-a#h&ZH~iOZZ+yJJA$i)=<~9Ri1opcvM&pT=^Ui{pW`i1p
nlacPhBzt{noQ}SIH2cRVKoGWbYj>5E00000NkvXXu0mjfr|Qy8

delta 436
zcmV;l0ZabY1I+`FBYy#uNkl<Zc%1E*v1)`s5QhJRv<C;lOX+n7mLdn&1iO0z(_Sxm
z0bd}#fqmN82hvHJK#(nkbZ2>ygFqg@6vv2Jch%c9CLx*1b=UpBnVsErfWK}hvX0ey
zQw}Ba^l&THIg^Q-izUu4=Gx->-4*~!8AJns#OI4;=j5U9Ab*I`)-jXmj2?v$r=pLB
z@VxJQLVz(%2_W<x*p>kRuq^|j?~Dr&CpkRV1ORxhi8#r}1z=fGiN;9|mKDkX!fn`Q
z6z(8OE8+UPF9!e)UQ-TGo0eo009CQU07Riy-3dwnyr9b3YXbyP3fnTYb^!2OPr@Gq
zpc{TbF$Z+cet&HMos2&Uz_yI)zzL$X@|w<m>gU`1cmTM*xj!DjbIpdgG%?GHs-JK3
z<GW0ngmIF8y7z&@+Sjk%u3QLxr*n)n0xT=QvZC@3XnMqlnzud?kOI`#ypK`D>cZ4+
z%YnvU>T10y?aQnB->kO1zrBJz-U;giVFdQOEhf|1AT9enh*GKzgeEK&hAvF<muG2p
e^zEhDzkL8VvbN;6RcrD90000<MNUMnLSTZdZ_<PS

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/dock.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/dock.png
index 1716f825bbdf2648ae622eac494d73b81d680bc0..8d59357a358a973db20048c6107ba80365f4d434 100644
GIT binary patch
delta 452
zcmV;#0XzP%1Kk6VBYyw^b5ch_0Itp)=>Px$mq|oHR9J=WS37FMKoETiX$^)Tr?fkR
zN+AqxLOP!yY2E7vK7nrFK5cx0bRtc_7?lQhR_Pc+AO}#YG2{J6yE_UglGjMukKWsz
z&+Y(!9al}A)7iZ4is=3I*~oR%L_Qo(aC<irlb;TI0H{qOjDG@%d^Dbj$pN6(AJD5N
z!ny;#E6=l3Yg-i+%I)#|ziPME##jaTl5;ZNuC{e9AkR`PmYd-D*P#=WIJzJ=nc&9+
zByohthoP9<TR@(r$g@-<=O!RANgQ=6fQVFktK{^}MT!NewzmD)WsC}^C|DI$tDQs0
zoduNJ<2jyH?|<i@eBc8wCnWDDGEQtuMx6@aAhYn@@Fn*WKw-5is*9CMvLFzUicPDO
zq+=%mNgNr8$qbTRaE=07dx+gRoP2;nk33&}Qa|~LI=%@`JJ6O^sh`e&*E9@xo&}PA
zv4FM}g*u{>0G@P+tjYV;@l7z^)u*$0o!me1+pHL0pFJNa-(Ix(!0Lpj!ydi<Ky=$7
uES4Lp4K!FQqpk~+YPU94N55X0{o@;Ya^a1Q8MILV0000<MNUMnLSTZY>e9;q

delta 407
zcmV;I0cif+1F!>-BYy#RNkl<Zc%1E4F>Zq}6n(9-bnj9rLoNWK>d-TQgh<AYo_c^D
zAnE~ffJ`1URuK}MqAG$5bjX;!V>(23KZsy|8!1D165``;{2$N%e+*3c@3=8d*lc$v
zp8#*KFM}}#oty3MbpP>#rmCHS2T_RQ>TZz4%(O^T)kyckiGM(zNj$8c2j>_GD15I!
zwGv%Ic_y{ZC40-6+_!k1Nd!@-FG|J+)(Z4N1z)^B{SB_q<F-n$2weI)IvzwJXGtD`
zSR^QA(F)j9HDZzI=Ta6d0<0WRQ2VXyu8#w!9H4!nscOt0=e<4~uoO`8rhB22%vS;L
zGW3O483Jd?U4L6Oz*L}HhE$PDwh2yUNJ00UyZ<Z#s@tVY(L3I?M<u}R@1qm&`5li!
zfG(!;faXIGg=nf;-vN8l)>ROT1VI$)pogzRD|jpt9h{Sl)&xpf=&uBzZPkWLS+sn%
zu-*bH=>qL+r<Kw5c@uCs<<NJJhB;S1mQR@Q3j}(UO%Mw4RqX%(002ovPDHLkV1k(B
ByE^~?

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png
index 46f7585812b82053f4238526c53dd60ea63b7422..107ea06c99cf284040b710a7a39857458f4e3972 100644
GIT binary patch
delta 432
zcmV;h0Z;zZ1K<OYBN+ezb5ch_0Itp)=>Px$nn^@KR9J=WSFuWwFB^XcTz){(+nQdm
z3pRorDFb$w@(c%pA8=M1a>?vwHd(RI*Cd-v=DpdOSu((1$ARkQbT;3aB6@v(Ai0iI
z<o0-i)AP|_^6h2~06R(qDL{~q#*@M10C0SACT?3I4rL#ih@9h3ngR;0W3g?sykyz2
z1qgDEW7o0ZIu^@Tnu32WA*P@uAn<MF`zZ8&Mu6*B2z(n!S}4gE@k(0&s|G~m&8r}+
zlXJvs3rNzUa@s5`Dso{DbQdj4fN&D{_MXE!IhFsWeQyB*Nm^9x)r`D;uagGtHUzp0
zPL?iX0=lZ5TY$X;aF19n*fo&lWp%`I?Trf1ajJt}HDD6T9T0!LEh@U+UesD<4*)mI
zCz7Lc2Nv;a?+8|{W%jDBF`j}b^r|*Y(gIQFDGS%Qfcg$(dD+^bCOW%-ib%Gmz7=*d
zkpJq_*?i|-T-E<(2jlDW1KG=CYd(<fz;?67{oSQ80oS)N`CK{~nI24v_cwAn`t{N5
aAK#LY+|YjEWk?JF0000<MNUMnLSTX;3(8~w

delta 419
zcmV;U0bKsz1JeVLBMbqWNkl<Zc%1E5Jxh^18-EYD`~gXCYkI*h*a&i@4A@=DGaLy1
zfLLwVOJ=_=D;D~iWZB8QH#;*+2KehZ5N%9n^Trm*>+^$<=SW2Ejwd)h9}OnoZq@+M
zh(z=RF!IrOGMF3yj!(|mD=FfT`p8D)y8g%%Q1CrRo3JQrZCfn?j9kaD?>X>2M_UA$
z0)Ledo6r^zg|2iziG!aJ;Cl|D&_$M4Qu0N*+Dm}423X|XCnMy^b;KGA$nvUn+AS<9
za%K<c6|GVLa}tH_jzgZD%752>ZvhNhUbXGjjhufsO@mPz0_uVjrOTQCRkfQGps@gx
zD^?d;HBgjwd&TP7TNPmH)C9&gU>m{{V1K>MDw=OEYAvz{fScu$P=NFV7U^o|3YM)!
z_NuP2nt~(_+BVGc3P~I&3)iXu{sfA$?wt??X%|otiPqG&%ua^hU+Q!=Z~TiZ{%>|L
zzCJ%tygZWg0eJ%3%^LT2m(~Pa-=@Mna#*lEm{jj?!s+PON3(x?0|e0A(CR<*X$$}W
N002ovPDHLkV1hKG!$kl9

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/drama1.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/drama1.png
new file mode 100644
index 0000000000000000000000000000000000000000..af0d276d5c0d73da964edf56eb88e80b2428eedd
GIT binary patch
literal 627
zcmV-(0*w8MP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%ElET{R9J=WS3OSaKoI^wP*4PfkbnaqfoP$kvAj~Q-~+rW2cW>6yHId|R2;xp
zh_sO#s?Z{kH~=6;(R(RUyaI}3*0bYrY?B}g_?l$LyYqeXvtt?f=~&Z@M;CbiD#GVG
zpR*v~=mPJX`@q(2Zo5C7{hmE6M?M_`|KEHOo&X|0JZU+b-J1Xa%&6to^uG+WN1g?M
zm&b`GVqG5Qk#jP;Hz_#Qh&AEd&iw;Q2DXoZodf?67Xbjc90CA({RFAa5Saj-c9J`~
zIadXmQ44=xC;0c2XP{I7&j2SjahONh9pujAu&|Gxryv>$;8ANejZEM&klL*D4DSIc
zpwI(a+MLtNA<U?S$OIlKiHJ<#GN5Kq!A6w;PsDtk+6=ZkK&L%V{k#;sJUr?}x2946
zud}ofA&IcvfwRf}Xe>Yy_xg$JbVqW{ZVJNE{aS_yr9IH=C%N-D^qQ;=Qk!{%+#g42
z24;l%At&r=@kHdrWdT&)f=)YeDeUzVuQXJ5X(Q5Eqb3Xe*XjXEWok2Y+C?H-^L=!V
zM9__qPzTZd?XW;jps}ktBT+KlJeadT=glUe22Dg6xrCgAwFZ#{H7Jj)4!MR;WndXJ
zdKXZK(~Otv$OMJw{8v8LQ2jEBL+>i_HT401&dZ`bZ!ADUyM9uz+`kBo1!x(m+P{<l
z8S$#|?YE#X2c~0S=b*ZFpMi-(Ovk>h)`!WeQ2AlPMXa8F2Kj0Bix0MGb%MV|dtLwl
N002ovPDHLkV1m5b9z_5E

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/drama2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/drama2.png
new file mode 100644
index 0000000000000000000000000000000000000000..538374ce404d406c0a81951dc09b15d291f6daeb
GIT binary patch
literal 588
zcmV-S0<-;zP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%21!IgR9J=WS3OU|Fc5tp7&?@y3*`qO!46ZGs*$>N?p!hTCp4R-4&f(w;s<2x
z*hr4DFqO_Au~q_>3OaOP2t#nNFV1I+K!Ufl=d<tLJ)dm_`0Lm+4W70UepkZBTRmrj
zz-b%d;W1Ea?mqcu1-!rLBs2mt`N?^`P(X3L)@*B>zwYUNt&upO6S69&2~GYy618Te
zg2aC2>=MZV0O1_M@r#B8U{IhE!Z|Fv3)o!%fN=cCE`Y)cP-*$B4?gR|8rQ)+hJn>7
z!MFke08ypmI{2)Q$#4Nz1ONb61egpLl}MB$@CjE0ST3j9*m60I36()^515)tI6k<?
z;=QIeU6<7lsR{_k*Me}5X#pq0MI4ygbUuw$hyYDkR$f;Gsf1LdZb6jLya+(t1KeX6
z^%&rorIv})3dn83QIEy)$$eG>k9thAWk1OO(w~OR9*~P=Woi|!2;xNCV+o(SPA!5W
z@faPQ0e3g^c#O(AusRs^m{D$7J(XKcesOh)w}-FC$Vi~k%6?ExB+`;oygsir0+rqZ
z*`V~8R=J2ODX<Nw0-2{kULf+0r}n_=B>d_x^_!4;3@y8>9VOM4eW3c)Z87;v6QEGf
zIZY@D()n2^O~9l`-u$fy(294BA3p_&dtkEy8m;`js{+gJVzbi6e%FVIN@DlvBhXK?
ae|!LaZ!HcAeT=sN0000<MNUMnLSTYB3<g&K

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/drama3.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/drama3.png
new file mode 100644
index 0000000000000000000000000000000000000000..cba0ec5955a6d4ca24c3913e0a937ad2659182bb
GIT binary patch
literal 578
zcmV-I0=@l-P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px${7FPXR9J=WS3OI^P!zpN9UQc{Sf_$e(6Muu(m;2o{)OfTxD=Oc`3vb^$S7`s
z7qU1x)J?&ugIJeRD|E1+L%h%XzLJ+TqM&EV`#$HL`|gDR{B>;U23s9?|1QFZYmrkC
z(CWbZ&LP0=LG|RTIl$YqC_)f`<VUA_)w6%%>24{AsL2cH%_rk@x;<Q%Cd4xk$7iVv
z2t|O5_HYf8agB>$e$3~bQIEGx<9LQnjFkWi=Eqi~xQ-I)$TJ1d4W<ytH!Xug4j=|j
zm$yTfD18JKj_t)vJWI)f{S$zCL!SlImFaW}007NqQ`<MWwwNv9<vt?|WY9Q+pW1$T
z@yN;A!?n^E_CR*1j1I_$1d#`B-?NH4^JBhV79u;aZ8{`~JYge^tqnq!2x94Z6vhyw
zg!)YY=|gmHuK><(IDt+i5}PhybO7P@JsyrA`f7(Pfme44LF5VKXg{{)Fjxzqo6$<$
zEkc$k<JiZ2^b%GAvdSuT0aK3dlVfeFoQOho05Nd7N=6`g-eWCX2Xw#(N^fLCu0tsY
zHi2~=07z|Re#~pV+#fhyWuAWJc^z`o&>8iFRHA)+2Xvl>MK@nqfDHMi=hb~v`jr--
zb0ly5MgnxXT_t`z3zRyrngi4u`LQblXVin$TpasdKPFT}_4Fy^U$cLF0B@x-sd=Ud
Qi~s-t07*qoM6N<$f{wWXvH$=8

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/drones.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/drones.png
deleted file mode 100644
index 3d7e65f7a57fd46dadbdee861e15d71d43057f7f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 405
zcmV;G0c!q<P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800048Nkl<Zc%1E)
zv2KGf5QhI$eSuD188g`vTetcFDj|^i1YIk2XYd}WYn~tyh&OPyZcKQ}*p;d36Qo0B
zH-yI6hBk`Izrf++?mJ^224?+tEruLc>&<>lg6GEvYYyw+YQ5Rty*)vyHYho#1l#Dv
z3UNIYM5-2X-UI<i!LW$zK3Bd$YrzohL=ey<008j5dp$3}lp0(E$BOd?QZPWV-t#{J
z&`PtUW0!&jK{x}{;=AHBOUycuss*P6X_lZo@NtFlnt{WrZ<e=T&zAl1vZ$P6Is?Rc
zV=Cm7{OF?_md~f~ngJbH3T7SmQP4Kji8v)@HbQs7<@EtA(+?0{{V0I3iM;^o6N_#N
zIRS)L>H_Z72{|R5!->syh4$J7ru$`yNv7K{fSx@$Kv`7al%OmslT51C{1>$SYpoan
zJ^;k`=-eM)eKZKbDLL7CUEbXe_?-P%K5Nz|xTu5#!@|^000000NkvXXu0mjfUV61R

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/eng.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/eng.png
index 2d12b080fc7cb40ed8ad81b42f7159274b9008c8..5a70940bd90814ff369ed54aecc486c030d27145 100644
GIT binary patch
delta 393
zcmV;40e1ed1EK?vBYyw^b5ch_0Itp)=>Px$TuDShR9J=WmoZMmFcgM=5GSAmk{RFt
zc&P%MB~uQOwIgc|ktt^ZqAunDFkmS|xk4GLSGlfV<YyZRM1LuYl;`+;wtv4kz<<}-
zTyRxmTPo4h5YEK{tZHm;u7N9+pM0{w$7dKK2tdgn@A8wAo`2uM5a-+rB}N|89}6%i
z-HcGWJ$R;c3*C(3zQh2!8DaVgi)DTAe6g%y`brET0?^Hf&3c$^vsn)!2=NS9(`Chd
zT}T0xZedM#G*X%w-y1~%XpODu_Lnd6Laf9~FlRI}s6<KIFl4kCgBAnej3zZ;GC)b4
z0RAq3@A#A*kbec>J3eIx0FjkY>30A1a|;m_9WL&+;S@CkR9@ZA+(drdzh?sgi2B6-
z=z&C9<BI}N?dL{FaoP#gE@np9Q}M$+aC;ep7pM0x;N|uBRLt&z$?gDB*43BkD@-;V
n`<*`~E<}F%ow#4KlfD7i$DVDg%nAJf0000<MNUMnLIPldo{6zT

delta 407
zcmV;I0cifB1F!>-BYy#RNkl<Zc%1E4v2KGf5Phk-N141bW-=37wpy7ZMM3Hpbgk5#
z!F!~x`GQCwq|BA`1x#Ve$jZnUq(fuN&<bn=O{L~79LBnPcYeMDxZ}TL(zRi`+h6(w
zczbznjnVpXyW3x$idTrdbPCQW!O?qfCGpthMC2uc=;TB|aDN{YuYJ#hlji}^i$KPG
zOb^T7CE%SoGVZH)sgI2N@XmaE0!f^LQG$&7V3gGCBu=dfbc(QvAUZ)@1Ip~B?IKny
z0@K41A}_xMRD`b2YV~34)9MIJ`hjiFu&TgM83X-}z*>ZvcK%X?($;UsXaqLlT4gKp
zvSx3>wKW0jTYpf@BLq>T-WesR@O3<eb$AB?I)dngs*eNwfmvWw0T*!%O2Bm-n-DkF
zfONJA*J>U#Td}@oO4?Whj1m>RxjvgO006W30*n$<mv#h1ULuK8b=UQbWkp7vhO(pu
zp!z@sAXuSh>uZA$(0jfu7$rD%?78`G`5kwB0(uCjDG;W_MXmq<002ovPDHLkV1m+)
Bz`Xzf

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/engine.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/engine.png
index 2c4f14d70771827b0096a605673649f6b68153e1..629680bfea85b70e0e38e41d12c97aa1df7c3312 100644
GIT binary patch
delta 421
zcmV;W0b2go1HJ>0BYyw^b5ch_0Itp)=>Px$cu7P-R9J=WmpyKSKoEtWqnscVkw}po
zAlo4Fa}_EMLF+PY4nf5Ma*8C#MeqUa!blYM2_iWKnrIC>3$u$YOUY|2GYjvVVOR#>
zuWM!t&J*mXGI}Y@UM#>o!T$CJxDNfzn;KYe%n(KZGJm@FH-9I+FU=5_+zCUOhblu5
zC2YLP<KFewoBlc$U`Rof^h`)9Ek|GH!o@sP85>h+iS42|E&!K3nb+0p@c_8&UCf;T
zOxe4d10GGNn-ds46%rUH05Yxe_@Ejm>47Sbja`1S9sv4%;L`)%Pl1oQ6F?9p_<DPu
z#9RzO+0S<0lYf|t0qEXOWiAE)rYXBF(LTVv{d{DtfJ#fKwEVsIp~?>a(}qO96xWaI
z>%{;-n>B5*)C1fgLUFxPw)LX`r0@6cFfw%hs0!E`u4~xs6YmP>+AfM-M!F%zB_kO-
z6+b=zcUKZTyH-2k<5MsdH+2gj$%a#v$7pJE>^whAbRGzQ`&Qhi*}r}O$ZykGbfFR7
P00000NkvXXu0mjfXso;=

delta 446
zcmV;v0YU!01J?tPBYy#&Nkl<Zc%1E)v2KGf5QhI$-6JMeMkbip*orz=iV~?$(6v%`
z2Jex&<_RK!kn#Y|#+C_B9<wr`K0!L5vjUBPa}#xF{sn{0-FJ8P$-rIzU9+(T>&^D`
z8wVe6uY*1YC)b<p>FM|mscI|dN#J7deGWoAjv0}vMwC`o0Dn@1n0do%9;_^1kf#Oa
zyJz-)RselRo)*Zn!m3m(08a}5ZCPkM-#sJG3IMPw6$>EG3KM;!OB_T9pxtZ)Ltr-n
zh|&sD)kp#tjvpflTu4=$vE#=k8&?N7h|omm_%Rw?!trA)R|~Ty&k96o#md5DfFy8{
zX9bq4g^9A!Wq;=hboazn0i>$2TrJS(vJ*9Bg66q>V=_RLR-MSG_5gllgrm_;*oTlJ
z1XR&+d=AAuiY$PG2+eLMQ3)t|DMA(m3jk=NqzoAK-x*?;;M$r5KppQEngn1Q`4n*W
z9w4LCkoqn7rl$bF#h!l-a%9?L-v^|sjY9zDNYZz%*f$xV6n_DTUVtNjC{5XpCj%sb
o+jc(-C4r0m$eKUDmfv;PH&+e1E0c-@S^xk507*qoM6N<$g7$&LfdBvi

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/eva.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/eva.png
index 2db7d42645646bfbda6aa0634d6129076b12aa60..3e5d2db3c327eb11dd23129738481b66359c3f89 100644
GIT binary patch
delta 492
zcmV<I0Tcd%1BC>TBYyw^b5ch_0Itp)=>Px$zez+vR9J=WS21eCFcf_)T?>Wcc67FY
zM`Hq6O17N9U9;x~Ie~BBy=#4fZl+5i1dWDl@tB%Gp$Bl6epj|6>nk>NXdi?a$<}-N
z`g+m_{yHxDI_Jw(Jr>d1%afMts*l{C&TxA_8BBgU9sr=$iGR=vAo9s{Hkcd$u5a$>
zQ4wK`K;O*6z(c(7mG&$zA&Sa4Ub){Y?M4A6B<lzOut|5?zIfql`%JiWCC~EGNU%wF
z$nvrg$pI?@a>zwdAq+g@yP~KNFZ@QVX-S*}P*{_7)R3EUfcokEQ3U7&5#dlc<$#Pa
z$k_tq#1ci-OMgxwryLkXfGDa~=9|`4Zr`Lk>-w_=06#O5Bhmfo-m`&~gvmN;ML=gp
z)J9uR6qWMbSpvF)(BNU<wPvZ?^RyNFM6ivB$h$&p-`HRkkmaRfIvirIS6BteA*Vrg
zF4zUfhFJo-LdJ%Z6H?+)@^$~IpS%8m<5^%k>*Yg>8)Yr$v%qFBE_Z>m1lWwl<u>Fj
zfGk#aLXO+@L3>x9FIRQ=@F?GA2jlbO9pd#_sSk`vcsd?h0$kS?XfMZiZJ@wd8I4_-
il>4o=I{Nj}>>poLtOnrvSizD20000<MNUMnLSTYphVGRB

delta 361
zcmV-v0ha!S1cL*RBYy!(Nkl<Zc%1E)J!->15QSetiWIqlRVf5g?85300;^FML`qeu
zjn83JyK-rQIyWwI2n(dzm2(GoPPNO%KPzS?IED49LA%WR7|mz|47zpQ^<9|Fmj{W#
z^y59~5j>pDmxr&%Z!~SkGB;Ww-H(D04}D3Rw!`P!gauI46@Su~QSi<^E3;=%)RiO!
zAE2l!lv$24%S8|@0N-%4+nzk5sJ90$85^yzSg%~%w4FPr^b85WngKu(#qOCOQzwQD
zU=5Ne78$buY-x+S!e+O1rnV}aaV1y4mo=71^c`s0j$L{&z@;X<8i1Yu<M?U-e(5Ez
zfz^cE<-`V%E@B)pfMgy23Bb9eMk^#yjKzB8c0rlt7(YFe@{ya+XoWJ%PnytQP86|r
zfp6$nf+I4(uYPz<T{vd;NiTrWiaiBJD_|eK^Y6dqg9iNoKkj{CSydfW00000NkvXX
Hu0mjfRvx3+

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png
index afe1ce59865281e95613934a513e6d5b8fa0195d..05f0b7c0f5e68f3c96995fcf09d4838113eb6874 100644
GIT binary patch
delta 465
zcmV;?0WSXT1L^~iBYyw^b5ch_0Itp)=>Px$q)9|UR9J=Wm$7ZbFc3w5f=pn`g@F`q
zk}C{k0j<E&1E}x@nnN3;&;TyEf)@zjf=QDifQu+x!71dEXo{3*OLiP2zmdozc~5ub
z5d!|YZrY49vD^*i=v_WLeR%<9V!4Z^_ZW>vy`5{VQEWe)5Pwbpc0Q+v-p*MY_2z`Q
z^-UP!%R|=l0$fUWr%YOi7yz)6>xL~)2~tH~dvAb+h#{!hx8jBqc3zHY+HIXB1vOx|
zj*0+(y&YmRC1syKMJEH8p?9S~Pys;%0FbI~OBJ<(1gAhyfh1E^JIPc9vXW~gnL4nW
z^V)RO9^g>h?|*&NnSwm!uto>@=l49V$GRd=j&Jq{1JsKu2qGirwBK~iIV-uY_QQ`H
zL!hn)T{;^;$PoluZo|j<6Q+~#U_jf?FT8GE!f(S%>G}Z{B1WE4bsX&{+qo`qKg(_(
z4Zs!9b;eD*S@CShUI6w&Nv4pebO2;KDhm_^9mOC3+e#Tjxa>fA1iLOFR%azN%dIaB
zF8!K1;EjOR8q>)*Xd`tg$rQBKPTO_<n3xc~z3=7wHT%~$Bs1C+QBfv%00000NkvXX
Hu0mjfSr^ZD

delta 469
zcmV;`0V@9L1MUNmBYy$4Nkl<Zc%1E5y=uZx6#iPe3PRD2aT6Rv5L`+&pCGR8uATA(
zPF=HiHBaCcx)e&tD0DNU6`{}vu+zCcxt_$M36|1+Am--e-t(Q`<N$viS7n0Hc)D*&
z$;<MoRL@PBa;HDU?Om_7^4(?)0Q)i$2LwoYuRpA<8~|GFE`ME$B(9}RO<1lyPb6?j
zoJ_zSbl?s;qHI3%D&-QyB&<>%_>Ng;t8GCZCpiF^XKcBI#zVjfYM}N2Sx;7yb>!}B
zwJlhzv0hDpyIu-G;5+7ioaAO5C;3q#st^RegD^_XI*ignoWm$B$oalwQ0D;8>{GJ*
z7%D^XFzEsKc7H3+@;J$j8~`2{>x2FD{MiKfp@HudVs0lLAzN*mFGF%UZ!&fm_?j%&
zgi2KfWJy(-NwP*8k*3Da=>xy-Wpr@@^O<LUwC4Zrpkv;Gbf4~Nph`l!%kjghOU`Fr
zp-i<<g@Aj2$Z%4&wVDQW5&_=p?GV^x0DT3h32+Zc3Qp_b;45`Bp6=cI3ICd{jn9vF
zWX}t6J`j^|w^^gr?y57n3SpGeY#>4$7MdPR^0(L0>FCEtvwwU6Dge~+dLP$R00000
LNkvXXu0mjfuWjKb

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/gravi.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/gravi.png
index 21eb2e861365f25fd830d1a6ed79432e56bb494f..811d40aa898442b5812200188dfc94181c9d14d3 100644
GIT binary patch
delta 398
zcmV;90dfAy1E&L!BYyw^b5ch_0Itp)=>Px$VM#<mR9J=WmoZMmFcgM=5GSAmQW)R>
zc&P$COQs$oYe!ZNktt^ZsxIjPU}&Ta<qBnp9(r+~6F=LLkl<gO7bp3@7r)pJ@Yi)Q
z*10KgN@et1%U(`^O@Y(hEpU^?n|Cend5|GQ05V@a#G8{|_kS|PrRxSM^URd0cItVf
z06tnQi$NQrAOM$P2#5;6HfXAR(1w6S4FLd{^)~AMAOJh#sq<sH3Nf~`=5bTyDi9R_
znQ;RiXQn*spOR__=;3C){mGh}wap8TyINHj!9^G{-pK$`nFj-;lnQ{x-=)lySS*YA
zick^(NehsV)PJ9${T8HnRshK)rYOCJfF>Bql#coO&traF5&$YJo@rC%gZ%)HHB!%n
z{P?)5#lG19xa^EW>%a?u=69a)6rAs(<lGfMJp%XFUVdKs_yXSE&v(Vn&#-HIfY==m
s(7%zcmHU3@j|qo}x9{cpHT%~$BmbEXJq}v200000Ne4wvM6N<$f>^q^%>V!Z

delta 433
zcmV;i0Z#s>1Ih!CBYy#rNkl<Zc%1E)zixvt5XQe$eE}v`Mo%!YWh)O*34zon=vt{e
zgZD^X^8}HC@&?Y9jVYcOvofJPK{^D3-A2ZLB6Vm!32_+5_w#Xg4)D-_*J5tMYQ4Gm
zIQV>j)B4c9T&*{km(vFr@0^@xafp5NrG<E&TZHirX?1i0V1G2hBGS)!a$0#%LlZPK
z@mazhprHwhGDlJ7UJ$dNK&QSv`25@+K;CIl=BT&3$sXR>=8G{vLlb0ih=42sTz8+v
zp<)MQiJB%>5XL!>R!1=2q2BJsoeLNM&ZTM$5VaI(b^NtE8Nwwetg0Ytsq);n2gRvN
z&oIt`(Gi)(M1R;tF1R!-;|MU`Dc@NRy=>dcI08R+Cx_mr9~c8fEk)lR#wf_q5Vl;Z
zCsN%P;6y5b0O_lK-g&r8Wdz`R;CKVL9>*r&R;?JgmK@`qau3K7^>#Oo*+5%0qN2>f
zc&FR}D9(#AAN#`H0fZxQ7RXg0bZbl}>ppPCR0+3ic`EEK09hP@IaWayhuF`|`SZW!
b4?Xk^O1HJogTRu!00000NkvXXu0mjfxwOf~

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro.png
new file mode 100644
index 0000000000000000000000000000000000000000..f23fa7960de10d47971976cec74d3a8d0b36374b
GIT binary patch
literal 479
zcmV<50U-W~P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$nMp)JR9J=WS36F`FccgR6cn(cVL8A`aE5K7SjrW0245kayIdh>$Q2?vO2ZjI
z;s8Js!4@efmSW}Lc>T|=K!Rx!|MKQNd&Uaz*KuMST&=M^RG{YveJmq^)f(IL8{p!4
ze(<3OKHu~tv;;)(+xtuB$8(aP=ACoi%i~5%;?%UjC-a;npcz9>66ajg_lyL5Kr=RZ
z#vq!2nzc_AbT|uLz{?f@K#CLq1I-w!hN0%2GUkV%3h=T;)v)os=G|WKs$t{%!3i7#
z!30Fff$!~*vkyIxK?KC!$|MBj;2~$gXhc_cz+$O4A~|CLSMc}O4L+U%jK~JL5<bCg
z2$rErA}2{y;2;9Ra!sI_zF$amHUXNks4RD0VPEHc24t({WxHoKYM-w)d!GTCv9Z*u
z519IV5GBJHM9ENfI^C0(?O1NLos(qJ)?xNtK#Fvt5V<W5uT4Qt0_r}?H==32Z9JHO
zEI*-Xo3>pU2NQ6?ma$L8eq04c9~gRIu?*L>4x~si^!l;i`C}rJm>+%z)34b-z5xFW
V+gU*~Gv5FJ002ovPDHLkV1l>A(Sra0

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro1.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro1.png
deleted file mode 100644
index b20654fcd64d131182ac3e9f7bc4a124e5e44d85..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 428
zcmV;d0aN~oP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004VNkl<Zc%1E*
zJ!->15QSetT7x0TDdo<fQV4^a;Lay-TKBqvPM{m8PaB^gok?RbLZu*`RXV~D$N`jU
z#3JvmR<lAXlGjLse%`0q)$R=N*LA15u-fdZzD$nquS%Z>mASiE;_+#2ZGOF+0iaSr
z+yIdIe6h4P2Y|_RMyFDUd)Y%KU+#Mj;xK^kIj#5V-X{exG2gCTL`jP6+BJgc6@bir
z&#55>1=t@7#9@FeFA;|U_J@KEApHy4l;tG=)aDcq1`vnA4GdSTA&8O`QIgg$B2ZVc
zGSGyv5i0|Is&fXK=@w&7Hacg3OlTg6F-M~h!RP?2zkpUkF&-2k%S-D8h&1{TC;=$N
zx}#VRG-K0x!72mItyql3dVvkloM>%ZFK27k0*H$XO*-A=;}j=WL!kR&lZ*k9zF@W4
zRsQpfSj}4N=lcuU$D6c2kgfyQ%NdjD%xa$}MM+A%fmG6Fq3_0|_&h1QqtRQlfBgal
Wgr_VU2}0li0000<MNUMnLSTY#!Mu$C

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro2.png
deleted file mode 100644
index 40d3e546ec4d2ecaa6d50620dbe57e8573681929..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 421
zcmV;W0b2fvP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004ONkl<Zc%1E*
zv5LY#5QhIdt`&qsEn_EGh9KC8oll^xecm8XkT*zw?fC?Da?OE+l!5C^sX-9#0dmzG
zd)e8|?q#_Y=iiuR&CWNI*%=1-?|M*e%vamWm67-Ti_*@M%D6X~;dwM}ZTxyZ0YIgK
zkO0W|crt5k8~}R#Aw9AXkK9WxJU2a$1^7$d0oYqW@}~o=mmUCMcPNnMB>*4}gCFZQ
z(nest^bjQ}q9pwW0U)hK;5ZE20qhQi_Q3ic0XqZ8@=`ibG#VwT<h9cXn5gcxZ3Lvs
zG+%8if3XoOn6+1Rkk8u%+1o4I6STKLbzqZhfIF`PodXzsf~M=p{og4-mX}Vd9;ePf
zff9g1uKSI{0RD8quBkxL+8V$_x*kCVit8E10Ak`%BI**XY2O+^EIyQkx@0u**b1OY
zI*&~v1{n5&wzBR8*YgRz{_s~#sIDkUX*OWR4hyaalj7s3oQ^sl&F=aF(`Bn@Pz!Gd
P00000NkvXXu0mjf7zDdn

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro3.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro3.png
deleted file mode 100644
index ccb0e83784e79aa8d11eb8da68246d62ff2bc5d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 448
zcmV;x0YCnUP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004pNkl<Zc%1E*
zJ!->15QSetT7x0TDecanQV4^akj^JaTKBqvPM{m8PaB=Uok$Z1LZu;{RXWBH$N`jU
zV6&Rt9a(D<NM2*hYwdjVqgf5`*L7i9SgzKsFC#CTN28r9lkw?%f$N*uVB^RA4ggvc
zL<fM3&*qE4#sOe7p3qko;*z_`hv(A$*c9|p6b87zn|6LL$_DlJ;Jkkj02xp7s<W0Q
zF#tFr*c9j+MPb0MnT!KKnpbRObcrHB8>!w96nUyj8h#N#npfZQOdH$0&yv_5fNs>c
zoHd|A6lEiZ$dVXE**O2#>nZ3H2~&D>i6fvx_)>2G0HV;I6~Jc{PVR(7*|0r;*3J%4
zZx3D~aZ(C=>h}Urer=!XL8V_uVPHMToB$H(C!TsuXN9Y2Spn24r>eJAxU~I>0n~O%
z6>qD2={tZJz$Kf<l86D!T(DfN+vxT|eVZMu&yRQ1&rj@pz&4`eeuvR`V(fH%l;#!9
q2CUd&!S`U&yuBKyqaPp5{`Cc%bh0z_^-c@`0000<MNUMnLSTX<HOqYf

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/interrogation.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/interrogation.png
index 653caf39075a6ca7c8b4b97ae0da5637f04ef3f5..e5c0b186b4ca61a9c6d392e6ffe509c55fb3c831 100644
GIT binary patch
delta 416
zcmV;R0bl-$1Gxi`BYyw^b5ch_0Itp)=>Px$b4f%&R9J=Wmpx9zFc5{G5eJ~4N=>zO
zE|7D$jUwkZ+a*FN*XP&^xTd1rR1~?v(BQ>uJc;cXgal98!to^Uo6-1Zfxj-XHrWAG
z%IKN#VgWjUDgX}!%ohMN0}%wU=1&F8tzH?3JMM+p%q1B}GJl(K-1k_3RAWg7jZ(?q
z$pTo*IJP2IY!4g&JSLiJQ3vC+sPP8i1qnUCY3?V?{j_Qx8gt6-0S?5E*#fywF?E~l
zJdS9TVj(1%s48Stz?z@OG3WI>05|*4a&w=>W}gJ$%T{5pq5xuz8l{r5j|SKSwHtsl
z@*A)kT2w;|;D2*BjDajt0c-558rn^W<gGYY#kS%fQ3ucwAR=@9ot*IrxEb4L7o~#n
z7p3S3Q0R)cS^>M9+-0RjeLd;?`D$pPMg1k7>yb@>9Qnt!B(r*G6$c0%%h?sM*~H#(
z=6?GA8&R&fWyszKmJfiGY&dCAV`1ig=N}UnqJTfZm>K^I0Nw$)rqN&S8O%Wd0000<
KMNUMnLSTY$BEIGT

delta 369
zcmV-%0gnE;1B(NYBYy!>Nkl<Zc%1E)J!-=+6vzK9J%->NL^(hY5DJAXf<Vz$(WPU?
zEWz1KCXa!hpa-Z9@<8`UhhQTo!IqvJI@JHkSRe1F_n{|X)_>Q-*o58Tcq%dQ@%B1s
zV{mYHIG%pKzrf5Q<3xnT^UEN_)7U1=jH+%#0L~gLM&^tHw13)fH#a>&M0o$)WTFWG
zm>EO_rBwGXgwR3lw`Yi4m}G#eZs4rB@<JOPX`Unl#Ktb=tbx|L_q|-Lrw15P9F814
zmKt`}fQZEFi#^b~9srb5@ZM*wFY<u11|fvbXb2&Dk0K8cQ5W~zlea3)0pJ{ls&0DW
zxI2KeM!Iww0BS&f`NR_Ez^zMZxmqV*Kv@7&xmyfS(vBwqh&O9XFD^l?HN5w|f2q(}
zIS{wwOXC2p#!{431<c%QIz-f+9FR4ntoOh@GzvgO;wnh#l7IdzpEc_jGK!9JIXINe
P00000NkvXXu0mjfCQz)b

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png
index 789a53802c716b7cdf6c4b6f39d0c1764943123d..350f40dabd4c23555360004baf6de53c52aa68b8 100644
GIT binary patch
delta 408
zcmV;J0cZZG1hNB=B!2;OQb$4nuFf3k0004ONkl<ZScUCZJx;?g7=0iZIzZKha)3&3
zhAvSo<qA1Nu8_@Ju8=eI3XvSKa0ZY#0I)>RAp=7hg2UIy4*ndYg5WKV?Zof-`||t)
z{B<0Sb*|Rfg(7;mHFH@7tk&3_UI4Sjbn><V-k!}Oi~=<I<$v|rboLKC-ffK{PHZ2z
z%v=?9|19!&^xfH_i^33A0WRc}bXa$VH3jEaz<jx%f>cDv68YtzWhJpuH+yX_Pg}g+
zGg4qemPn^rs-nh5xkZDW0-E;_IOe>pXYX1D7w{c8xB!+5fbJhCD`_3j_M_Tdz>Yv!
zNo2{V&1jh=a(`5u32Xt>-+E1;Ys1k0!3BiI?-Wp0vR{yB$<06D;R0U-b3tgZ1n6+5
zB7!Pvq$29u=^ml$F8hX81oUD<?I-fMC*<r2-YE#RD>?}<k@=i{yaj06x!P=K(J>s{
zhSn2N+W_-rm|TlIM%$SCe&)r5ikME{!FDzK$2$zQs}Zi$#nrt40000<MNUMnLSTZ)
CS;SQU

delta 527
zcmV+q0`UE^1E>U$B!32COGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA
z00(qQO+^Ri3I-Ae0uQ)%Qvd(}9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*P
zO;BVmWd{HN0gOpRK~z}7V_+ERfDxC3rF;B;YFTo8=R%zJuz%pPTwdLbL0DXYV$0vY
ze89lK!0;cJBUo@*uApv472op;h{2dx9l?Z6lZb>8RpS|-c~~95%*sYp2jDZ0g<M11
zvrORZ%4uiFb{q@2mLpq=&Zmh3jI=}<LLKC>h5#~u^?`>B=dQh`z5_xX<cacSdzJ}p
z9DvQ&)BsGxDu0Ceo>-dd4xkkv*#Smcq717KJj6;<%>jRZ|H7(x^?`>Bp$_u!M21X<
zI><AuKJbu%6!UO8;Q#-BSQR6uZdjH?&YHMVKQ8lzW*S(1;2}IaBGb5npXx>NxofXU
zDrl${0*nI@1<01RL4(^!OO&BK%LJb7kV{AOsG&*-Fn=>KVXYI8Q$M+70KqiypMima
zjg^t%$4~rq0<vSMo(AfY4H^F9s29)+D4I9`mhJFmvvb#8lbsD2v9*eg?81;+vlN5R
zA6_w>JG2UG|9}NoTb@@yj4Jhi<+L-fz5(&so7x?dhc{2*>>Ukw*K8C30M*H^rW{-2
Ry#N3J00>D%PDHLkV1hwp<^KQx

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/kitchen.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/kitchen.png
new file mode 100644
index 0000000000000000000000000000000000000000..322d62d8d2e6d584d30d7ae572accb2eb7545983
GIT binary patch
literal 486
zcmV<C0U7>@P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$ph-kQR9J=WS20e*Fcf_t7#KpuLODPsm^*f<Y{^^aN{k(le1vB6mLoK0=n;tI
zs0$MZ0Eq)oma25<z+i^TqA7Obk24^_lcFT{kKfD7_qPN5bsW`o_69I*5xqRPxx4~;
z1DMlG;Oruve7gcZ-rORb0xbE}P0~2{m=7`6i^jOur;Ss@vG0L4-aKSHuYeHfti)U|
zptJJFV?+tCB4Th7^Ds|Ya1Qto?LaKZ4vhH_Qm9Is6hK}mNTHAyisT5%0iBf<^1S%E
zw(U|VjQOyA0Xi!yg!`nf_D~Td2kHp-+YkHe;H`w`*FdLRt%MY75A$HX+~EEBdnF_#
z;bHRmKyiR1fHH9F0&KxqFE>H)cekUU=@=|P3I!>`Vku4q&jOw@5_xDbBIQ7+h-mZ%
zF#QRPF^`5#lgim1Y?_$a{it&9i)Yis^d~T`Egq>5SqJP{3I(3BT4#95YM1Or0Xi#5
z)>HQfjRKn9z!l%BfI8%bg3ijQT@h(5hyi&m*sg$1H-66t>^{qO<?j2PKPLMk;^}wr
c{hIyb6Jt!(6A~sSk^lez07*qoM6N<$f+bPe=Kufz

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/laundromat.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/laundromat.png
index 251e0ebd7b7725425f82354465b0ebb3693f30cd..400e73df422d8bd18dd8b0ac95170446664bc0c4 100644
GIT binary patch
delta 441
zcmV;q0Y?6f1JeVLB!2;OQb$4nuFf3k0004vNkl<ZScUCZyK2KQ6g@3j1A&rsbhbc7
zV**)1wtPXlX7?ZD3;YM!yVhTj&2%Y*;4zRb9@7vg^aI@K8lhKwEvp&Yvq+X?pCjF)
zi!bok@nD;rE>>k*L?7E%Emy}z9*ib<dLBBHU(Y81D0L#V0)L2nIGQ+<13<Sopspgq
zcmleehvPn$^WY|7nia?o7v+1!ai^>`3eaIW53t_sD={>dW<}M~m@L4AM~(m;MDjYP
zBZGAUBE%h1pIVNP#sXwN=;H280Fjd)03eAY0APz~B!I|?6hQUN72s?_SKM7dqY$K7
zfh3L;4^STPE`NaHEPCMAZUJRLA~nr<6HsTD-VzbTzRo%?0`kM9+MOJ8F*9<!zz%`v
zd|6x*6I%0teB9x<k0g#Nv(dcRito^~&77=6L@C&2GF^(ct!HP#Iws_REx_afZvy1F
zilA$0yLPwcwg2kV#i|TvFXG><Grqq*k-xtw^?~skUNX-obbEtVV!qz&sWwnxtc=<&
jOp4=9TOHlKH2cR7{yM)`-^jP$00000NkvXXu0mjf*qqCY

delta 370
zcmV-&0ge9C1C0ZaB!3BTNLh0L01FZT01FZU(%pXi0000RbVXQnQ*UN;cVTj607GSL
zb9r+hQ*?D?X>TA@Z*OeDr{R16009_DL_t(og=75x|3AY(0>)7X40;Fj&00Z`3yabs
z7|C`(->en?cXK>txN!LjS(Y2<>M*$ekjCo>f)41uy^~>OXn!GD4hUb}&rquBPCW;-
z-`LGyD5J!1{>eQ!jSW<4xYEu6!~mK(V8@rcL^;5NN0~Mb81N84cL2;HT;eo!fT4^M
z!~E@=7#J8B7*>WBqR7$Q0mzoa0J0;7zXQ-6LH8&?b_4?h14e-~d<!C&p$rTR81(}-
zahf=Q6hJixP-_B)M+m?i5Wc#f!9Z6BCG}spe1##=(+|!z(AA-BZ8(4XCWb^$KRAu<
z2tyeq+SP`z5P<m<780-m2_}cEe(0xx0d17R96^@tP(V?$oE~7*0R!#;07N3V(BQAU
QasU7T07*qoM6N<$f?hkAF#rGn

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/law.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/law.png
index de6e16d4a60ca0273338b450e8e3a9f7242d67aa..0a239af288a5cf4f8d751869959f18fa0c4596bd 100644
GIT binary patch
delta 369
zcmV-%0gnFf0*nKYB!2;OQb$4nuFf3k0003-Nkl<ZScUDEJ#K?Q5Jn$S4v-=hbt>0f
zfOF7V*7`(VS!p>37obj++Eof}uqmRk*49om%dVYB$=3ja<$LqPtbo6+=DV9a2(^rk
zikAwogU|v`70eglq(CGA#Qdd#x#(Sic+eKqh}`l%6~L<AxqqVd#Q^PLdp;k+%n)XJ
z=NQ6lTK`xIAjSY=)19y7{AK`ggjTbZ%q56ZD-ouQd*>LN&fFVjfU)Ul4_nn(%qQ;w
zn7lVZROtcH<b8H&%m8s}CCZd?`@vL#HL11Alz}y=tqM@vG}h`#7*9L-MDGUBJ9jaH
z;cFzXfl#;O4QlYbhECB3@J7aVd@p5<;#krHlJ>YCQqLCyTua9CbuZ+qs07w1Zw63f
zHe><FR-Dpl|H=^Ni=#z9{u!#Hc!>Z?YAt12l>5K)$0UZR;17!VzW_b~E8>Vp*tMzJ
P00000NkvXXu0mjf!-lYR

delta 340
zcmV-a0jvIu1MdQmB!3BTNLh0L01m_e01m_fl`9S#0003YNkl<Zc${Nl7+^4X9boAm
z|DRfx9N)Q+kt7FzESFa|V-OZspxE-aFCT!Y|F|51;Q*NB3P4N^z$+jIV`6m#))1hE
z&(Y0$c=Hrixxt$V@qzX%6AZD+X=mu?01#Mx;31qH>L5?9F@MB4z(`9J!xD5pa;ShD
zckbG2>Nx;p8M2RwQBPF|&=QO~VAKIbIRKOcNXhG@<QSqH0LoItW-C&`(1?Oj2Y||X
z<k}8aH^9n#m^?a7H3y&rkmWFoC{3JXM*+4r0bLyc3jw-00A?AsxCNyJkUTO?RR^G3
z3gg3Q<bsOSG);lk0id=#s5woIAO<-S+BYE10noNPxL1_Z_KIQ$fGh_!$%*cmAUgtA
mTb@)va@UNICTfBKFNy)nBZ+zja@l480000<MNUMnLSTX|+=vhW

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/mail.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/mail.png
index f397ffe996eb88634a8aba684fd53c828b7f4e47..ffb43a9ae5febdb13a70c648fb0d98f7e6b9e785 100644
GIT binary patch
delta 393
zcmV;40e1e{0-^(uBYyw^b5ch_0Itp)=>Px$TuDShR9J=Wm$7cbFc5}+s?JnV6)_@Z
zVCce<XMlk{L*~2%8Od8PGi2`o&yb}{2Zl(D2t`)=0(8Nto7m*yvr47%OBoW|_kXc3
z7aRER8eD5!OmTK)^!ldvG6F27I6n=6XU}7sS3=<9QxBm9kbmYclL^~g>V3c0LOhrT
zxOj6)JR`tw>E-~Blupa_#@ZlDVm<&RkWLhE@)Go&1!{lt3>0}<2fa2MvQLqx2&0ud
zfbFgXkp3`HK~!VeKa9HLk^#OU&;n^1_fanZ6Nrs53xI2C1;D8VYyg`YK-JAl@g1NO
zpqYH~em)DZTz_vcp9S@EdFjSk1E|5&pkcH^mc(_rm5JInVMze;KOn1J6O1Dgz;;)n
z$kSHgaq)SQld!Am>6S^&36qSw;$ZAy<oi^<P90Atln2q;6&ovIB?Lyk?_`~`Bt|8K
nw(V~oOjHQA`$eXs*<D|*XOgCGvas_20000<MNUMnLIPldEe*20

delta 320
zcmV-G0l)sD1KI+RBYy!QNkl<Zc${Nk7zHC8FcMPGJ9GJeN-QW&kHl*SUdi5>%m0hK
zU&wIz@&&Ri*VQ#(cq15(*AXm)47q&y0)ubfPO==Zd6GMWq+L8-HB4lgOhqu@4j>o>
z$YAp%ccRph5@jSg00uk*60wSJ-!PwKvq+8tU0nmL7H!`!pMODD*MRm8kWn_oa0JY9
z8D&F~9Y9tTz$}6}f?UhVb^y!~<XTFR1IS5eRC55iB_cjB;04jB1Bglk#1_Fca{wjP
zF;yIZZm6!V0lbmo8IZ{E<nDQf%a<=Ocm^agu*gM_WFA>*;PT}Q@Nyq!Ik|u=2Y3b~
z!X1I^7;*|Jk~yOQmL7cbAVIC*$bdpq-2u9~24v>~U0nl)Hw4rSc(Z&Ii~<0xBw52O
SxfuBX0000<MNUMnLSTX~yn|N&

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/mats.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/mats.png
new file mode 100644
index 0000000000000000000000000000000000000000..af933d5b9e3cce8feb9399a394647fb5a23e693e
GIT binary patch
literal 391
zcmV;20eJq2P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$K}keGR9J=Wmpg8QKoExiL_R@WM8bu0fNW!7`z%x(g4ShP4nf6P>>!%;0qnvn
zQQ#}sg*6s2JNp0<Sqi^|5R7)_o7p$;-}PcLZX#TU3iOrhW3d362$%T`cn|squM}`R
z=^?ZL6ny>JKR9W-*F(H=4Ti|v#owf>LlGB7yUao-Kb-&qk)SSf);?WC&c3_>Y?+(D
z1_1#0^4j2ZVh7=0X#^MnMu1-da9xIhjth}#!BH~x^5qTSlbws6e+)d9o4x~)K*R+C
zk=*~&)3n?62d4^<lcuxjB7)4q`_@ZcLvOO%y37fnE^~;uXl=Eo?5GV@s26~eDe5wB
zjc`+TN~S+5#L0OU_)agXj_rWLo{CpX;N#6JrcsA8u={SGirETO>ITr|l=CQ=g{YL?
l_M8`!CPe@6H*r_9QCGiqcA-lz9ku`f002ovPDHLkV1hR8tX%*A

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/medbay.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/medbay.png
index c9c6e1362a7f973039ffd199b7a7c4827b7dc6ab..e57571f6821a78822ed0771ed2c4c228a22933ec 100644
GIT binary patch
delta 508
zcmV<Y0R#TI0+j@iBYyw^b5ch_0Itp)=>Px$&q+i<R9J=WmoaXGFcgOWRy{!=L!=H_
zS`U%BMk?(M7&!n^as$r64T{787=43;NUW7IxLrC_%Fy5|q(l0sgKPpON-MSh0tAKs
z<GtT{2Kei`Xu3J}=etuGz40flml0s>&v)+V8iT>0x4D!O+kefw7D5X^<`Z_KePG~w
z$as#x_u#WFxNxiMjOW__ti`Jq;?hKIdUG-bpgjh@*XemifF^S;TmaA>n;?1tsOCP~
zB8^y8?u_S1BX)4VEkrATx_KB2aN#127yuxR7`Si|#-cOCRTuM&=g9c}cREiahA<WY
z1OO=KlofL@fq#Zoa67rfXy`P;&88(DAMO=nvo;?kUe?d;SHUsOrX`ZXsm!SzU1bH3
zMyxU?*+Lx6fKFt#Sgrtkx8hhEbh2(i7>la^N#R(T_W}S=Rlv6Yy#Ul4ES9VDh7dRm
zT|JOz0U!uqAHpBWz-(Fq=vM)&Wk^a22T5V~=A_mYsC9>ot^?mg8nJ`Hlt%2d)39!;
z!q9Y7GeA@E<N!2+X#-LRvr#92jOW!@R%N>aIs*`dDyoWF1znX)>a`!}BGZ1rxD2I~
y7!93X{UwF5fRs{u?{|Kfs1Uu~zhwF}``0H01pc!c)+ho10000<MNUMnLSTY>!{?0v

delta 287
zcmV+)0pR|X1i1o`BYyz^Nkl<Zc${Nk7zHC8FcMPGJ9GJeN-QW&kHl*SUdi5>%l|Kt
z-@$PH%0;p)H`LK*h<WIN*AXm)3^{-0BEv!3g=9Iv{%|})46g@XH3S`i&v0Zwt|OVq
zbpW-%r~`;j1L$#1NS@d<G2kIE>HwnC0D7E`mIK4a0c6(&<bTFFSq>mn2+`aDlvKx5
zaRAJ)4CiQu8GDy980zT58!0e0x*Sc4;*&40FfcGMFqn($FfcGcLgxIHiwuT3`V2Gn
zE@jAYj)wDz1td9Of?yGfL+lU7!+mV1qYoD+1&~}4!h_ZpNfH;E8V)ej(I-0>80zRV
lFg(PsX26@}qZnWm004RpTw$E^!8-r|002ovPDHLkV1hb+c!mG~

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
index 97be2aaa0d0..a13df6f7d66 100644
--- a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
@@ -5,1490 +5,490 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, except numerical signs which were created by discord: brainfood#7460, states: 'survival' and 'ntmining' from https://github.com/tgstation/tgstation/commit/f743754ec3ef446c8172388431effa73aeddb7ff#diff-b429dd7fccbca60d740d4887c1077a178abf1efffe57e7ae2a0b607c8a9e2202, 'janitor' edited by forgotmyotheraccount on github, 'arcade', 'barbershop', 'direction_exam', 'direction_icu', 'laundromat', 'news', 'reception', and 'salvage' made by rosieposieeee (github)",
+  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, Job signs by EmoGarbage404 (github) with inspiration from yogstation and tgstation, 'direction_exam' and 'direction_icu' made by rosieposieeee (github)",
     "states": [
         {
-            "name": "ai",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "ai"
         },
         {
-            "name": "anomaly",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "ai_upload"
         },
         {
-            "name": "anomaly2"
+            "name": "vault"
         },
         {
-            "name": "arcade",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "xenoarch"
         },
         {
-            "name": "armory",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "anomaly"
         },
         {
-            "name": "barbershop",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "arcade"
         },
         {
-            "name": "ass",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "armory"
         },
         {
-            "name": "atmos",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "barbershop"
         },
         {
-            "name": "atmos_air",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "ass"
         },
         {
-            "name": "atmos_co2",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "atmos"
         },
         {
-            "name": "atmos_n2",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "atmos_air"
         },
         {
-            "name": "atmos_n2o",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "atmos_co2"
         },
         {
-            "name": "atmos_o2",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "atmos_n2"
         },
         {
-            "name": "atmos_plasma",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "atmos_n2o"
         },
         {
-            "name": "atmos_tritium",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "atmos_o2"
         },
         {
-            "name": "atmos_waste",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "atmos_plasma"
         },
         {
-            "name": "atmosplaque",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "atmos_tritium"
         },
         {
-            "name": "zumosplaque",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "atmos_waste"
         },
         {
-            "name": "bar",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "atmosplaque"
         },
         {
-            "name": "biblio",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "zumosplaque"
         },
         {
-            "name": "bio",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "bar"
         },
         {
-            "name": "biohazard",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "biblio"
         },
         {
-            "name": "bridge",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "bio"
         },
         {
-            "name": "canisters",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "biohazard"
         },
         {
-            "name": "cargo",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "bridge"
         },
         {
-            "name": "cargo_dock",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "canisters"
         },
         {
-            "name": "chapel",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "cargo"
         },
         {
-            "name": "chem",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "cargo_dock"
         },
         {
-            "name": "chemistry1",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "chapel"
         },
         {
-            "name": "chemistry2",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "chem"
         },
         {
-            "name": "commander",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "commander"
         },
         {
-            "name": "conference_room",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "conference_room"
         },
         {
-            "name": "corrosives",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "corrosives"
         },
         {
-            "name": "court",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "cryogenics"
         },
         {
-            "name": "cryogenics",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "danger"
         },
         {
-            "name": "danger",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "deathsposal",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "deathsposal"
         },
         {
             "name": "direction_bar",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_exam",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_icu",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_janitor",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_food",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_hop",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_library",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_chemistry",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_eng",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_evac",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_supply",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_bridge",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_med",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_sci",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_sec",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_brig",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_chapel",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_hydro",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_dorms",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_cryo",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_gravity",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_salvage",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_solar",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_wash",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "dock",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "doors",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "drones",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "electrical",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "eng",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "engine",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "eva",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "examroom",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "explosives",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "fire",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "flammable",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "cloning",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "directions": 4
+        },
+        {
+            "name": "dock"
+        },
+        {
+            "name": "doors"
+        },
+        {
+            "name": "mats"
+        },
+        {
+            "name": "electrical"
+        },
+        {
+            "name": "eng"
+        },
+        {
+            "name": "engine"
+        },
+        {
+            "name": "eva"
+        },
+        {
+            "name": "examroom"
         },
         {
-            "name": "gravi",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "explosives"
         },
         {
-            "name": "hydro1",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "fire"
         },
         {
-            "name": "hydro2",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "flammable"
         },
         {
-            "name": "hydro3",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "cloning"
         },
         {
-            "name": "interrogation",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "gravi"
         },
         {
-            "name": "janitor",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "hydro"
         },
         {
-            "name": "laser",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "interrogation"
         },
         {
-            "name": "laundromat",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "janitor"
         },
         {
-            "name": "law",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "laser"
         },
         {
-            "name": "magnetics",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "laundromat"
         },
         {
-            "name": "mail",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "law"
         },
         {
-            "name": "medbay",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "magnetics"
         },
         {
-            "name": "memetic",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "mail"
         },
         {
-            "name": "miner_dock",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "medbay"
         },
         {
-            "name": "monkey_painting",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "memetic"
         },
         {
-            "name": "morgue",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "monkey_painting"
         },
         {
-            "name": "news",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "morgue"
         },
         {
-            "name": "nosmoking",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "news"
         },
         {
-            "name": "nosmoking2",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "kitchen"
         },
         {
-            "name": "surgery",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "drama1"
         },
         {
-            "name": "optical",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "drama2"
         },
         {
-            "name": "oxidants",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "drama3"
         },
         {
-            "name": "pods",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "restroom"
         },
         {
-            "name": "prison",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "nosmoking"
         },
         {
-            "name": "psychology",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "nosmoking2"
         },
         {
-            "name": "radiation",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "surgery"
         },
         {
-            "name": "reception",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "optical"
         },
         {
-            "name": "rnd",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "oxidants"
         },
         {
-            "name": "robo",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "pods"
         },
         {
-            "name": "salvage",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "prison"
         },
         {
-            "name": "sci",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "psychology"
         },
         {
-            "name": "science1",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "radiation"
         },
         {
-            "name": "science2",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "reception"
         },
         {
-            "name": "secure",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "rnd"
         },
         {
-            "name": "securearea",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "robo"
         },
         {
-            "name": "shield",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "salvage"
         },
         {
-            "name": "shock",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "sci"
         },
         {
-            "name": "something-old1",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "secure"
         },
         {
-            "name": "something-old2",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "securearea"
         },
         {
-            "name": "space",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "cans"
         },
         {
-            "name": "telecoms",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "shock"
         },
         {
-            "name": "toxins2",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "something-old1"
         },
         {
-            "name": "toxins",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "something-old2"
         },
         {
-            "name": "virology",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "space"
         },
         {
-            "name": "xenobio",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "telecoms"
         },
         {
-            "name": "xenobio2",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "toxins"
         },
         {
-            "name": "xenolab",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "virology"
         },
         {
-            "name": "zomlab",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "xenobio"
         },
         {
-            "name": "small_secure_red",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "zomlab"
         },
         {
-            "name": "small_secure",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "small_secure_red"
         },
         {
-            "name": "medium_secure_red",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "small_secure"
         },
         {
-            "name": "medium_blank",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "medium_secure_red"
         },
         {
-            "name": "medium_magnetics",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "medium_blank"
         },
         {
-            "name": "medium_danger",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "medium_magnetics"
         },
         {
-            "name": "medium_explosives",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "medium_danger"
         },
         {
-            "name": "medium_cryogenics",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "medium_explosives"
         },
         {
-            "name": "medium_electrical",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "medium_cryogenics"
         },
         {
-            "name": "medium_biohazard",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "medium_electrical"
         },
         {
-            "name": "medium_radiation",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "medium_biohazard"
         },
         {
-            "name": "medium_flammable",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "medium_radiation"
         },
         {
-            "name": "medium_laser",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "medium_flammable"
         },
         {
-            "name": "medium_secure",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "medium_laser"
         },
         {
-            "name": "goldenplaque",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "medium_secure"
         },
         {
-            "name": "kiddieplaque",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "goldenplaque"
         },
         {
-            "name": "security",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "kiddieplaque"
         },
         {
-            "name": "nanotrasen_sign1",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "security"
         },
         {
-            "name": "nanotrasen_sign2",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "data"
         },
         {
-            "name": "nanotrasen_sign3",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "cryo"
         },
         {
-            "name": "nanotrasen_sign4",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "nanotrasen_sign1"
         },
         {
-            "name": "nanotrasen_sign5",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "nanotrasen_sign2"
         },
         {
-            "name": "atmominsky",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
+            "name": "nanotrasen_sign3"
+        },
         {
-            "name": "one",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
+            "name": "nanotrasen_sign4"
+        },
         {
-            "name": "two",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
+            "name": "nanotrasen_sign5"
+        },
         {
-            "name": "three",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
+            "name": "one"
+        },
         {
-            "name": "four",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
+            "name": "two"
+        },
         {
-            "name": "five",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
+            "name": "three"
+        },
         {
-            "name": "six",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
+            "name": "four"
+        },
         {
-            "name": "seven",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
+            "name": "five"
+        },
         {
-            "name": "eight",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
+            "name": "six"
+        },
+        {
+            "name": "seven"
+        },
+        {
+            "name": "eight"
+        },
         {
-            "name": "nine",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
+            "name": "nine"
+        },
         {
-            "name": "zero",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
+            "name": "zero"
+        },
         {
-            "name": "survival",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
+            "name": "survival"
+        },
         {
-            "name": "ntmining",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "ntmining"
         }
     ]
 }
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/miner_dock.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/miner_dock.png
deleted file mode 100644
index a9444f1ed6c073171a40752b1ecb271846153888..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 462
zcmV;<0WtoGP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004%Nkl<Zc%1E)
zv1-FW42J)fzCfW%!9&2a;PL{6Ou>V}V><;;-Mn<@Gjzz3EmP=}j)4pzQy;;Gn++X2
z2Kor;B=vF)_T42RL-T{dJ`3rybkZ5P=)dc#%V0d6Zx0FZ^8C~qqxI!@I^W)XzeDRP
zC^(VA=62Kyant2Q>k4VH4gy$ChPZziwc2z7n9f*4O76|<5GilqYiCP99BW<4Wdeni
z$~glz1k21!NU6L4mXjgUV!aa-`2F$_80Qk0bq9bX%VjOea<SoiS9$G$HZU9TqyTBL
z#%eJ`6!!rDO<e*2qPUOMVs@G?*jMMKE)m6jxfsMp&YO@($rrNh=OoL$ThY4>O*M77
zlkTt2S8pHA0OsHUAnh2%A5w~tvF%j?JAgS8LeC6mfZpH@y}{r0(1Xegz@B`^loP-q
z$MI1B*qPaiyeE<@M^l&3x{@^?Xs<TpPT)X9O6EY4<pRbN(nVgQ*gj}D5Q8w7Ih?xW
zoB>X0T08=PbcFr9uTu^JAX33yK%}tgusQp0`9&A~08l@<Utvr#(*OVf07*qoM6N<$
Ef@8_i-T(jq

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/morgue.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/morgue.png
index 1dc0e7d1a960dcf91fd09c4ceab3848de9459ffa..957299380712e5c28ce51585cc2dc8cd2929e1ae 100644
GIT binary patch
delta 510
zcmV<a0RjHi0+$4kBYyw^b5ch_0Itp)=>Px$(Md!>R9J=WSG#S)Fc5tSGJ!vZffQ~M
z76!6_21vtF1E}x@YO;hjNTC5-Y6WKi11^{}DFV2N!WEptK7~AyG$qSGfaC!NKX<%)
zyd%#P@YiwWnw-n!{!$L#t7pq+i@;ni_mkNzMx)W-&b8L4cYhxi35x(ZUx+)Wfm9}~
zxmC3e>T&s2y;&r#`C{MBQ<-2@ts8^X=cGuFbhw<`ZxI**<kS^0j!pzpnOMd{DdFwe
z1bFEAd|%weDw?@9`!1Ndr`D$*6#*Xhm|e$4>0|^#SE>sMA3C3bp%HZkT=$t1DszEK
zO#lE=)K(t=vVTH#Cy>hIXdr0}5u^}J-!x8oCJ7?wA`v8D8sjjH1In7`&O->E0W#t;
zCPm%+&Ve@qKeZnK)UgeNcFyzPivV!QTUYqf<-0{*0*3{s|4d@gyAWOK?wfEPLJB>#
zsZ3DjqNxRCF03)h`8vMdl~Qj6Ol2u*WQ9VRqdAP`n0Mqpgyi097&1r%`SlDPTA!@<
zizq8pry9_!6cZ{nL77uQY8&Em-xvTMpI)rBtyl5=;sLYiIEGg*>^{Hny4^Id;#LH-
z)|gGly^7E&WQBs(+M4@aA0{S=!Mz{BKh6H}4Q`PM!~8Hs82|tP07*qoM6N<$f^cZ%
Ay#N3J

delta 315
zcmV-B0mS~71l0nNBYy!LNkl<Zc${Nk7zHC8FcMPGJ9GJeN-QW&kHl*SUdi5>%l|Kt
z-@$PH%0;p)H`LK*h<WIN*AXm)3^{-0BEv!3g=9Iv{%|})46g@XH3S`i&v0Zwt|OVq
zbpW-%&~`wEb2LMSb2LQ`AUX}8$2lQ+V$%d!i4fh_F#e3aOMgi=YrxY0Ss?)PDJ4E9
z*#YQrI$91;3y@tDGcZsV_Y^yT+&Cx80fY)6nmd4!>X<4HKsGSLIhx_*%PR~F43M@0
zj1Oba*t?V@2a}u&V3wJS>!9!rb@Ul#>|M%WsH0Dkc_cdkW--h%nB_2WQk!oiMZrPa
zg$xY87#JdL-82w_won>foLUYr)X^t97Z~d3GcY{FuV%oT<)dH}003M@Xv62T2p#|c
N002ovPDHLkV1jAjf$IPO

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/news.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/news.png
index 575d943c769404a914cfa4e57e3bfdf5668647fe..40b73c7c2d272b8ba2a332c70cc83a9a1ebd7ec6 100644
GIT binary patch
delta 448
zcmV;x0YCni7?>E4Be63>3V#8dNkl<ZScUCZv2KGf5Phw>Mv7FCj%16(h)|>~RknOV
zx@PAO@&)+=_O9g%vY{@OD#VD?EsQCORH+|8hxVu;J~+Tqhx9EzbKv)UJ{uo!>9}fg
zE>@eu6w%B6QOkAHL~hUKxV@VWCO;hy08r>eXax}YbT%JM4gjO^gn!I45!c*DCT1=f
zk6i-7&i4kBZ-bciwF*!Na2*Q(kfeFVR^d8U=}*$Ubpq@X)WH#wPbW?SQ3PDa!g^@~
zK-m)1e%)tGK$7O#nM=?nN+bZ#uRryH?_>?5tRxMiOe9(?Kpjjsa2RDJG1*21sM$>-
zRGY}V=0WEOaFL*`+J7}yI&DLByQwW_OVBF^)IJvxX(U<&gi&VXIPNWA$QdAkI0r6Q
zz|Qw7Ip8{0<r&x3-{T<u9q)V(+aShzX*d4g3DWm^ErDcL(C%qF4|)lZ%q&UsGGa{-
zA4CN8T-XM2*;iZOH%ip!puMXvR-3}Te^76;gYo(Cj^z32tTjGhBXBw%Fd9#cT}ppy
qgEO#|k?F!DdwbPZM}J<L{o@NRgxXDn$Or}i0000<MNUMnLSTZ&g32oZ

delta 446
zcmV;v0YUzl7?&83BMtxrXF*Lt006O%3;baPu^~kYe*hq3NK#Dz0D2|>0Dy!50Qvv`
z0D$NK0Cg|`0P0`>06Lfe02gqax=}m;000SaNLh0L01FZT01FZU(%pXi0000RbVXQn
zQ*UN;cVTj607GSLb9r+hQ*?D?X>TA@Z*OeDr{R1600AROL_t(og=75x|3AY(0>)7X
z40;Fjf6ZD!kqe8`A{fbbK;Ntt|95jdWw>zp3R#vL=;|=I{*cD&2!amizP*!SWoRK;
z4hUb}&rquBJ`5cYzPcZ)qtL}^8UolX!{$(`J7C9`yKwgW?VA`9J^kP`0|Ntt2ahuC
z91y;`A8rvo0CNOY9T2{{A1-d7tAp18l^U+Je|LbPj1oNPVLooZv76z-<tr#5Mso)+
zFfhO!(SBn${X(Ep!<Avjm%AvAIRE4x?Hm9z5ZM6?3=D8bz#KrcD1d?R)%^pL2+0A%
z#{rap;SmDJsT#QqKras%7*KNv&9WhKmV;S}tz@KGWd!s6h09k^90OwyuWUG=jZ&B+
oB*?NI3Mgup(*uk;V89&!097ls(DhC9oB#j-07*qoM6N<$f>;l(pa1{>

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/prison.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/prison.png
index a6fe5ca1f399fc26dd62ecf9ea2c53721ed143e2..cea5bba81a9159ce005092b40175b474d274dcc3 100644
GIT binary patch
delta 347
zcmV-h0i^!G0`&rrBYyw^b5ch_0Itp)=>Px$FG)l}R9J=Wmp^WUFcijru5y43nV36e
z<^r69HA3b#-4aEN;T*jHbEmBF)PWngL$T!id6r8|OWS-BvY(9oeSG%g0sMEU&|n2N
z713Vc5(QLXGhms3ya$XR;-&yc{+xi^;V6h$NE6(X7h02TH-DpvP2KRi+p!!3T;gf;
z%2T2O`vUghT_>$a_YcE*w+?l*1O7IAwI9NdZ^0x2O52^a-!1^4Re98Xe{%~U&i=^+
zv?|BcP1H6_=D@E>L$MgGffea$!8`EAbupU11F0}u2ciU&wxhHih1S8?<$j^{S$wwu
z_{?qpF#55}cU0GA+YPPC)4m5v+hOWPjHNlr1cV&82csRh9P?XKH&G734AM~iD((jX
tu~jXER^{}<*gStsd=UxwK_Gts-~$z+rB9h_#QOjM002ovPDHLkV1oKQq@(}<

delta 294
zcmV+>0onfb0>A>0BYy!0Nkl<Zc%1E4F>1p=5FCd*Log4KAK(WBL%@w85Zqa$NvTqe
zu{)zmrNJ-A19A_UmpGLV1tQ(;Sx$=FG`F0Nnb8b~1Z4bo%t8lt?dfuhz}xHdsK)5S
zU3<EGew-mGNt`6+i{+?^#}J7m?2lcNfoikHJaFd0LU?Fu(|;U;U;=$&NvJk!zc(}=
zni|{pI3v*sTnYEb&Q~%t$BLT_+zX}(fZ^D41*ymt<O)m`kn~ZH&3CJyPaHGHAgY3X
zyi+5}z%8HSNeui%T9zf8b07&xezlr4Uqh1L#EYT;0KZycPCybQc@x*Sch3EefqukK
stCu8ElL3;+w;zCH@XVk8mS<#q0i&s=7U2UUqW}N^07*qoM6N<$f&)i}6#xJL

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png
index 9b0761c1bb42c81946926611c7e312ef5a29c8bc..1d89a1ec590e08b9e17f53184eab6961842ce57b 100644
GIT binary patch
delta 551
zcmV+?0@(e=1i%E4B!2;OQb$4nuFf3k0005{Nkl<ZScUDEF>c#16o$VR-3=(xV4y>m
zmP3FXz-ezlc*+4Z<OVv2ZqPvo@MQ1?X?lPH8Q3lz0(dYhz$ZwDh72W(5*c|Y(EJM_
zQsVpge(H&W|6Om!2G8Zq<EaAuQeOsR1p&_G&11fNPnKn~gMYVei`hL4LJR`f;1}Y<
z?BG`S`sX0TyU+tuD{m@s)K}Izcz>2<nBBuse-L0Qu+q8flfs~MPE$>T^z}A1xY9Yd
zU%vsc*l&@-xND{JCy?Xp%m%Q*eI1H*r?pTi5K#dBWQ+ZlL$PMD-vYSR`(w|ROhZfp
z_-U8I@cGjU=zp%>!T=phViaw`p;$YQZ9v=lP)g?xDkcljZ-JkBn`XocFm7*1VSvB3
zxXg&vJb<#+G!-bGH=6a>g5miNKxcEB(fOk+C~J)r#_a(=xWDQ8)<|I{YeKXI{zSIm
z^eyOH6jP9rD`6kT2eRJB27fU?2&k!6sQ4-jB$nbBkbjibpB%tKr0C=TsTu`nDnU~T
zuH_W~*Ye8s*>S&}8Xr=0A=;?v_d3;oNcb25uD08Z*z5jhy8rwvfU?$X)ExjDb?0`v
zz4qJC^J7Y?1Ks1;@x(7VmIY76A1^Lh7H27ZquT9%^W*+|{HeHYTb9LH()li=vevY1
pJ2>`l{veq65VNB{DfDahsz1DeBc7o7_;~;T002ovPDHLkV1oT06Pf@3

delta 557
zcmV+|0@D4!1jYoAB!3BTNLh0L01m_e01m_fl`9S#0005_Nkl<Zc%03bKTE?v7{(+1
znJNfcb!%}EnoUG->*gou>@NKReu4T8+?~4%Zf=5zTLW%()Z*r(Xv`Dyl$W=6m%Ap=
zK2WZ?yWI1;_q|*$Yte$Wya1<X=V@Ig4|g{!K>#ps9iBwndw=c9<{xjbC{i253;@mB
z*{=?5Zte1~5yBXOo&5vnpjQ{iGj*5OPuBhzZ~XFTY%>C^u5UPvhxg-YU9a29ui0h-
zv5jX1u$jZC)BMb?8hIJVaWoo@@@qn&pDP-30nl73nKYufC@DZO8om&v05ab&fFVoH
zUbe}U_&_)TWPjLu-8ipHvTM#-!ay*WP(JcX0SuBN1v&~?2ZZ|X(+En17l1a!Od-UC
zYlC%&0Q>sL2>^P%0GVTgVaBqK;pZZ)1Rx=(p-KhKO;MVA5&nFC%|K8RMy9}JuE#3{
zNYh{I4SH4tV(v{dca2y1JU}ymBx<wrQEdkju9c8&xPMjvLWF90k7V-I`<zUoqfT?W
z*~oCSWIOxI_Ws~D96%ajz_RC>?d<O>ua^<Ty`3|Z*BV;hUkN}C22+NX|1oPlTlpmD
zT{IX#4-5@0&$=xlWwHY3e4FxbijZ!b>vfE?JdV>oIV=+Zif;oyfa2_)e--ry@09^y
vjw8AEhbD=Hu$|>Y75r&dc2k{N_*VP}eB5SSzumj100000NkvXXu0mjfm~R7-

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/reception.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/reception.png
index b16670d5b5f6bfffcc8dcbd3b1cb2798b2a7557e..3f3e6dfa490179644e10f24b4c621c1101ba025a 100644
GIT binary patch
delta 421
zcmV;W0b2f_82uNJBe63>3V#8CNkl<ZScUCZJ!-=+6#iPe1_Gt&=xl+G!346DY&k)?
zX7>$r0^dM;*X9J>k`5^p;jMvg@tA}_p$Bj$1=*IRCrc%i_M0Tcd*7$`BlLj3jtkS_
zcsega5xqV?YPqgV<k4V+>)XCJ`Ej=efI=riD?pO>2P1EC0O)jka(`J9aoJ=P;^q{8
zjVYiYP2$s<anZ_0V+1IWq;1Ioj|ix@m+Lk{oCQd-#WF{>IcU#ZggB)jO=6>S#swG`
zrRW3`Aj#7t*51A<get<T2t(j^2vBox3%>+44bBmukh_4?hOU*Z+656HE8i8iwj~Py
zfY~H+7C-?x1wVzew|}8A0@Zhacz1J31>?fHSM68py}JO_QMNf?Hi=5<u<cd*)%soQ
z-<pDI2iV%NdT#3=s{qDDsRL{Usf&Q=@p3A{#WF{l#HHMt_7rIU>f`CW7~Vgqzgcg5
zeeRLHJk{od#v(lKw&-+wt)Ad27#DIjsG)H(3O$(QA8*>}=o;*!*+0Gk5&ytAhM@W`
P00000NkvXXu0mjfk4VUn

delta 454
zcmV;%0XhEt7oQlABMtxrXF*Lt006O%3;baPu^~kYe*hq3NK#Dz0D2|>0Dy!50Qvv`
z0D$NK0Cg|`0P0`>06Lfe02gqax=}m;000SaNLh0L01FZT01FZU(%pXi0000RbVXQn
zQ*UN;cVTj607GSLb9r+hQ*?D?X>TA@Z*OeDr{R1600ApWL_t(oh3(d{YQj(y#_@l)
z4t;|<e_09+3B-p8)x}NH)unq29ejce1+%-jTC%xl$wL@OhCs1X`vwl((xJU_iK$|e
zo0Q-;A98-2a1TdIl7u>=odN$IFqzH^2_Nt8wA_Hnbe{MZp9Eo)tGQ|DSYKBM5k~>f
zZ?C)zA94X~&*kanRvo~JeE`NCs~*6yC<m;ze;WXLm)F$;oY-gFu~=<4tUul}e}ghW
zy17Ui(QH7s)dr{@@K^IJM5zEVcH46?4ILnJL#As>2gtEKch^*o5`g^SLy>EmzX>Y?
z6iG8CAOplR?6%s>mJ3Gx!EPS}VYFAP1Tg9km@OB;&($OLfobUK7LkY(`vhUM*H}zM
wEcpaZNhyF@k5Yli)%`bx&hjd92GkDt27!L5&;k3efdBvi07*qoM6N<$f{HA-`v3p{

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/restroom.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/restroom.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5903a7d155910ffd43d1ce8f8fa252070a4990d
GIT binary patch
literal 515
zcmV+e0{s1nP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$y-7qtR9J=WSG`WdFcALu-6~ar6t+|>l`=+Er7kF2pCGK=`v!S}zCm_Y`UGqh
z3lfSlMq+Em5>-NC13?(jA?Iu-P7?$OzQs;^x$nDkd}jlH9Xn-zjwjQ+Eu!1&OC{HS
z8M!?e;pn8_n0&Kd0YI)2p%g&m{lTa)IRJFJJ(@})c6BcupPm^xcOA>fPUlZ6VDI2i
zBAU;J5~1(eMt0m^r2q~h;)L7U)fVtoFcz>_riHPo9YMPdMa*Zz&$;i}@I4zr7!`<I
z$10?q>=w%uagu3$S7u;78%ohEmg%P`axRJ@1YuP9Ef_5UkDx4~x+oPu(eo|kI#wYI
zO;Gv`P)a!wrMrzxXfyEo@(e&<>F9SF#r0Rs$sdO{19|=i;A6exB!lZ%g^}QUwoxX?
zA4ltzur7X2CDg&R;_09~rHm)j+&#Y#`*>qKJw715xspyswMsFSRk7>_VI)0^+m=^H
z4kH1g<2cErvdf>zwu&66@eS~vAVx`5(e!k*l>pvY#OUHAGip347%zbcu@8uAzRiyK
zxw~MqUZK<NwbJo|FrvGG1nteJ?Tblzf2X`1ef!nyAMcpz-#bnGT{i##002ovPDHLk
FV1kgv<n{mn

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/rnd.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/rnd.png
index 875b57204b378f7b712b90599c08841fb4f830cd..3dc284f4794a5d8b69f9e0c64aa4579f82d809cf 100644
GIT binary patch
delta 423
zcmV;Y0a*Tq1Hc22BYyw^b5ch_0Itp)=>Px$dPzh<R9J=Wm$6R6Fc5}+5JOR=rd<$1
zDtjLw^5VUZk<8ihB;7J6kHOx>$^&Gl5<)DHNC>tvzy&9bqxc*mB=|SiN&oN8=d%O+
zb)EH1%GLHbhROc<&gf&DkgM&{yY#T|7Eb0>S)qI@jS!tbl7IQ_&6Sfm>Hgu#2yt$D
z$u@E!1(H0p{x2hdt$DE9Ad3s@cbx%rbG28~0+2ZXmN@`iaLwE6Eu@$}1G<9U211Hy
z04Vw_E)e-?1LDU4l02+UDdn8%X9JMA9yzxF0cH`J8qQ<@dh|eZJKBm>ghC2d#dnF7
z0g5)jY1Fp;z<(+OeFsh(Zgc>bb?(#PB~W_><@2|j6M&v}{nShH@MPTeoHGFMz4ekj
zgz{D05ov6CZZrUjjtsK6XtZUn1{Y!Er**`@XSLJVr8Bbc17zM_YyG4gBIB)ieZ9tV
zKI8H=^z!<S!{edzR&2~bRaRKeXU+#t<fo|0$~gZ!KOjtW2q*V1^?jQC>jMP1wLS_2
RHyr=~002ovPDHLkV1h%G%<=#L

delta 364
zcmV-y0h9i~1BL^TBYy!+Nkl<Zc${Nk7zHC8FcMPGJ9GJeN-QW&kHl*SUdi5>%m0h4
z|ITpv!X>gS*EP^%coWEp*AXm)47q&a5`*u?M6w*P*?&HRWS}`-HB4lgj0ODJ@RDJ(
z|9q155exxh0L)^~L@$!{QXB%vzGev!r>_H$E!Q>BBg+i39e?nk{w#{+moHpG5u>>S
z6dH{gbPe<vd^aXCT)uD#?g+X$0Okk=1_rnz$N^;Kf<GHxA`BoS;ZfuOjJ%G-B_|=0
z>;PD)xY>U`hJ~;wAq9|~29V?Z@`X!ervb7Yu-Sh;JSvbardv@=ZskO_1IY0iRUJS{
zbxaippc@J+^<_L0y%?UHe*#Yjo{3&0mkVSiLRiteef~DMm}jCF3ZJG9@J#fAhXAr;
z$Y~FdT@d*OpwbEqq!&U&IY8GykL+BaYoN#QhJcy@Z<ddOQ2+of$$g6ajK22(0000<
KMNUMnLSTZpYMdqj

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/robo.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/robo.png
index 5b3bb6e83dbb846ce5fcc3355e8547297f347191..82519ba966bf8e55f50e5a0d480ddf7e8bb73c76 100644
GIT binary patch
delta 456
zcmV;(0XP1g1K|UZBYyw^b5ch_0Itp)=>Px$n@L1LR9J=WSG`WdKnymBp{P>RE(jr&
zy$=v&$==6k=5BeCZke0MV9yfe0kTsGAr{C<2)43dbh-NHF6n>--x9^XoIm?MTNi-8
zjtj||F4o6$1*%>j$XG0abg@20*AdL3+34V=Gthl>BngrL27kZ5yXo1BCIbL~ZM<iL
zacdr*UPuy`+(uI7Nty)NrTwnhF9={(MUw&K0CiROf^T*!u{spk3TQ+&yVXy|LxTeZ
zR=_2Jl^7a4hyZ5k0&OThM47j}BN|O0G|QsNppJC{ss@rYIms@Bgwz>c1l-J#kh?Ku
zN3o6~KoPQ^ntxqGFo7~}dr!@-A-E0eswTz7+0RY@;kKo3+qqDWpv+sc3pfqfD4I+?
z614(YT9<^+Oz>IbeFR)3r1d`VCNNZF8bl2gP1YMO?y&LoOO;baXiqboinib+KWaeI
zf=WPBvX9aw1XW;&e>4Fb*a>#V_B-X*z}||Nw@a8$CqW_nM7+I!!r}RFaw}%r&~ygo
y)5+kwfQ@au2h$nS_d9<~Y!aiRe}nrq`^OjHz2*-*l-6Vb0000<MNUMnLSTZ^mCz*s

delta 387
zcmV-}0et@91DykqBYy#8Nkl<Zc%1E4F>b>!47?Owx_2p%p&yW-qC?+c1A&{dqo+Ke
z56BDhfJ_=Q7J-4}6+sO90~s=A@0bn+1KCk+Qa0M5zQvSCkSCI&3=H`17_}KJmaB7@
z0PnN6#u$yt#d3AN|M*0i7eT?5(Kt=-8cE!?IVtl3lXV(IAb(3N9;PpiHa8N7hxrbN
z`7T)RLu&?HP$?eq9Hj3|fJ%`i_Npwtz1|79M6$#}84aLYpNI%#iLI>N+u`aYWJFB}
z;Bsn`>uV|48K4uo>88E<TG9{f3`kBVu@yI=GWx0)XswJEPfa#~x?|rpbZxn_fL#Jf
zXG?6wC7?{y%Y5MKBnX;>eS$^6ciLYi(B(Pqg#bBouNle8XpEo6*xF4+&m}E>j(q{k
zyg-!3*xC&MAWCDlPtjWtr7_C9z;S=95CU)^L^2ob3{XlZuisyH(EKF#LclkAxll&q
h)ME4JzvTl4d;wiAot?M?=JWsn002ovPDHLkV1n3Bv3LLg

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/salvage.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/salvage.png
index 8c51238f897b6fad6fbeac1dd4f134034ccb4b0d..20b0eb577de574a673c40d2fcce02a7d6b63f42d 100644
GIT binary patch
delta 413
zcmV;O0b>5881)yBBe63>3V#84Nkl<ZScUDEy>5dr6opT#&aF^|GFD>9&?O7c07G^L
z&%6bU@D|Jr>>bQAuypB=0jXmZA*+3XbZCwEGhAY%1hr>D=3<}EzW5LL>$({W?sqsX
zW%Tko?4<<Q?{Ip!2ObSW+q@D2pI^feg8<U}dArp%mwG!K1|e=$6@OGccO7fgNEKJL
zcQ@KvM?sPT0BjG4eKtF;1rQ`@tI@e-Z2%RNu9W`(MMV}O_8E#SybQn+S_i<?)YGZA
zjuE&x0ME;_8mH7FuLDIEw&s12g|)%Yvmd9348ZdeJZEqn3$_>addKq;w$}z*6rgF;
z?XA>Y^RoaX1kY)k&3}~EF$-MBLXf2Ou*<SsXu9c;Wy)qnN`dV~t*up-gCx~X1!)B2
z6l^Z7OKint0G^kKeFoc$>UY!=&y+|hki8vST;w;g&+7D0AeE<L>&d{zG%0)}eH@P{
z-$n0KtQ>(#2y9GqkzB_<LnXvu>^d(dO$crGU#YHU|M~{{5E7^wputLr00000NkvXX
Hu0mjfi>ADk

delta 460
zcmV;-0W<#f7o`}GBMtxrXF*Lt006O%3;baPu^~kYe*hq3NK#Dz0D2|>0Dy!50Qvv`
z0D$NK0Cg|`0P0`>06Lfe02gqax=}m;000SaNLh0L01FZT01FZU(%pXi0000RbVXQn
zQ*UN;cVTj607GSLb9r+hQ*?D?X>TA@Z*OeDr{R1600A*cL_t(og=75x|3AY(0>)7X
z40;Fjf6ZD!kqe8`A{fbbK;Ntt|3%&}WVn3!0$G;p>KZV-5sb&{2!alHeyEVaH*Y6d
z4%j@&ok7yBpSlisu)mx^!LbvodUQFeJK(|oa=0A2Be2QQ!~rtOh73>cp2z9{bUCUz
z0NID=7U7bknFC+|mOFHH4KU<}rvs4V9hr|ye~#*jaPuU0xEy-ffK8674nVd5n?=~<
zs2&1;9<5+tk&A%S$N-z%@G1w8EgG<*m{dSD2T%frM+hK0VDlt*2G4**h9`H=Gsq|#
zGHl;4pMik^QW{>qd;vo(O%frj2=)v}WME)mV0d!(Jj3P77Z^MP5>c`z%|Za#$1ob^
zG8mdWfD}L#2MlPV6y^xBY=;7hn&tEWqYfBw2LJ#JV8_sFOmsW|0000<MNUMnLSTZ=
Cv9odj

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/sci.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/sci.png
index eb3afab2f8f7c808d7708b10aad8ea47ad875917..599207f48ae27edccd4ea791457f9e423c5a71f4 100644
GIT binary patch
delta 546
zcmV+-0^R-D1G)r|BYyw^b5ch_0Itp)=>Px$^hrcPR9J=Wm$6QRP!xuLjf2LdwTm$(
zy7K^(#IW}<V8)3jVPkF|!=2@Z2k34SV_Xyxqmww;|9VQfa49u0(SK=xQ~vLqd(H)b
zzpjI}i~eL*?aL^8zH9U{0{D|zH9i?*G#(8$FN+ezThR#72!BBH>&x@O=G6VeQzOKo
z=?^xUd%lM>58?S<XRPUdMgSZ0AaM}6a|DTF1<|A<TO(=_FQGDpAaSsWm-<|gI6w@j
zOd-v~t@xb*m?f3wAp(2>@y04s2;d+{90b^oSMC6SMZ83shdLA9TxLm0V^)q;GO4o%
zRHk%^<vJ6LjejVOq<LHU0gDO{0x@)n3B-(*yI%Ko3<0~$tpOwifQ{0od5FlJYbc(#
zG4BN+r-5e5{q6~x>xqf&Aglo7%xlHaYcJQE9nU2h+yhPK^>eZZXc)P3D~Qf1kVfoy
zxiQsa<<`tyvQ5_efIQ}I=lLE~rnKR$x4`sfs;7nVgMR?zy4Jzii0pytqcX<t4A2H9
z8_{;`_69(RKG_Zikb6Po&bN+buWXF$z5wduSU)C&tvS&1g+xAp_N86`d>nVp_KyLi
zdARZDWktC5^<Ntq--@p;u5fmG+=s7KFR$-dJ+8Liij7TJ7Uc#&pR6d^jAc<a#{A9?
k6A3ZceH$&)r`f+g0snkQH!;bcIsgCw07*qoM6N<$f|rN~Pyhe`

delta 448
zcmV;x0YCn_1la?SBYy#)Nkl<Zc%1E4F>b;z6n(8&x>u?yWyl2*8D;1hK#Eevj-Gme
z9suP49Dpe!BSewl6eyN`0R}Hf>|K!PfSejg6Fa8rP~Mb$JO4fZ|NVb}8~!`)+BQt4
zvx5u4$NO6&N8{pTIy*ehKOq?JL>`b3yU|0Vh+dl$!8qcac7GC3BpIGZFO7TdJ9*X!
ziX?M!(Otl1yhfZ;#5r{m(V7AsMUo*P;YC`Mh`O~l7)PK;GQ>HBpGE+V5zyBFz)vIV
zh!_jd9S0<YpGH*;=qEmZZ-Z3|;+$f?*g`N4k$i`Gzt|!mp*6X+003BJO9Ui@*Y{3r
z05G6KTX%N1K!2T3Fpl2q(?trD?N<c+l<PRBCk1I+gvKeTD?$Z7jUW<^&3J8n4Xuk%
zL63<3>?5lE_9_C-#i)pMofS?3T#2m&xDFg=0WRbCDgtz8YTy9J#v@A!ukS&Y5`u9I
z=n$)HX)M}UKtMtOs7PcftFEYbLS-|BaU&9pLoj|qs5$J4P?oZ?nZl|ODX6=y-}yS*
qRRpLh*98Fyv1{4$=fCAQ-0%gzXUoBQj%_gj0000<MNUMnLSTZA&%?+7

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/science1.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/science1.png
deleted file mode 100644
index 7c67901ec43a5c2ab714e333ff106621f0604880..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 516
zcmV+f0{i`mP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80005YNkl<Zc%1E5
zF>Zq}6n(9_R;pCdj%16(h)|?%Y&`*UcW#gqaD(ifbAoQ!DpiOPsaqH$lryADANl#Q
zjR{B@+P@HE$M5;Q?{5tJ^|-Nhyu7|0rULo=c(>x**}%j30*}wL(ct^t761-55@!Sm
zKASI`6UR}2EDf>VG^py<I`01Ai9d}bZcTskS$UR*SguNBY1li~HJ_0{U&K-1Y!3-z
z4#<h+3Mn^N4*<(mi6T!>)va~>#RMb}02Fy*mAuH4j*xuUN5E;pded|hb8-Suc0Oev
z!PlF{3EoSfs@pRXBt{U~*5G}s2YM_Z2@OVTbRX^U1@|IA5)w=*uw0cVq=tqU0h!$d
ztLnA`WI>WDO{RdY;>q{y(_7Jpgfj^_ne-btdMy=TP?;<Zy$Y0*fT<2pW)hOQp|`A0
znRZ&Bw;-i1@&s`dbdnP=j)JrCqX@|C*Tk5J%mdeWS6p-$X^^3yqX_^<dwgVeg;yN_
zPHTZoOj@B6aB>2AN9Z<><)PKk+X6~H=Hp`&0a;+KLV$&aNk>KKy?*+JcMfQ8^`5`v
zB(xIP@3!)Ddhn_=q2IfKF^rdmsV^qY_m}l{boHy*fBXO-!#dn{TP!620000<MNUMn
GLSTZjd*~Mc

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/science2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/science2.png
deleted file mode 100644
index 7722ef8303102cb54f4172e280545e477a30a86c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 422
zcmV;X0a^ZuP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004PNkl<Zc%1E*
zziNaq9LK*cT?>U`J9^uJqlANQZhZph?s)^BAaCH_*(d1cRw&{qbUVjG?isF2bL3(o
z$uFrL+TWr<^!xe!OZ)+U-L7m8o}OP$u|(eAUadMeHt}@3!~NqXSp0a{1Hj1!F$0j|
zo9!-G8~|?b9^|bN;@b2Q#q&H%AUHEVTl$_6fFfQNDVlclem59E74L^>T>vQ#fFurB
zy1>QseCJuRegsr2ixhd5tOFpuZ`u)6-CaQZIDp{nEGk1zseUqm6jwc`79c<@LfeM3
z8i49OaM_N&Mk>NQOGp)OGExMjw<fQB_XDp8EFCyHTy%htJTIAZ3i@FRYPVnjH3C)L
z&DLsa^e%}4P!{QI+f~;R!bcqNsDY*(AvlZHe%=86Frliu=!NJEAUK2I?0oRZh{)XQ
zS66ec0X?^RSNP_B5#V^(tH0Bv!$$@Bo(+s<92Q~^CgbOabvpX>(d^&80BqZoi6iB8
Qod5s;07*qoM6N<$f)X>lga7~l

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/security.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/security.png
index 7e27efa2b3220c9bd937bff71fa8694b5ad11231..2de5d34a5ee47c2512be0faa7c0baf09f092c63c 100644
GIT binary patch
delta 400
zcmV;B0dM}<1F8d%B!2;OQb$4nuFf3k0004GNkl<ZScUDEJ#K_R423_U93Vw1>Qt%s
z0(%Zxgvf2SV-=;$o+B5aPL+DA6nlf&%4isknejk=q~tZ2;paWuV;kVFqguMyf!m7c
zS>aLzbl_^>ZUgcQa8^V_1qk`W2IPVdMZ}Hvz>?>U8`<~$WPbzf`+l-5?^6ZDASCCf
z7wVy%?8c4MLp#|bE(dA~9)bH{T?kXChn7>do2`8U?-){$i+X5RJ#P{qp-&0QiBge(
zx8rd}Bw~C!yf1~-dm!fVx9tHTU$YNP5rA|h#Jq<MBXFvAs>d4n5{gm~6H!8L7SOnH
z>U6#cA(u|M)PIt*(1AOEdj;p*I6GQxIUc~p#(OdX(%&V#e*Xs+*K=C8xe7}0WwT%{
zipFvH4WOOp;MO7_EVa~m4$RXq{NPwya^`6mHldQ{<HM8!@m5MJEW22Frtsrss7Bxt
u2q?+5ABBr@&+q&(@kMOF4+{A|0Iv4F{v@yDph5ru00{s|MNUMnLSTXlY`rM}

delta 447
zcmV;w0YLt$1K9(RB!3BTNLh0L01m_e01m_fl`9S#0004tNkl<Zc%03bu}T9$5QbMs
zD+oa?lTNS{5$x=I0&Dx=3-|*12KLtWfpm6)h^1g>N|8K6%pdZ@IGMZb%<U3?2)DPn
zyZ_t0*}2(X+OqyH!1?9%yp+ky<Z;IZ0Q14oS?V7SJDbnGzkhI;H$kic(0sV~mC)|q
z0h=a-IRhm|uAevkd^P`b2jTtbG~GVDwYELV1~@t1PgfU%^z=Mknn6|@$M=t)@&Gia
z8Kv8}t_r{=sHn05IJ!2&2v9ZvrWFP>lBNXYbyWZuVA4#Fn1Se74dED|dDl3|2EeGS
zS&-&{@#X^841Z_{sff87pa~*s?gEe*PeRa~nUau202t9a=VPhqemM))eIWq7tT<}+
zwe>f}iVFZEm5GIhI@wtLxv#<fHRQt?6FjdH15#F`%k%2X(E8p-i;xfi<AJLH>T2!+
zka<A&0Yp|uRbrs+{X=@ibOJyvFUsjZ5uYmwxY`@!0XVE`_vNmL<@wFsI7J0>l;qhP
p6A95&%X{VCnr*tNq_)00{soO!Dbl$zmudh2002ovPDHLkV1l4Z*4qF8

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/shield.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/shield.png
deleted file mode 100644
index bb88d2a770e7e6da59be40ee3d317eea2cd814d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 402
zcmV;D0d4+?P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800045Nkl<Zc%1E)
zv2KGf5QhI$eSu7@88gAemaTq(N>L*939?4&&cGh2Yn~udBHqB+yfKA|F)I_|3DTu@
zZB)VeLKRizU%+7b|L!=S0Y?3IP5LJ6_J`X&2Jf4<PLIx)yZzzza@|4}70X<N0nW3J
zPKf8eMPyMSPA)6}nMRn*y5~HxRvu7Z0C^fAPb2b}qTWx?mIwpLFB1_40N{*$>%|*j
zI$uCQnR@{4xX6ANpe~g$wxRSpU;V8j)cPq>PW0XYadPP_GEUE6e*!yVZuBewI}3HG
zj5)VsdhY@Q(P}u{cFh8~$FQx3Z$nZBeEa+00Niv_z{xd`w+@`udWq99g9rmm=L>VM
zcL)`l46s@+QJ2aXIEF>$fYqf!LtK|!gr{Q$Sybi-wxiWq0N_AUM9zRtX#*gB{l4mF
w4S+aFoaci8*gqh?5@CRI&zy(<mX8|s3BpL3W~k!Yi~s-t07*qoM6N<$f`lotX8-^I

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/space.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/space.png
index 214650d6db435628df141c29eabadf34299e0722..b9286eb06dbe8ce68b78755fd0107b40dae3a8e9 100644
GIT binary patch
delta 502
zcmV<S0SW$t1djxeBYyw^b5ch_0Itp)=>Px$$w@>(R9J=WSG{V3P!v8bT?2t)I+`uu
zC=$q0-0}o=%`SZbU!cB$d)K%Zx`i%<B9210IHnRP^a1R2<lO81RZEBV1BoZsd%y4e
z+@lxZuj4{BxY_R7sfb>mAB9|3Dsp$VhU=T<X!7&v2msKEM1KecAo+5&9z>YN0VG+`
z*|YfqZ+jvxWs6MVxygFc6d-)h>HSw$jdBip?|Y8+S!o350{lfqi3Fx`U?fy4Kt@1;
zBuEMXO#Vj;7y{pOAdLg9_(1}wrxZz6bYoHIGQXn)@OjJ+HAJB+^e#Wtkj4Szhq|+M
z(Cz{NvDZ=PGJoQH&tW__tpg(gbTK5N-thu45~BIm0{Fd*<hUKtTPh5<s|l=&ka|NS
zfrO^S2%{9}#L!4kjP8U0W*+f1VKY}50lw|Z7PjepRsuw1Q{zWku?>_Fpv{H0T7Dby
zHa<`7`-dlc0iw!AA!XHc<Gih!&qJ94>}a$QX|G3H1#jKBQb1WXkYok(R!g#iDNLP*
zx^ZO+XwFSQ-vLQhFt)4)gx~6$?XLB2@95X;XncKsK>4!ooe!iDIG>I%n=iCEG(nOT
scsA%kdNP{&U{b%o2~S7Ael+{XH`1sDU^f#ERsaA107*qoM6N<$f-foOL;wH)

delta 490
zcmV<G0Tup_1cL;SBYy$PNkl<Zc%1E5y=uZx6#iPe3POn;<0fPbL2xN<K0&&=hrWO>
z(7b_rSKSNUq)VYl#y~eSS`i9;06U#<a&m9(y(XnY`+?{+H~0I_Z*qXYjtkv|$!vb=
zisbeAQOk3sBlkyRT;B{^lOOjx066JH)C3Uua5O%PFij#XmVeuF-RlqNr&7eF>X0rh
zw>?i80zw#gwg0mG&`3tshk<9@3urvR50D=&N+mE&A}gUr0XhN>A|X-$mH4+7a1O%2
zLz+ZJ@n;F(mU1kX+wxjG^()`41jsn9HwEIUue5HxDUc=+)|;YS+n})u0JYWe)USvO
z1FvGaOCA^n@PEUIh+8KGk|$L6I}4DtOypFKWGxp)<!TG3B;?j`PY|ICF~JxDlNjy^
zj@F$Ju(L?!gv-4^g9l{W)gA2G`K$$~$bJHyw_;alJ;0j_Z?&=v<y!6sfcu9hcLA!*
zrh~KmP+pg7x!(kB2&kj+MC84m)=fy0$hfDm3bOoAT4M;*Et0O5u<?La0FSv1_%ncr
zY2B0qwYSvCY<>!F@A%tnYkYlvAbVLU=L4k&j{6;Y{edxlHdrjTG#e<P92UABOp5n6
g?R50(quD>c0R`v<(YjkkE&u=k07*qoM6N<$f;{@<;s5{u

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/surgery.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/surgery.png
index 254ada76fd4d76c38965d88101b216d133fa576c..f24ba5c1b331d0d183373f349b8d7a87eb245fa7 100644
GIT binary patch
delta 405
zcmV;G0c!rN1Fi#*BYyw^b5ch_0Itp)=>Px$Xh}ptR9J=W*D-E`Fcb#hzg12^$bi%#
zOY0$0FTfQ%asY<hfOBwz4jdq(uh0ur%HVeCP$@%+uaFLnQ=oQu_(58!{TG6q=zV^~
zV1U1#t8;@(xju|l=v6&9Yk2`nxjw|n4WcMw7dOVB-n}^yPJe(cz7n_W;x=3T;zV5g
ze$bqGRR~mtU;%uc^a8q3I%Xq+0ePt*MLh|E+<~bOWWZF2L4YX`g8@wh0Aw<~JisE9
zjv+<O>O?RAz^MxWf)Ol$(sAoN1i=Dq)FT_g0*rxR11ushbr7N#kjeD4)cQW#l`#b2
zeH`Dd?vX6!gnv2EvU}g-dHY0v9A7FVKqk}Hp1^gi3embG)IG$E0+6Eq_9yEmFEy$H
z*eKffZAcxk51w=P{i+Z_%aH`I%dC0p?WS+s7t$rLGx?mMK6d2myqmu9W`2AbdOKi@
zL9&>Svgyc64P%UR?03GHG!g9T$M{~&{__Fi&cFzhmkx(J00000NkvXXu0mjfofEqF

delta 403
zcmV;E0c`%R1FQp(BYy#NNkl<Zc%1E4F>8b{6#iO@TZc{^`v(Hz)G0U|l=}<P1IKoh
z_II3g^hTlLUnqiuINc<H{DB*9a=+y|C8*`1Nh}@ex5T`}_defyUm~#JzvF6b!*-XS
zZ34W%1j-o7#qBOXe?EMn;mjzwM_g<UYbA-BF((aYsAy_Lz<;kpY;M=eJ=Z3Vqc%qF
z6mp(B1)?@Kab-rJ;SBpDm-GFR8<)w5Kt)qDoXJesl*x#|oEUAwOQ>iHzYeXw9+)8m
z9&xSSHzpud&~VmMgf5IqkUIsEGLxzI%Me%r!Rblcmr(|~5>(k{C*ap1qBcguS+DjU
zaiuK%I{ZBXLVy2a6zJM?6`@@MkGSyb@J9xQwyDr=!jHQ*fR5W{C7@f^*$LQO$77h>
z1404aQC!2~xjRmURuewn6DhgZ)iaVZlWR$t!6R<ZHah{~yc@iGCJfJqDVVH+ULTx*
xfDVpbdg0lYfY7)JJmLZe^`1ZfEnl$U8+&r5_oHdc{tN&B002ovPDHLkV1iFOza#(v

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/telecoms.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/telecoms.png
index e1e721de4aa9cd7323f42a4af0fecba84c81aef7..5896206cafefba4d8cbe90cd1f0b1bb664569c9d 100644
GIT binary patch
delta 406
zcmV;H0crly1Fr*+BYyw^b5ch_0Itp)=>Px$X-PyuR9J=WmoZMmFcgM=5GSAmQW)R>
zc&SV|OQswmYe&`|!c)!yL|x1QU}&Ta<qBnp9&#Pqd9EE)3H~K|vY-FY&(2c<{B>P~
z2G=DHxs0A0x0e@SUE*+e3)~dx=6wfz?%WVg05X4iNH-_FynnkPE`13(cFtMP3-DXI
zicJtzJ2^)yIS+uSTGry+c~Jo7qM<5iC83pML$CmB^U%UH&V`r+C`9cvcU8eQ)=Huf
zH9EaH9e|R3Af{Z#A#)bM6bLESI2s@XLUD{S>EuR4MpT7Z<75ESoYS0U0iYv@>3mrM
zQq8jfr0To@3V%^URPE0tqqq<?fbk`?pLV`W!9K89mPcnyv8dY7Ye+I<JKv@3m(Yy&
z+vccZvjBwD=?%1!SS(BLoZu1A4uD~26z{hU3xIM%^Sxiit4HAen&rdN#~1MWHvTI1
zR-o?&fRr{%(n_N5++*kYV`4(2+Yj>nn*Hk=M$F60s}I)$!~g&Q07*qoM6N<$g7eq8
A%K!iX

delta 441
zcmV;q0Y?6>1JVPKBYy#zNkl<Zc%1E4F>ZrE5S&C&UXaqYB^O9*`3;uL2S5}QRCz!O
z<QE_cKfsj>7YKjAk@AL!l_(-nQ|1L}oFd*6U<dB7QHpq)JC4=OXm^<fxZ%I!t}9@*
zP7aq4ygYlY9IY=`>*VnE@df6*7derI`Q))x#6#C5%sJB7?|&u04Y!z2X00*zy>7lD
zIy2D3>-#4*yZzaBfn#Gadm2uFkpET^H{1d+6QM1jN`5X2fny_$ePa>Y0-EH_EC{iP
zSj_YqSGx&`EC4`Ol#1L9w?|?ijeTTAS&P+yb_S;7QEiP9RzjkLvGnL9=Bfgurm`+Q
zLX>dLCz>%jFn{uaDB;>ObAFQUW=t21K11dl@JQ92$O3Z?_h{8=?5mhT1W1PyS(uJT
z*zERdpA{wCaBFPa#!e_AWI!?JYTsvO7z^l2bddn5`4G?&aLG8nih$~6()rCslrz(Q
z(Ds4Au>t%vUEtV?NJ!<3$Qs6q1w@vbgjrE4(rP9EXfk_&krk^6SG`>J%~cbf0*I{M
jUx7|3{`|N6h8w;C$9BhYDO7v+00000NkvXXu0mjf@*2&$

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/toxins.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/toxins.png
index 6c28bfde0033b911a4a60d8c897cef911abd6c47..cf11ed6155f27279e02623f7c3f3879089a18a8e 100644
GIT binary patch
delta 516
zcmV+f0{i`_1DynrBYyw^b5ch_0Itp)=>Px$*GWV{R9J=WS20V&Kp1_BL#5C*i-=H%
z4nluG$dbK3pp#QGXS-k0Epsw;>JM;kD1`igK!*+%L|keDqFWvGi<jdrxik?4eNfWg
z_3pj9_wG9a{B@j^b=t<{&=yg+zmsw)1=z;q&_C~^*Y7nZ&wtVk>1!$#Ar(O6*H;&f
z$qDxlPf`)5ssUvyw`>bu>=fF(*nwqR$}y_>lmg1gXY(;!(=W8UrjOZtTq>d!0Wxw?
z#J36npj>6$)dRrUF#=}uF~ES)bf33vmqzW?*A~DBPqc#X^I}J7lL##f_|yk1!75xA
zNa?u>*9cgWw}0taQYnB^AFu?j=_3jw0LWKJ<n%iVBe<rIfF)X|qEY~DH4*b5QrUKs
zkg8l96~YDE;C6n4?a~17u}h=r9t*aqJ(sc+4=;xpbUUSk`QTNB?)l{nyT_e=DXxO(
zy;z!cp)G(2_!A*!fKR@zpjsC2lLjm)1d~n+L9|3=L4BhP)IsYRXbYtRyx7S<z?c7`
z&-|1BKmYwG0b<CgD5;8ztT4HzUn-)J1vI(t#nZX~B0shU)D{r11YYdqH=axo|J1>c
zA4BD3l%*L4-A<$JCAg-KEX|~Szw^a}7txsg6RKCUf4l>P;QUXv+9CJ=0000<MNUMn
GLSTaVy!2lH

delta 399
zcmV;A0dW4E1gHa$BYy#JNkl<Zc%1E)F;2rU6o!9L7j~oysY5Q1$cTY6v{ICGWc0)V
zH~``RJwPXq9jho(dkWMjxj=`E-8+^6o@Go(V#gK(`4{KKmjBOwFLr=Y|6NyI16J$J
zWr)Gc^HZxwYv*dcx!i8gsEX3cJY*40%bQk+N!KJ*Q6kQ`6@NgU2;40nTgO~m&HSa~
z>wB+v&H(a6d^1v0Lw&*9gFk>c<I+e?O`ZsZENTRG3eY4nr<Lc4Fsd2j6of4LVM3|U
zcfvV9oN-h|DIrLD><vJd4gq*BLfYcl{Y)BC+yvzufK(r9X-=^U<qd#p0DxRIwFKoA
zK$i|-b8H&}(0?wdE3OZ<^_|gq8T|&KDoCdYU{?J`0Jh(_Gk_u2u@eA&vXDjcM68Mu
zbH2b{>|_k|hwfd3bH0!*nG(ca>;OQ<G}b8qiK<^+v3e?2MJa*$sCNn`=@fDLxvgr&
t)3e?>0~m7Cg)G9UW6YobmX8|s0TS=0(+1jEN&o-=00>D%PDHLkV1k_dv}6DP

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/toxins2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/toxins2.png
deleted file mode 100644
index c2c35212d0b5bce15bd13d83f7fac3f65358fb13..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 433
zcmV;i0Z#sjP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004aNkl<Zc%1E)
zKW>9C7{y<!EZr+rl^AjX5K)JoA(0}Iu_IFt&;wLGKn{?}W5y~%f>Tsj_60h4%-%7b
zK4T(^|A5+|yah0p-w*rQAHbylt}9!I-TrVMV({|()a%jva<@O6Z{NQlxd<|k(*&pO
zO)tdEHi+Z`>th}SP-G1E+sEEMR)DTS`{WDj4Dk8-0m%j8G(oh8006310ML3aGKM%!
zFn@b+8u!{2fN~HmBB)wvb23)7(jY#WaR%s`TFFJHna?tKWng{GTNxlDY6}UhcL=)-
zLU#$^u>?QKoDtg&84ZApDDm_hG7~`nmsuDh?+gIVmjlfiP-N`)W`IQILlnFOk_&wp
z4XGDFOF$6%eiOb8odCuPTrj|pay$ya<zR7|=*lR$z%pN<Vx_K>6)T;gokO_HSNck(
zBvmU7V^+yg0ZcOhs94!*H_Nq;oR?s>xzlN%qxspOd$Y}FS6Bhev))&6n&4#V^XI?i
blO}xwSDT$DhFH7M00000NkvXXu0mjfS!KEb

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/vault.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/vault.png
new file mode 100644
index 0000000000000000000000000000000000000000..33572ca25b572fe3f99f904a89906766308ad606
GIT binary patch
literal 458
zcmV;*0X6=KP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$gh@m}R9J=WmqAX0Koo|5jcE*xgmj}TU9j)~-S!6M2!vfZ14rl?%8v91cmuW`
zzy%9k*$p8j65^(Ad<KUZcrcJ?^iLYn%<%s2F>f9N@Yi+LHfSu@r?HI6#|NpG62Mrl
zPsZXJmsggyc~#^nvx5{u3P9%O&23{W@Lg<HIosU!VgSJL^+gJCp}J9)Ihj+?Hl>l%
zh*xHZ#=P^+NCV9|^Vk4WnFB3LP#3Ma_*iA?W6lQP2Ic^YV%NY_8U#R@4#`*>AdMV^
ziG{#-5hj*4L~j791uD$GMW+ow8Hb7W?Z0Z?=m54CW3$S!-R+gVftG0!0D`DrW#-%6
zo)wGT2e^;4ZqBKX(HjvrbJFi<MBJ@5WJ|UJh#fERU8IqNz;~tNVx6Rs^Yt49Ad0pf
z_e9jTTLu9D<Me+m0NvKx3&8f`))NlBjOtylYt2O|PsNM7d(7r0J5ZP2-;T(hpZKTZ
zs>m^$o1?6`?Zv1HdEx%d50g5Cw)>}4pJxC10LxCfy$yt^^8f$<07*qoM6N<$f|7RA
A(f|Me

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/virology.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/virology.png
index b83297d037c3c92d58d919e5fd167280daea92c2..232d9a74b553fcb8edbb9d42a46a2940b721df4e 100644
GIT binary patch
delta 494
zcmV<K0TKSx1BV2VBYyw^b5ch_0Itp)=>Px$!AV3xR9J=WSG#S)Fc7^2nLw5c0V&)h
zDhy-+t-w+PsPG1!LmQ;<04lkH7YN{jNs}Ugi#S}tDU>tG(@{FfDgq=A5cHwQ_wFkS
z;IHGRZ*ZkH=eda9^)t&A6|hp9bDG^lk|bA?TWjHT{9r|}0)LQvoj+VnjyRY%R>W;=
zg2eJt6|mdpP^x0^-Pn3j0TdjO%1^<W3X?!AK%2BfRMjRp`@*zIMeE*41vGjOjcz?r
z)h4hIukm>+$V66}C;)*ZXknxGfe`AAA&5iZlTh+f6;P_8;~5DCJy5FR5>q7ftsXOP
zk^n!`Rqm|AihpQxBP3|O;N~?tzW!hc(B0akz465`0JM4H&+EgW2Qd3-Ru6?CHgB{5
z3R(q@Y(J?AMhkF#z&*p<2>Zay0x+v-_oIZqha}Y^?gLzV#hRzJ&$aCs#2(<<D-yNB
z+?Y$i83k~VW_lk)A)v0_ZS%|F-(w#bvricPEdby@!)H}(g0AV`&n|!i?F~}QCO~TO
zBmuO+#L5q$O)B<CbXWYieu8YdkmwWP`1u8|hnLQ-I9i6*TF91*(Hjg7Rc*jp%Z~ld
k9}{21)$Bir{hIyb8%yv9<$RJ$cK`qY07*qoM6N<$f?YM}I{*Lx

delta 443
zcmV;s0Yv_X1k?kNBYy##Nkl<Zc%1E4v2MaJ5Phw>c3@)c4_LB1WwJ6LA$|dYl(88R
z{SFW#jFF1?g)R(HCZ;Hoe}IvRy$c=StSF5VpNZ6=yd}mt-MxFhJOe!N-|^HIu-NP_
z_Z0YeA2-%$e7V@{E}w5-$W7r@TnUNkanwlSr7cNr3Zy#mB7YEO5vH%B#+YZX%(vv#
zb$QPfYywn72?+q0otH>;VxL^J9zhjUEH?#0+&V{Oi-%dnBI2w-S>D_fRskg>l#mFs
z$V&xh0@Qh!MNmQ_HwEIs1i2{?^o8A{n9d0Rz^XU5Yb7Ms`>j=?9K%t8Jp+WGFA(&_
zuYH;iR}#(yNPqe^ta@`myJlq&upR08@0|vd`xST{0S#PrkJ~-qX+*2u97;%}Izg%v
zTYPq2a?|k%ki4V-5dyB~&$VOkyMTyP&zoyRPBY+h$#hEKp6j?10+cKsOsxCS4A8o4
z&+GlRdm{pX!^zlnJec5cGPT7ya3)aKebo!<?uO0?j5NQ880+En2boRTbeIO@On~gw
l2TDlb*c|icf6E_u;0Kd*yDvdLp}GJ7002ovPDHLkV1nW_&Wr#6

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/xenoarch.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenoarch.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4b26daa993151d6db2b6ded084f32cf760e66ac
GIT binary patch
literal 449
zcmV;y0Y3hTP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$dr3q=R9J=Wm%mQKFc8K+5JOR=rd<$1DtjIv^5VUZk<8ipB-t{jkHMZL$^&$#
z5<)CsO9-~IaFLbTjsFcG_!jGA$M?I-ot*%GT^Hvj`D$~F<*0pq(E2h0@YUv+Tqjs0
zi(uzcNQe)ih0p?!^ZUD-$;}yO=-O^_-Q&}X7UI(MfKB9#GvrkY#@Xar(|$$(8|77s
zGHZ}msrMe<0OP1_vJe%3q6ZL^1up<ov_4tz0#KtT`DP)g2xI8?0Wi)`W)14T7;FHj
z`vPUwIM;y_03AGITXkxCFnIywRf^qqKSWD56=mHQgB=}!qUzdifY@#KT3cNo4M1%@
za$*`?TGG1<bmxGNu3Q{a<=d{03gEJ-i>v^s-KfYY6Jwho$M!i{)qw8aS8erH)Q!Oa
z08ZXNwOy#J0b<>L-T*G5Y}s^;@vC@!yT)=piw5=f{)xl$;pD5>*acEZEax+)-Z!bt
r8b~3vb3gOPM1=_U{w>q5*}uL31);w6U&E9Z00000NkvXXu0mjf{$tIP

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png
index 0d9336c01a19f7967bb4e2b70feb77d2b778b4ee..4f99ab19c3da09dae0f756c6b902996445ea472b 100644
GIT binary patch
delta 465
zcmV;?0WSXG1nL8jBYyw^b5ch_0Itp)=>Px$q)9|UR9J=Wmp@CxKp4g!#i3GYn?*#Z
zLk6KAAOuP}_XA{dO6P3(B-uKrQzt)wb4#K00~9(qSP*fE7m&KuK`&gcm-1dNsGtvo
zgnKXd{O)}(e-8NTIyn~ftl_>cqj`F-^eP4Ltl_?W-bSn4GJiJDSO&IZN(dzYH^08R
zFgE9Ue0otroR!@m&ippM!NBWlo6hD7OruRc9^0{lKBWMn23{YNXsrzp#C=S$Iojux
zGSF<k&^D*uM*^5e8`ypd00`n<-fsJ8e#o-@G*7=V0DyxvVEZW^?yUTfL8xnn44^U>
zC4%Uv5&$>XHGiuOKn5{^sayj2S}qAyr1yZR&-Z~<ScE1Z+8GGq-p?&U$}Dvuv;e5-
z)hUB^395V(Y6YlU<fkBX60L!k&XUxRl!5VTR5-hyi}7kyXy?~r-1Xdg0AvMm522G3
zvJyH;4#DH%m(vJ<4=x&tGd2;q1mX-i)VBf1nnde^x=O3!lt;Gouef{JMW@-Q!l%^h
z+dH<;Tl!yd#xiu8jaq6QItenCDPzBLV<JKryML){Yxb`XH?PDZ6ly`z00000NkvXX
Hu0mjf5@*&O

delta 585
zcmV-P0=E6?1K|XaBYy%YNkl<Zc%1E5yK3V=6g>&sxCjImC#BK_Je?5%H?cZ@fl?XV
zD?ea=K+qT1{X!}mcB>Ry#o1;dHtH-$XO)Qv1QJMjx4PQ#Xht)N6Sl~n#*8$+=iJw5
zF7Vm0V|vl)4d}f{e*gSt<oRME_l{5S_3&tG^2hr%0FX&UNq+#7A03~RHph_<02ob{
zMnc}hn9VbM{{f?jU7Zn~=d$5;tLaRhq<Li|wJER}27rFI0U<;Y4O!G|o&f-oG`HH;
zMxcs(HqX#%zCZ|3B4#9M?nG`Cp!3|-uq&()P!UId;XUVA6=tfD+5+Ti=e)Y?4+GCx
zgtZ7|5n<qMyno|0dtb+MhI0z~-3C^xRq1&cc!(n(?N+l8B&TL;0sU?R{cZyQaC!4;
z-1io8Cjm@)dGlIyg)S0|x?SRw0-2m^LMNi?h~7$oYMi5@iulkXbP=I;i3^;*1uD2G
zRk)lLDr%pEz+dl$5ZY7m!v(MiPRU!zwdnK)bbfI~M1MrX@nYkbA+Lwy1r5gwnqIGo
zh-iAf-dGb6onKs$>56Bq0XeT~o6Y7K;>gEnvP2ko7)_RlBOghc7i$}gDUgjZ;>h3l
zL|28K#o1cZD4^YH79wO(u7^#M=0#+xU`#<6cqI?3E~V@-r;PX7TC;RZ?eqrJK0U+U
z{z2s*>q6l9=>f^FsdhflM&R*&jlKN??Uk%9Mw2Da23lx`h4&szvb$U3bo9?hv;X)5
XTzo~p<ItxB00000NkvXXu0mjfD}xw2

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio2.png
deleted file mode 100644
index 3e8515dda03e687731c1b8a8b0432942dc7f1a23..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 569
zcmV-90>=G`P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800062Nkl<Zc%1E5
zJ!`^17=BU;;!qG;?WmhzwjhE_b@Lb4NpR0U$S=r0$X;-&zo46TDU{%*&`n1xLZO2=
zr9*tLZ<4!wn3N9f10i?G-968}ANK+Lb!e&|-ND!^isa?#LCJHeBCj_)xV~-VCf{$@
z0N|-aL<A6dquI$#4ggn`8Wp7?E@YjGn0eaqq%KH;ZMFk-%W-2`E8U-601+>jOX>HZ
z5DkELdeo4*Ac<Vp^}s`df|f~_M5zRX$-_{KC_uodR}PRLk4I7GuHYi5Pay*MzyMGx
zm15hIP)&;uK0@jsB-4`^S)GgZyaHq3Cz09$Jo-6!J(!-9hVe+W0FQhk;6&kX-)<<#
z1(W$flyzMfiw(~L%W(si;C*rn06alJgp>I}xP!>ZQt`|3SpxiYA`z71mg5StQLlU!
zIgoKL@CiJGH<-!%0L+OzUGNdkNJA9?iOP16QVO6ooxkY;G*<Ruv~FOVZ5XZUsa}n=
zks;9q)7eIp!#<wQHn7b$EXT#LUx($mu+26WtDUGPL1_U#7$H0({!b>HTO_jpqg53m
zxTv&|zF6&qW#XW8!LVPC%us&v@j){tmr+~pLKz}^W_K|5jJtb&n$3;Rk9RDdAEoyL
zsRj1iHLfbP%%>X}EXSq0ffUkHL(vzL&D*Q;cJ%94vwwU6G}j0Z3SOnJ00000NkvXX
Hu0mjff|UYh

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/xenolab.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenolab.png
deleted file mode 100644
index 21eb486835b9418e35103b15dcfbe06efc4a22b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 408
zcmV;J0cZY+P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004BNkl<Zc%1E)
zKW>9C6vn?+S-N+rlpz-YQDx{EKtd#AM^8OK4}f}r93T^8#tI=Nr>KJP1v)Th@0bpe
zE$0u$@5OD0@+~&c#@`S7*#;Q&-*wa1VX<88uQ7OidA5338yCyf{{H<7vTj)BK@?&)
zzq3M&`Ua78gR~SZfGR8SFn_Z4=>@P2Zi)+e>%+V&_9Fl`BMt;>27HPHP-O*zC`1s2
zXKgA@odt3dPTr=6N)Ej}gDBK-nbEc^dkHkiNu4SZKw1iX<{zEyRaTI<BY6pA-2nM<
z%m(EZKqcYn(QM`dbrx7TaLM3TPQtVl`fE)?Rp;Cr<Q%wU-1Y1YfP2n+1Gwfo_5z>=
zi$#J>vDP~w775yI3t2a3G1tS%ISEbk@#7c(w0SHN4WVMLat7EGYi-nSTL91?=B!ZV
zyaXx_(%GS$V0!dy##HGAfOEx~@9ui~{P}PBph4gKfS9#W%prRK0000<MNUMnLSTYX
C*ROT}

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/zomlab.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/zomlab.png
index 09d54e603dc3fd202cf25852de243e422c49f007..a81784d30b5f8f1d304cd4d8faa434832ef2fa8f 100644
GIT binary patch
delta 565
zcmV-50?Pg4FTMwmBNYLLX+uL$Nkc;*aB^>EX>4Tx04R~OkOy}Ge_^C9a{vGV^GQTO
zR9J=Wm%nO*P!z_$mJTTa6PHp7>EM<J2!UYcJU|{G&e?pDY|i=sK0xP4KzsnV3=Ndh
z#VV9^ONZo`qq*ueIuzOuf^hDi?|09+-dusduA8z(U7a1;GV-Dqp;sY*uFej<`yP~@
z(%3wS6U6&i2q6R@fAi<3hsNfl*S8NL#9h&Vs+C)TaS>aN?85#^PeHtoFXDv&RmP4P
zrm@9p2*(W5wla`L09IhYF+*tc2!IN09$~6au=X|p)D+4J3~7kly5?M4SIs;DK$}OI
zY_tNvC)4H;wyt{00#2*Xw&hFG2!K|;_BL3ohM4LT0NK?Oe++Qk4;-p70BP$UYkb}V
zNS_?aF~bx}CJWM=kf)x~d^A755foc{n~Tg`4X_;97aNdjOkjYTi2>*GO!bBU9D>Bn
z`KA+Psp@r<E&-p2!|)Q+HLnFw1jB)-_Oj+z0~7&Sfq|_XmUqrc`ZbgVsk8dl0SKaw
zS_h~rsiT;Fe*iGn$FKqeV||>q=lk<<)bDD5<;c#Ym1<0<Ufwi6miM~~fF>@hEuH!K
zziUyfHh|3K!uNbQW(eQ&Gx1h4z^`JWmF3N8TvY}NZ^eVh0s7sJ44;%fzrL}1-^t&K
zlQ==Y+mXInm1#M$k;I9x?RS2daEQk4Cl!5~{p$x)6WuE0;-PVY00000NkvXXu0mjf
D?Hmoa

literal 6115
zcmeHKdpwi<`=3ZPDix(tW<n0LgV}7E^D)N4<5Uj!wtEb-*~VCuQ!5IoDDp_CP>)jN
zaR{BH<kW!*MU;-zQ&I8gdr#-r@B2@$*YEpZ+w0!$`}$nh`?{|8b$vef=aWKnv7ZlL
z0f)h0^Bo;*+@ODi^qMOV{R+h5w=mcoXR(L3&<zkFcziC49R?zVF+30fMzdKkSoFPq
zFP}XII*L;x%4Sv?8gf^Fv{&<EV~-Vx4-sz~ZJ9n*S6JtvoR*BM8fXsK>M}9MEcX4A
z#Nbp?v+SYW)<<V)teSN1K52g8qn|oCVDJOb=NF(PQ5D_K(9M5?9-6LgYEW_DSJOg9
zc7A-1+%EX{ZDnU^P8)LXWDU)18T}r5s>b4OFPZKlZrny5KNk?SXT0aGt3w8>(Nw>_
zXSVo2@Tn2m#_Pvq!UFi45XtZKD<#=sjS25IDK7ZX;@aaXvAyX$U)@D)@ksAO#+7~}
z--LGEso~-1b6ZVD>rKxM9A91Aqjp2LYv}LnHiF1B=0SsC9N&{)v2!tU)2a@t-`Ue^
zt{<lXWqXs@uW7Nfou1U<%H=5YJ)YRF(<^^`MyJU*?p6OX^MAc39<Ov(#H;Db724Iy
zFVP1>n%ZQIH*ML&f80LL;q2_qfwlJ@?!Om{uddVz9$oEzm4R(^c-7V#H?dIQyEb}j
z@$r*^%Q8tTS*rZ;ootIs9XCr)tHsvjn@jX%EwSj0JD4VCN43h{Z`2-`jb{`NG%z|t
z&6maREbtB76@-A@GToUmO+&t0o$d@PX%arPP?;OO=ox0uEP)&$#o2hea0^vSLvh_M
z%^aC|gDvnd+_HF;#CY=+i%mR|wRSitXRYyBKdf4KN!8fb&EVRKyi~hCsJT^ZTr?b0
z9o^THvYc}=@mg0-kRIhZCA24IDNOre4)0r^6<YEz<b<z#TNS?Z*fwnxfm8a(lN>qP
zqE3l=Svuk`Q7^bL*V;~ve50kvnZ`MN5V*F>Jt#LOTR%kS1iFVvd!rLlx%+gA*mizV
z*?z71BTKN?VX8F)34gDUL*SRQ?Elf&tr2u!RgRL16~;~R%;<b9LRF%ZGoAQnQCf+{
zL<Uc=Vl}Vm5OPGZmW!N7?X@q7Y!z`d&K7m%i7|x>$L#g?rK;5JubaHRbL{@7R)yO#
z9!?<<$z`vbV8K|c6IB=bFWTB_kJYrBu^9W(P4$X;t~wZ6)?Jr$U3)*CBP4WCn&k?R
z!s~82;-q<IHKmb-<!f%-sNKIvtYmJhqt_hFNiUU6c?0`<xo4%~vr{=r)U6HAMCSN`
zTN#N_z5|j>>e#L)UYfg|kB!`1ck_kg2Bmmw1*@KV`@r{0X$aTBy^{vGXP7$YxmuFW
z>z7itJ)`*~9(Qo=%UG_rp8DwOnL~kTO@GDx^|*fBoj%6wiE7&8uFV#Gv_pR=*~G=f
za9-3}7sJiz>r~EqR^)AVebCb@aQb+8JjAKUEtB@<fELlDt^(<$7`x#{vDU!t?cIeg
zwUn}Wv*4(fl2f4ixbrSLLDJjgpLu_G%n^syMRjInBg#QG7w>0UrR&(wdkfbLh`Z=o
z-jLQhvW35Fb?or5l>1SyVZle2pQ`4Y&9}kHnch_@tR*YQzZuMnP?!kwdoBAs8#CU%
zGO(ws>bC9<&1Kx?T#S{aO38>M&~LMm&S6ResWaJyw3%h|q3whAu6s@HqjJ`E2ixe_
zSEo;9-|I><I1O`U!ggOS^6{9O4T4Nf1=Wf~-}R&C&E3GpJIXPGUE&(1$x!pECA)SP
ztqs{|Q<3BII$pUj+xDnJq!X$YOEO$7e~adEOKbI&{i2un%haLMj%!<Ox^Q_|AMO1O
z$>q8k#kTzJe6NV!Yy0YtI9^Y(JU=h$uFCb<Y%*WFTaB^6KZS$68eB28pyrA};++fE
zf{{w<MJpd3iCK5kH~w(?&c^pHGD%tR)I>wR!8?hw$5p^Xt0|}i8GX9o@r0e|Iza<f
z_K2%f#QgAt_{i65%Yjf*6?OXFQSGq5@*{Fq>b0#&)MuSo)bAYIZdglL5U0-Ri)(l@
zK^$!;!Ew2LaiwEz$e{-L@pCV0G7^qd61y|pGMAQEU$*$9phq-qQC-?>8RfSl(fdqi
z3;BG9kNyhByyu?ThpW^>)nFqsYp{-y<@vDf59+|FRJ6!cvOk8tk<ssDJDECqq~%2%
z!FGZ_-_57r$!4sz6<*!uo%Uix(s!_eZ=I}vZ8*J2{~eD4K2J}J?}k%YuTrw%Bman|
z#<p}{s=v|tj)D1yFrMsIskf*4R>ILGPx)SD8+Ze%ZSG6u7U2=4cl!P9)CSjTWSAWH
z4_$O8X>)_K<=L_v&Vuezlj;-Vxmxz|@GT`6?ZCrS&vJ7It3w~3Y;WL;vZhzT4~GMH
zV-F9eZ5v&GF~rDV-Fesr`Gxz?Y6jFcg$KYM-978_Nt(GGiHeO+L!REhl4<2`R;E(G
zX>XG0dUhcdemBohv|;e*yEO|{;@dt<og@}{z@tazWo>Cbd!V{qet{(G=yK)Q6y7?|
z7BbLuhP^pky;Wy%yZ`onSlTjEaZ=EqVcm-^&dL+TcWlh{(K#5|;@ApT2p=xmDBKEM
zI46Vt*iUH6UA}2T-}Ei4^53L^*HL}e`rH2QZD`*Yb>v@)PS>Yat0gaYO|FF7k&bLX
z{?ZEulaa8kt!a+d)?eSN(AzXGE|cPLk*2)O^=62z{(>l_h!)zP20K#8>s59J9<EgJ
zjl{$}&FC!FaEyph-lVW#+Q4(wro6~Vo{HRgbtQWp9ouEPuN#Uxk<AJj6A||*+b2e4
zlf^lutUyJYajU~+2Axoiln+>Bp%Z(+F5{9jCDXs9=}g0D>E36C*Ur>WPM`4C;^LZg
z7I)zKPwnVQIYvPJ`Nk~bK-QXV@AIN>6(}q==lex{NE37c2|<!H=a6(0XM?4^-r)>S
zoX11QhdT;G_Mw@6o+jJ~&(=S>>vgsQYfqw%)wqPtjW9qatg&e+q055aJ8qO`(vh|!
z*oB`8hFteJY4^yhk{)kJfM0!`^y&QA-P~;{5ky^OS+alFBtv!X=&ZC{&Q|r_s3Eym
z=CWSCtpTO7Mu&=fe0_)KKIxS=EZ>-0KWEb@OxCrQ>5x8rOiLNwG`T#^eZiB)*|lE%
zHO3tgA7RX3PbXs2c@2zP@eAV&k*KQU<%9gkQ(IuJY5W}KiLx?i2c*h|b~@fvXEKA!
zF$9=gI%pWp;Xykg7|hf>ng=jKK_P+;2C>5_$g#RcB!bPPAia#K7%I;i3}!os`JlVl
z#e*RZWssOib2GSUG#LWmfI<Kf%?S$^kfSNc8C)`SFBPMah#3`OC<W<Fr6H`jd=P;*
z#2aEzw$bb;9MTMqFy%8@WH%eTFA&fZ1sN<9^2lhkNF*{885wf<L1-+AL_%Y5XdDg&
zX`lo#;X)u96)w<}LVU)s0R;>`n<r#*!x2(UfX<B+Qjkb!9Pu?i4v$Lx1|Kf?!UDtx
zIvU`iv4$8lhlBpnLLjt_f<V3m^j|Fm9?*sn?FI_Ck$eVd8wG|7HGhO)GQQdKBKcu6
z=`a~+Fbw2CsshL>_9vJ2j#Sz=3n>LbYz}Y63L^U_O(C20ovfc?la9=!^J5^8`8V93
zw7=#)qYP<Lsbm{2BT^ckqYVWq^-pGU8Ehtb<`!gu1PmU_L=iwbfWqS#Mko_3))+-1
zvalGO5ylvUVf+B)7%mV3;S5j;1%Vr~Ashf;(1`#9VMH`0qVPmI2?dxiKomeEVTg1L
z15Y4ee}Hi1v!Sj8!hVcO3dMw=@Hh;e&N9ZL7<e23g(t9#Q6_jg7G-2az?cy6M2ry*
zn1Nz4$aY*l2Y|}S<^Vw;nin24Gax0LY)NyZAaRD6?-E)VAY?%X&>UcgGr1zc_aP59
z2Xq$#Qa-T+JPC)z7!!ylL>v)E_^#v$@&!;YN>Q;GL!-~g(!!9TbRcR0X{SN}GZs)b
zWNSVM2)TR@E;o#Vlm>;6TFx{$!t`@l9M}R#BSzZuU%K8MjQITYc@l)NXNC}nnZ_jp
zjL%L4KorQFaRk|Y9%2Lo;XxoY!@soDS2_E?l#7W0j7i3LI*I{8b;jfAP{m0`SQOoa
z#lnF`MgRcC`IBP-mn9Sde9$ro$`r~5YN45I5Np4Xsr$3OC>WG7g@NWb29LrRd*E<n
z433N^BGF%xMN8-O*KAGE|A!CL8HFDf0m$yN3|d^EwF>=hvHHT7l*0ev=L;SGLk|%2
zZzsRR?{B(()AdUX{F3tT?)pvFFEQ{-%D=no|BWvA_u~#24()(M&|&6}zUlzzAS6$B
zvbTYKl70)$9oq{@=J6bS1TdJw66qxa%gs}TgmZ+BRNFa^<>Y70Lfcs)vZ3=X-O<L<
z!~5b(PfB<aMtRz;LU_`{_MhDf@fNGZ5}Q<q=5%L@#lm=Tyc%K&qggxkRz7mppaS#N
zV%^RA9iF}|Nn2ZSe(hh^4l1f{HLq8XH=Ew9Xvpz4@ERe&&>gNx&2mdyZ+{qlxx}<}
zWkOxU_Mxe>*~x;ZO8JitgcsV$odpsHrz)a4+NuOi*f>CaOj*RNlL>tLv2#^IT)n=9
z-vfOM(8?4)$xJWh&&o<^3B7mxd2*(#dFe?$U9MFwI$QtQ@qPPGMq1UuhsV~#hHd=(
zy)`YCx1Xtpop3WSA1hYOQp~vRre?q7RQ&mzevy5_i@938?6_c|<ef`!VMCQHC;n5n
z!5zuf$a$5^uXOVVD$NEoW4u0oGRd_lE_|}fAP@%2gioG<9$-N-vK{={^?iB5poFN!
z*I+gh<-IHasXyf}d1Q*%cJuB;obU6p9^}AB{~<kI+`=mlrZ?WVR}U!kD!#DUU1JC;
O0L;<W#iraUF!4V(td_t4

diff --git a/Resources/Textures/Template/signs.png b/Resources/Textures/Template/signs.png
new file mode 100644
index 0000000000000000000000000000000000000000..4dc483183b2dd18052c195683fbb9f0cca5c907c
GIT binary patch
literal 1013
zcmV<R0}A|!P)<h;3K|Lk000e1NJLTq002e+001Be1^@s6uY(T500001b5ch_0Itp)
z=>Px&uSrBfRA_<iSxswGK@>e|m4479{YZmVNLLoR=pv+r6hE>ns0a#i(?wmliglr@
zmUeCaKpR06EQpH~TnGwoY!#tkLj;A0y98Hls3_gJaNP7hZ*FGhy)>m$um{4+eRtl>
zn=^Orc{2kzMq#z0lv1j&T2Zr08;U?S`IS<E{C>9SN<XsOToaQ?$1#^LB9~2~RIUL)
zolSlYo8QmYA(u^hbrP(^q$a0T@Gjc1{$}}@?Zu?MvQ`aTH+4+bC-0Fh+gn+ydTnOX
zaR3%#Qj^mvK0J=T*ihgXG+}$Q0szWHjvOr+L4MFhlwWz?9<@Ue2pEVVQig`d1HG6Z
zx+4Sh*GLWrj~E(F0Cgj7^K<ZMut5%j_9au3(<*WCCht(o*!j7I()&Wgl$u@I*thAr
zpE&ON1#;P>_mlU7Uiq`Kp2SELxoi@Nk!W3cZtJejiJ|cK%L^Q`^D<{}kSbB`pz_?-
z!8tKOAXTRs5>55_<(xxDjBey@5wRD{<%_<G=bRWhw}YyPU!6hg<9=T5NR<q59x;BZ
zL4K)1&8U{`O8==nf^%a0RD=9dy;@Dc1WN2urJNI^gYL^#j_6)NiJXX~`X$lMiQ%90
z1U`bLaxKtzhYfPtaFye$`@pN~gFvZVL#bRd$}v|L9i*Dbh~W2hAm7SbwNAp1RLKD6
z5yL~<wEe(s`CMWoicC80jW~}miU7X)Hq|HLJjY0I1>*NOc;}?5(eq^M605Ea3Fi@`
z`!dyahJ%m1i8R~uGN)V~T?YVMI6txbta2YQeD@6SCq)PT3`K)!D?&z;3C<%%2i=aH
zUs;)>xJt=#+z$Y+Kc{xD|8(HLSEY9^7eRa5-H`!rnmLacQWZe28d7zD#vT7wmIs%v
z&D7acmvds|xsMEedF~|T-3GplD3xnklD|9}LpTKV_4FVXjbi@sa})~;?uh{!Rl@cq
z+svjFPq6%GB$JMNZLPLlL1%jm?QId9`W?bNfKP*qW@5HCE8d)I6?6F_oh=#t@*GJ{
z8xuLU4K3-T12umC{<&9(p8;Znz)&v$T*Zyfhk9am6QlxwnFm|u9tXtsW(C!6AGN2E
z&FruNjjBSUugg1f`;yjW9M5)cqyN`g^q%O&=|6pV3ShnKu3nW02XREZ->Rfr5Zdrz
zVFBTeFhb!FB3<psZ`{K2y{~p+4g#*_`p2Cy3<8J%=m#*RirC6NIULE?CEiW|CkKFz
j9v~d+#uR`T*T3U01$#8khX(LK00000NkvXXu0mjf&HCNv

literal 0
HcmV?d00001


From 5085b854d18128bc0518222c782efae339ab1566 Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Tue, 30 Jul 2024 15:55:21 +0200
Subject: [PATCH 131/366] add more logic gates prototypes for mapping (#30385)

* Add more logic gates types for mapping

* i forgor

* me stupid

* nuh
---
 .../Prototypes/Entities/Structures/gates.yml  | 68 ++++++++++++++++++-
 .../Construction/Graphs/tools/logic_gate.yml  |  2 +-
 2 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Structures/gates.yml b/Resources/Prototypes/Entities/Structures/gates.yml
index 22ab745a1ee..6b02840ba0b 100644
--- a/Resources/Prototypes/Entities/Structures/gates.yml
+++ b/Resources/Prototypes/Entities/Structures/gates.yml
@@ -15,9 +15,10 @@
 
 - type: entity
   parent: BaseLogicItem
-  id: LogicGate
+  id: LogicGateOr
   name: logic gate
   description: A logic gate with two inputs and one output. Technicians can change its mode of operation using a screwdriver.
+  suffix: Or
   components:
   - type: Sprite
     layers:
@@ -51,6 +52,71 @@
           Nand: { state: nand }
           Xnor: { state: xnor }
 
+- type: entity
+  parent: LogicGateOr
+  id: LogicGateAnd
+  suffix: And
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+    - state: and
+      map: [ "enum.LogicGateLayers.Gate" ]
+  - type: LogicGate
+    gate: And
+
+- type: entity
+  parent: LogicGateOr
+  id: LogicGateXor
+  suffix: Xor
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+    - state: xor
+      map: [ "enum.LogicGateLayers.Gate" ]
+  - type: LogicGate
+    gate: Xor
+
+- type: entity
+  parent: LogicGateOr
+  id: LogicGateNor
+  suffix: Nor
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+    - state: nor
+      map: [ "enum.LogicGateLayers.Gate" ]
+  - type: LogicGate
+    gate: Nor
+
+- type: entity
+  parent: LogicGateOr
+  id: LogicGateNand
+  suffix: Nand
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+    - state: nand
+      map: [ "enum.LogicGateLayers.Gate" ]
+  - type: LogicGate
+    gate: Nand
+
+- type: entity
+  parent: LogicGateOr
+  id: LogicGateXnor
+  suffix: Xnor
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+    - state: xnor
+      map: [ "enum.LogicGateLayers.Gate" ]
+  - type: LogicGate
+    gate: Xnor
+
 - type: entity
   parent: BaseLogicItem
   id: EdgeDetector
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml b/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
index 6e64f061eb9..d366a2ea59a 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
@@ -34,7 +34,7 @@
           state: icon
         name: a multitool
   - node: logic_gate
-    entity: LogicGate
+    entity: LogicGateOr
   - node: edge_detector
     entity: EdgeDetector
   - node: power_sensor

From 548550d0293e96bb9f6f33c978a79998536a9bbd Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 02:03:47 -0400
Subject: [PATCH 132/366] oops

---
 Resources/Migrations/migration.yml | 32 ------------------------------
 1 file changed, 32 deletions(-)

diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml
index 2e5d7693ad0..ca24012e956 100644
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@@ -287,38 +287,6 @@ SignShield: null # what was this even for?
 SignHydro2: SignHydro1
 SignHydro3: SignHydro1
 
-# 2024-07-7
-SignScience1: SignScience
-SignScience2: SignScience
-SignXenobio2: SignXenobio
-SignXenolab: SignXenobio
-SignToxins2: SignToxins
-SignMinerDock: SignShipDock
-SignChemistry1: SignChem
-SignChemistry2: SignChem
-SignCourt: SignLawyer
-SignAtmosMinsky: SignAtmos
-SignDrones: SignMaterials
-SignShield: null # what was this even for?
-SignHydro2: SignHydro1
-SignHydro3: SignHydro1
-
-# 2024-07-7
-SignScience1: SignScience
-SignScience2: SignScience
-SignXenobio2: SignXenobio
-SignXenolab: SignXenobio
-SignToxins2: SignToxins
-SignMinerDock: SignShipDock
-SignChemistry1: SignChem
-SignChemistry2: SignChem
-SignCourt: SignLawyer
-SignAtmosMinsky: SignAtmos
-SignDrones: SignMaterials
-SignShield: null # what was this even for?
-SignHydro2: SignHydro1
-SignHydro3: SignHydro1
-
 # 2024-07-27
 LogicGate: LogicGateOr
 

From 1e57b6888f8b414bacc733be21dd6c75eb328b07 Mon Sep 17 00:00:00 2001
From: themias <89101928+themias@users.noreply.github.com>
Date: Sat, 17 Aug 2024 10:09:42 -0400
Subject: [PATCH 133/366] Add croissant recipe (#30825)

* Add croissant recipe

* comma

* fix description

* fix merge error
---
 .../Objects/Consumable/Food/Baked/misc.yml    |  24 ++++++++++++++++++
 .../Objects/Consumable/Food/ingredients.yml   |   3 +++
 .../Food/Baked/misc.rsi/croissant.png         | Bin 0 -> 305 bytes
 .../Consumable/Food/Baked/misc.rsi/meta.json  |   5 +++-
 .../Food/ingredients.rsi/croissant-raw.png    | Bin 0 -> 244 bytes
 .../Consumable/Food/ingredients.rsi/meta.json |   8 +++++-
 6 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/croissant.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/croissant-raw.png

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
index fde181d8b9b..a78df427cee 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
@@ -612,3 +612,27 @@
             Quantity: 1
           - ReagentId: Vitamin
             Quantity: 1
+
+- type: entity
+  name: croissant
+  parent: FoodBakedBase
+  id: FoodBakedCroissant
+  description: Buttery, flaky goodness.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - bread
+      - butter
+  - type: Sprite
+    state: croissant
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 7
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 3
+        - ReagentId: Butter
+          Quantity: 2
+        - ReagentId: Vitamin
+          Quantity: 1
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
index ffb52a7b0ff..adb1dddec5c 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -427,6 +427,9 @@
   - type: Construction
     graph: Pizza
     node: flat
+  - type: SliceableFood
+    count: 3
+    slice: FoodCroissantRaw
 
 - type: entity
   name: pizza bread
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/croissant.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/croissant.png
new file mode 100644
index 0000000000000000000000000000000000000000..3922f8bdde89d10501d84a594a7f3962158a5c4d
GIT binary patch
literal 305
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvtpJ}8S0LTxBOc@|eqxIAo>qs8
z+k;o<Ye##_oLm>UAjNEQfO?gV^r}M3I8{Yfo&`-n)r=)Ue!&b5&u*jvIa@tl978lF
zCMPUV7YK29EN#7z!_ca|%~D#ibIOjEw#pXELqFeSYOYh%JgCWJz<6<+N%{l_<uff8
zCYXp%7CEij7{DmlAGTd&!2z$wyaCFW=lEXoG13i}YvY=7*2mDV_~e|OS$rW27NvH6
zHrYOPbDkrsM67e#PM>JgV*U4-GgJ-L!_P(Sp52(pJn6t4ZVx%btuwb4F>eZQ%}u-O
z`ti5i?9D4057s_=!WJ^oHvIz2j&kD*k_-$p%B<v+^(SoudVs;x)z4*}Q$iB}_>gX1

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json
index 7f887863aaf..56d8c81f100 100644
--- a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Chevrechaud created by Github user deathride58",
+  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Chevrechaud created by Github user deathride58, croissant taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955",
   "size": {
     "x": 32,
     "y": 32
@@ -123,6 +123,9 @@
     },
     {
       "name": "chevrechaud"
+    },
+    {
+      "name": "croissant"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/croissant-raw.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/croissant-raw.png
new file mode 100644
index 0000000000000000000000000000000000000000..be8a1e2a8f394971bdbf90cf0ef0fff6e61e4483
GIT binary patch
literal 244
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvp#Yx{S0LR{Y?BgY`{&!fZ+9lV
zJD#9^y>J^)l(8hpFPOpM*^M+HXM(4TV~EDYy%#R>9#-IC37E{e;4MSwRGtYEY#BNF
z0XKiI50Y}^;t}}&^QDd-LyYA^%Qrj9pKu80_MYkKy!`u)dT>|QEA2Z+`Bn(FU$n@&
zvh_f-=NI;fyk|8Dx;kqz*5rf;uTfdFNu)re_2>_?wO<8$wB|EBkiIedp5&AGPa0jH
pn&h_qGcGFScTQmtfAHuhlZBzow{QpMwLrHqc)I$ztaD0e0sx=mUZ4N~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json
index 6633b0b0bd6..2943d9dea33 100644
--- a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and baystation and modified by potato1234x at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514. Chevrelog and chevredisk created by Github user deathride58, tortilladough tortillaflat and tortillaslice added by Phunny,",
+  "copyright": "Taken from tgstation and baystation and modified by potato1234x at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514. Chevrelog and chevredisk created by Github user deathride58, tortilladough tortillaflat and tortillaslice added by Phunny, butter-slice and croissant-raw taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955",
   "size": {
     "x": 32,
     "y": 32
@@ -108,6 +108,12 @@
     },
     {
       "name": "tortilladough-slice"
+    },
+    {
+      "name": "butter-slice"
+    },
+    {
+      "name": "croissant-raw"
     }
   ]
 }

From 65f263345e09d195a50d418fc599a1f5ec3c6028 Mon Sep 17 00:00:00 2001
From: themias <89101928+themias@users.noreply.github.com>
Date: Thu, 8 Aug 2024 19:32:42 -0400
Subject: [PATCH 134/366] Add butter slices (#30789)

---
 .../VendingMachines/Inventories/chefvend.yml  |   2 +-
 .../Objects/Consumable/Food/ingredients.yml   |  52 ++++++++++++++++++
 .../Recipes/Cooking/meal_recipes.yml          |  10 ++--
 .../Food/ingredients.rsi/butter-slice.png     | Bin 0 -> 146 bytes
 4 files changed, 58 insertions(+), 6 deletions(-)
 create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/butter-slice.png

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
index bc6ddc96fb8..7343233b6b9 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
@@ -17,7 +17,7 @@
     FoodContainerEgg: 1
     DrinkMilkCarton: 2
     DrinkSoyMilkCarton: 1
-    FoodButter: 4
+    FoodButter: 3
     FoodCheese: 1
     FoodMeat: 6
     LunchboxGenericFilledRandom: 5 # Delta-V Adds Lunchbox
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
index adb1dddec5c..f45be096c7f 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -460,6 +460,58 @@
   components:
   - type: Sprite
     state: butter
+  - type: Slippery
+  - type: StepTrigger
+    intersectRatio: 0.2
+  - type: CollisionWake
+    enabled: false
+  - type: Physics
+    bodyType: Dynamic
+  - type: Fixtures
+    fixtures:
+      slips:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.3,-0.2,0.3,0.2"
+        layer:
+        - SlipLayer
+        hard: false
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.3,-0.2,0.3,0.2"
+        density: 10
+        mask:
+        - ItemMask
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 18
+        reagents:
+        - ReagentId: Butter
+          Quantity: 15
+  - type: SliceableFood
+    count: 3
+    slice: FoodButterSlice
+
+- type: entity
+  name: butter slice
+  parent: FoodBakingBase
+  id: FoodButterSlice
+  description: A pat of delicious, golden, fatty goodness.
+  components:
+  - type: Sprite
+    state: butter-slice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 6
+        reagents:
+        - ReagentId: Butter
+          Quantity: 5
+  - type: Tag
+    tags:
+    - Slice
 
 - type: entity
   name: stick of cannabis butter
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index c10943c4031..d17234a49cc 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -439,7 +439,7 @@
   time: 5
   solids:
     FoodBreadPlainSlice: 1
-    FoodButter: 1
+    FoodButterSlice: 1
 
 - type: microwaveMealRecipe
   id: RecipeFrenchToast
@@ -460,7 +460,7 @@
   solids:
     FoodBreadPlainSlice: 1
     FoodGarlic: 1
-    FoodButter: 1
+    FoodButterSlice: 1
 
 - type: microwaveMealRecipe
   id: RecipeJellyToast
@@ -1210,7 +1210,7 @@
     Flour: 5
     Sugar: 5
   solids:
-    FoodButter: 1
+    FoodButterSlice: 1
     FoodSnackChocolateBar: 1
 
 - type: microwaveMealRecipe
@@ -1222,7 +1222,7 @@
     Flour: 5
     Sugar: 10
   solids:
-    FoodButter: 1
+    FoodButterSlice: 1
 
 - type: microwaveMealRecipe
   id: RecipeRaisinCookie
@@ -1244,7 +1244,7 @@
     Oats: 5
     Sugar: 5
   solids:
-    FoodButter: 1
+    FoodButterSlice: 1
 
 - type: microwaveMealRecipe
   id: RecipeChocolateChipPancake
diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/butter-slice.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/butter-slice.png
new file mode 100644
index 0000000000000000000000000000000000000000..81b73772a7318579c56567281dd9a11720d2251c
GIT binary patch
literal 146
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4S0MfW#kT*C7W}{2{Qr#a
zv-~&zfI^HVL4Lsu4$p3+0Xc@AE{-7@6O$7p7#jiw=IU!SC@s*?=vdTp(<3n8CS&B0
p8y+`VT^kNc^qxP^b4*^0fgyScbC&kf4NO4I44$rjF6*2UngD=UFWmqD

literal 0
HcmV?d00001


From 058f8d59158ca4e11ac5005777bd8585dead1deb Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 02:19:16 -0400
Subject: [PATCH 135/366] yeag

---
 .../Catalog/Fills/Boxes/syndicate.yml         | 18 +++++++++++++++
 .../Prototypes/Catalog/uplink_catalog.yml     | 19 +++++++++++++++
 .../Objects/Consumable/Food/ingredients.yml   | 19 +++++++++++++++
 .../Objects/Weapons/Melee/baguette.yml        | 15 ++++++++++++
 .../Objects/Weapons/Throwable/croissant.yml   | 23 +++++++++++++++++++
 .../Reagents/Consumable/Food/ingredients.yml  |  2 +-
 .../Recipes/Cooking/meal_recipes.yml          | 13 +++++++++++
 7 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml
 create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
index 7b5b05a49a5..115f93b58d6 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
@@ -66,3 +66,21 @@
     layers:
       - state: box_of_doom
       - state: throwing_knives
+
+- type: entity
+  parent: BoxCardboard
+  id: CombatBakeryKit
+  name: combat bakery kit
+  description: A kit of clandestine baked weapons.
+  components:
+  - type: Sprite
+    layers:
+      - state: box_of_doom
+      - state: france
+  - type: StorageFill
+    contents:
+      - id: WeaponCroissant
+        amount: 2
+      - id: WeaponBaguette
+      - id: SyndicateMicrowaveMachineCircuitboard
+      - id: PaperWrittenCombatBakeryKit
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 2865bfce0d8..325dffa1315 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -1811,6 +1811,25 @@
       components:
       - SurplusBundle
 
+- type: listing
+  id: UplinkCombatBakery
+  name: uplink-combat-bakery-name
+  description: uplink-combat-bakery-desc
+  icon: { sprite:  Objects/Consumable/Food/Baked/bread.rsi, state: baguette}
+  productEntity: CombatBakeryKit
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 2
+  cost:
+    Telecrystal: 6
+  categories:
+  - UplinkJob
+  conditions:
+  - !type:BuyerJobCondition
+    whitelist:
+    - Chef
+    - Mime
+
 - type: listing
   id: UplinkEmpFlashlight
   name: uplink-emp-flashlight-name
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
index f45be096c7f..e12fe8a13cb 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -748,3 +748,22 @@
   - type: SolutionContainerVisuals
     maxFillLevels: 2
     fillBaseName: packet-solid-
+
+- type: entity
+  name: raw croissant
+  parent: FoodBakingBase
+  id: FoodCroissantRaw
+  description: Buttery, flaky goodness waiting to happen.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - dough
+  - type: Sprite
+    state: croissant-raw
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 4
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 3
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml
new file mode 100644
index 00000000000..4492d31320f
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml
@@ -0,0 +1,15 @@
+- type: entity
+  parent: FoodBreadBaguette
+  id: WeaponBaguette
+  suffix: Weapon
+  components:
+  - type: MeleeWeapon
+    wideAnimationRotation: -120
+    damage:
+      types:
+        Slash: 16
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
+  - type: Reflect
+    reflectProb: 0.05
+    spread: 90
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml
new file mode 100644
index 00000000000..d2f53857acb
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml
@@ -0,0 +1,23 @@
+- type: entity
+  parent: FoodBakedCroissant
+  id: WeaponCroissant
+  suffix: Weapon
+  components:
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.2
+        density: 5
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
+  - type: EmbeddableProjectile
+    sound: /Audio/Weapons/star_hit.ogg
+  - type: LandAtCursor
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Slash: 5
+        Piercing: 10
\ No newline at end of file
diff --git a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml
index 84d00fa0c14..b74fd7eb232 100644
--- a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml
@@ -258,4 +258,4 @@
       effects:
       - !type:AdjustReagent
         reagent: Nutriment
-        amount: 0.75
+        amount: 0.75
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index d17234a49cc..de939ed3fc1 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -432,6 +432,19 @@
   solids:
     FoodDough: 1
 
+- type: microwaveMealRecipe
+  id: RecipeBaguetteSword
+  name: baguette sword recipe
+  result: WeaponBaguette
+  secretRecipe: true
+  time: 15
+  reagents:
+    TableSalt: 5
+    Blackpepper: 5
+  solids:
+    FoodDough: 1
+    PartRodMetal1: 1
+
 - type: microwaveMealRecipe
   id: RecipeButteredToast
   name: buttered toast recipe

From 41450eb6e27e1c854faf01112d918c4a2346c63c Mon Sep 17 00:00:00 2001
From: themias <89101928+themias@users.noreply.github.com>
Date: Mon, 2 Sep 2024 09:49:00 -0400
Subject: [PATCH 136/366] Add Donk Co. microwave board to Combat Bakery Kit
 (#31239)

* Add special microwave board to Combat Bakery Kit

* use event instead of trycomp

* make the board sus

* add instructions note

* embarrassing typo

* Add functionality to Donk Co. microwave instead

* update note
---
 .../Kitchen/EntitySystems/MicrowaveSystem.cs  | 25 ++++++++++++++++++-
 .../Components/RecipeProviderComponent.cs     | 13 ++++++++++
 .../Kitchen/GetSecretRecipesEvent.cs          | 10 ++++++++
 .../Kitchen/MicrowaveMealRecipePrototype.cs   |  6 +++++
 Content.Shared/Kitchen/RecipeManager.cs       |  3 ++-
 Resources/Locale/en-US/paper/paper-misc.ftl   | 18 +++++++++++++
 .../Locale/en-US/store/uplink-catalog.ftl     |  3 +++
 .../Catalog/Fills/Boxes/syndicate.yml         |  2 +-
 .../Catalog/Fills/Paper/manuals.yml           |  9 +++++++
 .../Structures/Machines/microwave.yml         | 23 +++++++++++++++++
 10 files changed, 109 insertions(+), 3 deletions(-)
 create mode 100644 Content.Shared/Kitchen/Components/RecipeProviderComponent.cs
 create mode 100644 Content.Shared/Kitchen/GetSecretRecipesEvent.cs

diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
index d005b041e49..07c14f82166 100644
--- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
@@ -40,6 +40,7 @@
 using Content.Server.Construction.Components;
 using Content.Shared.Chat;
 using Content.Shared.Damage;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Kitchen.EntitySystems
 {
@@ -101,6 +102,8 @@ public override void Initialize()
             SubscribeLocalEvent<ActiveMicrowaveComponent, EntRemovedFromContainerMessage>(OnActiveMicrowaveRemove);
 
             SubscribeLocalEvent<ActivelyMicrowavedComponent, OnConstructionTemperatureEvent>(OnConstructionTemp);
+
+            SubscribeLocalEvent<FoodRecipeProviderComponent, GetSecretRecipesEvent>(OnGetSecretRecipes);
         }
 
         private void OnCookStart(Entity<ActiveMicrowaveComponent> ent, ref ComponentStartup args)
@@ -515,7 +518,12 @@ public void Wzhzhzh(EntityUid uid, MicrowaveComponent component, EntityUid? user
             }
 
             // Check recipes
-            var portionedRecipe = _recipeManager.Recipes.Select(r =>
+            var getRecipesEv = new GetSecretRecipesEvent();
+            RaiseLocalEvent(uid, ref getRecipesEv);
+
+            List<FoodRecipePrototype> recipes = getRecipesEv.Recipes;
+            recipes.AddRange(_recipeManager.Recipes);
+            var portionedRecipe = recipes.Select(r =>
                 CanSatisfyRecipe(component, r, solidsDict, reagentDict)).FirstOrDefault(r => r.Item2 > 0);
 
             _audio.PlayPvs(component.StartCookingSound, uid);
@@ -619,6 +627,21 @@ public override void Update(float frameTime)
             }
         }
 
+        /// <summary>
+        /// This event tries to get secret recipes that the microwave might be capable of.
+        /// Currently, we only check the microwave itself, but in the future, the user might be able to learn recipes.
+        /// </summary>
+        private void OnGetSecretRecipes(Entity<FoodRecipeProviderComponent> ent, ref GetSecretRecipesEvent args)
+        {
+            foreach (ProtoId<FoodRecipePrototype> recipeId in ent.Comp.ProvidedRecipes)
+            {
+                if (_prototype.TryIndex(recipeId, out var recipeProto))
+                {
+                    args.Recipes.Add(recipeProto);
+                }
+            }
+        }
+
         #region ui
         private void OnEjectMessage(Entity<MicrowaveComponent> ent, ref MicrowaveEjectMessage args)
         {
diff --git a/Content.Shared/Kitchen/Components/RecipeProviderComponent.cs b/Content.Shared/Kitchen/Components/RecipeProviderComponent.cs
new file mode 100644
index 00000000000..d677e426743
--- /dev/null
+++ b/Content.Shared/Kitchen/Components/RecipeProviderComponent.cs
@@ -0,0 +1,13 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Kitchen.Components;
+
+[RegisterComponent]
+public sealed partial class FoodRecipeProviderComponent : Component
+{
+    /// <summary>
+    /// These are additional recipes that the entity is capable of cooking.
+    /// </summary>
+    [DataField, ViewVariables]
+    public List<ProtoId<FoodRecipePrototype>> ProvidedRecipes = new();
+}
diff --git a/Content.Shared/Kitchen/GetSecretRecipesEvent.cs b/Content.Shared/Kitchen/GetSecretRecipesEvent.cs
new file mode 100644
index 00000000000..cf5416dfaa4
--- /dev/null
+++ b/Content.Shared/Kitchen/GetSecretRecipesEvent.cs
@@ -0,0 +1,10 @@
+namespace Content.Shared.Kitchen;
+
+/// <summary>
+/// This returns a list of recipes not found in the main list of available recipes.
+/// </summary>
+[ByRefEvent]
+public struct GetSecretRecipesEvent()
+{
+    public List<FoodRecipePrototype> Recipes = new();
+}
diff --git a/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs b/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs
index b0991b54605..65a7b9ed045 100644
--- a/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs
+++ b/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs
@@ -37,6 +37,12 @@ public sealed partial class FoodRecipePrototype : IPrototype
         public IReadOnlyDictionary<string, FixedPoint2> IngredientsReagents => _ingsReagents;
         public IReadOnlyDictionary<string, FixedPoint2> IngredientsSolids => _ingsSolids;
 
+        /// <summary>
+        /// Is this recipe unavailable in normal circumstances?
+        /// </summary>
+        [DataField]
+        public bool SecretRecipe = false;
+
         /// <summary>
         ///    Count the number of ingredients in a recipe for sorting the recipe list.
         ///    This makes sure that where ingredient lists overlap, the more complex
diff --git a/Content.Shared/Kitchen/RecipeManager.cs b/Content.Shared/Kitchen/RecipeManager.cs
index 0b120db26da..79c169b754b 100644
--- a/Content.Shared/Kitchen/RecipeManager.cs
+++ b/Content.Shared/Kitchen/RecipeManager.cs
@@ -14,7 +14,8 @@ public void Initialize()
             Recipes = new List<FoodRecipePrototype>();
             foreach (var item in _prototypeManager.EnumeratePrototypes<FoodRecipePrototype>())
             {
-                Recipes.Add(item);
+                if (!item.SecretRecipe)
+                    Recipes.Add(item);
             }
 
             Recipes.Sort(new RecipeComparer());
diff --git a/Resources/Locale/en-US/paper/paper-misc.ftl b/Resources/Locale/en-US/paper/paper-misc.ftl
index 587701a9274..c7c3a5e42ee 100644
--- a/Resources/Locale/en-US/paper/paper-misc.ftl
+++ b/Resources/Locale/en-US/paper/paper-misc.ftl
@@ -26,3 +26,21 @@ book-text-ame-scribbles = I don't know if you're trained already, so I hope this
       The golden rule is 2 injection for every 1 core. You can go lower to save fuel.
       Higher will burn the engine out and eventually make it explode. Don't.
       Don't forget to refuel it, it tends to stop at the worst possible time.
+
+book-text-combat-bakery-kit = Thank you for choosing our combat bakery kit!
+      Enclosed are two (2) CyberSun patented Throwing Croissants, and one (1) patent-pending Baguette Sword.
+      The included Donk Co. microwave board can construct a microwave capable of baking more weapons.
+      Just like the baked weapons, be sure to eat this note after use. Good luck, agent.
+
+      Baguette Sword Recipe:
+      Dough x 1
+      Salt 5u
+      Pepper 5u
+      Metal Rod x 1
+      Cook Time: 15 seconds
+
+      Throwing Croissant Recipe:
+      Raw Croissant x 1
+      Butter Slice x 1
+      Glass Shard x 1
+      Cook Time: 5 seconds
\ No newline at end of file
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index c2bb30a738a..7eaacc50267 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -441,3 +441,6 @@ uplink-backpack-syndicate-desc = Lightweight explosion-proof а backpack for hol
 
 uplink-home-run-bat-name = Home Run Bat
 uplink-home-run-bat-desc = Rigged bat pre-coated in blood for Syndicate tee-ball practice. Launch your foes!
+
+uplink-combat-bakery-name = Combat Bakery Kit
+uplink-combat-bakery-desc = A kit of clandestine baked weapons. Contains a baguette sword, a pair of throwing croissants, and a syndicate microwave board for making more. Once the job is done, eat the evidence.
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
index 115f93b58d6..6aab924c0ad 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
@@ -83,4 +83,4 @@
         amount: 2
       - id: WeaponBaguette
       - id: SyndicateMicrowaveMachineCircuitboard
-      - id: PaperWrittenCombatBakeryKit
+      - id: PaperWrittenCombatBakeryKit
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/Fills/Paper/manuals.yml b/Resources/Prototypes/Catalog/Fills/Paper/manuals.yml
index 4893fa2557f..7f2268953bf 100644
--- a/Resources/Prototypes/Catalog/Fills/Paper/manuals.yml
+++ b/Resources/Prototypes/Catalog/Fills/Paper/manuals.yml
@@ -23,3 +23,12 @@
         type: PaperBoundUserInterface
   - type: Paper
     content: book-text-holoparasite-info
+
+- type: entity
+  id: PaperWrittenCombatBakeryKit
+  name: "combat bakery kit instructions"
+  description: "Eat note after reading."
+  parent: Paper
+  components:
+  - type: Paper
+    content: book-text-combat-bakery-kit
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
index 994269f71b4..b415551ad2b 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
@@ -105,3 +105,26 @@
   - type: GuideHelp
     guides:
     - Chef
+    - FoodRecipes
+
+- type: entity
+  id: SyndicateMicrowave
+  parent: KitchenMicrowave
+  name: donk co. microwave
+  description: So advanced, it can cook donk-pockets in a mere 2.5 seconds!
+  components:
+  - type: Microwave
+    cookTimeMultiplier: 0.5
+    capacity: 10
+    canMicrowaveIdsSafely: false
+    explosionChance: 0.3
+  - type: Sprite
+    sprite: Structures/Machines/microwave_syndie.rsi
+    drawdepth: SmallObjects
+    snapCardinals: true
+  - type: Machine
+    board: SyndicateMicrowaveMachineCircuitboard
+  - type: FoodRecipeProvider
+    providedRecipes:
+    - RecipeBaguetteSword
+    - RecipeThrowingCroissant

From d978ef33d1fcf53655b6279e7bf7bdd17900d3fd Mon Sep 17 00:00:00 2001
From: Verm <32827189+Vermidia@users.noreply.github.com>
Date: Fri, 14 Jun 2024 22:00:00 -0500
Subject: [PATCH 137/366] Donk co. microwave + microwave tweaks (#28951)

* THE syndie microwave

* Always burn to explode microwave when copying

* Make it so copying ids stop when the microwave is goign to explode

* Made explosion destroy the board and spit out the machine parts

* Move logic is MicrowaveSystem, make metal cooking use the same logic

* Fix passing the wrong malfunction time

* Shuttle cannot escape aggressive branding

* Always make it explode with an id

* Forgot to invert bool, move it after fry chance
---
 Content.Server/Access/Systems/IdCardSystem.cs |    15 +
 .../Kitchen/Components/MicrowaveComponent.cs  |     6 +
 .../Kitchen/EntitySystems/MicrowaveSystem.cs  |    24 +-
 Resources/Maps/Nonstations/nukieplanet.yml    | 30548 ++++++++--------
 Resources/Maps/Shuttles/infiltrator.yml       | 11356 +++---
 .../Machines/microwave_syndie.rsi/meta.json   |    35 +
 .../Machines/microwave_syndie.rsi/mw.png      |   Bin 0 -> 836 bytes
 .../Machines/microwave_syndie.rsi/mw0.png     |   Bin 0 -> 825 bytes
 .../microwave_syndie.rsi/mw_running_unlit.png |   Bin 0 -> 617 bytes
 .../microwave_syndie.rsi/mw_unlit.png         |   Bin 0 -> 1772 bytes
 .../Machines/microwave_syndie.rsi/mwb.png     |   Bin 0 -> 1193 bytes
 .../microwave_syndie.rsi/mwbloody0.png        |   Bin 0 -> 268 bytes
 .../microwave_syndie.rsi/mwbloody1.png        |   Bin 0 -> 230 bytes
 .../Machines/microwave_syndie.rsi/mwo.png     |   Bin 0 -> 947 bytes
 14 files changed, 21030 insertions(+), 20954 deletions(-)
 create mode 100644 Resources/Textures/Structures/Machines/microwave_syndie.rsi/meta.json
 create mode 100644 Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw.png
 create mode 100644 Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw0.png
 create mode 100644 Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_running_unlit.png
 create mode 100644 Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_unlit.png
 create mode 100644 Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwb.png
 create mode 100644 Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody0.png
 create mode 100644 Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody1.png
 create mode 100644 Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwo.png

diff --git a/Content.Server/Access/Systems/IdCardSystem.cs b/Content.Server/Access/Systems/IdCardSystem.cs
index 9cd9976cea9..b49bc55d1be 100644
--- a/Content.Server/Access/Systems/IdCardSystem.cs
+++ b/Content.Server/Access/Systems/IdCardSystem.cs
@@ -9,6 +9,7 @@
 using Content.Shared.Popups;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
+using Content.Server.Kitchen.EntitySystems;
 
 namespace Content.Server.Access.Systems;
 
@@ -18,6 +19,7 @@ public sealed class IdCardSystem : SharedIdCardSystem
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly MicrowaveSystem _microwave = default!;
 
     public override void Initialize()
     {
@@ -27,9 +29,13 @@ public override void Initialize()
 
     private void OnMicrowaved(EntityUid uid, IdCardComponent component, BeingMicrowavedEvent args)
     {
+        if (!component.CanMicrowave || !TryComp<MicrowaveComponent>(args.Microwave, out var micro) || micro.Broken)
+            return;   
+
         if (TryComp<AccessComponent>(uid, out var access))
         {
             float randomPick = _random.NextFloat();
+
             // if really unlucky, burn card
             if (randomPick <= 0.15f)
             {
@@ -46,6 +52,14 @@ private void OnMicrowaved(EntityUid uid, IdCardComponent component, BeingMicrowa
                 EntityManager.QueueDeleteEntity(uid);
                 return;
             }
+
+            //Explode if the microwave can't handle it
+            if (!micro.CanMicrowaveIdsSafely)
+            {
+                _microwave.Explode((args.Microwave, micro));
+                return;
+            }
+
             // If they're unlucky, brick their ID
             if (randomPick <= 0.25f)
             {
@@ -70,6 +84,7 @@ private void OnMicrowaved(EntityUid uid, IdCardComponent component, BeingMicrowa
 
             _adminLogger.Add(LogType.Action, LogImpact.Medium,
                     $"{ToPrettyString(args.Microwave)} added {random.ID} access to {ToPrettyString(uid):entity}");
+
         }
     }
 }
diff --git a/Content.Server/Kitchen/Components/MicrowaveComponent.cs b/Content.Server/Kitchen/Components/MicrowaveComponent.cs
index 1e343e5e332..7e8ddd8b457 100644
--- a/Content.Server/Kitchen/Components/MicrowaveComponent.cs
+++ b/Content.Server/Kitchen/Components/MicrowaveComponent.cs
@@ -105,6 +105,12 @@ public sealed partial class MicrowaveComponent : Component
         /// </summary>
         [DataField]
         public float LightningChance = .75f;
+
+        /// <summary>
+        /// If this microwave can give ids accesses without exploding
+        /// </summary>
+        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        public bool CanMicrowaveIdsSafely = true;
     }
 
     public sealed class BeingMicrowavedEvent : HandledEntityEventArgs
diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
index 07c14f82166..84ec850a3e8 100644
--- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
@@ -1,3 +1,4 @@
+using Content.Server.Administration.Logs;
 using Content.Server.Body.Systems;
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Construction;
@@ -15,6 +16,7 @@
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Construction.EntitySystems;
+using Content.Shared.Database;
 using Content.Shared.Destructible;
 using Content.Shared.FixedPoint;
 using Content.Shared.Interaction;
@@ -420,6 +422,23 @@ public static bool HasContents(MicrowaveComponent component)
             return component.Storage.ContainedEntities.Any();
         }
 
+        /// <summary>
+        /// Explodes the microwave internally, turning it into a broken state, destroying its board, and spitting out its machine parts
+        /// </summary>
+        /// <param name="ent"></param>
+        public void Explode(Entity<MicrowaveComponent> ent)
+        {
+            ent.Comp.Broken = true; // Make broken so we stop processing stuff
+            _explosion.TriggerExplosive(ent);
+            if (TryComp<MachineComponent>(ent, out var machine))
+            {
+                _container.CleanContainer(machine.BoardContainer);
+                _container.EmptyContainer(machine.PartContainer);
+            }
+
+            _adminLogger.Add(LogType.Action, LogImpact.Medium,
+                $"{ToPrettyString(ent)} exploded from unsafe cooking!");
+        }
         /// <summary>
         /// Handles the attempted cooking of unsafe objects
         /// </summary>
@@ -437,7 +456,7 @@ private void RollMalfunction(Entity<ActiveMicrowaveComponent, MicrowaveComponent
             ent.Comp1.MalfunctionTime = _gameTiming.CurTime + TimeSpan.FromSeconds(ent.Comp2.MalfunctionInterval);
             if (_random.Prob(ent.Comp2.ExplosionChance))
             {
-                _explosion.TriggerExplosive(ent);
+                Explode((ent, ent.Comp2));
                 return;  // microwave is fucked, stop the cooking.
             }
 
@@ -531,7 +550,8 @@ public void Wzhzhzh(EntityUid uid, MicrowaveComponent component, EntityUid? user
             activeComp.CookTimeRemaining = component.CurrentCookTimerTime * component.CookTimeMultiplier;
             activeComp.TotalTime = component.CurrentCookTimerTime; //this doesn't scale so that we can have the "actual" time
             activeComp.PortionedRecipe = portionedRecipe;
-            component.CurrentCookTimeEnd = _gameTiming.CurTime + TimeSpan.FromSeconds(component.CurrentCookTimerTime);
+            //Scale tiems with cook times
+            component.CurrentCookTimeEnd = _gameTiming.CurTime + TimeSpan.FromSeconds(component.CurrentCookTimerTime * component.CookTimeMultiplier);
             if (malfunctioning)
                 activeComp.MalfunctionTime = _gameTiming.CurTime + TimeSpan.FromSeconds(component.MalfunctionInterval);
             UpdateUserInterfaceState(uid, component);
diff --git a/Resources/Maps/Nonstations/nukieplanet.yml b/Resources/Maps/Nonstations/nukieplanet.yml
index 304def19c70..b1d5d558255 100644
--- a/Resources/Maps/Nonstations/nukieplanet.yml
+++ b/Resources/Maps/Nonstations/nukieplanet.yml
@@ -1,15274 +1,15274 @@
-meta:
-  format: 6
-  postmapinit: false
-tilemap:
-  0: Space
-  14: FloorBar
-  20: FloorCarpetClown
-  29: FloorDark
-  44: FloorFreezer
-  59: FloorIce
-  77: FloorReinforced
-  79: FloorRockVault
-  80: FloorShowroom
-  84: FloorShuttleOrange
-  86: FloorShuttleRed
-  89: FloorSnow
-  91: FloorSteel
-  106: FloorTechMaint
-  110: FloorWhite
-  120: FloorWood
-  123: Lattice
-  124: Plating
-entities:
-- proto: ""
-  entities:
-  - uid: 104
-    components:
-    - type: MetaData
-      name: Syndicate Outpost
-    - type: Transform
-      parent: 1295
-    - type: FTLDestination
-      whitelist:
-        tags:
-        - Syndicate
-    - type: MapGrid
-      chunks:
-        -1,-1:
-          ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAKWQAAAAAAfAAAAAAAHQAAAAACbgAAAAADbgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHQAAAAABbgAAAAADWwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHQAAAAAAbgAAAAACbgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHQAAAAAAHQAAAAADHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAADWQAAAAAEWQAAAAAAWQAAAAAEfAAAAAAAeAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAeAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAeAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAADgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAADgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAADgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAADgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAIfAAAAAAADgAAAAAB
-          version: 6
-        0,-1:
-          ind: 0,-1
-          tiles: bgAAAAAAbgAAAAADfAAAAAAAbgAAAAAAbgAAAAACbgAAAAACbgAAAAADbgAAAAABHQAAAAAAHQAAAAABHQAAAAABHQAAAAABHQAAAAABHQAAAAAAHQAAAAADHQAAAAACWwAAAAAAbgAAAAADbgAAAAADbgAAAAADbgAAAAACbgAAAAAAbgAAAAADbgAAAAADHQAAAAADVgAAAAAAHQAAAAACVgAAAAAAHQAAAAADVgAAAAAAHQAAAAADHQAAAAADbgAAAAAAbgAAAAACfAAAAAAAbgAAAAADbgAAAAACbgAAAAADbgAAAAACbgAAAAACHQAAAAADVgAAAAAAHQAAAAADVgAAAAAAHQAAAAABVgAAAAAAHQAAAAABHQAAAAAAHQAAAAABHQAAAAADHQAAAAAAWwAAAAADWwAAAAACWwAAAAADbgAAAAADbgAAAAACHQAAAAABHQAAAAAAHQAAAAAAHQAAAAABHQAAAAABHQAAAAABHQAAAAAAHQAAAAADfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAABWwAAAAABWwAAAAACbgAAAAADbgAAAAACDgAAAAACHQAAAAADHQAAAAAAHQAAAAADHQAAAAADHQAAAAACHQAAAAAAHQAAAAADWQAAAAAAWQAAAAAAbgAAAAAAWwAAAAABWwAAAAAAWwAAAAAAbgAAAAACbgAAAAAAWQAAAAAAHQAAAAADHQAAAAADVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAADgAAAAABDgAAAAADDgAAAAACDgAAAAAADgAAAAADfAAAAAAAHQAAAAABfAAAAAAADgAAAAADDgAAAAACDgAAAAAADgAAAAACDgAAAAAAHQAAAAABHQAAAAADHQAAAAABVgAAAAAAVgAAAAAAeAAAAAACeAAAAAACeAAAAAADHQAAAAAAHQAAAAABHQAAAAABHQAAAAAAHQAAAAADHQAAAAACfAAAAAAAHQAAAAACHQAAAAACHQAAAAADHQAAAAABeAAAAAAAeAAAAAACeAAAAAACeAAAAAADeAAAAAADHQAAAAAAHQAAAAAAHQAAAAACHQAAAAAAHQAAAAACHQAAAAACHQAAAAABHQAAAAADHQAAAAABHQAAAAACHQAAAAABeAAAAAAAeAAAAAABeAAAAAAAeAAAAAADeAAAAAADHQAAAAAAHQAAAAAAHQAAAAADHQAAAAAAHQAAAAABHQAAAAADfAAAAAAAHQAAAAACHQAAAAABHQAAAAABHQAAAAACDgAAAAACDgAAAAAADgAAAAACDgAAAAADDgAAAAACDgAAAAABDgAAAAACDgAAAAAADgAAAAAADgAAAAACDgAAAAADDgAAAAAADgAAAAABHQAAAAAAHQAAAAACHQAAAAACDgAAAAAADgAAAAABDgAAAAACDgAAAAAADgAAAAABDgAAAAABDgAAAAADDgAAAAAADgAAAAAALAAAAAAALAAAAAAALAAAAAAADgAAAAACeAAAAAAAeAAAAAADeAAAAAABDgAAAAACDgAAAAACDgAAAAAADgAAAAAADgAAAAADDgAAAAAADgAAAAAAVgAAAAAADgAAAAACLAAAAAAALAAAAAAALAAAAAAADgAAAAADeAAAAAABeAAAAAABeAAAAAADDgAAAAADDgAAAAABDgAAAAADDgAAAAACDgAAAAADDgAAAAAADgAAAAAAVgAAAAAADgAAAAAAUAAAAAAALAAAAAAADgAAAAAADgAAAAACHQAAAAAAHQAAAAACfAAAAAAADgAAAAACDgAAAAACDgAAAAACDgAAAAAADgAAAAADDgAAAAABDgAAAAACVgAAAAAADgAAAAADUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAADgAAAAAADgAAAAADDgAAAAACDgAAAAACDgAAAAACDgAAAAABDgAAAAABDgAAAAAADgAAAAACUAAAAAAAUAAAAAAALAAAAAAAUAAAAAAAUAAAAAAAfAAAAAAAfAAAAAAA
-          version: 6
-        0,0:
-          ind: 0,0
-          tiles: HQAAAAADHQAAAAACHQAAAAACDgAAAAAADgAAAAABDgAAAAABDgAAAAABDgAAAAACDgAAAAADUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfAAAAAAAWQAAAAAGfAAAAAAAfAAAAAAAfAAAAAAAHQAAAAACfAAAAAAADgAAAAAADgAAAAABDgAAAAABDgAAAAACDgAAAAABDgAAAAAADgAAAAACDgAAAAACWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAATwAAAAAAfAAAAAAAWQAAAAAAWQAAAAAHWQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAAfAAAAAAATwAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAATwAAAAAAWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMWQAAAAAAWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAWQAAAAAIWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAIWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAKWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAHWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAGWQAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAMWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAHWQAAAAAAWQAAAAACWQAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAJWQAAAAAAWQAAAAAFTwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAHWQAAAAAHWQAAAAAKWQAAAAAFWQAAAAAAWQAAAAALWQAAAAAA
-          version: 6
-        -1,0:
-          ind: -1,0
-          tiles: ewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMWQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAAWQAAAAAKWQAAAAAIWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAKWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAGHQAAAAADHQAAAAADHQAAAAAAfAAAAAAAHQAAAAAAHQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAALWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAAIfAAAAAAAHQAAAAABHQAAAAACHQAAAAACHQAAAAADHQAAAAACHQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAfAAAAAAAHQAAAAABHQAAAAABWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAALWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAGTwAAAAAAHQAAAAABHQAAAAAAfAAAAAAAfAAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAADWQAAAAAATwAAAAAATwAAAAAATwAAAAAAfAAAAAAAfAAAAAAATwAAAAAATwAAAAAATwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATwAAAAAATwAAAAAATwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMWQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAGWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKTwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAA
-          version: 6
-        1,-1:
-          ind: 1,-1
-          tiles: HQAAAAADHQAAAAADHQAAAAACHQAAAAACHQAAAAAATQAAAAAATQAAAAAATQAAAAAAHQAAAAADHQAAAAACHQAAAAACHQAAAAACfAAAAAAAWQAAAAAAWQAAAAABWQAAAAACHQAAAAADHQAAAAADHQAAAAADHQAAAAAAHQAAAAADTQAAAAAATQAAAAAATQAAAAAAHQAAAAADHQAAAAACHQAAAAADHQAAAAACfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAHQAAAAABHQAAAAADHQAAAAAAHQAAAAABHQAAAAACHQAAAAAAHQAAAAADHQAAAAADHQAAAAAAHQAAAAADHQAAAAABHQAAAAACfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAHQAAAAADHQAAAAAAHQAAAAAAHQAAAAADHQAAAAADHQAAAAABHQAAAAACHQAAAAADHQAAAAADHQAAAAABfAAAAAAAfAAAAAAAfAAAAAAAWQAAAAAMWQAAAAAHWQAAAAAAHQAAAAABHQAAAAAAHQAAAAADHQAAAAABHQAAAAACHQAAAAAAHQAAAAADHQAAAAACHQAAAAACHQAAAAABWQAAAAAAWQAAAAADWQAAAAAAWQAAAAACWQAAAAAAAAAAAAAAHQAAAAAAHQAAAAABHQAAAAABHQAAAAADHQAAAAABHQAAAAABHQAAAAABHQAAAAADHQAAAAABHQAAAAACWQAAAAAFWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAHQAAAAADHQAAAAABVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAHQAAAAACHQAAAAACHQAAAAACWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAACAAAAAAAAfAAAAAAAHQAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAHQAAAAADHQAAAAADHQAAAAACWQAAAAAETwAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAAAAAAAAAHQAAAAAAHQAAAAABVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAHQAAAAACHQAAAAADHQAAAAACWQAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHQAAAAACVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAHQAAAAAAHQAAAAADHQAAAAACWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAfAAAAAAAHQAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAHQAAAAAAHQAAAAABHQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHQAAAAABHQAAAAADHQAAAAAAHQAAAAAAHQAAAAABHQAAAAAAHQAAAAACHQAAAAABHQAAAAABWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHQAAAAABHQAAAAADHQAAAAACHQAAAAACHQAAAAADHQAAAAADHQAAAAACHQAAAAAAHQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAfAAAAAAAfAAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAABHQAAAAADHQAAAAAAHQAAAAABWQAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAGfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAWQAAAAAATwAAAAAAWQAAAAAEWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAA
-          version: 6
-        0,-2:
-          ind: 0,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAALWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAGWQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAWQAAAAAAWQAAAAAHWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAWQAAAAAAWQAAAAAGWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAAAWwAAAAAAWwAAAAABWwAAAAAAWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAWQAAAAAAbgAAAAAAbgAAAAADbgAAAAADbgAAAAADbgAAAAAAfAAAAAAAagAAAAAAWwAAAAACWwAAAAADWwAAAAABWwAAAAABWwAAAAADfAAAAAAAHQAAAAAAHQAAAAABWQAAAAAAbgAAAAABbgAAAAABbgAAAAADbgAAAAADbgAAAAAAagAAAAAAagAAAAAAWwAAAAADWwAAAAAAWwAAAAABWwAAAAABWwAAAAAAfAAAAAAA
-          version: 6
-        -1,-2:
-          ind: -1,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAEWQAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAAWQAAAAAFWQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAGWQAAAAAAWQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAALWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHQAAAAABHQAAAAAAHQAAAAAC
-          version: 6
-        -1,1:
-          ind: -1,1
-          tiles: WQAAAAAIWQAAAAAAWQAAAAALWQAAAAAAWQAAAAADWQAAAAAMWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAGWQAAAAAAWQAAAAAFWQAAAAADWQAAAAAEWQAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAEWQAAAAAHWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAEFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFTwAAAAAATwAAAAAATwAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAWQAAAAAAWQAAAAAKWQAAAAAAWQAAAAACWQAAAAAAWQAAAAADTwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAMWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAALWQAAAAAHWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        0,1:
-          ind: 0,1
-          tiles: WQAAAAAAWQAAAAAEWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAHWQAAAAAAWQAAAAAJWQAAAAAGWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAHWQAAAAAAWQAAAAAAWQAAAAALWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAALWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAMWQAAAAAIWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAGWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAACWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAADWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAA
-          version: 6
-        1,1:
-          ind: 1,1
-          tiles: WQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAAMWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAGWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMWQAAAAAAWQAAAAAAWQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAABWQAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        1,0:
-          ind: 1,0
-          tiles: WQAAAAAATwAAAAAATwAAAAAAWQAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAALWQAAAAALWQAAAAAAWQAAAAAMWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAWQAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAMWQAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAFWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAHAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAEWQAAAAAHWQAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAEWQAAAAAJWQAAAAAAWQAAAAAHWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAHWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAABWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        1,-2:
-          ind: 1,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAABWQAAAAAAWQAAAAAAAAAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAMWQAAAAAAWQAAAAALWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAAMWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAagAAAAAAHQAAAAACHQAAAAADHQAAAAACfAAAAAAAfAAAAAAAfAAAAAAAHQAAAAAAHQAAAAACHQAAAAABagAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJfAAAAAAAagAAAAAAHQAAAAADHQAAAAACHQAAAAADHQAAAAACHQAAAAACHQAAAAADHQAAAAABHQAAAAABHQAAAAABagAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAagAAAAAAHQAAAAAAHQAAAAABHQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHQAAAAACHQAAAAADHQAAAAACagAAAAAAfAAAAAAAWQAAAAALWQAAAAAAWQAAAAAAWQAAAAAEHQAAAAACHQAAAAACHQAAAAABHQAAAAABTQAAAAAATQAAAAAATQAAAAAAHQAAAAABHQAAAAADHQAAAAACHQAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAD
-          version: 6
-        -2,0:
-          ind: -2,0
-          tiles: ewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAHWQAAAAAAWQAAAAABTwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAATwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAETwAAAAAATwAAAAAATwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAALWQAAAAAAWQAAAAALWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAALWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAA
-          version: 6
-        -2,1:
-          ind: -2,1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAFAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAKFAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAFAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAHWQAAAAAKWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAFAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAGWQAAAAAJWQAAAAALWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAFAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAALWQAAAAAIWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAWQAAAAAGFAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAEWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAEWQAAAAAAWQAAAAAMWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAA
-          version: 6
-        -2,-2:
-          ind: -2,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        2,0:
-          ind: 2,0
-          tiles: TwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        2,-1:
-          ind: 2,-1
-          tiles: TwAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATwAAAAAAWQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATwAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATwAAAAAAWQAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        2,-2:
-          ind: 2,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAIWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATwAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        -2,2:
-          ind: -2,2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        -3,-2:
-          ind: -3,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        0,2:
-          ind: 0,2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAEWQAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        1,2:
-          ind: 1,2
-          tiles: WQAAAAAAWQAAAAAFWQAAAAACWQAAAAAJWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        -3,0:
-          ind: -3,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-    - type: Broadphase
-    - type: Physics
-      bodyStatus: InAir
-      angularDamping: 0.05
-      linearDamping: 0.05
-      fixedRotation: False
-      bodyType: Dynamic
-    - type: Fixtures
-      fixtures: {}
-    - type: Gravity
-      gravityShakeSound: !type:SoundPathSpecifier
-        path: /Audio/Effects/alert.ogg
-    - type: DecalGrid
-      chunkCollection:
-        version: 2
-        nodes:
-        - node:
-            angle: -3.141592653589793 rad
-            color: '#FFFFFFFF'
-            id: Arrows
-          decals:
-            311: 27,-15
-        - node:
-            color: '#FFFFFFFF'
-            id: Arrows
-          decals:
-            309: 18,-19
-            310: 26,-19
-        - node:
-            color: '#FFFFFFFF'
-            id: Basalt1
-          decals:
-            368: 26.834131,4.97881
-        - node:
-            color: '#FFFFFFFF'
-            id: Bot
-          decals:
-            295: 21,-16
-            296: 22,-15
-            297: 23,-16
-            302: 22,-17
-            303: 17,-19
-            304: 27,-19
-        - node:
-            color: '#FFFFFFFF'
-            id: BotLeft
-          decals:
-            194: 5,-11
-            195: 4,-11
-            300: 23,-15
-            301: 21,-17
-            305: 27,-18
-            306: 17,-20
-        - node:
-            color: '#FFFFFFFF'
-            id: BotRight
-          decals:
-            298: 23,-17
-            299: 21,-15
-            307: 27,-20
-            308: 17,-18
-        - node:
-            color: '#FFFFFFFF'
-            id: Box
-          decals:
-            206: 12,-22
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileDarkLineN
-          decals:
-            326: 2,-1
-            327: 1,-1
-            328: 0,-1
-        - node:
-            color: '#52B4E996'
-            id: BrickTileSteelBox
-          decals:
-            238: -3,-15
-            239: -2,-17
-            240: 1,-17
-            241: 1,-13
-            242: -2,-13
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelCornerNe
-          decals:
-            143: 15,-12
-            149: 10,-11
-            186: 5,-11
-            332: 10,-7
-            339: 15,-7
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelCornerNw
-          decals:
-            150: 9,-11
-            187: 3,-11
-            340: 12,-7
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelCornerSe
-          decals:
-            141: 15,-15
-            188: 5,-13
-            259: 27,-17
-            264: 26,-20
-            329: 10,-9
-            342: 15,-9
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelCornerSw
-          decals:
-            127: 14,-15
-            138: 9,-13
-            189: 3,-13
-            256: 17,-17
-            263: 18,-20
-            335: 5,-9
-            341: 12,-9
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelEndS
-          decals:
-            125: 10,-15
-            126: 12,-15
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelInnerNe
-          decals:
-            148: 10,-12
-            250: -3,-17
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelInnerSe
-          decals:
-            139: 10,-13
-            140: 12,-13
-            249: -3,-13
-            260: 26,-17
-            289: 20,-14
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelInnerSw
-          decals:
-            133: 10,-13
-            134: 12,-13
-            135: 14,-13
-            261: 18,-17
-            285: 24,-14
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelLineE
-          decals:
-            128: 12,-14
-            129: 10,-14
-            142: 15,-13
-            191: 5,-12
-            247: -3,-16
-            248: -3,-14
-            257: 26,-19
-            258: 26,-18
-            265: 20,-17
-            266: 20,-16
-            267: 20,-15
-            290: 20,-19
-            312: 27,-16
-            313: 27,-15
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelLineN
-          decals:
-            144: 14,-12
-            145: 13,-12
-            146: 12,-12
-            147: 11,-12
-            192: 4,-11
-            243: 0,-17
-            244: -1,-17
-            274: 26,-14
-            275: 25,-14
-            276: 23,-14
-            277: 22,-14
-            278: 21,-14
-            279: 20,-14
-            280: 18,-14
-            281: 19,-14
-            284: 24,-14
-            333: 9,-7
-            334: 8,-7
-            345: 13,-7
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelLineS
-          decals:
-            136: 13,-13
-            137: 11,-13
-            190: 4,-13
-            245: 0,-13
-            246: -1,-13
-            272: 25,-20
-            273: 19,-20
-            286: 23,-14
-            287: 22,-14
-            288: 21,-14
-            330: 8,-9
-            331: 7,-9
-            343: 14,-9
-            344: 13,-9
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelLineW
-          decals:
-            130: 14,-14
-            131: 12,-14
-            132: 10,-14
-            151: 9,-12
-            193: 3,-12
-            253: 18,-18
-            254: 17,-16
-            255: 17,-15
-            262: 18,-19
-            268: 24,-19
-            269: 24,-17
-            270: 24,-16
-            271: 24,-15
-            336: 5,-8
-            359: 5,-7
-        - node:
-            color: '#9FED5896'
-            id: BrickTileWhiteCornerNe
-          decals:
-            159: 7,-11
-        - node:
-            color: '#9FED5896'
-            id: BrickTileWhiteCornerNw
-          decals:
-            160: 6,-11
-            178: 3,-14
-        - node:
-            color: '#9FED5896'
-            id: BrickTileWhiteCornerSe
-          decals:
-            171: 7,-18
-        - node:
-            color: '#9FED5896'
-            id: BrickTileWhiteCornerSw
-          decals:
-            174: 3,-18
-        - node:
-            color: '#9FED5896'
-            id: BrickTileWhiteInnerNw
-          decals:
-            162: 6,-14
-        - node:
-            color: '#9FED5896'
-            id: BrickTileWhiteLineE
-          decals:
-            165: 7,-12
-            166: 7,-13
-            167: 7,-14
-            168: 7,-15
-            169: 7,-16
-            170: 7,-17
-        - node:
-            color: '#9FED5896'
-            id: BrickTileWhiteLineN
-          decals:
-            163: 5,-14
-            164: 4,-14
-        - node:
-            color: '#9FED5896'
-            id: BrickTileWhiteLineS
-          decals:
-            172: 6,-18
-            173: 5,-18
-            175: 4,-18
-        - node:
-            color: '#9FED5896'
-            id: BrickTileWhiteLineW
-          decals:
-            161: 6,-13
-            176: 3,-17
-            177: 3,-16
-        - node:
-            color: '#A4610647'
-            id: CheckerNWSE
-          decals:
-            196: -13,6
-            197: -14,6
-            198: -15,6
-            199: -15,7
-            200: -14,7
-            201: -13,7
-            202: -14,8
-            203: -15,8
-        - node:
-            color: '#D381C996'
-            id: CheckerNWSE
-          decals:
-            207: 10,-19
-            208: 11,-19
-            209: 12,-19
-            210: 13,-19
-            211: 14,-19
-            212: 14,-18
-            213: 14,-17
-            214: 13,-17
-            215: 13,-18
-            216: 12,-18
-            217: 12,-17
-            218: 11,-17
-            219: 11,-18
-            220: 10,-18
-            221: 10,-17
-        - node:
-            color: '#FFFFFFFF'
-            id: Delivery
-          decals:
-            204: -16,8
-            205: -16,9
-            251: 7,-18
-            252: 6,-18
-        - node:
-            color: '#DE3A3A96'
-            id: DeliveryGreyscale
-          decals:
-            283: 16,-14
-        - node:
-            color: '#9FED5896'
-            id: FullTileOverlayGreyscale
-          decals:
-            181: 5,-17
-            182: 5,-16
-            183: 5,-15
-            184: 6,-16
-            185: 4,-16
-        - node:
-            color: '#52B4E996'
-            id: HalfTileOverlayGreyscale
-          decals:
-            232: 1,-14
-            233: 0,-14
-            234: -1,-14
-        - node:
-            color: '#9FED5896'
-            id: HalfTileOverlayGreyscale
-          decals:
-            324: 11,-2
-        - node:
-            color: '#52B4E996'
-            id: HalfTileOverlayGreyscale180
-          decals:
-            229: 1,-16
-            230: 0,-16
-            231: -1,-16
-        - node:
-            color: '#9FED5896'
-            id: HalfTileOverlayGreyscale180
-          decals:
-            325: 11,0
-        - node:
-            color: '#52B4E996'
-            id: HalfTileOverlayGreyscale270
-          decals:
-            235: -2,-15
-        - node:
-            color: '#9FED5896'
-            id: HalfTileOverlayGreyscale270
-          decals:
-            323: 12,-1
-        - node:
-            color: '#9FED5896'
-            id: HalfTileOverlayGreyscale90
-          decals:
-            322: 10,-1
-        - node:
-            color: '#9FED5896'
-            id: QuarterTileOverlayGreyscale
-          decals:
-            314: 9,0
-            315: 10,0
-        - node:
-            color: '#9FED5896'
-            id: QuarterTileOverlayGreyscale180
-          decals:
-            318: 13,-2
-            319: 12,-2
-        - node:
-            color: '#9FED5896'
-            id: QuarterTileOverlayGreyscale270
-          decals:
-            320: 9,-2
-            321: 10,-2
-        - node:
-            color: '#9FED5896'
-            id: QuarterTileOverlayGreyscale90
-          decals:
-            316: 13,0
-            317: 12,0
-        - node:
-            color: '#FFFFFFFF'
-            id: Rock06
-          decals:
-            75: 9.232971,15.9332485
-        - node:
-            color: '#52B4E996'
-            id: ThreeQuarterTileOverlayGreyscale
-          decals:
-            237: -2,-14
-        - node:
-            color: '#52B4E996'
-            id: ThreeQuarterTileOverlayGreyscale270
-          decals:
-            236: -2,-16
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnBox
-          decals:
-            124: -5,-3
-        - node:
-            angle: -1.5707963267948966 rad
-            color: '#FFFFFFFF'
-            id: WarnCorner
-          decals:
-            21: 18,-5
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnCorner
-          decals:
-            0: 17,-10
-            1: 18,-11
-            2: 19,-11
-        - node:
-            angle: 4.71238898038469 rad
-            color: '#FFFFFFFF'
-            id: WarnCorner
-          decals:
-            14: 17,-6
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnCornerFlipped
-          decals:
-            7: 23,-10
-            13: 16,-6
-            19: 22,-11
-        - node:
-            angle: 1.5707963267948966 rad
-            color: '#FFFFFFFF'
-            id: WarnCornerFlipped
-          decals:
-            11: 23,-6
-            12: 22,-5
-        - node:
-            color: '#DE3A3A96'
-            id: WarnCornerGreyscaleNW
-          decals:
-            282: 17,-14
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnCornerSE
-          decals:
-            292: 20,-20
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnCornerSW
-          decals:
-            226: 10,-19
-            291: 24,-20
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnEndE
-          decals:
-            154: 1,-9
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnEndN
-          decals:
-            156: 7,-2
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnEndS
-          decals:
-            123: -6,21
-            155: 7,-4
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnEndW
-          decals:
-            153: 0,-9
-        - node:
-            color: '#DE3A3A96'
-            id: WarnFullGreyscale
-          decals:
-            352: 16,-8
-            353: 11,-8
-            354: 9,-10
-            355: 6,-10
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineE
-          decals:
-            158: 7,-3
-            294: 20,-18
-        - node:
-            color: '#DE3A3A96'
-            id: WarnLineGreyscaleE
-          decals:
-            152: 15,-14
-            349: 10,-8
-            350: 15,-8
-        - node:
-            color: '#DE3A3A96'
-            id: WarnLineGreyscaleN
-          decals:
-            351: 14,-7
-            356: 7,-7
-            357: 6,-7
-            358: 5,-7
-        - node:
-            color: '#DE3A3A96'
-            id: WarnLineGreyscaleS
-          decals:
-            346: 9,-9
-            347: 6,-9
-        - node:
-            color: '#DE3A3A96'
-            id: WarnLineGreyscaleW
-          decals:
-            348: 12,-8
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineGreyscaleW
-          decals:
-            179: 3,-15
-            180: 6,-12
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineN
-          decals:
-            222: 14,-19
-            223: 13,-19
-            224: 12,-19
-            225: 11,-19
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineS
-          decals:
-            94: -9,4
-            95: -9,3
-            96: -9,2
-            97: -9,1
-            98: -9,0
-            99: -9,-1
-            100: -9,-2
-            101: -9,-3
-            102: -9,-4
-            103: -9,-5
-            104: -9,-6
-            105: -9,-7
-            106: -9,-8
-            107: -9,-9
-            108: -9,-10
-            109: -9,-11
-            110: -9,-12
-            111: -9,-13
-            112: -9,-14
-            113: -9,-15
-            114: -9,-16
-            115: -9,-17
-            116: -9,-18
-            117: -9,-19
-            118: -9,-20
-            119: -9,-21
-            120: -9,-22
-            121: -9,-23
-            122: -9,-24
-            157: 7,-3
-            227: 10,-18
-            228: 10,-17
-            293: 24,-18
-        - node:
-            color: '#FFFFFFFF'
-            id: WarningLine
-          decals:
-            15: 19,-4
-            16: 20,-4
-            17: 21,-4
-        - node:
-            angle: 3.141592653589793 rad
-            color: '#FFFFFFFF'
-            id: WarningLine
-          decals:
-            3: 19,-11
-            4: 19,-12
-            5: 20,-12
-            6: 21,-12
-        - node:
-            angle: 4.71238898038469 rad
-            color: '#FFFFFFFF'
-            id: WarningLine
-          decals:
-            8: 24,-9
-            9: 24,-8
-            10: 24,-7
-        - node:
-            color: '#FFFFFFFF'
-            id: WarningLineCornerFlipped
-          decals:
-            20: 22,-4
-        - node:
-            angle: 4.71238898038469 rad
-            color: '#FFFFFFFF'
-            id: WarningLineCornerFlipped
-          decals:
-            18: 24,-10
-        - node:
-            color: '#FFFFFFFF'
-            id: WoodTrimThinInnerSw
-          decals:
-            363: 5,-6
-        - node:
-            color: '#FFFFFFFF'
-            id: WoodTrimThinLineS
-          decals:
-            361: 0,-6
-            362: -1,-6
-            364: 4,-6
-            365: 3,-6
-            366: 2,-6
-            367: 1,-6
-        - node:
-            color: '#FFFFFFFF'
-            id: WoodTrimThinLineW
-          decals:
-            337: 5,-9
-            338: 5,-8
-            360: 5,-7
-        - node:
-            color: '#FFFFFFFF'
-            id: bushsnowa1
-          decals:
-            67: 12.033197,7.701807
-            69: 14.310135,6.6772776
-        - node:
-            color: '#FFFFFFFF'
-            id: bushsnowa2
-          decals:
-            68: -1.884201,10.692345
-            70: 13.896899,12.679136
-            73: -2.6609726,10.251652
-        - node:
-            color: '#FFFFFFFF'
-            id: bushsnowb2
-          decals:
-            71: 12.943774,14.853275
-        - node:
-            color: '#FFFFFFFF'
-            id: bushsnowb3
-          decals:
-            72: 0.2452774,15.588417
-            74: -0.9488945,8.937782
-        - node:
-            color: '#AB0000FF'
-            id: d
-          decals:
-            373: 21.412256,2.9944348
-        - node:
-            color: '#FFFFFFFF'
-            id: grasssnowa1
-          decals:
-            30: 9.251883,16.971285
-            41: 4.707512,15.727119
-            47: -2.8426914,5.7681084
-            84: 16.072964,17.452217
-            85: -4.644718,19.141476
-            369: 26.896631,2.9944348
-        - node:
-            color: '#FFFFFFFF'
-            id: grasssnowa2
-          decals:
-            22: -3.6290493,-9.771207
-            25: 15.159365,5.392831
-            42: 2.707512,15.930454
-            53: 1.6412125,14.139866
-            62: 14.449558,12.269236
-            86: -6.332218,17.702477
-            87: -7.488468,14.82448
-            91: -5.738468,8.348984
-        - node:
-            color: '#FFFFFFFF'
-            id: grasssnowa3
-          decals:
-            44: -1.3739414,16.399694
-            54: 0.43808746,13.654987
-            57: 3.1880875,12.434965
-            58: 2.1568375,9.893942
-            63: 16.060982,2.673603
-            90: -6.207218,16.0445
-        - node:
-            color: '#FFFFFFFF'
-            id: grasssnowb1
-          decals:
-            51: 0.79449654,2.152192
-            55: 0.18808746,9.666458
-            79: 4.997473,19.080475
-        - node:
-            color: '#FFFFFFFF'
-            id: grasssnowb2
-          decals:
-            36: 6.1287537,4.4684677
-            38: 13.017959,2.0284252
-            61: 8.19574,16.289047
-            64: 3.43816,14.798347
-            78: 2.4505978,18.17328
-            92: -5.832218,13.979851
-            93: 4.1790752,7.8279076
-        - node:
-            color: '#FFFFFFFF'
-            id: grasssnowb3
-          decals:
-            23: -3.3477993,-19.991972
-            31: 9.061624,11.550716
-            35: 9.066255,4.2786684
-            50: -3.1864414,-0.9828911
-            52: -0.88188744,15.563225
-            65: 0.5527668,14.892197
-            83: 17.104214,9.229881
-        - node:
-            color: '#FFFFFFFF'
-            id: grasssnowc1
-          decals:
-            24: -3.9999733,-6.081314
-            26: 15.819311,9.398571
-            32: 12.170999,10.565315
-            39: 10.861709,2.2630453
-            40: 8.471084,13.624069
-            45: -2.1864414,7.911888
-            48: -0.6551914,1.8769035
-            49: -3.7333164,0.34661865
-            56: 4.1724625,13.733192
-            76: 2.5912228,19.753052
-            82: 17.947964,3.1297789
-            88: -7.175968,10.382353
-        - node:
-            color: '#FFFFFFFF'
-            id: grasssnowc2
-          decals:
-            27: 14.194311,14.208315
-            29: 12.819311,16.642818
-            33: 8.01938,8.972565
-            81: 19.322964,7.2277966
-            89: -5.675968,10.1320915
-        - node:
-            color: '#FFFFFFFF'
-            id: grasssnowc3
-          decals:
-            28: 15.694311,15.172535
-            34: 10.48813,7.3443623
-            37: 9.0946245,2.0440664
-            43: -2.8895664,16.211998
-            46: -4.0458164,7.6303444
-            59: 0.45371246,11.270374
-            60: 9.166802,10.222887
-            66: -1.9470882,14.409473
-            77: 6.122473,18.001226
-            80: 18.166714,4.631343
-        - node:
-            color: '#AB0000FF'
-            id: i
-          decals:
-            374: 21.677881,2.8381848
-        - node:
-            color: '#AB0000FF'
-            id: k
-          decals:
-            377: 23.427881,2.8069348
-        - node:
-            color: '#AB0000FF'
-            id: n
-          decals:
-            372: 20.943506,2.9006848
-            378: 22.959131,2.9631848
-        - node:
-            color: '#AB0000FF'
-            id: r
-          decals:
-            375: 22.099756,2.7913098
-        - node:
-            color: '#AB0000FF'
-            id: s
-          decals:
-            370: 20.224756,2.9788098
-        - node:
-            color: '#AB0000FF'
-            id: shortline
-          decals:
-            376: 22.552881,2.8381848
-        - node:
-            color: '#AB0000FF'
-            id: y
-          decals:
-            371: 20.568506,2.9319348
-    - type: GridAtmosphere
-      version: 2
-      data:
-        tiles:
-          -1,-2:
-            0: 65535
-          -1,-1:
-            0: 65503
-            1: 32
-          0,-1:
-            0: 65535
-          -2,-4:
-            0: 65535
-          -2,-3:
-            0: 65535
-          -2,-2:
-            0: 65535
-          -2,-1:
-            0: 65535
-          -1,-4:
-            0: 65535
-          -1,-3:
-            0: 65535
-          0,-4:
-            0: 65535
-          0,-3:
-            0: 65535
-          0,-2:
-            0: 65535
-          1,-4:
-            0: 57343
-            1: 8192
-          1,-3:
-            0: 65535
-          1,-2:
-            0: 65535
-          1,-1:
-            0: 65535
-          2,-4:
-            0: 62815
-            1: 2720
-          2,-3:
-            0: 65535
-          2,-2:
-            0: 32767
-            1: 32768
-          2,-1:
-            0: 65533
-            1: 2
-          3,-4:
-            0: 64991
-            1: 544
-          3,-3:
-            0: 65535
-          3,-2:
-            0: 57343
-            1: 8192
-          3,-1:
-            0: 65535
-          0,0:
-            0: 65535
-          0,1:
-            0: 65535
-          0,2:
-            0: 65535
-          0,3:
-            0: 65535
-          1,0:
-            0: 65535
-          1,1:
-            0: 65535
-          1,2:
-            0: 65535
-          1,3:
-            0: 65535
-          2,0:
-            0: 65535
-          2,1:
-            0: 65535
-          2,2:
-            0: 65535
-          2,3:
-            0: 65535
-          3,0:
-            0: 65535
-          3,1:
-            0: 65535
-          3,2:
-            0: 65535
-          3,3:
-            0: 65535
-          -2,0:
-            0: 65535
-          -2,1:
-            0: 65535
-          -2,2:
-            0: 65535
-          -2,3:
-            0: 65535
-          -1,0:
-            0: 65535
-          -1,1:
-            0: 65535
-          -1,2:
-            0: 65535
-          -1,3:
-            0: 65535
-          4,-4:
-            0: 65535
-          4,-3:
-            0: 65535
-          4,-2:
-            0: 65535
-          4,-1:
-            0: 65535
-          5,-4:
-            0: 65519
-            1: 16
-          5,-3:
-            0: 65535
-          5,-2:
-            0: 65535
-          5,-1:
-            0: 65535
-          6,-4:
-            0: 65519
-            1: 16
-          6,-3:
-            0: 65535
-          6,-2:
-            0: 65535
-          6,-1:
-            0: 65535
-          7,-4:
-            0: 65535
-          7,-3:
-            0: 65535
-          7,-2:
-            0: 65535
-          7,-1:
-            0: 65535
-          0,-6:
-            0: 65535
-          0,-5:
-            0: 65535
-          1,-6:
-            0: 65535
-          1,-5:
-            0: 62463
-            1: 3072
-          2,-6:
-            0: 65535
-          2,-5:
-            0: 65535
-          3,-6:
-            0: 65535
-          3,-5:
-            0: 65535
-          -2,-6:
-            0: 65535
-          -2,-5:
-            0: 65535
-          -1,-6:
-            0: 65535
-          -1,-5:
-            0: 65535
-          -2,4:
-            0: 65535
-          -1,4:
-            0: 65535
-          0,4:
-            0: 65535
-          1,4:
-            0: 65535
-          2,4:
-            0: 65535
-          3,4:
-            0: 65535
-          4,4:
-            0: 65535
-          4,0:
-            0: 65535
-          4,1:
-            0: 65535
-          4,2:
-            0: 65535
-          4,3:
-            0: 65535
-          5,0:
-            0: 65535
-          6,0:
-            0: 65535
-          7,0:
-            0: 65535
-          4,-6:
-            0: 65535
-          4,-5:
-            0: 65535
-          5,-6:
-            0: 65535
-          5,-5:
-            0: 65535
-          6,-6:
-            0: 65535
-          6,-5:
-            0: 65535
-          7,-6:
-            0: 65535
-          7,-5:
-            0: 65535
-          -4,-4:
-            0: 65535
-          -4,-3:
-            0: 4095
-          -3,-4:
-            0: 65535
-          -3,-3:
-            0: 61439
-          -3,-2:
-            0: 61166
-          -3,-1:
-            0: 61166
-          -4,0:
-            0: 65520
-            2: 15
-          -4,1:
-            0: 65535
-          -4,2:
-            0: 65535
-          -4,3:
-            0: 65535
-          -3,0:
-            0: 65534
-            2: 1
-          -3,1:
-            0: 65535
-          -3,2:
-            0: 65535
-          -3,3:
-            0: 65535
-          0,-7:
-            0: 65535
-          1,-7:
-            0: 61441
-            2: 3840
-          2,-7:
-            0: 4096
-            2: 57600
-          3,-7:
-            0: 32768
-            2: 28672
-          -4,-7:
-            0: 65535
-          -4,-6:
-            0: 65535
-          -4,-5:
-            0: 65535
-          -3,-7:
-            0: 65535
-          -3,-6:
-            0: 65535
-          -3,-5:
-            0: 65535
-          -1,-7:
-            0: 65535
-          -4,4:
-            0: 65535
-          -4,5:
-            0: 65535
-          -3,4:
-            0: 65535
-          -3,5:
-            0: 65535
-          -2,5:
-            0: 65535
-          -2,6:
-            0: 65535
-          -1,5:
-            0: 65535
-          -1,6:
-            0: 13107
-          0,5:
-            0: 8191
-          1,5:
-            0: 4095
-          2,5:
-            0: 65535
-          3,5:
-            0: 65535
-          4,5:
-            0: 65535
-          5,4:
-            0: 65535
-          5,5:
-            0: 30719
-          6,4:
-            0: 4915
-          5,1:
-            0: 65535
-          5,2:
-            0: 65535
-          5,3:
-            0: 65535
-          6,1:
-            0: 65535
-          6,2:
-            0: 30719
-          6,3:
-            0: 13107
-          7,1:
-            0: 16383
-          7,2:
-            0: 51
-          4,-7:
-            0: 61440
-          5,-7:
-            0: 61440
-          6,-7:
-            0: 61440
-          7,-7:
-            0: 28672
-          -8,-4:
-            0: 12
-          -7,-4:
-            0: 32783
-          -6,-4:
-            0: 61679
-          -5,-4:
-            0: 65535
-          -5,-3:
-            0: 4095
-          -6,3:
-            0: 65534
-          -6,2:
-            0: 52428
-          -5,0:
-            0: 65520
-            2: 15
-          -5,1:
-            0: 65535
-          -5,2:
-            0: 65535
-          -5,3:
-            0: 65535
-          -7,7:
-            0: 52424
-          -7,5:
-            0: 34944
-          -7,6:
-            0: 34952
-          -6,4:
-            0: 61183
-          -6,5:
-            0: 65535
-          -6,6:
-            0: 65535
-          -6,7:
-            0: 65535
-          -5,4:
-            0: 65535
-          -5,5:
-            0: 65535
-          -8,-6:
-            0: 65535
-          -8,-5:
-            0: 57343
-          -7,-5:
-            0: 65535
-          -7,-6:
-            0: 65535
-          -6,-6:
-            0: 65535
-          -6,-5:
-            0: 65535
-          -6,-7:
-            0: 64704
-          -5,-7:
-            0: 65528
-          -5,-6:
-            0: 65535
-          -5,-5:
-            0: 65535
-          8,0:
-            0: 17
-          8,-4:
-            0: 13107
-          8,-1:
-            0: 4369
-          8,-6:
-            0: 13072
-          8,-5:
-            0: 13107
-          -7,8:
-            0: 12
-          -6,8:
-            0: 3
-          -12,-6:
-            0: 65535
-          -12,-5:
-            0: 65535
-          -11,-6:
-            0: 65533
-          -11,-5:
-            0: 65535
-          -10,-6:
-            0: 65535
-          -10,-5:
-            0: 65535
-          -9,-6:
-            0: 65535
-          -9,-5:
-            0: 65535
-          -15,-4:
-            0: 65535
-          -15,-3:
-            0: 65535
-          -15,-2:
-            0: 65535
-          -15,-1:
-            0: 65535
-          -14,-4:
-            0: 65535
-          -14,-3:
-            0: 29495
-          -14,-2:
-            0: 30583
-          -14,-1:
-            0: 13175
-          -13,-4:
-            0: 4607
-          -12,-4:
-            0: 255
-          -11,-4:
-            0: 255
-          -10,-4:
-            0: 255
-          -9,-4:
-            0: 119
-          -15,-5:
-            0: 65535
-          -14,-5:
-            0: 65535
-          -14,-6:
-            0: 65535
-          -13,-6:
-            0: 65535
-          -13,-5:
-            0: 65535
-          -15,0:
-            0: 65518
-          -15,1:
-            0: 65535
-          -15,2:
-            0: 65535
-          -15,3:
-            0: 65535
-          -14,0:
-            0: 13171
-          -14,1:
-            0: 13075
-          -14,2:
-            0: 13107
-          -14,3:
-            0: 29491
-          -15,4:
-            0: 65535
-          -15,5:
-            0: 65535
-          -15,6:
-            0: 35007
-          -14,4:
-            0: 65535
-          -14,5:
-            0: 65535
-          -14,6:
-            0: 16383
-          -2,-7:
-            0: 65535
-          -4,6:
-            0: 65535
-          -4,7:
-            0: 4095
-          -3,6:
-            0: 65535
-          -3,7:
-            0: 511
-          -2,7:
-            0: 255
-          -1,7:
-            0: 51
-          2,6:
-            0: 52428
-          2,7:
-            0: 52428
-          3,6:
-            0: 65535
-          3,7:
-            0: 65535
-          4,6:
-            0: 65535
-          4,7:
-            0: 65535
-          5,6:
-            0: 13107
-          5,7:
-            0: 4915
-          -7,-3:
-            0: 2184
-          -6,-3:
-            0: 4095
-          -7,0:
-            0: 65520
-            2: 15
-          -7,1:
-            0: 15
-          -6,0:
-            0: 65520
-            2: 15
-          -6,1:
-            0: 15
-            2: 51328
-          -5,6:
-            0: 65535
-          -5,7:
-            0: 32767
-          -8,-7:
-            0: 63744
-          -7,-7:
-            0: 65407
-          -12,-7:
-            0: 65519
-          -11,-7:
-            0: 4983
-          -10,-7:
-            0: 60622
-          -9,-7:
-            0: 65535
-          -16,-4:
-            0: 65535
-          -16,-3:
-            0: 65535
-          -16,-2:
-            0: 65535
-          -16,-1:
-            0: 65535
-          -16,-7:
-            0: 13107
-          -16,-6:
-            0: 65535
-          -16,-5:
-            0: 65535
-          -15,-6:
-            0: 65535
-          -15,-7:
-            0: 52360
-          -14,-7:
-            0: 65535
-          -13,-7:
-            0: 63251
-          -16,0:
-            0: 65535
-          -16,1:
-            0: 65535
-          -16,2:
-            0: 65535
-          -16,3:
-            0: 65535
-          -16,4:
-            0: 65535
-          -16,5:
-            0: 65535
-          -16,6:
-            0: 255
-          -18,0:
-            0: 65535
-          -18,3:
-            0: 61440
-          -18,1:
-            0: 34956
-          -17,0:
-            0: 65535
-          -17,1:
-            0: 65535
-          -17,2:
-            0: 65519
-          -17,3:
-            0: 65535
-          -18,4:
-            0: 52991
-          -18,5:
-            0: 65532
-          -18,6:
-            0: 3823
-          -17,4:
-            0: 65535
-          -17,5:
-            0: 65535
-          -17,6:
-            0: 4095
-          -18,-4:
-            0: 65535
-          -18,-3:
-            0: 52479
-          -18,-1:
-            0: 65484
-          -18,-2:
-            0: 52428
-          -17,-4:
-            0: 65535
-          -17,-3:
-            0: 65535
-          -17,-2:
-            0: 65535
-          -17,-1:
-            0: 65535
-          -18,-6:
-            0: 65484
-          -18,-5:
-            0: 65535
-          -18,-7:
-            0: 52224
-          -17,-7:
-            0: 65484
-          -17,-6:
-            0: 65535
-          -17,-5:
-            0: 65535
-          2,8:
-            0: 12
-          3,8:
-            0: 15
-          4,8:
-            0: 15
-          5,8:
-            0: 1
-          -8,0:
-            0: 65520
-            2: 15
-          -8,1:
-            0: 15
-          -9,0:
-            0: 61152
-            2: 14
-          -9,1:
-            0: 14
-        uniqueMixes:
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 21.824879
-          - 82.10312
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 21.213781
-          - 79.80423
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        chunkSize: 4
-    - type: RadiationGridResistance
-    - type: OccluderTree
-    - type: Shuttle
-    - type: GravityShake
-      shakeTimes: 10
-    - type: GasTileOverlay
-    - type: SpreaderGrid
-    - type: GridPathfinding
-    - type: BecomesStation
-      id: SyndicateOutpost
-  - uid: 1295
-    components:
-    - type: MetaData
-    - type: Transform
-    - type: Map
-    - type: PhysicsMap
-    - type: Broadphase
-    - type: OccluderTree
-    - type: Parallax
-      parallax: Sky
-    - type: MapAtmosphere
-      space: False
-      mixture:
-        volume: 2500
-        temperature: 248.15
-        moles:
-        - 21.824879
-        - 82.10312
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: LoadedMap
-    - type: GridTree
-    - type: MovedGrids
-- proto: AirlockExternalGlassNukeopLocked
-  entities:
-  - uid: 49
-    components:
-    - type: Transform
-      pos: 3.5,1.5
-      parent: 104
-  - uid: 55
-    components:
-    - type: Transform
-      pos: -1.5,-3.5
-      parent: 104
-  - uid: 56
-    components:
-    - type: Transform
-      pos: -5.5,-3.5
-      parent: 104
-  - uid: 58
-    components:
-    - type: Transform
-      pos: 3.5,3.5
-      parent: 104
-- proto: AirlockGlassShuttle
-  entities:
-  - uid: 2053
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-19.5
-      parent: 104
-  - uid: 2057
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -29.5,-19.5
-      parent: 104
-  - uid: 2062
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,-19.5
-      parent: 104
-  - uid: 2185
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,-19.5
-      parent: 104
-  - uid: 2186
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -17.5,-19.5
-      parent: 104
-  - uid: 2187
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -13.5,-19.5
-      parent: 104
-  - uid: 2190
-    components:
-    - type: Transform
-      pos: -13.5,0.5
-      parent: 104
-  - uid: 2191
-    components:
-    - type: Transform
-      pos: -17.5,0.5
-      parent: 104
-  - uid: 2193
-    components:
-    - type: Transform
-      pos: -21.5,0.5
-      parent: 104
-  - uid: 2448
-    components:
-    - type: Transform
-      pos: -25.5,0.5
-      parent: 104
-  - uid: 2472
-    components:
-    - type: Transform
-      pos: -29.5,0.5
-      parent: 104
-    - type: GridFill
-      addComponents:
-      - type: NukeOpsShuttle
-      path: /Maps/Shuttles/infiltrator.yml
-  - uid: 2481
-    components:
-    - type: Transform
-      pos: -33.5,0.5
-      parent: 104
-- proto: AirlockSyndicateNukeopGlassLocked
-  entities:
-  - uid: 48
-    components:
-    - type: Transform
-      pos: -11.5,6.5
-      parent: 104
-  - uid: 65
-    components:
-    - type: Transform
-      pos: 2.5,-14.5
-      parent: 104
-  - uid: 96
-    components:
-    - type: Transform
-      pos: 8.5,-16.5
-      parent: 104
-  - uid: 112
-    components:
-    - type: Transform
-      pos: 16.5,-7.5
-      parent: 104
-  - uid: 122
-    components:
-    - type: Transform
-      pos: 9.5,-9.5
-      parent: 104
-  - uid: 130
-    components:
-    - type: Transform
-      pos: 11.5,-7.5
-      parent: 104
-  - uid: 131
-    components:
-    - type: Transform
-      pos: 8.5,-0.5
-      parent: 104
-  - uid: 165
-    components:
-    - type: Transform
-      pos: 10.5,-2.5
-      parent: 104
-  - uid: 190
-    components:
-    - type: Transform
-      pos: 16.5,-13.5
-      parent: 104
-  - uid: 302
-    components:
-    - type: Transform
-      pos: 14.5,-5.5
-      parent: 104
-  - uid: 305
-    components:
-    - type: Transform
-      pos: 6.5,-9.5
-      parent: 104
-- proto: AirlockSyndicateNukeopLocked
-  entities:
-  - uid: 109
-    components:
-    - type: Transform
-      pos: 14.5,-1.5
-      parent: 104
-  - uid: 120
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 23.5,-7.5
-      parent: 104
-  - uid: 136
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 17.5,-7.5
-      parent: 104
-  - uid: 148
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 20.5,-10.5
-      parent: 104
-  - uid: 272
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 20.5,-4.5
-      parent: 104
-- proto: AlwaysPoweredLightExterior
-  entities:
-  - uid: 1267
-    components:
-    - type: Transform
-      pos: -15.5,23.5
-      parent: 104
-- proto: AlwaysPoweredLightLED
-  entities:
-  - uid: 135
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,-1.5
-      parent: 104
-  - uid: 974
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-17.5
-      parent: 104
-  - uid: 1286
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,-5.5
-      parent: 104
-  - uid: 1287
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,-11.5
-      parent: 104
-  - uid: 1288
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,-20.5
-      parent: 104
-- proto: AlwaysPoweredWallLight
-  entities:
-  - uid: 258
-    components:
-    - type: Transform
-      pos: -3.5,-2.5
-      parent: 104
-  - uid: 1356
-    components:
-    - type: Transform
-      pos: 1.5,-12.5
-      parent: 104
-  - uid: 1470
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 12.5,-14.5
-      parent: 104
-  - uid: 1471
-    components:
-    - type: Transform
-      pos: 12.5,-10.5
-      parent: 104
-  - uid: 1532
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 10.5,-8.5
-      parent: 104
-  - uid: 1534
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-1.5
-      parent: 104
-  - uid: 1536
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-2.5
-      parent: 104
-  - uid: 1537
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-8.5
-      parent: 104
-  - uid: 1544
-    components:
-    - type: Transform
-      pos: 15.5,-6.5
-      parent: 104
-  - uid: 1545
-    components:
-    - type: Transform
-      pos: 14.5,-3.5
-      parent: 104
-  - uid: 1546
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 10.5,-4.5
-      parent: 104
-  - uid: 1570
-    components:
-    - type: Transform
-      pos: 19.5,-5.5
-      parent: 104
-  - uid: 1571
-    components:
-    - type: Transform
-      pos: 21.5,-5.5
-      parent: 104
-  - uid: 1572
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 19.5,-9.5
-      parent: 104
-  - uid: 1573
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 21.5,-9.5
-      parent: 104
-  - uid: 1758
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,5.5
-      parent: 104
-  - uid: 1759
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,12.5
-      parent: 104
-  - uid: 1760
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 14.5,-22.5
-      parent: 104
-  - uid: 1763
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.5,-22.5
-      parent: 104
-  - uid: 1867
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-16.5
-      parent: 104
-  - uid: 2257
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,10.5
-      parent: 104
-  - uid: 2291
-    components:
-    - type: Transform
-      pos: 5.5,14.5
-      parent: 104
-  - uid: 2397
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 24.5,-11.5
-      parent: 104
-  - uid: 2398
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 24.5,-3.5
-      parent: 104
-  - uid: 2399
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 17.5,-3.5
-      parent: 104
-  - uid: 2400
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 17.5,-11.5
-      parent: 104
-  - uid: 2401
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 17.5,-15.5
-      parent: 104
-  - uid: 2402
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 27.5,-15.5
-      parent: 104
-  - uid: 2403
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-19.5
-      parent: 104
-  - uid: 2404
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 19.5,-19.5
-      parent: 104
-  - uid: 3375
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-11.5
-      parent: 104
-  - uid: 3377
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-11.5
-      parent: 104
-- proto: APCHyperCapacity
-  entities:
-  - uid: 1431
-    components:
-    - type: Transform
-      pos: 20.5,-12.5
-      parent: 104
-  - uid: 1445
-    components:
-    - type: Transform
-      pos: 13.5,-9.5
-      parent: 104
-  - uid: 1477
-    components:
-    - type: Transform
-      pos: 8.5,-5.5
-      parent: 104
-  - uid: 1574
-    components:
-    - type: Transform
-      pos: 21.5,-4.5
-      parent: 104
-- proto: AsteroidRock
-  entities:
-  - uid: 19
-    components:
-    - type: Transform
-      pos: 16.5,1.5
-      parent: 104
-  - uid: 20
-    components:
-    - type: Transform
-      pos: -3.5,-10.5
-      parent: 104
-  - uid: 216
-    components:
-    - type: Transform
-      pos: -4.5,-9.5
-      parent: 104
-  - uid: 238
-    components:
-    - type: Transform
-      pos: -4.5,-13.5
-      parent: 104
-  - uid: 243
-    components:
-    - type: Transform
-      pos: -4.5,-6.5
-      parent: 104
-  - uid: 244
-    components:
-    - type: Transform
-      pos: -4.5,-8.5
-      parent: 104
-  - uid: 246
-    components:
-    - type: Transform
-      pos: -3.5,-8.5
-      parent: 104
-  - uid: 247
-    components:
-    - type: Transform
-      pos: -4.5,-12.5
-      parent: 104
-  - uid: 248
-    components:
-    - type: Transform
-      pos: -4.5,-7.5
-      parent: 104
-  - uid: 249
-    components:
-    - type: Transform
-      pos: -8.5,9.5
-      parent: 104
-  - uid: 250
-    components:
-    - type: Transform
-      pos: 0.5,-10.5
-      parent: 104
-  - uid: 251
-    components:
-    - type: Transform
-      pos: 15.5,1.5
-      parent: 104
-  - uid: 255
-    components:
-    - type: Transform
-      pos: -3.5,-7.5
-      parent: 104
-  - uid: 257
-    components:
-    - type: Transform
-      pos: 15.5,0.5
-      parent: 104
-  - uid: 259
-    components:
-    - type: Transform
-      pos: -4.5,-10.5
-      parent: 104
-  - uid: 263
-    components:
-    - type: Transform
-      pos: -4.5,-11.5
-      parent: 104
-  - uid: 277
-    components:
-    - type: Transform
-      pos: -10.5,22.5
-      parent: 104
-  - uid: 292
-    components:
-    - type: Transform
-      pos: -9.5,21.5
-      parent: 104
-  - uid: 294
-    components:
-    - type: Transform
-      pos: -10.5,21.5
-      parent: 104
-  - uid: 295
-    components:
-    - type: Transform
-      pos: -11.5,22.5
-      parent: 104
-  - uid: 296
-    components:
-    - type: Transform
-      pos: -20.5,9.5
-      parent: 104
-  - uid: 358
-    components:
-    - type: Transform
-      pos: -22.5,21.5
-      parent: 104
-  - uid: 359
-    components:
-    - type: Transform
-      pos: -22.5,15.5
-      parent: 104
-  - uid: 360
-    components:
-    - type: Transform
-      pos: -22.5,16.5
-      parent: 104
-  - uid: 361
-    components:
-    - type: Transform
-      pos: -21.5,17.5
-      parent: 104
-  - uid: 362
-    components:
-    - type: Transform
-      pos: -21.5,16.5
-      parent: 104
-  - uid: 363
-    components:
-    - type: Transform
-      pos: -21.5,15.5
-      parent: 104
-  - uid: 364
-    components:
-    - type: Transform
-      pos: -21.5,14.5
-      parent: 104
-  - uid: 365
-    components:
-    - type: Transform
-      pos: -22.5,14.5
-      parent: 104
-  - uid: 366
-    components:
-    - type: Transform
-      pos: -21.5,13.5
-      parent: 104
-  - uid: 367
-    components:
-    - type: Transform
-      pos: -21.5,20.5
-      parent: 104
-  - uid: 368
-    components:
-    - type: Transform
-      pos: -21.5,21.5
-      parent: 104
-  - uid: 369
-    components:
-    - type: Transform
-      pos: -20.5,21.5
-      parent: 104
-  - uid: 370
-    components:
-    - type: Transform
-      pos: -19.5,21.5
-      parent: 104
-  - uid: 371
-    components:
-    - type: Transform
-      pos: -20.5,22.5
-      parent: 104
-  - uid: 372
-    components:
-    - type: Transform
-      pos: -18.5,21.5
-      parent: 104
-  - uid: 373
-    components:
-    - type: Transform
-      pos: -20.5,8.5
-      parent: 104
-  - uid: 374
-    components:
-    - type: Transform
-      pos: -22.5,22.5
-      parent: 104
-  - uid: 375
-    components:
-    - type: Transform
-      pos: -21.5,22.5
-      parent: 104
-  - uid: 376
-    components:
-    - type: Transform
-      pos: -23.5,22.5
-      parent: 104
-  - uid: 377
-    components:
-    - type: Transform
-      pos: -20.5,15.5
-      parent: 104
-  - uid: 401
-    components:
-    - type: Transform
-      pos: -20.5,20.5
-      parent: 104
-  - uid: 402
-    components:
-    - type: Transform
-      pos: -20.5,19.5
-      parent: 104
-  - uid: 403
-    components:
-    - type: Transform
-      pos: -20.5,18.5
-      parent: 104
-  - uid: 404
-    components:
-    - type: Transform
-      pos: -20.5,17.5
-      parent: 104
-  - uid: 405
-    components:
-    - type: Transform
-      pos: -20.5,16.5
-      parent: 104
-  - uid: 406
-    components:
-    - type: Transform
-      pos: -20.5,14.5
-      parent: 104
-  - uid: 407
-    components:
-    - type: Transform
-      pos: -24.5,23.5
-      parent: 104
-  - uid: 408
-    components:
-    - type: Transform
-      pos: -24.5,22.5
-      parent: 104
-  - uid: 409
-    components:
-    - type: Transform
-      pos: -20.5,10.5
-      parent: 104
-  - uid: 410
-    components:
-    - type: Transform
-      pos: -9.5,22.5
-      parent: 104
-  - uid: 415
-    components:
-    - type: Transform
-      pos: -18.5,23.5
-      parent: 104
-  - uid: 417
-    components:
-    - type: Transform
-      pos: -16.5,6.5
-      parent: 104
-  - uid: 419
-    components:
-    - type: Transform
-      pos: -7.5,21.5
-      parent: 104
-  - uid: 420
-    components:
-    - type: Transform
-      pos: -8.5,21.5
-      parent: 104
-  - uid: 421
-    components:
-    - type: Transform
-      pos: -10.5,23.5
-      parent: 104
-  - uid: 422
-    components:
-    - type: Transform
-      pos: -11.5,23.5
-      parent: 104
-  - uid: 423
-    components:
-    - type: Transform
-      pos: -19.5,22.5
-      parent: 104
-  - uid: 425
-    components:
-    - type: Transform
-      pos: -18.5,22.5
-      parent: 104
-  - uid: 426
-    components:
-    - type: Transform
-      pos: -7.5,12.5
-      parent: 104
-  - uid: 455
-    components:
-    - type: Transform
-      pos: 1.5,-19.5
-      parent: 104
-  - uid: 469
-    components:
-    - type: Transform
-      pos: -8.5,10.5
-      parent: 104
-  - uid: 471
-    components:
-    - type: Transform
-      pos: -9.5,10.5
-      parent: 104
-  - uid: 473
-    components:
-    - type: Transform
-      pos: -8.5,11.5
-      parent: 104
-  - uid: 475
-    components:
-    - type: Transform
-      pos: -9.5,11.5
-      parent: 104
-  - uid: 477
-    components:
-    - type: Transform
-      pos: 16.5,0.5
-      parent: 104
-  - uid: 478
-    components:
-    - type: Transform
-      pos: -6.5,12.5
-      parent: 104
-  - uid: 479
-    components:
-    - type: Transform
-      pos: -2.5,-18.5
-      parent: 104
-  - uid: 480
-    components:
-    - type: Transform
-      pos: -2.5,-19.5
-      parent: 104
-  - uid: 483
-    components:
-    - type: Transform
-      pos: -2.5,-10.5
-      parent: 104
-  - uid: 485
-    components:
-    - type: Transform
-      pos: -2.5,-6.5
-      parent: 104
-  - uid: 488
-    components:
-    - type: Transform
-      pos: -2.5,-7.5
-      parent: 104
-  - uid: 489
-    components:
-    - type: Transform
-      pos: -2.5,-8.5
-      parent: 104
-  - uid: 492
-    components:
-    - type: Transform
-      pos: -3.5,-20.5
-      parent: 104
-  - uid: 502
-    components:
-    - type: Transform
-      pos: -3.5,-18.5
-      parent: 104
-  - uid: 504
-    components:
-    - type: Transform
-      pos: -2.5,-9.5
-      parent: 104
-  - uid: 505
-    components:
-    - type: Transform
-      pos: -3.5,-19.5
-      parent: 104
-  - uid: 506
-    components:
-    - type: Transform
-      pos: 17.5,-1.5
-      parent: 104
-  - uid: 509
-    components:
-    - type: Transform
-      pos: -4.5,-19.5
-      parent: 104
-  - uid: 511
-    components:
-    - type: Transform
-      pos: -4.5,-18.5
-      parent: 104
-  - uid: 512
-    components:
-    - type: Transform
-      pos: -9.5,12.5
-      parent: 104
-  - uid: 513
-    components:
-    - type: Transform
-      pos: -3.5,-9.5
-      parent: 104
-  - uid: 521
-    components:
-    - type: Transform
-      pos: -4.5,-14.5
-      parent: 104
-  - uid: 522
-    components:
-    - type: Transform
-      pos: -1.5,19.5
-      parent: 104
-  - uid: 524
-    components:
-    - type: Transform
-      pos: -0.5,19.5
-      parent: 104
-  - uid: 525
-    components:
-    - type: Transform
-      pos: 9.5,20.5
-      parent: 104
-  - uid: 529
-    components:
-    - type: Transform
-      pos: 10.5,19.5
-      parent: 104
-  - uid: 531
-    components:
-    - type: Transform
-      pos: 11.5,19.5
-      parent: 104
-  - uid: 532
-    components:
-    - type: Transform
-      pos: 12.5,19.5
-      parent: 104
-  - uid: 533
-    components:
-    - type: Transform
-      pos: 16.5,19.5
-      parent: 104
-  - uid: 534
-    components:
-    - type: Transform
-      pos: 17.5,19.5
-      parent: 104
-  - uid: 535
-    components:
-    - type: Transform
-      pos: 18.5,19.5
-      parent: 104
-  - uid: 536
-    components:
-    - type: Transform
-      pos: 18.5,11.5
-      parent: 104
-  - uid: 537
-    components:
-    - type: Transform
-      pos: 18.5,12.5
-      parent: 104
-  - uid: 538
-    components:
-    - type: Transform
-      pos: 18.5,15.5
-      parent: 104
-  - uid: 539
-    components:
-    - type: Transform
-      pos: 18.5,18.5
-      parent: 104
-  - uid: 543
-    components:
-    - type: Transform
-      pos: 26.5,9.5
-      parent: 104
-  - uid: 546
-    components:
-    - type: Transform
-      pos: 28.5,3.5
-      parent: 104
-  - uid: 547
-    components:
-    - type: Transform
-      pos: 29.5,3.5
-      parent: 104
-  - uid: 548
-    components:
-    - type: Transform
-      pos: 30.5,3.5
-      parent: 104
-  - uid: 549
-    components:
-    - type: Transform
-      pos: 22.5,-22.5
-      parent: 104
-  - uid: 550
-    components:
-    - type: Transform
-      pos: 31.5,-20.5
-      parent: 104
-  - uid: 551
-    components:
-    - type: Transform
-      pos: 31.5,-19.5
-      parent: 104
-  - uid: 552
-    components:
-    - type: Transform
-      pos: 31.5,-18.5
-      parent: 104
-  - uid: 553
-    components:
-    - type: Transform
-      pos: 31.5,-17.5
-      parent: 104
-  - uid: 554
-    components:
-    - type: Transform
-      pos: 31.5,-16.5
-      parent: 104
-  - uid: 555
-    components:
-    - type: Transform
-      pos: 31.5,-15.5
-      parent: 104
-  - uid: 556
-    components:
-    - type: Transform
-      pos: 31.5,-14.5
-      parent: 104
-  - uid: 557
-    components:
-    - type: Transform
-      pos: 31.5,-13.5
-      parent: 104
-  - uid: 558
-    components:
-    - type: Transform
-      pos: 31.5,-12.5
-      parent: 104
-  - uid: 559
-    components:
-    - type: Transform
-      pos: 31.5,-7.5
-      parent: 104
-  - uid: 560
-    components:
-    - type: Transform
-      pos: 31.5,-6.5
-      parent: 104
-  - uid: 561
-    components:
-    - type: Transform
-      pos: 31.5,-5.5
-      parent: 104
-  - uid: 562
-    components:
-    - type: Transform
-      pos: 31.5,-4.5
-      parent: 104
-  - uid: 563
-    components:
-    - type: Transform
-      pos: 31.5,-3.5
-      parent: 104
-  - uid: 564
-    components:
-    - type: Transform
-      pos: 31.5,-2.5
-      parent: 104
-  - uid: 565
-    components:
-    - type: Transform
-      pos: 31.5,-1.5
-      parent: 104
-  - uid: 566
-    components:
-    - type: Transform
-      pos: 31.5,-0.5
-      parent: 104
-  - uid: 567
-    components:
-    - type: Transform
-      pos: 31.5,0.5
-      parent: 104
-  - uid: 568
-    components:
-    - type: Transform
-      pos: 31.5,1.5
-      parent: 104
-  - uid: 569
-    components:
-    - type: Transform
-      pos: 17.5,-22.5
-      parent: 104
-  - uid: 570
-    components:
-    - type: Transform
-      pos: 18.5,-22.5
-      parent: 104
-  - uid: 571
-    components:
-    - type: Transform
-      pos: 19.5,-22.5
-      parent: 104
-  - uid: 572
-    components:
-    - type: Transform
-      pos: 20.5,-22.5
-      parent: 104
-  - uid: 573
-    components:
-    - type: Transform
-      pos: 21.5,-22.5
-      parent: 104
-  - uid: 574
-    components:
-    - type: Transform
-      pos: -5.5,-22.5
-      parent: 104
-  - uid: 575
-    components:
-    - type: Transform
-      pos: 23.5,-22.5
-      parent: 104
-  - uid: 576
-    components:
-    - type: Transform
-      pos: 24.5,-22.5
-      parent: 104
-  - uid: 577
-    components:
-    - type: Transform
-      pos: 25.5,-22.5
-      parent: 104
-  - uid: 578
-    components:
-    - type: Transform
-      pos: 26.5,-22.5
-      parent: 104
-  - uid: 579
-    components:
-    - type: Transform
-      pos: 27.5,-22.5
-      parent: 104
-  - uid: 580
-    components:
-    - type: Transform
-      pos: 28.5,-22.5
-      parent: 104
-  - uid: 581
-    components:
-    - type: Transform
-      pos: -4.5,-20.5
-      parent: 104
-  - uid: 582
-    components:
-    - type: Transform
-      pos: -4.5,-15.5
-      parent: 104
-  - uid: 586
-    components:
-    - type: Transform
-      pos: 4.5,-22.5
-      parent: 104
-  - uid: 587
-    components:
-    - type: Transform
-      pos: 5.5,-22.5
-      parent: 104
-  - uid: 588
-    components:
-    - type: Transform
-      pos: 6.5,-22.5
-      parent: 104
-  - uid: 589
-    components:
-    - type: Transform
-      pos: 7.5,-22.5
-      parent: 104
-  - uid: 590
-    components:
-    - type: Transform
-      pos: 8.5,-22.5
-      parent: 104
-  - uid: 595
-    components:
-    - type: Transform
-      pos: -5.5,-21.5
-      parent: 104
-  - uid: 596
-    components:
-    - type: Transform
-      pos: -5.5,-20.5
-      parent: 104
-  - uid: 597
-    components:
-    - type: Transform
-      pos: -5.5,-19.5
-      parent: 104
-  - uid: 598
-    components:
-    - type: Transform
-      pos: -5.5,-18.5
-      parent: 104
-  - uid: 599
-    components:
-    - type: Transform
-      pos: -5.5,-17.5
-      parent: 104
-  - uid: 600
-    components:
-    - type: Transform
-      pos: -5.5,-16.5
-      parent: 104
-  - uid: 601
-    components:
-    - type: Transform
-      pos: -5.5,-15.5
-      parent: 104
-  - uid: 602
-    components:
-    - type: Transform
-      pos: -5.5,-14.5
-      parent: 104
-  - uid: 603
-    components:
-    - type: Transform
-      pos: -5.5,-13.5
-      parent: 104
-  - uid: 604
-    components:
-    - type: Transform
-      pos: -5.5,-12.5
-      parent: 104
-  - uid: 605
-    components:
-    - type: Transform
-      pos: -5.5,-11.5
-      parent: 104
-  - uid: 606
-    components:
-    - type: Transform
-      pos: -5.5,-10.5
-      parent: 104
-  - uid: 607
-    components:
-    - type: Transform
-      pos: -5.5,-9.5
-      parent: 104
-  - uid: 608
-    components:
-    - type: Transform
-      pos: -5.5,-8.5
-      parent: 104
-  - uid: 609
-    components:
-    - type: Transform
-      pos: -5.5,-7.5
-      parent: 104
-  - uid: 610
-    components:
-    - type: Transform
-      pos: -14.5,16.5
-      parent: 104
-  - uid: 614
-    components:
-    - type: Transform
-      pos: -16.5,15.5
-      parent: 104
-  - uid: 615
-    components:
-    - type: Transform
-      pos: -10.5,9.5
-      parent: 104
-  - uid: 618
-    components:
-    - type: Transform
-      pos: -8.5,12.5
-      parent: 104
-  - uid: 621
-    components:
-    - type: Transform
-      pos: -9.5,9.5
-      parent: 104
-  - uid: 622
-    components:
-    - type: Transform
-      pos: -10.5,10.5
-      parent: 104
-  - uid: 632
-    components:
-    - type: Transform
-      pos: -10.5,12.5
-      parent: 104
-  - uid: 637
-    components:
-    - type: Transform
-      pos: -10.5,11.5
-      parent: 104
-  - uid: 640
-    components:
-    - type: Transform
-      pos: -16.5,5.5
-      parent: 104
-  - uid: 648
-    components:
-    - type: Transform
-      pos: -11.5,13.5
-      parent: 104
-  - uid: 670
-    components:
-    - type: Transform
-      pos: -18.5,10.5
-      parent: 104
-  - uid: 672
-    components:
-    - type: Transform
-      pos: -16.5,16.5
-      parent: 104
-  - uid: 673
-    components:
-    - type: Transform
-      pos: -11.5,12.5
-      parent: 104
-  - uid: 674
-    components:
-    - type: Transform
-      pos: -19.5,15.5
-      parent: 104
-  - uid: 676
-    components:
-    - type: Transform
-      pos: -19.5,16.5
-      parent: 104
-  - uid: 677
-    components:
-    - type: Transform
-      pos: -18.5,11.5
-      parent: 104
-  - uid: 678
-    components:
-    - type: Transform
-      pos: -14.5,11.5
-      parent: 104
-  - uid: 679
-    components:
-    - type: Transform
-      pos: -14.5,17.5
-      parent: 104
-  - uid: 680
-    components:
-    - type: Transform
-      pos: -14.5,18.5
-      parent: 104
-  - uid: 681
-    components:
-    - type: Transform
-      pos: -15.5,14.5
-      parent: 104
-  - uid: 682
-    components:
-    - type: Transform
-      pos: -24.5,25.5
-      parent: 104
-  - uid: 684
-    components:
-    - type: Transform
-      pos: -17.5,13.5
-      parent: 104
-  - uid: 685
-    components:
-    - type: Transform
-      pos: -15.5,16.5
-      parent: 104
-  - uid: 686
-    components:
-    - type: Transform
-      pos: -12.5,12.5
-      parent: 104
-  - uid: 687
-    components:
-    - type: Transform
-      pos: -12.5,11.5
-      parent: 104
-  - uid: 688
-    components:
-    - type: Transform
-      pos: -11.5,14.5
-      parent: 104
-  - uid: 689
-    components:
-    - type: Transform
-      pos: -15.5,15.5
-      parent: 104
-  - uid: 690
-    components:
-    - type: Transform
-      pos: -14.5,14.5
-      parent: 104
-  - uid: 691
-    components:
-    - type: Transform
-      pos: -19.5,14.5
-      parent: 104
-  - uid: 692
-    components:
-    - type: Transform
-      pos: -13.5,16.5
-      parent: 104
-  - uid: 693
-    components:
-    - type: Transform
-      pos: -17.5,15.5
-      parent: 104
-  - uid: 694
-    components:
-    - type: Transform
-      pos: -11.5,9.5
-      parent: 104
-  - uid: 695
-    components:
-    - type: Transform
-      pos: -20.5,23.5
-      parent: 104
-  - uid: 699
-    components:
-    - type: Transform
-      pos: -18.5,8.5
-      parent: 104
-  - uid: 700
-    components:
-    - type: Transform
-      pos: -18.5,9.5
-      parent: 104
-  - uid: 701
-    components:
-    - type: Transform
-      pos: -13.5,12.5
-      parent: 104
-  - uid: 702
-    components:
-    - type: Transform
-      pos: -13.5,17.5
-      parent: 104
-  - uid: 703
-    components:
-    - type: Transform
-      pos: -13.5,18.5
-      parent: 104
-  - uid: 704
-    components:
-    - type: Transform
-      pos: -15.5,18.5
-      parent: 104
-  - uid: 705
-    components:
-    - type: Transform
-      pos: -17.5,14.5
-      parent: 104
-  - uid: 706
-    components:
-    - type: Transform
-      pos: -11.5,11.5
-      parent: 104
-  - uid: 708
-    components:
-    - type: Transform
-      pos: -17.5,11.5
-      parent: 104
-  - uid: 709
-    components:
-    - type: Transform
-      pos: -17.5,16.5
-      parent: 104
-  - uid: 711
-    components:
-    - type: Transform
-      pos: -17.5,10.5
-      parent: 104
-  - uid: 712
-    components:
-    - type: Transform
-      pos: -15.5,17.5
-      parent: 104
-  - uid: 714
-    components:
-    - type: Transform
-      pos: -11.5,17.5
-      parent: 104
-  - uid: 716
-    components:
-    - type: Transform
-      pos: -13.5,13.5
-      parent: 104
-  - uid: 717
-    components:
-    - type: Transform
-      pos: -13.5,14.5
-      parent: 104
-  - uid: 718
-    components:
-    - type: Transform
-      pos: -18.5,14.5
-      parent: 104
-  - uid: 719
-    components:
-    - type: Transform
-      pos: -18.5,15.5
-      parent: 104
-  - uid: 720
-    components:
-    - type: Transform
-      pos: -18.5,16.5
-      parent: 104
-  - uid: 721
-    components:
-    - type: Transform
-      pos: -17.5,8.5
-      parent: 104
-  - uid: 722
-    components:
-    - type: Transform
-      pos: -16.5,13.5
-      parent: 104
-  - uid: 723
-    components:
-    - type: Transform
-      pos: -16.5,14.5
-      parent: 104
-  - uid: 724
-    components:
-    - type: Transform
-      pos: -12.5,17.5
-      parent: 104
-  - uid: 725
-    components:
-    - type: Transform
-      pos: -12.5,18.5
-      parent: 104
-  - uid: 726
-    components:
-    - type: Transform
-      pos: -14.5,12.5
-      parent: 104
-  - uid: 728
-    components:
-    - type: Transform
-      pos: -14.5,13.5
-      parent: 104
-  - uid: 729
-    components:
-    - type: Transform
-      pos: -18.5,17.5
-      parent: 104
-  - uid: 733
-    components:
-    - type: Transform
-      pos: -18.5,18.5
-      parent: 104
-  - uid: 734
-    components:
-    - type: Transform
-      pos: -18.5,19.5
-      parent: 104
-  - uid: 735
-    components:
-    - type: Transform
-      pos: -12.5,13.5
-      parent: 104
-  - uid: 740
-    components:
-    - type: Transform
-      pos: -12.5,15.5
-      parent: 104
-  - uid: 741
-    components:
-    - type: Transform
-      pos: -19.5,17.5
-      parent: 104
-  - uid: 745
-    components:
-    - type: Transform
-      pos: -19.5,18.5
-      parent: 104
-  - uid: 746
-    components:
-    - type: Transform
-      pos: -19.5,19.5
-      parent: 104
-  - uid: 747
-    components:
-    - type: Transform
-      pos: -16.5,17.5
-      parent: 104
-  - uid: 752
-    components:
-    - type: Transform
-      pos: -16.5,18.5
-      parent: 104
-  - uid: 753
-    components:
-    - type: Transform
-      pos: -15.5,11.5
-      parent: 104
-  - uid: 755
-    components:
-    - type: Transform
-      pos: -15.5,12.5
-      parent: 104
-  - uid: 756
-    components:
-    - type: Transform
-      pos: -12.5,14.5
-      parent: 104
-  - uid: 757
-    components:
-    - type: Transform
-      pos: -16.5,12.5
-      parent: 104
-  - uid: 758
-    components:
-    - type: Transform
-      pos: -13.5,15.5
-      parent: 104
-  - uid: 759
-    components:
-    - type: Transform
-      pos: -19.5,9.5
-      parent: 104
-  - uid: 762
-    components:
-    - type: Transform
-      pos: -17.5,9.5
-      parent: 104
-  - uid: 763
-    components:
-    - type: Transform
-      pos: -17.5,17.5
-      parent: 104
-  - uid: 764
-    components:
-    - type: Transform
-      pos: -17.5,18.5
-      parent: 104
-  - uid: 765
-    components:
-    - type: Transform
-      pos: -16.5,11.5
-      parent: 104
-  - uid: 768
-    components:
-    - type: Transform
-      pos: -19.5,8.5
-      parent: 104
-  - uid: 771
-    components:
-    - type: Transform
-      pos: -6.5,13.5
-      parent: 104
-  - uid: 774
-    components:
-    - type: Transform
-      pos: -10.5,18.5
-      parent: 104
-  - uid: 775
-    components:
-    - type: Transform
-      pos: -10.5,17.5
-      parent: 104
-  - uid: 776
-    components:
-    - type: Transform
-      pos: -10.5,16.5
-      parent: 104
-  - uid: 777
-    components:
-    - type: Transform
-      pos: -10.5,15.5
-      parent: 104
-  - uid: 778
-    components:
-    - type: Transform
-      pos: -10.5,14.5
-      parent: 104
-  - uid: 779
-    components:
-    - type: Transform
-      pos: -10.5,13.5
-      parent: 104
-  - uid: 780
-    components:
-    - type: Transform
-      pos: -9.5,19.5
-      parent: 104
-  - uid: 781
-    components:
-    - type: Transform
-      pos: -9.5,18.5
-      parent: 104
-  - uid: 782
-    components:
-    - type: Transform
-      pos: -9.5,17.5
-      parent: 104
-  - uid: 783
-    components:
-    - type: Transform
-      pos: -9.5,16.5
-      parent: 104
-  - uid: 784
-    components:
-    - type: Transform
-      pos: -9.5,15.5
-      parent: 104
-  - uid: 785
-    components:
-    - type: Transform
-      pos: -9.5,14.5
-      parent: 104
-  - uid: 786
-    components:
-    - type: Transform
-      pos: -9.5,13.5
-      parent: 104
-  - uid: 787
-    components:
-    - type: Transform
-      pos: -8.5,19.5
-      parent: 104
-  - uid: 788
-    components:
-    - type: Transform
-      pos: -8.5,18.5
-      parent: 104
-  - uid: 789
-    components:
-    - type: Transform
-      pos: -8.5,17.5
-      parent: 104
-  - uid: 790
-    components:
-    - type: Transform
-      pos: -8.5,15.5
-      parent: 104
-  - uid: 791
-    components:
-    - type: Transform
-      pos: -8.5,14.5
-      parent: 104
-  - uid: 792
-    components:
-    - type: Transform
-      pos: -8.5,13.5
-      parent: 104
-  - uid: 793
-    components:
-    - type: Transform
-      pos: -7.5,19.5
-      parent: 104
-  - uid: 794
-    components:
-    - type: Transform
-      pos: -7.5,18.5
-      parent: 104
-  - uid: 795
-    components:
-    - type: Transform
-      pos: -7.5,15.5
-      parent: 104
-  - uid: 796
-    components:
-    - type: Transform
-      pos: -7.5,14.5
-      parent: 104
-  - uid: 797
-    components:
-    - type: Transform
-      pos: -7.5,13.5
-      parent: 104
-  - uid: 798
-    components:
-    - type: Transform
-      pos: -15.5,13.5
-      parent: 104
-  - uid: 801
-    components:
-    - type: Transform
-      pos: -12.5,16.5
-      parent: 104
-  - uid: 802
-    components:
-    - type: Transform
-      pos: -14.5,15.5
-      parent: 104
-  - uid: 803
-    components:
-    - type: Transform
-      pos: -19.5,23.5
-      parent: 104
-  - uid: 804
-    components:
-    - type: Transform
-      pos: -24.5,24.5
-      parent: 104
-  - uid: 805
-    components:
-    - type: Transform
-      pos: -19.5,10.5
-      parent: 104
-  - uid: 806
-    components:
-    - type: Transform
-      pos: -17.5,12.5
-      parent: 104
-  - uid: 807
-    components:
-    - type: Transform
-      pos: -11.5,16.5
-      parent: 104
-  - uid: 808
-    components:
-    - type: Transform
-      pos: -11.5,15.5
-      parent: 104
-  - uid: 809
-    components:
-    - type: Transform
-      pos: -13.5,11.5
-      parent: 104
-  - uid: 810
-    components:
-    - type: Transform
-      pos: -19.5,20.5
-      parent: 104
-  - uid: 1020
-    components:
-    - type: Transform
-      pos: -18.5,20.5
-      parent: 104
-  - uid: 1021
-    components:
-    - type: Transform
-      pos: -10.5,20.5
-      parent: 104
-  - uid: 1027
-    components:
-    - type: Transform
-      pos: -9.5,20.5
-      parent: 104
-  - uid: 1028
-    components:
-    - type: Transform
-      pos: -8.5,20.5
-      parent: 104
-  - uid: 1029
-    components:
-    - type: Transform
-      pos: -7.5,20.5
-      parent: 104
-  - uid: 1030
-    components:
-    - type: Transform
-      pos: -2.5,20.5
-      parent: 104
-  - uid: 1031
-    components:
-    - type: Transform
-      pos: -1.5,20.5
-      parent: 104
-  - uid: 1032
-    components:
-    - type: Transform
-      pos: -0.5,20.5
-      parent: 104
-  - uid: 1033
-    components:
-    - type: Transform
-      pos: 9.5,22.5
-      parent: 104
-  - uid: 1036
-    components:
-    - type: Transform
-      pos: 10.5,20.5
-      parent: 104
-  - uid: 1041
-    components:
-    - type: Transform
-      pos: 11.5,20.5
-      parent: 104
-  - uid: 1042
-    components:
-    - type: Transform
-      pos: 12.5,20.5
-      parent: 104
-  - uid: 1043
-    components:
-    - type: Transform
-      pos: 13.5,20.5
-      parent: 104
-  - uid: 1044
-    components:
-    - type: Transform
-      pos: 16.5,20.5
-      parent: 104
-  - uid: 1045
-    components:
-    - type: Transform
-      pos: 17.5,20.5
-      parent: 104
-  - uid: 1046
-    components:
-    - type: Transform
-      pos: 18.5,20.5
-      parent: 104
-  - uid: 1047
-    components:
-    - type: Transform
-      pos: 19.5,20.5
-      parent: 104
-  - uid: 1048
-    components:
-    - type: Transform
-      pos: 19.5,19.5
-      parent: 104
-  - uid: 1049
-    components:
-    - type: Transform
-      pos: 19.5,18.5
-      parent: 104
-  - uid: 1050
-    components:
-    - type: Transform
-      pos: 19.5,16.5
-      parent: 104
-  - uid: 1051
-    components:
-    - type: Transform
-      pos: 19.5,15.5
-      parent: 104
-  - uid: 1052
-    components:
-    - type: Transform
-      pos: 19.5,14.5
-      parent: 104
-  - uid: 1053
-    components:
-    - type: Transform
-      pos: 19.5,12.5
-      parent: 104
-  - uid: 1054
-    components:
-    - type: Transform
-      pos: 19.5,11.5
-      parent: 104
-  - uid: 1055
-    components:
-    - type: Transform
-      pos: 19.5,10.5
-      parent: 104
-  - uid: 1056
-    components:
-    - type: Transform
-      pos: -11.5,20.5
-      parent: 104
-  - uid: 1057
-    components:
-    - type: Transform
-      pos: 15.5,3.5
-      parent: 104
-  - uid: 1058
-    components:
-    - type: Transform
-      pos: 22.5,4.5
-      parent: 104
-  - uid: 1059
-    components:
-    - type: Transform
-      pos: 23.5,4.5
-      parent: 104
-  - uid: 1060
-    components:
-    - type: Transform
-      pos: 24.5,4.5
-      parent: 104
-  - uid: 1064
-    components:
-    - type: Transform
-      pos: 28.5,4.5
-      parent: 104
-  - uid: 1065
-    components:
-    - type: Transform
-      pos: 29.5,4.5
-      parent: 104
-  - uid: 1066
-    components:
-    - type: Transform
-      pos: 30.5,4.5
-      parent: 104
-  - uid: 1067
-    components:
-    - type: Transform
-      pos: 32.5,0.5
-      parent: 104
-  - uid: 1068
-    components:
-    - type: Transform
-      pos: 32.5,-0.5
-      parent: 104
-  - uid: 1069
-    components:
-    - type: Transform
-      pos: 32.5,-3.5
-      parent: 104
-  - uid: 1070
-    components:
-    - type: Transform
-      pos: 32.5,-12.5
-      parent: 104
-  - uid: 1071
-    components:
-    - type: Transform
-      pos: 32.5,-13.5
-      parent: 104
-  - uid: 1072
-    components:
-    - type: Transform
-      pos: 32.5,-14.5
-      parent: 104
-  - uid: 1073
-    components:
-    - type: Transform
-      pos: 32.5,-15.5
-      parent: 104
-  - uid: 1074
-    components:
-    - type: Transform
-      pos: 32.5,-16.5
-      parent: 104
-  - uid: 1075
-    components:
-    - type: Transform
-      pos: 32.5,-17.5
-      parent: 104
-  - uid: 1076
-    components:
-    - type: Transform
-      pos: 32.5,-18.5
-      parent: 104
-  - uid: 1077
-    components:
-    - type: Transform
-      pos: 32.5,-19.5
-      parent: 104
-  - uid: 1078
-    components:
-    - type: Transform
-      pos: 32.5,-20.5
-      parent: 104
-  - uid: 1079
-    components:
-    - type: Transform
-      pos: 32.5,-21.5
-      parent: 104
-  - uid: 1083
-    components:
-    - type: Transform
-      pos: -4.5,-16.5
-      parent: 104
-  - uid: 1084
-    components:
-    - type: Transform
-      pos: -4.5,-21.5
-      parent: 104
-  - uid: 1085
-    components:
-    - type: Transform
-      pos: 28.5,-23.5
-      parent: 104
-  - uid: 1092
-    components:
-    - type: Transform
-      pos: 27.5,-23.5
-      parent: 104
-  - uid: 1093
-    components:
-    - type: Transform
-      pos: 26.5,-23.5
-      parent: 104
-  - uid: 1094
-    components:
-    - type: Transform
-      pos: 25.5,-23.5
-      parent: 104
-  - uid: 1095
-    components:
-    - type: Transform
-      pos: 24.5,-23.5
-      parent: 104
-  - uid: 1096
-    components:
-    - type: Transform
-      pos: 23.5,-23.5
-      parent: 104
-  - uid: 1097
-    components:
-    - type: Transform
-      pos: 22.5,-23.5
-      parent: 104
-  - uid: 1098
-    components:
-    - type: Transform
-      pos: 21.5,-23.5
-      parent: 104
-  - uid: 1099
-    components:
-    - type: Transform
-      pos: 20.5,-23.5
-      parent: 104
-  - uid: 1100
-    components:
-    - type: Transform
-      pos: 19.5,-23.5
-      parent: 104
-  - uid: 1101
-    components:
-    - type: Transform
-      pos: 18.5,-23.5
-      parent: 104
-  - uid: 1105
-    components:
-    - type: Transform
-      pos: 8.5,-23.5
-      parent: 104
-  - uid: 1106
-    components:
-    - type: Transform
-      pos: 7.5,-23.5
-      parent: 104
-  - uid: 1107
-    components:
-    - type: Transform
-      pos: 6.5,-23.5
-      parent: 104
-  - uid: 1108
-    components:
-    - type: Transform
-      pos: 5.5,-23.5
-      parent: 104
-  - uid: 1109
-    components:
-    - type: Transform
-      pos: -23.5,23.5
-      parent: 104
-  - uid: 1155
-    components:
-    - type: Transform
-      pos: -23.5,24.5
-      parent: 104
-  - uid: 1156
-    components:
-    - type: Transform
-      pos: -23.5,25.5
-      parent: 104
-  - uid: 1157
-    components:
-    - type: Transform
-      pos: -22.5,32.5
-      parent: 104
-  - uid: 1158
-    components:
-    - type: Transform
-      pos: -23.5,30.5
-      parent: 104
-  - uid: 1160
-    components:
-    - type: Transform
-      pos: -23.5,31.5
-      parent: 104
-  - uid: 1161
-    components:
-    - type: Transform
-      pos: -22.5,23.5
-      parent: 104
-  - uid: 1162
-    components:
-    - type: Transform
-      pos: -22.5,24.5
-      parent: 104
-  - uid: 1163
-    components:
-    - type: Transform
-      pos: -22.5,25.5
-      parent: 104
-  - uid: 1164
-    components:
-    - type: Transform
-      pos: -21.5,26.5
-      parent: 104
-  - uid: 1165
-    components:
-    - type: Transform
-      pos: -22.5,30.5
-      parent: 104
-  - uid: 1166
-    components:
-    - type: Transform
-      pos: -21.5,30.5
-      parent: 104
-  - uid: 1167
-    components:
-    - type: Transform
-      pos: -24.5,31.5
-      parent: 104
-  - uid: 1168
-    components:
-    - type: Transform
-      pos: -23.5,20.5
-      parent: 104
-  - uid: 1169
-    components:
-    - type: Transform
-      pos: -24.5,21.5
-      parent: 104
-  - uid: 1170
-    components:
-    - type: Transform
-      pos: -22.5,31.5
-      parent: 104
-  - uid: 1171
-    components:
-    - type: Transform
-      pos: -25.5,30.5
-      parent: 104
-  - uid: 1172
-    components:
-    - type: Transform
-      pos: -25.5,31.5
-      parent: 104
-  - uid: 1173
-    components:
-    - type: Transform
-      pos: -25.5,32.5
-      parent: 104
-  - uid: 1174
-    components:
-    - type: Transform
-      pos: -23.5,21.5
-      parent: 104
-  - uid: 1175
-    components:
-    - type: Transform
-      pos: -23.5,29.5
-      parent: 104
-  - uid: 1176
-    components:
-    - type: Transform
-      pos: -22.5,20.5
-      parent: 104
-  - uid: 1177
-    components:
-    - type: Transform
-      pos: -23.5,15.5
-      parent: 104
-  - uid: 1178
-    components:
-    - type: Transform
-      pos: -23.5,13.5
-      parent: 104
-  - uid: 1179
-    components:
-    - type: Transform
-      pos: -22.5,13.5
-      parent: 104
-  - uid: 1180
-    components:
-    - type: Transform
-      pos: -11.5,10.5
-      parent: 104
-  - uid: 1224
-    components:
-    - type: Transform
-      pos: -23.5,14.5
-      parent: 104
-  - uid: 1250
-    components:
-    - type: Transform
-      pos: 1.5,-10.5
-      parent: 104
-  - uid: 1390
-    components:
-    - type: Transform
-      pos: -0.5,-10.5
-      parent: 104
-  - uid: 1391
-    components:
-    - type: Transform
-      pos: -23.5,28.5
-      parent: 104
-  - uid: 1392
-    components:
-    - type: Transform
-      pos: -24.5,30.5
-      parent: 104
-  - uid: 1393
-    components:
-    - type: Transform
-      pos: -23.5,32.5
-      parent: 104
-  - uid: 1394
-    components:
-    - type: Transform
-      pos: -22.5,26.5
-      parent: 104
-  - uid: 1395
-    components:
-    - type: Transform
-      pos: -23.5,26.5
-      parent: 104
-  - uid: 1396
-    components:
-    - type: Transform
-      pos: -24.5,32.5
-      parent: 104
-  - uid: 1397
-    components:
-    - type: Transform
-      pos: -23.5,27.5
-      parent: 104
-  - uid: 1398
-    components:
-    - type: Transform
-      pos: -22.5,28.5
-      parent: 104
-  - uid: 1399
-    components:
-    - type: Transform
-      pos: -21.5,29.5
-      parent: 104
-  - uid: 1400
-    components:
-    - type: Transform
-      pos: -22.5,29.5
-      parent: 104
-  - uid: 1401
-    components:
-    - type: Transform
-      pos: -22.5,27.5
-      parent: 104
-  - uid: 1402
-    components:
-    - type: Transform
-      pos: -21.5,27.5
-      parent: 104
-  - uid: 1403
-    components:
-    - type: Transform
-      pos: -21.5,28.5
-      parent: 104
-  - uid: 1404
-    components:
-    - type: Transform
-      pos: -21.5,25.5
-      parent: 104
-  - uid: 1405
-    components:
-    - type: Transform
-      pos: -21.5,24.5
-      parent: 104
-  - uid: 1406
-    components:
-    - type: Transform
-      pos: -21.5,23.5
-      parent: 104
-  - uid: 1407
-    components:
-    - type: Transform
-      pos: 6.5,-24.5
-      parent: 104
-  - uid: 1408
-    components:
-    - type: Transform
-      pos: 7.5,-24.5
-      parent: 104
-  - uid: 1415
-    components:
-    - type: Transform
-      pos: 3.5,-21.5
-      parent: 104
-  - uid: 1416
-    components:
-    - type: Transform
-      pos: 4.5,-21.5
-      parent: 104
-  - uid: 1417
-    components:
-    - type: Transform
-      pos: 20.5,-24.5
-      parent: 104
-  - uid: 1418
-    components:
-    - type: Transform
-      pos: 21.5,-24.5
-      parent: 104
-  - uid: 1419
-    components:
-    - type: Transform
-      pos: 22.5,-24.5
-      parent: 104
-  - uid: 1420
-    components:
-    - type: Transform
-      pos: 23.5,-24.5
-      parent: 104
-  - uid: 1421
-    components:
-    - type: Transform
-      pos: 24.5,-24.5
-      parent: 104
-  - uid: 1422
-    components:
-    - type: Transform
-      pos: 25.5,-24.5
-      parent: 104
-  - uid: 1423
-    components:
-    - type: Transform
-      pos: 26.5,-24.5
-      parent: 104
-  - uid: 1424
-    components:
-    - type: Transform
-      pos: 27.5,-24.5
-      parent: 104
-  - uid: 1425
-    components:
-    - type: Transform
-      pos: -4.5,-22.5
-      parent: 104
-  - uid: 1427
-    components:
-    - type: Transform
-      pos: -4.5,-17.5
-      parent: 104
-  - uid: 1433
-    components:
-    - type: Transform
-      pos: 5.5,-24.5
-      parent: 104
-  - uid: 1434
-    components:
-    - type: Transform
-      pos: 33.5,-21.5
-      parent: 104
-  - uid: 1435
-    components:
-    - type: Transform
-      pos: 33.5,-20.5
-      parent: 104
-  - uid: 1436
-    components:
-    - type: Transform
-      pos: 33.5,-19.5
-      parent: 104
-  - uid: 1437
-    components:
-    - type: Transform
-      pos: 33.5,-18.5
-      parent: 104
-  - uid: 1440
-    components:
-    - type: Transform
-      pos: 33.5,-17.5
-      parent: 104
-  - uid: 1441
-    components:
-    - type: Transform
-      pos: 33.5,-16.5
-      parent: 104
-  - uid: 1442
-    components:
-    - type: Transform
-      pos: 33.5,-15.5
-      parent: 104
-  - uid: 1443
-    components:
-    - type: Transform
-      pos: 33.5,-14.5
-      parent: 104
-  - uid: 1444
-    components:
-    - type: Transform
-      pos: 33.5,-13.5
-      parent: 104
-  - uid: 1446
-    components:
-    - type: Transform
-      pos: 33.5,-12.5
-      parent: 104
-  - uid: 1447
-    components:
-    - type: Transform
-      pos: 30.5,5.5
-      parent: 104
-  - uid: 1448
-    components:
-    - type: Transform
-      pos: 29.5,5.5
-      parent: 104
-  - uid: 1472
-    components:
-    - type: Transform
-      pos: 28.5,5.5
-      parent: 104
-  - uid: 1542
-    components:
-    - type: Transform
-      pos: 24.5,5.5
-      parent: 104
-  - uid: 1550
-    components:
-    - type: Transform
-      pos: 23.5,5.5
-      parent: 104
-  - uid: 1552
-    components:
-    - type: Transform
-      pos: 22.5,5.5
-      parent: 104
-  - uid: 1553
-    components:
-    - type: Transform
-      pos: 21.5,5.5
-      parent: 104
-  - uid: 1557
-    components:
-    - type: Transform
-      pos: 19.5,19.5
-      parent: 104
-  - uid: 1559
-    components:
-    - type: Transform
-      pos: 19.5,20.5
-      parent: 104
-  - uid: 1560
-    components:
-    - type: Transform
-      pos: 19.5,21.5
-      parent: 104
-  - uid: 1562
-    components:
-    - type: Transform
-      pos: -11.5,19.5
-      parent: 104
-  - uid: 1564
-    components:
-    - type: Transform
-      pos: -11.5,18.5
-      parent: 104
-  - uid: 1566
-    components:
-    - type: Transform
-      pos: 20.5,9.5
-      parent: 104
-  - uid: 1567
-    components:
-    - type: Transform
-      pos: 20.5,10.5
-      parent: 104
-  - uid: 1568
-    components:
-    - type: Transform
-      pos: 20.5,11.5
-      parent: 104
-  - uid: 1569
-    components:
-    - type: Transform
-      pos: 20.5,12.5
-      parent: 104
-  - uid: 1594
-    components:
-    - type: Transform
-      pos: 20.5,13.5
-      parent: 104
-  - uid: 1598
-    components:
-    - type: Transform
-      pos: 20.5,14.5
-      parent: 104
-  - uid: 1599
-    components:
-    - type: Transform
-      pos: 20.5,15.5
-      parent: 104
-  - uid: 1600
-    components:
-    - type: Transform
-      pos: 20.5,16.5
-      parent: 104
-  - uid: 1601
-    components:
-    - type: Transform
-      pos: 20.5,17.5
-      parent: 104
-  - uid: 1602
-    components:
-    - type: Transform
-      pos: 20.5,18.5
-      parent: 104
-  - uid: 1603
-    components:
-    - type: Transform
-      pos: 20.5,19.5
-      parent: 104
-  - uid: 1604
-    components:
-    - type: Transform
-      pos: 20.5,20.5
-      parent: 104
-  - uid: 1605
-    components:
-    - type: Transform
-      pos: 20.5,21.5
-      parent: 104
-  - uid: 1606
-    components:
-    - type: Transform
-      pos: -10.5,19.5
-      parent: 104
-  - uid: 1607
-    components:
-    - type: Transform
-      pos: 19.5,11.5
-      parent: 104
-  - uid: 1608
-    components:
-    - type: Transform
-      pos: 19.5,12.5
-      parent: 104
-  - uid: 1609
-    components:
-    - type: Transform
-      pos: 19.5,15.5
-      parent: 104
-  - uid: 1610
-    components:
-    - type: Transform
-      pos: 18.5,21.5
-      parent: 104
-  - uid: 1611
-    components:
-    - type: Transform
-      pos: 17.5,21.5
-      parent: 104
-  - uid: 1612
-    components:
-    - type: Transform
-      pos: 16.5,21.5
-      parent: 104
-  - uid: 1613
-    components:
-    - type: Transform
-      pos: 15.5,21.5
-      parent: 104
-  - uid: 1614
-    components:
-    - type: Transform
-      pos: 14.5,21.5
-      parent: 104
-  - uid: 1615
-    components:
-    - type: Transform
-      pos: 13.5,21.5
-      parent: 104
-  - uid: 1616
-    components:
-    - type: Transform
-      pos: 12.5,21.5
-      parent: 104
-  - uid: 1623
-    components:
-    - type: Transform
-      pos: 11.5,21.5
-      parent: 104
-  - uid: 1625
-    components:
-    - type: Transform
-      pos: 10.5,21.5
-      parent: 104
-  - uid: 1632
-    components:
-    - type: Transform
-      pos: 9.5,21.5
-      parent: 104
-  - uid: 1636
-    components:
-    - type: Transform
-      pos: -0.5,21.5
-      parent: 104
-  - uid: 1637
-    components:
-    - type: Transform
-      pos: -1.5,21.5
-      parent: 104
-  - uid: 1638
-    components:
-    - type: Transform
-      pos: -2.5,21.5
-      parent: 104
-  - uid: 1639
-    components:
-    - type: Transform
-      pos: -0.5,22.5
-      parent: 104
-  - uid: 1640
-    components:
-    - type: Transform
-      pos: -1.5,22.5
-      parent: 104
-  - uid: 1641
-    components:
-    - type: Transform
-      pos: -2.5,22.5
-      parent: 104
-  - uid: 1642
-    components:
-    - type: Transform
-      pos: -3.5,22.5
-      parent: 104
-  - uid: 1643
-    components:
-    - type: Transform
-      pos: -7.5,22.5
-      parent: 104
-  - uid: 1644
-    components:
-    - type: Transform
-      pos: -8.5,22.5
-      parent: 104
-  - uid: 1645
-    components:
-    - type: Transform
-      pos: -8.5,23.5
-      parent: 104
-  - uid: 1646
-    components:
-    - type: Transform
-      pos: -9.5,23.5
-      parent: 104
-  - uid: 1647
-    components:
-    - type: Transform
-      pos: -10.5,23.5
-      parent: 104
-  - uid: 1649
-    components:
-    - type: Transform
-      pos: 28.5,7.5
-      parent: 104
-  - uid: 1650
-    components:
-    - type: Transform
-      pos: 28.5,8.5
-      parent: 104
-  - uid: 1651
-    components:
-    - type: Transform
-      pos: 22.5,13.5
-      parent: 104
-  - uid: 1657
-    components:
-    - type: Transform
-      pos: 23.5,13.5
-      parent: 104
-  - uid: 1658
-    components:
-    - type: Transform
-      pos: 17.5,22.5
-      parent: 104
-  - uid: 1659
-    components:
-    - type: Transform
-      pos: 24.5,16.5
-      parent: 104
-  - uid: 1660
-    components:
-    - type: Transform
-      pos: 24.5,15.5
-      parent: 104
-  - uid: 1661
-    components:
-    - type: Transform
-      pos: 24.5,14.5
-      parent: 104
-  - uid: 1662
-    components:
-    - type: Transform
-      pos: 23.5,17.5
-      parent: 104
-  - uid: 1663
-    components:
-    - type: Transform
-      pos: 28.5,6.5
-      parent: 104
-  - uid: 1664
-    components:
-    - type: Transform
-      pos: 23.5,14.5
-      parent: 104
-  - uid: 1665
-    components:
-    - type: Transform
-      pos: 22.5,14.5
-      parent: 104
-  - uid: 1666
-    components:
-    - type: Transform
-      pos: 23.5,12.5
-      parent: 104
-  - uid: 1667
-    components:
-    - type: Transform
-      pos: 21.5,8.5
-      parent: 104
-  - uid: 1676
-    components:
-    - type: Transform
-      pos: 24.5,9.5
-      parent: 104
-  - uid: 1677
-    components:
-    - type: Transform
-      pos: 24.5,10.5
-      parent: 104
-  - uid: 1678
-    components:
-    - type: Transform
-      pos: 24.5,17.5
-      parent: 104
-  - uid: 1679
-    components:
-    - type: Transform
-      pos: 23.5,16.5
-      parent: 104
-  - uid: 1682
-    components:
-    - type: Transform
-      pos: 23.5,15.5
-      parent: 104
-  - uid: 1683
-    components:
-    - type: Transform
-      pos: 24.5,11.5
-      parent: 104
-  - uid: 1685
-    components:
-    - type: Transform
-      pos: 23.5,11.5
-      parent: 104
-  - uid: 1686
-    components:
-    - type: Transform
-      pos: 21.5,9.5
-      parent: 104
-  - uid: 1687
-    components:
-    - type: Transform
-      pos: 27.5,7.5
-      parent: 104
-  - uid: 1688
-    components:
-    - type: Transform
-      pos: 27.5,8.5
-      parent: 104
-  - uid: 1691
-    components:
-    - type: Transform
-      pos: 26.5,8.5
-      parent: 104
-  - uid: 1692
-    components:
-    - type: Transform
-      pos: 22.5,15.5
-      parent: 104
-  - uid: 1693
-    components:
-    - type: Transform
-      pos: 24.5,12.5
-      parent: 104
-  - uid: 1695
-    components:
-    - type: Transform
-      pos: 23.5,10.5
-      parent: 104
-  - uid: 1696
-    components:
-    - type: Transform
-      pos: 22.5,10.5
-      parent: 104
-  - uid: 1698
-    components:
-    - type: Transform
-      pos: 12.5,22.5
-      parent: 104
-  - uid: 1700
-    components:
-    - type: Transform
-      pos: 25.5,9.5
-      parent: 104
-  - uid: 1701
-    components:
-    - type: Transform
-      pos: 25.5,10.5
-      parent: 104
-  - uid: 1702
-    components:
-    - type: Transform
-      pos: 13.5,22.5
-      parent: 104
-  - uid: 1709
-    components:
-    - type: Transform
-      pos: 24.5,13.5
-      parent: 104
-  - uid: 1710
-    components:
-    - type: Transform
-      pos: 22.5,8.5
-      parent: 104
-  - uid: 1712
-    components:
-    - type: Transform
-      pos: 22.5,9.5
-      parent: 104
-  - uid: 1713
-    components:
-    - type: Transform
-      pos: 11.5,22.5
-      parent: 104
-  - uid: 1714
-    components:
-    - type: Transform
-      pos: 25.5,11.5
-      parent: 104
-  - uid: 1715
-    components:
-    - type: Transform
-      pos: 22.5,16.5
-      parent: 104
-  - uid: 1716
-    components:
-    - type: Transform
-      pos: 22.5,17.5
-      parent: 104
-  - uid: 1717
-    components:
-    - type: Transform
-      pos: 19.5,22.5
-      parent: 104
-  - uid: 1719
-    components:
-    - type: Transform
-      pos: 21.5,13.5
-      parent: 104
-  - uid: 1720
-    components:
-    - type: Transform
-      pos: 23.5,9.5
-      parent: 104
-  - uid: 1721
-    components:
-    - type: Transform
-      pos: 21.5,11.5
-      parent: 104
-  - uid: 1722
-    components:
-    - type: Transform
-      pos: 22.5,11.5
-      parent: 104
-  - uid: 1723
-    components:
-    - type: Transform
-      pos: 10.5,22.5
-      parent: 104
-  - uid: 1724
-    components:
-    - type: Transform
-      pos: 22.5,18.5
-      parent: 104
-  - uid: 1725
-    components:
-    - type: Transform
-      pos: 16.5,22.5
-      parent: 104
-  - uid: 1726
-    components:
-    - type: Transform
-      pos: 15.5,22.5
-      parent: 104
-  - uid: 1727
-    components:
-    - type: Transform
-      pos: 14.5,22.5
-      parent: 104
-  - uid: 1729
-    components:
-    - type: Transform
-      pos: 23.5,13.5
-      parent: 104
-  - uid: 1731
-    components:
-    - type: Transform
-      pos: -11.5,21.5
-      parent: 104
-  - uid: 1732
-    components:
-    - type: Transform
-      pos: 22.5,12.5
-      parent: 104
-  - uid: 1733
-    components:
-    - type: Transform
-      pos: 27.5,6.5
-      parent: 104
-  - uid: 1734
-    components:
-    - type: Transform
-      pos: 22.5,19.5
-      parent: 104
-  - uid: 1735
-    components:
-    - type: Transform
-      pos: 18.5,22.5
-      parent: 104
-  - uid: 1736
-    components:
-    - type: Transform
-      pos: 21.5,21.5
-      parent: 104
-  - uid: 1740
-    components:
-    - type: Transform
-      pos: -11.5,20.5
-      parent: 104
-  - uid: 1741
-    components:
-    - type: Transform
-      pos: 21.5,10.5
-      parent: 104
-  - uid: 1742
-    components:
-    - type: Transform
-      pos: 21.5,20.5
-      parent: 104
-  - uid: 1743
-    components:
-    - type: Transform
-      pos: 20.5,22.5
-      parent: 104
-  - uid: 1744
-    components:
-    - type: Transform
-      pos: 21.5,19.5
-      parent: 104
-  - uid: 1745
-    components:
-    - type: Transform
-      pos: 21.5,18.5
-      parent: 104
-  - uid: 1746
-    components:
-    - type: Transform
-      pos: 21.5,17.5
-      parent: 104
-  - uid: 1747
-    components:
-    - type: Transform
-      pos: 21.5,16.5
-      parent: 104
-  - uid: 1748
-    components:
-    - type: Transform
-      pos: 21.5,15.5
-      parent: 104
-  - uid: 1749
-    components:
-    - type: Transform
-      pos: 21.5,14.5
-      parent: 104
-  - uid: 1750
-    components:
-    - type: Transform
-      pos: 21.5,12.5
-      parent: 104
-  - uid: 1751
-    components:
-    - type: Transform
-      pos: 9.5,19.5
-      parent: 104
-  - uid: 1752
-    components:
-    - type: Transform
-      pos: -2.5,23.5
-      parent: 104
-  - uid: 1753
-    components:
-    - type: Transform
-      pos: -3.5,23.5
-      parent: 104
-  - uid: 1754
-    components:
-    - type: Transform
-      pos: -4.5,23.5
-      parent: 104
-  - uid: 1755
-    components:
-    - type: Transform
-      pos: -5.5,23.5
-      parent: 104
-  - uid: 1756
-    components:
-    - type: Transform
-      pos: -6.5,23.5
-      parent: 104
-  - uid: 1757
-    components:
-    - type: Transform
-      pos: -7.5,23.5
-      parent: 104
-  - uid: 1762
-    components:
-    - type: Transform
-      pos: 1.5,-18.5
-      parent: 104
-  - uid: 1767
-    components:
-    - type: Transform
-      pos: -19.5,7.5
-      parent: 104
-  - uid: 1768
-    components:
-    - type: Transform
-      pos: -19.5,6.5
-      parent: 104
-  - uid: 1769
-    components:
-    - type: Transform
-      pos: -19.5,5.5
-      parent: 104
-  - uid: 1770
-    components:
-    - type: Transform
-      pos: -18.5,7.5
-      parent: 104
-  - uid: 1771
-    components:
-    - type: Transform
-      pos: -18.5,6.5
-      parent: 104
-  - uid: 1772
-    components:
-    - type: Transform
-      pos: -18.5,5.5
-      parent: 104
-  - uid: 1773
-    components:
-    - type: Transform
-      pos: -17.5,7.5
-      parent: 104
-  - uid: 1774
-    components:
-    - type: Transform
-      pos: -17.5,6.5
-      parent: 104
-  - uid: 1775
-    components:
-    - type: Transform
-      pos: -17.5,5.5
-      parent: 104
-  - uid: 1776
-    components:
-    - type: Transform
-      pos: -21.5,19.5
-      parent: 104
-  - uid: 1777
-    components:
-    - type: Transform
-      pos: -22.5,19.5
-      parent: 104
-  - uid: 1778
-    components:
-    - type: Transform
-      pos: -21.5,18.5
-      parent: 104
-  - uid: 1779
-    components:
-    - type: Transform
-      pos: -22.5,18.5
-      parent: 104
-  - uid: 1780
-    components:
-    - type: Transform
-      pos: -22.5,17.5
-      parent: 104
-  - uid: 1781
-    components:
-    - type: Transform
-      pos: -23.5,17.5
-      parent: 104
-  - uid: 1782
-    components:
-    - type: Transform
-      pos: -23.5,16.5
-      parent: 104
-  - uid: 1792
-    components:
-    - type: Transform
-      pos: 4.5,-19.5
-      parent: 104
-  - uid: 1793
-    components:
-    - type: Transform
-      pos: 4.5,-20.5
-      parent: 104
-  - uid: 1794
-    components:
-    - type: Transform
-      pos: 2.5,-19.5
-      parent: 104
-  - uid: 1795
-    components:
-    - type: Transform
-      pos: 2.5,-20.5
-      parent: 104
-  - uid: 1796
-    components:
-    - type: Transform
-      pos: -1.5,-10.5
-      parent: 104
-  - uid: 1797
-    components:
-    - type: Transform
-      pos: 3.5,-19.5
-      parent: 104
-  - uid: 1798
-    components:
-    - type: Transform
-      pos: 3.5,-20.5
-      parent: 104
-  - uid: 1801
-    components:
-    - type: Transform
-      pos: 7.5,-19.5
-      parent: 104
-  - uid: 1802
-    components:
-    - type: Transform
-      pos: 7.5,-20.5
-      parent: 104
-  - uid: 1803
-    components:
-    - type: Transform
-      pos: 7.5,-21.5
-      parent: 104
-  - uid: 1804
-    components:
-    - type: Transform
-      pos: 5.5,-19.5
-      parent: 104
-  - uid: 1805
-    components:
-    - type: Transform
-      pos: 5.5,-20.5
-      parent: 104
-  - uid: 1806
-    components:
-    - type: Transform
-      pos: 5.5,-21.5
-      parent: 104
-  - uid: 1807
-    components:
-    - type: Transform
-      pos: 6.5,-19.5
-      parent: 104
-  - uid: 1808
-    components:
-    - type: Transform
-      pos: 6.5,-20.5
-      parent: 104
-  - uid: 1809
-    components:
-    - type: Transform
-      pos: 6.5,-21.5
-      parent: 104
-  - uid: 1835
-    components:
-    - type: Transform
-      pos: 8.5,-19.5
-      parent: 104
-  - uid: 1836
-    components:
-    - type: Transform
-      pos: 8.5,-20.5
-      parent: 104
-  - uid: 1837
-    components:
-    - type: Transform
-      pos: 8.5,-21.5
-      parent: 104
-  - uid: 1865
-    components:
-    - type: Transform
-      pos: 16.5,-21.5
-      parent: 104
-  - uid: 1870
-    components:
-    - type: Transform
-      pos: 17.5,-21.5
-      parent: 104
-  - uid: 1875
-    components:
-    - type: Transform
-      pos: 18.5,-21.5
-      parent: 104
-  - uid: 1880
-    components:
-    - type: Transform
-      pos: 19.5,-21.5
-      parent: 104
-  - uid: 1884
-    components:
-    - type: Transform
-      pos: 20.5,-21.5
-      parent: 104
-  - uid: 1888
-    components:
-    - type: Transform
-      pos: 21.5,-21.5
-      parent: 104
-  - uid: 1892
-    components:
-    - type: Transform
-      pos: 22.5,-21.5
-      parent: 104
-  - uid: 1896
-    components:
-    - type: Transform
-      pos: 23.5,-21.5
-      parent: 104
-  - uid: 1900
-    components:
-    - type: Transform
-      pos: 24.5,-21.5
-      parent: 104
-  - uid: 1904
-    components:
-    - type: Transform
-      pos: 25.5,-21.5
-      parent: 104
-  - uid: 1909
-    components:
-    - type: Transform
-      pos: 28.5,-11.5
-      parent: 104
-  - uid: 1910
-    components:
-    - type: Transform
-      pos: 28.5,-10.5
-      parent: 104
-  - uid: 1911
-    components:
-    - type: Transform
-      pos: 28.5,-9.5
-      parent: 104
-  - uid: 1912
-    components:
-    - type: Transform
-      pos: 28.5,-8.5
-      parent: 104
-  - uid: 1913
-    components:
-    - type: Transform
-      pos: 26.5,-21.5
-      parent: 104
-  - uid: 1923
-    components:
-    - type: Transform
-      pos: 26.5,-11.5
-      parent: 104
-  - uid: 1924
-    components:
-    - type: Transform
-      pos: 26.5,-10.5
-      parent: 104
-  - uid: 1925
-    components:
-    - type: Transform
-      pos: 26.5,-9.5
-      parent: 104
-  - uid: 1926
-    components:
-    - type: Transform
-      pos: 26.5,-8.5
-      parent: 104
-  - uid: 1927
-    components:
-    - type: Transform
-      pos: 26.5,-7.5
-      parent: 104
-  - uid: 1928
-    components:
-    - type: Transform
-      pos: 26.5,-6.5
-      parent: 104
-  - uid: 1930
-    components:
-    - type: Transform
-      pos: 26.5,-5.5
-      parent: 104
-  - uid: 1934
-    components:
-    - type: Transform
-      pos: 26.5,-4.5
-      parent: 104
-  - uid: 1935
-    components:
-    - type: Transform
-      pos: 26.5,-3.5
-      parent: 104
-  - uid: 1936
-    components:
-    - type: Transform
-      pos: 26.5,-2.5
-      parent: 104
-  - uid: 1937
-    components:
-    - type: Transform
-      pos: 26.5,-1.5
-      parent: 104
-  - uid: 1938
-    components:
-    - type: Transform
-      pos: 26.5,-0.5
-      parent: 104
-  - uid: 1939
-    components:
-    - type: Transform
-      pos: 26.5,0.5
-      parent: 104
-  - uid: 1940
-    components:
-    - type: Transform
-      pos: 26.5,1.5
-      parent: 104
-  - uid: 1942
-    components:
-    - type: Transform
-      pos: 27.5,-21.5
-      parent: 104
-  - uid: 1952
-    components:
-    - type: Transform
-      pos: 27.5,-11.5
-      parent: 104
-  - uid: 1953
-    components:
-    - type: Transform
-      pos: 27.5,-10.5
-      parent: 104
-  - uid: 1954
-    components:
-    - type: Transform
-      pos: 27.5,-9.5
-      parent: 104
-  - uid: 1955
-    components:
-    - type: Transform
-      pos: 27.5,-8.5
-      parent: 104
-  - uid: 1956
-    components:
-    - type: Transform
-      pos: 27.5,-7.5
-      parent: 104
-  - uid: 1957
-    components:
-    - type: Transform
-      pos: 27.5,-6.5
-      parent: 104
-  - uid: 1958
-    components:
-    - type: Transform
-      pos: 27.5,-5.5
-      parent: 104
-  - uid: 1959
-    components:
-    - type: Transform
-      pos: 27.5,-4.5
-      parent: 104
-  - uid: 1960
-    components:
-    - type: Transform
-      pos: 27.5,-3.5
-      parent: 104
-  - uid: 1961
-    components:
-    - type: Transform
-      pos: 27.5,-2.5
-      parent: 104
-  - uid: 1962
-    components:
-    - type: Transform
-      pos: 27.5,-1.5
-      parent: 104
-  - uid: 1963
-    components:
-    - type: Transform
-      pos: 27.5,-0.5
-      parent: 104
-  - uid: 1964
-    components:
-    - type: Transform
-      pos: 27.5,0.5
-      parent: 104
-  - uid: 1965
-    components:
-    - type: Transform
-      pos: 27.5,1.5
-      parent: 104
-  - uid: 1966
-    components:
-    - type: Transform
-      pos: 27.5,2.5
-      parent: 104
-  - uid: 1967
-    components:
-    - type: Transform
-      pos: 28.5,-21.5
-      parent: 104
-  - uid: 1973
-    components:
-    - type: Transform
-      pos: 30.5,-1.5
-      parent: 104
-  - uid: 1974
-    components:
-    - type: Transform
-      pos: 30.5,-0.5
-      parent: 104
-  - uid: 1975
-    components:
-    - type: Transform
-      pos: 30.5,0.5
-      parent: 104
-  - uid: 1976
-    components:
-    - type: Transform
-      pos: 30.5,1.5
-      parent: 104
-  - uid: 1977
-    components:
-    - type: Transform
-      pos: 30.5,2.5
-      parent: 104
-  - uid: 1978
-    components:
-    - type: Transform
-      pos: 28.5,-7.5
-      parent: 104
-  - uid: 1979
-    components:
-    - type: Transform
-      pos: 28.5,-6.5
-      parent: 104
-  - uid: 1980
-    components:
-    - type: Transform
-      pos: 28.5,-5.5
-      parent: 104
-  - uid: 1981
-    components:
-    - type: Transform
-      pos: 28.5,-4.5
-      parent: 104
-  - uid: 1982
-    components:
-    - type: Transform
-      pos: 28.5,-3.5
-      parent: 104
-  - uid: 1983
-    components:
-    - type: Transform
-      pos: 28.5,-2.5
-      parent: 104
-  - uid: 1984
-    components:
-    - type: Transform
-      pos: 28.5,-1.5
-      parent: 104
-  - uid: 1985
-    components:
-    - type: Transform
-      pos: 28.5,-0.5
-      parent: 104
-  - uid: 1986
-    components:
-    - type: Transform
-      pos: 28.5,0.5
-      parent: 104
-  - uid: 1987
-    components:
-    - type: Transform
-      pos: 28.5,1.5
-      parent: 104
-  - uid: 1988
-    components:
-    - type: Transform
-      pos: 28.5,2.5
-      parent: 104
-  - uid: 1989
-    components:
-    - type: Transform
-      pos: 29.5,-20.5
-      parent: 104
-  - uid: 1990
-    components:
-    - type: Transform
-      pos: 29.5,-19.5
-      parent: 104
-  - uid: 1991
-    components:
-    - type: Transform
-      pos: 29.5,-18.5
-      parent: 104
-  - uid: 1992
-    components:
-    - type: Transform
-      pos: 29.5,-17.5
-      parent: 104
-  - uid: 1993
-    components:
-    - type: Transform
-      pos: 29.5,-16.5
-      parent: 104
-  - uid: 1994
-    components:
-    - type: Transform
-      pos: 29.5,-15.5
-      parent: 104
-  - uid: 1995
-    components:
-    - type: Transform
-      pos: 29.5,-14.5
-      parent: 104
-  - uid: 1996
-    components:
-    - type: Transform
-      pos: 29.5,-13.5
-      parent: 104
-  - uid: 1997
-    components:
-    - type: Transform
-      pos: 29.5,-12.5
-      parent: 104
-  - uid: 1998
-    components:
-    - type: Transform
-      pos: 29.5,-11.5
-      parent: 104
-  - uid: 1999
-    components:
-    - type: Transform
-      pos: 29.5,-10.5
-      parent: 104
-  - uid: 2000
-    components:
-    - type: Transform
-      pos: 29.5,-9.5
-      parent: 104
-  - uid: 2001
-    components:
-    - type: Transform
-      pos: 29.5,-8.5
-      parent: 104
-  - uid: 2002
-    components:
-    - type: Transform
-      pos: 29.5,-7.5
-      parent: 104
-  - uid: 2003
-    components:
-    - type: Transform
-      pos: 29.5,-6.5
-      parent: 104
-  - uid: 2004
-    components:
-    - type: Transform
-      pos: 29.5,-5.5
-      parent: 104
-  - uid: 2005
-    components:
-    - type: Transform
-      pos: 29.5,-4.5
-      parent: 104
-  - uid: 2006
-    components:
-    - type: Transform
-      pos: 29.5,-3.5
-      parent: 104
-  - uid: 2007
-    components:
-    - type: Transform
-      pos: 29.5,-2.5
-      parent: 104
-  - uid: 2008
-    components:
-    - type: Transform
-      pos: 29.5,-1.5
-      parent: 104
-  - uid: 2009
-    components:
-    - type: Transform
-      pos: 29.5,-0.5
-      parent: 104
-  - uid: 2010
-    components:
-    - type: Transform
-      pos: 29.5,0.5
-      parent: 104
-  - uid: 2011
-    components:
-    - type: Transform
-      pos: 29.5,1.5
-      parent: 104
-  - uid: 2012
-    components:
-    - type: Transform
-      pos: 29.5,2.5
-      parent: 104
-  - uid: 2013
-    components:
-    - type: Transform
-      pos: 30.5,-19.5
-      parent: 104
-  - uid: 2014
-    components:
-    - type: Transform
-      pos: 30.5,-18.5
-      parent: 104
-  - uid: 2015
-    components:
-    - type: Transform
-      pos: 30.5,-17.5
-      parent: 104
-  - uid: 2020
-    components:
-    - type: Transform
-      pos: 30.5,-16.5
-      parent: 104
-  - uid: 2023
-    components:
-    - type: Transform
-      pos: 30.5,-15.5
-      parent: 104
-  - uid: 2024
-    components:
-    - type: Transform
-      pos: 30.5,-14.5
-      parent: 104
-  - uid: 2025
-    components:
-    - type: Transform
-      pos: 30.5,-13.5
-      parent: 104
-  - uid: 2026
-    components:
-    - type: Transform
-      pos: 30.5,-12.5
-      parent: 104
-  - uid: 2029
-    components:
-    - type: Transform
-      pos: 30.5,-9.5
-      parent: 104
-  - uid: 2030
-    components:
-    - type: Transform
-      pos: 30.5,-8.5
-      parent: 104
-  - uid: 2032
-    components:
-    - type: Transform
-      pos: 30.5,-7.5
-      parent: 104
-  - uid: 2033
-    components:
-    - type: Transform
-      pos: 30.5,-6.5
-      parent: 104
-  - uid: 2034
-    components:
-    - type: Transform
-      pos: 30.5,-5.5
-      parent: 104
-  - uid: 2035
-    components:
-    - type: Transform
-      pos: 30.5,-4.5
-      parent: 104
-  - uid: 2036
-    components:
-    - type: Transform
-      pos: 30.5,-3.5
-      parent: 104
-  - uid: 2037
-    components:
-    - type: Transform
-      pos: 30.5,-2.5
-      parent: 104
-  - uid: 2038
-    components:
-    - type: Transform
-      pos: 20.5,-0.5
-      parent: 104
-  - uid: 2039
-    components:
-    - type: Transform
-      pos: 20.5,-1.5
-      parent: 104
-  - uid: 2040
-    components:
-    - type: Transform
-      pos: 15.5,2.5
-      parent: 104
-  - uid: 2041
-    components:
-    - type: Transform
-      pos: 16.5,2.5
-      parent: 104
-  - uid: 2042
-    components:
-    - type: Transform
-      pos: 19.5,0.5
-      parent: 104
-  - uid: 2043
-    components:
-    - type: Transform
-      pos: 19.5,-0.5
-      parent: 104
-  - uid: 2044
-    components:
-    - type: Transform
-      pos: 19.5,-1.5
-      parent: 104
-  - uid: 2047
-    components:
-    - type: Transform
-      pos: 25.5,0.5
-      parent: 104
-  - uid: 2049
-    components:
-    - type: Transform
-      pos: 25.5,-0.5
-      parent: 104
-  - uid: 2051
-    components:
-    - type: Transform
-      pos: 25.5,-1.5
-      parent: 104
-  - uid: 2054
-    components:
-    - type: Transform
-      pos: 24.5,0.5
-      parent: 104
-  - uid: 2055
-    components:
-    - type: Transform
-      pos: 24.5,-0.5
-      parent: 104
-  - uid: 2056
-    components:
-    - type: Transform
-      pos: 24.5,-1.5
-      parent: 104
-  - uid: 2058
-    components:
-    - type: Transform
-      pos: 23.5,1.5
-      parent: 104
-  - uid: 2059
-    components:
-    - type: Transform
-      pos: 23.5,0.5
-      parent: 104
-  - uid: 2060
-    components:
-    - type: Transform
-      pos: 23.5,-0.5
-      parent: 104
-  - uid: 2061
-    components:
-    - type: Transform
-      pos: 23.5,-1.5
-      parent: 104
-  - uid: 2063
-    components:
-    - type: Transform
-      pos: 22.5,1.5
-      parent: 104
-  - uid: 2064
-    components:
-    - type: Transform
-      pos: 22.5,0.5
-      parent: 104
-  - uid: 2065
-    components:
-    - type: Transform
-      pos: 22.5,-0.5
-      parent: 104
-  - uid: 2066
-    components:
-    - type: Transform
-      pos: 22.5,-1.5
-      parent: 104
-  - uid: 2067
-    components:
-    - type: Transform
-      pos: 14.5,2.5
-      parent: 104
-  - uid: 2068
-    components:
-    - type: Transform
-      pos: 15.5,1.5
-      parent: 104
-  - uid: 2069
-    components:
-    - type: Transform
-      pos: 21.5,0.5
-      parent: 104
-  - uid: 2070
-    components:
-    - type: Transform
-      pos: 21.5,-0.5
-      parent: 104
-  - uid: 2071
-    components:
-    - type: Transform
-      pos: 21.5,-1.5
-      parent: 104
-  - uid: 2072
-    components:
-    - type: Transform
-      pos: 14.5,3.5
-      parent: 104
-  - uid: 2073
-    components:
-    - type: Transform
-      pos: 17.5,-0.5
-      parent: 104
-  - uid: 2074
-    components:
-    - type: Transform
-      pos: 17.5,0.5
-      parent: 104
-  - uid: 2075
-    components:
-    - type: Transform
-      pos: 17.5,1.5
-      parent: 104
-  - uid: 2076
-    components:
-    - type: Transform
-      pos: 18.5,-1.5
-      parent: 104
-  - uid: 2077
-    components:
-    - type: Transform
-      pos: 18.5,-0.5
-      parent: 104
-  - uid: 2078
-    components:
-    - type: Transform
-      pos: 18.5,0.5
-      parent: 104
-  - uid: 2079
-    components:
-    - type: Transform
-      pos: 18.5,1.5
-      parent: 104
-  - uid: 2080
-    components:
-    - type: Transform
-      pos: -12.5,28.5
-      parent: 104
-  - uid: 2084
-    components:
-    - type: Transform
-      pos: -12.5,27.5
-      parent: 104
-  - uid: 2085
-    components:
-    - type: Transform
-      pos: -12.5,26.5
-      parent: 104
-  - uid: 2086
-    components:
-    - type: Transform
-      pos: -12.5,25.5
-      parent: 104
-  - uid: 2087
-    components:
-    - type: Transform
-      pos: -16.5,25.5
-      parent: 104
-  - uid: 2088
-    components:
-    - type: Transform
-      pos: -3.5,-6.5
-      parent: 104
-  - uid: 2091
-    components:
-    - type: Transform
-      pos: -15.5,25.5
-      parent: 104
-  - uid: 2093
-    components:
-    - type: Transform
-      pos: -14.5,26.5
-      parent: 104
-  - uid: 2094
-    components:
-    - type: Transform
-      pos: -14.5,25.5
-      parent: 104
-  - uid: 2096
-    components:
-    - type: Transform
-      pos: -13.5,27.5
-      parent: 104
-  - uid: 2098
-    components:
-    - type: Transform
-      pos: -13.5,26.5
-      parent: 104
-  - uid: 2099
-    components:
-    - type: Transform
-      pos: -13.5,25.5
-      parent: 104
-  - uid: 2100
-    components:
-    - type: Transform
-      pos: -20.5,30.5
-      parent: 104
-  - uid: 2101
-    components:
-    - type: Transform
-      pos: -20.5,29.5
-      parent: 104
-  - uid: 2102
-    components:
-    - type: Transform
-      pos: -20.5,28.5
-      parent: 104
-  - uid: 2103
-    components:
-    - type: Transform
-      pos: -20.5,27.5
-      parent: 104
-  - uid: 2104
-    components:
-    - type: Transform
-      pos: -20.5,26.5
-      parent: 104
-  - uid: 2105
-    components:
-    - type: Transform
-      pos: -20.5,25.5
-      parent: 104
-  - uid: 2106
-    components:
-    - type: Transform
-      pos: -20.5,24.5
-      parent: 104
-  - uid: 2107
-    components:
-    - type: Transform
-      pos: -19.5,30.5
-      parent: 104
-  - uid: 2108
-    components:
-    - type: Transform
-      pos: -19.5,29.5
-      parent: 104
-  - uid: 2109
-    components:
-    - type: Transform
-      pos: -19.5,28.5
-      parent: 104
-  - uid: 2110
-    components:
-    - type: Transform
-      pos: -19.5,27.5
-      parent: 104
-  - uid: 2111
-    components:
-    - type: Transform
-      pos: -19.5,26.5
-      parent: 104
-  - uid: 2112
-    components:
-    - type: Transform
-      pos: -19.5,25.5
-      parent: 104
-  - uid: 2113
-    components:
-    - type: Transform
-      pos: -19.5,24.5
-      parent: 104
-  - uid: 2115
-    components:
-    - type: Transform
-      pos: -18.5,30.5
-      parent: 104
-  - uid: 2116
-    components:
-    - type: Transform
-      pos: -18.5,29.5
-      parent: 104
-  - uid: 2117
-    components:
-    - type: Transform
-      pos: -18.5,28.5
-      parent: 104
-  - uid: 2118
-    components:
-    - type: Transform
-      pos: -18.5,27.5
-      parent: 104
-  - uid: 2119
-    components:
-    - type: Transform
-      pos: -18.5,26.5
-      parent: 104
-  - uid: 2120
-    components:
-    - type: Transform
-      pos: -18.5,25.5
-      parent: 104
-  - uid: 2121
-    components:
-    - type: Transform
-      pos: -18.5,24.5
-      parent: 104
-  - uid: 2122
-    components:
-    - type: Transform
-      pos: -17.5,28.5
-      parent: 104
-  - uid: 2123
-    components:
-    - type: Transform
-      pos: -17.5,27.5
-      parent: 104
-  - uid: 2124
-    components:
-    - type: Transform
-      pos: -17.5,25.5
-      parent: 104
-  - uid: 2125
-    components:
-    - type: Transform
-      pos: -11.5,28.5
-      parent: 104
-  - uid: 2127
-    components:
-    - type: Transform
-      pos: -11.5,27.5
-      parent: 104
-  - uid: 2128
-    components:
-    - type: Transform
-      pos: -11.5,26.5
-      parent: 104
-  - uid: 2129
-    components:
-    - type: Transform
-      pos: -11.5,25.5
-      parent: 104
-  - uid: 2130
-    components:
-    - type: Transform
-      pos: -11.5,24.5
-      parent: 104
-  - uid: 2131
-    components:
-    - type: Transform
-      pos: -21.5,31.5
-      parent: 104
-  - uid: 2132
-    components:
-    - type: Transform
-      pos: -20.5,31.5
-      parent: 104
-  - uid: 2133
-    components:
-    - type: Transform
-      pos: -19.5,31.5
-      parent: 104
-  - uid: 2134
-    components:
-    - type: Transform
-      pos: -10.5,28.5
-      parent: 104
-  - uid: 2136
-    components:
-    - type: Transform
-      pos: -10.5,27.5
-      parent: 104
-  - uid: 2137
-    components:
-    - type: Transform
-      pos: -10.5,26.5
-      parent: 104
-  - uid: 2138
-    components:
-    - type: Transform
-      pos: -10.5,25.5
-      parent: 104
-  - uid: 2139
-    components:
-    - type: Transform
-      pos: -10.5,24.5
-      parent: 104
-  - uid: 2140
-    components:
-    - type: Transform
-      pos: -9.5,29.5
-      parent: 104
-  - uid: 2141
-    components:
-    - type: Transform
-      pos: -9.5,28.5
-      parent: 104
-  - uid: 2142
-    components:
-    - type: Transform
-      pos: -9.5,27.5
-      parent: 104
-  - uid: 2143
-    components:
-    - type: Transform
-      pos: -9.5,26.5
-      parent: 104
-  - uid: 2144
-    components:
-    - type: Transform
-      pos: -9.5,25.5
-      parent: 104
-  - uid: 2145
-    components:
-    - type: Transform
-      pos: -9.5,24.5
-      parent: 104
-  - uid: 2146
-    components:
-    - type: Transform
-      pos: -8.5,29.5
-      parent: 104
-  - uid: 2147
-    components:
-    - type: Transform
-      pos: -8.5,28.5
-      parent: 104
-  - uid: 2148
-    components:
-    - type: Transform
-      pos: -8.5,27.5
-      parent: 104
-  - uid: 2149
-    components:
-    - type: Transform
-      pos: -8.5,26.5
-      parent: 104
-  - uid: 2150
-    components:
-    - type: Transform
-      pos: -8.5,25.5
-      parent: 104
-  - uid: 2151
-    components:
-    - type: Transform
-      pos: -8.5,24.5
-      parent: 104
-  - uid: 2152
-    components:
-    - type: Transform
-      pos: -7.5,29.5
-      parent: 104
-  - uid: 2153
-    components:
-    - type: Transform
-      pos: -7.5,28.5
-      parent: 104
-  - uid: 2154
-    components:
-    - type: Transform
-      pos: -7.5,27.5
-      parent: 104
-  - uid: 2155
-    components:
-    - type: Transform
-      pos: -7.5,26.5
-      parent: 104
-  - uid: 2156
-    components:
-    - type: Transform
-      pos: -7.5,25.5
-      parent: 104
-  - uid: 2157
-    components:
-    - type: Transform
-      pos: -7.5,24.5
-      parent: 104
-  - uid: 2158
-    components:
-    - type: Transform
-      pos: -6.5,29.5
-      parent: 104
-  - uid: 2159
-    components:
-    - type: Transform
-      pos: -6.5,28.5
-      parent: 104
-  - uid: 2160
-    components:
-    - type: Transform
-      pos: -6.5,27.5
-      parent: 104
-  - uid: 2161
-    components:
-    - type: Transform
-      pos: -6.5,26.5
-      parent: 104
-  - uid: 2162
-    components:
-    - type: Transform
-      pos: -6.5,25.5
-      parent: 104
-  - uid: 2163
-    components:
-    - type: Transform
-      pos: -6.5,24.5
-      parent: 104
-  - uid: 2164
-    components:
-    - type: Transform
-      pos: -5.5,29.5
-      parent: 104
-  - uid: 2165
-    components:
-    - type: Transform
-      pos: -5.5,28.5
-      parent: 104
-  - uid: 2166
-    components:
-    - type: Transform
-      pos: -5.5,27.5
-      parent: 104
-  - uid: 2167
-    components:
-    - type: Transform
-      pos: -5.5,26.5
-      parent: 104
-  - uid: 2168
-    components:
-    - type: Transform
-      pos: -5.5,25.5
-      parent: 104
-  - uid: 2169
-    components:
-    - type: Transform
-      pos: -5.5,24.5
-      parent: 104
-  - uid: 2170
-    components:
-    - type: Transform
-      pos: -4.5,29.5
-      parent: 104
-  - uid: 2171
-    components:
-    - type: Transform
-      pos: -4.5,28.5
-      parent: 104
-  - uid: 2172
-    components:
-    - type: Transform
-      pos: -4.5,27.5
-      parent: 104
-  - uid: 2173
-    components:
-    - type: Transform
-      pos: -4.5,26.5
-      parent: 104
-  - uid: 2174
-    components:
-    - type: Transform
-      pos: -4.5,25.5
-      parent: 104
-  - uid: 2175
-    components:
-    - type: Transform
-      pos: -4.5,24.5
-      parent: 104
-  - uid: 2176
-    components:
-    - type: Transform
-      pos: -3.5,28.5
-      parent: 104
-  - uid: 2177
-    components:
-    - type: Transform
-      pos: -3.5,27.5
-      parent: 104
-  - uid: 2178
-    components:
-    - type: Transform
-      pos: -3.5,26.5
-      parent: 104
-  - uid: 2179
-    components:
-    - type: Transform
-      pos: -3.5,25.5
-      parent: 104
-  - uid: 2180
-    components:
-    - type: Transform
-      pos: -3.5,24.5
-      parent: 104
-  - uid: 2181
-    components:
-    - type: Transform
-      pos: -2.5,26.5
-      parent: 104
-  - uid: 2183
-    components:
-    - type: Transform
-      pos: -2.5,25.5
-      parent: 104
-  - uid: 2184
-    components:
-    - type: Transform
-      pos: -2.5,24.5
-      parent: 104
-  - uid: 2192
-    components:
-    - type: Transform
-      pos: -5.5,-23.5
-      parent: 104
-  - uid: 2194
-    components:
-    - type: Transform
-      pos: 15.5,29.5
-      parent: 104
-  - uid: 2195
-    components:
-    - type: Transform
-      pos: 10.5,24.5
-      parent: 104
-  - uid: 2196
-    components:
-    - type: Transform
-      pos: 15.5,31.5
-      parent: 104
-  - uid: 2197
-    components:
-    - type: Transform
-      pos: 16.5,26.5
-      parent: 104
-  - uid: 2198
-    components:
-    - type: Transform
-      pos: 15.5,30.5
-      parent: 104
-  - uid: 2199
-    components:
-    - type: Transform
-      pos: 15.5,32.5
-      parent: 104
-  - uid: 2200
-    components:
-    - type: Transform
-      pos: 16.5,23.5
-      parent: 104
-  - uid: 2201
-    components:
-    - type: Transform
-      pos: 16.5,24.5
-      parent: 104
-  - uid: 2202
-    components:
-    - type: Transform
-      pos: 16.5,25.5
-      parent: 104
-  - uid: 2203
-    components:
-    - type: Transform
-      pos: 10.5,23.5
-      parent: 104
-  - uid: 2204
-    components:
-    - type: Transform
-      pos: 10.5,25.5
-      parent: 104
-  - uid: 2205
-    components:
-    - type: Transform
-      pos: 10.5,26.5
-      parent: 104
-  - uid: 2206
-    components:
-    - type: Transform
-      pos: 10.5,27.5
-      parent: 104
-  - uid: 2207
-    components:
-    - type: Transform
-      pos: 10.5,28.5
-      parent: 104
-  - uid: 2208
-    components:
-    - type: Transform
-      pos: 11.5,23.5
-      parent: 104
-  - uid: 2209
-    components:
-    - type: Transform
-      pos: 11.5,24.5
-      parent: 104
-  - uid: 2210
-    components:
-    - type: Transform
-      pos: 11.5,25.5
-      parent: 104
-  - uid: 2211
-    components:
-    - type: Transform
-      pos: 11.5,26.5
-      parent: 104
-  - uid: 2212
-    components:
-    - type: Transform
-      pos: 11.5,27.5
-      parent: 104
-  - uid: 2213
-    components:
-    - type: Transform
-      pos: 11.5,28.5
-      parent: 104
-  - uid: 2214
-    components:
-    - type: Transform
-      pos: 11.5,29.5
-      parent: 104
-  - uid: 2215
-    components:
-    - type: Transform
-      pos: 12.5,23.5
-      parent: 104
-  - uid: 2216
-    components:
-    - type: Transform
-      pos: 12.5,24.5
-      parent: 104
-  - uid: 2217
-    components:
-    - type: Transform
-      pos: 12.5,25.5
-      parent: 104
-  - uid: 2218
-    components:
-    - type: Transform
-      pos: 12.5,26.5
-      parent: 104
-  - uid: 2219
-    components:
-    - type: Transform
-      pos: 12.5,27.5
-      parent: 104
-  - uid: 2220
-    components:
-    - type: Transform
-      pos: 12.5,28.5
-      parent: 104
-  - uid: 2221
-    components:
-    - type: Transform
-      pos: 12.5,29.5
-      parent: 104
-  - uid: 2222
-    components:
-    - type: Transform
-      pos: 12.5,30.5
-      parent: 104
-  - uid: 2223
-    components:
-    - type: Transform
-      pos: 12.5,31.5
-      parent: 104
-  - uid: 2224
-    components:
-    - type: Transform
-      pos: 13.5,23.5
-      parent: 104
-  - uid: 2225
-    components:
-    - type: Transform
-      pos: 13.5,24.5
-      parent: 104
-  - uid: 2226
-    components:
-    - type: Transform
-      pos: 13.5,25.5
-      parent: 104
-  - uid: 2227
-    components:
-    - type: Transform
-      pos: 13.5,26.5
-      parent: 104
-  - uid: 2228
-    components:
-    - type: Transform
-      pos: 13.5,27.5
-      parent: 104
-  - uid: 2229
-    components:
-    - type: Transform
-      pos: 13.5,28.5
-      parent: 104
-  - uid: 2230
-    components:
-    - type: Transform
-      pos: 13.5,29.5
-      parent: 104
-  - uid: 2231
-    components:
-    - type: Transform
-      pos: 13.5,30.5
-      parent: 104
-  - uid: 2232
-    components:
-    - type: Transform
-      pos: 13.5,31.5
-      parent: 104
-  - uid: 2233
-    components:
-    - type: Transform
-      pos: 14.5,23.5
-      parent: 104
-  - uid: 2234
-    components:
-    - type: Transform
-      pos: 14.5,24.5
-      parent: 104
-  - uid: 2235
-    components:
-    - type: Transform
-      pos: 14.5,25.5
-      parent: 104
-  - uid: 2236
-    components:
-    - type: Transform
-      pos: 14.5,26.5
-      parent: 104
-  - uid: 2237
-    components:
-    - type: Transform
-      pos: 14.5,27.5
-      parent: 104
-  - uid: 2238
-    components:
-    - type: Transform
-      pos: 14.5,28.5
-      parent: 104
-  - uid: 2239
-    components:
-    - type: Transform
-      pos: 14.5,29.5
-      parent: 104
-  - uid: 2240
-    components:
-    - type: Transform
-      pos: 14.5,30.5
-      parent: 104
-  - uid: 2241
-    components:
-    - type: Transform
-      pos: 14.5,31.5
-      parent: 104
-  - uid: 2242
-    components:
-    - type: Transform
-      pos: 14.5,32.5
-      parent: 104
-  - uid: 2243
-    components:
-    - type: Transform
-      pos: 15.5,23.5
-      parent: 104
-  - uid: 2244
-    components:
-    - type: Transform
-      pos: 15.5,24.5
-      parent: 104
-  - uid: 2245
-    components:
-    - type: Transform
-      pos: 15.5,25.5
-      parent: 104
-  - uid: 2246
-    components:
-    - type: Transform
-      pos: 15.5,26.5
-      parent: 104
-  - uid: 2247
-    components:
-    - type: Transform
-      pos: 15.5,27.5
-      parent: 104
-  - uid: 2248
-    components:
-    - type: Transform
-      pos: 15.5,28.5
-      parent: 104
-  - uid: 2249
-    components:
-    - type: Transform
-      pos: 19.5,25.5
-      parent: 104
-  - uid: 2250
-    components:
-    - type: Transform
-      pos: 19.5,26.5
-      parent: 104
-  - uid: 2251
-    components:
-    - type: Transform
-      pos: 19.5,27.5
-      parent: 104
-  - uid: 2252
-    components:
-    - type: Transform
-      pos: 19.5,28.5
-      parent: 104
-  - uid: 2253
-    components:
-    - type: Transform
-      pos: 19.5,29.5
-      parent: 104
-  - uid: 2254
-    components:
-    - type: Transform
-      pos: 19.5,30.5
-      parent: 104
-  - uid: 2255
-    components:
-    - type: Transform
-      pos: 19.5,31.5
-      parent: 104
-  - uid: 2256
-    components:
-    - type: Transform
-      pos: 20.5,26.5
-      parent: 104
-  - uid: 2259
-    components:
-    - type: Transform
-      pos: 20.5,27.5
-      parent: 104
-  - uid: 2260
-    components:
-    - type: Transform
-      pos: 20.5,28.5
-      parent: 104
-  - uid: 2261
-    components:
-    - type: Transform
-      pos: 20.5,29.5
-      parent: 104
-  - uid: 2262
-    components:
-    - type: Transform
-      pos: 16.5,27.5
-      parent: 104
-  - uid: 2263
-    components:
-    - type: Transform
-      pos: 16.5,28.5
-      parent: 104
-  - uid: 2264
-    components:
-    - type: Transform
-      pos: 16.5,29.5
-      parent: 104
-  - uid: 2265
-    components:
-    - type: Transform
-      pos: 16.5,30.5
-      parent: 104
-  - uid: 2266
-    components:
-    - type: Transform
-      pos: 16.5,31.5
-      parent: 104
-  - uid: 2267
-    components:
-    - type: Transform
-      pos: 16.5,32.5
-      parent: 104
-  - uid: 2268
-    components:
-    - type: Transform
-      pos: 17.5,23.5
-      parent: 104
-  - uid: 2269
-    components:
-    - type: Transform
-      pos: 17.5,24.5
-      parent: 104
-  - uid: 2270
-    components:
-    - type: Transform
-      pos: 17.5,25.5
-      parent: 104
-  - uid: 2271
-    components:
-    - type: Transform
-      pos: 17.5,26.5
-      parent: 104
-  - uid: 2272
-    components:
-    - type: Transform
-      pos: 17.5,27.5
-      parent: 104
-  - uid: 2273
-    components:
-    - type: Transform
-      pos: 17.5,28.5
-      parent: 104
-  - uid: 2274
-    components:
-    - type: Transform
-      pos: 17.5,29.5
-      parent: 104
-  - uid: 2275
-    components:
-    - type: Transform
-      pos: 17.5,30.5
-      parent: 104
-  - uid: 2276
-    components:
-    - type: Transform
-      pos: 17.5,31.5
-      parent: 104
-  - uid: 2277
-    components:
-    - type: Transform
-      pos: 17.5,32.5
-      parent: 104
-  - uid: 2278
-    components:
-    - type: Transform
-      pos: 18.5,23.5
-      parent: 104
-  - uid: 2279
-    components:
-    - type: Transform
-      pos: 18.5,24.5
-      parent: 104
-  - uid: 2280
-    components:
-    - type: Transform
-      pos: 18.5,25.5
-      parent: 104
-  - uid: 2281
-    components:
-    - type: Transform
-      pos: 18.5,26.5
-      parent: 104
-  - uid: 2282
-    components:
-    - type: Transform
-      pos: 18.5,27.5
-      parent: 104
-  - uid: 2283
-    components:
-    - type: Transform
-      pos: 18.5,28.5
-      parent: 104
-  - uid: 2284
-    components:
-    - type: Transform
-      pos: 18.5,29.5
-      parent: 104
-  - uid: 2285
-    components:
-    - type: Transform
-      pos: 18.5,30.5
-      parent: 104
-  - uid: 2286
-    components:
-    - type: Transform
-      pos: 18.5,31.5
-      parent: 104
-  - uid: 2287
-    components:
-    - type: Transform
-      pos: 18.5,32.5
-      parent: 104
-  - uid: 2288
-    components:
-    - type: Transform
-      pos: 19.5,23.5
-      parent: 104
-  - uid: 2289
-    components:
-    - type: Transform
-      pos: 19.5,24.5
-      parent: 104
-- proto: BalloonSyn
-  entities:
-  - uid: 1327
-    components:
-    - type: Transform
-      pos: 0.03361702,-6.368435
-      parent: 104
-- proto: BaseComputer
-  entities:
-  - uid: 18
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-8.5
-      parent: 104
-  - uid: 29
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-8.5
-      parent: 104
-  - uid: 111
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-1.5
-      parent: 104
-  - uid: 2292
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-2.5
-      parent: 104
-  - uid: 2295
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-3.5
-      parent: 104
-- proto: Beaker
-  entities:
-  - uid: 2031
-    components:
-    - type: Transform
-      pos: 3.6114278,-10.732791
-      parent: 104
-  - uid: 2095
-    components:
-    - type: Transform
-      pos: 4.017678,-12.520861
-      parent: 104
-- proto: Bed
-  entities:
-  - uid: 957
-    components:
-    - type: Transform
-      pos: 15.5,-3.5
-      parent: 104
-  - uid: 1548
-    components:
-    - type: Transform
-      pos: 15.5,-4.5
-      parent: 104
-- proto: BedsheetMedical
-  entities:
-  - uid: 1872
-    components:
-    - type: Transform
-      pos: 1.5,-12.5
-      parent: 104
-  - uid: 1877
-    components:
-    - type: Transform
-      pos: -1.5,-16.5
-      parent: 104
-  - uid: 1898
-    components:
-    - type: Transform
-      pos: 1.5,-16.5
-      parent: 104
-  - uid: 1899
-    components:
-    - type: Transform
-      pos: -1.5,-12.5
-      parent: 104
-- proto: BedsheetSyndie
-  entities:
-  - uid: 154
-    components:
-    - type: Transform
-      pos: 15.5,-3.5
-      parent: 104
-  - uid: 289
-    components:
-    - type: Transform
-      pos: 15.5,-4.5
-      parent: 104
-- proto: BigBox
-  entities:
-  - uid: 2458
-    components:
-    - type: Transform
-      pos: 13.500806,-4.4874377
-      parent: 104
-- proto: Bookshelf
-  entities:
-  - uid: 140
-    components:
-    - type: Transform
-      pos: -0.5,-0.5
-      parent: 104
-- proto: BoozeDispenser
-  entities:
-  - uid: 230
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-8.5
-      parent: 104
-- proto: BoxBeaker
-  entities:
-  - uid: 2114
-    components:
-    - type: Transform
-      pos: 5.539936,-12.489611
-      parent: 104
-- proto: BoxFolderBlack
-  entities:
-  - uid: 1022
-    components:
-    - type: Transform
-      pos: -13.494709,9.54891
-      parent: 104
-- proto: BoxMagazinePistolCaselessRiflePractice
-  entities:
-  - uid: 1635
-    components:
-    - type: Transform
-      pos: 5.4970627,10.597828
-      parent: 104
-- proto: BoxMagazinePistolSubMachineGunPractice
-  entities:
-  - uid: 1634
-    components:
-    - type: Transform
-      pos: 5.388983,13.953581
-      parent: 104
-- proto: BoxPillCanister
-  entities:
-  - uid: 1844
-    components:
-    - type: Transform
-      pos: 5.430561,-12.364611
-      parent: 104
-- proto: BoxShotgunPractice
-  entities:
-  - uid: 1633
-    components:
-    - type: Transform
-      pos: 5.4972115,14.562988
-      parent: 104
-    - type: BallisticAmmoProvider
-      unspawnedCount: 12
-- proto: Bucket
-  entities:
-  - uid: 153
-    components:
-    - type: Transform
-      pos: 10.809023,-4.25956
-      parent: 104
-- proto: CableApcExtension
-  entities:
-  - uid: 13
-    components:
-    - type: Transform
-      pos: -10.5,-5.5
-      parent: 104
-  - uid: 24
-    components:
-    - type: Transform
-      pos: -31.5,0.5
-      parent: 104
-  - uid: 100
-    components:
-    - type: Transform
-      pos: 13.5,0.5
-      parent: 104
-  - uid: 143
-    components:
-    - type: Transform
-      pos: 12.5,0.5
-      parent: 104
-  - uid: 213
-    components:
-    - type: Transform
-      pos: -16.5,-19.5
-      parent: 104
-  - uid: 214
-    components:
-    - type: Transform
-      pos: -15.5,-19.5
-      parent: 104
-  - uid: 220
-    components:
-    - type: Transform
-      pos: 11.5,0.5
-      parent: 104
-  - uid: 235
-    components:
-    - type: Transform
-      pos: 1.5,-13.5
-      parent: 104
-  - uid: 245
-    components:
-    - type: Transform
-      pos: 12.5,-18.5
-      parent: 104
-  - uid: 254
-    components:
-    - type: Transform
-      pos: -30.5,0.5
-      parent: 104
-  - uid: 279
-    components:
-    - type: Transform
-      pos: 11.5,-0.5
-      parent: 104
-  - uid: 287
-    components:
-    - type: Transform
-      pos: -15.5,0.5
-      parent: 104
-  - uid: 297
-    components:
-    - type: Transform
-      pos: 3.5,-14.5
-      parent: 104
-  - uid: 390
-    components:
-    - type: Transform
-      pos: -10.5,-7.5
-      parent: 104
-  - uid: 397
-    components:
-    - type: Transform
-      pos: -10.5,0.5
-      parent: 104
-  - uid: 411
-    components:
-    - type: Transform
-      pos: -10.5,-8.5
-      parent: 104
-  - uid: 412
-    components:
-    - type: Transform
-      pos: -26.5,-19.5
-      parent: 104
-  - uid: 428
-    components:
-    - type: Transform
-      pos: -23.5,-19.5
-      parent: 104
-  - uid: 429
-    components:
-    - type: Transform
-      pos: -10.5,-0.5
-      parent: 104
-  - uid: 430
-    components:
-    - type: Transform
-      pos: -10.5,1.5
-      parent: 104
-  - uid: 432
-    components:
-    - type: Transform
-      pos: -27.5,0.5
-      parent: 104
-  - uid: 433
-    components:
-    - type: Transform
-      pos: -17.5,-19.5
-      parent: 104
-  - uid: 434
-    components:
-    - type: Transform
-      pos: -21.5,-19.5
-      parent: 104
-  - uid: 435
-    components:
-    - type: Transform
-      pos: -10.5,-4.5
-      parent: 104
-  - uid: 436
-    components:
-    - type: Transform
-      pos: -10.5,-6.5
-      parent: 104
-  - uid: 437
-    components:
-    - type: Transform
-      pos: -10.5,-9.5
-      parent: 104
-  - uid: 438
-    components:
-    - type: Transform
-      pos: -20.5,-19.5
-      parent: 104
-  - uid: 439
-    components:
-    - type: Transform
-      pos: -10.5,-3.5
-      parent: 104
-  - uid: 442
-    components:
-    - type: Transform
-      pos: -19.5,-19.5
-      parent: 104
-  - uid: 444
-    components:
-    - type: Transform
-      pos: -10.5,1.5
-      parent: 104
-  - uid: 445
-    components:
-    - type: Transform
-      pos: -26.5,0.5
-      parent: 104
-  - uid: 449
-    components:
-    - type: Transform
-      pos: -18.5,-19.5
-      parent: 104
-  - uid: 452
-    components:
-    - type: Transform
-      pos: -30.5,-19.5
-      parent: 104
-  - uid: 453
-    components:
-    - type: Transform
-      pos: -29.5,-19.5
-      parent: 104
-  - uid: 454
-    components:
-    - type: Transform
-      pos: -23.5,0.5
-      parent: 104
-  - uid: 465
-    components:
-    - type: Transform
-      pos: -28.5,-19.5
-      parent: 104
-  - uid: 466
-    components:
-    - type: Transform
-      pos: -27.5,-19.5
-      parent: 104
-  - uid: 467
-    components:
-    - type: Transform
-      pos: -24.5,-19.5
-      parent: 104
-  - uid: 476
-    components:
-    - type: Transform
-      pos: -22.5,-19.5
-      parent: 104
-  - uid: 619
-    components:
-    - type: Transform
-      pos: -10.5,-12.5
-      parent: 104
-  - uid: 624
-    components:
-    - type: Transform
-      pos: -10.5,-10.5
-      parent: 104
-  - uid: 625
-    components:
-    - type: Transform
-      pos: -10.5,-11.5
-      parent: 104
-  - uid: 627
-    components:
-    - type: Transform
-      pos: -10.5,-15.5
-      parent: 104
-  - uid: 628
-    components:
-    - type: Transform
-      pos: -10.5,-16.5
-      parent: 104
-  - uid: 630
-    components:
-    - type: Transform
-      pos: -10.5,-17.5
-      parent: 104
-  - uid: 657
-    components:
-    - type: Transform
-      pos: -25.5,-19.5
-      parent: 104
-  - uid: 659
-    components:
-    - type: Transform
-      pos: -32.5,-19.5
-      parent: 104
-  - uid: 660
-    components:
-    - type: Transform
-      pos: -31.5,-19.5
-      parent: 104
-  - uid: 666
-    components:
-    - type: Transform
-      pos: -22.5,0.5
-      parent: 104
-  - uid: 814
-    components:
-    - type: Transform
-      pos: -6.5,-3.5
-      parent: 104
-  - uid: 832
-    components:
-    - type: Transform
-      pos: -7.5,-3.5
-      parent: 104
-  - uid: 840
-    components:
-    - type: Transform
-      pos: -25.5,0.5
-      parent: 104
-  - uid: 845
-    components:
-    - type: Transform
-      pos: -10.5,-1.5
-      parent: 104
-  - uid: 866
-    components:
-    - type: Transform
-      pos: -10.5,-2.5
-      parent: 104
-  - uid: 867
-    components:
-    - type: Transform
-      pos: -5.5,-3.5
-      parent: 104
-  - uid: 868
-    components:
-    - type: Transform
-      pos: -10.5,-3.5
-      parent: 104
-  - uid: 870
-    components:
-    - type: Transform
-      pos: -9.5,-3.5
-      parent: 104
-  - uid: 877
-    components:
-    - type: Transform
-      pos: -8.5,-3.5
-      parent: 104
-  - uid: 884
-    components:
-    - type: Transform
-      pos: -4.5,-3.5
-      parent: 104
-  - uid: 920
-    components:
-    - type: Transform
-      pos: -10.5,-13.5
-      parent: 104
-  - uid: 926
-    components:
-    - type: Transform
-      pos: -12.5,0.5
-      parent: 104
-  - uid: 927
-    components:
-    - type: Transform
-      pos: -12.5,-19.5
-      parent: 104
-  - uid: 929
-    components:
-    - type: Transform
-      pos: -24.5,0.5
-      parent: 104
-  - uid: 931
-    components:
-    - type: Transform
-      pos: 12.5,-19.5
-      parent: 104
-  - uid: 933
-    components:
-    - type: Transform
-      pos: -10.5,-19.5
-      parent: 104
-  - uid: 934
-    components:
-    - type: Transform
-      pos: -10.5,-14.5
-      parent: 104
-  - uid: 960
-    components:
-    - type: Transform
-      pos: 12.5,-17.5
-      parent: 104
-  - uid: 961
-    components:
-    - type: Transform
-      pos: 11.5,-16.5
-      parent: 104
-  - uid: 962
-    components:
-    - type: Transform
-      pos: 6.5,-14.5
-      parent: 104
-  - uid: 963
-    components:
-    - type: Transform
-      pos: -14.5,0.5
-      parent: 104
-  - uid: 967
-    components:
-    - type: Transform
-      pos: 9.5,-16.5
-      parent: 104
-  - uid: 968
-    components:
-    - type: Transform
-      pos: 7.5,-16.5
-      parent: 104
-  - uid: 969
-    components:
-    - type: Transform
-      pos: -10.5,-18.5
-      parent: 104
-  - uid: 970
-    components:
-    - type: Transform
-      pos: -33.5,-19.5
-      parent: 104
-  - uid: 971
-    components:
-    - type: Transform
-      pos: -33.5,0.5
-      parent: 104
-  - uid: 973
-    components:
-    - type: Transform
-      pos: 5.5,-17.5
-      parent: 104
-  - uid: 979
-    components:
-    - type: Transform
-      pos: 1.5,-16.5
-      parent: 104
-  - uid: 981
-    components:
-    - type: Transform
-      pos: 5.5,-14.5
-      parent: 104
-  - uid: 982
-    components:
-    - type: Transform
-      pos: 12.5,-16.5
-      parent: 104
-  - uid: 983
-    components:
-    - type: Transform
-      pos: 5.5,-16.5
-      parent: 104
-  - uid: 1081
-    components:
-    - type: Transform
-      pos: -17.5,0.5
-      parent: 104
-  - uid: 1082
-    components:
-    - type: Transform
-      pos: -11.5,0.5
-      parent: 104
-  - uid: 1115
-    components:
-    - type: Transform
-      pos: 4.5,-14.5
-      parent: 104
-  - uid: 1116
-    components:
-    - type: Transform
-      pos: 1.5,-12.5
-      parent: 104
-  - uid: 1117
-    components:
-    - type: Transform
-      pos: 6.5,-16.5
-      parent: 104
-  - uid: 1122
-    components:
-    - type: Transform
-      pos: 1.5,-14.5
-      parent: 104
-  - uid: 1131
-    components:
-    - type: Transform
-      pos: -13.5,0.5
-      parent: 104
-  - uid: 1152
-    components:
-    - type: Transform
-      pos: 12.5,-20.5
-      parent: 104
-  - uid: 1154
-    components:
-    - type: Transform
-      pos: 3.5,-13.5
-      parent: 104
-  - uid: 1182
-    components:
-    - type: Transform
-      pos: 5.5,-15.5
-      parent: 104
-  - uid: 1183
-    components:
-    - type: Transform
-      pos: 7.5,-14.5
-      parent: 104
-  - uid: 1187
-    components:
-    - type: Transform
-      pos: -20.5,0.5
-      parent: 104
-  - uid: 1189
-    components:
-    - type: Transform
-      pos: -32.5,0.5
-      parent: 104
-  - uid: 1191
-    components:
-    - type: Transform
-      pos: 3.5,-12.5
-      parent: 104
-  - uid: 1194
-    components:
-    - type: Transform
-      pos: 2.5,-14.5
-      parent: 104
-  - uid: 1195
-    components:
-    - type: Transform
-      pos: 8.5,-16.5
-      parent: 104
-  - uid: 1200
-    components:
-    - type: Transform
-      pos: 1.5,-15.5
-      parent: 104
-  - uid: 1204
-    components:
-    - type: Transform
-      pos: 10.5,-16.5
-      parent: 104
-  - uid: 1232
-    components:
-    - type: Transform
-      pos: -10.5,6.5
-      parent: 104
-  - uid: 1233
-    components:
-    - type: Transform
-      pos: -10.5,5.5
-      parent: 104
-  - uid: 1234
-    components:
-    - type: Transform
-      pos: -10.5,4.5
-      parent: 104
-  - uid: 1235
-    components:
-    - type: Transform
-      pos: -10.5,3.5
-      parent: 104
-  - uid: 1236
-    components:
-    - type: Transform
-      pos: -10.5,2.5
-      parent: 104
-  - uid: 1237
-    components:
-    - type: Transform
-      pos: -11.5,6.5
-      parent: 104
-  - uid: 1238
-    components:
-    - type: Transform
-      pos: -12.5,6.5
-      parent: 104
-  - uid: 1239
-    components:
-    - type: Transform
-      pos: -13.5,6.5
-      parent: 104
-  - uid: 1240
-    components:
-    - type: Transform
-      pos: -14.5,6.5
-      parent: 104
-  - uid: 1249
-    components:
-    - type: Transform
-      pos: -11.5,-19.5
-      parent: 104
-  - uid: 1275
-    components:
-    - type: Transform
-      pos: -6.5,-2.5
-      parent: 104
-  - uid: 1277
-    components:
-    - type: Transform
-      pos: -21.5,0.5
-      parent: 104
-  - uid: 1278
-    components:
-    - type: Transform
-      pos: -16.5,0.5
-      parent: 104
-  - uid: 1281
-    components:
-    - type: Transform
-      pos: -6.5,-1.5
-      parent: 104
-  - uid: 1282
-    components:
-    - type: Transform
-      pos: -6.5,-0.5
-      parent: 104
-  - uid: 1283
-    components:
-    - type: Transform
-      pos: -6.5,0.5
-      parent: 104
-  - uid: 1292
-    components:
-    - type: Transform
-      pos: 3.5,1.5
-      parent: 104
-  - uid: 1337
-    components:
-    - type: Transform
-      pos: -6.5,-4.5
-      parent: 104
-  - uid: 1338
-    components:
-    - type: Transform
-      pos: -6.5,-5.5
-      parent: 104
-  - uid: 1339
-    components:
-    - type: Transform
-      pos: -6.5,-6.5
-      parent: 104
-  - uid: 1340
-    components:
-    - type: Transform
-      pos: -6.5,-7.5
-      parent: 104
-  - uid: 1341
-    components:
-    - type: Transform
-      pos: -6.5,-8.5
-      parent: 104
-  - uid: 1342
-    components:
-    - type: Transform
-      pos: -6.5,-9.5
-      parent: 104
-  - uid: 1343
-    components:
-    - type: Transform
-      pos: -6.5,-10.5
-      parent: 104
-  - uid: 1344
-    components:
-    - type: Transform
-      pos: -6.5,-11.5
-      parent: 104
-  - uid: 1345
-    components:
-    - type: Transform
-      pos: -6.5,-12.5
-      parent: 104
-  - uid: 1346
-    components:
-    - type: Transform
-      pos: -6.5,-13.5
-      parent: 104
-  - uid: 1347
-    components:
-    - type: Transform
-      pos: -6.5,-14.5
-      parent: 104
-  - uid: 1348
-    components:
-    - type: Transform
-      pos: -6.5,-15.5
-      parent: 104
-  - uid: 1349
-    components:
-    - type: Transform
-      pos: -6.5,-16.5
-      parent: 104
-  - uid: 1429
-    components:
-    - type: Transform
-      pos: -18.5,0.5
-      parent: 104
-  - uid: 1430
-    components:
-    - type: Transform
-      pos: -19.5,0.5
-      parent: 104
-  - uid: 1439
-    components:
-    - type: Transform
-      pos: 20.5,-12.5
-      parent: 104
-  - uid: 1449
-    components:
-    - type: Transform
-      pos: 16.5,-13.5
-      parent: 104
-  - uid: 1450
-    components:
-    - type: Transform
-      pos: 15.5,-13.5
-      parent: 104
-  - uid: 1451
-    components:
-    - type: Transform
-      pos: 15.5,-12.5
-      parent: 104
-  - uid: 1452
-    components:
-    - type: Transform
-      pos: 15.5,-11.5
-      parent: 104
-  - uid: 1453
-    components:
-    - type: Transform
-      pos: 15.5,-10.5
-      parent: 104
-  - uid: 1454
-    components:
-    - type: Transform
-      pos: 14.5,-10.5
-      parent: 104
-  - uid: 1455
-    components:
-    - type: Transform
-      pos: 13.5,-10.5
-      parent: 104
-  - uid: 1456
-    components:
-    - type: Transform
-      pos: 12.5,-10.5
-      parent: 104
-  - uid: 1457
-    components:
-    - type: Transform
-      pos: 11.5,-10.5
-      parent: 104
-  - uid: 1458
-    components:
-    - type: Transform
-      pos: 15.5,-14.5
-      parent: 104
-  - uid: 1459
-    components:
-    - type: Transform
-      pos: 14.5,-14.5
-      parent: 104
-  - uid: 1460
-    components:
-    - type: Transform
-      pos: 13.5,-14.5
-      parent: 104
-  - uid: 1461
-    components:
-    - type: Transform
-      pos: 12.5,-14.5
-      parent: 104
-  - uid: 1473
-    components:
-    - type: Transform
-      pos: -13.5,-19.5
-      parent: 104
-  - uid: 1474
-    components:
-    - type: Transform
-      pos: 7.5,-5.5
-      parent: 104
-  - uid: 1475
-    components:
-    - type: Transform
-      pos: 6.5,-1.5
-      parent: 104
-  - uid: 1476
-    components:
-    - type: Transform
-      pos: 3.5,0.5
-      parent: 104
-  - uid: 1488
-    components:
-    - type: Transform
-      pos: 6.5,-5.5
-      parent: 104
-  - uid: 1489
-    components:
-    - type: Transform
-      pos: 8.5,-5.5
-      parent: 104
-  - uid: 1490
-    components:
-    - type: Transform
-      pos: 6.5,-4.5
-      parent: 104
-  - uid: 1491
-    components:
-    - type: Transform
-      pos: 6.5,-3.5
-      parent: 104
-  - uid: 1492
-    components:
-    - type: Transform
-      pos: 6.5,-2.5
-      parent: 104
-  - uid: 1493
-    components:
-    - type: Transform
-      pos: 6.5,-0.5
-      parent: 104
-  - uid: 1494
-    components:
-    - type: Transform
-      pos: 5.5,-0.5
-      parent: 104
-  - uid: 1495
-    components:
-    - type: Transform
-      pos: 4.5,-0.5
-      parent: 104
-  - uid: 1496
-    components:
-    - type: Transform
-      pos: 4.5,0.5
-      parent: 104
-  - uid: 1497
-    components:
-    - type: Transform
-      pos: 2.5,0.5
-      parent: 104
-  - uid: 1498
-    components:
-    - type: Transform
-      pos: 2.5,-0.5
-      parent: 104
-  - uid: 1499
-    components:
-    - type: Transform
-      pos: 1.5,-0.5
-      parent: 104
-  - uid: 1500
-    components:
-    - type: Transform
-      pos: 0.5,-0.5
-      parent: 104
-  - uid: 1501
-    components:
-    - type: Transform
-      pos: 0.5,-1.5
-      parent: 104
-  - uid: 1502
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 104
-  - uid: 1503
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 104
-  - uid: 1504
-    components:
-    - type: Transform
-      pos: -0.5,-2.5
-      parent: 104
-  - uid: 1505
-    components:
-    - type: Transform
-      pos: -0.5,-3.5
-      parent: 104
-  - uid: 1506
-    components:
-    - type: Transform
-      pos: -0.5,-4.5
-      parent: 104
-  - uid: 1507
-    components:
-    - type: Transform
-      pos: -0.5,-5.5
-      parent: 104
-  - uid: 1508
-    components:
-    - type: Transform
-      pos: -0.5,-6.5
-      parent: 104
-  - uid: 1509
-    components:
-    - type: Transform
-      pos: -0.5,-7.5
-      parent: 104
-  - uid: 1510
-    components:
-    - type: Transform
-      pos: 0.5,-7.5
-      parent: 104
-  - uid: 1511
-    components:
-    - type: Transform
-      pos: 1.5,-7.5
-      parent: 104
-  - uid: 1512
-    components:
-    - type: Transform
-      pos: 2.5,-7.5
-      parent: 104
-  - uid: 1513
-    components:
-    - type: Transform
-      pos: 4.5,-7.5
-      parent: 104
-  - uid: 1514
-    components:
-    - type: Transform
-      pos: 3.5,-7.5
-      parent: 104
-  - uid: 1515
-    components:
-    - type: Transform
-      pos: 5.5,-7.5
-      parent: 104
-  - uid: 1516
-    components:
-    - type: Transform
-      pos: 5.5,-8.5
-      parent: 104
-  - uid: 1517
-    components:
-    - type: Transform
-      pos: 6.5,-8.5
-      parent: 104
-  - uid: 1518
-    components:
-    - type: Transform
-      pos: 7.5,-8.5
-      parent: 104
-  - uid: 1519
-    components:
-    - type: Transform
-      pos: 8.5,-8.5
-      parent: 104
-  - uid: 1520
-    components:
-    - type: Transform
-      pos: 9.5,-8.5
-      parent: 104
-  - uid: 1521
-    components:
-    - type: Transform
-      pos: 10.5,-8.5
-      parent: 104
-  - uid: 1522
-    components:
-    - type: Transform
-      pos: 10.5,-7.5
-      parent: 104
-  - uid: 1523
-    components:
-    - type: Transform
-      pos: 11.5,-7.5
-      parent: 104
-  - uid: 1524
-    components:
-    - type: Transform
-      pos: 12.5,-7.5
-      parent: 104
-  - uid: 1525
-    components:
-    - type: Transform
-      pos: 13.5,-7.5
-      parent: 104
-  - uid: 1526
-    components:
-    - type: Transform
-      pos: 14.5,-7.5
-      parent: 104
-  - uid: 1527
-    components:
-    - type: Transform
-      pos: 14.5,-7.5
-      parent: 104
-  - uid: 1528
-    components:
-    - type: Transform
-      pos: 15.5,-7.5
-      parent: 104
-  - uid: 1529
-    components:
-    - type: Transform
-      pos: 14.5,-6.5
-      parent: 104
-  - uid: 1530
-    components:
-    - type: Transform
-      pos: 14.5,-5.5
-      parent: 104
-  - uid: 1531
-    components:
-    - type: Transform
-      pos: 14.5,-4.5
-      parent: 104
-  - uid: 1533
-    components:
-    - type: Transform
-      pos: -29.5,0.5
-      parent: 104
-  - uid: 1538
-    components:
-    - type: Transform
-      pos: 7.5,-0.5
-      parent: 104
-  - uid: 1539
-    components:
-    - type: Transform
-      pos: 8.5,-0.5
-      parent: 104
-  - uid: 1540
-    components:
-    - type: Transform
-      pos: 9.5,-0.5
-      parent: 104
-  - uid: 1541
-    components:
-    - type: Transform
-      pos: 8.5,-0.5
-      parent: 104
-  - uid: 1543
-    components:
-    - type: Transform
-      pos: 10.5,-0.5
-      parent: 104
-  - uid: 1575
-    components:
-    - type: Transform
-      pos: 21.5,-5.5
-      parent: 104
-  - uid: 1576
-    components:
-    - type: Transform
-      pos: 20.5,-5.5
-      parent: 104
-  - uid: 1577
-    components:
-    - type: Transform
-      pos: 19.5,-5.5
-      parent: 104
-  - uid: 1578
-    components:
-    - type: Transform
-      pos: 19.5,-6.5
-      parent: 104
-  - uid: 1579
-    components:
-    - type: Transform
-      pos: 19.5,-7.5
-      parent: 104
-  - uid: 1580
-    components:
-    - type: Transform
-      pos: 19.5,-9.5
-      parent: 104
-  - uid: 1581
-    components:
-    - type: Transform
-      pos: 19.5,-9.5
-      parent: 104
-  - uid: 1582
-    components:
-    - type: Transform
-      pos: 19.5,-8.5
-      parent: 104
-  - uid: 1583
-    components:
-    - type: Transform
-      pos: 20.5,-9.5
-      parent: 104
-  - uid: 1584
-    components:
-    - type: Transform
-      pos: 21.5,-9.5
-      parent: 104
-  - uid: 1585
-    components:
-    - type: Transform
-      pos: 21.5,-4.5
-      parent: 104
-  - uid: 1586
-    components:
-    - type: Transform
-      pos: 18.5,-7.5
-      parent: 104
-  - uid: 1587
-    components:
-    - type: Transform
-      pos: 17.5,-7.5
-      parent: 104
-  - uid: 1588
-    components:
-    - type: Transform
-      pos: 21.5,-8.5
-      parent: 104
-  - uid: 1589
-    components:
-    - type: Transform
-      pos: 21.5,-7.5
-      parent: 104
-  - uid: 1590
-    components:
-    - type: Transform
-      pos: 21.5,-6.5
-      parent: 104
-  - uid: 1591
-    components:
-    - type: Transform
-      pos: 10.5,-1.5
-      parent: 104
-  - uid: 1592
-    components:
-    - type: Transform
-      pos: 10.5,-3.5
-      parent: 104
-  - uid: 1593
-    components:
-    - type: Transform
-      pos: 10.5,-2.5
-      parent: 104
-  - uid: 1595
-    components:
-    - type: Transform
-      pos: -1.5,-3.5
-      parent: 104
-  - uid: 1596
-    components:
-    - type: Transform
-      pos: -2.5,-3.5
-      parent: 104
-  - uid: 1597
-    components:
-    - type: Transform
-      pos: -3.5,-3.5
-      parent: 104
-  - uid: 1941
-    components:
-    - type: Transform
-      pos: -28.5,0.5
-      parent: 104
-  - uid: 1948
-    components:
-    - type: Transform
-      pos: -14.5,-19.5
-      parent: 104
-  - uid: 2301
-    components:
-    - type: Transform
-      pos: 12.5,-21.5
-      parent: 104
-  - uid: 2302
-    components:
-    - type: Transform
-      pos: 11.5,-21.5
-      parent: 104
-  - uid: 2303
-    components:
-    - type: Transform
-      pos: 13.5,-21.5
-      parent: 104
-  - uid: 2304
-    components:
-    - type: Transform
-      pos: 0.5,-14.5
-      parent: 104
-  - uid: 2305
-    components:
-    - type: Transform
-      pos: -0.5,-14.5
-      parent: 104
-  - uid: 2306
-    components:
-    - type: Transform
-      pos: -1.5,-14.5
-      parent: 104
-  - uid: 2307
-    components:
-    - type: Transform
-      pos: -2.5,-14.5
-      parent: 104
-  - uid: 2374
-    components:
-    - type: Transform
-      pos: 20.5,-12.5
-      parent: 104
-  - uid: 2375
-    components:
-    - type: Transform
-      pos: 20.5,-13.5
-      parent: 104
-  - uid: 2376
-    components:
-    - type: Transform
-      pos: 20.5,-14.5
-      parent: 104
-  - uid: 2377
-    components:
-    - type: Transform
-      pos: 20.5,-15.5
-      parent: 104
-  - uid: 2378
-    components:
-    - type: Transform
-      pos: 20.5,-16.5
-      parent: 104
-  - uid: 2379
-    components:
-    - type: Transform
-      pos: 20.5,-17.5
-      parent: 104
-  - uid: 2381
-    components:
-    - type: Transform
-      pos: 20.5,-18.5
-      parent: 104
-  - uid: 2382
-    components:
-    - type: Transform
-      pos: 20.5,-19.5
-      parent: 104
-  - uid: 2383
-    components:
-    - type: Transform
-      pos: 19.5,-17.5
-      parent: 104
-  - uid: 2384
-    components:
-    - type: Transform
-      pos: 18.5,-17.5
-      parent: 104
-  - uid: 2385
-    components:
-    - type: Transform
-      pos: 21.5,-17.5
-      parent: 104
-  - uid: 2386
-    components:
-    - type: Transform
-      pos: 22.5,-17.5
-      parent: 104
-  - uid: 2387
-    components:
-    - type: Transform
-      pos: 23.5,-17.5
-      parent: 104
-  - uid: 2388
-    components:
-    - type: Transform
-      pos: 24.5,-17.5
-      parent: 104
-  - uid: 2389
-    components:
-    - type: Transform
-      pos: 25.5,-17.5
-      parent: 104
-  - uid: 2390
-    components:
-    - type: Transform
-      pos: 26.5,-17.5
-      parent: 104
-  - uid: 2391
-    components:
-    - type: Transform
-      pos: 25.5,-18.5
-      parent: 104
-  - uid: 2392
-    components:
-    - type: Transform
-      pos: 25.5,-19.5
-      parent: 104
-  - uid: 2393
-    components:
-    - type: Transform
-      pos: 25.5,-16.5
-      parent: 104
-  - uid: 2394
-    components:
-    - type: Transform
-      pos: 25.5,-15.5
-      parent: 104
-  - uid: 2395
-    components:
-    - type: Transform
-      pos: 25.5,-14.5
-      parent: 104
-  - uid: 2396
-    components:
-    - type: Transform
-      pos: 25.5,-13.5
-      parent: 104
-  - uid: 2439
-    components:
-    - type: Transform
-      pos: 13.5,-9.5
-      parent: 104
-  - uid: 2440
-    components:
-    - type: Transform
-      pos: 5.5,-6.5
-      parent: 104
-  - uid: 2441
-    components:
-    - type: Transform
-      pos: 5.5,-5.5
-      parent: 104
-  - uid: 3378
-    components:
-    - type: Transform
-      pos: 7.5,-9.5
-      parent: 104
-  - uid: 3379
-    components:
-    - type: Transform
-      pos: 7.5,-10.5
-      parent: 104
-  - uid: 3380
-    components:
-    - type: Transform
-      pos: 6.5,-10.5
-      parent: 104
-  - uid: 3381
-    components:
-    - type: Transform
-      pos: 5.5,-10.5
-      parent: 104
-  - uid: 3382
-    components:
-    - type: Transform
-      pos: 4.5,-10.5
-      parent: 104
-  - uid: 3383
-    components:
-    - type: Transform
-      pos: 3.5,-10.5
-      parent: 104
-  - uid: 3384
-    components:
-    - type: Transform
-      pos: 3.5,-11.5
-      parent: 104
-- proto: CableApcStack
-  entities:
-  - uid: 211
-    components:
-    - type: Transform
-      pos: 11.428643,-10.548745
-      parent: 104
-  - uid: 1324
-    components:
-    - type: Transform
-      pos: 4.439247,-17.36072
-      parent: 104
-- proto: CableHV
-  entities:
-  - uid: 2334
-    components:
-    - type: Transform
-      pos: 17.5,-19.5
-      parent: 104
-  - uid: 2335
-    components:
-    - type: Transform
-      pos: 17.5,-18.5
-      parent: 104
-  - uid: 2336
-    components:
-    - type: Transform
-      pos: 17.5,-17.5
-      parent: 104
-  - uid: 2337
-    components:
-    - type: Transform
-      pos: 18.5,-19.5
-      parent: 104
-  - uid: 2338
-    components:
-    - type: Transform
-      pos: 19.5,-19.5
-      parent: 104
-  - uid: 2339
-    components:
-    - type: Transform
-      pos: 20.5,-19.5
-      parent: 104
-  - uid: 2340
-    components:
-    - type: Transform
-      pos: 21.5,-19.5
-      parent: 104
-  - uid: 2341
-    components:
-    - type: Transform
-      pos: 22.5,-19.5
-      parent: 104
-  - uid: 2342
-    components:
-    - type: Transform
-      pos: 23.5,-19.5
-      parent: 104
-  - uid: 2343
-    components:
-    - type: Transform
-      pos: 24.5,-19.5
-      parent: 104
-  - uid: 2344
-    components:
-    - type: Transform
-      pos: 25.5,-19.5
-      parent: 104
-  - uid: 2345
-    components:
-    - type: Transform
-      pos: 26.5,-19.5
-      parent: 104
-  - uid: 2346
-    components:
-    - type: Transform
-      pos: 27.5,-19.5
-      parent: 104
-  - uid: 2347
-    components:
-    - type: Transform
-      pos: 27.5,-18.5
-      parent: 104
-  - uid: 2348
-    components:
-    - type: Transform
-      pos: 27.5,-17.5
-      parent: 104
-  - uid: 2352
-    components:
-    - type: Transform
-      pos: 21.5,-18.5
-      parent: 104
-  - uid: 2353
-    components:
-    - type: Transform
-      pos: 22.5,-18.5
-      parent: 104
-  - uid: 2354
-    components:
-    - type: Transform
-      pos: 23.5,-18.5
-      parent: 104
-  - uid: 2355
-    components:
-    - type: Transform
-      pos: 22.5,-17.5
-      parent: 104
-  - uid: 2356
-    components:
-    - type: Transform
-      pos: 23.5,-17.5
-      parent: 104
-  - uid: 2357
-    components:
-    - type: Transform
-      pos: 24.5,-17.5
-      parent: 104
-  - uid: 2358
-    components:
-    - type: Transform
-      pos: 24.5,-16.5
-      parent: 104
-  - uid: 2359
-    components:
-    - type: Transform
-      pos: 24.5,-15.5
-      parent: 104
-  - uid: 2360
-    components:
-    - type: Transform
-      pos: 24.5,-14.5
-      parent: 104
-  - uid: 2361
-    components:
-    - type: Transform
-      pos: 21.5,-17.5
-      parent: 104
-  - uid: 2362
-    components:
-    - type: Transform
-      pos: 25.5,-14.5
-      parent: 104
-  - uid: 2363
-    components:
-    - type: Transform
-      pos: 26.5,-14.5
-      parent: 104
-  - uid: 2364
-    components:
-    - type: Transform
-      pos: 27.5,-14.5
-      parent: 104
-  - uid: 2365
-    components:
-    - type: Transform
-      pos: 27.5,-13.5
-      parent: 104
-- proto: CableHVStack
-  entities:
-  - uid: 209
-    components:
-    - type: Transform
-      pos: 11.334893,-10.282843
-      parent: 104
-- proto: CableMV
-  entities:
-  - uid: 240
-    components:
-    - type: Transform
-      pos: 17.5,-13.5
-      parent: 104
-  - uid: 1438
-    components:
-    - type: Transform
-      pos: 20.5,-12.5
-      parent: 104
-  - uid: 1462
-    components:
-    - type: Transform
-      pos: 16.5,-13.5
-      parent: 104
-  - uid: 1463
-    components:
-    - type: Transform
-      pos: 15.5,-13.5
-      parent: 104
-  - uid: 1464
-    components:
-    - type: Transform
-      pos: 15.5,-12.5
-      parent: 104
-  - uid: 1465
-    components:
-    - type: Transform
-      pos: 15.5,-11.5
-      parent: 104
-  - uid: 1466
-    components:
-    - type: Transform
-      pos: 15.5,-10.5
-      parent: 104
-  - uid: 1467
-    components:
-    - type: Transform
-      pos: 14.5,-10.5
-      parent: 104
-  - uid: 1468
-    components:
-    - type: Transform
-      pos: 13.5,-10.5
-      parent: 104
-  - uid: 1469
-    components:
-    - type: Transform
-      pos: 13.5,-9.5
-      parent: 104
-  - uid: 1478
-    components:
-    - type: Transform
-      pos: 12.5,-10.5
-      parent: 104
-  - uid: 1479
-    components:
-    - type: Transform
-      pos: 11.5,-10.5
-      parent: 104
-  - uid: 1480
-    components:
-    - type: Transform
-      pos: 10.5,-10.5
-      parent: 104
-  - uid: 1481
-    components:
-    - type: Transform
-      pos: 9.5,-10.5
-      parent: 104
-  - uid: 1482
-    components:
-    - type: Transform
-      pos: 9.5,-9.5
-      parent: 104
-  - uid: 1483
-    components:
-    - type: Transform
-      pos: 9.5,-8.5
-      parent: 104
-  - uid: 1484
-    components:
-    - type: Transform
-      pos: 9.5,-7.5
-      parent: 104
-  - uid: 1485
-    components:
-    - type: Transform
-      pos: 9.5,-6.5
-      parent: 104
-  - uid: 1486
-    components:
-    - type: Transform
-      pos: 8.5,-6.5
-      parent: 104
-  - uid: 1487
-    components:
-    - type: Transform
-      pos: 8.5,-5.5
-      parent: 104
-  - uid: 2322
-    components:
-    - type: Transform
-      pos: 18.5,-13.5
-      parent: 104
-  - uid: 2323
-    components:
-    - type: Transform
-      pos: 19.5,-13.5
-      parent: 104
-  - uid: 2324
-    components:
-    - type: Transform
-      pos: 20.5,-13.5
-      parent: 104
-  - uid: 2325
-    components:
-    - type: Transform
-      pos: 20.5,-12.5
-      parent: 104
-  - uid: 2367
-    components:
-    - type: Transform
-      pos: 27.5,-13.5
-      parent: 104
-  - uid: 2368
-    components:
-    - type: Transform
-      pos: 26.5,-13.5
-      parent: 104
-  - uid: 2369
-    components:
-    - type: Transform
-      pos: 25.5,-13.5
-      parent: 104
-  - uid: 2370
-    components:
-    - type: Transform
-      pos: 24.5,-13.5
-      parent: 104
-  - uid: 2371
-    components:
-    - type: Transform
-      pos: 23.5,-13.5
-      parent: 104
-  - uid: 2372
-    components:
-    - type: Transform
-      pos: 22.5,-13.5
-      parent: 104
-  - uid: 2373
-    components:
-    - type: Transform
-      pos: 21.5,-13.5
-      parent: 104
-- proto: CableMVStack
-  entities:
-  - uid: 210
-    components:
-    - type: Transform
-      pos: 11.381768,-10.407973
-      parent: 104
-- proto: CableTerminal
-  entities:
-  - uid: 2349
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 21.5,-19.5
-      parent: 104
-  - uid: 2350
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 22.5,-19.5
-      parent: 104
-  - uid: 2351
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 23.5,-19.5
-      parent: 104
-- proto: Carpet
-  entities:
-  - uid: 2459
-    components:
-    - type: Transform
-      pos: 14.5,-4.5
-      parent: 104
-  - uid: 2460
-    components:
-    - type: Transform
-      pos: 14.5,-3.5
-      parent: 104
-- proto: Catwalk
-  entities:
-  - uid: 217
-    components:
-    - type: Transform
-      pos: -12.5,-19.5
-      parent: 104
-  - uid: 218
-    components:
-    - type: Transform
-      pos: -26.5,-20.5
-      parent: 104
-  - uid: 256
-    components:
-    - type: Transform
-      pos: -29.5,2.5
-      parent: 104
-  - uid: 264
-    components:
-    - type: Transform
-      pos: -24.5,-19.5
-      parent: 104
-  - uid: 278
-    components:
-    - type: Transform
-      pos: -21.5,-23.5
-      parent: 104
-  - uid: 381
-    components:
-    - type: Transform
-      pos: -20.5,-21.5
-      parent: 104
-  - uid: 382
-    components:
-    - type: Transform
-      pos: -20.5,-23.5
-      parent: 104
-  - uid: 383
-    components:
-    - type: Transform
-      pos: -20.5,-22.5
-      parent: 104
-  - uid: 384
-    components:
-    - type: Transform
-      pos: -26.5,-19.5
-      parent: 104
-  - uid: 385
-    components:
-    - type: Transform
-      pos: -30.5,4.5
-      parent: 104
-  - uid: 386
-    components:
-    - type: Transform
-      pos: -30.5,-19.5
-      parent: 104
-  - uid: 387
-    components:
-    - type: Transform
-      pos: -14.5,-20.5
-      parent: 104
-  - uid: 388
-    components:
-    - type: Transform
-      pos: -29.5,3.5
-      parent: 104
-  - uid: 389
-    components:
-    - type: Transform
-      pos: -14.5,-22.5
-      parent: 104
-  - uid: 391
-    components:
-    - type: Transform
-      pos: -33.5,3.5
-      parent: 104
-  - uid: 392
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -34.5,-21.5
-      parent: 104
-  - uid: 393
-    components:
-    - type: Transform
-      pos: -19.5,-22.5
-      parent: 104
-  - uid: 394
-    components:
-    - type: Transform
-      pos: -32.5,4.5
-      parent: 104
-  - uid: 395
-    components:
-    - type: Transform
-      pos: -24.5,-21.5
-      parent: 104
-  - uid: 396
-    components:
-    - type: Transform
-      pos: -10.5,-16.5
-      parent: 104
-  - uid: 398
-    components:
-    - type: Transform
-      pos: -9.5,-15.5
-      parent: 104
-  - uid: 399
-    components:
-    - type: Transform
-      pos: -10.5,-15.5
-      parent: 104
-  - uid: 400
-    components:
-    - type: Transform
-      pos: -9.5,-14.5
-      parent: 104
-  - uid: 413
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,3.5
-      parent: 104
-  - uid: 414
-    components:
-    - type: Transform
-      pos: -35.5,-19.5
-      parent: 104
-  - uid: 431
-    components:
-    - type: Transform
-      pos: -9.5,-13.5
-      parent: 104
-  - uid: 440
-    components:
-    - type: Transform
-      pos: -16.5,-21.5
-      parent: 104
-  - uid: 450
-    components:
-    - type: Transform
-      pos: -33.5,-20.5
-      parent: 104
-  - uid: 451
-    components:
-    - type: Transform
-      pos: -34.5,-19.5
-      parent: 104
-  - uid: 464
-    components:
-    - type: Transform
-      pos: -34.5,-20.5
-      parent: 104
-  - uid: 468
-    components:
-    - type: Transform
-      pos: -9.5,-21.5
-      parent: 104
-  - uid: 470
-    components:
-    - type: Transform
-      pos: -9.5,-20.5
-      parent: 104
-  - uid: 490
-    components:
-    - type: Transform
-      pos: -13.5,0.5
-      parent: 104
-  - uid: 491
-    components:
-    - type: Transform
-      pos: -12.5,1.5
-      parent: 104
-  - uid: 494
-    components:
-    - type: Transform
-      pos: -11.5,1.5
-      parent: 104
-  - uid: 496
-    components:
-    - type: Transform
-      pos: -14.5,1.5
-      parent: 104
-  - uid: 499
-    components:
-    - type: Transform
-      pos: -9.5,-19.5
-      parent: 104
-  - uid: 500
-    components:
-    - type: Transform
-      pos: -9.5,-18.5
-      parent: 104
-  - uid: 501
-    components:
-    - type: Transform
-      pos: -30.5,0.5
-      parent: 104
-  - uid: 503
-    components:
-    - type: Transform
-      pos: -29.5,1.5
-      parent: 104
-  - uid: 508
-    components:
-    - type: Transform
-      pos: -12.5,0.5
-      parent: 104
-  - uid: 510
-    components:
-    - type: Transform
-      pos: -31.5,0.5
-      parent: 104
-  - uid: 514
-    components:
-    - type: Transform
-      pos: -27.5,0.5
-      parent: 104
-  - uid: 515
-    components:
-    - type: Transform
-      pos: -30.5,1.5
-      parent: 104
-  - uid: 516
-    components:
-    - type: Transform
-      pos: -9.5,-17.5
-      parent: 104
-  - uid: 517
-    components:
-    - type: Transform
-      pos: -9.5,-16.5
-      parent: 104
-  - uid: 518
-    components:
-    - type: Transform
-      pos: -10.5,-14.5
-      parent: 104
-  - uid: 519
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -31.5,-21.5
-      parent: 104
-  - uid: 520
-    components:
-    - type: Transform
-      pos: -28.5,0.5
-      parent: 104
-  - uid: 583
-    components:
-    - type: Transform
-      pos: -26.5,1.5
-      parent: 104
-  - uid: 584
-    components:
-    - type: Transform
-      pos: -10.5,-13.5
-      parent: 104
-  - uid: 616
-    components:
-    - type: Transform
-      pos: -31.5,3.5
-      parent: 104
-  - uid: 617
-    components:
-    - type: Transform
-      pos: -14.5,-23.5
-      parent: 104
-  - uid: 626
-    components:
-    - type: Transform
-      pos: -16.5,-22.5
-      parent: 104
-  - uid: 631
-    components:
-    - type: Transform
-      pos: -9.5,-23.5
-      parent: 104
-  - uid: 633
-    components:
-    - type: Transform
-      pos: -9.5,-22.5
-      parent: 104
-  - uid: 634
-    components:
-    - type: Transform
-      pos: -16.5,-23.5
-      parent: 104
-  - uid: 635
-    components:
-    - type: Transform
-      pos: -25.5,0.5
-      parent: 104
-  - uid: 636
-    components:
-    - type: Transform
-      pos: -27.5,1.5
-      parent: 104
-  - uid: 638
-    components:
-    - type: Transform
-      pos: -26.5,0.5
-      parent: 104
-  - uid: 639
-    components:
-    - type: Transform
-      pos: -24.5,1.5
-      parent: 104
-  - uid: 641
-    components:
-    - type: Transform
-      pos: -11.5,-22.5
-      parent: 104
-  - uid: 642
-    components:
-    - type: Transform
-      pos: -11.5,-23.5
-      parent: 104
-  - uid: 643
-    components:
-    - type: Transform
-      pos: -10.5,-23.5
-      parent: 104
-  - uid: 644
-    components:
-    - type: Transform
-      pos: -24.5,0.5
-      parent: 104
-  - uid: 645
-    components:
-    - type: Transform
-      pos: -25.5,1.5
-      parent: 104
-  - uid: 646
-    components:
-    - type: Transform
-      pos: -15.5,0.5
-      parent: 104
-  - uid: 647
-    components:
-    - type: Transform
-      pos: -13.5,-23.5
-      parent: 104
-  - uid: 652
-    components:
-    - type: Transform
-      pos: -14.5,0.5
-      parent: 104
-  - uid: 653
-    components:
-    - type: Transform
-      pos: -13.5,1.5
-      parent: 104
-  - uid: 654
-    components:
-    - type: Transform
-      pos: -29.5,0.5
-      parent: 104
-  - uid: 655
-    components:
-    - type: Transform
-      pos: -28.5,1.5
-      parent: 104
-  - uid: 656
-    components:
-    - type: Transform
-      pos: -35.5,-20.5
-      parent: 104
-  - uid: 658
-    components:
-    - type: Transform
-      pos: -11.5,0.5
-      parent: 104
-  - uid: 661
-    components:
-    - type: Transform
-      pos: -20.5,-19.5
-      parent: 104
-  - uid: 662
-    components:
-    - type: Transform
-      pos: -18.5,0.5
-      parent: 104
-  - uid: 663
-    components:
-    - type: Transform
-      pos: -12.5,-23.5
-      parent: 104
-  - uid: 664
-    components:
-    - type: Transform
-      pos: -17.5,1.5
-      parent: 104
-  - uid: 665
-    components:
-    - type: Transform
-      pos: -21.5,0.5
-      parent: 104
-  - uid: 667
-    components:
-    - type: Transform
-      pos: -20.5,-20.5
-      parent: 104
-  - uid: 668
-    components:
-    - type: Transform
-      pos: -32.5,1.5
-      parent: 104
-  - uid: 669
-    components:
-    - type: Transform
-      pos: -31.5,1.5
-      parent: 104
-  - uid: 707
-    components:
-    - type: Transform
-      pos: -32.5,0.5
-      parent: 104
-  - uid: 713
-    components:
-    - type: Transform
-      pos: -20.5,1.5
-      parent: 104
-  - uid: 715
-    components:
-    - type: Transform
-      pos: -10.5,-22.5
-      parent: 104
-  - uid: 736
-    components:
-    - type: Transform
-      pos: -10.5,-21.5
-      parent: 104
-  - uid: 737
-    components:
-    - type: Transform
-      pos: -10.5,-20.5
-      parent: 104
-  - uid: 738
-    components:
-    - type: Transform
-      pos: -20.5,0.5
-      parent: 104
-  - uid: 742
-    components:
-    - type: Transform
-      pos: -10.5,-19.5
-      parent: 104
-  - uid: 748
-    components:
-    - type: Transform
-      pos: -10.5,-18.5
-      parent: 104
-  - uid: 749
-    components:
-    - type: Transform
-      pos: -10.5,-17.5
-      parent: 104
-  - uid: 760
-    components:
-    - type: Transform
-      pos: -14.5,-21.5
-      parent: 104
-  - uid: 761
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,-21.5
-      parent: 104
-  - uid: 769
-    components:
-    - type: Transform
-      pos: -33.5,4.5
-      parent: 104
-  - uid: 772
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-21.5
-      parent: 104
-  - uid: 799
-    components:
-    - type: Transform
-      pos: -26.5,3.5
-      parent: 104
-  - uid: 800
-    components:
-    - type: Transform
-      pos: -34.5,4.5
-      parent: 104
-  - uid: 812
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -32.5,-21.5
-      parent: 104
-  - uid: 813
-    components:
-    - type: Transform
-      pos: -29.5,4.5
-      parent: 104
-  - uid: 815
-    components:
-    - type: Transform
-      pos: -17.5,-23.5
-      parent: 104
-  - uid: 816
-    components:
-    - type: Transform
-      pos: -34.5,1.5
-      parent: 104
-  - uid: 817
-    components:
-    - type: Transform
-      pos: -24.5,-22.5
-      parent: 104
-  - uid: 818
-    components:
-    - type: Transform
-      pos: -24.5,-23.5
-      parent: 104
-  - uid: 820
-    components:
-    - type: Transform
-      pos: -21.5,-21.5
-      parent: 104
-  - uid: 821
-    components:
-    - type: Transform
-      pos: -21.5,-22.5
-      parent: 104
-  - uid: 822
-    components:
-    - type: Transform
-      pos: -27.5,3.5
-      parent: 104
-  - uid: 823
-    components:
-    - type: Transform
-      pos: -26.5,4.5
-      parent: 104
-  - uid: 824
-    components:
-    - type: Transform
-      pos: -25.5,4.5
-      parent: 104
-  - uid: 825
-    components:
-    - type: Transform
-      pos: -25.5,2.5
-      parent: 104
-  - uid: 826
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-23.5
-      parent: 104
-  - uid: 827
-    components:
-    - type: Transform
-      pos: -27.5,4.5
-      parent: 104
-  - uid: 828
-    components:
-    - type: Transform
-      pos: -27.5,2.5
-      parent: 104
-  - uid: 829
-    components:
-    - type: Transform
-      pos: -26.5,2.5
-      parent: 104
-  - uid: 830
-    components:
-    - type: Transform
-      pos: -25.5,3.5
-      parent: 104
-  - uid: 831
-    components:
-    - type: Transform
-      pos: -19.5,-20.5
-      parent: 104
-  - uid: 833
-    components:
-    - type: Transform
-      pos: -18.5,-21.5
-      parent: 104
-  - uid: 834
-    components:
-    - type: Transform
-      pos: -17.5,0.5
-      parent: 104
-  - uid: 835
-    components:
-    - type: Transform
-      pos: -15.5,1.5
-      parent: 104
-  - uid: 836
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -29.5,-21.5
-      parent: 104
-  - uid: 837
-    components:
-    - type: Transform
-      pos: -16.5,1.5
-      parent: 104
-  - uid: 839
-    components:
-    - type: Transform
-      pos: -32.5,3.5
-      parent: 104
-  - uid: 841
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-22.5
-      parent: 104
-  - uid: 842
-    components:
-    - type: Transform
-      pos: -17.5,-22.5
-      parent: 104
-  - uid: 843
-    components:
-    - type: Transform
-      pos: -18.5,-23.5
-      parent: 104
-  - uid: 844
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -32.5,-22.5
-      parent: 104
-  - uid: 846
-    components:
-    - type: Transform
-      pos: -34.5,0.5
-      parent: 104
-  - uid: 847
-    components:
-    - type: Transform
-      pos: -19.5,-21.5
-      parent: 104
-  - uid: 848
-    components:
-    - type: Transform
-      pos: -16.5,0.5
-      parent: 104
-  - uid: 849
-    components:
-    - type: Transform
-      pos: -18.5,-22.5
-      parent: 104
-  - uid: 850
-    components:
-    - type: Transform
-      pos: -17.5,-21.5
-      parent: 104
-  - uid: 851
-    components:
-    - type: Transform
-      pos: -17.5,-19.5
-      parent: 104
-  - uid: 852
-    components:
-    - type: Transform
-      pos: -18.5,-19.5
-      parent: 104
-  - uid: 853
-    components:
-    - type: Transform
-      pos: -19.5,1.5
-      parent: 104
-  - uid: 854
-    components:
-    - type: Transform
-      pos: -17.5,-20.5
-      parent: 104
-  - uid: 855
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -30.5,-21.5
-      parent: 104
-  - uid: 856
-    components:
-    - type: Transform
-      pos: -31.5,2.5
-      parent: 104
-  - uid: 857
-    components:
-    - type: Transform
-      pos: -19.5,0.5
-      parent: 104
-  - uid: 858
-    components:
-    - type: Transform
-      pos: -30.5,3.5
-      parent: 104
-  - uid: 859
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -28.5,-21.5
-      parent: 104
-  - uid: 860
-    components:
-    - type: Transform
-      pos: -33.5,1.5
-      parent: 104
-  - uid: 861
-    components:
-    - type: Transform
-      pos: -33.5,0.5
-      parent: 104
-  - uid: 862
-    components:
-    - type: Transform
-      pos: -31.5,-20.5
-      parent: 104
-  - uid: 863
-    components:
-    - type: Transform
-      pos: -32.5,-19.5
-      parent: 104
-  - uid: 864
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,-21.5
-      parent: 104
-  - uid: 865
-    components:
-    - type: Transform
-      pos: -28.5,2.5
-      parent: 104
-  - uid: 869
-    components:
-    - type: Transform
-      pos: -32.5,2.5
-      parent: 104
-  - uid: 871
-    components:
-    - type: Transform
-      pos: -31.5,4.5
-      parent: 104
-  - uid: 872
-    components:
-    - type: Transform
-      pos: -30.5,2.5
-      parent: 104
-  - uid: 873
-    components:
-    - type: Transform
-      pos: -18.5,1.5
-      parent: 104
-  - uid: 874
-    components:
-    - type: Transform
-      pos: -15.5,4.5
-      parent: 104
-  - uid: 875
-    components:
-    - type: Transform
-      pos: -15.5,3.5
-      parent: 104
-  - uid: 876
-    components:
-    - type: Transform
-      pos: -15.5,2.5
-      parent: 104
-  - uid: 878
-    components:
-    - type: Transform
-      pos: -23.5,-21.5
-      parent: 104
-  - uid: 879
-    components:
-    - type: Transform
-      pos: -23.5,-22.5
-      parent: 104
-  - uid: 880
-    components:
-    - type: Transform
-      pos: -23.5,-23.5
-      parent: 104
-  - uid: 881
-    components:
-    - type: Transform
-      pos: -18.5,-20.5
-      parent: 104
-  - uid: 882
-    components:
-    - type: Transform
-      pos: -22.5,-21.5
-      parent: 104
-  - uid: 883
-    components:
-    - type: Transform
-      pos: -19.5,-19.5
-      parent: 104
-  - uid: 885
-    components:
-    - type: Transform
-      pos: -32.5,-20.5
-      parent: 104
-  - uid: 886
-    components:
-    - type: Transform
-      pos: -33.5,-19.5
-      parent: 104
-  - uid: 887
-    components:
-    - type: Transform
-      pos: -28.5,4.5
-      parent: 104
-  - uid: 888
-    components:
-    - type: Transform
-      pos: -28.5,3.5
-      parent: 104
-  - uid: 889
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -34.5,-23.5
-      parent: 104
-  - uid: 890
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -32.5,-23.5
-      parent: 104
-  - uid: 891
-    components:
-    - type: Transform
-      pos: -33.5,2.5
-      parent: 104
-  - uid: 892
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -31.5,-22.5
-      parent: 104
-  - uid: 893
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -31.5,-23.5
-      parent: 104
-  - uid: 894
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -30.5,-22.5
-      parent: 104
-  - uid: 895
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -30.5,-23.5
-      parent: 104
-  - uid: 896
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -29.5,-22.5
-      parent: 104
-  - uid: 897
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -29.5,-23.5
-      parent: 104
-  - uid: 898
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -28.5,-22.5
-      parent: 104
-  - uid: 899
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -28.5,-23.5
-      parent: 104
-  - uid: 900
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,-22.5
-      parent: 104
-  - uid: 901
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,-22.5
-      parent: 104
-  - uid: 902
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,-23.5
-      parent: 104
-  - uid: 903
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,-22.5
-      parent: 104
-  - uid: 904
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,-23.5
-      parent: 104
-  - uid: 905
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -35.5,-22.5
-      parent: 104
-  - uid: 906
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -35.5,-23.5
-      parent: 104
-  - uid: 907
-    components:
-    - type: Transform
-      pos: -19.5,-23.5
-      parent: 104
-  - uid: 908
-    components:
-    - type: Transform
-      pos: -21.5,-19.5
-      parent: 104
-  - uid: 909
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,-21.5
-      parent: 104
-  - uid: 910
-    components:
-    - type: Transform
-      pos: -31.5,-19.5
-      parent: 104
-  - uid: 911
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -35.5,-21.5
-      parent: 104
-  - uid: 912
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -34.5,-22.5
-      parent: 104
-  - uid: 913
-    components:
-    - type: Transform
-      pos: -23.5,4.5
-      parent: 104
-  - uid: 914
-    components:
-    - type: Transform
-      pos: -21.5,-20.5
-      parent: 104
-  - uid: 915
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -23.5,3.5
-      parent: 104
-  - uid: 916
-    components:
-    - type: Transform
-      pos: -12.5,4.5
-      parent: 104
-  - uid: 917
-    components:
-    - type: Transform
-      pos: -12.5,3.5
-      parent: 104
-  - uid: 918
-    components:
-    - type: Transform
-      pos: -12.5,2.5
-      parent: 104
-  - uid: 919
-    components:
-    - type: Transform
-      pos: -22.5,-22.5
-      parent: 104
-  - uid: 921
-    components:
-    - type: Transform
-      pos: -15.5,-22.5
-      parent: 104
-  - uid: 922
-    components:
-    - type: Transform
-      pos: -30.5,-20.5
-      parent: 104
-  - uid: 923
-    components:
-    - type: Transform
-      pos: -13.5,4.5
-      parent: 104
-  - uid: 924
-    components:
-    - type: Transform
-      pos: -13.5,3.5
-      parent: 104
-  - uid: 925
-    components:
-    - type: Transform
-      pos: -13.5,2.5
-      parent: 104
-  - uid: 928
-    components:
-    - type: Transform
-      pos: -15.5,-23.5
-      parent: 104
-  - uid: 930
-    components:
-    - type: Transform
-      pos: -14.5,4.5
-      parent: 104
-  - uid: 932
-    components:
-    - type: Transform
-      pos: -14.5,2.5
-      parent: 104
-  - uid: 935
-    components:
-    - type: Transform
-      pos: -22.5,-20.5
-      parent: 104
-  - uid: 936
-    components:
-    - type: Transform
-      pos: -16.5,4.5
-      parent: 104
-  - uid: 937
-    components:
-    - type: Transform
-      pos: -16.5,3.5
-      parent: 104
-  - uid: 938
-    components:
-    - type: Transform
-      pos: -16.5,2.5
-      parent: 104
-  - uid: 939
-    components:
-    - type: Transform
-      pos: -27.5,-20.5
-      parent: 104
-  - uid: 940
-    components:
-    - type: Transform
-      pos: -15.5,-21.5
-      parent: 104
-  - uid: 941
-    components:
-    - type: Transform
-      pos: -13.5,-19.5
-      parent: 104
-  - uid: 943
-    components:
-    - type: Transform
-      pos: -17.5,4.5
-      parent: 104
-  - uid: 944
-    components:
-    - type: Transform
-      pos: -17.5,3.5
-      parent: 104
-  - uid: 945
-    components:
-    - type: Transform
-      pos: -17.5,2.5
-      parent: 104
-  - uid: 946
-    components:
-    - type: Transform
-      pos: -12.5,-22.5
-      parent: 104
-  - uid: 947
-    components:
-    - type: Transform
-      pos: -22.5,-23.5
-      parent: 104
-  - uid: 948
-    components:
-    - type: Transform
-      pos: -13.5,-21.5
-      parent: 104
-  - uid: 949
-    components:
-    - type: Transform
-      pos: -22.5,1.5
-      parent: 104
-  - uid: 950
-    components:
-    - type: Transform
-      pos: -18.5,4.5
-      parent: 104
-  - uid: 951
-    components:
-    - type: Transform
-      pos: -18.5,3.5
-      parent: 104
-  - uid: 952
-    components:
-    - type: Transform
-      pos: -18.5,2.5
-      parent: 104
-  - uid: 953
-    components:
-    - type: Transform
-      pos: -12.5,-21.5
-      parent: 104
-  - uid: 954
-    components:
-    - type: Transform
-      pos: -13.5,-22.5
-      parent: 104
-  - uid: 958
-    components:
-    - type: Transform
-      pos: -19.5,3.5
-      parent: 104
-  - uid: 959
-    components:
-    - type: Transform
-      pos: -19.5,2.5
-      parent: 104
-  - uid: 964
-    components:
-    - type: Transform
-      pos: -11.5,4.5
-      parent: 104
-  - uid: 965
-    components:
-    - type: Transform
-      pos: -11.5,3.5
-      parent: 104
-  - uid: 966
-    components:
-    - type: Transform
-      pos: -11.5,2.5
-      parent: 104
-  - uid: 972
-    components:
-    - type: Transform
-      pos: -11.5,-21.5
-      parent: 104
-  - uid: 984
-    components:
-    - type: Transform
-      pos: -9.5,-9.5
-      parent: 104
-  - uid: 985
-    components:
-    - type: Transform
-      pos: -9.5,-10.5
-      parent: 104
-  - uid: 986
-    components:
-    - type: Transform
-      pos: -9.5,-11.5
-      parent: 104
-  - uid: 987
-    components:
-    - type: Transform
-      pos: -9.5,-12.5
-      parent: 104
-  - uid: 988
-    components:
-    - type: Transform
-      pos: -10.5,4.5
-      parent: 104
-  - uid: 989
-    components:
-    - type: Transform
-      pos: -10.5,3.5
-      parent: 104
-  - uid: 990
-    components:
-    - type: Transform
-      pos: -10.5,2.5
-      parent: 104
-  - uid: 991
-    components:
-    - type: Transform
-      pos: -10.5,1.5
-      parent: 104
-  - uid: 992
-    components:
-    - type: Transform
-      pos: -10.5,0.5
-      parent: 104
-  - uid: 993
-    components:
-    - type: Transform
-      pos: -10.5,-0.5
-      parent: 104
-  - uid: 994
-    components:
-    - type: Transform
-      pos: -10.5,-1.5
-      parent: 104
-  - uid: 995
-    components:
-    - type: Transform
-      pos: -10.5,-2.5
-      parent: 104
-  - uid: 996
-    components:
-    - type: Transform
-      pos: -10.5,-3.5
-      parent: 104
-  - uid: 997
-    components:
-    - type: Transform
-      pos: -10.5,-4.5
-      parent: 104
-  - uid: 998
-    components:
-    - type: Transform
-      pos: -10.5,-5.5
-      parent: 104
-  - uid: 999
-    components:
-    - type: Transform
-      pos: -10.5,-6.5
-      parent: 104
-  - uid: 1000
-    components:
-    - type: Transform
-      pos: -10.5,-7.5
-      parent: 104
-  - uid: 1001
-    components:
-    - type: Transform
-      pos: -10.5,-8.5
-      parent: 104
-  - uid: 1002
-    components:
-    - type: Transform
-      pos: -10.5,-9.5
-      parent: 104
-  - uid: 1003
-    components:
-    - type: Transform
-      pos: -10.5,-10.5
-      parent: 104
-  - uid: 1004
-    components:
-    - type: Transform
-      pos: -10.5,-11.5
-      parent: 104
-  - uid: 1005
-    components:
-    - type: Transform
-      pos: -10.5,-12.5
-      parent: 104
-  - uid: 1006
-    components:
-    - type: Transform
-      pos: -9.5,4.5
-      parent: 104
-  - uid: 1007
-    components:
-    - type: Transform
-      pos: -9.5,3.5
-      parent: 104
-  - uid: 1008
-    components:
-    - type: Transform
-      pos: -9.5,2.5
-      parent: 104
-  - uid: 1009
-    components:
-    - type: Transform
-      pos: -9.5,1.5
-      parent: 104
-  - uid: 1010
-    components:
-    - type: Transform
-      pos: -9.5,0.5
-      parent: 104
-  - uid: 1011
-    components:
-    - type: Transform
-      pos: -9.5,-0.5
-      parent: 104
-  - uid: 1012
-    components:
-    - type: Transform
-      pos: -9.5,-1.5
-      parent: 104
-  - uid: 1013
-    components:
-    - type: Transform
-      pos: -9.5,-2.5
-      parent: 104
-  - uid: 1014
-    components:
-    - type: Transform
-      pos: -9.5,-3.5
-      parent: 104
-  - uid: 1015
-    components:
-    - type: Transform
-      pos: -9.5,-4.5
-      parent: 104
-  - uid: 1016
-    components:
-    - type: Transform
-      pos: -9.5,-5.5
-      parent: 104
-  - uid: 1017
-    components:
-    - type: Transform
-      pos: -9.5,-6.5
-      parent: 104
-  - uid: 1018
-    components:
-    - type: Transform
-      pos: -9.5,-7.5
-      parent: 104
-  - uid: 1019
-    components:
-    - type: Transform
-      pos: -9.5,-8.5
-      parent: 104
-  - uid: 1086
-    components:
-    - type: Transform
-      pos: -14.5,3.5
-      parent: 104
-  - uid: 1087
-    components:
-    - type: Transform
-      pos: -19.5,4.5
-      parent: 104
-  - uid: 1202
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,4.5
-      parent: 104
-  - uid: 1203
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,-23.5
-      parent: 104
-  - uid: 1222
-    components:
-    - type: Transform
-      pos: -34.5,2.5
-      parent: 104
-  - uid: 1223
-    components:
-    - type: Transform
-      pos: -34.5,3.5
-      parent: 104
-  - uid: 1280
-    components:
-    - type: Transform
-      pos: -23.5,-20.5
-      parent: 104
-  - uid: 1284
-    components:
-    - type: Transform
-      pos: -25.5,-19.5
-      parent: 104
-  - uid: 1289
-    components:
-    - type: Transform
-      pos: -28.5,-20.5
-      parent: 104
-  - uid: 1290
-    components:
-    - type: Transform
-      pos: -22.5,0.5
-      parent: 104
-  - uid: 1362
-    components:
-    - type: Transform
-      pos: -4.5,-2.5
-      parent: 104
-  - uid: 1363
-    components:
-    - type: Transform
-      pos: -2.5,-2.5
-      parent: 104
-  - uid: 1364
-    components:
-    - type: Transform
-      pos: -3.5,-2.5
-      parent: 104
-  - uid: 1365
-    components:
-    - type: Transform
-      pos: -4.5,-4.5
-      parent: 104
-  - uid: 1366
-    components:
-    - type: Transform
-      pos: -3.5,-4.5
-      parent: 104
-  - uid: 1377
-    components:
-    - type: Transform
-      pos: -2.5,-4.5
-      parent: 104
-  - uid: 1428
-    components:
-    - type: Transform
-      pos: -16.5,-19.5
-      parent: 104
-  - uid: 1535
-    components:
-    - type: Transform
-      pos: -13.5,-20.5
-      parent: 104
-  - uid: 1554
-    components:
-    - type: Transform
-      pos: -29.5,-19.5
-      parent: 104
-  - uid: 1674
-    components:
-    - type: Transform
-      pos: -28.5,-19.5
-      parent: 104
-  - uid: 1785
-    components:
-    - type: Transform
-      pos: -11.5,-19.5
-      parent: 104
-  - uid: 1786
-    components:
-    - type: Transform
-      pos: -22.5,-19.5
-      parent: 104
-  - uid: 1787
-    components:
-    - type: Transform
-      pos: -11.5,-20.5
-      parent: 104
-  - uid: 1788
-    components:
-    - type: Transform
-      pos: -27.5,-19.5
-      parent: 104
-  - uid: 1789
-    components:
-    - type: Transform
-      pos: -24.5,-20.5
-      parent: 104
-  - uid: 1791
-    components:
-    - type: Transform
-      pos: -25.5,-20.5
-      parent: 104
-  - uid: 1799
-    components:
-    - type: Transform
-      pos: -29.5,-20.5
-      parent: 104
-  - uid: 1825
-    components:
-    - type: Transform
-      pos: -12.5,-20.5
-      parent: 104
-  - uid: 1886
-    components:
-    - type: Transform
-      pos: -15.5,-20.5
-      parent: 104
-  - uid: 1887
-    components:
-    - type: Transform
-      pos: -14.5,-19.5
-      parent: 104
-  - uid: 1947
-    components:
-    - type: Transform
-      pos: -15.5,-19.5
-      parent: 104
-  - uid: 1949
-    components:
-    - type: Transform
-      pos: -23.5,-19.5
-      parent: 104
-  - uid: 2046
-    components:
-    - type: Transform
-      pos: -16.5,-20.5
-      parent: 104
-  - uid: 2048
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -23.5,2.5
-      parent: 104
-  - uid: 2050
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,2.5
-      parent: 104
-  - uid: 2052
-    components:
-    - type: Transform
-      pos: -23.5,1.5
-      parent: 104
-  - uid: 2188
-    components:
-    - type: Transform
-      pos: -21.5,1.5
-      parent: 104
-  - uid: 2405
-    components:
-    - type: Transform
-      pos: 23.5,-19.5
-      parent: 104
-  - uid: 2406
-    components:
-    - type: Transform
-      pos: 22.5,-19.5
-      parent: 104
-  - uid: 2407
-    components:
-    - type: Transform
-      pos: 21.5,-19.5
-      parent: 104
-  - uid: 2408
-    components:
-    - type: Transform
-      pos: 21.5,-17.5
-      parent: 104
-  - uid: 2409
-    components:
-    - type: Transform
-      pos: 22.5,-17.5
-      parent: 104
-  - uid: 2410
-    components:
-    - type: Transform
-      pos: 23.5,-17.5
-      parent: 104
-  - uid: 2505
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -22.5,3.5
-      parent: 104
-  - uid: 2507
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -20.5,4.5
-      parent: 104
-  - uid: 2508
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,2.5
-      parent: 104
-  - uid: 2514
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -20.5,3.5
-      parent: 104
-  - uid: 2515
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,4.5
-      parent: 104
-  - uid: 2521
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -20.5,2.5
-      parent: 104
-  - uid: 2526
-    components:
-    - type: Transform
-      pos: -23.5,0.5
-      parent: 104
-  - uid: 2553
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -22.5,4.5
-      parent: 104
-  - uid: 2554
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -22.5,2.5
-      parent: 104
-  - uid: 2557
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,3.5
-      parent: 104
-- proto: Chair
-  entities:
-  - uid: 487
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -35.5,-20.5
-      parent: 104
-  - uid: 1367
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-4.5
-      parent: 104
-  - uid: 1376
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,-4.5
-      parent: 104
-  - uid: 1878
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -35.5,-21.5
-      parent: 104
-  - uid: 1879
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -35.5,-22.5
-      parent: 104
-  - uid: 2312
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-13.5
-      parent: 104
-  - uid: 2313
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-14.5
-      parent: 104
-- proto: ChairFolding
-  entities:
-  - uid: 544
-    components:
-    - type: Transform
-      pos: 20.5,8.5
-      parent: 104
-  - uid: 1062
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 18.5,4.5
-      parent: 104
-  - uid: 1063
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 18.5,2.5
-      parent: 104
-- proto: ChairOfficeDark
-  entities:
-  - uid: 1298
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 13.5,-17.5
-      parent: 104
-  - uid: 1304
-    components:
-    - type: Transform
-      pos: 11.5,-17.5
-      parent: 104
-  - uid: 1764
-    components:
-    - type: Transform
-      pos: -13.5,6.5
-      parent: 104
-  - uid: 2427
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 19.5,-15.5
-      parent: 104
-  - uid: 2428
-    components:
-    - type: Transform
-      pos: 25.5,-15.5
-      parent: 104
-- proto: ChairOfficeLight
-  entities:
-  - uid: 751
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-16.5
-      parent: 104
-  - uid: 1124
-    components:
-    - type: Transform
-      pos: -0.5,-12.5
-      parent: 104
-  - uid: 1296
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-11.5
-      parent: 104
-  - uid: 1297
-    components:
-    - type: Transform
-      pos: 4.5,-16.5
-      parent: 104
-- proto: ChairPilotSeat
-  entities:
-  - uid: 326
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 20.5,-6.5
-      parent: 104
-  - uid: 327
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 19.5,-7.5
-      parent: 104
-  - uid: 328
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 21.5,-7.5
-      parent: 104
-  - uid: 329
-    components:
-    - type: Transform
-      pos: 20.5,-8.5
-      parent: 104
-  - uid: 330
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 18.5,-6.5
-      parent: 104
-  - uid: 331
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 19.5,-5.5
-      parent: 104
-  - uid: 332
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 21.5,-5.5
-      parent: 104
-  - uid: 333
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 22.5,-6.5
-      parent: 104
-  - uid: 334
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 22.5,-8.5
-      parent: 104
-  - uid: 335
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 21.5,-9.5
-      parent: 104
-  - uid: 336
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 19.5,-9.5
-      parent: 104
-  - uid: 337
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 18.5,-8.5
-      parent: 104
-- proto: ChairWood
-  entities:
-  - uid: 2429
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 104
-- proto: chem_master
-  entities:
-  - uid: 2444
-    components:
-    - type: Transform
-      pos: 5.5,-10.5
-      parent: 104
-- proto: ChemicalPayload
-  entities:
-  - uid: 2380
-    components:
-    - type: Transform
-      pos: 3.3003616,-17.381208
-      parent: 104
-  - uid: 3110
-    components:
-    - type: Transform
-      pos: 3.6284866,-17.287361
-      parent: 104
-- proto: ChemistryHotplate
-  entities:
-  - uid: 1383
-    components:
-    - type: Transform
-      pos: 4.5,-12.5
-      parent: 104
-- proto: ChessBoard
-  entities:
-  - uid: 354
-    components:
-    - type: Transform
-      pos: 13.499366,-8.433407
-      parent: 104
-- proto: ClosetEmergencyFilledRandom
-  entities:
-  - uid: 1359
-    components:
-    - type: Transform
-      pos: -2.5,-2.5
-      parent: 104
-- proto: ClosetL3Filled
-  entities:
-  - uid: 1153
-    components:
-    - type: Transform
-      pos: 7.5,-17.5
-      parent: 104
-- proto: ClosetRadiationSuitFilled
-  entities:
-  - uid: 1114
-    components:
-    - type: Transform
-      pos: 6.5,-17.5
-      parent: 104
-- proto: ClosetToolFilled
-  entities:
-  - uid: 2417
-    components:
-    - type: Transform
-      pos: 20.5,-14.5
-      parent: 104
-  - uid: 2418
-    components:
-    - type: Transform
-      pos: 24.5,-14.5
-      parent: 104
-- proto: ClothingBackpackDuffelSyndicateFilledMedical
-  entities:
-  - uid: 2437
-    components:
-    - type: Transform
-      pos: 0.5,-12.5
-      parent: 104
-- proto: ClothingBackpackWaterTank
-  entities:
-  - uid: 151
-    components:
-    - type: Transform
-      pos: 9.36168,-4.462339
-      parent: 104
-    - type: SolutionAmmoProvider
-      maxShots: 200
-- proto: ClothingBeltUtilityFilled
-  entities:
-  - uid: 212
-    components:
-    - type: Transform
-      pos: 13.897393,-10.470539
-      parent: 104
-- proto: ClothingEyesGlassesChemical
-  entities:
-  - uid: 1738
-    components:
-    - type: Transform
-      pos: 3.5009227,-11.519134
-      parent: 104
-- proto: ClothingNeckScarfStripedRed
-  entities:
-  - uid: 1150
-    components:
-    - type: Transform
-      pos: -2.530845,-16.461567
-      parent: 104
-- proto: ClothingNeckStethoscope
-  entities:
-  - uid: 1336
-    components:
-    - type: Transform
-      pos: 7.5027137,-12.301802
-      parent: 104
-- proto: ClothingShoesBootsSalvage
-  entities:
-  - uid: 542
-    components:
-    - type: Transform
-      pos: 19.574894,7.069533
-      parent: 104
-  - uid: 545
-    components:
-    - type: Transform
-      pos: 19.246769,6.507033
-      parent: 104
-- proto: CombatKnife
-  entities:
-  - uid: 1694
-    components:
-    - type: Transform
-      pos: 5.483225,11.368477
-      parent: 104
-- proto: ComfyChair
-  entities:
-  - uid: 21
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 12.5,-8.5
-      parent: 104
-  - uid: 352
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 14.5,-8.5
-      parent: 104
-- proto: computerBodyScanner
-  entities:
-  - uid: 2436
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-14.5
-      parent: 104
-- proto: ComputerPowerMonitoring
-  entities:
-  - uid: 1730
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 27.5,-14.5
-      parent: 104
-- proto: ComputerSurveillanceWirelessCameraMonitor
-  entities:
-  - uid: 1127
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -14.5,6.5
-      parent: 104
-- proto: CyberPen
-  entities:
-  - uid: 696
-    components:
-    - type: Transform
-      pos: -14.478909,9.585995
-      parent: 104
-- proto: DresserFilled
-  entities:
-  - uid: 349
-    components:
-    - type: Transform
-      pos: 13.5,-3.5
-      parent: 104
-- proto: DrinkAbsintheBottleFull
-  entities:
-  - uid: 15
-    components:
-    - type: Transform
-      pos: 3.9415665,-8.34479
-      parent: 104
-- proto: DrinkBeerBottleFull
-  entities:
-  - uid: 157
-    components:
-    - type: Transform
-      pos: 2.5961013,-2.2186527
-      parent: 104
-  - uid: 170
-    components:
-    - type: Transform
-      pos: 3.6117263,-3.1874027
-      parent: 104
-- proto: DrinkGinBottleFull
-  entities:
-  - uid: 134
-    components:
-    - type: Transform
-      pos: 3.2228165,-8.4229965
-      parent: 104
-- proto: DrinkWhiskeyBottleFull
-  entities:
-  - uid: 25
-    components:
-    - type: Transform
-      pos: -0.5303154,-6.2851996
-      parent: 104
-- proto: EmpGrenade
-  entities:
-  - uid: 2456
-    components:
-    - type: Transform
-      pos: 14.40774,-17.385033
-      parent: 104
-  - uid: 2457
-    components:
-    - type: Transform
-      pos: 14.62649,-17.385033
-      parent: 104
-- proto: ExtinguisherCabinetFilled
-  entities:
-  - uid: 139
-    components:
-    - type: Transform
-      pos: 28.5,-14.5
-      parent: 104
-  - uid: 141
-    components:
-    - type: Transform
-      pos: 14.5,-0.5
-      parent: 104
-  - uid: 1812
-    components:
-    - type: Transform
-      pos: -1.5,-2.5
-      parent: 104
-  - uid: 1816
-    components:
-    - type: Transform
-      pos: 8.5,-10.5
-      parent: 104
-  - uid: 1822
-    components:
-    - type: Transform
-      pos: 15.5,-17.5
-      parent: 104
-- proto: FaxMachineSyndie
-  entities:
-  - uid: 81
-    components:
-    - type: Transform
-      pos: 7.5,-4.5
-      parent: 104
-- proto: filingCabinetDrawer
-  entities:
-  - uid: 1140
-    components:
-    - type: Transform
-      pos: -12.5,7.5
-      parent: 104
-- proto: filingCabinetDrawerRandom
-  entities:
-  - uid: 108
-    components:
-    - type: Transform
-      pos: 7.5,-5.5
-      parent: 104
-- proto: FirelockGlass
-  entities:
-  - uid: 1765
-    components:
-    - type: Transform
-      pos: -13.5,5.5
-      parent: 104
-- proto: Fireplace
-  entities:
-  - uid: 1273
-    components:
-    - type: Transform
-      pos: 1.5,0.5
-      parent: 104
-- proto: FloorDrain
-  entities:
-  - uid: 1361
-    components:
-    - type: Transform
-      pos: -4.5,-2.5
-      parent: 104
-    - type: Fixtures
-      fixtures: {}
-  - uid: 2438
-    components:
-    - type: Transform
-      pos: 10.5,-3.5
-      parent: 104
-    - type: Fixtures
-      fixtures: {}
-  - uid: 2443
-    components:
-    - type: Transform
-      pos: 4.5,-11.5
-      parent: 104
-    - type: Fixtures
-      fixtures: {}
-- proto: FloraRockSolid01
-  entities:
-  - uid: 1707
-    components:
-    - type: Transform
-      pos: 5.5565968,16.377468
-      parent: 104
-- proto: FloraRockSolid02
-  entities:
-  - uid: 1708
-    components:
-    - type: Transform
-      pos: -3.1481876,-0.15203857
-      parent: 104
-  - uid: 1711
-    components:
-    - type: Transform
-      pos: -1.3676796,16.13784
-      parent: 104
-- proto: FloraRockSolid03
-  entities:
-  - uid: 1706
-    components:
-    - type: Transform
-      pos: 13.550529,12.489372
-      parent: 104
-- proto: FloraTreeConifer01
-  entities:
-  - uid: 261
-    components:
-    - type: Transform
-      pos: 7.7892694,4.987089
-      parent: 104
-  - uid: 275
-    components:
-    - type: Transform
-      pos: -3.80645,4.798395
-      parent: 104
-  - uid: 281
-    components:
-    - type: Transform
-      pos: -1.0279694,6.890992
-      parent: 104
-  - uid: 1619
-    components:
-    - type: Transform
-      pos: 16.10984,7.3249645
-      parent: 104
-  - uid: 1622
-    components:
-    - type: Transform
-      pos: 7.42463,16.597832
-      parent: 104
-  - uid: 1626
-    components:
-    - type: Transform
-      pos: 11.605486,16.944057
-      parent: 104
-- proto: FloraTreeConifer02
-  entities:
-  - uid: 219
-    components:
-    - type: Transform
-      pos: 5.5,4.5
-      parent: 104
-  - uid: 260
-    components:
-    - type: Transform
-      pos: 7.7267694,7.536619
-      parent: 104
-  - uid: 267
-    components:
-    - type: Transform
-      pos: 12.789269,3.6888618
-      parent: 104
-  - uid: 268
-    components:
-    - type: Transform
-      pos: -0.17814255,7.5043383
-      parent: 104
-  - uid: 273
-    components:
-    - type: Transform
-      pos: -2.591959,2.9214401
-      parent: 104
-  - uid: 280
-    components:
-    - type: Transform
-      pos: 1.5111885,4.4898434
-      parent: 104
-  - uid: 1618
-    components:
-    - type: Transform
-      pos: 11.32859,10.093473
-      parent: 104
-  - uid: 1620
-    components:
-    - type: Transform
-      pos: 15.85984,13.16621
-      parent: 104
-  - uid: 1621
-    components:
-    - type: Transform
-      pos: 14.582346,17.286049
-      parent: 104
-- proto: FloraTreeConifer03
-  entities:
-  - uid: 271
-    components:
-    - type: Transform
-      pos: -1.1000175,4.26659
-      parent: 104
-  - uid: 1035
-    components:
-    - type: Transform
-      pos: 0.74747276,19.424063
-      parent: 104
-  - uid: 1673
-    components:
-    - type: Transform
-      pos: -3.5,15.5
-      parent: 104
-  - uid: 1830
-    components:
-    - type: Transform
-      pos: 8.497473,19.862019
-      parent: 104
-- proto: FloraTreeSnow01
-  entities:
-  - uid: 262
-    components:
-    - type: Transform
-      pos: 9.630766,6.7434845
-      parent: 104
-- proto: FloraTreeSnow02
-  entities:
-  - uid: 270
-    components:
-    - type: Transform
-      pos: -2.3114033,5.0917635
-      parent: 104
-  - uid: 1630
-    components:
-    - type: Transform
-      pos: 4.558771,16.696045
-      parent: 104
-- proto: FloraTreeSnow03
-  entities:
-  - uid: 274
-    components:
-    - type: Transform
-      pos: -3.3325882,6.8936405
-      parent: 104
-  - uid: 1629
-    components:
-    - type: Transform
-      pos: 9.924105,15.382175
-      parent: 104
-- proto: FloraTreeSnow04
-  entities:
-  - uid: 265
-    components:
-    - type: Transform
-      pos: 0.24603653,5.7335367
-      parent: 104
-  - uid: 276
-    components:
-    - type: Transform
-      pos: 5.8604717,5.2799397
-      parent: 104
-  - uid: 1624
-    components:
-    - type: Transform
-      pos: -3.1344147,13.722986
-      parent: 104
-- proto: FloraTreeSnow05
-  entities:
-  - uid: 269
-    components:
-    - type: Transform
-      pos: 0.30623245,3.9068413
-      parent: 104
-  - uid: 1627
-    components:
-    - type: Transform
-      pos: 13.331816,13.977352
-      parent: 104
-  - uid: 1628
-    components:
-    - type: Transform
-      pos: 15.066191,11.052429
-      parent: 104
-  - uid: 1631
-    components:
-    - type: Transform
-      pos: 2.1525211,16.977589
-      parent: 104
-  - uid: 1672
-    components:
-    - type: Transform
-      pos: -3.5,16.5
-      parent: 104
-- proto: FoodBoxDonkpocket
-  entities:
-  - uid: 11
-    components:
-    - type: Transform
-      pos: 12.527094,-6.308407
-      parent: 104
-- proto: FoodBoxDonkpocketTeriyaki
-  entities:
-  - uid: 2475
-    components:
-    - type: Transform
-      pos: 12.636917,-6.187726
-      parent: 104
-- proto: FoodBoxDonut
-  entities:
-  - uid: 2445
-    components:
-    - type: Transform
-      pos: 2.5389562,-6.3072195
-      parent: 104
-- proto: FoodDonutJellySlugcat
-  entities:
-  - uid: 3327
-    components:
-    - type: Transform
-      pos: -5.7255287,20.539352
-      parent: 104
-- proto: GeneratorBasic15kW
-  entities:
-  - uid: 2326
-    components:
-    - type: Transform
-      pos: 27.5,-19.5
-      parent: 104
-  - uid: 2328
-    components:
-    - type: Transform
-      pos: 17.5,-17.5
-      parent: 104
-  - uid: 2329
-    components:
-    - type: Transform
-      pos: 17.5,-19.5
-      parent: 104
-  - uid: 2330
-    components:
-    - type: Transform
-      pos: 27.5,-17.5
-      parent: 104
-- proto: GeneratorRTG
-  entities:
-  - uid: 2415
-    components:
-    - type: Transform
-      pos: 17.5,-18.5
-      parent: 104
-  - uid: 2416
-    components:
-    - type: Transform
-      pos: 27.5,-18.5
-      parent: 104
-- proto: GravityGenerator
-  entities:
-  - uid: 2327
-    components:
-    - type: Transform
-      pos: 22.5,-15.5
-      parent: 104
-    - type: GravityGenerator
-      charge: 100
-    - type: PointLight
-      radius: 175.75
-- proto: GrenadeFlashBang
-  entities:
-  - uid: 2309
-    components:
-    - type: Transform
-      pos: 11.399388,-16.363453
-      parent: 104
-  - uid: 2310
-    components:
-    - type: Transform
-      pos: 11.571263,-16.363453
-      parent: 104
-- proto: Grille
-  entities:
-  - uid: 95
-    components:
-    - type: Transform
-      pos: 0.5,1.5
-      parent: 104
-  - uid: 115
-    components:
-    - type: Transform
-      pos: -1.5,-0.5
-      parent: 104
-  - uid: 118
-    components:
-    - type: Transform
-      pos: 2.5,1.5
-      parent: 104
-  - uid: 147
-    components:
-    - type: Transform
-      pos: 11.5,1.5
-      parent: 104
-  - uid: 231
-    components:
-    - type: Transform
-      pos: 2.5,2.5
-      parent: 104
-  - uid: 232
-    components:
-    - type: Transform
-      pos: 2.5,3.5
-      parent: 104
-  - uid: 233
-    components:
-    - type: Transform
-      pos: 4.5,2.5
-      parent: 104
-  - uid: 234
-    components:
-    - type: Transform
-      pos: 4.5,3.5
-      parent: 104
-  - uid: 303
-    components:
-    - type: Transform
-      pos: 16.5,-6.5
-      parent: 104
-  - uid: 304
-    components:
-    - type: Transform
-      pos: 16.5,-8.5
-      parent: 104
-  - uid: 526
-    components:
-    - type: Transform
-      pos: 0.5,21.5
-      parent: 104
-  - uid: 527
-    components:
-    - type: Transform
-      pos: 6.5,21.5
-      parent: 104
-  - uid: 528
-    components:
-    - type: Transform
-      pos: 1.5,21.5
-      parent: 104
-  - uid: 1034
-    components:
-    - type: Transform
-      pos: 5.5,21.5
-      parent: 104
-  - uid: 1112
-    components:
-    - type: Transform
-      pos: -1.5,-17.5
-      parent: 104
-  - uid: 1120
-    components:
-    - type: Transform
-      pos: 2.5,-15.5
-      parent: 104
-  - uid: 1121
-    components:
-    - type: Transform
-      pos: 2.5,-13.5
-      parent: 104
-  - uid: 1146
-    components:
-    - type: Transform
-      pos: -12.5,5.5
-      parent: 104
-  - uid: 1148
-    components:
-    - type: Transform
-      pos: -14.5,5.5
-      parent: 104
-  - uid: 1241
-    components:
-    - type: Transform
-      pos: 5.5,-9.5
-      parent: 104
-  - uid: 1243
-    components:
-    - type: Transform
-      pos: 7.5,-9.5
-      parent: 104
-  - uid: 1389
-    components:
-    - type: Transform
-      pos: 4.5,1.5
-      parent: 104
-  - uid: 1410
-    components:
-    - type: Transform
-      pos: 8.5,-17.5
-      parent: 104
-  - uid: 1823
-    components:
-    - type: Transform
-      pos: 8.5,20.5
-      parent: 104
-  - uid: 1824
-    components:
-    - type: Transform
-      pos: 4.5,21.5
-      parent: 104
-  - uid: 1831
-    components:
-    - type: Transform
-      pos: 8.5,21.5
-      parent: 104
-  - uid: 1832
-    components:
-    - type: Transform
-      pos: 3.5,21.5
-      parent: 104
-  - uid: 1840
-    components:
-    - type: Transform
-      pos: 11.5,-23.5
-      parent: 104
-  - uid: 1841
-    components:
-    - type: Transform
-      pos: 10.5,-23.5
-      parent: 104
-  - uid: 1847
-    components:
-    - type: Transform
-      pos: 12.5,-23.5
-      parent: 104
-  - uid: 1854
-    components:
-    - type: Transform
-      pos: 13.5,-23.5
-      parent: 104
-  - uid: 1860
-    components:
-    - type: Transform
-      pos: 14.5,-23.5
-      parent: 104
-  - uid: 1931
-    components:
-    - type: Transform
-      pos: 0.5,20.5
-      parent: 104
-  - uid: 1932
-    components:
-    - type: Transform
-      pos: 7.5,21.5
-      parent: 104
-  - uid: 1933
-    components:
-    - type: Transform
-      pos: 2.5,21.5
-      parent: 104
-  - uid: 2189
-    components:
-    - type: Transform
-      pos: -0.5,-17.5
-      parent: 104
-  - uid: 2296
-    components:
-    - type: Transform
-      pos: 0.5,-17.5
-      parent: 104
-  - uid: 2318
-    components:
-    - type: Transform
-      pos: 11.5,-8.5
-      parent: 104
-  - uid: 2319
-    components:
-    - type: Transform
-      pos: 11.5,-6.5
-      parent: 104
-- proto: KitchenKnife
-  entities:
-  - uid: 1061
-    components:
-    - type: Transform
-      pos: 18.918644,6.663283
-      parent: 104
-- proto: KitchenMicrowave
-  entities:
-  - uid: 10
-    components:
-    - type: Transform
-      pos: 13.5,-6.5
-      parent: 104
-- proto: KitchenReagentGrinder
-  entities:
-  - uid: 1257
-    components:
-    - type: Transform
-      pos: 3.5,-10.5
-      parent: 104
-- proto: LargeBeaker
-  entities:
-  - uid: 2021
-    components:
-    - type: Transform
-      pos: 5.039936,-12.489611
-      parent: 104
-- proto: LightPostSmall
-  entities:
-  - uid: 221
-    components:
-    - type: Transform
-      pos: 15.5,16.5
-      parent: 104
-  - uid: 222
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,3.5
-      parent: 104
-  - uid: 291
-    components:
-    - type: Transform
-      pos: 17.5,3.5
-      parent: 104
-  - uid: 540
-    components:
-    - type: Transform
-      pos: 27.5,4.5
-      parent: 104
-  - uid: 541
-    components:
-    - type: Transform
-      pos: 18.5,8.5
-      parent: 104
-  - uid: 629
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,8.5
-      parent: 104
-  - uid: 1226
-    components:
-    - type: Transform
-      pos: -4.5,-0.5
-      parent: 104
-  - uid: 1276
-    components:
-    - type: Transform
-      pos: -34.5,4.5
-      parent: 104
-  - uid: 1279
-    components:
-    - type: Transform
-      pos: -35.5,-23.5
-      parent: 104
-  - uid: 1413
-    components:
-    - type: Transform
-      pos: 0.5,-22.5
-      parent: 104
-  - uid: 1668
-    components:
-    - type: Transform
-      pos: 5.5,17.5
-      parent: 104
-  - uid: 1669
-    components:
-    - type: Transform
-      pos: 10.5,11.5
-      parent: 104
-  - uid: 1671
-    components:
-    - type: Transform
-      pos: -3.5,17.5
-      parent: 104
-  - uid: 1675
-    components:
-    - type: Transform
-      pos: 10.5,2.5
-      parent: 104
-- proto: LockerSyndicatePersonalFilled
-  entities:
-  - uid: 178
-    components:
-    - type: Transform
-      pos: 9.5,-13.5
-      parent: 104
-  - uid: 196
-    components:
-    - type: Transform
-      pos: 11.5,-14.5
-      parent: 104
-  - uid: 197
-    components:
-    - type: Transform
-      pos: 11.5,-13.5
-      parent: 104
-  - uid: 198
-    components:
-    - type: Transform
-      pos: 9.5,-14.5
-      parent: 104
-  - uid: 1271
-    components:
-    - type: Transform
-      pos: 13.5,-13.5
-      parent: 104
-  - uid: 1375
-    components:
-    - type: Transform
-      pos: 13.5,-14.5
-      parent: 104
-  - uid: 2476
-    components:
-    - type: Transform
-      pos: 15.5,-6.5
-      parent: 104
-- proto: MachineCentrifuge
-  entities:
-  - uid: 1728
-    components:
-    - type: Transform
-      pos: 3.5,-11.5
-      parent: 104
-- proto: MachineElectrolysisUnit
-  entities:
-  - uid: 1718
-    components:
-    - type: Transform
-      pos: 3.5,-12.5
-      parent: 104
-- proto: MagazinePistolSubMachineGunPractice
-  entities:
-  - uid: 1648
-    components:
-    - type: Transform
-      pos: 5.7430096,13.989216
-      parent: 104
-    - type: BallisticAmmoProvider
-      unspawnedCount: 35
-- proto: MedicalBed
-  entities:
-  - uid: 1868
-    components:
-    - type: Transform
-      pos: 1.5,-16.5
-      parent: 104
-  - uid: 1874
-    components:
-    - type: Transform
-      pos: -1.5,-12.5
-      parent: 104
-  - uid: 1890
-    components:
-    - type: Transform
-      pos: 1.5,-12.5
-      parent: 104
-  - uid: 1891
-    components:
-    - type: Transform
-      pos: -1.5,-16.5
-      parent: 104
-- proto: MedkitAdvancedFilled
-  entities:
-  - uid: 447
-    components:
-    - type: Transform
-      pos: 7.5183387,-10.279964
-      parent: 104
-- proto: MedkitBruteFilled
-  entities:
-  - uid: 138
-    components:
-    - type: Transform
-      pos: 7.5183387,-10.576839
-      parent: 104
-- proto: MedkitBurnFilled
-  entities:
-  - uid: 1894
-    components:
-    - type: Transform
-      pos: 7.5339637,-10.889339
-      parent: 104
-- proto: MedkitFilled
-  entities:
-  - uid: 770
-    components:
-    - type: Transform
-      pos: 0.48478004,-16.399067
-      parent: 104
-- proto: MedkitOxygenFilled
-  entities:
-  - uid: 1895
-    components:
-    - type: Transform
-      pos: 7.5339637,-11.186214
-      parent: 104
-- proto: MedkitRadiationFilled
-  entities:
-  - uid: 448
-    components:
-    - type: Transform
-      pos: 7.5495887,-11.733089
-      parent: 104
-- proto: MedkitToxinFilled
-  entities:
-  - uid: 1388
-    components:
-    - type: Transform
-      pos: 7.5339637,-11.436214
-      parent: 104
-- proto: Mirror
-  entities:
-  - uid: 142
-    components:
-    - type: Transform
-      pos: 9.5,1.5
-      parent: 104
-  - uid: 146
-    components:
-    - type: Transform
-      pos: 10.5,1.5
-      parent: 104
-- proto: ModularGrenade
-  entities:
-  - uid: 1326
-    components:
-    - type: Transform
-      pos: 4.001747,-17.289776
-      parent: 104
-  - uid: 1328
-    components:
-    - type: Transform
-      pos: 4.204872,-17.508755
-      parent: 104
-- proto: MopBucket
-  entities:
-  - uid: 149
-    components:
-    - type: Transform
-      pos: 11.5,-3.5
-      parent: 104
-- proto: MopItem
-  entities:
-  - uid: 150
-    components:
-    - type: Transform
-      pos: 11.5,-3.5
-      parent: 104
-- proto: Multitool
-  entities:
-  - uid: 1555
-    components:
-    - type: Transform
-      pos: 11.895346,-10.413807
-      parent: 104
-- proto: NukeDiskFake
-  entities:
-  - uid: 282
-    components:
-    - type: Transform
-      pos: 12.149857,15.427643
-      parent: 104
-- proto: OperatingTable
-  entities:
-  - uid: 2435
-    components:
-    - type: Transform
-      pos: -0.5,-14.5
-      parent: 104
-- proto: Paper
-  entities:
-  - uid: 612
-    components:
-    - type: Transform
-      pos: -14.166584,9.634687
-      parent: 104
-- proto: PartRodMetal
-  entities:
-  - uid: 2425
-    components:
-    - type: Transform
-      pos: 24.5,-16.5
-      parent: 104
-  - uid: 2426
-    components:
-    - type: Transform
-      pos: 24.5,-16.5
-      parent: 104
-- proto: PhoneInstrumentSyndicate
-  entities:
-  - uid: 1684
-    components:
-    - type: Transform
-      pos: 1.4424791,-6.340748
-      parent: 104
-- proto: PianoInstrument
-  entities:
-  - uid: 2430
-    components:
-    - type: Transform
-      pos: -0.5,-2.5
-      parent: 104
-- proto: PlasmaReinforcedWindowDirectional
-  entities:
-  - uid: 1817
-    components:
-    - type: Transform
-      pos: 13.5,-18.5
-      parent: 104
-  - uid: 1818
-    components:
-    - type: Transform
-      pos: 12.5,-18.5
-      parent: 104
-  - uid: 1819
-    components:
-    - type: Transform
-      pos: 11.5,-18.5
-      parent: 104
-  - uid: 1858
-    components:
-    - type: Transform
-      pos: 14.5,-18.5
-      parent: 104
-- proto: PlushieBee
-  entities:
-  - uid: 2317
-    components:
-    - type: Transform
-      pos: 1.5,-12.5
-      parent: 104
-- proto: PlushieLizard
-  entities:
-  - uid: 1266
-    components:
-    - type: Transform
-      pos: -15.435635,22.055351
-      parent: 104
-  - uid: 2315
-    components:
-    - type: Transform
-      pos: -1.5,-16.5
-      parent: 104
-  - uid: 3367
-    components:
-    - type: Transform
-      pos: -4.605839,20.481245
-      parent: 104
-- proto: PlushieNuke
-  entities:
-  - uid: 163
-    components:
-    - type: Transform
-      pos: 1.8113766,-6.337348
-      parent: 104
-  - uid: 283
-    components:
-    - type: Transform
-      pos: 12.912951,15.575253
-      parent: 104
-- proto: PlushieRouny
-  entities:
-  - uid: 2316
-    components:
-    - type: Transform
-      pos: -1.5,-12.5
-      parent: 104
-- proto: PlushieVox
-  entities:
-  - uid: 2314
-    components:
-    - type: Transform
-      pos: 1.5,-16.5
-      parent: 104
-- proto: PortableScrubber
-  entities:
-  - uid: 811
-    components:
-    - type: Transform
-      pos: 10.5,-10.5
-      parent: 104
-- proto: PosterBroken
-  entities:
-  - uid: 227
-    components:
-    - type: Transform
-      pos: -0.5,10.5
-      parent: 104
-- proto: PosterContrabandC20r
-  entities:
-  - uid: 1556
-    components:
-    - type: Transform
-      pos: 10.5,-9.5
-      parent: 104
-- proto: PosterContrabandClown
-  entities:
-  - uid: 1681
-    components:
-    - type: Transform
-      pos: 12.5,1.5
-      parent: 104
-- proto: PosterContrabandCybersun600
-  entities:
-  - uid: 2466
-    components:
-    - type: Transform
-      pos: 8.5,-9.5
-      parent: 104
-- proto: PosterContrabandDonk
-  entities:
-  - uid: 12
-    components:
-    - type: Transform
-      pos: 12.5,-5.5
-      parent: 104
-  - uid: 2465
-    components:
-    - type: Transform
-      pos: -10.5,8.5
-      parent: 104
-- proto: PosterContrabandDonutCorp
-  entities:
-  - uid: 2450
-    components:
-    - type: Transform
-      pos: -3.5,-1.5
-      parent: 104
-- proto: PosterContrabandEnergySwords
-  entities:
-  - uid: 1384
-    components:
-    - type: Transform
-      pos: 14.5,-9.5
-      parent: 104
-- proto: PosterContrabandEnlistGorlex
-  entities:
-  - uid: 2461
-    components:
-    - type: Transform
-      pos: -0.5,0.5
-      parent: 104
-- proto: PosterContrabandInterdyne
-  entities:
-  - uid: 2464
-    components:
-    - type: Transform
-      pos: 8.5,-12.5
-      parent: 104
-- proto: PosterContrabandLustyExomorph
-  entities:
-  - uid: 754
-    components:
-    - type: Transform
-      pos: -3.5,-13.5
-      parent: 104
-  - uid: 2447
-    components:
-    - type: Transform
-      pos: 15.5,-15.5
-      parent: 104
-- proto: PosterContrabandMoth
-  entities:
-  - uid: 2462
-    components:
-    - type: Transform
-      pos: 8.5,-2.5
-      parent: 104
-- proto: PosterContrabandNuclearDeviceInformational
-  entities:
-  - uid: 2298
-    components:
-    - type: Transform
-      pos: -1.5,-5.5
-      parent: 104
-- proto: PosterContrabandPower
-  entities:
-  - uid: 1563
-    components:
-    - type: Transform
-      pos: 19.5,-12.5
-      parent: 104
-- proto: PosterContrabandPunchShit
-  entities:
-  - uid: 2451
-    components:
-    - type: Transform
-      pos: 25.5,-12.5
-      parent: 104
-- proto: PosterContrabandRebelsUnite
-  entities:
-  - uid: 2446
-    components:
-    - type: Transform
-      pos: 8.5,-3.5
-      parent: 104
-- proto: PosterContrabandRedRum
-  entities:
-  - uid: 1387
-    components:
-    - type: Transform
-      pos: 2.5,-9.5
-      parent: 104
-- proto: PosterContrabandRevolver
-  entities:
-  - uid: 2452
-    components:
-    - type: Transform
-      pos: -1.5,-7.5
-      parent: 104
-- proto: PosterContrabandRobustSoftdrinks
-  entities:
-  - uid: 1245
-    components:
-    - type: Transform
-      pos: -9.5,8.5
-      parent: 104
-- proto: PosterContrabandSyndicatePistol
-  entities:
-  - uid: 1386
-    components:
-    - type: Transform
-      pos: 12.5,-9.5
-      parent: 104
-- proto: PosterContrabandSyndicateRecruitment
-  entities:
-  - uid: 1242
-    components:
-    - type: Transform
-      pos: -15.5,7.5
-      parent: 104
-  - uid: 1561
-    components:
-    - type: Transform
-      pos: 16.5,-11.5
-      parent: 104
-  - uid: 2453
-    components:
-    - type: Transform
-      pos: -3.5,-5.5
-      parent: 104
-  - uid: 2454
-    components:
-    - type: Transform
-      pos: 12.5,-15.5
-      parent: 104
-- proto: PosterContrabandTheBigGasTruth
-  entities:
-  - uid: 2455
-    components:
-    - type: Transform
-      pos: 10.5,-15.5
-      parent: 104
-- proto: PosterContrabandVoteWeh
-  entities:
-  - uid: 1113
-    components:
-    - type: Transform
-      pos: -3.5,-15.5
-      parent: 104
-  - uid: 1227
-    components:
-    - type: Transform
-      pos: -17.5,24.5
-      parent: 104
-  - uid: 1228
-    components:
-    - type: Transform
-      pos: -16.5,24.5
-      parent: 104
-  - uid: 1229
-    components:
-    - type: Transform
-      pos: -15.5,24.5
-      parent: 104
-  - uid: 1230
-    components:
-    - type: Transform
-      pos: -14.5,24.5
-      parent: 104
-  - uid: 1231
-    components:
-    - type: Transform
-      pos: -13.5,24.5
-      parent: 104
-  - uid: 1248
-    components:
-    - type: Transform
-      pos: -12.5,24.5
-      parent: 104
-  - uid: 1251
-    components:
-    - type: Transform
-      pos: -12.5,23.5
-      parent: 104
-  - uid: 1252
-    components:
-    - type: Transform
-      pos: -12.5,22.5
-      parent: 104
-  - uid: 1253
-    components:
-    - type: Transform
-      pos: -12.5,21.5
-      parent: 104
-  - uid: 1254
-    components:
-    - type: Transform
-      pos: -12.5,20.5
-      parent: 104
-  - uid: 1255
-    components:
-    - type: Transform
-      pos: -12.5,19.5
-      parent: 104
-  - uid: 1256
-    components:
-    - type: Transform
-      pos: -13.5,19.5
-      parent: 104
-  - uid: 1258
-    components:
-    - type: Transform
-      pos: -14.5,19.5
-      parent: 104
-  - uid: 1259
-    components:
-    - type: Transform
-      pos: -15.5,19.5
-      parent: 104
-  - uid: 1260
-    components:
-    - type: Transform
-      pos: -16.5,19.5
-      parent: 104
-  - uid: 1261
-    components:
-    - type: Transform
-      pos: -17.5,19.5
-      parent: 104
-  - uid: 1262
-    components:
-    - type: Transform
-      pos: -17.5,20.5
-      parent: 104
-  - uid: 1263
-    components:
-    - type: Transform
-      pos: -17.5,21.5
-      parent: 104
-  - uid: 1264
-    components:
-    - type: Transform
-      pos: -17.5,22.5
-      parent: 104
-  - uid: 1265
-    components:
-    - type: Transform
-      pos: -17.5,23.5
-      parent: 104
-  - uid: 1565
-    components:
-    - type: Transform
-      pos: 12.5,-3.5
-      parent: 104
-- proto: PosterContrabandWaffleCorp
-  entities:
-  - uid: 2463
-    components:
-    - type: Transform
-      pos: 14.5,-2.5
-      parent: 104
-- proto: PosterLegitAnatomyPoster
-  entities:
-  - uid: 2320
-    components:
-    - type: Transform
-      pos: 2.5,-11.5
-      parent: 104
-- proto: PosterLegitCleanliness
-  entities:
-  - uid: 955
-    components:
-    - type: Transform
-      pos: 0.5,-11.5
-      parent: 104
-- proto: PosterLegitIan
-  entities:
-  - uid: 1551
-    components:
-    - type: Transform
-      pos: -0.5,12.5
-      parent: 104
-- proto: PosterLegitIonRifle
-  entities:
-  - uid: 1558
-    components:
-    - type: Transform
-      pos: 16.5,-14.5
-      parent: 104
-- proto: PosterLegitNanotrasenLogo
-  entities:
-  - uid: 237
-    components:
-    - type: Transform
-      pos: -0.5,14.5
-      parent: 104
-- proto: PosterMapSplit
-  entities:
-  - uid: 350
-    components:
-    - type: Transform
-      pos: 0.5,-9.5
-      parent: 104
-- proto: PosterMapWaystation
-  entities:
-  - uid: 2449
-    components:
-    - type: Transform
-      pos: 10.5,-5.5
-      parent: 104
-- proto: PottedPlant24
-  entities:
-  - uid: 1143
-    components:
-    - type: Transform
-      pos: -14.5,7.5
-      parent: 104
-- proto: PottedPlantBioluminscent
-  entities:
-  - uid: 7
-    components:
-    - type: Transform
-      pos: 15.481667,-8.824032
-      parent: 104
-- proto: PottedPlantRandom
-  entities:
-  - uid: 1656
-    components:
-    - type: Transform
-      pos: 9.5,-1.5
-      parent: 104
-- proto: PottedPlantRandomPlastic
-  entities:
-  - uid: 1654
-    components:
-    - type: Transform
-      pos: 8.5,-6.5
-      parent: 104
-  - uid: 1655
-    components:
-    - type: Transform
-      pos: 5.5,-8.5
-      parent: 104
-- proto: Poweredlight
-  entities:
-  - uid: 1333
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 13.5,-0.5
-      parent: 104
-- proto: PoweredLightPostSmall
-  entities:
-  - uid: 2525
-    components:
-    - type: Transform
-      pos: -10.5,0.5
-      parent: 104
-  - uid: 2527
-    components:
-    - type: Transform
-      pos: -31.5,0.5
-      parent: 104
-  - uid: 2528
-    components:
-    - type: Transform
-      pos: -27.5,0.5
-      parent: 104
-  - uid: 2529
-    components:
-    - type: Transform
-      pos: -23.5,0.5
-      parent: 104
-  - uid: 2530
-    components:
-    - type: Transform
-      pos: -19.5,0.5
-      parent: 104
-  - uid: 2531
-    components:
-    - type: Transform
-      pos: -15.5,0.5
-      parent: 104
-  - uid: 2532
-    components:
-    - type: Transform
-      pos: -10.5,-19.5
-      parent: 104
-  - uid: 2533
-    components:
-    - type: Transform
-      pos: -15.5,-19.5
-      parent: 104
-  - uid: 2534
-    components:
-    - type: Transform
-      pos: -19.5,-19.5
-      parent: 104
-  - uid: 2535
-    components:
-    - type: Transform
-      pos: -23.5,-19.5
-      parent: 104
-  - uid: 2536
-    components:
-    - type: Transform
-      pos: -27.5,-19.5
-      parent: 104
-  - uid: 2537
-    components:
-    - type: Transform
-      pos: -31.5,-19.5
-      parent: 104
-- proto: PoweredSmallLight
-  entities:
-  - uid: 23
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 15.5,-1.5
-      parent: 104
-- proto: Rack
-  entities:
-  - uid: 472
-    components:
-    - type: Transform
-      pos: 11.5,-16.5
-      parent: 104
-  - uid: 1360
-    components:
-    - type: Transform
-      pos: -2.5,-4.5
-      parent: 104
-- proto: Railing
-  entities:
-  - uid: 253
-    components:
-    - type: Transform
-      pos: -31.5,0.5
-      parent: 104
-  - uid: 446
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-6.5
-      parent: 104
-  - uid: 456
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-2.5
-      parent: 104
-  - uid: 457
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-3.5
-      parent: 104
-  - uid: 458
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-4.5
-      parent: 104
-  - uid: 459
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,5.5
-      parent: 104
-  - uid: 461
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-5.5
-      parent: 104
-  - uid: 481
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,6.5
-      parent: 104
-  - uid: 523
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,7.5
-      parent: 104
-  - uid: 585
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -35.5,-22.5
-      parent: 104
-  - uid: 942
-    components:
-    - type: Transform
-      pos: -20.5,0.5
-      parent: 104
-  - uid: 956
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -34.5,1.5
-      parent: 104
-  - uid: 1080
-    components:
-    - type: Transform
-      pos: -34.5,-23.5
-      parent: 104
-  - uid: 1111
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-0.5
-      parent: 104
-  - uid: 1159
-    components:
-    - type: Transform
-      pos: -22.5,-23.5
-      parent: 104
-  - uid: 1301
-    components:
-    - type: Transform
-      pos: -28.5,-23.5
-      parent: 104
-  - uid: 1302
-    components:
-    - type: Transform
-      pos: -21.5,-23.5
-      parent: 104
-  - uid: 1303
-    components:
-    - type: Transform
-      pos: -26.5,-23.5
-      parent: 104
-  - uid: 1305
-    components:
-    - type: Transform
-      pos: -24.5,-23.5
-      parent: 104
-  - uid: 1306
-    components:
-    - type: Transform
-      pos: -20.5,-23.5
-      parent: 104
-  - uid: 1307
-    components:
-    - type: Transform
-      pos: -19.5,-23.5
-      parent: 104
-  - uid: 1308
-    components:
-    - type: Transform
-      pos: -18.5,-23.5
-      parent: 104
-  - uid: 1309
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,4.5
-      parent: 104
-  - uid: 1310
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,4.5
-      parent: 104
-  - uid: 1311
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -23.5,4.5
-      parent: 104
-  - uid: 1312
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -22.5,4.5
-      parent: 104
-  - uid: 1313
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,4.5
-      parent: 104
-  - uid: 1314
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -30.5,4.5
-      parent: 104
-  - uid: 1315
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -32.5,4.5
-      parent: 104
-  - uid: 1316
-    components:
-    - type: Transform
-      pos: -32.5,-23.5
-      parent: 104
-  - uid: 1317
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -29.5,4.5
-      parent: 104
-  - uid: 1319
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -31.5,4.5
-      parent: 104
-  - uid: 1323
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -34.5,3.5
-      parent: 104
-  - uid: 1352
-    components:
-    - type: Transform
-      pos: -23.5,-23.5
-      parent: 104
-  - uid: 1353
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,4.5
-      parent: 104
-  - uid: 1354
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -28.5,4.5
-      parent: 104
-  - uid: 1355
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,4.5
-      parent: 104
-  - uid: 1357
-    components:
-    - type: Transform
-      pos: -27.5,-23.5
-      parent: 104
-  - uid: 1373
-    components:
-    - type: Transform
-      pos: -31.5,-23.5
-      parent: 104
-  - uid: 1374
-    components:
-    - type: Transform
-      pos: -29.5,-23.5
-      parent: 104
-  - uid: 1378
-    components:
-    - type: Transform
-      pos: -25.5,-23.5
-      parent: 104
-  - uid: 1379
-    components:
-    - type: Transform
-      pos: -30.5,-23.5
-      parent: 104
-  - uid: 1414
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-1.5
-      parent: 104
-  - uid: 1432
-    components:
-    - type: Transform
-      pos: -33.5,-23.5
-      parent: 104
-  - uid: 1800
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -35.5,-21.5
-      parent: 104
-  - uid: 1838
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-18.5
-      parent: 104
-  - uid: 1839
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-17.5
-      parent: 104
-  - uid: 1845
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-16.5
-      parent: 104
-  - uid: 1846
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-14.5
-      parent: 104
-  - uid: 1851
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-13.5
-      parent: 104
-  - uid: 1852
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-15.5
-      parent: 104
-  - uid: 1857
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-7.5
-      parent: 104
-  - uid: 1882
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -19.5,4.5
-      parent: 104
-  - uid: 1902
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -20.5,4.5
-      parent: 104
-  - uid: 1903
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,4.5
-      parent: 104
-  - uid: 1916
-    components:
-    - type: Transform
-      pos: -15.5,-23.5
-      parent: 104
-  - uid: 1917
-    components:
-    - type: Transform
-      pos: -14.5,-23.5
-      parent: 104
-  - uid: 1918
-    components:
-    - type: Transform
-      pos: -13.5,-23.5
-      parent: 104
-  - uid: 1919
-    components:
-    - type: Transform
-      pos: -12.5,-23.5
-      parent: 104
-  - uid: 1920
-    components:
-    - type: Transform
-      pos: -11.5,-23.5
-      parent: 104
-  - uid: 1921
-    components:
-    - type: Transform
-      pos: -17.5,-23.5
-      parent: 104
-  - uid: 1922
-    components:
-    - type: Transform
-      pos: -16.5,-23.5
-      parent: 104
-  - uid: 1945
-    components:
-    - type: Transform
-      pos: -10.5,-23.5
-      parent: 104
-  - uid: 1946
-    components:
-    - type: Transform
-      pos: -9.5,-23.5
-      parent: 104
-  - uid: 1951
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -34.5,2.5
-      parent: 104
-  - uid: 2045
-    components:
-    - type: Transform
-      pos: -32.5,0.5
-      parent: 104
-  - uid: 2083
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-9.5
-      parent: 104
-  - uid: 2089
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-12.5
-      parent: 104
-  - uid: 2097
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-8.5
-      parent: 104
-  - uid: 2126
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-10.5
-      parent: 104
-  - uid: 2135
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-11.5
-      parent: 104
-  - uid: 2482
-    components:
-    - type: Transform
-      pos: -30.5,0.5
-      parent: 104
-  - uid: 2483
-    components:
-    - type: Transform
-      pos: -28.5,0.5
-      parent: 104
-  - uid: 2484
-    components:
-    - type: Transform
-      pos: -27.5,0.5
-      parent: 104
-  - uid: 2485
-    components:
-    - type: Transform
-      pos: -26.5,0.5
-      parent: 104
-  - uid: 2486
-    components:
-    - type: Transform
-      pos: -24.5,0.5
-      parent: 104
-  - uid: 2487
-    components:
-    - type: Transform
-      pos: -23.5,0.5
-      parent: 104
-  - uid: 2488
-    components:
-    - type: Transform
-      pos: -22.5,0.5
-      parent: 104
-  - uid: 2489
-    components:
-    - type: Transform
-      pos: -19.5,0.5
-      parent: 104
-  - uid: 2490
-    components:
-    - type: Transform
-      pos: -18.5,0.5
-      parent: 104
-  - uid: 2491
-    components:
-    - type: Transform
-      pos: -16.5,0.5
-      parent: 104
-  - uid: 2492
-    components:
-    - type: Transform
-      pos: -15.5,0.5
-      parent: 104
-  - uid: 2493
-    components:
-    - type: Transform
-      pos: -14.5,0.5
-      parent: 104
-  - uid: 2494
-    components:
-    - type: Transform
-      pos: -12.5,0.5
-      parent: 104
-  - uid: 2495
-    components:
-    - type: Transform
-      pos: -11.5,0.5
-      parent: 104
-  - uid: 2497
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -11.5,-19.5
-      parent: 104
-  - uid: 2498
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -12.5,-19.5
-      parent: 104
-  - uid: 2499
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-19.5
-      parent: 104
-  - uid: 2500
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -15.5,-19.5
-      parent: 104
-  - uid: 2501
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-19.5
-      parent: 104
-  - uid: 2502
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -18.5,-19.5
-      parent: 104
-  - uid: 2503
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -19.5,-19.5
-      parent: 104
-  - uid: 2504
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -20.5,-19.5
-      parent: 104
-  - uid: 2506
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -22.5,-19.5
-      parent: 104
-  - uid: 2509
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -23.5,-19.5
-      parent: 104
-  - uid: 2510
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,-19.5
-      parent: 104
-  - uid: 2511
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,-19.5
-      parent: 104
-  - uid: 2512
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,-19.5
-      parent: 104
-  - uid: 2513
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -28.5,-19.5
-      parent: 104
-  - uid: 2516
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -30.5,-19.5
-      parent: 104
-  - uid: 2517
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -31.5,-19.5
-      parent: 104
-  - uid: 2518
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -32.5,-19.5
-      parent: 104
-  - uid: 2519
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -34.5,-19.5
-      parent: 104
-  - uid: 2520
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -35.5,-20.5
-      parent: 104
-- proto: RailingCorner
-  entities:
-  - uid: 1790
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -35.5,-23.5
-      parent: 104
-  - uid: 1950
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -34.5,4.5
-      parent: 104
-  - uid: 2496
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -34.5,0.5
-      parent: 104
-  - uid: 2522
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -35.5,-19.5
-      parent: 104
-- proto: RailingCornerSmall
-  entities:
-  - uid: 1285
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -8.5,-23.5
-      parent: 104
-  - uid: 1761
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -8.5,8.5
-      parent: 104
-  - uid: 1869
-    components:
-    - type: Transform
-      pos: -8.5,-24.5
-      parent: 104
-  - uid: 1873
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -9.5,-24.5
-      parent: 104
-  - uid: 1883
-    components:
-    - type: Transform
-      pos: -18.5,4.5
-      parent: 104
-  - uid: 2523
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,0.5
-      parent: 104
-  - uid: 2524
-    components:
-    - type: Transform
-      pos: -10.5,-19.5
-      parent: 104
-- proto: ReinforcedPlasmaWindow
-  entities:
-  - uid: 1842
-    components:
-    - type: Transform
-      pos: 12.5,-23.5
-      parent: 104
-  - uid: 1848
-    components:
-    - type: Transform
-      pos: 14.5,-23.5
-      parent: 104
-  - uid: 1849
-    components:
-    - type: Transform
-      pos: 11.5,-23.5
-      parent: 104
-  - uid: 1853
-    components:
-    - type: Transform
-      pos: 13.5,-23.5
-      parent: 104
-  - uid: 1855
-    components:
-    - type: Transform
-      pos: 10.5,-23.5
-      parent: 104
-- proto: ReinforcedWindow
-  entities:
-  - uid: 52
-    components:
-    - type: Transform
-      pos: 16.5,-6.5
-      parent: 104
-  - uid: 73
-    components:
-    - type: Transform
-      pos: 11.5,1.5
-      parent: 104
-  - uid: 89
-    components:
-    - type: Transform
-      pos: 7.5,-9.5
-      parent: 104
-  - uid: 99
-    components:
-    - type: Transform
-      pos: 0.5,1.5
-      parent: 104
-  - uid: 103
-    components:
-    - type: Transform
-      pos: 4.5,1.5
-      parent: 104
-  - uid: 127
-    components:
-    - type: Transform
-      pos: 11.5,-8.5
-      parent: 104
-  - uid: 128
-    components:
-    - type: Transform
-      pos: 11.5,-6.5
-      parent: 104
-  - uid: 129
-    components:
-    - type: Transform
-      pos: 16.5,-8.5
-      parent: 104
-  - uid: 155
-    components:
-    - type: Transform
-      pos: 2.5,3.5
-      parent: 104
-  - uid: 223
-    components:
-    - type: Transform
-      pos: 4.5,2.5
-      parent: 104
-  - uid: 224
-    components:
-    - type: Transform
-      pos: 4.5,3.5
-      parent: 104
-  - uid: 353
-    components:
-    - type: Transform
-      pos: 2.5,2.5
-      parent: 104
-  - uid: 498
-    components:
-    - type: Transform
-      pos: -1.5,-17.5
-      parent: 104
-  - uid: 530
-    components:
-    - type: Transform
-      pos: 8.5,20.5
-      parent: 104
-  - uid: 649
-    components:
-    - type: Transform
-      pos: -12.5,5.5
-      parent: 104
-  - uid: 1037
-    components:
-    - type: Transform
-      pos: 1.5,21.5
-      parent: 104
-  - uid: 1038
-    components:
-    - type: Transform
-      pos: 6.5,21.5
-      parent: 104
-  - uid: 1039
-    components:
-    - type: Transform
-      pos: 8.5,21.5
-      parent: 104
-  - uid: 1040
-    components:
-    - type: Transform
-      pos: 7.5,21.5
-      parent: 104
-  - uid: 1102
-    components:
-    - type: Transform
-      pos: 8.5,-17.5
-      parent: 104
-  - uid: 1103
-    components:
-    - type: Transform
-      pos: 2.5,21.5
-      parent: 104
-  - uid: 1118
-    components:
-    - type: Transform
-      pos: 0.5,-17.5
-      parent: 104
-  - uid: 1142
-    components:
-    - type: Transform
-      pos: -14.5,5.5
-      parent: 104
-  - uid: 1186
-    components:
-    - type: Transform
-      pos: 2.5,-15.5
-      parent: 104
-  - uid: 1196
-    components:
-    - type: Transform
-      pos: -0.5,-17.5
-      parent: 104
-  - uid: 1198
-    components:
-    - type: Transform
-      pos: 2.5,-13.5
-      parent: 104
-  - uid: 1382
-    components:
-    - type: Transform
-      pos: -1.5,-0.5
-      parent: 104
-  - uid: 1385
-    components:
-    - type: Transform
-      pos: 2.5,1.5
-      parent: 104
-  - uid: 1820
-    components:
-    - type: Transform
-      pos: 5.5,21.5
-      parent: 104
-  - uid: 1821
-    components:
-    - type: Transform
-      pos: 0.5,21.5
-      parent: 104
-  - uid: 1828
-    components:
-    - type: Transform
-      pos: 4.5,21.5
-      parent: 104
-  - uid: 1829
-    components:
-    - type: Transform
-      pos: 0.5,20.5
-      parent: 104
-  - uid: 1929
-    components:
-    - type: Transform
-      pos: 3.5,21.5
-      parent: 104
-  - uid: 2081
-    components:
-    - type: Transform
-      pos: 5.5,-9.5
-      parent: 104
-- proto: RemoteSignaller
-  entities:
-  - uid: 1322
-    components:
-    - type: Transform
-      pos: 5.611122,-17.316748
-      parent: 104
-  - uid: 1332
-    components:
-    - type: Transform
-      pos: 5.267372,-17.316748
-      parent: 104
-- proto: Screwdriver
-  entities:
-  - uid: 1325
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.954872,-17.44188
-      parent: 104
-- proto: SheetGlass
-  entities:
-  - uid: 2421
-    components:
-    - type: Transform
-      pos: 20.5,-16.5
-      parent: 104
-  - uid: 2422
-    components:
-    - type: Transform
-      pos: 20.5,-16.5
-      parent: 104
-- proto: SheetPlasteel
-  entities:
-  - uid: 2423
-    components:
-    - type: Transform
-      pos: 24.5,-15.5
-      parent: 104
-  - uid: 2424
-    components:
-    - type: Transform
-      pos: 24.5,-15.5
-      parent: 104
-- proto: SheetPlastic
-  entities:
-  - uid: 460
-    components:
-    - type: Transform
-      pos: 12.60107,-16.44067
-      parent: 104
-- proto: SheetSteel
-  entities:
-  - uid: 286
-    components:
-    - type: Transform
-      pos: 13.50732,-16.456295
-      parent: 104
-  - uid: 1350
-    components:
-    - type: Transform
-      pos: 3.460312,-15.657375
-      parent: 104
-  - uid: 2419
-    components:
-    - type: Transform
-      pos: 20.5,-15.5
-      parent: 104
-  - uid: 2420
-    components:
-    - type: Transform
-      pos: 20.5,-15.5
-      parent: 104
-- proto: SignalTrigger
-  entities:
-  - uid: 1330
-    components:
-    - type: Transform
-      pos: 3.6284866,-16.955233
-      parent: 104
-  - uid: 1331
-    components:
-    - type: Transform
-      pos: 3.3003616,-17.06472
-      parent: 104
-- proto: SignDirectionalBar
-  entities:
-  - uid: 2297
-    components:
-    - type: Transform
-      pos: -1.5,-4.5
-      parent: 104
-- proto: SignEscapePods
-  entities:
-  - uid: 1737
-    components:
-    - type: MetaData
-      desc: steel rain babey
-      name: drop pod sign
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 16.5,-8.5
-      parent: 104
-- proto: SignMedical
-  entities:
-  - uid: 351
-    components:
-    - type: Transform
-      pos: 4.5,-9.5
-      parent: 104
-- proto: SignSurgery
-  entities:
-  - uid: 266
-    components:
-    - type: Transform
-      pos: 2.5,-12.5
-      parent: 104
-- proto: SignToxins2
-  entities:
-  - uid: 1318
-    components:
-    - type: Transform
-      pos: 8.5,-15.5
-      parent: 104
-- proto: SinkStemlessWater
-  entities:
-  - uid: 22
-    components:
-    - type: Transform
-      pos: 15.5,-1.5
-      parent: 104
-- proto: SinkWide
-  entities:
-  - uid: 144
-    components:
-    - type: Transform
-      pos: 9.5,0.5
-      parent: 104
-  - uid: 145
-    components:
-    - type: Transform
-      pos: 10.5,0.5
-      parent: 104
-  - uid: 1246
-    components:
-    - type: Transform
-      pos: 9.5,-3.5
-      parent: 104
-  - uid: 1358
-    components:
-    - type: Transform
-      pos: -4.5,-2.5
-      parent: 104
-  - uid: 2311
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-7.5
-      parent: 104
-- proto: SmallLight
-  entities:
-  - uid: 484
-    components:
-    - type: Transform
-      pos: -12.5,7.5
-      parent: 104
-  - uid: 1024
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-6.5
-      parent: 104
-  - uid: 1141
-    components:
-    - type: Transform
-      pos: -13.5,9.5
-      parent: 104
-  - uid: 1766
-    components:
-    - type: Transform
-      pos: 11.5,-16.5
-      parent: 104
-- proto: SMESBasic
-  entities:
-  - uid: 2331
-    components:
-    - type: Transform
-      pos: 21.5,-18.5
-      parent: 104
-  - uid: 2332
-    components:
-    - type: Transform
-      pos: 22.5,-18.5
-      parent: 104
-  - uid: 2333
-    components:
-    - type: Transform
-      pos: 23.5,-18.5
-      parent: 104
-- proto: soda_dispenser
-  entities:
-  - uid: 225
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-8.5
-      parent: 104
-- proto: SpaceVillainArcadeFilled
-  entities:
-  - uid: 1652
-    components:
-    - type: Transform
-      pos: 10.5,-6.5
-      parent: 104
-  - uid: 1653
-    components:
-    - type: Transform
-      pos: 9.5,-6.5
-      parent: 104
-- proto: SpawnMobLizard
-  entities:
-  - uid: 2473
-    components:
-    - type: Transform
-      pos: 5.5,-1.5
-      parent: 104
-- proto: SpawnPointNukies
-  entities:
-  - uid: 167
-    components:
-    - type: Transform
-      pos: 3.5,-5.5
-      parent: 104
-  - uid: 172
-    components:
-    - type: Transform
-      pos: 3.5,-7.5
-      parent: 104
-  - uid: 173
-    components:
-    - type: Transform
-      pos: 0.5,-5.5
-      parent: 104
-  - uid: 2477
-    components:
-    - type: Transform
-      pos: 4.5,-3.5
-      parent: 104
-  - uid: 2478
-    components:
-    - type: Transform
-      pos: 3.5,-1.5
-      parent: 104
-  - uid: 2479
-    components:
-    - type: Transform
-      pos: 2.5,-1.5
-      parent: 104
-  - uid: 2480
-    components:
-    - type: Transform
-      pos: 1.5,-2.5
-      parent: 104
-- proto: Spear
-  entities:
-  - uid: 3366
-    components:
-    - type: Transform
-      pos: -5.3505287,20.508072
-      parent: 104
-- proto: SprayBottle
-  entities:
-  - uid: 1699
-    components:
-    - type: Transform
-      pos: 14.060668,-16.439913
-      parent: 104
-- proto: StasisBed
-  entities:
-  - uid: 1130
-    components:
-    - type: Transform
-      pos: -2.5,-14.5
-      parent: 104
-- proto: Stool
-  entities:
-  - uid: 156
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-3.5
-      parent: 104
-  - uid: 158
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-2.5
-      parent: 104
-  - uid: 164
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-3.5
-      parent: 104
-  - uid: 166
-    components:
-    - type: Transform
-      pos: 2.5,-1.5
-      parent: 104
-  - uid: 169
-    components:
-    - type: Transform
-      pos: 3.5,-1.5
-      parent: 104
-  - uid: 194
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,-13.5
-      parent: 104
-  - uid: 195
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 12.5,-14.5
-      parent: 104
-  - uid: 200
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,-14.5
-      parent: 104
-  - uid: 507
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 11.5,-1.5
-      parent: 104
-  - uid: 1334
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 12.5,-1.5
-      parent: 104
-  - uid: 1369
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 14.5,-13.5
-      parent: 104
-  - uid: 1371
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 12.5,-13.5
-      parent: 104
-  - uid: 1372
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 14.5,-14.5
-      parent: 104
-- proto: StoolBar
-  entities:
-  - uid: 1
-    components:
-    - type: Transform
-      pos: -0.5,-5.5
-      parent: 104
-  - uid: 2
-    components:
-    - type: Transform
-      pos: 3.5,-5.5
-      parent: 104
-  - uid: 3
-    components:
-    - type: Transform
-      pos: 0.5,-5.5
-      parent: 104
-  - uid: 4
-    components:
-    - type: Transform
-      pos: 1.5,-5.5
-      parent: 104
-  - uid: 5
-    components:
-    - type: Transform
-      pos: 2.5,-5.5
-      parent: 104
-  - uid: 6
-    components:
-    - type: Transform
-      pos: 4.5,-5.5
-      parent: 104
-- proto: SubstationBasic
-  entities:
-  - uid: 2366
-    components:
-    - type: Transform
-      pos: 27.5,-13.5
-      parent: 104
-- proto: SurveillanceCameraGeneral
-  entities:
-  - uid: 85
-    components:
-    - type: Transform
-      pos: 1.5,-8.5
-      parent: 104
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
-      nameSet: True
-      id: Bar
-  - uid: 1144
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -6.5,-16.5
-      parent: 104
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
-      nameSet: True
-      id: Dock
-  - uid: 1185
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -10.5,7.5
-      parent: 104
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
-      nameSet: True
-      id: Surveillance Shack
-  - uid: 1268
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 15.5,-12.5
-      parent: 104
-  - uid: 1269
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-12.5
-      parent: 104
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
-      nameSet: True
-      id: Medbay
-  - uid: 1270
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-12.5
-      parent: 104
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
-      nameSet: True
-      id: Chem and Bombs
-  - uid: 1272
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 13.5,-0.5
-      parent: 104
-  - uid: 1274
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-2.5
-      parent: 104
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
-      nameSet: True
-      id: Entrance
-  - uid: 1320
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 11.5,-4.5
-      parent: 104
-  - uid: 1321
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 14.5,-3.5
-      parent: 104
-- proto: SurveillanceCameraRouterGeneral
-  entities:
-  - uid: 620
-    components:
-    - type: Transform
-      pos: -15.5,9.5
-      parent: 104
-- proto: SurveillanceCameraWirelessRouterEntertainment
-  entities:
-  - uid: 978
-    components:
-    - type: Transform
-      pos: -15.5,8.5
-      parent: 104
-- proto: SurveillanceWirelessCameraAnchoredEntertainment
-  entities:
-  - uid: 1023
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,21.5
-      parent: 104
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraEntertainment
-      nameSet: True
-      id: Weeh
-- proto: SyndicatePersonalAI
-  entities:
-  - uid: 160
-    components:
-    - type: Transform
-      pos: 1.4711013,-3.6405277
-      parent: 104
-- proto: SyndieFlag
-  entities:
-  - uid: 819
-    components:
-    - type: Transform
-      pos: 11.5,-9.5
-      parent: 104
-- proto: SyndieHandyFlag
-  entities:
-  - uid: 1810
-    components:
-    - type: Transform
-      pos: 3.5076954,-6.413422
-      parent: 104
-- proto: SyringeInaprovaline
-  entities:
-  - uid: 1151
-    components:
-    - type: Transform
-      pos: -2.530845,-12.414692
-      parent: 104
-- proto: Table
-  entities:
-  - uid: 16
-    components:
-    - type: Transform
-      pos: 12.5,-6.5
-      parent: 104
-  - uid: 107
-    components:
-    - type: Transform
-      pos: 7.5,-4.5
-      parent: 104
-  - uid: 1090
-    components:
-    - type: Transform
-      pos: 7.5,-11.5
-      parent: 104
-  - uid: 1193
-    components:
-    - type: Transform
-      pos: 7.5,-12.5
-      parent: 104
-  - uid: 1300
-    components:
-    - type: Transform
-      pos: 7.5,-10.5
-      parent: 104
-  - uid: 1813
-    components:
-    - type: Transform
-      pos: 12.5,-16.5
-      parent: 104
-  - uid: 1814
-    components:
-    - type: Transform
-      pos: 13.5,-16.5
-      parent: 104
-  - uid: 1815
-    components:
-    - type: Transform
-      pos: 14.5,-16.5
-      parent: 104
-  - uid: 1859
-    components:
-    - type: Transform
-      pos: 14.5,-17.5
-      parent: 104
-  - uid: 2321
-    components:
-    - type: Transform
-      pos: 13.5,-6.5
-      parent: 104
-- proto: TableCarpet
-  entities:
-  - uid: 9
-    components:
-    - type: Transform
-      pos: 13.5,-8.5
-      parent: 104
-- proto: TableGlass
-  entities:
-  - uid: 980
-    components:
-    - type: Transform
-      pos: -2.5,-16.5
-      parent: 104
-  - uid: 1125
-    components:
-    - type: Transform
-      pos: -2.5,-12.5
-      parent: 104
-  - uid: 2090
-    components:
-    - type: Transform
-      pos: 0.5,-16.5
-      parent: 104
-  - uid: 2092
-    components:
-    - type: Transform
-      pos: 0.5,-12.5
-      parent: 104
-- proto: TablePlasmaGlass
-  entities:
-  - uid: 2411
-    components:
-    - type: Transform
-      pos: 20.5,-16.5
-      parent: 104
-  - uid: 2412
-    components:
-    - type: Transform
-      pos: 20.5,-15.5
-      parent: 104
-  - uid: 2413
-    components:
-    - type: Transform
-      pos: 24.5,-16.5
-      parent: 104
-  - uid: 2414
-    components:
-    - type: Transform
-      pos: 24.5,-15.5
-      parent: 104
-  - uid: 2431
-    components:
-    - type: Transform
-      pos: 17.5,-16.5
-      parent: 104
-  - uid: 2432
-    components:
-    - type: Transform
-      pos: 17.5,-15.5
-      parent: 104
-  - uid: 2433
-    components:
-    - type: Transform
-      pos: 27.5,-16.5
-      parent: 104
-  - uid: 2434
-    components:
-    - type: Transform
-      pos: 27.5,-15.5
-      parent: 104
-- proto: TableReinforced
-  entities:
-  - uid: 201
-    components:
-    - type: Transform
-      pos: 13.5,-10.5
-      parent: 104
-  - uid: 202
-    components:
-    - type: Transform
-      pos: 12.5,-10.5
-      parent: 104
-  - uid: 203
-    components:
-    - type: Transform
-      pos: 14.5,-10.5
-      parent: 104
-  - uid: 208
-    components:
-    - type: Transform
-      pos: 11.5,-10.5
-      parent: 104
-  - uid: 226
-    components:
-    - type: Transform
-      pos: 5.5,10.5
-      parent: 104
-  - uid: 229
-    components:
-    - type: Transform
-      pos: 5.5,11.5
-      parent: 104
-  - uid: 239
-    components:
-    - type: Transform
-      pos: 5.5,13.5
-      parent: 104
-  - uid: 241
-    components:
-    - type: Transform
-      pos: 5.5,14.5
-      parent: 104
-  - uid: 285
-    components:
-    - type: Transform
-      pos: 5.5,12.5
-      parent: 104
-  - uid: 697
-    components:
-    - type: Transform
-      pos: -13.5,5.5
-      parent: 104
-  - uid: 1129
-    components:
-    - type: Transform
-      pos: -14.5,9.5
-      parent: 104
-  - uid: 1149
-    components:
-    - type: Transform
-      pos: -13.5,9.5
-      parent: 104
-- proto: TableReinforcedGlass
-  entities:
-  - uid: 838
-    components:
-    - type: Transform
-      pos: 5.5,-17.5
-      parent: 104
-  - uid: 975
-    components:
-    - type: Transform
-      pos: 4.5,-17.5
-      parent: 104
-  - uid: 976
-    components:
-    - type: Transform
-      pos: 3.5,-17.5
-      parent: 104
-  - uid: 1192
-    components:
-    - type: Transform
-      pos: 3.5,-16.5
-      parent: 104
-  - uid: 1351
-    components:
-    - type: Transform
-      pos: 3.5,-15.5
-      parent: 104
-  - uid: 1739
-    components:
-    - type: Transform
-      pos: 5.5,-12.5
-      parent: 104
-  - uid: 2016
-    components:
-    - type: Transform
-      pos: 4.5,-12.5
-      parent: 104
-  - uid: 2022
-    components:
-    - type: Transform
-      pos: 3.5,-10.5
-      parent: 104
-  - uid: 2027
-    components:
-    - type: Transform
-      pos: 3.5,-11.5
-      parent: 104
-  - uid: 2028
-    components:
-    - type: Transform
-      pos: 3.5,-12.5
-      parent: 104
-- proto: TableWood
-  entities:
-  - uid: 8
-    components:
-    - type: Transform
-      pos: 3.5,-3.5
-      parent: 104
-  - uid: 28
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-8.5
-      parent: 104
-  - uid: 30
-    components:
-    - type: Transform
-      pos: 3.5,-8.5
-      parent: 104
-  - uid: 31
-    components:
-    - type: Transform
-      pos: 4.5,-8.5
-      parent: 104
-  - uid: 32
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-6.5
-      parent: 104
-  - uid: 33
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-6.5
-      parent: 104
-  - uid: 34
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-6.5
-      parent: 104
-  - uid: 35
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-6.5
-      parent: 104
-  - uid: 36
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-6.5
-      parent: 104
-  - uid: 37
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-6.5
-      parent: 104
-  - uid: 159
-    components:
-    - type: Transform
-      pos: 2.5,-3.5
-      parent: 104
-  - uid: 162
-    components:
-    - type: Transform
-      pos: 2.5,-2.5
-      parent: 104
-  - uid: 355
-    components:
-    - type: Transform
-      pos: 3.5,-2.5
-      parent: 104
-- proto: TargetClown
-  entities:
-  - uid: 1291
-    components:
-    - type: Transform
-      pos: 0.5,12.5
-      parent: 104
-- proto: TargetHuman
-  entities:
-  - uid: 1293
-    components:
-    - type: Transform
-      pos: 0.5,14.5
-      parent: 104
-  - uid: 2308
-    components:
-    - type: Transform
-      pos: 12.5,-21.5
-      parent: 104
-- proto: TargetStrange
-  entities:
-  - uid: 1294
-    components:
-    - type: Transform
-      pos: 0.5,10.5
-      parent: 104
-- proto: TearGasGrenade
-  entities:
-  - uid: 306
-    components:
-    - type: Transform
-      pos: 14.638793,-16.908663
-      parent: 104
-  - uid: 1703
-    components:
-    - type: Transform
-      pos: 14.341918,-16.877413
-      parent: 104
-- proto: Telecrystal1
-  entities:
-  - uid: 2474
-    components:
-    - type: Transform
-      pos: 2.9398513,-3.4842777
-      parent: 104
-- proto: TimerTrigger
-  entities:
-  - uid: 1225
-    components:
-    - type: Transform
-      pos: 3.7048721,-16.445147
-      parent: 104
-  - uid: 1329
-    components:
-    - type: Transform
-      pos: 3.3003616,-16.470352
-      parent: 104
-- proto: ToiletEmpty
-  entities:
-  - uid: 293
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 15.5,-1.5
-      parent: 104
-- proto: ToolboxElectricalFilled
-  entities:
-  - uid: 206
-    components:
-    - type: Transform
-      pos: 13.241143,-10.4236145
-      parent: 104
-- proto: ToolboxEmergencyFilled
-  entities:
-  - uid: 1368
-    components:
-    - type: Transform
-      pos: -2.4700382,-4.362167
-      parent: 104
-- proto: ToolboxSyndicateFilled
-  entities:
-  - uid: 205
-    components:
-    - type: Transform
-      pos: 12.366143,-10.392332
-      parent: 104
-- proto: ToyFigurineCaptain
-  entities:
-  - uid: 2470
-    components:
-    - type: Transform
-      pos: 2.5657434,-3.260709
-      parent: 104
-- proto: ToyFigurineNukie
-  entities:
-  - uid: 14
-    components:
-    - type: Transform
-      pos: 3.4242263,-2.6717777
-      parent: 104
-  - uid: 161
-    components:
-    - type: Transform
-      pos: 3.5492263,-2.4374027
-      parent: 104
-  - uid: 2468
-    components:
-    - type: Transform
-      pos: 3.6429763,-2.6717777
-      parent: 104
-- proto: ToyFigurineNukieCommander
-  entities:
-  - uid: 2471
-    components:
-    - type: Transform
-      pos: 3.1898513,-2.9530277
-      parent: 104
-- proto: ToyFigurineNukieElite
-  entities:
-  - uid: 2467
-    components:
-    - type: Transform
-      pos: 3.1117263,-2.6874027
-      parent: 104
-- proto: ToyMauler
-  entities:
-  - uid: 2469
-    components:
-    - type: Transform
-      pos: 3.0179763,-2.3124027
-      parent: 104
-- proto: ToyNuke
-  entities:
-  - uid: 26
-    components:
-    - type: Transform
-      pos: 4.4214306,-6.3946886
-      parent: 104
-  - uid: 284
-    components:
-    - type: Transform
-      pos: 12.453509,14.985125
-      parent: 104
-- proto: ToySkeleton
-  entities:
-  - uid: 17
-    components:
-    - type: Transform
-      pos: 3.5882664,-8.344303
-      parent: 104
-- proto: VariantCubeBox
-  entities:
-  - uid: 1826
-    components:
-    - type: Transform
-      pos: 14.485744,-16.427467
-      parent: 104
-- proto: VendingMachineBooze
-  entities:
-  - uid: 1380
-    components:
-    - type: Transform
-      pos: -0.5,-8.5
-      parent: 104
-- proto: VendingMachineChang
-  entities:
-  - uid: 1208
-    components:
-    - type: Transform
-      pos: -10.5,7.5
-      parent: 104
-- proto: VendingMachineChemicalsSyndicate
-  entities:
-  - uid: 1335
-    components:
-    - type: Transform
-      pos: 4.5,-10.5
-      parent: 104
-- proto: VendingMachineCigs
-  entities:
-  - uid: 117
-    components:
-    - type: MetaData
-      name: cigarette machine
-    - type: Transform
-      pos: 7.5,0.5
-      parent: 104
-- proto: VendingMachineClothing
-  entities:
-  - uid: 1617
-    components:
-    - type: Transform
-      pos: 13.5,0.5
-      parent: 104
-- proto: VendingMachineCola
-  entities:
-  - uid: 116
-    components:
-    - type: Transform
-      pos: 5.5,0.5
-      parent: 104
-  - uid: 1244
-    components:
-    - type: Transform
-      pos: -9.5,7.5
-      parent: 104
-- proto: VendingMachineSnack
-  entities:
-  - uid: 2442
-    components:
-    - type: Transform
-      pos: 6.5,0.5
-      parent: 104
-- proto: VendingMachineSyndieDrobe
-  entities:
-  - uid: 1299
-    components:
-    - type: Transform
-      pos: 11.5,0.5
-      parent: 104
-- proto: VendingMachineTheater
-  entities:
-  - uid: 1680
-    components:
-    - type: Transform
-      pos: 12.5,0.5
-      parent: 104
-- proto: VendingMachineYouTool
-  entities:
-  - uid: 204
-    components:
-    - type: Transform
-      pos: 15.5,-10.5
-      parent: 104
-- proto: WallIce
-  entities:
-  - uid: 236
-    components:
-    - type: Transform
-      pos: -0.5,12.5
-      parent: 104
-  - uid: 356
-    components:
-    - type: Transform
-      pos: -6.5,21.5
-      parent: 104
-  - uid: 357
-    components:
-    - type: Transform
-      pos: -3.5,21.5
-      parent: 104
-  - uid: 416
-    components:
-    - type: Transform
-      pos: -4.5,21.5
-      parent: 104
-  - uid: 727
-    components:
-    - type: Transform
-      pos: -6.5,19.5
-      parent: 104
-  - uid: 1132
-    components:
-    - type: Transform
-      pos: -4.5,22.5
-      parent: 104
-  - uid: 1133
-    components:
-    - type: Transform
-      pos: -5.5,22.5
-      parent: 104
-  - uid: 1134
-    components:
-    - type: Transform
-      pos: -6.5,22.5
-      parent: 104
-  - uid: 1221
-    components:
-    - type: Transform
-      pos: -6.5,20.5
-      parent: 104
-  - uid: 1549
-    components:
-    - type: Transform
-      pos: -0.5,10.5
-      parent: 104
-  - uid: 1670
-    components:
-    - type: Transform
-      pos: -0.5,14.5
-      parent: 104
-- proto: WallmountTelevision
-  entities:
-  - uid: 977
-    components:
-    - type: Transform
-      pos: 6.5,1.5
-      parent: 104
-- proto: WallPlastitanium
-  entities:
-  - uid: 38
-    components:
-    - type: Transform
-      pos: 12.5,-4.5
-      parent: 104
-  - uid: 39
-    components:
-    - type: Transform
-      pos: 12.5,-3.5
-      parent: 104
-  - uid: 40
-    components:
-    - type: Transform
-      pos: 9.5,-5.5
-      parent: 104
-  - uid: 41
-    components:
-    - type: Transform
-      pos: 10.5,-5.5
-      parent: 104
-  - uid: 42
-    components:
-    - type: Transform
-      pos: 11.5,-5.5
-      parent: 104
-  - uid: 43
-    components:
-    - type: Transform
-      pos: 12.5,-5.5
-      parent: 104
-  - uid: 44
-    components:
-    - type: Transform
-      pos: 12.5,-5.5
-      parent: 104
-  - uid: 45
-    components:
-    - type: Transform
-      pos: 16.5,-5.5
-      parent: 104
-  - uid: 46
-    components:
-    - type: Transform
-      pos: 20.5,-2.5
-      parent: 104
-  - uid: 47
-    components:
-    - type: Transform
-      pos: 22.5,-2.5
-      parent: 104
-  - uid: 50
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 17.5,-12.5
-      parent: 104
-  - uid: 51
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 19.5,-12.5
-      parent: 104
-  - uid: 53
-    components:
-    - type: Transform
-      pos: 17.5,-2.5
-      parent: 104
-  - uid: 54
-    components:
-    - type: Transform
-      pos: 18.5,-2.5
-      parent: 104
-  - uid: 57
-    components:
-    - type: Transform
-      pos: 13.5,-5.5
-      parent: 104
-  - uid: 59
-    components:
-    - type: Transform
-      pos: 8.5,-5.5
-      parent: 104
-  - uid: 60
-    components:
-    - type: Transform
-      pos: 8.5,-4.5
-      parent: 104
-  - uid: 61
-    components:
-    - type: Transform
-      pos: 8.5,-3.5
-      parent: 104
-  - uid: 62
-    components:
-    - type: Transform
-      pos: 12.5,-9.5
-      parent: 104
-  - uid: 63
-    components:
-    - type: Transform
-      pos: 11.5,-9.5
-      parent: 104
-  - uid: 64
-    components:
-    - type: Transform
-      pos: 10.5,-9.5
-      parent: 104
-  - uid: 66
-    components:
-    - type: Transform
-      pos: 8.5,-1.5
-      parent: 104
-  - uid: 67
-    components:
-    - type: Transform
-      pos: 8.5,-2.5
-      parent: 104
-  - uid: 68
-    components:
-    - type: Transform
-      pos: 9.5,-2.5
-      parent: 104
-  - uid: 69
-    components:
-    - type: Transform
-      pos: 11.5,-2.5
-      parent: 104
-  - uid: 70
-    components:
-    - type: Transform
-      pos: 14.5,1.5
-      parent: 104
-  - uid: 71
-    components:
-    - type: Transform
-      pos: 13.5,1.5
-      parent: 104
-  - uid: 72
-    components:
-    - type: Transform
-      pos: 12.5,1.5
-      parent: 104
-  - uid: 74
-    components:
-    - type: Transform
-      pos: 10.5,1.5
-      parent: 104
-  - uid: 75
-    components:
-    - type: Transform
-      pos: 9.5,1.5
-      parent: 104
-  - uid: 76
-    components:
-    - type: Transform
-      pos: 8.5,0.5
-      parent: 104
-  - uid: 77
-    components:
-    - type: Transform
-      pos: 8.5,1.5
-      parent: 104
-  - uid: 78
-    components:
-    - type: Transform
-      pos: 7.5,1.5
-      parent: 104
-  - uid: 79
-    components:
-    - type: Transform
-      pos: 8.5,-11.5
-      parent: 104
-  - uid: 80
-    components:
-    - type: Transform
-      pos: 8.5,-9.5
-      parent: 104
-  - uid: 82
-    components:
-    - type: Transform
-      pos: 1.5,-9.5
-      parent: 104
-  - uid: 83
-    components:
-    - type: Transform
-      pos: 0.5,-9.5
-      parent: 104
-  - uid: 84
-    components:
-    - type: Transform
-      pos: -0.5,-9.5
-      parent: 104
-  - uid: 86
-    components:
-    - type: Transform
-      pos: 2.5,-9.5
-      parent: 104
-  - uid: 87
-    components:
-    - type: Transform
-      pos: 3.5,-9.5
-      parent: 104
-  - uid: 88
-    components:
-    - type: Transform
-      pos: 4.5,-9.5
-      parent: 104
-  - uid: 90
-    components:
-    - type: Transform
-      pos: -1.5,-8.5
-      parent: 104
-  - uid: 91
-    components:
-    - type: Transform
-      pos: -1.5,-7.5
-      parent: 104
-  - uid: 92
-    components:
-    - type: Transform
-      pos: -1.5,-6.5
-      parent: 104
-  - uid: 93
-    components:
-    - type: Transform
-      pos: -1.5,-5.5
-      parent: 104
-  - uid: 94
-    components:
-    - type: Transform
-      pos: -1.5,-1.5
-      parent: 104
-  - uid: 97
-    components:
-    - type: Transform
-      pos: 6.5,1.5
-      parent: 104
-  - uid: 98
-    components:
-    - type: Transform
-      pos: 5.5,1.5
-      parent: 104
-  - uid: 101
-    components:
-    - type: Transform
-      pos: -0.5,0.5
-      parent: 104
-  - uid: 102
-    components:
-    - type: Transform
-      pos: -0.5,1.5
-      parent: 104
-  - uid: 105
-    components:
-    - type: Transform
-      pos: -1.5,0.5
-      parent: 104
-  - uid: 106
-    components:
-    - type: Transform
-      pos: 14.5,0.5
-      parent: 104
-  - uid: 110
-    components:
-    - type: Transform
-      pos: 12.5,-2.5
-      parent: 104
-  - uid: 113
-    components:
-    - type: Transform
-      pos: 8.5,-10.5
-      parent: 104
-  - uid: 114
-    components:
-    - type: Transform
-      pos: 16.5,-1.5
-      parent: 104
-  - uid: 119
-    components:
-    - type: Transform
-      pos: 24.5,-2.5
-      parent: 104
-  - uid: 121
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 18.5,-12.5
-      parent: 104
-  - uid: 123
-    components:
-    - type: Transform
-      pos: 21.5,-2.5
-      parent: 104
-  - uid: 124
-    components:
-    - type: Transform
-      pos: 19.5,-2.5
-      parent: 104
-  - uid: 125
-    components:
-    - type: Transform
-      pos: 16.5,-3.5
-      parent: 104
-  - uid: 126
-    components:
-    - type: Transform
-      pos: 16.5,-4.5
-      parent: 104
-  - uid: 132
-    components:
-    - type: Transform
-      pos: 23.5,-2.5
-      parent: 104
-  - uid: 133
-    components:
-    - type: Transform
-      pos: 1.5,1.5
-      parent: 104
-  - uid: 137
-    components:
-    - type: Transform
-      pos: 8.5,-12.5
-      parent: 104
-  - uid: 168
-    components:
-    - type: Transform
-      pos: 14.5,-9.5
-      parent: 104
-  - uid: 171
-    components:
-    - type: Transform
-      pos: 13.5,-9.5
-      parent: 104
-  - uid: 174
-    components:
-    - type: Transform
-      pos: 15.5,-9.5
-      parent: 104
-  - uid: 175
-    components:
-    - type: Transform
-      pos: 16.5,-9.5
-      parent: 104
-  - uid: 176
-    components:
-    - type: Transform
-      pos: 15.5,-5.5
-      parent: 104
-  - uid: 177
-    components:
-    - type: Transform
-      pos: 8.5,-13.5
-      parent: 104
-  - uid: 179
-    components:
-    - type: Transform
-      pos: 8.5,-14.5
-      parent: 104
-  - uid: 180
-    components:
-    - type: Transform
-      pos: 8.5,-15.5
-      parent: 104
-  - uid: 181
-    components:
-    - type: Transform
-      pos: 9.5,-15.5
-      parent: 104
-  - uid: 182
-    components:
-    - type: Transform
-      pos: 10.5,-15.5
-      parent: 104
-  - uid: 183
-    components:
-    - type: Transform
-      pos: 11.5,-15.5
-      parent: 104
-  - uid: 184
-    components:
-    - type: Transform
-      pos: 12.5,-15.5
-      parent: 104
-  - uid: 185
-    components:
-    - type: Transform
-      pos: 13.5,-15.5
-      parent: 104
-  - uid: 186
-    components:
-    - type: Transform
-      pos: 14.5,-15.5
-      parent: 104
-  - uid: 187
-    components:
-    - type: Transform
-      pos: 15.5,-15.5
-      parent: 104
-  - uid: 188
-    components:
-    - type: Transform
-      pos: 16.5,-15.5
-      parent: 104
-  - uid: 189
-    components:
-    - type: Transform
-      pos: 16.5,-14.5
-      parent: 104
-  - uid: 191
-    components:
-    - type: Transform
-      pos: 16.5,-12.5
-      parent: 104
-  - uid: 192
-    components:
-    - type: Transform
-      pos: 16.5,-11.5
-      parent: 104
-  - uid: 193
-    components:
-    - type: Transform
-      pos: 16.5,-10.5
-      parent: 104
-  - uid: 199
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-17.5
-      parent: 104
-  - uid: 215
-    components:
-    - type: Transform
-      pos: 16.5,-0.5
-      parent: 104
-  - uid: 242
-    components:
-    - type: Transform
-      pos: -4.5,-5.5
-      parent: 104
-  - uid: 252
-    components:
-    - type: Transform
-      pos: -3.5,-15.5
-      parent: 104
-  - uid: 288
-    components:
-    - type: Transform
-      pos: 14.5,-0.5
-      parent: 104
-  - uid: 290
-    components:
-    - type: Transform
-      pos: 15.5,-0.5
-      parent: 104
-  - uid: 298
-    components:
-    - type: Transform
-      pos: 13.5,-2.5
-      parent: 104
-  - uid: 299
-    components:
-    - type: Transform
-      pos: 14.5,-2.5
-      parent: 104
-  - uid: 300
-    components:
-    - type: Transform
-      pos: 15.5,-2.5
-      parent: 104
-  - uid: 301
-    components:
-    - type: Transform
-      pos: 16.5,-2.5
-      parent: 104
-  - uid: 307
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 23.5,-8.5
-      parent: 104
-  - uid: 308
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 19.5,-10.5
-      parent: 104
-  - uid: 309
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 25.5,-11.5
-      parent: 104
-  - uid: 310
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 25.5,-12.5
-      parent: 104
-  - uid: 311
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 24.5,-12.5
-      parent: 104
-  - uid: 312
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 21.5,-12.5
-      parent: 104
-  - uid: 313
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 23.5,-12.5
-      parent: 104
-  - uid: 314
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 22.5,-12.5
-      parent: 104
-  - uid: 315
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 20.5,-12.5
-      parent: 104
-  - uid: 316
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 23.5,-6.5
-      parent: 104
-  - uid: 317
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 21.5,-4.5
-      parent: 104
-  - uid: 318
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 17.5,-6.5
-      parent: 104
-  - uid: 319
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 19.5,-4.5
-      parent: 104
-  - uid: 320
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 17.5,-8.5
-      parent: 104
-  - uid: 321
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 21.5,-10.5
-      parent: 104
-  - uid: 322
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 20.5,-7.5
-      parent: 104
-  - uid: 339
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 25.5,-10.5
-      parent: 104
-  - uid: 340
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 25.5,-9.5
-      parent: 104
-  - uid: 341
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 25.5,-8.5
-      parent: 104
-  - uid: 342
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 25.5,-7.5
-      parent: 104
-  - uid: 343
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 25.5,-6.5
-      parent: 104
-  - uid: 344
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 25.5,-5.5
-      parent: 104
-  - uid: 345
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 25.5,-4.5
-      parent: 104
-  - uid: 346
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 25.5,-3.5
-      parent: 104
-  - uid: 347
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 25.5,-2.5
-      parent: 104
-  - uid: 378
-    components:
-    - type: Transform
-      pos: -3.5,-16.5
-      parent: 104
-  - uid: 379
-    components:
-    - type: Transform
-      pos: -3.5,-13.5
-      parent: 104
-  - uid: 380
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-11.5
-      parent: 104
-  - uid: 418
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -12.5,8.5
-      parent: 104
-  - uid: 424
-    components:
-    - type: Transform
-      pos: -10.5,8.5
-      parent: 104
-  - uid: 427
-    components:
-    - type: Transform
-      pos: -1.5,-9.5
-      parent: 104
-  - uid: 441
-    components:
-    - type: Transform
-      pos: -2.5,-1.5
-      parent: 104
-  - uid: 443
-    components:
-    - type: Transform
-      pos: -3.5,-1.5
-      parent: 104
-  - uid: 462
-    components:
-    - type: Transform
-      pos: -5.5,-5.5
-      parent: 104
-  - uid: 463
-    components:
-    - type: Transform
-      pos: -4.5,-1.5
-      parent: 104
-  - uid: 474
-    components:
-    - type: Transform
-      pos: -5.5,-1.5
-      parent: 104
-  - uid: 482
-    components:
-    - type: Transform
-      pos: -9.5,8.5
-      parent: 104
-  - uid: 486
-    components:
-    - type: Transform
-      pos: -16.5,8.5
-      parent: 104
-  - uid: 493
-    components:
-    - type: Transform
-      pos: -3.5,-12.5
-      parent: 104
-  - uid: 495
-    components:
-    - type: Transform
-      pos: -2.5,-5.5
-      parent: 104
-  - uid: 497
-    components:
-    - type: Transform
-      pos: -2.5,-17.5
-      parent: 104
-  - uid: 591
-    components:
-    - type: Transform
-      pos: 15.5,-23.5
-      parent: 104
-  - uid: 592
-    components:
-    - type: Transform
-      pos: 9.5,-20.5
-      parent: 104
-  - uid: 593
-    components:
-    - type: Transform
-      pos: 9.5,-22.5
-      parent: 104
-  - uid: 594
-    components:
-    - type: Transform
-      pos: 9.5,-18.5
-      parent: 104
-  - uid: 611
-    components:
-    - type: Transform
-      pos: -5.5,-6.5
-      parent: 104
-  - uid: 613
-    components:
-    - type: Transform
-      pos: -13.5,19.5
-      parent: 104
-  - uid: 623
-    components:
-    - type: Transform
-      pos: -17.5,19.5
-      parent: 104
-  - uid: 651
-    components:
-    - type: Transform
-      pos: -17.5,23.5
-      parent: 104
-  - uid: 671
-    components:
-    - type: Transform
-      pos: -12.5,24.5
-      parent: 104
-  - uid: 675
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -12.5,9.5
-      parent: 104
-  - uid: 683
-    components:
-    - type: Transform
-      pos: -15.5,10.5
-      parent: 104
-  - uid: 698
-    components:
-    - type: Transform
-      pos: -14.5,10.5
-      parent: 104
-  - uid: 710
-    components:
-    - type: Transform
-      pos: -13.5,10.5
-      parent: 104
-  - uid: 730
-    components:
-    - type: Transform
-      pos: -12.5,10.5
-      parent: 104
-  - uid: 731
-    components:
-    - type: Transform
-      pos: -12.5,22.5
-      parent: 104
-  - uid: 732
-    components:
-    - type: Transform
-      pos: -15.5,19.5
-      parent: 104
-  - uid: 739
-    components:
-    - type: Transform
-      pos: -17.5,21.5
-      parent: 104
-  - uid: 743
-    components:
-    - type: Transform
-      pos: -16.5,9.5
-      parent: 104
-  - uid: 744
-    components:
-    - type: Transform
-      pos: -16.5,7.5
-      parent: 104
-  - uid: 750
-    components:
-    - type: Transform
-      pos: -3.5,-14.5
-      parent: 104
-  - uid: 767
-    components:
-    - type: Transform
-      pos: -16.5,10.5
-      parent: 104
-  - uid: 773
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-11.5
-      parent: 104
-  - uid: 1025
-    components:
-    - type: Transform
-      pos: 3.5,-18.5
-      parent: 104
-  - uid: 1026
-    components:
-    - type: Transform
-      pos: 4.5,-18.5
-      parent: 104
-  - uid: 1091
-    components:
-    - type: Transform
-      pos: -5.5,-2.5
-      parent: 104
-  - uid: 1104
-    components:
-    - type: Transform
-      pos: 9.5,-19.5
-      parent: 104
-  - uid: 1110
-    components:
-    - type: Transform
-      pos: -5.5,-4.5
-      parent: 104
-  - uid: 1123
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-11.5
-      parent: 104
-  - uid: 1126
-    components:
-    - type: Transform
-      pos: -17.5,22.5
-      parent: 104
-  - uid: 1128
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -11.5,8.5
-      parent: 104
-  - uid: 1136
-    components:
-    - type: Transform
-      pos: -11.5,5.5
-      parent: 104
-  - uid: 1137
-    components:
-    - type: Transform
-      pos: -15.5,7.5
-      parent: 104
-  - uid: 1138
-    components:
-    - type: Transform
-      pos: -15.5,6.5
-      parent: 104
-  - uid: 1139
-    components:
-    - type: Transform
-      pos: -15.5,5.5
-      parent: 104
-  - uid: 1147
-    components:
-    - type: Transform
-      pos: -11.5,7.5
-      parent: 104
-  - uid: 1181
-    components:
-    - type: Transform
-      pos: 2.5,-16.5
-      parent: 104
-  - uid: 1184
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-11.5
-      parent: 104
-  - uid: 1188
-    components:
-    - type: Transform
-      pos: 2.5,-18.5
-      parent: 104
-  - uid: 1190
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-11.5
-      parent: 104
-  - uid: 1197
-    components:
-    - type: Transform
-      pos: 7.5,-18.5
-      parent: 104
-  - uid: 1199
-    components:
-    - type: Transform
-      pos: 5.5,-18.5
-      parent: 104
-  - uid: 1201
-    components:
-    - type: Transform
-      pos: 6.5,-18.5
-      parent: 104
-  - uid: 1205
-    components:
-    - type: Transform
-      pos: 2.5,-17.5
-      parent: 104
-  - uid: 1206
-    components:
-    - type: Transform
-      pos: 8.5,-18.5
-      parent: 104
-  - uid: 1207
-    components:
-    - type: Transform
-      pos: -17.5,24.5
-      parent: 104
-  - uid: 1209
-    components:
-    - type: Transform
-      pos: -17.5,20.5
-      parent: 104
-  - uid: 1210
-    components:
-    - type: Transform
-      pos: -14.5,19.5
-      parent: 104
-  - uid: 1211
-    components:
-    - type: Transform
-      pos: -12.5,23.5
-      parent: 104
-  - uid: 1212
-    components:
-    - type: Transform
-      pos: -16.5,19.5
-      parent: 104
-  - uid: 1213
-    components:
-    - type: Transform
-      pos: -12.5,19.5
-      parent: 104
-  - uid: 1214
-    components:
-    - type: Transform
-      pos: -16.5,24.5
-      parent: 104
-  - uid: 1215
-    components:
-    - type: Transform
-      pos: -12.5,20.5
-      parent: 104
-  - uid: 1216
-    components:
-    - type: Transform
-      pos: -15.5,24.5
-      parent: 104
-  - uid: 1218
-    components:
-    - type: Transform
-      pos: -14.5,24.5
-      parent: 104
-  - uid: 1219
-    components:
-    - type: Transform
-      pos: -12.5,21.5
-      parent: 104
-  - uid: 1220
-    components:
-    - type: Transform
-      pos: -13.5,24.5
-      parent: 104
-  - uid: 1381
-    components:
-    - type: Transform
-      pos: 16.5,-16.5
-      parent: 104
-  - uid: 1409
-    components:
-    - type: Transform
-      pos: 9.5,-21.5
-      parent: 104
-  - uid: 1411
-    components:
-    - type: Transform
-      pos: 9.5,-23.5
-      parent: 104
-  - uid: 1412
-    components:
-    - type: Transform
-      pos: 15.5,-16.5
-      parent: 104
-  - uid: 1426
-    components:
-    - type: Transform
-      pos: -3.5,-5.5
-      parent: 104
-  - uid: 1783
-    components:
-    - type: Transform
-      pos: -3.5,-11.5
-      parent: 104
-  - uid: 1784
-    components:
-    - type: Transform
-      pos: -3.5,-17.5
-      parent: 104
-  - uid: 1811
-    components:
-    - type: Transform
-      pos: 15.5,-19.5
-      parent: 104
-  - uid: 1833
-    components:
-    - type: Transform
-      pos: 15.5,-17.5
-      parent: 104
-  - uid: 1834
-    components:
-    - type: Transform
-      pos: 15.5,-18.5
-      parent: 104
-  - uid: 1843
-    components:
-    - type: Transform
-      pos: 15.5,-22.5
-      parent: 104
-  - uid: 1850
-    components:
-    - type: Transform
-      pos: 15.5,-21.5
-      parent: 104
-  - uid: 1856
-    components:
-    - type: Transform
-      pos: 15.5,-20.5
-      parent: 104
-  - uid: 1861
-    components:
-    - type: Transform
-      pos: 26.5,-12.5
-      parent: 104
-  - uid: 1862
-    components:
-    - type: Transform
-      pos: 27.5,-12.5
-      parent: 104
-  - uid: 1863
-    components:
-    - type: Transform
-      pos: 28.5,-12.5
-      parent: 104
-  - uid: 1864
-    components:
-    - type: Transform
-      pos: 28.5,-14.5
-      parent: 104
-  - uid: 1866
-    components:
-    - type: Transform
-      pos: 28.5,-13.5
-      parent: 104
-  - uid: 1871
-    components:
-    - type: Transform
-      pos: 28.5,-19.5
-      parent: 104
-  - uid: 1876
-    components:
-    - type: Transform
-      pos: 28.5,-15.5
-      parent: 104
-  - uid: 1881
-    components:
-    - type: Transform
-      pos: 28.5,-16.5
-      parent: 104
-  - uid: 1885
-    components:
-    - type: Transform
-      pos: 28.5,-17.5
-      parent: 104
-  - uid: 1889
-    components:
-    - type: Transform
-      pos: 28.5,-18.5
-      parent: 104
-  - uid: 1893
-    components:
-    - type: Transform
-      pos: 28.5,-20.5
-      parent: 104
-  - uid: 1897
-    components:
-    - type: Transform
-      pos: 27.5,-20.5
-      parent: 104
-  - uid: 1901
-    components:
-    - type: Transform
-      pos: 26.5,-20.5
-      parent: 104
-  - uid: 1905
-    components:
-    - type: Transform
-      pos: 18.5,-20.5
-      parent: 104
-  - uid: 1906
-    components:
-    - type: Transform
-      pos: 17.5,-20.5
-      parent: 104
-  - uid: 1907
-    components:
-    - type: Transform
-      pos: 16.5,-20.5
-      parent: 104
-  - uid: 1908
-    components:
-    - type: Transform
-      pos: 16.5,-19.5
-      parent: 104
-  - uid: 1914
-    components:
-    - type: Transform
-      pos: 25.5,-20.5
-      parent: 104
-  - uid: 1915
-    components:
-    - type: Transform
-      pos: 16.5,-17.5
-      parent: 104
-  - uid: 1943
-    components:
-    - type: Transform
-      pos: 24.5,-20.5
-      parent: 104
-  - uid: 1944
-    components:
-    - type: Transform
-      pos: 16.5,-18.5
-      parent: 104
-  - uid: 1968
-    components:
-    - type: Transform
-      pos: 23.5,-20.5
-      parent: 104
-  - uid: 1969
-    components:
-    - type: Transform
-      pos: 22.5,-20.5
-      parent: 104
-  - uid: 1970
-    components:
-    - type: Transform
-      pos: 21.5,-20.5
-      parent: 104
-  - uid: 1971
-    components:
-    - type: Transform
-      pos: 20.5,-20.5
-      parent: 104
-  - uid: 1972
-    components:
-    - type: Transform
-      pos: 19.5,-20.5
-      parent: 104
-  - uid: 2017
-    components:
-    - type: Transform
-      pos: 2.5,-10.5
-      parent: 104
-  - uid: 2018
-    components:
-    - type: Transform
-      pos: 2.5,-11.5
-      parent: 104
-  - uid: 2019
-    components:
-    - type: Transform
-      pos: 2.5,-12.5
-      parent: 104
-  - uid: 2299
-    components:
-    - type: Transform
-      pos: -1.5,-2.5
-      parent: 104
-  - uid: 2300
-    components:
-    - type: Transform
-      pos: -1.5,-4.5
-      parent: 104
-- proto: WallPlastitaniumDiagonal
-  entities:
-  - uid: 323
-    components:
-    - type: Transform
-      pos: 18.5,-4.5
-      parent: 104
-  - uid: 324
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 22.5,-5.5
-      parent: 104
-  - uid: 325
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 23.5,-9.5
-      parent: 104
-  - uid: 338
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 17.5,-9.5
-      parent: 104
-  - uid: 348
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 18.5,-9.5
-      parent: 104
-  - uid: 650
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 18.5,-10.5
-      parent: 104
-  - uid: 1088
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 18.5,-5.5
-      parent: 104
-  - uid: 1089
-    components:
-    - type: Transform
-      pos: 17.5,-5.5
-      parent: 104
-  - uid: 1119
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 22.5,-10.5
-      parent: 104
-  - uid: 1689
-    components:
-    - type: Transform
-      pos: 22.5,-9.5
-      parent: 104
-  - uid: 1690
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 23.5,-5.5
-      parent: 104
-  - uid: 1697
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 22.5,-4.5
-      parent: 104
-- proto: WaterTankFull
-  entities:
-  - uid: 1547
-    components:
-    - type: Transform
-      pos: 11.5,-4.5
-      parent: 104
-- proto: WeaponPistolCobra
-  entities:
-  - uid: 1705
-    components:
-    - type: Transform
-      pos: 5.4793262,12.166912
-      parent: 104
-- proto: WeaponShotgunSawn
-  entities:
-  - uid: 228
-    components:
-    - type: Transform
-      pos: 5.347948,13.528896
-      parent: 104
-    - type: BallisticAmmoProvider
-      unspawnedCount: 2
-- proto: WeaponSprayNozzle
-  entities:
-  - uid: 152
-    components:
-    - type: Transform
-      pos: 9.67418,-4.571714
-      parent: 104
-- proto: WeaponSubMachineGunC20r
-  entities:
-  - uid: 1704
-    components:
-    - type: Transform
-      pos: 5.497257,12.817707
-      parent: 104
-- proto: WelderIndustrial
-  entities:
-  - uid: 207
-    components:
-    - type: Transform
-      pos: 14.5,-10.5
-      parent: 104
-- proto: Windoor
-  entities:
-  - uid: 27
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-7.5
-      parent: 104
-- proto: WindoorSecure
-  entities:
-  - uid: 1145
-    components:
-    - type: Transform
-      pos: -13.5,5.5
-      parent: 104
-  - uid: 1827
-    components:
-    - type: Transform
-      pos: 10.5,-18.5
-      parent: 104
-- proto: WindowReinforcedDirectional
-  entities:
-  - uid: 766
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-12.5
-      parent: 104
-  - uid: 1135
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-16.5
-      parent: 104
-  - uid: 1217
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 7.5,9.5
-      parent: 104
-  - uid: 1247
-    components:
-    - type: Transform
-      pos: 4.5,-12.5
-      parent: 104
-  - uid: 1370
-    components:
-    - type: Transform
-      pos: 3.5,-12.5
-      parent: 104
-  - uid: 2082
-    components:
-    - type: Transform
-      pos: 7.5,15.5
-      parent: 104
-  - uid: 2182
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-12.5
-      parent: 104
-  - uid: 2258
-    components:
-    - type: Transform
-      pos: 5.5,-12.5
-      parent: 104
-  - uid: 2290
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,9.5
-      parent: 104
-  - uid: 2293
-    components:
-    - type: Transform
-      pos: 5.5,15.5
-      parent: 104
-  - uid: 2294
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-10.5
-      parent: 104
-...
+meta:
+  format: 6
+  postmapinit: false
+tilemap:
+  0: Space
+  14: FloorBar
+  20: FloorCarpetClown
+  29: FloorDark
+  44: FloorFreezer
+  59: FloorIce
+  77: FloorReinforced
+  79: FloorRockVault
+  80: FloorShowroom
+  84: FloorShuttleOrange
+  86: FloorShuttleRed
+  89: FloorSnow
+  91: FloorSteel
+  106: FloorTechMaint
+  110: FloorWhite
+  120: FloorWood
+  123: Lattice
+  124: Plating
+entities:
+- proto: ""
+  entities:
+  - uid: 104
+    components:
+    - type: MetaData
+      name: Syndicate Outpost
+    - type: Transform
+      parent: 1295
+    - type: FTLDestination
+      whitelist:
+        tags:
+        - Syndicate
+    - type: MapGrid
+      chunks:
+        -1,-1:
+          ind: -1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAKWQAAAAAAfAAAAAAAHQAAAAACbgAAAAADbgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHQAAAAABbgAAAAADWwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHQAAAAAAbgAAAAACbgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHQAAAAAAHQAAAAADHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAADWQAAAAAEWQAAAAAAWQAAAAAEfAAAAAAAeAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAeAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAeAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAADgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAADgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAADgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAADgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAIfAAAAAAADgAAAAAB
+          version: 6
+        0,-1:
+          ind: 0,-1
+          tiles: bgAAAAAAbgAAAAADfAAAAAAAbgAAAAAAbgAAAAACbgAAAAACbgAAAAADbgAAAAABHQAAAAAAHQAAAAABHQAAAAABHQAAAAABHQAAAAABHQAAAAAAHQAAAAADHQAAAAACWwAAAAAAbgAAAAADbgAAAAADbgAAAAADbgAAAAACbgAAAAAAbgAAAAADbgAAAAADHQAAAAADVgAAAAAAHQAAAAACVgAAAAAAHQAAAAADVgAAAAAAHQAAAAADHQAAAAADbgAAAAAAbgAAAAACfAAAAAAAbgAAAAADbgAAAAACbgAAAAADbgAAAAACbgAAAAACHQAAAAADVgAAAAAAHQAAAAADVgAAAAAAHQAAAAABVgAAAAAAHQAAAAABHQAAAAAAHQAAAAABHQAAAAADHQAAAAAAWwAAAAADWwAAAAACWwAAAAADbgAAAAADbgAAAAACHQAAAAABHQAAAAAAHQAAAAAAHQAAAAABHQAAAAABHQAAAAABHQAAAAAAHQAAAAADfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAABWwAAAAABWwAAAAACbgAAAAADbgAAAAACDgAAAAACHQAAAAADHQAAAAAAHQAAAAADHQAAAAADHQAAAAACHQAAAAAAHQAAAAADWQAAAAAAWQAAAAAAbgAAAAAAWwAAAAABWwAAAAAAWwAAAAAAbgAAAAACbgAAAAAAWQAAAAAAHQAAAAADHQAAAAADVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAADgAAAAABDgAAAAADDgAAAAACDgAAAAAADgAAAAADfAAAAAAAHQAAAAABfAAAAAAADgAAAAADDgAAAAACDgAAAAAADgAAAAACDgAAAAAAHQAAAAABHQAAAAADHQAAAAABVgAAAAAAVgAAAAAAeAAAAAACeAAAAAACeAAAAAADHQAAAAAAHQAAAAABHQAAAAABHQAAAAAAHQAAAAADHQAAAAACfAAAAAAAHQAAAAACHQAAAAACHQAAAAADHQAAAAABeAAAAAAAeAAAAAACeAAAAAACeAAAAAADeAAAAAADHQAAAAAAHQAAAAAAHQAAAAACHQAAAAAAHQAAAAACHQAAAAACHQAAAAABHQAAAAADHQAAAAABHQAAAAACHQAAAAABeAAAAAAAeAAAAAABeAAAAAAAeAAAAAADeAAAAAADHQAAAAAAHQAAAAAAHQAAAAADHQAAAAAAHQAAAAABHQAAAAADfAAAAAAAHQAAAAACHQAAAAABHQAAAAABHQAAAAACDgAAAAACDgAAAAAADgAAAAACDgAAAAADDgAAAAACDgAAAAABDgAAAAACDgAAAAAADgAAAAAADgAAAAACDgAAAAADDgAAAAAADgAAAAABHQAAAAAAHQAAAAACHQAAAAACDgAAAAAADgAAAAABDgAAAAACDgAAAAAADgAAAAABDgAAAAABDgAAAAADDgAAAAAADgAAAAAALAAAAAAALAAAAAAALAAAAAAADgAAAAACeAAAAAAAeAAAAAADeAAAAAABDgAAAAACDgAAAAACDgAAAAAADgAAAAAADgAAAAADDgAAAAAADgAAAAAAVgAAAAAADgAAAAACLAAAAAAALAAAAAAALAAAAAAADgAAAAADeAAAAAABeAAAAAABeAAAAAADDgAAAAADDgAAAAABDgAAAAADDgAAAAACDgAAAAADDgAAAAAADgAAAAAAVgAAAAAADgAAAAAAUAAAAAAALAAAAAAADgAAAAAADgAAAAACHQAAAAAAHQAAAAACfAAAAAAADgAAAAACDgAAAAACDgAAAAACDgAAAAAADgAAAAADDgAAAAABDgAAAAACVgAAAAAADgAAAAADUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAADgAAAAAADgAAAAADDgAAAAACDgAAAAACDgAAAAACDgAAAAABDgAAAAABDgAAAAAADgAAAAACUAAAAAAAUAAAAAAALAAAAAAAUAAAAAAAUAAAAAAAfAAAAAAAfAAAAAAA
+          version: 6
+        0,0:
+          ind: 0,0
+          tiles: HQAAAAADHQAAAAACHQAAAAACDgAAAAAADgAAAAABDgAAAAABDgAAAAABDgAAAAACDgAAAAADUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfAAAAAAAWQAAAAAGfAAAAAAAfAAAAAAAfAAAAAAAHQAAAAACfAAAAAAADgAAAAAADgAAAAABDgAAAAABDgAAAAACDgAAAAABDgAAAAAADgAAAAACDgAAAAACWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAATwAAAAAAfAAAAAAAWQAAAAAAWQAAAAAHWQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAAfAAAAAAATwAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAATwAAAAAAWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMWQAAAAAAWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAWQAAAAAIWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAIWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAKWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAHWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAGWQAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAMWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAHWQAAAAAAWQAAAAACWQAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAJWQAAAAAAWQAAAAAFTwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAHWQAAAAAHWQAAAAAKWQAAAAAFWQAAAAAAWQAAAAALWQAAAAAA
+          version: 6
+        -1,0:
+          ind: -1,0
+          tiles: ewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMWQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAAWQAAAAAKWQAAAAAIWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAKWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAGHQAAAAADHQAAAAADHQAAAAAAfAAAAAAAHQAAAAAAHQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAALWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAAIfAAAAAAAHQAAAAABHQAAAAACHQAAAAACHQAAAAADHQAAAAACHQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAfAAAAAAAHQAAAAABHQAAAAABWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAALWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAGTwAAAAAAHQAAAAABHQAAAAAAfAAAAAAAfAAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAADWQAAAAAATwAAAAAATwAAAAAATwAAAAAAfAAAAAAAfAAAAAAATwAAAAAATwAAAAAATwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATwAAAAAATwAAAAAATwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMWQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAGWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKTwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAA
+          version: 6
+        1,-1:
+          ind: 1,-1
+          tiles: HQAAAAADHQAAAAADHQAAAAACHQAAAAACHQAAAAAATQAAAAAATQAAAAAATQAAAAAAHQAAAAADHQAAAAACHQAAAAACHQAAAAACfAAAAAAAWQAAAAAAWQAAAAABWQAAAAACHQAAAAADHQAAAAADHQAAAAADHQAAAAAAHQAAAAADTQAAAAAATQAAAAAATQAAAAAAHQAAAAADHQAAAAACHQAAAAADHQAAAAACfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAHQAAAAABHQAAAAADHQAAAAAAHQAAAAABHQAAAAACHQAAAAAAHQAAAAADHQAAAAADHQAAAAAAHQAAAAADHQAAAAABHQAAAAACfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAHQAAAAADHQAAAAAAHQAAAAAAHQAAAAADHQAAAAADHQAAAAABHQAAAAACHQAAAAADHQAAAAADHQAAAAABfAAAAAAAfAAAAAAAfAAAAAAAWQAAAAAMWQAAAAAHWQAAAAAAHQAAAAABHQAAAAAAHQAAAAADHQAAAAABHQAAAAACHQAAAAAAHQAAAAADHQAAAAACHQAAAAACHQAAAAABWQAAAAAAWQAAAAADWQAAAAAAWQAAAAACWQAAAAAAAAAAAAAAHQAAAAAAHQAAAAABHQAAAAABHQAAAAADHQAAAAABHQAAAAABHQAAAAABHQAAAAADHQAAAAABHQAAAAACWQAAAAAFWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAHQAAAAADHQAAAAABVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAHQAAAAACHQAAAAACHQAAAAACWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAACAAAAAAAAfAAAAAAAHQAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAHQAAAAADHQAAAAADHQAAAAACWQAAAAAETwAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAAAAAAAAAHQAAAAAAHQAAAAABVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAHQAAAAACHQAAAAADHQAAAAACWQAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHQAAAAACVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAHQAAAAAAHQAAAAADHQAAAAACWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAfAAAAAAAHQAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAHQAAAAAAHQAAAAABHQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHQAAAAABHQAAAAADHQAAAAAAHQAAAAAAHQAAAAABHQAAAAAAHQAAAAACHQAAAAABHQAAAAABWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHQAAAAABHQAAAAADHQAAAAACHQAAAAACHQAAAAADHQAAAAADHQAAAAACHQAAAAAAHQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAfAAAAAAAfAAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAABHQAAAAADHQAAAAAAHQAAAAABWQAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAGfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAWQAAAAAATwAAAAAAWQAAAAAEWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAA
+          version: 6
+        0,-2:
+          ind: 0,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAALWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAGWQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAWQAAAAAAWQAAAAAHWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAWQAAAAAAWQAAAAAGWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAAAWwAAAAAAWwAAAAABWwAAAAAAWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAWQAAAAAAbgAAAAAAbgAAAAADbgAAAAADbgAAAAADbgAAAAAAfAAAAAAAagAAAAAAWwAAAAACWwAAAAADWwAAAAABWwAAAAABWwAAAAADfAAAAAAAHQAAAAAAHQAAAAABWQAAAAAAbgAAAAABbgAAAAABbgAAAAADbgAAAAADbgAAAAAAagAAAAAAagAAAAAAWwAAAAADWwAAAAAAWwAAAAABWwAAAAABWwAAAAAAfAAAAAAA
+          version: 6
+        -1,-2:
+          ind: -1,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAEWQAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAAWQAAAAAFWQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAGWQAAAAAAWQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAALWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHQAAAAABHQAAAAAAHQAAAAAC
+          version: 6
+        -1,1:
+          ind: -1,1
+          tiles: WQAAAAAIWQAAAAAAWQAAAAALWQAAAAAAWQAAAAADWQAAAAAMWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAGWQAAAAAAWQAAAAAFWQAAAAADWQAAAAAEWQAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAEWQAAAAAHWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAEFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFTwAAAAAATwAAAAAATwAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAWQAAAAAAWQAAAAAKWQAAAAAAWQAAAAACWQAAAAAAWQAAAAADTwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAMWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAALWQAAAAAHWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        0,1:
+          ind: 0,1
+          tiles: WQAAAAAAWQAAAAAEWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAHWQAAAAAAWQAAAAAJWQAAAAAGWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAHWQAAAAAAWQAAAAAAWQAAAAALWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAALWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAMWQAAAAAIWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAGWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAACWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAADWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAA
+          version: 6
+        1,1:
+          ind: 1,1
+          tiles: WQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAAMWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAGWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMWQAAAAAAWQAAAAAAWQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAABWQAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        1,0:
+          ind: 1,0
+          tiles: WQAAAAAATwAAAAAATwAAAAAAWQAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAALWQAAAAALWQAAAAAAWQAAAAAMWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAWQAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAMWQAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAFWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAHAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAEWQAAAAAHWQAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAEWQAAAAAJWQAAAAAAWQAAAAAHWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAHWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAABWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        1,-2:
+          ind: 1,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAABWQAAAAAAWQAAAAAAAAAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAMWQAAAAAAWQAAAAALWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAAMWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAagAAAAAAHQAAAAACHQAAAAADHQAAAAACfAAAAAAAfAAAAAAAfAAAAAAAHQAAAAAAHQAAAAACHQAAAAABagAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJfAAAAAAAagAAAAAAHQAAAAADHQAAAAACHQAAAAADHQAAAAACHQAAAAACHQAAAAADHQAAAAABHQAAAAABHQAAAAABagAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAagAAAAAAHQAAAAAAHQAAAAABHQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHQAAAAACHQAAAAADHQAAAAACagAAAAAAfAAAAAAAWQAAAAALWQAAAAAAWQAAAAAAWQAAAAAEHQAAAAACHQAAAAACHQAAAAABHQAAAAABTQAAAAAATQAAAAAATQAAAAAAHQAAAAABHQAAAAADHQAAAAACHQAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAD
+          version: 6
+        -2,0:
+          ind: -2,0
+          tiles: ewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAHWQAAAAAAWQAAAAABTwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAATwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAETwAAAAAATwAAAAAATwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAALWQAAAAAAWQAAAAALWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAALWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAA
+          version: 6
+        -2,1:
+          ind: -2,1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAFAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAKFAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAFAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAHWQAAAAAKWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAFAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAGWQAAAAAJWQAAAAALWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAFAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAALWQAAAAAIWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAWQAAAAAGFAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAEWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAEWQAAAAAAWQAAAAAMWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAA
+          version: 6
+        -2,-2:
+          ind: -2,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        2,0:
+          ind: 2,0
+          tiles: TwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        2,-1:
+          ind: 2,-1
+          tiles: TwAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATwAAAAAAWQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATwAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATwAAAAAAWQAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        2,-2:
+          ind: 2,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAIWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATwAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -2,2:
+          ind: -2,2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -3,-2:
+          ind: -3,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        0,2:
+          ind: 0,2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAEWQAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        1,2:
+          ind: 1,2
+          tiles: WQAAAAAAWQAAAAAFWQAAAAACWQAAAAAJWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -3,0:
+          ind: -3,0
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+    - type: Broadphase
+    - type: Physics
+      bodyStatus: InAir
+      angularDamping: 0.05
+      linearDamping: 0.05
+      fixedRotation: False
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures: {}
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes:
+        - node:
+            angle: -3.141592653589793 rad
+            color: '#FFFFFFFF'
+            id: Arrows
+          decals:
+            311: 27,-15
+        - node:
+            color: '#FFFFFFFF'
+            id: Arrows
+          decals:
+            309: 18,-19
+            310: 26,-19
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt1
+          decals:
+            368: 26.834131,4.97881
+        - node:
+            color: '#FFFFFFFF'
+            id: Bot
+          decals:
+            295: 21,-16
+            296: 22,-15
+            297: 23,-16
+            302: 22,-17
+            303: 17,-19
+            304: 27,-19
+        - node:
+            color: '#FFFFFFFF'
+            id: BotLeft
+          decals:
+            194: 5,-11
+            195: 4,-11
+            300: 23,-15
+            301: 21,-17
+            305: 27,-18
+            306: 17,-20
+        - node:
+            color: '#FFFFFFFF'
+            id: BotRight
+          decals:
+            298: 23,-17
+            299: 21,-15
+            307: 27,-20
+            308: 17,-18
+        - node:
+            color: '#FFFFFFFF'
+            id: Box
+          decals:
+            206: 12,-22
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkLineN
+          decals:
+            326: 2,-1
+            327: 1,-1
+            328: 0,-1
+        - node:
+            color: '#52B4E996'
+            id: BrickTileSteelBox
+          decals:
+            238: -3,-15
+            239: -2,-17
+            240: 1,-17
+            241: 1,-13
+            242: -2,-13
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelCornerNe
+          decals:
+            143: 15,-12
+            149: 10,-11
+            186: 5,-11
+            332: 10,-7
+            339: 15,-7
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelCornerNw
+          decals:
+            150: 9,-11
+            187: 3,-11
+            340: 12,-7
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelCornerSe
+          decals:
+            141: 15,-15
+            188: 5,-13
+            259: 27,-17
+            264: 26,-20
+            329: 10,-9
+            342: 15,-9
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelCornerSw
+          decals:
+            127: 14,-15
+            138: 9,-13
+            189: 3,-13
+            256: 17,-17
+            263: 18,-20
+            335: 5,-9
+            341: 12,-9
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelEndS
+          decals:
+            125: 10,-15
+            126: 12,-15
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelInnerNe
+          decals:
+            148: 10,-12
+            250: -3,-17
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelInnerSe
+          decals:
+            139: 10,-13
+            140: 12,-13
+            249: -3,-13
+            260: 26,-17
+            289: 20,-14
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelInnerSw
+          decals:
+            133: 10,-13
+            134: 12,-13
+            135: 14,-13
+            261: 18,-17
+            285: 24,-14
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelLineE
+          decals:
+            128: 12,-14
+            129: 10,-14
+            142: 15,-13
+            191: 5,-12
+            247: -3,-16
+            248: -3,-14
+            257: 26,-19
+            258: 26,-18
+            265: 20,-17
+            266: 20,-16
+            267: 20,-15
+            290: 20,-19
+            312: 27,-16
+            313: 27,-15
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelLineN
+          decals:
+            144: 14,-12
+            145: 13,-12
+            146: 12,-12
+            147: 11,-12
+            192: 4,-11
+            243: 0,-17
+            244: -1,-17
+            274: 26,-14
+            275: 25,-14
+            276: 23,-14
+            277: 22,-14
+            278: 21,-14
+            279: 20,-14
+            280: 18,-14
+            281: 19,-14
+            284: 24,-14
+            333: 9,-7
+            334: 8,-7
+            345: 13,-7
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelLineS
+          decals:
+            136: 13,-13
+            137: 11,-13
+            190: 4,-13
+            245: 0,-13
+            246: -1,-13
+            272: 25,-20
+            273: 19,-20
+            286: 23,-14
+            287: 22,-14
+            288: 21,-14
+            330: 8,-9
+            331: 7,-9
+            343: 14,-9
+            344: 13,-9
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelLineW
+          decals:
+            130: 14,-14
+            131: 12,-14
+            132: 10,-14
+            151: 9,-12
+            193: 3,-12
+            253: 18,-18
+            254: 17,-16
+            255: 17,-15
+            262: 18,-19
+            268: 24,-19
+            269: 24,-17
+            270: 24,-16
+            271: 24,-15
+            336: 5,-8
+            359: 5,-7
+        - node:
+            color: '#9FED5896'
+            id: BrickTileWhiteCornerNe
+          decals:
+            159: 7,-11
+        - node:
+            color: '#9FED5896'
+            id: BrickTileWhiteCornerNw
+          decals:
+            160: 6,-11
+            178: 3,-14
+        - node:
+            color: '#9FED5896'
+            id: BrickTileWhiteCornerSe
+          decals:
+            171: 7,-18
+        - node:
+            color: '#9FED5896'
+            id: BrickTileWhiteCornerSw
+          decals:
+            174: 3,-18
+        - node:
+            color: '#9FED5896'
+            id: BrickTileWhiteInnerNw
+          decals:
+            162: 6,-14
+        - node:
+            color: '#9FED5896'
+            id: BrickTileWhiteLineE
+          decals:
+            165: 7,-12
+            166: 7,-13
+            167: 7,-14
+            168: 7,-15
+            169: 7,-16
+            170: 7,-17
+        - node:
+            color: '#9FED5896'
+            id: BrickTileWhiteLineN
+          decals:
+            163: 5,-14
+            164: 4,-14
+        - node:
+            color: '#9FED5896'
+            id: BrickTileWhiteLineS
+          decals:
+            172: 6,-18
+            173: 5,-18
+            175: 4,-18
+        - node:
+            color: '#9FED5896'
+            id: BrickTileWhiteLineW
+          decals:
+            161: 6,-13
+            176: 3,-17
+            177: 3,-16
+        - node:
+            color: '#A4610647'
+            id: CheckerNWSE
+          decals:
+            196: -13,6
+            197: -14,6
+            198: -15,6
+            199: -15,7
+            200: -14,7
+            201: -13,7
+            202: -14,8
+            203: -15,8
+        - node:
+            color: '#D381C996'
+            id: CheckerNWSE
+          decals:
+            207: 10,-19
+            208: 11,-19
+            209: 12,-19
+            210: 13,-19
+            211: 14,-19
+            212: 14,-18
+            213: 14,-17
+            214: 13,-17
+            215: 13,-18
+            216: 12,-18
+            217: 12,-17
+            218: 11,-17
+            219: 11,-18
+            220: 10,-18
+            221: 10,-17
+        - node:
+            color: '#FFFFFFFF'
+            id: Delivery
+          decals:
+            204: -16,8
+            205: -16,9
+            251: 7,-18
+            252: 6,-18
+        - node:
+            color: '#DE3A3A96'
+            id: DeliveryGreyscale
+          decals:
+            283: 16,-14
+        - node:
+            color: '#9FED5896'
+            id: FullTileOverlayGreyscale
+          decals:
+            181: 5,-17
+            182: 5,-16
+            183: 5,-15
+            184: 6,-16
+            185: 4,-16
+        - node:
+            color: '#52B4E996'
+            id: HalfTileOverlayGreyscale
+          decals:
+            232: 1,-14
+            233: 0,-14
+            234: -1,-14
+        - node:
+            color: '#9FED5896'
+            id: HalfTileOverlayGreyscale
+          decals:
+            324: 11,-2
+        - node:
+            color: '#52B4E996'
+            id: HalfTileOverlayGreyscale180
+          decals:
+            229: 1,-16
+            230: 0,-16
+            231: -1,-16
+        - node:
+            color: '#9FED5896'
+            id: HalfTileOverlayGreyscale180
+          decals:
+            325: 11,0
+        - node:
+            color: '#52B4E996'
+            id: HalfTileOverlayGreyscale270
+          decals:
+            235: -2,-15
+        - node:
+            color: '#9FED5896'
+            id: HalfTileOverlayGreyscale270
+          decals:
+            323: 12,-1
+        - node:
+            color: '#9FED5896'
+            id: HalfTileOverlayGreyscale90
+          decals:
+            322: 10,-1
+        - node:
+            color: '#9FED5896'
+            id: QuarterTileOverlayGreyscale
+          decals:
+            314: 9,0
+            315: 10,0
+        - node:
+            color: '#9FED5896'
+            id: QuarterTileOverlayGreyscale180
+          decals:
+            318: 13,-2
+            319: 12,-2
+        - node:
+            color: '#9FED5896'
+            id: QuarterTileOverlayGreyscale270
+          decals:
+            320: 9,-2
+            321: 10,-2
+        - node:
+            color: '#9FED5896'
+            id: QuarterTileOverlayGreyscale90
+          decals:
+            316: 13,0
+            317: 12,0
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock06
+          decals:
+            75: 9.232971,15.9332485
+        - node:
+            color: '#52B4E996'
+            id: ThreeQuarterTileOverlayGreyscale
+          decals:
+            237: -2,-14
+        - node:
+            color: '#52B4E996'
+            id: ThreeQuarterTileOverlayGreyscale270
+          decals:
+            236: -2,-16
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnBox
+          decals:
+            124: -5,-3
+        - node:
+            angle: -1.5707963267948966 rad
+            color: '#FFFFFFFF'
+            id: WarnCorner
+          decals:
+            21: 18,-5
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCorner
+          decals:
+            0: 17,-10
+            1: 18,-11
+            2: 19,-11
+        - node:
+            angle: 4.71238898038469 rad
+            color: '#FFFFFFFF'
+            id: WarnCorner
+          decals:
+            14: 17,-6
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerFlipped
+          decals:
+            7: 23,-10
+            13: 16,-6
+            19: 22,-11
+        - node:
+            angle: 1.5707963267948966 rad
+            color: '#FFFFFFFF'
+            id: WarnCornerFlipped
+          decals:
+            11: 23,-6
+            12: 22,-5
+        - node:
+            color: '#DE3A3A96'
+            id: WarnCornerGreyscaleNW
+          decals:
+            282: 17,-14
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSE
+          decals:
+            292: 20,-20
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSW
+          decals:
+            226: 10,-19
+            291: 24,-20
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnEndE
+          decals:
+            154: 1,-9
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnEndN
+          decals:
+            156: 7,-2
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnEndS
+          decals:
+            123: -6,21
+            155: 7,-4
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnEndW
+          decals:
+            153: 0,-9
+        - node:
+            color: '#DE3A3A96'
+            id: WarnFullGreyscale
+          decals:
+            352: 16,-8
+            353: 11,-8
+            354: 9,-10
+            355: 6,-10
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineE
+          decals:
+            158: 7,-3
+            294: 20,-18
+        - node:
+            color: '#DE3A3A96'
+            id: WarnLineGreyscaleE
+          decals:
+            152: 15,-14
+            349: 10,-8
+            350: 15,-8
+        - node:
+            color: '#DE3A3A96'
+            id: WarnLineGreyscaleN
+          decals:
+            351: 14,-7
+            356: 7,-7
+            357: 6,-7
+            358: 5,-7
+        - node:
+            color: '#DE3A3A96'
+            id: WarnLineGreyscaleS
+          decals:
+            346: 9,-9
+            347: 6,-9
+        - node:
+            color: '#DE3A3A96'
+            id: WarnLineGreyscaleW
+          decals:
+            348: 12,-8
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineGreyscaleW
+          decals:
+            179: 3,-15
+            180: 6,-12
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineN
+          decals:
+            222: 14,-19
+            223: 13,-19
+            224: 12,-19
+            225: 11,-19
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineS
+          decals:
+            94: -9,4
+            95: -9,3
+            96: -9,2
+            97: -9,1
+            98: -9,0
+            99: -9,-1
+            100: -9,-2
+            101: -9,-3
+            102: -9,-4
+            103: -9,-5
+            104: -9,-6
+            105: -9,-7
+            106: -9,-8
+            107: -9,-9
+            108: -9,-10
+            109: -9,-11
+            110: -9,-12
+            111: -9,-13
+            112: -9,-14
+            113: -9,-15
+            114: -9,-16
+            115: -9,-17
+            116: -9,-18
+            117: -9,-19
+            118: -9,-20
+            119: -9,-21
+            120: -9,-22
+            121: -9,-23
+            122: -9,-24
+            157: 7,-3
+            227: 10,-18
+            228: 10,-17
+            293: 24,-18
+        - node:
+            color: '#FFFFFFFF'
+            id: WarningLine
+          decals:
+            15: 19,-4
+            16: 20,-4
+            17: 21,-4
+        - node:
+            angle: 3.141592653589793 rad
+            color: '#FFFFFFFF'
+            id: WarningLine
+          decals:
+            3: 19,-11
+            4: 19,-12
+            5: 20,-12
+            6: 21,-12
+        - node:
+            angle: 4.71238898038469 rad
+            color: '#FFFFFFFF'
+            id: WarningLine
+          decals:
+            8: 24,-9
+            9: 24,-8
+            10: 24,-7
+        - node:
+            color: '#FFFFFFFF'
+            id: WarningLineCornerFlipped
+          decals:
+            20: 22,-4
+        - node:
+            angle: 4.71238898038469 rad
+            color: '#FFFFFFFF'
+            id: WarningLineCornerFlipped
+          decals:
+            18: 24,-10
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinInnerSw
+          decals:
+            363: 5,-6
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineS
+          decals:
+            361: 0,-6
+            362: -1,-6
+            364: 4,-6
+            365: 3,-6
+            366: 2,-6
+            367: 1,-6
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineW
+          decals:
+            337: 5,-9
+            338: 5,-8
+            360: 5,-7
+        - node:
+            color: '#FFFFFFFF'
+            id: bushsnowa1
+          decals:
+            67: 12.033197,7.701807
+            69: 14.310135,6.6772776
+        - node:
+            color: '#FFFFFFFF'
+            id: bushsnowa2
+          decals:
+            68: -1.884201,10.692345
+            70: 13.896899,12.679136
+            73: -2.6609726,10.251652
+        - node:
+            color: '#FFFFFFFF'
+            id: bushsnowb2
+          decals:
+            71: 12.943774,14.853275
+        - node:
+            color: '#FFFFFFFF'
+            id: bushsnowb3
+          decals:
+            72: 0.2452774,15.588417
+            74: -0.9488945,8.937782
+        - node:
+            color: '#AB0000FF'
+            id: d
+          decals:
+            373: 21.412256,2.9944348
+        - node:
+            color: '#FFFFFFFF'
+            id: grasssnowa1
+          decals:
+            30: 9.251883,16.971285
+            41: 4.707512,15.727119
+            47: -2.8426914,5.7681084
+            84: 16.072964,17.452217
+            85: -4.644718,19.141476
+            369: 26.896631,2.9944348
+        - node:
+            color: '#FFFFFFFF'
+            id: grasssnowa2
+          decals:
+            22: -3.6290493,-9.771207
+            25: 15.159365,5.392831
+            42: 2.707512,15.930454
+            53: 1.6412125,14.139866
+            62: 14.449558,12.269236
+            86: -6.332218,17.702477
+            87: -7.488468,14.82448
+            91: -5.738468,8.348984
+        - node:
+            color: '#FFFFFFFF'
+            id: grasssnowa3
+          decals:
+            44: -1.3739414,16.399694
+            54: 0.43808746,13.654987
+            57: 3.1880875,12.434965
+            58: 2.1568375,9.893942
+            63: 16.060982,2.673603
+            90: -6.207218,16.0445
+        - node:
+            color: '#FFFFFFFF'
+            id: grasssnowb1
+          decals:
+            51: 0.79449654,2.152192
+            55: 0.18808746,9.666458
+            79: 4.997473,19.080475
+        - node:
+            color: '#FFFFFFFF'
+            id: grasssnowb2
+          decals:
+            36: 6.1287537,4.4684677
+            38: 13.017959,2.0284252
+            61: 8.19574,16.289047
+            64: 3.43816,14.798347
+            78: 2.4505978,18.17328
+            92: -5.832218,13.979851
+            93: 4.1790752,7.8279076
+        - node:
+            color: '#FFFFFFFF'
+            id: grasssnowb3
+          decals:
+            23: -3.3477993,-19.991972
+            31: 9.061624,11.550716
+            35: 9.066255,4.2786684
+            50: -3.1864414,-0.9828911
+            52: -0.88188744,15.563225
+            65: 0.5527668,14.892197
+            83: 17.104214,9.229881
+        - node:
+            color: '#FFFFFFFF'
+            id: grasssnowc1
+          decals:
+            24: -3.9999733,-6.081314
+            26: 15.819311,9.398571
+            32: 12.170999,10.565315
+            39: 10.861709,2.2630453
+            40: 8.471084,13.624069
+            45: -2.1864414,7.911888
+            48: -0.6551914,1.8769035
+            49: -3.7333164,0.34661865
+            56: 4.1724625,13.733192
+            76: 2.5912228,19.753052
+            82: 17.947964,3.1297789
+            88: -7.175968,10.382353
+        - node:
+            color: '#FFFFFFFF'
+            id: grasssnowc2
+          decals:
+            27: 14.194311,14.208315
+            29: 12.819311,16.642818
+            33: 8.01938,8.972565
+            81: 19.322964,7.2277966
+            89: -5.675968,10.1320915
+        - node:
+            color: '#FFFFFFFF'
+            id: grasssnowc3
+          decals:
+            28: 15.694311,15.172535
+            34: 10.48813,7.3443623
+            37: 9.0946245,2.0440664
+            43: -2.8895664,16.211998
+            46: -4.0458164,7.6303444
+            59: 0.45371246,11.270374
+            60: 9.166802,10.222887
+            66: -1.9470882,14.409473
+            77: 6.122473,18.001226
+            80: 18.166714,4.631343
+        - node:
+            color: '#AB0000FF'
+            id: i
+          decals:
+            374: 21.677881,2.8381848
+        - node:
+            color: '#AB0000FF'
+            id: k
+          decals:
+            377: 23.427881,2.8069348
+        - node:
+            color: '#AB0000FF'
+            id: n
+          decals:
+            372: 20.943506,2.9006848
+            378: 22.959131,2.9631848
+        - node:
+            color: '#AB0000FF'
+            id: r
+          decals:
+            375: 22.099756,2.7913098
+        - node:
+            color: '#AB0000FF'
+            id: s
+          decals:
+            370: 20.224756,2.9788098
+        - node:
+            color: '#AB0000FF'
+            id: shortline
+          decals:
+            376: 22.552881,2.8381848
+        - node:
+            color: '#AB0000FF'
+            id: y
+          decals:
+            371: 20.568506,2.9319348
+    - type: GridAtmosphere
+      version: 2
+      data:
+        tiles:
+          -1,-2:
+            0: 65535
+          -1,-1:
+            0: 65503
+            1: 32
+          0,-1:
+            0: 65535
+          -2,-4:
+            0: 65535
+          -2,-3:
+            0: 65535
+          -2,-2:
+            0: 65535
+          -2,-1:
+            0: 65535
+          -1,-4:
+            0: 65535
+          -1,-3:
+            0: 65535
+          0,-4:
+            0: 65535
+          0,-3:
+            0: 65535
+          0,-2:
+            0: 65535
+          1,-4:
+            0: 57343
+            1: 8192
+          1,-3:
+            0: 65535
+          1,-2:
+            0: 65535
+          1,-1:
+            0: 65535
+          2,-4:
+            0: 62815
+            1: 2720
+          2,-3:
+            0: 65535
+          2,-2:
+            0: 32767
+            1: 32768
+          2,-1:
+            0: 65533
+            1: 2
+          3,-4:
+            0: 64991
+            1: 544
+          3,-3:
+            0: 65535
+          3,-2:
+            0: 57343
+            1: 8192
+          3,-1:
+            0: 65535
+          0,0:
+            0: 65535
+          0,1:
+            0: 65535
+          0,2:
+            0: 65535
+          0,3:
+            0: 65535
+          1,0:
+            0: 65535
+          1,1:
+            0: 65535
+          1,2:
+            0: 65535
+          1,3:
+            0: 65535
+          2,0:
+            0: 65535
+          2,1:
+            0: 65535
+          2,2:
+            0: 65535
+          2,3:
+            0: 65535
+          3,0:
+            0: 65535
+          3,1:
+            0: 65535
+          3,2:
+            0: 65535
+          3,3:
+            0: 65535
+          -2,0:
+            0: 65535
+          -2,1:
+            0: 65535
+          -2,2:
+            0: 65535
+          -2,3:
+            0: 65535
+          -1,0:
+            0: 65535
+          -1,1:
+            0: 65535
+          -1,2:
+            0: 65535
+          -1,3:
+            0: 65535
+          4,-4:
+            0: 65535
+          4,-3:
+            0: 65535
+          4,-2:
+            0: 65535
+          4,-1:
+            0: 65535
+          5,-4:
+            0: 65519
+            1: 16
+          5,-3:
+            0: 65535
+          5,-2:
+            0: 65535
+          5,-1:
+            0: 65535
+          6,-4:
+            0: 65519
+            1: 16
+          6,-3:
+            0: 65535
+          6,-2:
+            0: 65535
+          6,-1:
+            0: 65535
+          7,-4:
+            0: 65535
+          7,-3:
+            0: 65535
+          7,-2:
+            0: 65535
+          7,-1:
+            0: 65535
+          0,-6:
+            0: 65535
+          0,-5:
+            0: 65535
+          1,-6:
+            0: 65535
+          1,-5:
+            0: 62463
+            1: 3072
+          2,-6:
+            0: 65535
+          2,-5:
+            0: 65535
+          3,-6:
+            0: 65535
+          3,-5:
+            0: 65535
+          -2,-6:
+            0: 65535
+          -2,-5:
+            0: 65535
+          -1,-6:
+            0: 65535
+          -1,-5:
+            0: 65535
+          -2,4:
+            0: 65535
+          -1,4:
+            0: 65535
+          0,4:
+            0: 65535
+          1,4:
+            0: 65535
+          2,4:
+            0: 65535
+          3,4:
+            0: 65535
+          4,4:
+            0: 65535
+          4,0:
+            0: 65535
+          4,1:
+            0: 65535
+          4,2:
+            0: 65535
+          4,3:
+            0: 65535
+          5,0:
+            0: 65535
+          6,0:
+            0: 65535
+          7,0:
+            0: 65535
+          4,-6:
+            0: 65535
+          4,-5:
+            0: 65535
+          5,-6:
+            0: 65535
+          5,-5:
+            0: 65535
+          6,-6:
+            0: 65535
+          6,-5:
+            0: 65535
+          7,-6:
+            0: 65535
+          7,-5:
+            0: 65535
+          -4,-4:
+            0: 65535
+          -4,-3:
+            0: 4095
+          -3,-4:
+            0: 65535
+          -3,-3:
+            0: 61439
+          -3,-2:
+            0: 61166
+          -3,-1:
+            0: 61166
+          -4,0:
+            0: 65520
+            2: 15
+          -4,1:
+            0: 65535
+          -4,2:
+            0: 65535
+          -4,3:
+            0: 65535
+          -3,0:
+            0: 65534
+            2: 1
+          -3,1:
+            0: 65535
+          -3,2:
+            0: 65535
+          -3,3:
+            0: 65535
+          0,-7:
+            0: 65535
+          1,-7:
+            0: 61441
+            2: 3840
+          2,-7:
+            0: 4096
+            2: 57600
+          3,-7:
+            0: 32768
+            2: 28672
+          -4,-7:
+            0: 65535
+          -4,-6:
+            0: 65535
+          -4,-5:
+            0: 65535
+          -3,-7:
+            0: 65535
+          -3,-6:
+            0: 65535
+          -3,-5:
+            0: 65535
+          -1,-7:
+            0: 65535
+          -4,4:
+            0: 65535
+          -4,5:
+            0: 65535
+          -3,4:
+            0: 65535
+          -3,5:
+            0: 65535
+          -2,5:
+            0: 65535
+          -2,6:
+            0: 65535
+          -1,5:
+            0: 65535
+          -1,6:
+            0: 13107
+          0,5:
+            0: 8191
+          1,5:
+            0: 4095
+          2,5:
+            0: 65535
+          3,5:
+            0: 65535
+          4,5:
+            0: 65535
+          5,4:
+            0: 65535
+          5,5:
+            0: 30719
+          6,4:
+            0: 4915
+          5,1:
+            0: 65535
+          5,2:
+            0: 65535
+          5,3:
+            0: 65535
+          6,1:
+            0: 65535
+          6,2:
+            0: 30719
+          6,3:
+            0: 13107
+          7,1:
+            0: 16383
+          7,2:
+            0: 51
+          4,-7:
+            0: 61440
+          5,-7:
+            0: 61440
+          6,-7:
+            0: 61440
+          7,-7:
+            0: 28672
+          -8,-4:
+            0: 12
+          -7,-4:
+            0: 32783
+          -6,-4:
+            0: 61679
+          -5,-4:
+            0: 65535
+          -5,-3:
+            0: 4095
+          -6,3:
+            0: 65534
+          -6,2:
+            0: 52428
+          -5,0:
+            0: 65520
+            2: 15
+          -5,1:
+            0: 65535
+          -5,2:
+            0: 65535
+          -5,3:
+            0: 65535
+          -7,7:
+            0: 52424
+          -7,5:
+            0: 34944
+          -7,6:
+            0: 34952
+          -6,4:
+            0: 61183
+          -6,5:
+            0: 65535
+          -6,6:
+            0: 65535
+          -6,7:
+            0: 65535
+          -5,4:
+            0: 65535
+          -5,5:
+            0: 65535
+          -8,-6:
+            0: 65535
+          -8,-5:
+            0: 57343
+          -7,-5:
+            0: 65535
+          -7,-6:
+            0: 65535
+          -6,-6:
+            0: 65535
+          -6,-5:
+            0: 65535
+          -6,-7:
+            0: 64704
+          -5,-7:
+            0: 65528
+          -5,-6:
+            0: 65535
+          -5,-5:
+            0: 65535
+          8,0:
+            0: 17
+          8,-4:
+            0: 13107
+          8,-1:
+            0: 4369
+          8,-6:
+            0: 13072
+          8,-5:
+            0: 13107
+          -7,8:
+            0: 12
+          -6,8:
+            0: 3
+          -12,-6:
+            0: 65535
+          -12,-5:
+            0: 65535
+          -11,-6:
+            0: 65533
+          -11,-5:
+            0: 65535
+          -10,-6:
+            0: 65535
+          -10,-5:
+            0: 65535
+          -9,-6:
+            0: 65535
+          -9,-5:
+            0: 65535
+          -15,-4:
+            0: 65535
+          -15,-3:
+            0: 65535
+          -15,-2:
+            0: 65535
+          -15,-1:
+            0: 65535
+          -14,-4:
+            0: 65535
+          -14,-3:
+            0: 29495
+          -14,-2:
+            0: 30583
+          -14,-1:
+            0: 13175
+          -13,-4:
+            0: 4607
+          -12,-4:
+            0: 255
+          -11,-4:
+            0: 255
+          -10,-4:
+            0: 255
+          -9,-4:
+            0: 119
+          -15,-5:
+            0: 65535
+          -14,-5:
+            0: 65535
+          -14,-6:
+            0: 65535
+          -13,-6:
+            0: 65535
+          -13,-5:
+            0: 65535
+          -15,0:
+            0: 65518
+          -15,1:
+            0: 65535
+          -15,2:
+            0: 65535
+          -15,3:
+            0: 65535
+          -14,0:
+            0: 13171
+          -14,1:
+            0: 13075
+          -14,2:
+            0: 13107
+          -14,3:
+            0: 29491
+          -15,4:
+            0: 65535
+          -15,5:
+            0: 65535
+          -15,6:
+            0: 35007
+          -14,4:
+            0: 65535
+          -14,5:
+            0: 65535
+          -14,6:
+            0: 16383
+          -2,-7:
+            0: 65535
+          -4,6:
+            0: 65535
+          -4,7:
+            0: 4095
+          -3,6:
+            0: 65535
+          -3,7:
+            0: 511
+          -2,7:
+            0: 255
+          -1,7:
+            0: 51
+          2,6:
+            0: 52428
+          2,7:
+            0: 52428
+          3,6:
+            0: 65535
+          3,7:
+            0: 65535
+          4,6:
+            0: 65535
+          4,7:
+            0: 65535
+          5,6:
+            0: 13107
+          5,7:
+            0: 4915
+          -7,-3:
+            0: 2184
+          -6,-3:
+            0: 4095
+          -7,0:
+            0: 65520
+            2: 15
+          -7,1:
+            0: 15
+          -6,0:
+            0: 65520
+            2: 15
+          -6,1:
+            0: 15
+            2: 51328
+          -5,6:
+            0: 65535
+          -5,7:
+            0: 32767
+          -8,-7:
+            0: 63744
+          -7,-7:
+            0: 65407
+          -12,-7:
+            0: 65519
+          -11,-7:
+            0: 4983
+          -10,-7:
+            0: 60622
+          -9,-7:
+            0: 65535
+          -16,-4:
+            0: 65535
+          -16,-3:
+            0: 65535
+          -16,-2:
+            0: 65535
+          -16,-1:
+            0: 65535
+          -16,-7:
+            0: 13107
+          -16,-6:
+            0: 65535
+          -16,-5:
+            0: 65535
+          -15,-6:
+            0: 65535
+          -15,-7:
+            0: 52360
+          -14,-7:
+            0: 65535
+          -13,-7:
+            0: 63251
+          -16,0:
+            0: 65535
+          -16,1:
+            0: 65535
+          -16,2:
+            0: 65535
+          -16,3:
+            0: 65535
+          -16,4:
+            0: 65535
+          -16,5:
+            0: 65535
+          -16,6:
+            0: 255
+          -18,0:
+            0: 65535
+          -18,3:
+            0: 61440
+          -18,1:
+            0: 34956
+          -17,0:
+            0: 65535
+          -17,1:
+            0: 65535
+          -17,2:
+            0: 65519
+          -17,3:
+            0: 65535
+          -18,4:
+            0: 52991
+          -18,5:
+            0: 65532
+          -18,6:
+            0: 3823
+          -17,4:
+            0: 65535
+          -17,5:
+            0: 65535
+          -17,6:
+            0: 4095
+          -18,-4:
+            0: 65535
+          -18,-3:
+            0: 52479
+          -18,-1:
+            0: 65484
+          -18,-2:
+            0: 52428
+          -17,-4:
+            0: 65535
+          -17,-3:
+            0: 65535
+          -17,-2:
+            0: 65535
+          -17,-1:
+            0: 65535
+          -18,-6:
+            0: 65484
+          -18,-5:
+            0: 65535
+          -18,-7:
+            0: 52224
+          -17,-7:
+            0: 65484
+          -17,-6:
+            0: 65535
+          -17,-5:
+            0: 65535
+          2,8:
+            0: 12
+          3,8:
+            0: 15
+          4,8:
+            0: 15
+          5,8:
+            0: 1
+          -8,0:
+            0: 65520
+            2: 15
+          -8,1:
+            0: 15
+          -9,0:
+            0: 61152
+            2: 14
+          -9,1:
+            0: 14
+        uniqueMixes:
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.213781
+          - 79.80423
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        chunkSize: 4
+    - type: RadiationGridResistance
+    - type: OccluderTree
+    - type: Shuttle
+    - type: GravityShake
+      shakeTimes: 10
+    - type: GasTileOverlay
+    - type: SpreaderGrid
+    - type: GridPathfinding
+    - type: BecomesStation
+      id: SyndicateOutpost
+  - uid: 1295
+    components:
+    - type: MetaData
+    - type: Transform
+    - type: Map
+    - type: PhysicsMap
+    - type: Broadphase
+    - type: OccluderTree
+    - type: Parallax
+      parallax: Sky
+    - type: MapAtmosphere
+      space: False
+      mixture:
+        volume: 2500
+        temperature: 248.15
+        moles:
+        - 21.824879
+        - 82.10312
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: LoadedMap
+    - type: GridTree
+    - type: MovedGrids
+- proto: AirlockExternalGlassNukeopLocked
+  entities:
+  - uid: 49
+    components:
+    - type: Transform
+      pos: 3.5,1.5
+      parent: 104
+  - uid: 55
+    components:
+    - type: Transform
+      pos: -1.5,-3.5
+      parent: 104
+  - uid: 56
+    components:
+    - type: Transform
+      pos: -5.5,-3.5
+      parent: 104
+  - uid: 58
+    components:
+    - type: Transform
+      pos: 3.5,3.5
+      parent: 104
+- proto: AirlockGlassShuttle
+  entities:
+  - uid: 2053
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -33.5,-19.5
+      parent: 104
+  - uid: 2057
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -29.5,-19.5
+      parent: 104
+  - uid: 2062
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -25.5,-19.5
+      parent: 104
+  - uid: 2185
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -21.5,-19.5
+      parent: 104
+  - uid: 2186
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -17.5,-19.5
+      parent: 104
+  - uid: 2187
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -13.5,-19.5
+      parent: 104
+  - uid: 2190
+    components:
+    - type: Transform
+      pos: -13.5,0.5
+      parent: 104
+  - uid: 2191
+    components:
+    - type: Transform
+      pos: -17.5,0.5
+      parent: 104
+  - uid: 2193
+    components:
+    - type: Transform
+      pos: -21.5,0.5
+      parent: 104
+  - uid: 2448
+    components:
+    - type: Transform
+      pos: -25.5,0.5
+      parent: 104
+  - uid: 2472
+    components:
+    - type: Transform
+      pos: -29.5,0.5
+      parent: 104
+    - type: GridFill
+      addComponents:
+      - type: NukeOpsShuttle
+      path: /Maps/Shuttles/infiltrator.yml
+  - uid: 2481
+    components:
+    - type: Transform
+      pos: -33.5,0.5
+      parent: 104
+- proto: AirlockSyndicateNukeopGlassLocked
+  entities:
+  - uid: 48
+    components:
+    - type: Transform
+      pos: -11.5,6.5
+      parent: 104
+  - uid: 65
+    components:
+    - type: Transform
+      pos: 2.5,-14.5
+      parent: 104
+  - uid: 96
+    components:
+    - type: Transform
+      pos: 8.5,-16.5
+      parent: 104
+  - uid: 112
+    components:
+    - type: Transform
+      pos: 16.5,-7.5
+      parent: 104
+  - uid: 122
+    components:
+    - type: Transform
+      pos: 9.5,-9.5
+      parent: 104
+  - uid: 130
+    components:
+    - type: Transform
+      pos: 11.5,-7.5
+      parent: 104
+  - uid: 131
+    components:
+    - type: Transform
+      pos: 8.5,-0.5
+      parent: 104
+  - uid: 165
+    components:
+    - type: Transform
+      pos: 10.5,-2.5
+      parent: 104
+  - uid: 190
+    components:
+    - type: Transform
+      pos: 16.5,-13.5
+      parent: 104
+  - uid: 302
+    components:
+    - type: Transform
+      pos: 14.5,-5.5
+      parent: 104
+  - uid: 305
+    components:
+    - type: Transform
+      pos: 6.5,-9.5
+      parent: 104
+- proto: AirlockSyndicateNukeopLocked
+  entities:
+  - uid: 109
+    components:
+    - type: Transform
+      pos: 14.5,-1.5
+      parent: 104
+  - uid: 120
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,-7.5
+      parent: 104
+  - uid: 136
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,-7.5
+      parent: 104
+  - uid: 148
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,-10.5
+      parent: 104
+  - uid: 272
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,-4.5
+      parent: 104
+- proto: AlwaysPoweredLightExterior
+  entities:
+  - uid: 1267
+    components:
+    - type: Transform
+      pos: -15.5,23.5
+      parent: 104
+- proto: AlwaysPoweredLightLED
+  entities:
+  - uid: 135
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-1.5
+      parent: 104
+  - uid: 974
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-17.5
+      parent: 104
+  - uid: 1286
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-5.5
+      parent: 104
+  - uid: 1287
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-11.5
+      parent: 104
+  - uid: 1288
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-20.5
+      parent: 104
+- proto: AlwaysPoweredWallLight
+  entities:
+  - uid: 258
+    components:
+    - type: Transform
+      pos: -3.5,-2.5
+      parent: 104
+  - uid: 1356
+    components:
+    - type: Transform
+      pos: 1.5,-12.5
+      parent: 104
+  - uid: 1470
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,-14.5
+      parent: 104
+  - uid: 1471
+    components:
+    - type: Transform
+      pos: 12.5,-10.5
+      parent: 104
+  - uid: 1532
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-8.5
+      parent: 104
+  - uid: 1534
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-1.5
+      parent: 104
+  - uid: 1536
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-2.5
+      parent: 104
+  - uid: 1537
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-8.5
+      parent: 104
+  - uid: 1544
+    components:
+    - type: Transform
+      pos: 15.5,-6.5
+      parent: 104
+  - uid: 1545
+    components:
+    - type: Transform
+      pos: 14.5,-3.5
+      parent: 104
+  - uid: 1546
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-4.5
+      parent: 104
+  - uid: 1570
+    components:
+    - type: Transform
+      pos: 19.5,-5.5
+      parent: 104
+  - uid: 1571
+    components:
+    - type: Transform
+      pos: 21.5,-5.5
+      parent: 104
+  - uid: 1572
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 19.5,-9.5
+      parent: 104
+  - uid: 1573
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 21.5,-9.5
+      parent: 104
+  - uid: 1758
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,5.5
+      parent: 104
+  - uid: 1759
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,12.5
+      parent: 104
+  - uid: 1760
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-22.5
+      parent: 104
+  - uid: 1763
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-22.5
+      parent: 104
+  - uid: 1867
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-16.5
+      parent: 104
+  - uid: 2257
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,10.5
+      parent: 104
+  - uid: 2291
+    components:
+    - type: Transform
+      pos: 5.5,14.5
+      parent: 104
+  - uid: 2397
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.5,-11.5
+      parent: 104
+  - uid: 2398
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.5,-3.5
+      parent: 104
+  - uid: 2399
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,-3.5
+      parent: 104
+  - uid: 2400
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,-11.5
+      parent: 104
+  - uid: 2401
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,-15.5
+      parent: 104
+  - uid: 2402
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 27.5,-15.5
+      parent: 104
+  - uid: 2403
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-19.5
+      parent: 104
+  - uid: 2404
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 19.5,-19.5
+      parent: 104
+  - uid: 3375
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-11.5
+      parent: 104
+  - uid: 3377
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-11.5
+      parent: 104
+- proto: APCHyperCapacity
+  entities:
+  - uid: 1431
+    components:
+    - type: Transform
+      pos: 20.5,-12.5
+      parent: 104
+  - uid: 1445
+    components:
+    - type: Transform
+      pos: 13.5,-9.5
+      parent: 104
+  - uid: 1477
+    components:
+    - type: Transform
+      pos: 8.5,-5.5
+      parent: 104
+  - uid: 1574
+    components:
+    - type: Transform
+      pos: 21.5,-4.5
+      parent: 104
+- proto: AsteroidRock
+  entities:
+  - uid: 19
+    components:
+    - type: Transform
+      pos: 16.5,1.5
+      parent: 104
+  - uid: 20
+    components:
+    - type: Transform
+      pos: -3.5,-10.5
+      parent: 104
+  - uid: 216
+    components:
+    - type: Transform
+      pos: -4.5,-9.5
+      parent: 104
+  - uid: 238
+    components:
+    - type: Transform
+      pos: -4.5,-13.5
+      parent: 104
+  - uid: 243
+    components:
+    - type: Transform
+      pos: -4.5,-6.5
+      parent: 104
+  - uid: 244
+    components:
+    - type: Transform
+      pos: -4.5,-8.5
+      parent: 104
+  - uid: 246
+    components:
+    - type: Transform
+      pos: -3.5,-8.5
+      parent: 104
+  - uid: 247
+    components:
+    - type: Transform
+      pos: -4.5,-12.5
+      parent: 104
+  - uid: 248
+    components:
+    - type: Transform
+      pos: -4.5,-7.5
+      parent: 104
+  - uid: 249
+    components:
+    - type: Transform
+      pos: -8.5,9.5
+      parent: 104
+  - uid: 250
+    components:
+    - type: Transform
+      pos: 0.5,-10.5
+      parent: 104
+  - uid: 251
+    components:
+    - type: Transform
+      pos: 15.5,1.5
+      parent: 104
+  - uid: 255
+    components:
+    - type: Transform
+      pos: -3.5,-7.5
+      parent: 104
+  - uid: 257
+    components:
+    - type: Transform
+      pos: 15.5,0.5
+      parent: 104
+  - uid: 259
+    components:
+    - type: Transform
+      pos: -4.5,-10.5
+      parent: 104
+  - uid: 263
+    components:
+    - type: Transform
+      pos: -4.5,-11.5
+      parent: 104
+  - uid: 277
+    components:
+    - type: Transform
+      pos: -10.5,22.5
+      parent: 104
+  - uid: 292
+    components:
+    - type: Transform
+      pos: -9.5,21.5
+      parent: 104
+  - uid: 294
+    components:
+    - type: Transform
+      pos: -10.5,21.5
+      parent: 104
+  - uid: 295
+    components:
+    - type: Transform
+      pos: -11.5,22.5
+      parent: 104
+  - uid: 296
+    components:
+    - type: Transform
+      pos: -20.5,9.5
+      parent: 104
+  - uid: 358
+    components:
+    - type: Transform
+      pos: -22.5,21.5
+      parent: 104
+  - uid: 359
+    components:
+    - type: Transform
+      pos: -22.5,15.5
+      parent: 104
+  - uid: 360
+    components:
+    - type: Transform
+      pos: -22.5,16.5
+      parent: 104
+  - uid: 361
+    components:
+    - type: Transform
+      pos: -21.5,17.5
+      parent: 104
+  - uid: 362
+    components:
+    - type: Transform
+      pos: -21.5,16.5
+      parent: 104
+  - uid: 363
+    components:
+    - type: Transform
+      pos: -21.5,15.5
+      parent: 104
+  - uid: 364
+    components:
+    - type: Transform
+      pos: -21.5,14.5
+      parent: 104
+  - uid: 365
+    components:
+    - type: Transform
+      pos: -22.5,14.5
+      parent: 104
+  - uid: 366
+    components:
+    - type: Transform
+      pos: -21.5,13.5
+      parent: 104
+  - uid: 367
+    components:
+    - type: Transform
+      pos: -21.5,20.5
+      parent: 104
+  - uid: 368
+    components:
+    - type: Transform
+      pos: -21.5,21.5
+      parent: 104
+  - uid: 369
+    components:
+    - type: Transform
+      pos: -20.5,21.5
+      parent: 104
+  - uid: 370
+    components:
+    - type: Transform
+      pos: -19.5,21.5
+      parent: 104
+  - uid: 371
+    components:
+    - type: Transform
+      pos: -20.5,22.5
+      parent: 104
+  - uid: 372
+    components:
+    - type: Transform
+      pos: -18.5,21.5
+      parent: 104
+  - uid: 373
+    components:
+    - type: Transform
+      pos: -20.5,8.5
+      parent: 104
+  - uid: 374
+    components:
+    - type: Transform
+      pos: -22.5,22.5
+      parent: 104
+  - uid: 375
+    components:
+    - type: Transform
+      pos: -21.5,22.5
+      parent: 104
+  - uid: 376
+    components:
+    - type: Transform
+      pos: -23.5,22.5
+      parent: 104
+  - uid: 377
+    components:
+    - type: Transform
+      pos: -20.5,15.5
+      parent: 104
+  - uid: 401
+    components:
+    - type: Transform
+      pos: -20.5,20.5
+      parent: 104
+  - uid: 402
+    components:
+    - type: Transform
+      pos: -20.5,19.5
+      parent: 104
+  - uid: 403
+    components:
+    - type: Transform
+      pos: -20.5,18.5
+      parent: 104
+  - uid: 404
+    components:
+    - type: Transform
+      pos: -20.5,17.5
+      parent: 104
+  - uid: 405
+    components:
+    - type: Transform
+      pos: -20.5,16.5
+      parent: 104
+  - uid: 406
+    components:
+    - type: Transform
+      pos: -20.5,14.5
+      parent: 104
+  - uid: 407
+    components:
+    - type: Transform
+      pos: -24.5,23.5
+      parent: 104
+  - uid: 408
+    components:
+    - type: Transform
+      pos: -24.5,22.5
+      parent: 104
+  - uid: 409
+    components:
+    - type: Transform
+      pos: -20.5,10.5
+      parent: 104
+  - uid: 410
+    components:
+    - type: Transform
+      pos: -9.5,22.5
+      parent: 104
+  - uid: 415
+    components:
+    - type: Transform
+      pos: -18.5,23.5
+      parent: 104
+  - uid: 417
+    components:
+    - type: Transform
+      pos: -16.5,6.5
+      parent: 104
+  - uid: 419
+    components:
+    - type: Transform
+      pos: -7.5,21.5
+      parent: 104
+  - uid: 420
+    components:
+    - type: Transform
+      pos: -8.5,21.5
+      parent: 104
+  - uid: 421
+    components:
+    - type: Transform
+      pos: -10.5,23.5
+      parent: 104
+  - uid: 422
+    components:
+    - type: Transform
+      pos: -11.5,23.5
+      parent: 104
+  - uid: 423
+    components:
+    - type: Transform
+      pos: -19.5,22.5
+      parent: 104
+  - uid: 425
+    components:
+    - type: Transform
+      pos: -18.5,22.5
+      parent: 104
+  - uid: 426
+    components:
+    - type: Transform
+      pos: -7.5,12.5
+      parent: 104
+  - uid: 455
+    components:
+    - type: Transform
+      pos: 1.5,-19.5
+      parent: 104
+  - uid: 469
+    components:
+    - type: Transform
+      pos: -8.5,10.5
+      parent: 104
+  - uid: 471
+    components:
+    - type: Transform
+      pos: -9.5,10.5
+      parent: 104
+  - uid: 473
+    components:
+    - type: Transform
+      pos: -8.5,11.5
+      parent: 104
+  - uid: 475
+    components:
+    - type: Transform
+      pos: -9.5,11.5
+      parent: 104
+  - uid: 477
+    components:
+    - type: Transform
+      pos: 16.5,0.5
+      parent: 104
+  - uid: 478
+    components:
+    - type: Transform
+      pos: -6.5,12.5
+      parent: 104
+  - uid: 479
+    components:
+    - type: Transform
+      pos: -2.5,-18.5
+      parent: 104
+  - uid: 480
+    components:
+    - type: Transform
+      pos: -2.5,-19.5
+      parent: 104
+  - uid: 483
+    components:
+    - type: Transform
+      pos: -2.5,-10.5
+      parent: 104
+  - uid: 485
+    components:
+    - type: Transform
+      pos: -2.5,-6.5
+      parent: 104
+  - uid: 488
+    components:
+    - type: Transform
+      pos: -2.5,-7.5
+      parent: 104
+  - uid: 489
+    components:
+    - type: Transform
+      pos: -2.5,-8.5
+      parent: 104
+  - uid: 492
+    components:
+    - type: Transform
+      pos: -3.5,-20.5
+      parent: 104
+  - uid: 502
+    components:
+    - type: Transform
+      pos: -3.5,-18.5
+      parent: 104
+  - uid: 504
+    components:
+    - type: Transform
+      pos: -2.5,-9.5
+      parent: 104
+  - uid: 505
+    components:
+    - type: Transform
+      pos: -3.5,-19.5
+      parent: 104
+  - uid: 506
+    components:
+    - type: Transform
+      pos: 17.5,-1.5
+      parent: 104
+  - uid: 509
+    components:
+    - type: Transform
+      pos: -4.5,-19.5
+      parent: 104
+  - uid: 511
+    components:
+    - type: Transform
+      pos: -4.5,-18.5
+      parent: 104
+  - uid: 512
+    components:
+    - type: Transform
+      pos: -9.5,12.5
+      parent: 104
+  - uid: 513
+    components:
+    - type: Transform
+      pos: -3.5,-9.5
+      parent: 104
+  - uid: 521
+    components:
+    - type: Transform
+      pos: -4.5,-14.5
+      parent: 104
+  - uid: 522
+    components:
+    - type: Transform
+      pos: -1.5,19.5
+      parent: 104
+  - uid: 524
+    components:
+    - type: Transform
+      pos: -0.5,19.5
+      parent: 104
+  - uid: 525
+    components:
+    - type: Transform
+      pos: 9.5,20.5
+      parent: 104
+  - uid: 529
+    components:
+    - type: Transform
+      pos: 10.5,19.5
+      parent: 104
+  - uid: 531
+    components:
+    - type: Transform
+      pos: 11.5,19.5
+      parent: 104
+  - uid: 532
+    components:
+    - type: Transform
+      pos: 12.5,19.5
+      parent: 104
+  - uid: 533
+    components:
+    - type: Transform
+      pos: 16.5,19.5
+      parent: 104
+  - uid: 534
+    components:
+    - type: Transform
+      pos: 17.5,19.5
+      parent: 104
+  - uid: 535
+    components:
+    - type: Transform
+      pos: 18.5,19.5
+      parent: 104
+  - uid: 536
+    components:
+    - type: Transform
+      pos: 18.5,11.5
+      parent: 104
+  - uid: 537
+    components:
+    - type: Transform
+      pos: 18.5,12.5
+      parent: 104
+  - uid: 538
+    components:
+    - type: Transform
+      pos: 18.5,15.5
+      parent: 104
+  - uid: 539
+    components:
+    - type: Transform
+      pos: 18.5,18.5
+      parent: 104
+  - uid: 543
+    components:
+    - type: Transform
+      pos: 26.5,9.5
+      parent: 104
+  - uid: 546
+    components:
+    - type: Transform
+      pos: 28.5,3.5
+      parent: 104
+  - uid: 547
+    components:
+    - type: Transform
+      pos: 29.5,3.5
+      parent: 104
+  - uid: 548
+    components:
+    - type: Transform
+      pos: 30.5,3.5
+      parent: 104
+  - uid: 549
+    components:
+    - type: Transform
+      pos: 22.5,-22.5
+      parent: 104
+  - uid: 550
+    components:
+    - type: Transform
+      pos: 31.5,-20.5
+      parent: 104
+  - uid: 551
+    components:
+    - type: Transform
+      pos: 31.5,-19.5
+      parent: 104
+  - uid: 552
+    components:
+    - type: Transform
+      pos: 31.5,-18.5
+      parent: 104
+  - uid: 553
+    components:
+    - type: Transform
+      pos: 31.5,-17.5
+      parent: 104
+  - uid: 554
+    components:
+    - type: Transform
+      pos: 31.5,-16.5
+      parent: 104
+  - uid: 555
+    components:
+    - type: Transform
+      pos: 31.5,-15.5
+      parent: 104
+  - uid: 556
+    components:
+    - type: Transform
+      pos: 31.5,-14.5
+      parent: 104
+  - uid: 557
+    components:
+    - type: Transform
+      pos: 31.5,-13.5
+      parent: 104
+  - uid: 558
+    components:
+    - type: Transform
+      pos: 31.5,-12.5
+      parent: 104
+  - uid: 559
+    components:
+    - type: Transform
+      pos: 31.5,-7.5
+      parent: 104
+  - uid: 560
+    components:
+    - type: Transform
+      pos: 31.5,-6.5
+      parent: 104
+  - uid: 561
+    components:
+    - type: Transform
+      pos: 31.5,-5.5
+      parent: 104
+  - uid: 562
+    components:
+    - type: Transform
+      pos: 31.5,-4.5
+      parent: 104
+  - uid: 563
+    components:
+    - type: Transform
+      pos: 31.5,-3.5
+      parent: 104
+  - uid: 564
+    components:
+    - type: Transform
+      pos: 31.5,-2.5
+      parent: 104
+  - uid: 565
+    components:
+    - type: Transform
+      pos: 31.5,-1.5
+      parent: 104
+  - uid: 566
+    components:
+    - type: Transform
+      pos: 31.5,-0.5
+      parent: 104
+  - uid: 567
+    components:
+    - type: Transform
+      pos: 31.5,0.5
+      parent: 104
+  - uid: 568
+    components:
+    - type: Transform
+      pos: 31.5,1.5
+      parent: 104
+  - uid: 569
+    components:
+    - type: Transform
+      pos: 17.5,-22.5
+      parent: 104
+  - uid: 570
+    components:
+    - type: Transform
+      pos: 18.5,-22.5
+      parent: 104
+  - uid: 571
+    components:
+    - type: Transform
+      pos: 19.5,-22.5
+      parent: 104
+  - uid: 572
+    components:
+    - type: Transform
+      pos: 20.5,-22.5
+      parent: 104
+  - uid: 573
+    components:
+    - type: Transform
+      pos: 21.5,-22.5
+      parent: 104
+  - uid: 574
+    components:
+    - type: Transform
+      pos: -5.5,-22.5
+      parent: 104
+  - uid: 575
+    components:
+    - type: Transform
+      pos: 23.5,-22.5
+      parent: 104
+  - uid: 576
+    components:
+    - type: Transform
+      pos: 24.5,-22.5
+      parent: 104
+  - uid: 577
+    components:
+    - type: Transform
+      pos: 25.5,-22.5
+      parent: 104
+  - uid: 578
+    components:
+    - type: Transform
+      pos: 26.5,-22.5
+      parent: 104
+  - uid: 579
+    components:
+    - type: Transform
+      pos: 27.5,-22.5
+      parent: 104
+  - uid: 580
+    components:
+    - type: Transform
+      pos: 28.5,-22.5
+      parent: 104
+  - uid: 581
+    components:
+    - type: Transform
+      pos: -4.5,-20.5
+      parent: 104
+  - uid: 582
+    components:
+    - type: Transform
+      pos: -4.5,-15.5
+      parent: 104
+  - uid: 586
+    components:
+    - type: Transform
+      pos: 4.5,-22.5
+      parent: 104
+  - uid: 587
+    components:
+    - type: Transform
+      pos: 5.5,-22.5
+      parent: 104
+  - uid: 588
+    components:
+    - type: Transform
+      pos: 6.5,-22.5
+      parent: 104
+  - uid: 589
+    components:
+    - type: Transform
+      pos: 7.5,-22.5
+      parent: 104
+  - uid: 590
+    components:
+    - type: Transform
+      pos: 8.5,-22.5
+      parent: 104
+  - uid: 595
+    components:
+    - type: Transform
+      pos: -5.5,-21.5
+      parent: 104
+  - uid: 596
+    components:
+    - type: Transform
+      pos: -5.5,-20.5
+      parent: 104
+  - uid: 597
+    components:
+    - type: Transform
+      pos: -5.5,-19.5
+      parent: 104
+  - uid: 598
+    components:
+    - type: Transform
+      pos: -5.5,-18.5
+      parent: 104
+  - uid: 599
+    components:
+    - type: Transform
+      pos: -5.5,-17.5
+      parent: 104
+  - uid: 600
+    components:
+    - type: Transform
+      pos: -5.5,-16.5
+      parent: 104
+  - uid: 601
+    components:
+    - type: Transform
+      pos: -5.5,-15.5
+      parent: 104
+  - uid: 602
+    components:
+    - type: Transform
+      pos: -5.5,-14.5
+      parent: 104
+  - uid: 603
+    components:
+    - type: Transform
+      pos: -5.5,-13.5
+      parent: 104
+  - uid: 604
+    components:
+    - type: Transform
+      pos: -5.5,-12.5
+      parent: 104
+  - uid: 605
+    components:
+    - type: Transform
+      pos: -5.5,-11.5
+      parent: 104
+  - uid: 606
+    components:
+    - type: Transform
+      pos: -5.5,-10.5
+      parent: 104
+  - uid: 607
+    components:
+    - type: Transform
+      pos: -5.5,-9.5
+      parent: 104
+  - uid: 608
+    components:
+    - type: Transform
+      pos: -5.5,-8.5
+      parent: 104
+  - uid: 609
+    components:
+    - type: Transform
+      pos: -5.5,-7.5
+      parent: 104
+  - uid: 610
+    components:
+    - type: Transform
+      pos: -14.5,16.5
+      parent: 104
+  - uid: 614
+    components:
+    - type: Transform
+      pos: -16.5,15.5
+      parent: 104
+  - uid: 615
+    components:
+    - type: Transform
+      pos: -10.5,9.5
+      parent: 104
+  - uid: 618
+    components:
+    - type: Transform
+      pos: -8.5,12.5
+      parent: 104
+  - uid: 621
+    components:
+    - type: Transform
+      pos: -9.5,9.5
+      parent: 104
+  - uid: 622
+    components:
+    - type: Transform
+      pos: -10.5,10.5
+      parent: 104
+  - uid: 632
+    components:
+    - type: Transform
+      pos: -10.5,12.5
+      parent: 104
+  - uid: 637
+    components:
+    - type: Transform
+      pos: -10.5,11.5
+      parent: 104
+  - uid: 640
+    components:
+    - type: Transform
+      pos: -16.5,5.5
+      parent: 104
+  - uid: 648
+    components:
+    - type: Transform
+      pos: -11.5,13.5
+      parent: 104
+  - uid: 670
+    components:
+    - type: Transform
+      pos: -18.5,10.5
+      parent: 104
+  - uid: 672
+    components:
+    - type: Transform
+      pos: -16.5,16.5
+      parent: 104
+  - uid: 673
+    components:
+    - type: Transform
+      pos: -11.5,12.5
+      parent: 104
+  - uid: 674
+    components:
+    - type: Transform
+      pos: -19.5,15.5
+      parent: 104
+  - uid: 676
+    components:
+    - type: Transform
+      pos: -19.5,16.5
+      parent: 104
+  - uid: 677
+    components:
+    - type: Transform
+      pos: -18.5,11.5
+      parent: 104
+  - uid: 678
+    components:
+    - type: Transform
+      pos: -14.5,11.5
+      parent: 104
+  - uid: 679
+    components:
+    - type: Transform
+      pos: -14.5,17.5
+      parent: 104
+  - uid: 680
+    components:
+    - type: Transform
+      pos: -14.5,18.5
+      parent: 104
+  - uid: 681
+    components:
+    - type: Transform
+      pos: -15.5,14.5
+      parent: 104
+  - uid: 682
+    components:
+    - type: Transform
+      pos: -24.5,25.5
+      parent: 104
+  - uid: 684
+    components:
+    - type: Transform
+      pos: -17.5,13.5
+      parent: 104
+  - uid: 685
+    components:
+    - type: Transform
+      pos: -15.5,16.5
+      parent: 104
+  - uid: 686
+    components:
+    - type: Transform
+      pos: -12.5,12.5
+      parent: 104
+  - uid: 687
+    components:
+    - type: Transform
+      pos: -12.5,11.5
+      parent: 104
+  - uid: 688
+    components:
+    - type: Transform
+      pos: -11.5,14.5
+      parent: 104
+  - uid: 689
+    components:
+    - type: Transform
+      pos: -15.5,15.5
+      parent: 104
+  - uid: 690
+    components:
+    - type: Transform
+      pos: -14.5,14.5
+      parent: 104
+  - uid: 691
+    components:
+    - type: Transform
+      pos: -19.5,14.5
+      parent: 104
+  - uid: 692
+    components:
+    - type: Transform
+      pos: -13.5,16.5
+      parent: 104
+  - uid: 693
+    components:
+    - type: Transform
+      pos: -17.5,15.5
+      parent: 104
+  - uid: 694
+    components:
+    - type: Transform
+      pos: -11.5,9.5
+      parent: 104
+  - uid: 695
+    components:
+    - type: Transform
+      pos: -20.5,23.5
+      parent: 104
+  - uid: 699
+    components:
+    - type: Transform
+      pos: -18.5,8.5
+      parent: 104
+  - uid: 700
+    components:
+    - type: Transform
+      pos: -18.5,9.5
+      parent: 104
+  - uid: 701
+    components:
+    - type: Transform
+      pos: -13.5,12.5
+      parent: 104
+  - uid: 702
+    components:
+    - type: Transform
+      pos: -13.5,17.5
+      parent: 104
+  - uid: 703
+    components:
+    - type: Transform
+      pos: -13.5,18.5
+      parent: 104
+  - uid: 704
+    components:
+    - type: Transform
+      pos: -15.5,18.5
+      parent: 104
+  - uid: 705
+    components:
+    - type: Transform
+      pos: -17.5,14.5
+      parent: 104
+  - uid: 706
+    components:
+    - type: Transform
+      pos: -11.5,11.5
+      parent: 104
+  - uid: 708
+    components:
+    - type: Transform
+      pos: -17.5,11.5
+      parent: 104
+  - uid: 709
+    components:
+    - type: Transform
+      pos: -17.5,16.5
+      parent: 104
+  - uid: 711
+    components:
+    - type: Transform
+      pos: -17.5,10.5
+      parent: 104
+  - uid: 712
+    components:
+    - type: Transform
+      pos: -15.5,17.5
+      parent: 104
+  - uid: 714
+    components:
+    - type: Transform
+      pos: -11.5,17.5
+      parent: 104
+  - uid: 716
+    components:
+    - type: Transform
+      pos: -13.5,13.5
+      parent: 104
+  - uid: 717
+    components:
+    - type: Transform
+      pos: -13.5,14.5
+      parent: 104
+  - uid: 718
+    components:
+    - type: Transform
+      pos: -18.5,14.5
+      parent: 104
+  - uid: 719
+    components:
+    - type: Transform
+      pos: -18.5,15.5
+      parent: 104
+  - uid: 720
+    components:
+    - type: Transform
+      pos: -18.5,16.5
+      parent: 104
+  - uid: 721
+    components:
+    - type: Transform
+      pos: -17.5,8.5
+      parent: 104
+  - uid: 722
+    components:
+    - type: Transform
+      pos: -16.5,13.5
+      parent: 104
+  - uid: 723
+    components:
+    - type: Transform
+      pos: -16.5,14.5
+      parent: 104
+  - uid: 724
+    components:
+    - type: Transform
+      pos: -12.5,17.5
+      parent: 104
+  - uid: 725
+    components:
+    - type: Transform
+      pos: -12.5,18.5
+      parent: 104
+  - uid: 726
+    components:
+    - type: Transform
+      pos: -14.5,12.5
+      parent: 104
+  - uid: 728
+    components:
+    - type: Transform
+      pos: -14.5,13.5
+      parent: 104
+  - uid: 729
+    components:
+    - type: Transform
+      pos: -18.5,17.5
+      parent: 104
+  - uid: 733
+    components:
+    - type: Transform
+      pos: -18.5,18.5
+      parent: 104
+  - uid: 734
+    components:
+    - type: Transform
+      pos: -18.5,19.5
+      parent: 104
+  - uid: 735
+    components:
+    - type: Transform
+      pos: -12.5,13.5
+      parent: 104
+  - uid: 740
+    components:
+    - type: Transform
+      pos: -12.5,15.5
+      parent: 104
+  - uid: 741
+    components:
+    - type: Transform
+      pos: -19.5,17.5
+      parent: 104
+  - uid: 745
+    components:
+    - type: Transform
+      pos: -19.5,18.5
+      parent: 104
+  - uid: 746
+    components:
+    - type: Transform
+      pos: -19.5,19.5
+      parent: 104
+  - uid: 747
+    components:
+    - type: Transform
+      pos: -16.5,17.5
+      parent: 104
+  - uid: 752
+    components:
+    - type: Transform
+      pos: -16.5,18.5
+      parent: 104
+  - uid: 753
+    components:
+    - type: Transform
+      pos: -15.5,11.5
+      parent: 104
+  - uid: 755
+    components:
+    - type: Transform
+      pos: -15.5,12.5
+      parent: 104
+  - uid: 756
+    components:
+    - type: Transform
+      pos: -12.5,14.5
+      parent: 104
+  - uid: 757
+    components:
+    - type: Transform
+      pos: -16.5,12.5
+      parent: 104
+  - uid: 758
+    components:
+    - type: Transform
+      pos: -13.5,15.5
+      parent: 104
+  - uid: 759
+    components:
+    - type: Transform
+      pos: -19.5,9.5
+      parent: 104
+  - uid: 762
+    components:
+    - type: Transform
+      pos: -17.5,9.5
+      parent: 104
+  - uid: 763
+    components:
+    - type: Transform
+      pos: -17.5,17.5
+      parent: 104
+  - uid: 764
+    components:
+    - type: Transform
+      pos: -17.5,18.5
+      parent: 104
+  - uid: 765
+    components:
+    - type: Transform
+      pos: -16.5,11.5
+      parent: 104
+  - uid: 768
+    components:
+    - type: Transform
+      pos: -19.5,8.5
+      parent: 104
+  - uid: 771
+    components:
+    - type: Transform
+      pos: -6.5,13.5
+      parent: 104
+  - uid: 774
+    components:
+    - type: Transform
+      pos: -10.5,18.5
+      parent: 104
+  - uid: 775
+    components:
+    - type: Transform
+      pos: -10.5,17.5
+      parent: 104
+  - uid: 776
+    components:
+    - type: Transform
+      pos: -10.5,16.5
+      parent: 104
+  - uid: 777
+    components:
+    - type: Transform
+      pos: -10.5,15.5
+      parent: 104
+  - uid: 778
+    components:
+    - type: Transform
+      pos: -10.5,14.5
+      parent: 104
+  - uid: 779
+    components:
+    - type: Transform
+      pos: -10.5,13.5
+      parent: 104
+  - uid: 780
+    components:
+    - type: Transform
+      pos: -9.5,19.5
+      parent: 104
+  - uid: 781
+    components:
+    - type: Transform
+      pos: -9.5,18.5
+      parent: 104
+  - uid: 782
+    components:
+    - type: Transform
+      pos: -9.5,17.5
+      parent: 104
+  - uid: 783
+    components:
+    - type: Transform
+      pos: -9.5,16.5
+      parent: 104
+  - uid: 784
+    components:
+    - type: Transform
+      pos: -9.5,15.5
+      parent: 104
+  - uid: 785
+    components:
+    - type: Transform
+      pos: -9.5,14.5
+      parent: 104
+  - uid: 786
+    components:
+    - type: Transform
+      pos: -9.5,13.5
+      parent: 104
+  - uid: 787
+    components:
+    - type: Transform
+      pos: -8.5,19.5
+      parent: 104
+  - uid: 788
+    components:
+    - type: Transform
+      pos: -8.5,18.5
+      parent: 104
+  - uid: 789
+    components:
+    - type: Transform
+      pos: -8.5,17.5
+      parent: 104
+  - uid: 790
+    components:
+    - type: Transform
+      pos: -8.5,15.5
+      parent: 104
+  - uid: 791
+    components:
+    - type: Transform
+      pos: -8.5,14.5
+      parent: 104
+  - uid: 792
+    components:
+    - type: Transform
+      pos: -8.5,13.5
+      parent: 104
+  - uid: 793
+    components:
+    - type: Transform
+      pos: -7.5,19.5
+      parent: 104
+  - uid: 794
+    components:
+    - type: Transform
+      pos: -7.5,18.5
+      parent: 104
+  - uid: 795
+    components:
+    - type: Transform
+      pos: -7.5,15.5
+      parent: 104
+  - uid: 796
+    components:
+    - type: Transform
+      pos: -7.5,14.5
+      parent: 104
+  - uid: 797
+    components:
+    - type: Transform
+      pos: -7.5,13.5
+      parent: 104
+  - uid: 798
+    components:
+    - type: Transform
+      pos: -15.5,13.5
+      parent: 104
+  - uid: 801
+    components:
+    - type: Transform
+      pos: -12.5,16.5
+      parent: 104
+  - uid: 802
+    components:
+    - type: Transform
+      pos: -14.5,15.5
+      parent: 104
+  - uid: 803
+    components:
+    - type: Transform
+      pos: -19.5,23.5
+      parent: 104
+  - uid: 804
+    components:
+    - type: Transform
+      pos: -24.5,24.5
+      parent: 104
+  - uid: 805
+    components:
+    - type: Transform
+      pos: -19.5,10.5
+      parent: 104
+  - uid: 806
+    components:
+    - type: Transform
+      pos: -17.5,12.5
+      parent: 104
+  - uid: 807
+    components:
+    - type: Transform
+      pos: -11.5,16.5
+      parent: 104
+  - uid: 808
+    components:
+    - type: Transform
+      pos: -11.5,15.5
+      parent: 104
+  - uid: 809
+    components:
+    - type: Transform
+      pos: -13.5,11.5
+      parent: 104
+  - uid: 810
+    components:
+    - type: Transform
+      pos: -19.5,20.5
+      parent: 104
+  - uid: 1020
+    components:
+    - type: Transform
+      pos: -18.5,20.5
+      parent: 104
+  - uid: 1021
+    components:
+    - type: Transform
+      pos: -10.5,20.5
+      parent: 104
+  - uid: 1027
+    components:
+    - type: Transform
+      pos: -9.5,20.5
+      parent: 104
+  - uid: 1028
+    components:
+    - type: Transform
+      pos: -8.5,20.5
+      parent: 104
+  - uid: 1029
+    components:
+    - type: Transform
+      pos: -7.5,20.5
+      parent: 104
+  - uid: 1030
+    components:
+    - type: Transform
+      pos: -2.5,20.5
+      parent: 104
+  - uid: 1031
+    components:
+    - type: Transform
+      pos: -1.5,20.5
+      parent: 104
+  - uid: 1032
+    components:
+    - type: Transform
+      pos: -0.5,20.5
+      parent: 104
+  - uid: 1033
+    components:
+    - type: Transform
+      pos: 9.5,22.5
+      parent: 104
+  - uid: 1036
+    components:
+    - type: Transform
+      pos: 10.5,20.5
+      parent: 104
+  - uid: 1041
+    components:
+    - type: Transform
+      pos: 11.5,20.5
+      parent: 104
+  - uid: 1042
+    components:
+    - type: Transform
+      pos: 12.5,20.5
+      parent: 104
+  - uid: 1043
+    components:
+    - type: Transform
+      pos: 13.5,20.5
+      parent: 104
+  - uid: 1044
+    components:
+    - type: Transform
+      pos: 16.5,20.5
+      parent: 104
+  - uid: 1045
+    components:
+    - type: Transform
+      pos: 17.5,20.5
+      parent: 104
+  - uid: 1046
+    components:
+    - type: Transform
+      pos: 18.5,20.5
+      parent: 104
+  - uid: 1047
+    components:
+    - type: Transform
+      pos: 19.5,20.5
+      parent: 104
+  - uid: 1048
+    components:
+    - type: Transform
+      pos: 19.5,19.5
+      parent: 104
+  - uid: 1049
+    components:
+    - type: Transform
+      pos: 19.5,18.5
+      parent: 104
+  - uid: 1050
+    components:
+    - type: Transform
+      pos: 19.5,16.5
+      parent: 104
+  - uid: 1051
+    components:
+    - type: Transform
+      pos: 19.5,15.5
+      parent: 104
+  - uid: 1052
+    components:
+    - type: Transform
+      pos: 19.5,14.5
+      parent: 104
+  - uid: 1053
+    components:
+    - type: Transform
+      pos: 19.5,12.5
+      parent: 104
+  - uid: 1054
+    components:
+    - type: Transform
+      pos: 19.5,11.5
+      parent: 104
+  - uid: 1055
+    components:
+    - type: Transform
+      pos: 19.5,10.5
+      parent: 104
+  - uid: 1056
+    components:
+    - type: Transform
+      pos: -11.5,20.5
+      parent: 104
+  - uid: 1057
+    components:
+    - type: Transform
+      pos: 15.5,3.5
+      parent: 104
+  - uid: 1058
+    components:
+    - type: Transform
+      pos: 22.5,4.5
+      parent: 104
+  - uid: 1059
+    components:
+    - type: Transform
+      pos: 23.5,4.5
+      parent: 104
+  - uid: 1060
+    components:
+    - type: Transform
+      pos: 24.5,4.5
+      parent: 104
+  - uid: 1064
+    components:
+    - type: Transform
+      pos: 28.5,4.5
+      parent: 104
+  - uid: 1065
+    components:
+    - type: Transform
+      pos: 29.5,4.5
+      parent: 104
+  - uid: 1066
+    components:
+    - type: Transform
+      pos: 30.5,4.5
+      parent: 104
+  - uid: 1067
+    components:
+    - type: Transform
+      pos: 32.5,0.5
+      parent: 104
+  - uid: 1068
+    components:
+    - type: Transform
+      pos: 32.5,-0.5
+      parent: 104
+  - uid: 1069
+    components:
+    - type: Transform
+      pos: 32.5,-3.5
+      parent: 104
+  - uid: 1070
+    components:
+    - type: Transform
+      pos: 32.5,-12.5
+      parent: 104
+  - uid: 1071
+    components:
+    - type: Transform
+      pos: 32.5,-13.5
+      parent: 104
+  - uid: 1072
+    components:
+    - type: Transform
+      pos: 32.5,-14.5
+      parent: 104
+  - uid: 1073
+    components:
+    - type: Transform
+      pos: 32.5,-15.5
+      parent: 104
+  - uid: 1074
+    components:
+    - type: Transform
+      pos: 32.5,-16.5
+      parent: 104
+  - uid: 1075
+    components:
+    - type: Transform
+      pos: 32.5,-17.5
+      parent: 104
+  - uid: 1076
+    components:
+    - type: Transform
+      pos: 32.5,-18.5
+      parent: 104
+  - uid: 1077
+    components:
+    - type: Transform
+      pos: 32.5,-19.5
+      parent: 104
+  - uid: 1078
+    components:
+    - type: Transform
+      pos: 32.5,-20.5
+      parent: 104
+  - uid: 1079
+    components:
+    - type: Transform
+      pos: 32.5,-21.5
+      parent: 104
+  - uid: 1083
+    components:
+    - type: Transform
+      pos: -4.5,-16.5
+      parent: 104
+  - uid: 1084
+    components:
+    - type: Transform
+      pos: -4.5,-21.5
+      parent: 104
+  - uid: 1085
+    components:
+    - type: Transform
+      pos: 28.5,-23.5
+      parent: 104
+  - uid: 1092
+    components:
+    - type: Transform
+      pos: 27.5,-23.5
+      parent: 104
+  - uid: 1093
+    components:
+    - type: Transform
+      pos: 26.5,-23.5
+      parent: 104
+  - uid: 1094
+    components:
+    - type: Transform
+      pos: 25.5,-23.5
+      parent: 104
+  - uid: 1095
+    components:
+    - type: Transform
+      pos: 24.5,-23.5
+      parent: 104
+  - uid: 1096
+    components:
+    - type: Transform
+      pos: 23.5,-23.5
+      parent: 104
+  - uid: 1097
+    components:
+    - type: Transform
+      pos: 22.5,-23.5
+      parent: 104
+  - uid: 1098
+    components:
+    - type: Transform
+      pos: 21.5,-23.5
+      parent: 104
+  - uid: 1099
+    components:
+    - type: Transform
+      pos: 20.5,-23.5
+      parent: 104
+  - uid: 1100
+    components:
+    - type: Transform
+      pos: 19.5,-23.5
+      parent: 104
+  - uid: 1101
+    components:
+    - type: Transform
+      pos: 18.5,-23.5
+      parent: 104
+  - uid: 1105
+    components:
+    - type: Transform
+      pos: 8.5,-23.5
+      parent: 104
+  - uid: 1106
+    components:
+    - type: Transform
+      pos: 7.5,-23.5
+      parent: 104
+  - uid: 1107
+    components:
+    - type: Transform
+      pos: 6.5,-23.5
+      parent: 104
+  - uid: 1108
+    components:
+    - type: Transform
+      pos: 5.5,-23.5
+      parent: 104
+  - uid: 1109
+    components:
+    - type: Transform
+      pos: -23.5,23.5
+      parent: 104
+  - uid: 1155
+    components:
+    - type: Transform
+      pos: -23.5,24.5
+      parent: 104
+  - uid: 1156
+    components:
+    - type: Transform
+      pos: -23.5,25.5
+      parent: 104
+  - uid: 1157
+    components:
+    - type: Transform
+      pos: -22.5,32.5
+      parent: 104
+  - uid: 1158
+    components:
+    - type: Transform
+      pos: -23.5,30.5
+      parent: 104
+  - uid: 1160
+    components:
+    - type: Transform
+      pos: -23.5,31.5
+      parent: 104
+  - uid: 1161
+    components:
+    - type: Transform
+      pos: -22.5,23.5
+      parent: 104
+  - uid: 1162
+    components:
+    - type: Transform
+      pos: -22.5,24.5
+      parent: 104
+  - uid: 1163
+    components:
+    - type: Transform
+      pos: -22.5,25.5
+      parent: 104
+  - uid: 1164
+    components:
+    - type: Transform
+      pos: -21.5,26.5
+      parent: 104
+  - uid: 1165
+    components:
+    - type: Transform
+      pos: -22.5,30.5
+      parent: 104
+  - uid: 1166
+    components:
+    - type: Transform
+      pos: -21.5,30.5
+      parent: 104
+  - uid: 1167
+    components:
+    - type: Transform
+      pos: -24.5,31.5
+      parent: 104
+  - uid: 1168
+    components:
+    - type: Transform
+      pos: -23.5,20.5
+      parent: 104
+  - uid: 1169
+    components:
+    - type: Transform
+      pos: -24.5,21.5
+      parent: 104
+  - uid: 1170
+    components:
+    - type: Transform
+      pos: -22.5,31.5
+      parent: 104
+  - uid: 1171
+    components:
+    - type: Transform
+      pos: -25.5,30.5
+      parent: 104
+  - uid: 1172
+    components:
+    - type: Transform
+      pos: -25.5,31.5
+      parent: 104
+  - uid: 1173
+    components:
+    - type: Transform
+      pos: -25.5,32.5
+      parent: 104
+  - uid: 1174
+    components:
+    - type: Transform
+      pos: -23.5,21.5
+      parent: 104
+  - uid: 1175
+    components:
+    - type: Transform
+      pos: -23.5,29.5
+      parent: 104
+  - uid: 1176
+    components:
+    - type: Transform
+      pos: -22.5,20.5
+      parent: 104
+  - uid: 1177
+    components:
+    - type: Transform
+      pos: -23.5,15.5
+      parent: 104
+  - uid: 1178
+    components:
+    - type: Transform
+      pos: -23.5,13.5
+      parent: 104
+  - uid: 1179
+    components:
+    - type: Transform
+      pos: -22.5,13.5
+      parent: 104
+  - uid: 1180
+    components:
+    - type: Transform
+      pos: -11.5,10.5
+      parent: 104
+  - uid: 1224
+    components:
+    - type: Transform
+      pos: -23.5,14.5
+      parent: 104
+  - uid: 1250
+    components:
+    - type: Transform
+      pos: 1.5,-10.5
+      parent: 104
+  - uid: 1390
+    components:
+    - type: Transform
+      pos: -0.5,-10.5
+      parent: 104
+  - uid: 1391
+    components:
+    - type: Transform
+      pos: -23.5,28.5
+      parent: 104
+  - uid: 1392
+    components:
+    - type: Transform
+      pos: -24.5,30.5
+      parent: 104
+  - uid: 1393
+    components:
+    - type: Transform
+      pos: -23.5,32.5
+      parent: 104
+  - uid: 1394
+    components:
+    - type: Transform
+      pos: -22.5,26.5
+      parent: 104
+  - uid: 1395
+    components:
+    - type: Transform
+      pos: -23.5,26.5
+      parent: 104
+  - uid: 1396
+    components:
+    - type: Transform
+      pos: -24.5,32.5
+      parent: 104
+  - uid: 1397
+    components:
+    - type: Transform
+      pos: -23.5,27.5
+      parent: 104
+  - uid: 1398
+    components:
+    - type: Transform
+      pos: -22.5,28.5
+      parent: 104
+  - uid: 1399
+    components:
+    - type: Transform
+      pos: -21.5,29.5
+      parent: 104
+  - uid: 1400
+    components:
+    - type: Transform
+      pos: -22.5,29.5
+      parent: 104
+  - uid: 1401
+    components:
+    - type: Transform
+      pos: -22.5,27.5
+      parent: 104
+  - uid: 1402
+    components:
+    - type: Transform
+      pos: -21.5,27.5
+      parent: 104
+  - uid: 1403
+    components:
+    - type: Transform
+      pos: -21.5,28.5
+      parent: 104
+  - uid: 1404
+    components:
+    - type: Transform
+      pos: -21.5,25.5
+      parent: 104
+  - uid: 1405
+    components:
+    - type: Transform
+      pos: -21.5,24.5
+      parent: 104
+  - uid: 1406
+    components:
+    - type: Transform
+      pos: -21.5,23.5
+      parent: 104
+  - uid: 1407
+    components:
+    - type: Transform
+      pos: 6.5,-24.5
+      parent: 104
+  - uid: 1408
+    components:
+    - type: Transform
+      pos: 7.5,-24.5
+      parent: 104
+  - uid: 1415
+    components:
+    - type: Transform
+      pos: 3.5,-21.5
+      parent: 104
+  - uid: 1416
+    components:
+    - type: Transform
+      pos: 4.5,-21.5
+      parent: 104
+  - uid: 1417
+    components:
+    - type: Transform
+      pos: 20.5,-24.5
+      parent: 104
+  - uid: 1418
+    components:
+    - type: Transform
+      pos: 21.5,-24.5
+      parent: 104
+  - uid: 1419
+    components:
+    - type: Transform
+      pos: 22.5,-24.5
+      parent: 104
+  - uid: 1420
+    components:
+    - type: Transform
+      pos: 23.5,-24.5
+      parent: 104
+  - uid: 1421
+    components:
+    - type: Transform
+      pos: 24.5,-24.5
+      parent: 104
+  - uid: 1422
+    components:
+    - type: Transform
+      pos: 25.5,-24.5
+      parent: 104
+  - uid: 1423
+    components:
+    - type: Transform
+      pos: 26.5,-24.5
+      parent: 104
+  - uid: 1424
+    components:
+    - type: Transform
+      pos: 27.5,-24.5
+      parent: 104
+  - uid: 1425
+    components:
+    - type: Transform
+      pos: -4.5,-22.5
+      parent: 104
+  - uid: 1427
+    components:
+    - type: Transform
+      pos: -4.5,-17.5
+      parent: 104
+  - uid: 1433
+    components:
+    - type: Transform
+      pos: 5.5,-24.5
+      parent: 104
+  - uid: 1434
+    components:
+    - type: Transform
+      pos: 33.5,-21.5
+      parent: 104
+  - uid: 1435
+    components:
+    - type: Transform
+      pos: 33.5,-20.5
+      parent: 104
+  - uid: 1436
+    components:
+    - type: Transform
+      pos: 33.5,-19.5
+      parent: 104
+  - uid: 1437
+    components:
+    - type: Transform
+      pos: 33.5,-18.5
+      parent: 104
+  - uid: 1440
+    components:
+    - type: Transform
+      pos: 33.5,-17.5
+      parent: 104
+  - uid: 1441
+    components:
+    - type: Transform
+      pos: 33.5,-16.5
+      parent: 104
+  - uid: 1442
+    components:
+    - type: Transform
+      pos: 33.5,-15.5
+      parent: 104
+  - uid: 1443
+    components:
+    - type: Transform
+      pos: 33.5,-14.5
+      parent: 104
+  - uid: 1444
+    components:
+    - type: Transform
+      pos: 33.5,-13.5
+      parent: 104
+  - uid: 1446
+    components:
+    - type: Transform
+      pos: 33.5,-12.5
+      parent: 104
+  - uid: 1447
+    components:
+    - type: Transform
+      pos: 30.5,5.5
+      parent: 104
+  - uid: 1448
+    components:
+    - type: Transform
+      pos: 29.5,5.5
+      parent: 104
+  - uid: 1472
+    components:
+    - type: Transform
+      pos: 28.5,5.5
+      parent: 104
+  - uid: 1542
+    components:
+    - type: Transform
+      pos: 24.5,5.5
+      parent: 104
+  - uid: 1550
+    components:
+    - type: Transform
+      pos: 23.5,5.5
+      parent: 104
+  - uid: 1552
+    components:
+    - type: Transform
+      pos: 22.5,5.5
+      parent: 104
+  - uid: 1553
+    components:
+    - type: Transform
+      pos: 21.5,5.5
+      parent: 104
+  - uid: 1557
+    components:
+    - type: Transform
+      pos: 19.5,19.5
+      parent: 104
+  - uid: 1559
+    components:
+    - type: Transform
+      pos: 19.5,20.5
+      parent: 104
+  - uid: 1560
+    components:
+    - type: Transform
+      pos: 19.5,21.5
+      parent: 104
+  - uid: 1562
+    components:
+    - type: Transform
+      pos: -11.5,19.5
+      parent: 104
+  - uid: 1564
+    components:
+    - type: Transform
+      pos: -11.5,18.5
+      parent: 104
+  - uid: 1566
+    components:
+    - type: Transform
+      pos: 20.5,9.5
+      parent: 104
+  - uid: 1567
+    components:
+    - type: Transform
+      pos: 20.5,10.5
+      parent: 104
+  - uid: 1568
+    components:
+    - type: Transform
+      pos: 20.5,11.5
+      parent: 104
+  - uid: 1569
+    components:
+    - type: Transform
+      pos: 20.5,12.5
+      parent: 104
+  - uid: 1594
+    components:
+    - type: Transform
+      pos: 20.5,13.5
+      parent: 104
+  - uid: 1598
+    components:
+    - type: Transform
+      pos: 20.5,14.5
+      parent: 104
+  - uid: 1599
+    components:
+    - type: Transform
+      pos: 20.5,15.5
+      parent: 104
+  - uid: 1600
+    components:
+    - type: Transform
+      pos: 20.5,16.5
+      parent: 104
+  - uid: 1601
+    components:
+    - type: Transform
+      pos: 20.5,17.5
+      parent: 104
+  - uid: 1602
+    components:
+    - type: Transform
+      pos: 20.5,18.5
+      parent: 104
+  - uid: 1603
+    components:
+    - type: Transform
+      pos: 20.5,19.5
+      parent: 104
+  - uid: 1604
+    components:
+    - type: Transform
+      pos: 20.5,20.5
+      parent: 104
+  - uid: 1605
+    components:
+    - type: Transform
+      pos: 20.5,21.5
+      parent: 104
+  - uid: 1606
+    components:
+    - type: Transform
+      pos: -10.5,19.5
+      parent: 104
+  - uid: 1607
+    components:
+    - type: Transform
+      pos: 19.5,11.5
+      parent: 104
+  - uid: 1608
+    components:
+    - type: Transform
+      pos: 19.5,12.5
+      parent: 104
+  - uid: 1609
+    components:
+    - type: Transform
+      pos: 19.5,15.5
+      parent: 104
+  - uid: 1610
+    components:
+    - type: Transform
+      pos: 18.5,21.5
+      parent: 104
+  - uid: 1611
+    components:
+    - type: Transform
+      pos: 17.5,21.5
+      parent: 104
+  - uid: 1612
+    components:
+    - type: Transform
+      pos: 16.5,21.5
+      parent: 104
+  - uid: 1613
+    components:
+    - type: Transform
+      pos: 15.5,21.5
+      parent: 104
+  - uid: 1614
+    components:
+    - type: Transform
+      pos: 14.5,21.5
+      parent: 104
+  - uid: 1615
+    components:
+    - type: Transform
+      pos: 13.5,21.5
+      parent: 104
+  - uid: 1616
+    components:
+    - type: Transform
+      pos: 12.5,21.5
+      parent: 104
+  - uid: 1623
+    components:
+    - type: Transform
+      pos: 11.5,21.5
+      parent: 104
+  - uid: 1625
+    components:
+    - type: Transform
+      pos: 10.5,21.5
+      parent: 104
+  - uid: 1632
+    components:
+    - type: Transform
+      pos: 9.5,21.5
+      parent: 104
+  - uid: 1636
+    components:
+    - type: Transform
+      pos: -0.5,21.5
+      parent: 104
+  - uid: 1637
+    components:
+    - type: Transform
+      pos: -1.5,21.5
+      parent: 104
+  - uid: 1638
+    components:
+    - type: Transform
+      pos: -2.5,21.5
+      parent: 104
+  - uid: 1639
+    components:
+    - type: Transform
+      pos: -0.5,22.5
+      parent: 104
+  - uid: 1640
+    components:
+    - type: Transform
+      pos: -1.5,22.5
+      parent: 104
+  - uid: 1641
+    components:
+    - type: Transform
+      pos: -2.5,22.5
+      parent: 104
+  - uid: 1642
+    components:
+    - type: Transform
+      pos: -3.5,22.5
+      parent: 104
+  - uid: 1643
+    components:
+    - type: Transform
+      pos: -7.5,22.5
+      parent: 104
+  - uid: 1644
+    components:
+    - type: Transform
+      pos: -8.5,22.5
+      parent: 104
+  - uid: 1645
+    components:
+    - type: Transform
+      pos: -8.5,23.5
+      parent: 104
+  - uid: 1646
+    components:
+    - type: Transform
+      pos: -9.5,23.5
+      parent: 104
+  - uid: 1647
+    components:
+    - type: Transform
+      pos: -10.5,23.5
+      parent: 104
+  - uid: 1649
+    components:
+    - type: Transform
+      pos: 28.5,7.5
+      parent: 104
+  - uid: 1650
+    components:
+    - type: Transform
+      pos: 28.5,8.5
+      parent: 104
+  - uid: 1651
+    components:
+    - type: Transform
+      pos: 22.5,13.5
+      parent: 104
+  - uid: 1657
+    components:
+    - type: Transform
+      pos: 23.5,13.5
+      parent: 104
+  - uid: 1658
+    components:
+    - type: Transform
+      pos: 17.5,22.5
+      parent: 104
+  - uid: 1659
+    components:
+    - type: Transform
+      pos: 24.5,16.5
+      parent: 104
+  - uid: 1660
+    components:
+    - type: Transform
+      pos: 24.5,15.5
+      parent: 104
+  - uid: 1661
+    components:
+    - type: Transform
+      pos: 24.5,14.5
+      parent: 104
+  - uid: 1662
+    components:
+    - type: Transform
+      pos: 23.5,17.5
+      parent: 104
+  - uid: 1663
+    components:
+    - type: Transform
+      pos: 28.5,6.5
+      parent: 104
+  - uid: 1664
+    components:
+    - type: Transform
+      pos: 23.5,14.5
+      parent: 104
+  - uid: 1665
+    components:
+    - type: Transform
+      pos: 22.5,14.5
+      parent: 104
+  - uid: 1666
+    components:
+    - type: Transform
+      pos: 23.5,12.5
+      parent: 104
+  - uid: 1667
+    components:
+    - type: Transform
+      pos: 21.5,8.5
+      parent: 104
+  - uid: 1676
+    components:
+    - type: Transform
+      pos: 24.5,9.5
+      parent: 104
+  - uid: 1677
+    components:
+    - type: Transform
+      pos: 24.5,10.5
+      parent: 104
+  - uid: 1678
+    components:
+    - type: Transform
+      pos: 24.5,17.5
+      parent: 104
+  - uid: 1679
+    components:
+    - type: Transform
+      pos: 23.5,16.5
+      parent: 104
+  - uid: 1682
+    components:
+    - type: Transform
+      pos: 23.5,15.5
+      parent: 104
+  - uid: 1683
+    components:
+    - type: Transform
+      pos: 24.5,11.5
+      parent: 104
+  - uid: 1685
+    components:
+    - type: Transform
+      pos: 23.5,11.5
+      parent: 104
+  - uid: 1686
+    components:
+    - type: Transform
+      pos: 21.5,9.5
+      parent: 104
+  - uid: 1687
+    components:
+    - type: Transform
+      pos: 27.5,7.5
+      parent: 104
+  - uid: 1688
+    components:
+    - type: Transform
+      pos: 27.5,8.5
+      parent: 104
+  - uid: 1691
+    components:
+    - type: Transform
+      pos: 26.5,8.5
+      parent: 104
+  - uid: 1692
+    components:
+    - type: Transform
+      pos: 22.5,15.5
+      parent: 104
+  - uid: 1693
+    components:
+    - type: Transform
+      pos: 24.5,12.5
+      parent: 104
+  - uid: 1695
+    components:
+    - type: Transform
+      pos: 23.5,10.5
+      parent: 104
+  - uid: 1696
+    components:
+    - type: Transform
+      pos: 22.5,10.5
+      parent: 104
+  - uid: 1698
+    components:
+    - type: Transform
+      pos: 12.5,22.5
+      parent: 104
+  - uid: 1700
+    components:
+    - type: Transform
+      pos: 25.5,9.5
+      parent: 104
+  - uid: 1701
+    components:
+    - type: Transform
+      pos: 25.5,10.5
+      parent: 104
+  - uid: 1702
+    components:
+    - type: Transform
+      pos: 13.5,22.5
+      parent: 104
+  - uid: 1709
+    components:
+    - type: Transform
+      pos: 24.5,13.5
+      parent: 104
+  - uid: 1710
+    components:
+    - type: Transform
+      pos: 22.5,8.5
+      parent: 104
+  - uid: 1712
+    components:
+    - type: Transform
+      pos: 22.5,9.5
+      parent: 104
+  - uid: 1713
+    components:
+    - type: Transform
+      pos: 11.5,22.5
+      parent: 104
+  - uid: 1714
+    components:
+    - type: Transform
+      pos: 25.5,11.5
+      parent: 104
+  - uid: 1715
+    components:
+    - type: Transform
+      pos: 22.5,16.5
+      parent: 104
+  - uid: 1716
+    components:
+    - type: Transform
+      pos: 22.5,17.5
+      parent: 104
+  - uid: 1717
+    components:
+    - type: Transform
+      pos: 19.5,22.5
+      parent: 104
+  - uid: 1719
+    components:
+    - type: Transform
+      pos: 21.5,13.5
+      parent: 104
+  - uid: 1720
+    components:
+    - type: Transform
+      pos: 23.5,9.5
+      parent: 104
+  - uid: 1721
+    components:
+    - type: Transform
+      pos: 21.5,11.5
+      parent: 104
+  - uid: 1722
+    components:
+    - type: Transform
+      pos: 22.5,11.5
+      parent: 104
+  - uid: 1723
+    components:
+    - type: Transform
+      pos: 10.5,22.5
+      parent: 104
+  - uid: 1724
+    components:
+    - type: Transform
+      pos: 22.5,18.5
+      parent: 104
+  - uid: 1725
+    components:
+    - type: Transform
+      pos: 16.5,22.5
+      parent: 104
+  - uid: 1726
+    components:
+    - type: Transform
+      pos: 15.5,22.5
+      parent: 104
+  - uid: 1727
+    components:
+    - type: Transform
+      pos: 14.5,22.5
+      parent: 104
+  - uid: 1729
+    components:
+    - type: Transform
+      pos: 23.5,13.5
+      parent: 104
+  - uid: 1731
+    components:
+    - type: Transform
+      pos: -11.5,21.5
+      parent: 104
+  - uid: 1732
+    components:
+    - type: Transform
+      pos: 22.5,12.5
+      parent: 104
+  - uid: 1733
+    components:
+    - type: Transform
+      pos: 27.5,6.5
+      parent: 104
+  - uid: 1734
+    components:
+    - type: Transform
+      pos: 22.5,19.5
+      parent: 104
+  - uid: 1735
+    components:
+    - type: Transform
+      pos: 18.5,22.5
+      parent: 104
+  - uid: 1736
+    components:
+    - type: Transform
+      pos: 21.5,21.5
+      parent: 104
+  - uid: 1740
+    components:
+    - type: Transform
+      pos: -11.5,20.5
+      parent: 104
+  - uid: 1741
+    components:
+    - type: Transform
+      pos: 21.5,10.5
+      parent: 104
+  - uid: 1742
+    components:
+    - type: Transform
+      pos: 21.5,20.5
+      parent: 104
+  - uid: 1743
+    components:
+    - type: Transform
+      pos: 20.5,22.5
+      parent: 104
+  - uid: 1744
+    components:
+    - type: Transform
+      pos: 21.5,19.5
+      parent: 104
+  - uid: 1745
+    components:
+    - type: Transform
+      pos: 21.5,18.5
+      parent: 104
+  - uid: 1746
+    components:
+    - type: Transform
+      pos: 21.5,17.5
+      parent: 104
+  - uid: 1747
+    components:
+    - type: Transform
+      pos: 21.5,16.5
+      parent: 104
+  - uid: 1748
+    components:
+    - type: Transform
+      pos: 21.5,15.5
+      parent: 104
+  - uid: 1749
+    components:
+    - type: Transform
+      pos: 21.5,14.5
+      parent: 104
+  - uid: 1750
+    components:
+    - type: Transform
+      pos: 21.5,12.5
+      parent: 104
+  - uid: 1751
+    components:
+    - type: Transform
+      pos: 9.5,19.5
+      parent: 104
+  - uid: 1752
+    components:
+    - type: Transform
+      pos: -2.5,23.5
+      parent: 104
+  - uid: 1753
+    components:
+    - type: Transform
+      pos: -3.5,23.5
+      parent: 104
+  - uid: 1754
+    components:
+    - type: Transform
+      pos: -4.5,23.5
+      parent: 104
+  - uid: 1755
+    components:
+    - type: Transform
+      pos: -5.5,23.5
+      parent: 104
+  - uid: 1756
+    components:
+    - type: Transform
+      pos: -6.5,23.5
+      parent: 104
+  - uid: 1757
+    components:
+    - type: Transform
+      pos: -7.5,23.5
+      parent: 104
+  - uid: 1762
+    components:
+    - type: Transform
+      pos: 1.5,-18.5
+      parent: 104
+  - uid: 1767
+    components:
+    - type: Transform
+      pos: -19.5,7.5
+      parent: 104
+  - uid: 1768
+    components:
+    - type: Transform
+      pos: -19.5,6.5
+      parent: 104
+  - uid: 1769
+    components:
+    - type: Transform
+      pos: -19.5,5.5
+      parent: 104
+  - uid: 1770
+    components:
+    - type: Transform
+      pos: -18.5,7.5
+      parent: 104
+  - uid: 1771
+    components:
+    - type: Transform
+      pos: -18.5,6.5
+      parent: 104
+  - uid: 1772
+    components:
+    - type: Transform
+      pos: -18.5,5.5
+      parent: 104
+  - uid: 1773
+    components:
+    - type: Transform
+      pos: -17.5,7.5
+      parent: 104
+  - uid: 1774
+    components:
+    - type: Transform
+      pos: -17.5,6.5
+      parent: 104
+  - uid: 1775
+    components:
+    - type: Transform
+      pos: -17.5,5.5
+      parent: 104
+  - uid: 1776
+    components:
+    - type: Transform
+      pos: -21.5,19.5
+      parent: 104
+  - uid: 1777
+    components:
+    - type: Transform
+      pos: -22.5,19.5
+      parent: 104
+  - uid: 1778
+    components:
+    - type: Transform
+      pos: -21.5,18.5
+      parent: 104
+  - uid: 1779
+    components:
+    - type: Transform
+      pos: -22.5,18.5
+      parent: 104
+  - uid: 1780
+    components:
+    - type: Transform
+      pos: -22.5,17.5
+      parent: 104
+  - uid: 1781
+    components:
+    - type: Transform
+      pos: -23.5,17.5
+      parent: 104
+  - uid: 1782
+    components:
+    - type: Transform
+      pos: -23.5,16.5
+      parent: 104
+  - uid: 1792
+    components:
+    - type: Transform
+      pos: 4.5,-19.5
+      parent: 104
+  - uid: 1793
+    components:
+    - type: Transform
+      pos: 4.5,-20.5
+      parent: 104
+  - uid: 1794
+    components:
+    - type: Transform
+      pos: 2.5,-19.5
+      parent: 104
+  - uid: 1795
+    components:
+    - type: Transform
+      pos: 2.5,-20.5
+      parent: 104
+  - uid: 1796
+    components:
+    - type: Transform
+      pos: -1.5,-10.5
+      parent: 104
+  - uid: 1797
+    components:
+    - type: Transform
+      pos: 3.5,-19.5
+      parent: 104
+  - uid: 1798
+    components:
+    - type: Transform
+      pos: 3.5,-20.5
+      parent: 104
+  - uid: 1801
+    components:
+    - type: Transform
+      pos: 7.5,-19.5
+      parent: 104
+  - uid: 1802
+    components:
+    - type: Transform
+      pos: 7.5,-20.5
+      parent: 104
+  - uid: 1803
+    components:
+    - type: Transform
+      pos: 7.5,-21.5
+      parent: 104
+  - uid: 1804
+    components:
+    - type: Transform
+      pos: 5.5,-19.5
+      parent: 104
+  - uid: 1805
+    components:
+    - type: Transform
+      pos: 5.5,-20.5
+      parent: 104
+  - uid: 1806
+    components:
+    - type: Transform
+      pos: 5.5,-21.5
+      parent: 104
+  - uid: 1807
+    components:
+    - type: Transform
+      pos: 6.5,-19.5
+      parent: 104
+  - uid: 1808
+    components:
+    - type: Transform
+      pos: 6.5,-20.5
+      parent: 104
+  - uid: 1809
+    components:
+    - type: Transform
+      pos: 6.5,-21.5
+      parent: 104
+  - uid: 1835
+    components:
+    - type: Transform
+      pos: 8.5,-19.5
+      parent: 104
+  - uid: 1836
+    components:
+    - type: Transform
+      pos: 8.5,-20.5
+      parent: 104
+  - uid: 1837
+    components:
+    - type: Transform
+      pos: 8.5,-21.5
+      parent: 104
+  - uid: 1865
+    components:
+    - type: Transform
+      pos: 16.5,-21.5
+      parent: 104
+  - uid: 1870
+    components:
+    - type: Transform
+      pos: 17.5,-21.5
+      parent: 104
+  - uid: 1875
+    components:
+    - type: Transform
+      pos: 18.5,-21.5
+      parent: 104
+  - uid: 1880
+    components:
+    - type: Transform
+      pos: 19.5,-21.5
+      parent: 104
+  - uid: 1884
+    components:
+    - type: Transform
+      pos: 20.5,-21.5
+      parent: 104
+  - uid: 1888
+    components:
+    - type: Transform
+      pos: 21.5,-21.5
+      parent: 104
+  - uid: 1892
+    components:
+    - type: Transform
+      pos: 22.5,-21.5
+      parent: 104
+  - uid: 1896
+    components:
+    - type: Transform
+      pos: 23.5,-21.5
+      parent: 104
+  - uid: 1900
+    components:
+    - type: Transform
+      pos: 24.5,-21.5
+      parent: 104
+  - uid: 1904
+    components:
+    - type: Transform
+      pos: 25.5,-21.5
+      parent: 104
+  - uid: 1909
+    components:
+    - type: Transform
+      pos: 28.5,-11.5
+      parent: 104
+  - uid: 1910
+    components:
+    - type: Transform
+      pos: 28.5,-10.5
+      parent: 104
+  - uid: 1911
+    components:
+    - type: Transform
+      pos: 28.5,-9.5
+      parent: 104
+  - uid: 1912
+    components:
+    - type: Transform
+      pos: 28.5,-8.5
+      parent: 104
+  - uid: 1913
+    components:
+    - type: Transform
+      pos: 26.5,-21.5
+      parent: 104
+  - uid: 1923
+    components:
+    - type: Transform
+      pos: 26.5,-11.5
+      parent: 104
+  - uid: 1924
+    components:
+    - type: Transform
+      pos: 26.5,-10.5
+      parent: 104
+  - uid: 1925
+    components:
+    - type: Transform
+      pos: 26.5,-9.5
+      parent: 104
+  - uid: 1926
+    components:
+    - type: Transform
+      pos: 26.5,-8.5
+      parent: 104
+  - uid: 1927
+    components:
+    - type: Transform
+      pos: 26.5,-7.5
+      parent: 104
+  - uid: 1928
+    components:
+    - type: Transform
+      pos: 26.5,-6.5
+      parent: 104
+  - uid: 1930
+    components:
+    - type: Transform
+      pos: 26.5,-5.5
+      parent: 104
+  - uid: 1934
+    components:
+    - type: Transform
+      pos: 26.5,-4.5
+      parent: 104
+  - uid: 1935
+    components:
+    - type: Transform
+      pos: 26.5,-3.5
+      parent: 104
+  - uid: 1936
+    components:
+    - type: Transform
+      pos: 26.5,-2.5
+      parent: 104
+  - uid: 1937
+    components:
+    - type: Transform
+      pos: 26.5,-1.5
+      parent: 104
+  - uid: 1938
+    components:
+    - type: Transform
+      pos: 26.5,-0.5
+      parent: 104
+  - uid: 1939
+    components:
+    - type: Transform
+      pos: 26.5,0.5
+      parent: 104
+  - uid: 1940
+    components:
+    - type: Transform
+      pos: 26.5,1.5
+      parent: 104
+  - uid: 1942
+    components:
+    - type: Transform
+      pos: 27.5,-21.5
+      parent: 104
+  - uid: 1952
+    components:
+    - type: Transform
+      pos: 27.5,-11.5
+      parent: 104
+  - uid: 1953
+    components:
+    - type: Transform
+      pos: 27.5,-10.5
+      parent: 104
+  - uid: 1954
+    components:
+    - type: Transform
+      pos: 27.5,-9.5
+      parent: 104
+  - uid: 1955
+    components:
+    - type: Transform
+      pos: 27.5,-8.5
+      parent: 104
+  - uid: 1956
+    components:
+    - type: Transform
+      pos: 27.5,-7.5
+      parent: 104
+  - uid: 1957
+    components:
+    - type: Transform
+      pos: 27.5,-6.5
+      parent: 104
+  - uid: 1958
+    components:
+    - type: Transform
+      pos: 27.5,-5.5
+      parent: 104
+  - uid: 1959
+    components:
+    - type: Transform
+      pos: 27.5,-4.5
+      parent: 104
+  - uid: 1960
+    components:
+    - type: Transform
+      pos: 27.5,-3.5
+      parent: 104
+  - uid: 1961
+    components:
+    - type: Transform
+      pos: 27.5,-2.5
+      parent: 104
+  - uid: 1962
+    components:
+    - type: Transform
+      pos: 27.5,-1.5
+      parent: 104
+  - uid: 1963
+    components:
+    - type: Transform
+      pos: 27.5,-0.5
+      parent: 104
+  - uid: 1964
+    components:
+    - type: Transform
+      pos: 27.5,0.5
+      parent: 104
+  - uid: 1965
+    components:
+    - type: Transform
+      pos: 27.5,1.5
+      parent: 104
+  - uid: 1966
+    components:
+    - type: Transform
+      pos: 27.5,2.5
+      parent: 104
+  - uid: 1967
+    components:
+    - type: Transform
+      pos: 28.5,-21.5
+      parent: 104
+  - uid: 1973
+    components:
+    - type: Transform
+      pos: 30.5,-1.5
+      parent: 104
+  - uid: 1974
+    components:
+    - type: Transform
+      pos: 30.5,-0.5
+      parent: 104
+  - uid: 1975
+    components:
+    - type: Transform
+      pos: 30.5,0.5
+      parent: 104
+  - uid: 1976
+    components:
+    - type: Transform
+      pos: 30.5,1.5
+      parent: 104
+  - uid: 1977
+    components:
+    - type: Transform
+      pos: 30.5,2.5
+      parent: 104
+  - uid: 1978
+    components:
+    - type: Transform
+      pos: 28.5,-7.5
+      parent: 104
+  - uid: 1979
+    components:
+    - type: Transform
+      pos: 28.5,-6.5
+      parent: 104
+  - uid: 1980
+    components:
+    - type: Transform
+      pos: 28.5,-5.5
+      parent: 104
+  - uid: 1981
+    components:
+    - type: Transform
+      pos: 28.5,-4.5
+      parent: 104
+  - uid: 1982
+    components:
+    - type: Transform
+      pos: 28.5,-3.5
+      parent: 104
+  - uid: 1983
+    components:
+    - type: Transform
+      pos: 28.5,-2.5
+      parent: 104
+  - uid: 1984
+    components:
+    - type: Transform
+      pos: 28.5,-1.5
+      parent: 104
+  - uid: 1985
+    components:
+    - type: Transform
+      pos: 28.5,-0.5
+      parent: 104
+  - uid: 1986
+    components:
+    - type: Transform
+      pos: 28.5,0.5
+      parent: 104
+  - uid: 1987
+    components:
+    - type: Transform
+      pos: 28.5,1.5
+      parent: 104
+  - uid: 1988
+    components:
+    - type: Transform
+      pos: 28.5,2.5
+      parent: 104
+  - uid: 1989
+    components:
+    - type: Transform
+      pos: 29.5,-20.5
+      parent: 104
+  - uid: 1990
+    components:
+    - type: Transform
+      pos: 29.5,-19.5
+      parent: 104
+  - uid: 1991
+    components:
+    - type: Transform
+      pos: 29.5,-18.5
+      parent: 104
+  - uid: 1992
+    components:
+    - type: Transform
+      pos: 29.5,-17.5
+      parent: 104
+  - uid: 1993
+    components:
+    - type: Transform
+      pos: 29.5,-16.5
+      parent: 104
+  - uid: 1994
+    components:
+    - type: Transform
+      pos: 29.5,-15.5
+      parent: 104
+  - uid: 1995
+    components:
+    - type: Transform
+      pos: 29.5,-14.5
+      parent: 104
+  - uid: 1996
+    components:
+    - type: Transform
+      pos: 29.5,-13.5
+      parent: 104
+  - uid: 1997
+    components:
+    - type: Transform
+      pos: 29.5,-12.5
+      parent: 104
+  - uid: 1998
+    components:
+    - type: Transform
+      pos: 29.5,-11.5
+      parent: 104
+  - uid: 1999
+    components:
+    - type: Transform
+      pos: 29.5,-10.5
+      parent: 104
+  - uid: 2000
+    components:
+    - type: Transform
+      pos: 29.5,-9.5
+      parent: 104
+  - uid: 2001
+    components:
+    - type: Transform
+      pos: 29.5,-8.5
+      parent: 104
+  - uid: 2002
+    components:
+    - type: Transform
+      pos: 29.5,-7.5
+      parent: 104
+  - uid: 2003
+    components:
+    - type: Transform
+      pos: 29.5,-6.5
+      parent: 104
+  - uid: 2004
+    components:
+    - type: Transform
+      pos: 29.5,-5.5
+      parent: 104
+  - uid: 2005
+    components:
+    - type: Transform
+      pos: 29.5,-4.5
+      parent: 104
+  - uid: 2006
+    components:
+    - type: Transform
+      pos: 29.5,-3.5
+      parent: 104
+  - uid: 2007
+    components:
+    - type: Transform
+      pos: 29.5,-2.5
+      parent: 104
+  - uid: 2008
+    components:
+    - type: Transform
+      pos: 29.5,-1.5
+      parent: 104
+  - uid: 2009
+    components:
+    - type: Transform
+      pos: 29.5,-0.5
+      parent: 104
+  - uid: 2010
+    components:
+    - type: Transform
+      pos: 29.5,0.5
+      parent: 104
+  - uid: 2011
+    components:
+    - type: Transform
+      pos: 29.5,1.5
+      parent: 104
+  - uid: 2012
+    components:
+    - type: Transform
+      pos: 29.5,2.5
+      parent: 104
+  - uid: 2013
+    components:
+    - type: Transform
+      pos: 30.5,-19.5
+      parent: 104
+  - uid: 2014
+    components:
+    - type: Transform
+      pos: 30.5,-18.5
+      parent: 104
+  - uid: 2015
+    components:
+    - type: Transform
+      pos: 30.5,-17.5
+      parent: 104
+  - uid: 2020
+    components:
+    - type: Transform
+      pos: 30.5,-16.5
+      parent: 104
+  - uid: 2023
+    components:
+    - type: Transform
+      pos: 30.5,-15.5
+      parent: 104
+  - uid: 2024
+    components:
+    - type: Transform
+      pos: 30.5,-14.5
+      parent: 104
+  - uid: 2025
+    components:
+    - type: Transform
+      pos: 30.5,-13.5
+      parent: 104
+  - uid: 2026
+    components:
+    - type: Transform
+      pos: 30.5,-12.5
+      parent: 104
+  - uid: 2029
+    components:
+    - type: Transform
+      pos: 30.5,-9.5
+      parent: 104
+  - uid: 2030
+    components:
+    - type: Transform
+      pos: 30.5,-8.5
+      parent: 104
+  - uid: 2032
+    components:
+    - type: Transform
+      pos: 30.5,-7.5
+      parent: 104
+  - uid: 2033
+    components:
+    - type: Transform
+      pos: 30.5,-6.5
+      parent: 104
+  - uid: 2034
+    components:
+    - type: Transform
+      pos: 30.5,-5.5
+      parent: 104
+  - uid: 2035
+    components:
+    - type: Transform
+      pos: 30.5,-4.5
+      parent: 104
+  - uid: 2036
+    components:
+    - type: Transform
+      pos: 30.5,-3.5
+      parent: 104
+  - uid: 2037
+    components:
+    - type: Transform
+      pos: 30.5,-2.5
+      parent: 104
+  - uid: 2038
+    components:
+    - type: Transform
+      pos: 20.5,-0.5
+      parent: 104
+  - uid: 2039
+    components:
+    - type: Transform
+      pos: 20.5,-1.5
+      parent: 104
+  - uid: 2040
+    components:
+    - type: Transform
+      pos: 15.5,2.5
+      parent: 104
+  - uid: 2041
+    components:
+    - type: Transform
+      pos: 16.5,2.5
+      parent: 104
+  - uid: 2042
+    components:
+    - type: Transform
+      pos: 19.5,0.5
+      parent: 104
+  - uid: 2043
+    components:
+    - type: Transform
+      pos: 19.5,-0.5
+      parent: 104
+  - uid: 2044
+    components:
+    - type: Transform
+      pos: 19.5,-1.5
+      parent: 104
+  - uid: 2047
+    components:
+    - type: Transform
+      pos: 25.5,0.5
+      parent: 104
+  - uid: 2049
+    components:
+    - type: Transform
+      pos: 25.5,-0.5
+      parent: 104
+  - uid: 2051
+    components:
+    - type: Transform
+      pos: 25.5,-1.5
+      parent: 104
+  - uid: 2054
+    components:
+    - type: Transform
+      pos: 24.5,0.5
+      parent: 104
+  - uid: 2055
+    components:
+    - type: Transform
+      pos: 24.5,-0.5
+      parent: 104
+  - uid: 2056
+    components:
+    - type: Transform
+      pos: 24.5,-1.5
+      parent: 104
+  - uid: 2058
+    components:
+    - type: Transform
+      pos: 23.5,1.5
+      parent: 104
+  - uid: 2059
+    components:
+    - type: Transform
+      pos: 23.5,0.5
+      parent: 104
+  - uid: 2060
+    components:
+    - type: Transform
+      pos: 23.5,-0.5
+      parent: 104
+  - uid: 2061
+    components:
+    - type: Transform
+      pos: 23.5,-1.5
+      parent: 104
+  - uid: 2063
+    components:
+    - type: Transform
+      pos: 22.5,1.5
+      parent: 104
+  - uid: 2064
+    components:
+    - type: Transform
+      pos: 22.5,0.5
+      parent: 104
+  - uid: 2065
+    components:
+    - type: Transform
+      pos: 22.5,-0.5
+      parent: 104
+  - uid: 2066
+    components:
+    - type: Transform
+      pos: 22.5,-1.5
+      parent: 104
+  - uid: 2067
+    components:
+    - type: Transform
+      pos: 14.5,2.5
+      parent: 104
+  - uid: 2068
+    components:
+    - type: Transform
+      pos: 15.5,1.5
+      parent: 104
+  - uid: 2069
+    components:
+    - type: Transform
+      pos: 21.5,0.5
+      parent: 104
+  - uid: 2070
+    components:
+    - type: Transform
+      pos: 21.5,-0.5
+      parent: 104
+  - uid: 2071
+    components:
+    - type: Transform
+      pos: 21.5,-1.5
+      parent: 104
+  - uid: 2072
+    components:
+    - type: Transform
+      pos: 14.5,3.5
+      parent: 104
+  - uid: 2073
+    components:
+    - type: Transform
+      pos: 17.5,-0.5
+      parent: 104
+  - uid: 2074
+    components:
+    - type: Transform
+      pos: 17.5,0.5
+      parent: 104
+  - uid: 2075
+    components:
+    - type: Transform
+      pos: 17.5,1.5
+      parent: 104
+  - uid: 2076
+    components:
+    - type: Transform
+      pos: 18.5,-1.5
+      parent: 104
+  - uid: 2077
+    components:
+    - type: Transform
+      pos: 18.5,-0.5
+      parent: 104
+  - uid: 2078
+    components:
+    - type: Transform
+      pos: 18.5,0.5
+      parent: 104
+  - uid: 2079
+    components:
+    - type: Transform
+      pos: 18.5,1.5
+      parent: 104
+  - uid: 2080
+    components:
+    - type: Transform
+      pos: -12.5,28.5
+      parent: 104
+  - uid: 2084
+    components:
+    - type: Transform
+      pos: -12.5,27.5
+      parent: 104
+  - uid: 2085
+    components:
+    - type: Transform
+      pos: -12.5,26.5
+      parent: 104
+  - uid: 2086
+    components:
+    - type: Transform
+      pos: -12.5,25.5
+      parent: 104
+  - uid: 2087
+    components:
+    - type: Transform
+      pos: -16.5,25.5
+      parent: 104
+  - uid: 2088
+    components:
+    - type: Transform
+      pos: -3.5,-6.5
+      parent: 104
+  - uid: 2091
+    components:
+    - type: Transform
+      pos: -15.5,25.5
+      parent: 104
+  - uid: 2093
+    components:
+    - type: Transform
+      pos: -14.5,26.5
+      parent: 104
+  - uid: 2094
+    components:
+    - type: Transform
+      pos: -14.5,25.5
+      parent: 104
+  - uid: 2096
+    components:
+    - type: Transform
+      pos: -13.5,27.5
+      parent: 104
+  - uid: 2098
+    components:
+    - type: Transform
+      pos: -13.5,26.5
+      parent: 104
+  - uid: 2099
+    components:
+    - type: Transform
+      pos: -13.5,25.5
+      parent: 104
+  - uid: 2100
+    components:
+    - type: Transform
+      pos: -20.5,30.5
+      parent: 104
+  - uid: 2101
+    components:
+    - type: Transform
+      pos: -20.5,29.5
+      parent: 104
+  - uid: 2102
+    components:
+    - type: Transform
+      pos: -20.5,28.5
+      parent: 104
+  - uid: 2103
+    components:
+    - type: Transform
+      pos: -20.5,27.5
+      parent: 104
+  - uid: 2104
+    components:
+    - type: Transform
+      pos: -20.5,26.5
+      parent: 104
+  - uid: 2105
+    components:
+    - type: Transform
+      pos: -20.5,25.5
+      parent: 104
+  - uid: 2106
+    components:
+    - type: Transform
+      pos: -20.5,24.5
+      parent: 104
+  - uid: 2107
+    components:
+    - type: Transform
+      pos: -19.5,30.5
+      parent: 104
+  - uid: 2108
+    components:
+    - type: Transform
+      pos: -19.5,29.5
+      parent: 104
+  - uid: 2109
+    components:
+    - type: Transform
+      pos: -19.5,28.5
+      parent: 104
+  - uid: 2110
+    components:
+    - type: Transform
+      pos: -19.5,27.5
+      parent: 104
+  - uid: 2111
+    components:
+    - type: Transform
+      pos: -19.5,26.5
+      parent: 104
+  - uid: 2112
+    components:
+    - type: Transform
+      pos: -19.5,25.5
+      parent: 104
+  - uid: 2113
+    components:
+    - type: Transform
+      pos: -19.5,24.5
+      parent: 104
+  - uid: 2115
+    components:
+    - type: Transform
+      pos: -18.5,30.5
+      parent: 104
+  - uid: 2116
+    components:
+    - type: Transform
+      pos: -18.5,29.5
+      parent: 104
+  - uid: 2117
+    components:
+    - type: Transform
+      pos: -18.5,28.5
+      parent: 104
+  - uid: 2118
+    components:
+    - type: Transform
+      pos: -18.5,27.5
+      parent: 104
+  - uid: 2119
+    components:
+    - type: Transform
+      pos: -18.5,26.5
+      parent: 104
+  - uid: 2120
+    components:
+    - type: Transform
+      pos: -18.5,25.5
+      parent: 104
+  - uid: 2121
+    components:
+    - type: Transform
+      pos: -18.5,24.5
+      parent: 104
+  - uid: 2122
+    components:
+    - type: Transform
+      pos: -17.5,28.5
+      parent: 104
+  - uid: 2123
+    components:
+    - type: Transform
+      pos: -17.5,27.5
+      parent: 104
+  - uid: 2124
+    components:
+    - type: Transform
+      pos: -17.5,25.5
+      parent: 104
+  - uid: 2125
+    components:
+    - type: Transform
+      pos: -11.5,28.5
+      parent: 104
+  - uid: 2127
+    components:
+    - type: Transform
+      pos: -11.5,27.5
+      parent: 104
+  - uid: 2128
+    components:
+    - type: Transform
+      pos: -11.5,26.5
+      parent: 104
+  - uid: 2129
+    components:
+    - type: Transform
+      pos: -11.5,25.5
+      parent: 104
+  - uid: 2130
+    components:
+    - type: Transform
+      pos: -11.5,24.5
+      parent: 104
+  - uid: 2131
+    components:
+    - type: Transform
+      pos: -21.5,31.5
+      parent: 104
+  - uid: 2132
+    components:
+    - type: Transform
+      pos: -20.5,31.5
+      parent: 104
+  - uid: 2133
+    components:
+    - type: Transform
+      pos: -19.5,31.5
+      parent: 104
+  - uid: 2134
+    components:
+    - type: Transform
+      pos: -10.5,28.5
+      parent: 104
+  - uid: 2136
+    components:
+    - type: Transform
+      pos: -10.5,27.5
+      parent: 104
+  - uid: 2137
+    components:
+    - type: Transform
+      pos: -10.5,26.5
+      parent: 104
+  - uid: 2138
+    components:
+    - type: Transform
+      pos: -10.5,25.5
+      parent: 104
+  - uid: 2139
+    components:
+    - type: Transform
+      pos: -10.5,24.5
+      parent: 104
+  - uid: 2140
+    components:
+    - type: Transform
+      pos: -9.5,29.5
+      parent: 104
+  - uid: 2141
+    components:
+    - type: Transform
+      pos: -9.5,28.5
+      parent: 104
+  - uid: 2142
+    components:
+    - type: Transform
+      pos: -9.5,27.5
+      parent: 104
+  - uid: 2143
+    components:
+    - type: Transform
+      pos: -9.5,26.5
+      parent: 104
+  - uid: 2144
+    components:
+    - type: Transform
+      pos: -9.5,25.5
+      parent: 104
+  - uid: 2145
+    components:
+    - type: Transform
+      pos: -9.5,24.5
+      parent: 104
+  - uid: 2146
+    components:
+    - type: Transform
+      pos: -8.5,29.5
+      parent: 104
+  - uid: 2147
+    components:
+    - type: Transform
+      pos: -8.5,28.5
+      parent: 104
+  - uid: 2148
+    components:
+    - type: Transform
+      pos: -8.5,27.5
+      parent: 104
+  - uid: 2149
+    components:
+    - type: Transform
+      pos: -8.5,26.5
+      parent: 104
+  - uid: 2150
+    components:
+    - type: Transform
+      pos: -8.5,25.5
+      parent: 104
+  - uid: 2151
+    components:
+    - type: Transform
+      pos: -8.5,24.5
+      parent: 104
+  - uid: 2152
+    components:
+    - type: Transform
+      pos: -7.5,29.5
+      parent: 104
+  - uid: 2153
+    components:
+    - type: Transform
+      pos: -7.5,28.5
+      parent: 104
+  - uid: 2154
+    components:
+    - type: Transform
+      pos: -7.5,27.5
+      parent: 104
+  - uid: 2155
+    components:
+    - type: Transform
+      pos: -7.5,26.5
+      parent: 104
+  - uid: 2156
+    components:
+    - type: Transform
+      pos: -7.5,25.5
+      parent: 104
+  - uid: 2157
+    components:
+    - type: Transform
+      pos: -7.5,24.5
+      parent: 104
+  - uid: 2158
+    components:
+    - type: Transform
+      pos: -6.5,29.5
+      parent: 104
+  - uid: 2159
+    components:
+    - type: Transform
+      pos: -6.5,28.5
+      parent: 104
+  - uid: 2160
+    components:
+    - type: Transform
+      pos: -6.5,27.5
+      parent: 104
+  - uid: 2161
+    components:
+    - type: Transform
+      pos: -6.5,26.5
+      parent: 104
+  - uid: 2162
+    components:
+    - type: Transform
+      pos: -6.5,25.5
+      parent: 104
+  - uid: 2163
+    components:
+    - type: Transform
+      pos: -6.5,24.5
+      parent: 104
+  - uid: 2164
+    components:
+    - type: Transform
+      pos: -5.5,29.5
+      parent: 104
+  - uid: 2165
+    components:
+    - type: Transform
+      pos: -5.5,28.5
+      parent: 104
+  - uid: 2166
+    components:
+    - type: Transform
+      pos: -5.5,27.5
+      parent: 104
+  - uid: 2167
+    components:
+    - type: Transform
+      pos: -5.5,26.5
+      parent: 104
+  - uid: 2168
+    components:
+    - type: Transform
+      pos: -5.5,25.5
+      parent: 104
+  - uid: 2169
+    components:
+    - type: Transform
+      pos: -5.5,24.5
+      parent: 104
+  - uid: 2170
+    components:
+    - type: Transform
+      pos: -4.5,29.5
+      parent: 104
+  - uid: 2171
+    components:
+    - type: Transform
+      pos: -4.5,28.5
+      parent: 104
+  - uid: 2172
+    components:
+    - type: Transform
+      pos: -4.5,27.5
+      parent: 104
+  - uid: 2173
+    components:
+    - type: Transform
+      pos: -4.5,26.5
+      parent: 104
+  - uid: 2174
+    components:
+    - type: Transform
+      pos: -4.5,25.5
+      parent: 104
+  - uid: 2175
+    components:
+    - type: Transform
+      pos: -4.5,24.5
+      parent: 104
+  - uid: 2176
+    components:
+    - type: Transform
+      pos: -3.5,28.5
+      parent: 104
+  - uid: 2177
+    components:
+    - type: Transform
+      pos: -3.5,27.5
+      parent: 104
+  - uid: 2178
+    components:
+    - type: Transform
+      pos: -3.5,26.5
+      parent: 104
+  - uid: 2179
+    components:
+    - type: Transform
+      pos: -3.5,25.5
+      parent: 104
+  - uid: 2180
+    components:
+    - type: Transform
+      pos: -3.5,24.5
+      parent: 104
+  - uid: 2181
+    components:
+    - type: Transform
+      pos: -2.5,26.5
+      parent: 104
+  - uid: 2183
+    components:
+    - type: Transform
+      pos: -2.5,25.5
+      parent: 104
+  - uid: 2184
+    components:
+    - type: Transform
+      pos: -2.5,24.5
+      parent: 104
+  - uid: 2192
+    components:
+    - type: Transform
+      pos: -5.5,-23.5
+      parent: 104
+  - uid: 2194
+    components:
+    - type: Transform
+      pos: 15.5,29.5
+      parent: 104
+  - uid: 2195
+    components:
+    - type: Transform
+      pos: 10.5,24.5
+      parent: 104
+  - uid: 2196
+    components:
+    - type: Transform
+      pos: 15.5,31.5
+      parent: 104
+  - uid: 2197
+    components:
+    - type: Transform
+      pos: 16.5,26.5
+      parent: 104
+  - uid: 2198
+    components:
+    - type: Transform
+      pos: 15.5,30.5
+      parent: 104
+  - uid: 2199
+    components:
+    - type: Transform
+      pos: 15.5,32.5
+      parent: 104
+  - uid: 2200
+    components:
+    - type: Transform
+      pos: 16.5,23.5
+      parent: 104
+  - uid: 2201
+    components:
+    - type: Transform
+      pos: 16.5,24.5
+      parent: 104
+  - uid: 2202
+    components:
+    - type: Transform
+      pos: 16.5,25.5
+      parent: 104
+  - uid: 2203
+    components:
+    - type: Transform
+      pos: 10.5,23.5
+      parent: 104
+  - uid: 2204
+    components:
+    - type: Transform
+      pos: 10.5,25.5
+      parent: 104
+  - uid: 2205
+    components:
+    - type: Transform
+      pos: 10.5,26.5
+      parent: 104
+  - uid: 2206
+    components:
+    - type: Transform
+      pos: 10.5,27.5
+      parent: 104
+  - uid: 2207
+    components:
+    - type: Transform
+      pos: 10.5,28.5
+      parent: 104
+  - uid: 2208
+    components:
+    - type: Transform
+      pos: 11.5,23.5
+      parent: 104
+  - uid: 2209
+    components:
+    - type: Transform
+      pos: 11.5,24.5
+      parent: 104
+  - uid: 2210
+    components:
+    - type: Transform
+      pos: 11.5,25.5
+      parent: 104
+  - uid: 2211
+    components:
+    - type: Transform
+      pos: 11.5,26.5
+      parent: 104
+  - uid: 2212
+    components:
+    - type: Transform
+      pos: 11.5,27.5
+      parent: 104
+  - uid: 2213
+    components:
+    - type: Transform
+      pos: 11.5,28.5
+      parent: 104
+  - uid: 2214
+    components:
+    - type: Transform
+      pos: 11.5,29.5
+      parent: 104
+  - uid: 2215
+    components:
+    - type: Transform
+      pos: 12.5,23.5
+      parent: 104
+  - uid: 2216
+    components:
+    - type: Transform
+      pos: 12.5,24.5
+      parent: 104
+  - uid: 2217
+    components:
+    - type: Transform
+      pos: 12.5,25.5
+      parent: 104
+  - uid: 2218
+    components:
+    - type: Transform
+      pos: 12.5,26.5
+      parent: 104
+  - uid: 2219
+    components:
+    - type: Transform
+      pos: 12.5,27.5
+      parent: 104
+  - uid: 2220
+    components:
+    - type: Transform
+      pos: 12.5,28.5
+      parent: 104
+  - uid: 2221
+    components:
+    - type: Transform
+      pos: 12.5,29.5
+      parent: 104
+  - uid: 2222
+    components:
+    - type: Transform
+      pos: 12.5,30.5
+      parent: 104
+  - uid: 2223
+    components:
+    - type: Transform
+      pos: 12.5,31.5
+      parent: 104
+  - uid: 2224
+    components:
+    - type: Transform
+      pos: 13.5,23.5
+      parent: 104
+  - uid: 2225
+    components:
+    - type: Transform
+      pos: 13.5,24.5
+      parent: 104
+  - uid: 2226
+    components:
+    - type: Transform
+      pos: 13.5,25.5
+      parent: 104
+  - uid: 2227
+    components:
+    - type: Transform
+      pos: 13.5,26.5
+      parent: 104
+  - uid: 2228
+    components:
+    - type: Transform
+      pos: 13.5,27.5
+      parent: 104
+  - uid: 2229
+    components:
+    - type: Transform
+      pos: 13.5,28.5
+      parent: 104
+  - uid: 2230
+    components:
+    - type: Transform
+      pos: 13.5,29.5
+      parent: 104
+  - uid: 2231
+    components:
+    - type: Transform
+      pos: 13.5,30.5
+      parent: 104
+  - uid: 2232
+    components:
+    - type: Transform
+      pos: 13.5,31.5
+      parent: 104
+  - uid: 2233
+    components:
+    - type: Transform
+      pos: 14.5,23.5
+      parent: 104
+  - uid: 2234
+    components:
+    - type: Transform
+      pos: 14.5,24.5
+      parent: 104
+  - uid: 2235
+    components:
+    - type: Transform
+      pos: 14.5,25.5
+      parent: 104
+  - uid: 2236
+    components:
+    - type: Transform
+      pos: 14.5,26.5
+      parent: 104
+  - uid: 2237
+    components:
+    - type: Transform
+      pos: 14.5,27.5
+      parent: 104
+  - uid: 2238
+    components:
+    - type: Transform
+      pos: 14.5,28.5
+      parent: 104
+  - uid: 2239
+    components:
+    - type: Transform
+      pos: 14.5,29.5
+      parent: 104
+  - uid: 2240
+    components:
+    - type: Transform
+      pos: 14.5,30.5
+      parent: 104
+  - uid: 2241
+    components:
+    - type: Transform
+      pos: 14.5,31.5
+      parent: 104
+  - uid: 2242
+    components:
+    - type: Transform
+      pos: 14.5,32.5
+      parent: 104
+  - uid: 2243
+    components:
+    - type: Transform
+      pos: 15.5,23.5
+      parent: 104
+  - uid: 2244
+    components:
+    - type: Transform
+      pos: 15.5,24.5
+      parent: 104
+  - uid: 2245
+    components:
+    - type: Transform
+      pos: 15.5,25.5
+      parent: 104
+  - uid: 2246
+    components:
+    - type: Transform
+      pos: 15.5,26.5
+      parent: 104
+  - uid: 2247
+    components:
+    - type: Transform
+      pos: 15.5,27.5
+      parent: 104
+  - uid: 2248
+    components:
+    - type: Transform
+      pos: 15.5,28.5
+      parent: 104
+  - uid: 2249
+    components:
+    - type: Transform
+      pos: 19.5,25.5
+      parent: 104
+  - uid: 2250
+    components:
+    - type: Transform
+      pos: 19.5,26.5
+      parent: 104
+  - uid: 2251
+    components:
+    - type: Transform
+      pos: 19.5,27.5
+      parent: 104
+  - uid: 2252
+    components:
+    - type: Transform
+      pos: 19.5,28.5
+      parent: 104
+  - uid: 2253
+    components:
+    - type: Transform
+      pos: 19.5,29.5
+      parent: 104
+  - uid: 2254
+    components:
+    - type: Transform
+      pos: 19.5,30.5
+      parent: 104
+  - uid: 2255
+    components:
+    - type: Transform
+      pos: 19.5,31.5
+      parent: 104
+  - uid: 2256
+    components:
+    - type: Transform
+      pos: 20.5,26.5
+      parent: 104
+  - uid: 2259
+    components:
+    - type: Transform
+      pos: 20.5,27.5
+      parent: 104
+  - uid: 2260
+    components:
+    - type: Transform
+      pos: 20.5,28.5
+      parent: 104
+  - uid: 2261
+    components:
+    - type: Transform
+      pos: 20.5,29.5
+      parent: 104
+  - uid: 2262
+    components:
+    - type: Transform
+      pos: 16.5,27.5
+      parent: 104
+  - uid: 2263
+    components:
+    - type: Transform
+      pos: 16.5,28.5
+      parent: 104
+  - uid: 2264
+    components:
+    - type: Transform
+      pos: 16.5,29.5
+      parent: 104
+  - uid: 2265
+    components:
+    - type: Transform
+      pos: 16.5,30.5
+      parent: 104
+  - uid: 2266
+    components:
+    - type: Transform
+      pos: 16.5,31.5
+      parent: 104
+  - uid: 2267
+    components:
+    - type: Transform
+      pos: 16.5,32.5
+      parent: 104
+  - uid: 2268
+    components:
+    - type: Transform
+      pos: 17.5,23.5
+      parent: 104
+  - uid: 2269
+    components:
+    - type: Transform
+      pos: 17.5,24.5
+      parent: 104
+  - uid: 2270
+    components:
+    - type: Transform
+      pos: 17.5,25.5
+      parent: 104
+  - uid: 2271
+    components:
+    - type: Transform
+      pos: 17.5,26.5
+      parent: 104
+  - uid: 2272
+    components:
+    - type: Transform
+      pos: 17.5,27.5
+      parent: 104
+  - uid: 2273
+    components:
+    - type: Transform
+      pos: 17.5,28.5
+      parent: 104
+  - uid: 2274
+    components:
+    - type: Transform
+      pos: 17.5,29.5
+      parent: 104
+  - uid: 2275
+    components:
+    - type: Transform
+      pos: 17.5,30.5
+      parent: 104
+  - uid: 2276
+    components:
+    - type: Transform
+      pos: 17.5,31.5
+      parent: 104
+  - uid: 2277
+    components:
+    - type: Transform
+      pos: 17.5,32.5
+      parent: 104
+  - uid: 2278
+    components:
+    - type: Transform
+      pos: 18.5,23.5
+      parent: 104
+  - uid: 2279
+    components:
+    - type: Transform
+      pos: 18.5,24.5
+      parent: 104
+  - uid: 2280
+    components:
+    - type: Transform
+      pos: 18.5,25.5
+      parent: 104
+  - uid: 2281
+    components:
+    - type: Transform
+      pos: 18.5,26.5
+      parent: 104
+  - uid: 2282
+    components:
+    - type: Transform
+      pos: 18.5,27.5
+      parent: 104
+  - uid: 2283
+    components:
+    - type: Transform
+      pos: 18.5,28.5
+      parent: 104
+  - uid: 2284
+    components:
+    - type: Transform
+      pos: 18.5,29.5
+      parent: 104
+  - uid: 2285
+    components:
+    - type: Transform
+      pos: 18.5,30.5
+      parent: 104
+  - uid: 2286
+    components:
+    - type: Transform
+      pos: 18.5,31.5
+      parent: 104
+  - uid: 2287
+    components:
+    - type: Transform
+      pos: 18.5,32.5
+      parent: 104
+  - uid: 2288
+    components:
+    - type: Transform
+      pos: 19.5,23.5
+      parent: 104
+  - uid: 2289
+    components:
+    - type: Transform
+      pos: 19.5,24.5
+      parent: 104
+- proto: BalloonSyn
+  entities:
+  - uid: 1327
+    components:
+    - type: Transform
+      pos: 0.03361702,-6.368435
+      parent: 104
+- proto: BaseComputer
+  entities:
+  - uid: 18
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-8.5
+      parent: 104
+  - uid: 29
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-8.5
+      parent: 104
+  - uid: 111
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-1.5
+      parent: 104
+  - uid: 2292
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-2.5
+      parent: 104
+  - uid: 2295
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-3.5
+      parent: 104
+- proto: Beaker
+  entities:
+  - uid: 2031
+    components:
+    - type: Transform
+      pos: 3.6114278,-10.732791
+      parent: 104
+  - uid: 2095
+    components:
+    - type: Transform
+      pos: 4.017678,-12.520861
+      parent: 104
+- proto: Bed
+  entities:
+  - uid: 957
+    components:
+    - type: Transform
+      pos: 15.5,-3.5
+      parent: 104
+  - uid: 1548
+    components:
+    - type: Transform
+      pos: 15.5,-4.5
+      parent: 104
+- proto: BedsheetMedical
+  entities:
+  - uid: 1872
+    components:
+    - type: Transform
+      pos: 1.5,-12.5
+      parent: 104
+  - uid: 1877
+    components:
+    - type: Transform
+      pos: -1.5,-16.5
+      parent: 104
+  - uid: 1898
+    components:
+    - type: Transform
+      pos: 1.5,-16.5
+      parent: 104
+  - uid: 1899
+    components:
+    - type: Transform
+      pos: -1.5,-12.5
+      parent: 104
+- proto: BedsheetSyndie
+  entities:
+  - uid: 154
+    components:
+    - type: Transform
+      pos: 15.5,-3.5
+      parent: 104
+  - uid: 289
+    components:
+    - type: Transform
+      pos: 15.5,-4.5
+      parent: 104
+- proto: BigBox
+  entities:
+  - uid: 2458
+    components:
+    - type: Transform
+      pos: 13.500806,-4.4874377
+      parent: 104
+- proto: Bookshelf
+  entities:
+  - uid: 140
+    components:
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 104
+- proto: BoozeDispenser
+  entities:
+  - uid: 230
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-8.5
+      parent: 104
+- proto: BoxBeaker
+  entities:
+  - uid: 2114
+    components:
+    - type: Transform
+      pos: 5.539936,-12.489611
+      parent: 104
+- proto: BoxFolderBlack
+  entities:
+  - uid: 1022
+    components:
+    - type: Transform
+      pos: -13.494709,9.54891
+      parent: 104
+- proto: BoxMagazinePistolCaselessRiflePractice
+  entities:
+  - uid: 1635
+    components:
+    - type: Transform
+      pos: 5.4970627,10.597828
+      parent: 104
+- proto: BoxMagazinePistolSubMachineGunPractice
+  entities:
+  - uid: 1634
+    components:
+    - type: Transform
+      pos: 5.388983,13.953581
+      parent: 104
+- proto: BoxPillCanister
+  entities:
+  - uid: 1844
+    components:
+    - type: Transform
+      pos: 5.430561,-12.364611
+      parent: 104
+- proto: BoxShotgunPractice
+  entities:
+  - uid: 1633
+    components:
+    - type: Transform
+      pos: 5.4972115,14.562988
+      parent: 104
+    - type: BallisticAmmoProvider
+      unspawnedCount: 12
+- proto: Bucket
+  entities:
+  - uid: 153
+    components:
+    - type: Transform
+      pos: 10.809023,-4.25956
+      parent: 104
+- proto: CableApcExtension
+  entities:
+  - uid: 13
+    components:
+    - type: Transform
+      pos: -10.5,-5.5
+      parent: 104
+  - uid: 24
+    components:
+    - type: Transform
+      pos: -31.5,0.5
+      parent: 104
+  - uid: 100
+    components:
+    - type: Transform
+      pos: 13.5,0.5
+      parent: 104
+  - uid: 143
+    components:
+    - type: Transform
+      pos: 12.5,0.5
+      parent: 104
+  - uid: 213
+    components:
+    - type: Transform
+      pos: -16.5,-19.5
+      parent: 104
+  - uid: 214
+    components:
+    - type: Transform
+      pos: -15.5,-19.5
+      parent: 104
+  - uid: 220
+    components:
+    - type: Transform
+      pos: 11.5,0.5
+      parent: 104
+  - uid: 235
+    components:
+    - type: Transform
+      pos: 1.5,-13.5
+      parent: 104
+  - uid: 245
+    components:
+    - type: Transform
+      pos: 12.5,-18.5
+      parent: 104
+  - uid: 254
+    components:
+    - type: Transform
+      pos: -30.5,0.5
+      parent: 104
+  - uid: 279
+    components:
+    - type: Transform
+      pos: 11.5,-0.5
+      parent: 104
+  - uid: 287
+    components:
+    - type: Transform
+      pos: -15.5,0.5
+      parent: 104
+  - uid: 297
+    components:
+    - type: Transform
+      pos: 3.5,-14.5
+      parent: 104
+  - uid: 390
+    components:
+    - type: Transform
+      pos: -10.5,-7.5
+      parent: 104
+  - uid: 397
+    components:
+    - type: Transform
+      pos: -10.5,0.5
+      parent: 104
+  - uid: 411
+    components:
+    - type: Transform
+      pos: -10.5,-8.5
+      parent: 104
+  - uid: 412
+    components:
+    - type: Transform
+      pos: -26.5,-19.5
+      parent: 104
+  - uid: 428
+    components:
+    - type: Transform
+      pos: -23.5,-19.5
+      parent: 104
+  - uid: 429
+    components:
+    - type: Transform
+      pos: -10.5,-0.5
+      parent: 104
+  - uid: 430
+    components:
+    - type: Transform
+      pos: -10.5,1.5
+      parent: 104
+  - uid: 432
+    components:
+    - type: Transform
+      pos: -27.5,0.5
+      parent: 104
+  - uid: 433
+    components:
+    - type: Transform
+      pos: -17.5,-19.5
+      parent: 104
+  - uid: 434
+    components:
+    - type: Transform
+      pos: -21.5,-19.5
+      parent: 104
+  - uid: 435
+    components:
+    - type: Transform
+      pos: -10.5,-4.5
+      parent: 104
+  - uid: 436
+    components:
+    - type: Transform
+      pos: -10.5,-6.5
+      parent: 104
+  - uid: 437
+    components:
+    - type: Transform
+      pos: -10.5,-9.5
+      parent: 104
+  - uid: 438
+    components:
+    - type: Transform
+      pos: -20.5,-19.5
+      parent: 104
+  - uid: 439
+    components:
+    - type: Transform
+      pos: -10.5,-3.5
+      parent: 104
+  - uid: 442
+    components:
+    - type: Transform
+      pos: -19.5,-19.5
+      parent: 104
+  - uid: 444
+    components:
+    - type: Transform
+      pos: -10.5,1.5
+      parent: 104
+  - uid: 445
+    components:
+    - type: Transform
+      pos: -26.5,0.5
+      parent: 104
+  - uid: 449
+    components:
+    - type: Transform
+      pos: -18.5,-19.5
+      parent: 104
+  - uid: 452
+    components:
+    - type: Transform
+      pos: -30.5,-19.5
+      parent: 104
+  - uid: 453
+    components:
+    - type: Transform
+      pos: -29.5,-19.5
+      parent: 104
+  - uid: 454
+    components:
+    - type: Transform
+      pos: -23.5,0.5
+      parent: 104
+  - uid: 465
+    components:
+    - type: Transform
+      pos: -28.5,-19.5
+      parent: 104
+  - uid: 466
+    components:
+    - type: Transform
+      pos: -27.5,-19.5
+      parent: 104
+  - uid: 467
+    components:
+    - type: Transform
+      pos: -24.5,-19.5
+      parent: 104
+  - uid: 476
+    components:
+    - type: Transform
+      pos: -22.5,-19.5
+      parent: 104
+  - uid: 619
+    components:
+    - type: Transform
+      pos: -10.5,-12.5
+      parent: 104
+  - uid: 624
+    components:
+    - type: Transform
+      pos: -10.5,-10.5
+      parent: 104
+  - uid: 625
+    components:
+    - type: Transform
+      pos: -10.5,-11.5
+      parent: 104
+  - uid: 627
+    components:
+    - type: Transform
+      pos: -10.5,-15.5
+      parent: 104
+  - uid: 628
+    components:
+    - type: Transform
+      pos: -10.5,-16.5
+      parent: 104
+  - uid: 630
+    components:
+    - type: Transform
+      pos: -10.5,-17.5
+      parent: 104
+  - uid: 657
+    components:
+    - type: Transform
+      pos: -25.5,-19.5
+      parent: 104
+  - uid: 659
+    components:
+    - type: Transform
+      pos: -32.5,-19.5
+      parent: 104
+  - uid: 660
+    components:
+    - type: Transform
+      pos: -31.5,-19.5
+      parent: 104
+  - uid: 666
+    components:
+    - type: Transform
+      pos: -22.5,0.5
+      parent: 104
+  - uid: 814
+    components:
+    - type: Transform
+      pos: -6.5,-3.5
+      parent: 104
+  - uid: 832
+    components:
+    - type: Transform
+      pos: -7.5,-3.5
+      parent: 104
+  - uid: 840
+    components:
+    - type: Transform
+      pos: -25.5,0.5
+      parent: 104
+  - uid: 845
+    components:
+    - type: Transform
+      pos: -10.5,-1.5
+      parent: 104
+  - uid: 866
+    components:
+    - type: Transform
+      pos: -10.5,-2.5
+      parent: 104
+  - uid: 867
+    components:
+    - type: Transform
+      pos: -5.5,-3.5
+      parent: 104
+  - uid: 868
+    components:
+    - type: Transform
+      pos: -10.5,-3.5
+      parent: 104
+  - uid: 870
+    components:
+    - type: Transform
+      pos: -9.5,-3.5
+      parent: 104
+  - uid: 877
+    components:
+    - type: Transform
+      pos: -8.5,-3.5
+      parent: 104
+  - uid: 884
+    components:
+    - type: Transform
+      pos: -4.5,-3.5
+      parent: 104
+  - uid: 920
+    components:
+    - type: Transform
+      pos: -10.5,-13.5
+      parent: 104
+  - uid: 926
+    components:
+    - type: Transform
+      pos: -12.5,0.5
+      parent: 104
+  - uid: 927
+    components:
+    - type: Transform
+      pos: -12.5,-19.5
+      parent: 104
+  - uid: 929
+    components:
+    - type: Transform
+      pos: -24.5,0.5
+      parent: 104
+  - uid: 931
+    components:
+    - type: Transform
+      pos: 12.5,-19.5
+      parent: 104
+  - uid: 933
+    components:
+    - type: Transform
+      pos: -10.5,-19.5
+      parent: 104
+  - uid: 934
+    components:
+    - type: Transform
+      pos: -10.5,-14.5
+      parent: 104
+  - uid: 960
+    components:
+    - type: Transform
+      pos: 12.5,-17.5
+      parent: 104
+  - uid: 961
+    components:
+    - type: Transform
+      pos: 11.5,-16.5
+      parent: 104
+  - uid: 962
+    components:
+    - type: Transform
+      pos: 6.5,-14.5
+      parent: 104
+  - uid: 963
+    components:
+    - type: Transform
+      pos: -14.5,0.5
+      parent: 104
+  - uid: 967
+    components:
+    - type: Transform
+      pos: 9.5,-16.5
+      parent: 104
+  - uid: 968
+    components:
+    - type: Transform
+      pos: 7.5,-16.5
+      parent: 104
+  - uid: 969
+    components:
+    - type: Transform
+      pos: -10.5,-18.5
+      parent: 104
+  - uid: 970
+    components:
+    - type: Transform
+      pos: -33.5,-19.5
+      parent: 104
+  - uid: 971
+    components:
+    - type: Transform
+      pos: -33.5,0.5
+      parent: 104
+  - uid: 973
+    components:
+    - type: Transform
+      pos: 5.5,-17.5
+      parent: 104
+  - uid: 979
+    components:
+    - type: Transform
+      pos: 1.5,-16.5
+      parent: 104
+  - uid: 981
+    components:
+    - type: Transform
+      pos: 5.5,-14.5
+      parent: 104
+  - uid: 982
+    components:
+    - type: Transform
+      pos: 12.5,-16.5
+      parent: 104
+  - uid: 983
+    components:
+    - type: Transform
+      pos: 5.5,-16.5
+      parent: 104
+  - uid: 1081
+    components:
+    - type: Transform
+      pos: -17.5,0.5
+      parent: 104
+  - uid: 1082
+    components:
+    - type: Transform
+      pos: -11.5,0.5
+      parent: 104
+  - uid: 1115
+    components:
+    - type: Transform
+      pos: 4.5,-14.5
+      parent: 104
+  - uid: 1116
+    components:
+    - type: Transform
+      pos: 1.5,-12.5
+      parent: 104
+  - uid: 1117
+    components:
+    - type: Transform
+      pos: 6.5,-16.5
+      parent: 104
+  - uid: 1122
+    components:
+    - type: Transform
+      pos: 1.5,-14.5
+      parent: 104
+  - uid: 1131
+    components:
+    - type: Transform
+      pos: -13.5,0.5
+      parent: 104
+  - uid: 1152
+    components:
+    - type: Transform
+      pos: 12.5,-20.5
+      parent: 104
+  - uid: 1154
+    components:
+    - type: Transform
+      pos: 3.5,-13.5
+      parent: 104
+  - uid: 1182
+    components:
+    - type: Transform
+      pos: 5.5,-15.5
+      parent: 104
+  - uid: 1183
+    components:
+    - type: Transform
+      pos: 7.5,-14.5
+      parent: 104
+  - uid: 1187
+    components:
+    - type: Transform
+      pos: -20.5,0.5
+      parent: 104
+  - uid: 1189
+    components:
+    - type: Transform
+      pos: -32.5,0.5
+      parent: 104
+  - uid: 1191
+    components:
+    - type: Transform
+      pos: 3.5,-12.5
+      parent: 104
+  - uid: 1194
+    components:
+    - type: Transform
+      pos: 2.5,-14.5
+      parent: 104
+  - uid: 1195
+    components:
+    - type: Transform
+      pos: 8.5,-16.5
+      parent: 104
+  - uid: 1200
+    components:
+    - type: Transform
+      pos: 1.5,-15.5
+      parent: 104
+  - uid: 1204
+    components:
+    - type: Transform
+      pos: 10.5,-16.5
+      parent: 104
+  - uid: 1232
+    components:
+    - type: Transform
+      pos: -10.5,6.5
+      parent: 104
+  - uid: 1233
+    components:
+    - type: Transform
+      pos: -10.5,5.5
+      parent: 104
+  - uid: 1234
+    components:
+    - type: Transform
+      pos: -10.5,4.5
+      parent: 104
+  - uid: 1235
+    components:
+    - type: Transform
+      pos: -10.5,3.5
+      parent: 104
+  - uid: 1236
+    components:
+    - type: Transform
+      pos: -10.5,2.5
+      parent: 104
+  - uid: 1237
+    components:
+    - type: Transform
+      pos: -11.5,6.5
+      parent: 104
+  - uid: 1238
+    components:
+    - type: Transform
+      pos: -12.5,6.5
+      parent: 104
+  - uid: 1239
+    components:
+    - type: Transform
+      pos: -13.5,6.5
+      parent: 104
+  - uid: 1240
+    components:
+    - type: Transform
+      pos: -14.5,6.5
+      parent: 104
+  - uid: 1249
+    components:
+    - type: Transform
+      pos: -11.5,-19.5
+      parent: 104
+  - uid: 1275
+    components:
+    - type: Transform
+      pos: -6.5,-2.5
+      parent: 104
+  - uid: 1277
+    components:
+    - type: Transform
+      pos: -21.5,0.5
+      parent: 104
+  - uid: 1278
+    components:
+    - type: Transform
+      pos: -16.5,0.5
+      parent: 104
+  - uid: 1281
+    components:
+    - type: Transform
+      pos: -6.5,-1.5
+      parent: 104
+  - uid: 1282
+    components:
+    - type: Transform
+      pos: -6.5,-0.5
+      parent: 104
+  - uid: 1283
+    components:
+    - type: Transform
+      pos: -6.5,0.5
+      parent: 104
+  - uid: 1292
+    components:
+    - type: Transform
+      pos: 3.5,1.5
+      parent: 104
+  - uid: 1337
+    components:
+    - type: Transform
+      pos: -6.5,-4.5
+      parent: 104
+  - uid: 1338
+    components:
+    - type: Transform
+      pos: -6.5,-5.5
+      parent: 104
+  - uid: 1339
+    components:
+    - type: Transform
+      pos: -6.5,-6.5
+      parent: 104
+  - uid: 1340
+    components:
+    - type: Transform
+      pos: -6.5,-7.5
+      parent: 104
+  - uid: 1341
+    components:
+    - type: Transform
+      pos: -6.5,-8.5
+      parent: 104
+  - uid: 1342
+    components:
+    - type: Transform
+      pos: -6.5,-9.5
+      parent: 104
+  - uid: 1343
+    components:
+    - type: Transform
+      pos: -6.5,-10.5
+      parent: 104
+  - uid: 1344
+    components:
+    - type: Transform
+      pos: -6.5,-11.5
+      parent: 104
+  - uid: 1345
+    components:
+    - type: Transform
+      pos: -6.5,-12.5
+      parent: 104
+  - uid: 1346
+    components:
+    - type: Transform
+      pos: -6.5,-13.5
+      parent: 104
+  - uid: 1347
+    components:
+    - type: Transform
+      pos: -6.5,-14.5
+      parent: 104
+  - uid: 1348
+    components:
+    - type: Transform
+      pos: -6.5,-15.5
+      parent: 104
+  - uid: 1349
+    components:
+    - type: Transform
+      pos: -6.5,-16.5
+      parent: 104
+  - uid: 1429
+    components:
+    - type: Transform
+      pos: -18.5,0.5
+      parent: 104
+  - uid: 1430
+    components:
+    - type: Transform
+      pos: -19.5,0.5
+      parent: 104
+  - uid: 1439
+    components:
+    - type: Transform
+      pos: 20.5,-12.5
+      parent: 104
+  - uid: 1449
+    components:
+    - type: Transform
+      pos: 16.5,-13.5
+      parent: 104
+  - uid: 1450
+    components:
+    - type: Transform
+      pos: 15.5,-13.5
+      parent: 104
+  - uid: 1451
+    components:
+    - type: Transform
+      pos: 15.5,-12.5
+      parent: 104
+  - uid: 1452
+    components:
+    - type: Transform
+      pos: 15.5,-11.5
+      parent: 104
+  - uid: 1453
+    components:
+    - type: Transform
+      pos: 15.5,-10.5
+      parent: 104
+  - uid: 1454
+    components:
+    - type: Transform
+      pos: 14.5,-10.5
+      parent: 104
+  - uid: 1455
+    components:
+    - type: Transform
+      pos: 13.5,-10.5
+      parent: 104
+  - uid: 1456
+    components:
+    - type: Transform
+      pos: 12.5,-10.5
+      parent: 104
+  - uid: 1457
+    components:
+    - type: Transform
+      pos: 11.5,-10.5
+      parent: 104
+  - uid: 1458
+    components:
+    - type: Transform
+      pos: 15.5,-14.5
+      parent: 104
+  - uid: 1459
+    components:
+    - type: Transform
+      pos: 14.5,-14.5
+      parent: 104
+  - uid: 1460
+    components:
+    - type: Transform
+      pos: 13.5,-14.5
+      parent: 104
+  - uid: 1461
+    components:
+    - type: Transform
+      pos: 12.5,-14.5
+      parent: 104
+  - uid: 1473
+    components:
+    - type: Transform
+      pos: -13.5,-19.5
+      parent: 104
+  - uid: 1474
+    components:
+    - type: Transform
+      pos: 7.5,-5.5
+      parent: 104
+  - uid: 1475
+    components:
+    - type: Transform
+      pos: 6.5,-1.5
+      parent: 104
+  - uid: 1476
+    components:
+    - type: Transform
+      pos: 3.5,0.5
+      parent: 104
+  - uid: 1488
+    components:
+    - type: Transform
+      pos: 6.5,-5.5
+      parent: 104
+  - uid: 1489
+    components:
+    - type: Transform
+      pos: 8.5,-5.5
+      parent: 104
+  - uid: 1490
+    components:
+    - type: Transform
+      pos: 6.5,-4.5
+      parent: 104
+  - uid: 1491
+    components:
+    - type: Transform
+      pos: 6.5,-3.5
+      parent: 104
+  - uid: 1492
+    components:
+    - type: Transform
+      pos: 6.5,-2.5
+      parent: 104
+  - uid: 1493
+    components:
+    - type: Transform
+      pos: 6.5,-0.5
+      parent: 104
+  - uid: 1494
+    components:
+    - type: Transform
+      pos: 5.5,-0.5
+      parent: 104
+  - uid: 1495
+    components:
+    - type: Transform
+      pos: 4.5,-0.5
+      parent: 104
+  - uid: 1496
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 104
+  - uid: 1497
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 104
+  - uid: 1498
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 104
+  - uid: 1499
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 104
+  - uid: 1500
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 104
+  - uid: 1501
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 104
+  - uid: 1502
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 104
+  - uid: 1503
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 104
+  - uid: 1504
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 104
+  - uid: 1505
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 104
+  - uid: 1506
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 104
+  - uid: 1507
+    components:
+    - type: Transform
+      pos: -0.5,-5.5
+      parent: 104
+  - uid: 1508
+    components:
+    - type: Transform
+      pos: -0.5,-6.5
+      parent: 104
+  - uid: 1509
+    components:
+    - type: Transform
+      pos: -0.5,-7.5
+      parent: 104
+  - uid: 1510
+    components:
+    - type: Transform
+      pos: 0.5,-7.5
+      parent: 104
+  - uid: 1511
+    components:
+    - type: Transform
+      pos: 1.5,-7.5
+      parent: 104
+  - uid: 1512
+    components:
+    - type: Transform
+      pos: 2.5,-7.5
+      parent: 104
+  - uid: 1513
+    components:
+    - type: Transform
+      pos: 4.5,-7.5
+      parent: 104
+  - uid: 1514
+    components:
+    - type: Transform
+      pos: 3.5,-7.5
+      parent: 104
+  - uid: 1515
+    components:
+    - type: Transform
+      pos: 5.5,-7.5
+      parent: 104
+  - uid: 1516
+    components:
+    - type: Transform
+      pos: 5.5,-8.5
+      parent: 104
+  - uid: 1517
+    components:
+    - type: Transform
+      pos: 6.5,-8.5
+      parent: 104
+  - uid: 1518
+    components:
+    - type: Transform
+      pos: 7.5,-8.5
+      parent: 104
+  - uid: 1519
+    components:
+    - type: Transform
+      pos: 8.5,-8.5
+      parent: 104
+  - uid: 1520
+    components:
+    - type: Transform
+      pos: 9.5,-8.5
+      parent: 104
+  - uid: 1521
+    components:
+    - type: Transform
+      pos: 10.5,-8.5
+      parent: 104
+  - uid: 1522
+    components:
+    - type: Transform
+      pos: 10.5,-7.5
+      parent: 104
+  - uid: 1523
+    components:
+    - type: Transform
+      pos: 11.5,-7.5
+      parent: 104
+  - uid: 1524
+    components:
+    - type: Transform
+      pos: 12.5,-7.5
+      parent: 104
+  - uid: 1525
+    components:
+    - type: Transform
+      pos: 13.5,-7.5
+      parent: 104
+  - uid: 1526
+    components:
+    - type: Transform
+      pos: 14.5,-7.5
+      parent: 104
+  - uid: 1527
+    components:
+    - type: Transform
+      pos: 14.5,-7.5
+      parent: 104
+  - uid: 1528
+    components:
+    - type: Transform
+      pos: 15.5,-7.5
+      parent: 104
+  - uid: 1529
+    components:
+    - type: Transform
+      pos: 14.5,-6.5
+      parent: 104
+  - uid: 1530
+    components:
+    - type: Transform
+      pos: 14.5,-5.5
+      parent: 104
+  - uid: 1531
+    components:
+    - type: Transform
+      pos: 14.5,-4.5
+      parent: 104
+  - uid: 1533
+    components:
+    - type: Transform
+      pos: -29.5,0.5
+      parent: 104
+  - uid: 1538
+    components:
+    - type: Transform
+      pos: 7.5,-0.5
+      parent: 104
+  - uid: 1539
+    components:
+    - type: Transform
+      pos: 8.5,-0.5
+      parent: 104
+  - uid: 1540
+    components:
+    - type: Transform
+      pos: 9.5,-0.5
+      parent: 104
+  - uid: 1541
+    components:
+    - type: Transform
+      pos: 8.5,-0.5
+      parent: 104
+  - uid: 1543
+    components:
+    - type: Transform
+      pos: 10.5,-0.5
+      parent: 104
+  - uid: 1575
+    components:
+    - type: Transform
+      pos: 21.5,-5.5
+      parent: 104
+  - uid: 1576
+    components:
+    - type: Transform
+      pos: 20.5,-5.5
+      parent: 104
+  - uid: 1577
+    components:
+    - type: Transform
+      pos: 19.5,-5.5
+      parent: 104
+  - uid: 1578
+    components:
+    - type: Transform
+      pos: 19.5,-6.5
+      parent: 104
+  - uid: 1579
+    components:
+    - type: Transform
+      pos: 19.5,-7.5
+      parent: 104
+  - uid: 1580
+    components:
+    - type: Transform
+      pos: 19.5,-9.5
+      parent: 104
+  - uid: 1581
+    components:
+    - type: Transform
+      pos: 19.5,-9.5
+      parent: 104
+  - uid: 1582
+    components:
+    - type: Transform
+      pos: 19.5,-8.5
+      parent: 104
+  - uid: 1583
+    components:
+    - type: Transform
+      pos: 20.5,-9.5
+      parent: 104
+  - uid: 1584
+    components:
+    - type: Transform
+      pos: 21.5,-9.5
+      parent: 104
+  - uid: 1585
+    components:
+    - type: Transform
+      pos: 21.5,-4.5
+      parent: 104
+  - uid: 1586
+    components:
+    - type: Transform
+      pos: 18.5,-7.5
+      parent: 104
+  - uid: 1587
+    components:
+    - type: Transform
+      pos: 17.5,-7.5
+      parent: 104
+  - uid: 1588
+    components:
+    - type: Transform
+      pos: 21.5,-8.5
+      parent: 104
+  - uid: 1589
+    components:
+    - type: Transform
+      pos: 21.5,-7.5
+      parent: 104
+  - uid: 1590
+    components:
+    - type: Transform
+      pos: 21.5,-6.5
+      parent: 104
+  - uid: 1591
+    components:
+    - type: Transform
+      pos: 10.5,-1.5
+      parent: 104
+  - uid: 1592
+    components:
+    - type: Transform
+      pos: 10.5,-3.5
+      parent: 104
+  - uid: 1593
+    components:
+    - type: Transform
+      pos: 10.5,-2.5
+      parent: 104
+  - uid: 1595
+    components:
+    - type: Transform
+      pos: -1.5,-3.5
+      parent: 104
+  - uid: 1596
+    components:
+    - type: Transform
+      pos: -2.5,-3.5
+      parent: 104
+  - uid: 1597
+    components:
+    - type: Transform
+      pos: -3.5,-3.5
+      parent: 104
+  - uid: 1941
+    components:
+    - type: Transform
+      pos: -28.5,0.5
+      parent: 104
+  - uid: 1948
+    components:
+    - type: Transform
+      pos: -14.5,-19.5
+      parent: 104
+  - uid: 2301
+    components:
+    - type: Transform
+      pos: 12.5,-21.5
+      parent: 104
+  - uid: 2302
+    components:
+    - type: Transform
+      pos: 11.5,-21.5
+      parent: 104
+  - uid: 2303
+    components:
+    - type: Transform
+      pos: 13.5,-21.5
+      parent: 104
+  - uid: 2304
+    components:
+    - type: Transform
+      pos: 0.5,-14.5
+      parent: 104
+  - uid: 2305
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 104
+  - uid: 2306
+    components:
+    - type: Transform
+      pos: -1.5,-14.5
+      parent: 104
+  - uid: 2307
+    components:
+    - type: Transform
+      pos: -2.5,-14.5
+      parent: 104
+  - uid: 2374
+    components:
+    - type: Transform
+      pos: 20.5,-12.5
+      parent: 104
+  - uid: 2375
+    components:
+    - type: Transform
+      pos: 20.5,-13.5
+      parent: 104
+  - uid: 2376
+    components:
+    - type: Transform
+      pos: 20.5,-14.5
+      parent: 104
+  - uid: 2377
+    components:
+    - type: Transform
+      pos: 20.5,-15.5
+      parent: 104
+  - uid: 2378
+    components:
+    - type: Transform
+      pos: 20.5,-16.5
+      parent: 104
+  - uid: 2379
+    components:
+    - type: Transform
+      pos: 20.5,-17.5
+      parent: 104
+  - uid: 2381
+    components:
+    - type: Transform
+      pos: 20.5,-18.5
+      parent: 104
+  - uid: 2382
+    components:
+    - type: Transform
+      pos: 20.5,-19.5
+      parent: 104
+  - uid: 2383
+    components:
+    - type: Transform
+      pos: 19.5,-17.5
+      parent: 104
+  - uid: 2384
+    components:
+    - type: Transform
+      pos: 18.5,-17.5
+      parent: 104
+  - uid: 2385
+    components:
+    - type: Transform
+      pos: 21.5,-17.5
+      parent: 104
+  - uid: 2386
+    components:
+    - type: Transform
+      pos: 22.5,-17.5
+      parent: 104
+  - uid: 2387
+    components:
+    - type: Transform
+      pos: 23.5,-17.5
+      parent: 104
+  - uid: 2388
+    components:
+    - type: Transform
+      pos: 24.5,-17.5
+      parent: 104
+  - uid: 2389
+    components:
+    - type: Transform
+      pos: 25.5,-17.5
+      parent: 104
+  - uid: 2390
+    components:
+    - type: Transform
+      pos: 26.5,-17.5
+      parent: 104
+  - uid: 2391
+    components:
+    - type: Transform
+      pos: 25.5,-18.5
+      parent: 104
+  - uid: 2392
+    components:
+    - type: Transform
+      pos: 25.5,-19.5
+      parent: 104
+  - uid: 2393
+    components:
+    - type: Transform
+      pos: 25.5,-16.5
+      parent: 104
+  - uid: 2394
+    components:
+    - type: Transform
+      pos: 25.5,-15.5
+      parent: 104
+  - uid: 2395
+    components:
+    - type: Transform
+      pos: 25.5,-14.5
+      parent: 104
+  - uid: 2396
+    components:
+    - type: Transform
+      pos: 25.5,-13.5
+      parent: 104
+  - uid: 2439
+    components:
+    - type: Transform
+      pos: 13.5,-9.5
+      parent: 104
+  - uid: 2440
+    components:
+    - type: Transform
+      pos: 5.5,-6.5
+      parent: 104
+  - uid: 2441
+    components:
+    - type: Transform
+      pos: 5.5,-5.5
+      parent: 104
+  - uid: 3378
+    components:
+    - type: Transform
+      pos: 7.5,-9.5
+      parent: 104
+  - uid: 3379
+    components:
+    - type: Transform
+      pos: 7.5,-10.5
+      parent: 104
+  - uid: 3380
+    components:
+    - type: Transform
+      pos: 6.5,-10.5
+      parent: 104
+  - uid: 3381
+    components:
+    - type: Transform
+      pos: 5.5,-10.5
+      parent: 104
+  - uid: 3382
+    components:
+    - type: Transform
+      pos: 4.5,-10.5
+      parent: 104
+  - uid: 3383
+    components:
+    - type: Transform
+      pos: 3.5,-10.5
+      parent: 104
+  - uid: 3384
+    components:
+    - type: Transform
+      pos: 3.5,-11.5
+      parent: 104
+- proto: CableApcStack
+  entities:
+  - uid: 211
+    components:
+    - type: Transform
+      pos: 11.428643,-10.548745
+      parent: 104
+  - uid: 1324
+    components:
+    - type: Transform
+      pos: 4.439247,-17.36072
+      parent: 104
+- proto: CableHV
+  entities:
+  - uid: 2334
+    components:
+    - type: Transform
+      pos: 17.5,-19.5
+      parent: 104
+  - uid: 2335
+    components:
+    - type: Transform
+      pos: 17.5,-18.5
+      parent: 104
+  - uid: 2336
+    components:
+    - type: Transform
+      pos: 17.5,-17.5
+      parent: 104
+  - uid: 2337
+    components:
+    - type: Transform
+      pos: 18.5,-19.5
+      parent: 104
+  - uid: 2338
+    components:
+    - type: Transform
+      pos: 19.5,-19.5
+      parent: 104
+  - uid: 2339
+    components:
+    - type: Transform
+      pos: 20.5,-19.5
+      parent: 104
+  - uid: 2340
+    components:
+    - type: Transform
+      pos: 21.5,-19.5
+      parent: 104
+  - uid: 2341
+    components:
+    - type: Transform
+      pos: 22.5,-19.5
+      parent: 104
+  - uid: 2342
+    components:
+    - type: Transform
+      pos: 23.5,-19.5
+      parent: 104
+  - uid: 2343
+    components:
+    - type: Transform
+      pos: 24.5,-19.5
+      parent: 104
+  - uid: 2344
+    components:
+    - type: Transform
+      pos: 25.5,-19.5
+      parent: 104
+  - uid: 2345
+    components:
+    - type: Transform
+      pos: 26.5,-19.5
+      parent: 104
+  - uid: 2346
+    components:
+    - type: Transform
+      pos: 27.5,-19.5
+      parent: 104
+  - uid: 2347
+    components:
+    - type: Transform
+      pos: 27.5,-18.5
+      parent: 104
+  - uid: 2348
+    components:
+    - type: Transform
+      pos: 27.5,-17.5
+      parent: 104
+  - uid: 2352
+    components:
+    - type: Transform
+      pos: 21.5,-18.5
+      parent: 104
+  - uid: 2353
+    components:
+    - type: Transform
+      pos: 22.5,-18.5
+      parent: 104
+  - uid: 2354
+    components:
+    - type: Transform
+      pos: 23.5,-18.5
+      parent: 104
+  - uid: 2355
+    components:
+    - type: Transform
+      pos: 22.5,-17.5
+      parent: 104
+  - uid: 2356
+    components:
+    - type: Transform
+      pos: 23.5,-17.5
+      parent: 104
+  - uid: 2357
+    components:
+    - type: Transform
+      pos: 24.5,-17.5
+      parent: 104
+  - uid: 2358
+    components:
+    - type: Transform
+      pos: 24.5,-16.5
+      parent: 104
+  - uid: 2359
+    components:
+    - type: Transform
+      pos: 24.5,-15.5
+      parent: 104
+  - uid: 2360
+    components:
+    - type: Transform
+      pos: 24.5,-14.5
+      parent: 104
+  - uid: 2361
+    components:
+    - type: Transform
+      pos: 21.5,-17.5
+      parent: 104
+  - uid: 2362
+    components:
+    - type: Transform
+      pos: 25.5,-14.5
+      parent: 104
+  - uid: 2363
+    components:
+    - type: Transform
+      pos: 26.5,-14.5
+      parent: 104
+  - uid: 2364
+    components:
+    - type: Transform
+      pos: 27.5,-14.5
+      parent: 104
+  - uid: 2365
+    components:
+    - type: Transform
+      pos: 27.5,-13.5
+      parent: 104
+- proto: CableHVStack
+  entities:
+  - uid: 209
+    components:
+    - type: Transform
+      pos: 11.334893,-10.282843
+      parent: 104
+- proto: CableMV
+  entities:
+  - uid: 240
+    components:
+    - type: Transform
+      pos: 17.5,-13.5
+      parent: 104
+  - uid: 1438
+    components:
+    - type: Transform
+      pos: 20.5,-12.5
+      parent: 104
+  - uid: 1462
+    components:
+    - type: Transform
+      pos: 16.5,-13.5
+      parent: 104
+  - uid: 1463
+    components:
+    - type: Transform
+      pos: 15.5,-13.5
+      parent: 104
+  - uid: 1464
+    components:
+    - type: Transform
+      pos: 15.5,-12.5
+      parent: 104
+  - uid: 1465
+    components:
+    - type: Transform
+      pos: 15.5,-11.5
+      parent: 104
+  - uid: 1466
+    components:
+    - type: Transform
+      pos: 15.5,-10.5
+      parent: 104
+  - uid: 1467
+    components:
+    - type: Transform
+      pos: 14.5,-10.5
+      parent: 104
+  - uid: 1468
+    components:
+    - type: Transform
+      pos: 13.5,-10.5
+      parent: 104
+  - uid: 1469
+    components:
+    - type: Transform
+      pos: 13.5,-9.5
+      parent: 104
+  - uid: 1478
+    components:
+    - type: Transform
+      pos: 12.5,-10.5
+      parent: 104
+  - uid: 1479
+    components:
+    - type: Transform
+      pos: 11.5,-10.5
+      parent: 104
+  - uid: 1480
+    components:
+    - type: Transform
+      pos: 10.5,-10.5
+      parent: 104
+  - uid: 1481
+    components:
+    - type: Transform
+      pos: 9.5,-10.5
+      parent: 104
+  - uid: 1482
+    components:
+    - type: Transform
+      pos: 9.5,-9.5
+      parent: 104
+  - uid: 1483
+    components:
+    - type: Transform
+      pos: 9.5,-8.5
+      parent: 104
+  - uid: 1484
+    components:
+    - type: Transform
+      pos: 9.5,-7.5
+      parent: 104
+  - uid: 1485
+    components:
+    - type: Transform
+      pos: 9.5,-6.5
+      parent: 104
+  - uid: 1486
+    components:
+    - type: Transform
+      pos: 8.5,-6.5
+      parent: 104
+  - uid: 1487
+    components:
+    - type: Transform
+      pos: 8.5,-5.5
+      parent: 104
+  - uid: 2322
+    components:
+    - type: Transform
+      pos: 18.5,-13.5
+      parent: 104
+  - uid: 2323
+    components:
+    - type: Transform
+      pos: 19.5,-13.5
+      parent: 104
+  - uid: 2324
+    components:
+    - type: Transform
+      pos: 20.5,-13.5
+      parent: 104
+  - uid: 2325
+    components:
+    - type: Transform
+      pos: 20.5,-12.5
+      parent: 104
+  - uid: 2367
+    components:
+    - type: Transform
+      pos: 27.5,-13.5
+      parent: 104
+  - uid: 2368
+    components:
+    - type: Transform
+      pos: 26.5,-13.5
+      parent: 104
+  - uid: 2369
+    components:
+    - type: Transform
+      pos: 25.5,-13.5
+      parent: 104
+  - uid: 2370
+    components:
+    - type: Transform
+      pos: 24.5,-13.5
+      parent: 104
+  - uid: 2371
+    components:
+    - type: Transform
+      pos: 23.5,-13.5
+      parent: 104
+  - uid: 2372
+    components:
+    - type: Transform
+      pos: 22.5,-13.5
+      parent: 104
+  - uid: 2373
+    components:
+    - type: Transform
+      pos: 21.5,-13.5
+      parent: 104
+- proto: CableMVStack
+  entities:
+  - uid: 210
+    components:
+    - type: Transform
+      pos: 11.381768,-10.407973
+      parent: 104
+- proto: CableTerminal
+  entities:
+  - uid: 2349
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 21.5,-19.5
+      parent: 104
+  - uid: 2350
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,-19.5
+      parent: 104
+  - uid: 2351
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 23.5,-19.5
+      parent: 104
+- proto: Carpet
+  entities:
+  - uid: 2459
+    components:
+    - type: Transform
+      pos: 14.5,-4.5
+      parent: 104
+  - uid: 2460
+    components:
+    - type: Transform
+      pos: 14.5,-3.5
+      parent: 104
+- proto: Catwalk
+  entities:
+  - uid: 217
+    components:
+    - type: Transform
+      pos: -12.5,-19.5
+      parent: 104
+  - uid: 218
+    components:
+    - type: Transform
+      pos: -26.5,-20.5
+      parent: 104
+  - uid: 256
+    components:
+    - type: Transform
+      pos: -29.5,2.5
+      parent: 104
+  - uid: 264
+    components:
+    - type: Transform
+      pos: -24.5,-19.5
+      parent: 104
+  - uid: 278
+    components:
+    - type: Transform
+      pos: -21.5,-23.5
+      parent: 104
+  - uid: 381
+    components:
+    - type: Transform
+      pos: -20.5,-21.5
+      parent: 104
+  - uid: 382
+    components:
+    - type: Transform
+      pos: -20.5,-23.5
+      parent: 104
+  - uid: 383
+    components:
+    - type: Transform
+      pos: -20.5,-22.5
+      parent: 104
+  - uid: 384
+    components:
+    - type: Transform
+      pos: -26.5,-19.5
+      parent: 104
+  - uid: 385
+    components:
+    - type: Transform
+      pos: -30.5,4.5
+      parent: 104
+  - uid: 386
+    components:
+    - type: Transform
+      pos: -30.5,-19.5
+      parent: 104
+  - uid: 387
+    components:
+    - type: Transform
+      pos: -14.5,-20.5
+      parent: 104
+  - uid: 388
+    components:
+    - type: Transform
+      pos: -29.5,3.5
+      parent: 104
+  - uid: 389
+    components:
+    - type: Transform
+      pos: -14.5,-22.5
+      parent: 104
+  - uid: 391
+    components:
+    - type: Transform
+      pos: -33.5,3.5
+      parent: 104
+  - uid: 392
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -34.5,-21.5
+      parent: 104
+  - uid: 393
+    components:
+    - type: Transform
+      pos: -19.5,-22.5
+      parent: 104
+  - uid: 394
+    components:
+    - type: Transform
+      pos: -32.5,4.5
+      parent: 104
+  - uid: 395
+    components:
+    - type: Transform
+      pos: -24.5,-21.5
+      parent: 104
+  - uid: 396
+    components:
+    - type: Transform
+      pos: -10.5,-16.5
+      parent: 104
+  - uid: 398
+    components:
+    - type: Transform
+      pos: -9.5,-15.5
+      parent: 104
+  - uid: 399
+    components:
+    - type: Transform
+      pos: -10.5,-15.5
+      parent: 104
+  - uid: 400
+    components:
+    - type: Transform
+      pos: -9.5,-14.5
+      parent: 104
+  - uid: 413
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,3.5
+      parent: 104
+  - uid: 414
+    components:
+    - type: Transform
+      pos: -35.5,-19.5
+      parent: 104
+  - uid: 431
+    components:
+    - type: Transform
+      pos: -9.5,-13.5
+      parent: 104
+  - uid: 440
+    components:
+    - type: Transform
+      pos: -16.5,-21.5
+      parent: 104
+  - uid: 450
+    components:
+    - type: Transform
+      pos: -33.5,-20.5
+      parent: 104
+  - uid: 451
+    components:
+    - type: Transform
+      pos: -34.5,-19.5
+      parent: 104
+  - uid: 464
+    components:
+    - type: Transform
+      pos: -34.5,-20.5
+      parent: 104
+  - uid: 468
+    components:
+    - type: Transform
+      pos: -9.5,-21.5
+      parent: 104
+  - uid: 470
+    components:
+    - type: Transform
+      pos: -9.5,-20.5
+      parent: 104
+  - uid: 490
+    components:
+    - type: Transform
+      pos: -13.5,0.5
+      parent: 104
+  - uid: 491
+    components:
+    - type: Transform
+      pos: -12.5,1.5
+      parent: 104
+  - uid: 494
+    components:
+    - type: Transform
+      pos: -11.5,1.5
+      parent: 104
+  - uid: 496
+    components:
+    - type: Transform
+      pos: -14.5,1.5
+      parent: 104
+  - uid: 499
+    components:
+    - type: Transform
+      pos: -9.5,-19.5
+      parent: 104
+  - uid: 500
+    components:
+    - type: Transform
+      pos: -9.5,-18.5
+      parent: 104
+  - uid: 501
+    components:
+    - type: Transform
+      pos: -30.5,0.5
+      parent: 104
+  - uid: 503
+    components:
+    - type: Transform
+      pos: -29.5,1.5
+      parent: 104
+  - uid: 508
+    components:
+    - type: Transform
+      pos: -12.5,0.5
+      parent: 104
+  - uid: 510
+    components:
+    - type: Transform
+      pos: -31.5,0.5
+      parent: 104
+  - uid: 514
+    components:
+    - type: Transform
+      pos: -27.5,0.5
+      parent: 104
+  - uid: 515
+    components:
+    - type: Transform
+      pos: -30.5,1.5
+      parent: 104
+  - uid: 516
+    components:
+    - type: Transform
+      pos: -9.5,-17.5
+      parent: 104
+  - uid: 517
+    components:
+    - type: Transform
+      pos: -9.5,-16.5
+      parent: 104
+  - uid: 518
+    components:
+    - type: Transform
+      pos: -10.5,-14.5
+      parent: 104
+  - uid: 519
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -31.5,-21.5
+      parent: 104
+  - uid: 520
+    components:
+    - type: Transform
+      pos: -28.5,0.5
+      parent: 104
+  - uid: 583
+    components:
+    - type: Transform
+      pos: -26.5,1.5
+      parent: 104
+  - uid: 584
+    components:
+    - type: Transform
+      pos: -10.5,-13.5
+      parent: 104
+  - uid: 616
+    components:
+    - type: Transform
+      pos: -31.5,3.5
+      parent: 104
+  - uid: 617
+    components:
+    - type: Transform
+      pos: -14.5,-23.5
+      parent: 104
+  - uid: 626
+    components:
+    - type: Transform
+      pos: -16.5,-22.5
+      parent: 104
+  - uid: 631
+    components:
+    - type: Transform
+      pos: -9.5,-23.5
+      parent: 104
+  - uid: 633
+    components:
+    - type: Transform
+      pos: -9.5,-22.5
+      parent: 104
+  - uid: 634
+    components:
+    - type: Transform
+      pos: -16.5,-23.5
+      parent: 104
+  - uid: 635
+    components:
+    - type: Transform
+      pos: -25.5,0.5
+      parent: 104
+  - uid: 636
+    components:
+    - type: Transform
+      pos: -27.5,1.5
+      parent: 104
+  - uid: 638
+    components:
+    - type: Transform
+      pos: -26.5,0.5
+      parent: 104
+  - uid: 639
+    components:
+    - type: Transform
+      pos: -24.5,1.5
+      parent: 104
+  - uid: 641
+    components:
+    - type: Transform
+      pos: -11.5,-22.5
+      parent: 104
+  - uid: 642
+    components:
+    - type: Transform
+      pos: -11.5,-23.5
+      parent: 104
+  - uid: 643
+    components:
+    - type: Transform
+      pos: -10.5,-23.5
+      parent: 104
+  - uid: 644
+    components:
+    - type: Transform
+      pos: -24.5,0.5
+      parent: 104
+  - uid: 645
+    components:
+    - type: Transform
+      pos: -25.5,1.5
+      parent: 104
+  - uid: 646
+    components:
+    - type: Transform
+      pos: -15.5,0.5
+      parent: 104
+  - uid: 647
+    components:
+    - type: Transform
+      pos: -13.5,-23.5
+      parent: 104
+  - uid: 652
+    components:
+    - type: Transform
+      pos: -14.5,0.5
+      parent: 104
+  - uid: 653
+    components:
+    - type: Transform
+      pos: -13.5,1.5
+      parent: 104
+  - uid: 654
+    components:
+    - type: Transform
+      pos: -29.5,0.5
+      parent: 104
+  - uid: 655
+    components:
+    - type: Transform
+      pos: -28.5,1.5
+      parent: 104
+  - uid: 656
+    components:
+    - type: Transform
+      pos: -35.5,-20.5
+      parent: 104
+  - uid: 658
+    components:
+    - type: Transform
+      pos: -11.5,0.5
+      parent: 104
+  - uid: 661
+    components:
+    - type: Transform
+      pos: -20.5,-19.5
+      parent: 104
+  - uid: 662
+    components:
+    - type: Transform
+      pos: -18.5,0.5
+      parent: 104
+  - uid: 663
+    components:
+    - type: Transform
+      pos: -12.5,-23.5
+      parent: 104
+  - uid: 664
+    components:
+    - type: Transform
+      pos: -17.5,1.5
+      parent: 104
+  - uid: 665
+    components:
+    - type: Transform
+      pos: -21.5,0.5
+      parent: 104
+  - uid: 667
+    components:
+    - type: Transform
+      pos: -20.5,-20.5
+      parent: 104
+  - uid: 668
+    components:
+    - type: Transform
+      pos: -32.5,1.5
+      parent: 104
+  - uid: 669
+    components:
+    - type: Transform
+      pos: -31.5,1.5
+      parent: 104
+  - uid: 707
+    components:
+    - type: Transform
+      pos: -32.5,0.5
+      parent: 104
+  - uid: 713
+    components:
+    - type: Transform
+      pos: -20.5,1.5
+      parent: 104
+  - uid: 715
+    components:
+    - type: Transform
+      pos: -10.5,-22.5
+      parent: 104
+  - uid: 736
+    components:
+    - type: Transform
+      pos: -10.5,-21.5
+      parent: 104
+  - uid: 737
+    components:
+    - type: Transform
+      pos: -10.5,-20.5
+      parent: 104
+  - uid: 738
+    components:
+    - type: Transform
+      pos: -20.5,0.5
+      parent: 104
+  - uid: 742
+    components:
+    - type: Transform
+      pos: -10.5,-19.5
+      parent: 104
+  - uid: 748
+    components:
+    - type: Transform
+      pos: -10.5,-18.5
+      parent: 104
+  - uid: 749
+    components:
+    - type: Transform
+      pos: -10.5,-17.5
+      parent: 104
+  - uid: 760
+    components:
+    - type: Transform
+      pos: -14.5,-21.5
+      parent: 104
+  - uid: 761
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,-21.5
+      parent: 104
+  - uid: 769
+    components:
+    - type: Transform
+      pos: -33.5,4.5
+      parent: 104
+  - uid: 772
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -33.5,-21.5
+      parent: 104
+  - uid: 799
+    components:
+    - type: Transform
+      pos: -26.5,3.5
+      parent: 104
+  - uid: 800
+    components:
+    - type: Transform
+      pos: -34.5,4.5
+      parent: 104
+  - uid: 812
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -32.5,-21.5
+      parent: 104
+  - uid: 813
+    components:
+    - type: Transform
+      pos: -29.5,4.5
+      parent: 104
+  - uid: 815
+    components:
+    - type: Transform
+      pos: -17.5,-23.5
+      parent: 104
+  - uid: 816
+    components:
+    - type: Transform
+      pos: -34.5,1.5
+      parent: 104
+  - uid: 817
+    components:
+    - type: Transform
+      pos: -24.5,-22.5
+      parent: 104
+  - uid: 818
+    components:
+    - type: Transform
+      pos: -24.5,-23.5
+      parent: 104
+  - uid: 820
+    components:
+    - type: Transform
+      pos: -21.5,-21.5
+      parent: 104
+  - uid: 821
+    components:
+    - type: Transform
+      pos: -21.5,-22.5
+      parent: 104
+  - uid: 822
+    components:
+    - type: Transform
+      pos: -27.5,3.5
+      parent: 104
+  - uid: 823
+    components:
+    - type: Transform
+      pos: -26.5,4.5
+      parent: 104
+  - uid: 824
+    components:
+    - type: Transform
+      pos: -25.5,4.5
+      parent: 104
+  - uid: 825
+    components:
+    - type: Transform
+      pos: -25.5,2.5
+      parent: 104
+  - uid: 826
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -33.5,-23.5
+      parent: 104
+  - uid: 827
+    components:
+    - type: Transform
+      pos: -27.5,4.5
+      parent: 104
+  - uid: 828
+    components:
+    - type: Transform
+      pos: -27.5,2.5
+      parent: 104
+  - uid: 829
+    components:
+    - type: Transform
+      pos: -26.5,2.5
+      parent: 104
+  - uid: 830
+    components:
+    - type: Transform
+      pos: -25.5,3.5
+      parent: 104
+  - uid: 831
+    components:
+    - type: Transform
+      pos: -19.5,-20.5
+      parent: 104
+  - uid: 833
+    components:
+    - type: Transform
+      pos: -18.5,-21.5
+      parent: 104
+  - uid: 834
+    components:
+    - type: Transform
+      pos: -17.5,0.5
+      parent: 104
+  - uid: 835
+    components:
+    - type: Transform
+      pos: -15.5,1.5
+      parent: 104
+  - uid: 836
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -29.5,-21.5
+      parent: 104
+  - uid: 837
+    components:
+    - type: Transform
+      pos: -16.5,1.5
+      parent: 104
+  - uid: 839
+    components:
+    - type: Transform
+      pos: -32.5,3.5
+      parent: 104
+  - uid: 841
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -33.5,-22.5
+      parent: 104
+  - uid: 842
+    components:
+    - type: Transform
+      pos: -17.5,-22.5
+      parent: 104
+  - uid: 843
+    components:
+    - type: Transform
+      pos: -18.5,-23.5
+      parent: 104
+  - uid: 844
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -32.5,-22.5
+      parent: 104
+  - uid: 846
+    components:
+    - type: Transform
+      pos: -34.5,0.5
+      parent: 104
+  - uid: 847
+    components:
+    - type: Transform
+      pos: -19.5,-21.5
+      parent: 104
+  - uid: 848
+    components:
+    - type: Transform
+      pos: -16.5,0.5
+      parent: 104
+  - uid: 849
+    components:
+    - type: Transform
+      pos: -18.5,-22.5
+      parent: 104
+  - uid: 850
+    components:
+    - type: Transform
+      pos: -17.5,-21.5
+      parent: 104
+  - uid: 851
+    components:
+    - type: Transform
+      pos: -17.5,-19.5
+      parent: 104
+  - uid: 852
+    components:
+    - type: Transform
+      pos: -18.5,-19.5
+      parent: 104
+  - uid: 853
+    components:
+    - type: Transform
+      pos: -19.5,1.5
+      parent: 104
+  - uid: 854
+    components:
+    - type: Transform
+      pos: -17.5,-20.5
+      parent: 104
+  - uid: 855
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -30.5,-21.5
+      parent: 104
+  - uid: 856
+    components:
+    - type: Transform
+      pos: -31.5,2.5
+      parent: 104
+  - uid: 857
+    components:
+    - type: Transform
+      pos: -19.5,0.5
+      parent: 104
+  - uid: 858
+    components:
+    - type: Transform
+      pos: -30.5,3.5
+      parent: 104
+  - uid: 859
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -28.5,-21.5
+      parent: 104
+  - uid: 860
+    components:
+    - type: Transform
+      pos: -33.5,1.5
+      parent: 104
+  - uid: 861
+    components:
+    - type: Transform
+      pos: -33.5,0.5
+      parent: 104
+  - uid: 862
+    components:
+    - type: Transform
+      pos: -31.5,-20.5
+      parent: 104
+  - uid: 863
+    components:
+    - type: Transform
+      pos: -32.5,-19.5
+      parent: 104
+  - uid: 864
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -27.5,-21.5
+      parent: 104
+  - uid: 865
+    components:
+    - type: Transform
+      pos: -28.5,2.5
+      parent: 104
+  - uid: 869
+    components:
+    - type: Transform
+      pos: -32.5,2.5
+      parent: 104
+  - uid: 871
+    components:
+    - type: Transform
+      pos: -31.5,4.5
+      parent: 104
+  - uid: 872
+    components:
+    - type: Transform
+      pos: -30.5,2.5
+      parent: 104
+  - uid: 873
+    components:
+    - type: Transform
+      pos: -18.5,1.5
+      parent: 104
+  - uid: 874
+    components:
+    - type: Transform
+      pos: -15.5,4.5
+      parent: 104
+  - uid: 875
+    components:
+    - type: Transform
+      pos: -15.5,3.5
+      parent: 104
+  - uid: 876
+    components:
+    - type: Transform
+      pos: -15.5,2.5
+      parent: 104
+  - uid: 878
+    components:
+    - type: Transform
+      pos: -23.5,-21.5
+      parent: 104
+  - uid: 879
+    components:
+    - type: Transform
+      pos: -23.5,-22.5
+      parent: 104
+  - uid: 880
+    components:
+    - type: Transform
+      pos: -23.5,-23.5
+      parent: 104
+  - uid: 881
+    components:
+    - type: Transform
+      pos: -18.5,-20.5
+      parent: 104
+  - uid: 882
+    components:
+    - type: Transform
+      pos: -22.5,-21.5
+      parent: 104
+  - uid: 883
+    components:
+    - type: Transform
+      pos: -19.5,-19.5
+      parent: 104
+  - uid: 885
+    components:
+    - type: Transform
+      pos: -32.5,-20.5
+      parent: 104
+  - uid: 886
+    components:
+    - type: Transform
+      pos: -33.5,-19.5
+      parent: 104
+  - uid: 887
+    components:
+    - type: Transform
+      pos: -28.5,4.5
+      parent: 104
+  - uid: 888
+    components:
+    - type: Transform
+      pos: -28.5,3.5
+      parent: 104
+  - uid: 889
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -34.5,-23.5
+      parent: 104
+  - uid: 890
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -32.5,-23.5
+      parent: 104
+  - uid: 891
+    components:
+    - type: Transform
+      pos: -33.5,2.5
+      parent: 104
+  - uid: 892
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -31.5,-22.5
+      parent: 104
+  - uid: 893
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -31.5,-23.5
+      parent: 104
+  - uid: 894
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -30.5,-22.5
+      parent: 104
+  - uid: 895
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -30.5,-23.5
+      parent: 104
+  - uid: 896
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -29.5,-22.5
+      parent: 104
+  - uid: 897
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -29.5,-23.5
+      parent: 104
+  - uid: 898
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -28.5,-22.5
+      parent: 104
+  - uid: 899
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -28.5,-23.5
+      parent: 104
+  - uid: 900
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -27.5,-22.5
+      parent: 104
+  - uid: 901
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,-22.5
+      parent: 104
+  - uid: 902
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,-23.5
+      parent: 104
+  - uid: 903
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -25.5,-22.5
+      parent: 104
+  - uid: 904
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -25.5,-23.5
+      parent: 104
+  - uid: 905
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -35.5,-22.5
+      parent: 104
+  - uid: 906
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -35.5,-23.5
+      parent: 104
+  - uid: 907
+    components:
+    - type: Transform
+      pos: -19.5,-23.5
+      parent: 104
+  - uid: 908
+    components:
+    - type: Transform
+      pos: -21.5,-19.5
+      parent: 104
+  - uid: 909
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -25.5,-21.5
+      parent: 104
+  - uid: 910
+    components:
+    - type: Transform
+      pos: -31.5,-19.5
+      parent: 104
+  - uid: 911
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -35.5,-21.5
+      parent: 104
+  - uid: 912
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -34.5,-22.5
+      parent: 104
+  - uid: 913
+    components:
+    - type: Transform
+      pos: -23.5,4.5
+      parent: 104
+  - uid: 914
+    components:
+    - type: Transform
+      pos: -21.5,-20.5
+      parent: 104
+  - uid: 915
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -23.5,3.5
+      parent: 104
+  - uid: 916
+    components:
+    - type: Transform
+      pos: -12.5,4.5
+      parent: 104
+  - uid: 917
+    components:
+    - type: Transform
+      pos: -12.5,3.5
+      parent: 104
+  - uid: 918
+    components:
+    - type: Transform
+      pos: -12.5,2.5
+      parent: 104
+  - uid: 919
+    components:
+    - type: Transform
+      pos: -22.5,-22.5
+      parent: 104
+  - uid: 921
+    components:
+    - type: Transform
+      pos: -15.5,-22.5
+      parent: 104
+  - uid: 922
+    components:
+    - type: Transform
+      pos: -30.5,-20.5
+      parent: 104
+  - uid: 923
+    components:
+    - type: Transform
+      pos: -13.5,4.5
+      parent: 104
+  - uid: 924
+    components:
+    - type: Transform
+      pos: -13.5,3.5
+      parent: 104
+  - uid: 925
+    components:
+    - type: Transform
+      pos: -13.5,2.5
+      parent: 104
+  - uid: 928
+    components:
+    - type: Transform
+      pos: -15.5,-23.5
+      parent: 104
+  - uid: 930
+    components:
+    - type: Transform
+      pos: -14.5,4.5
+      parent: 104
+  - uid: 932
+    components:
+    - type: Transform
+      pos: -14.5,2.5
+      parent: 104
+  - uid: 935
+    components:
+    - type: Transform
+      pos: -22.5,-20.5
+      parent: 104
+  - uid: 936
+    components:
+    - type: Transform
+      pos: -16.5,4.5
+      parent: 104
+  - uid: 937
+    components:
+    - type: Transform
+      pos: -16.5,3.5
+      parent: 104
+  - uid: 938
+    components:
+    - type: Transform
+      pos: -16.5,2.5
+      parent: 104
+  - uid: 939
+    components:
+    - type: Transform
+      pos: -27.5,-20.5
+      parent: 104
+  - uid: 940
+    components:
+    - type: Transform
+      pos: -15.5,-21.5
+      parent: 104
+  - uid: 941
+    components:
+    - type: Transform
+      pos: -13.5,-19.5
+      parent: 104
+  - uid: 943
+    components:
+    - type: Transform
+      pos: -17.5,4.5
+      parent: 104
+  - uid: 944
+    components:
+    - type: Transform
+      pos: -17.5,3.5
+      parent: 104
+  - uid: 945
+    components:
+    - type: Transform
+      pos: -17.5,2.5
+      parent: 104
+  - uid: 946
+    components:
+    - type: Transform
+      pos: -12.5,-22.5
+      parent: 104
+  - uid: 947
+    components:
+    - type: Transform
+      pos: -22.5,-23.5
+      parent: 104
+  - uid: 948
+    components:
+    - type: Transform
+      pos: -13.5,-21.5
+      parent: 104
+  - uid: 949
+    components:
+    - type: Transform
+      pos: -22.5,1.5
+      parent: 104
+  - uid: 950
+    components:
+    - type: Transform
+      pos: -18.5,4.5
+      parent: 104
+  - uid: 951
+    components:
+    - type: Transform
+      pos: -18.5,3.5
+      parent: 104
+  - uid: 952
+    components:
+    - type: Transform
+      pos: -18.5,2.5
+      parent: 104
+  - uid: 953
+    components:
+    - type: Transform
+      pos: -12.5,-21.5
+      parent: 104
+  - uid: 954
+    components:
+    - type: Transform
+      pos: -13.5,-22.5
+      parent: 104
+  - uid: 958
+    components:
+    - type: Transform
+      pos: -19.5,3.5
+      parent: 104
+  - uid: 959
+    components:
+    - type: Transform
+      pos: -19.5,2.5
+      parent: 104
+  - uid: 964
+    components:
+    - type: Transform
+      pos: -11.5,4.5
+      parent: 104
+  - uid: 965
+    components:
+    - type: Transform
+      pos: -11.5,3.5
+      parent: 104
+  - uid: 966
+    components:
+    - type: Transform
+      pos: -11.5,2.5
+      parent: 104
+  - uid: 972
+    components:
+    - type: Transform
+      pos: -11.5,-21.5
+      parent: 104
+  - uid: 984
+    components:
+    - type: Transform
+      pos: -9.5,-9.5
+      parent: 104
+  - uid: 985
+    components:
+    - type: Transform
+      pos: -9.5,-10.5
+      parent: 104
+  - uid: 986
+    components:
+    - type: Transform
+      pos: -9.5,-11.5
+      parent: 104
+  - uid: 987
+    components:
+    - type: Transform
+      pos: -9.5,-12.5
+      parent: 104
+  - uid: 988
+    components:
+    - type: Transform
+      pos: -10.5,4.5
+      parent: 104
+  - uid: 989
+    components:
+    - type: Transform
+      pos: -10.5,3.5
+      parent: 104
+  - uid: 990
+    components:
+    - type: Transform
+      pos: -10.5,2.5
+      parent: 104
+  - uid: 991
+    components:
+    - type: Transform
+      pos: -10.5,1.5
+      parent: 104
+  - uid: 992
+    components:
+    - type: Transform
+      pos: -10.5,0.5
+      parent: 104
+  - uid: 993
+    components:
+    - type: Transform
+      pos: -10.5,-0.5
+      parent: 104
+  - uid: 994
+    components:
+    - type: Transform
+      pos: -10.5,-1.5
+      parent: 104
+  - uid: 995
+    components:
+    - type: Transform
+      pos: -10.5,-2.5
+      parent: 104
+  - uid: 996
+    components:
+    - type: Transform
+      pos: -10.5,-3.5
+      parent: 104
+  - uid: 997
+    components:
+    - type: Transform
+      pos: -10.5,-4.5
+      parent: 104
+  - uid: 998
+    components:
+    - type: Transform
+      pos: -10.5,-5.5
+      parent: 104
+  - uid: 999
+    components:
+    - type: Transform
+      pos: -10.5,-6.5
+      parent: 104
+  - uid: 1000
+    components:
+    - type: Transform
+      pos: -10.5,-7.5
+      parent: 104
+  - uid: 1001
+    components:
+    - type: Transform
+      pos: -10.5,-8.5
+      parent: 104
+  - uid: 1002
+    components:
+    - type: Transform
+      pos: -10.5,-9.5
+      parent: 104
+  - uid: 1003
+    components:
+    - type: Transform
+      pos: -10.5,-10.5
+      parent: 104
+  - uid: 1004
+    components:
+    - type: Transform
+      pos: -10.5,-11.5
+      parent: 104
+  - uid: 1005
+    components:
+    - type: Transform
+      pos: -10.5,-12.5
+      parent: 104
+  - uid: 1006
+    components:
+    - type: Transform
+      pos: -9.5,4.5
+      parent: 104
+  - uid: 1007
+    components:
+    - type: Transform
+      pos: -9.5,3.5
+      parent: 104
+  - uid: 1008
+    components:
+    - type: Transform
+      pos: -9.5,2.5
+      parent: 104
+  - uid: 1009
+    components:
+    - type: Transform
+      pos: -9.5,1.5
+      parent: 104
+  - uid: 1010
+    components:
+    - type: Transform
+      pos: -9.5,0.5
+      parent: 104
+  - uid: 1011
+    components:
+    - type: Transform
+      pos: -9.5,-0.5
+      parent: 104
+  - uid: 1012
+    components:
+    - type: Transform
+      pos: -9.5,-1.5
+      parent: 104
+  - uid: 1013
+    components:
+    - type: Transform
+      pos: -9.5,-2.5
+      parent: 104
+  - uid: 1014
+    components:
+    - type: Transform
+      pos: -9.5,-3.5
+      parent: 104
+  - uid: 1015
+    components:
+    - type: Transform
+      pos: -9.5,-4.5
+      parent: 104
+  - uid: 1016
+    components:
+    - type: Transform
+      pos: -9.5,-5.5
+      parent: 104
+  - uid: 1017
+    components:
+    - type: Transform
+      pos: -9.5,-6.5
+      parent: 104
+  - uid: 1018
+    components:
+    - type: Transform
+      pos: -9.5,-7.5
+      parent: 104
+  - uid: 1019
+    components:
+    - type: Transform
+      pos: -9.5,-8.5
+      parent: 104
+  - uid: 1086
+    components:
+    - type: Transform
+      pos: -14.5,3.5
+      parent: 104
+  - uid: 1087
+    components:
+    - type: Transform
+      pos: -19.5,4.5
+      parent: 104
+  - uid: 1202
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,4.5
+      parent: 104
+  - uid: 1203
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -27.5,-23.5
+      parent: 104
+  - uid: 1222
+    components:
+    - type: Transform
+      pos: -34.5,2.5
+      parent: 104
+  - uid: 1223
+    components:
+    - type: Transform
+      pos: -34.5,3.5
+      parent: 104
+  - uid: 1280
+    components:
+    - type: Transform
+      pos: -23.5,-20.5
+      parent: 104
+  - uid: 1284
+    components:
+    - type: Transform
+      pos: -25.5,-19.5
+      parent: 104
+  - uid: 1289
+    components:
+    - type: Transform
+      pos: -28.5,-20.5
+      parent: 104
+  - uid: 1290
+    components:
+    - type: Transform
+      pos: -22.5,0.5
+      parent: 104
+  - uid: 1362
+    components:
+    - type: Transform
+      pos: -4.5,-2.5
+      parent: 104
+  - uid: 1363
+    components:
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 104
+  - uid: 1364
+    components:
+    - type: Transform
+      pos: -3.5,-2.5
+      parent: 104
+  - uid: 1365
+    components:
+    - type: Transform
+      pos: -4.5,-4.5
+      parent: 104
+  - uid: 1366
+    components:
+    - type: Transform
+      pos: -3.5,-4.5
+      parent: 104
+  - uid: 1377
+    components:
+    - type: Transform
+      pos: -2.5,-4.5
+      parent: 104
+  - uid: 1428
+    components:
+    - type: Transform
+      pos: -16.5,-19.5
+      parent: 104
+  - uid: 1535
+    components:
+    - type: Transform
+      pos: -13.5,-20.5
+      parent: 104
+  - uid: 1554
+    components:
+    - type: Transform
+      pos: -29.5,-19.5
+      parent: 104
+  - uid: 1674
+    components:
+    - type: Transform
+      pos: -28.5,-19.5
+      parent: 104
+  - uid: 1785
+    components:
+    - type: Transform
+      pos: -11.5,-19.5
+      parent: 104
+  - uid: 1786
+    components:
+    - type: Transform
+      pos: -22.5,-19.5
+      parent: 104
+  - uid: 1787
+    components:
+    - type: Transform
+      pos: -11.5,-20.5
+      parent: 104
+  - uid: 1788
+    components:
+    - type: Transform
+      pos: -27.5,-19.5
+      parent: 104
+  - uid: 1789
+    components:
+    - type: Transform
+      pos: -24.5,-20.5
+      parent: 104
+  - uid: 1791
+    components:
+    - type: Transform
+      pos: -25.5,-20.5
+      parent: 104
+  - uid: 1799
+    components:
+    - type: Transform
+      pos: -29.5,-20.5
+      parent: 104
+  - uid: 1825
+    components:
+    - type: Transform
+      pos: -12.5,-20.5
+      parent: 104
+  - uid: 1886
+    components:
+    - type: Transform
+      pos: -15.5,-20.5
+      parent: 104
+  - uid: 1887
+    components:
+    - type: Transform
+      pos: -14.5,-19.5
+      parent: 104
+  - uid: 1947
+    components:
+    - type: Transform
+      pos: -15.5,-19.5
+      parent: 104
+  - uid: 1949
+    components:
+    - type: Transform
+      pos: -23.5,-19.5
+      parent: 104
+  - uid: 2046
+    components:
+    - type: Transform
+      pos: -16.5,-20.5
+      parent: 104
+  - uid: 2048
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -23.5,2.5
+      parent: 104
+  - uid: 2050
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,2.5
+      parent: 104
+  - uid: 2052
+    components:
+    - type: Transform
+      pos: -23.5,1.5
+      parent: 104
+  - uid: 2188
+    components:
+    - type: Transform
+      pos: -21.5,1.5
+      parent: 104
+  - uid: 2405
+    components:
+    - type: Transform
+      pos: 23.5,-19.5
+      parent: 104
+  - uid: 2406
+    components:
+    - type: Transform
+      pos: 22.5,-19.5
+      parent: 104
+  - uid: 2407
+    components:
+    - type: Transform
+      pos: 21.5,-19.5
+      parent: 104
+  - uid: 2408
+    components:
+    - type: Transform
+      pos: 21.5,-17.5
+      parent: 104
+  - uid: 2409
+    components:
+    - type: Transform
+      pos: 22.5,-17.5
+      parent: 104
+  - uid: 2410
+    components:
+    - type: Transform
+      pos: 23.5,-17.5
+      parent: 104
+  - uid: 2505
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -22.5,3.5
+      parent: 104
+  - uid: 2507
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -20.5,4.5
+      parent: 104
+  - uid: 2508
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -21.5,2.5
+      parent: 104
+  - uid: 2514
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -20.5,3.5
+      parent: 104
+  - uid: 2515
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -21.5,4.5
+      parent: 104
+  - uid: 2521
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -20.5,2.5
+      parent: 104
+  - uid: 2526
+    components:
+    - type: Transform
+      pos: -23.5,0.5
+      parent: 104
+  - uid: 2553
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -22.5,4.5
+      parent: 104
+  - uid: 2554
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -22.5,2.5
+      parent: 104
+  - uid: 2557
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -21.5,3.5
+      parent: 104
+- proto: Chair
+  entities:
+  - uid: 487
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-20.5
+      parent: 104
+  - uid: 1367
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-4.5
+      parent: 104
+  - uid: 1376
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-4.5
+      parent: 104
+  - uid: 1878
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-21.5
+      parent: 104
+  - uid: 1879
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-22.5
+      parent: 104
+  - uid: 2312
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-13.5
+      parent: 104
+  - uid: 2313
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-14.5
+      parent: 104
+- proto: ChairFolding
+  entities:
+  - uid: 544
+    components:
+    - type: Transform
+      pos: 20.5,8.5
+      parent: 104
+  - uid: 1062
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,4.5
+      parent: 104
+  - uid: 1063
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,2.5
+      parent: 104
+- proto: ChairOfficeDark
+  entities:
+  - uid: 1298
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-17.5
+      parent: 104
+  - uid: 1304
+    components:
+    - type: Transform
+      pos: 11.5,-17.5
+      parent: 104
+  - uid: 1764
+    components:
+    - type: Transform
+      pos: -13.5,6.5
+      parent: 104
+  - uid: 2427
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-15.5
+      parent: 104
+  - uid: 2428
+    components:
+    - type: Transform
+      pos: 25.5,-15.5
+      parent: 104
+- proto: ChairOfficeLight
+  entities:
+  - uid: 751
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-16.5
+      parent: 104
+  - uid: 1124
+    components:
+    - type: Transform
+      pos: -0.5,-12.5
+      parent: 104
+  - uid: 1296
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-11.5
+      parent: 104
+  - uid: 1297
+    components:
+    - type: Transform
+      pos: 4.5,-16.5
+      parent: 104
+- proto: ChairPilotSeat
+  entities:
+  - uid: 326
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 20.5,-6.5
+      parent: 104
+  - uid: 327
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 19.5,-7.5
+      parent: 104
+  - uid: 328
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 21.5,-7.5
+      parent: 104
+  - uid: 329
+    components:
+    - type: Transform
+      pos: 20.5,-8.5
+      parent: 104
+  - uid: 330
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,-6.5
+      parent: 104
+  - uid: 331
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-5.5
+      parent: 104
+  - uid: 332
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 21.5,-5.5
+      parent: 104
+  - uid: 333
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-6.5
+      parent: 104
+  - uid: 334
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-8.5
+      parent: 104
+  - uid: 335
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 21.5,-9.5
+      parent: 104
+  - uid: 336
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-9.5
+      parent: 104
+  - uid: 337
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,-8.5
+      parent: 104
+- proto: ChairWood
+  entities:
+  - uid: 2429
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 104
+- proto: chem_master
+  entities:
+  - uid: 2444
+    components:
+    - type: Transform
+      pos: 5.5,-10.5
+      parent: 104
+- proto: ChemicalPayload
+  entities:
+  - uid: 2380
+    components:
+    - type: Transform
+      pos: 3.3003616,-17.381208
+      parent: 104
+  - uid: 3110
+    components:
+    - type: Transform
+      pos: 3.6284866,-17.287361
+      parent: 104
+- proto: ChemistryHotplate
+  entities:
+  - uid: 1383
+    components:
+    - type: Transform
+      pos: 4.5,-12.5
+      parent: 104
+- proto: ChessBoard
+  entities:
+  - uid: 354
+    components:
+    - type: Transform
+      pos: 13.499366,-8.433407
+      parent: 104
+- proto: ClosetEmergencyFilledRandom
+  entities:
+  - uid: 1359
+    components:
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 104
+- proto: ClosetL3Filled
+  entities:
+  - uid: 1153
+    components:
+    - type: Transform
+      pos: 7.5,-17.5
+      parent: 104
+- proto: ClosetRadiationSuitFilled
+  entities:
+  - uid: 1114
+    components:
+    - type: Transform
+      pos: 6.5,-17.5
+      parent: 104
+- proto: ClosetToolFilled
+  entities:
+  - uid: 2417
+    components:
+    - type: Transform
+      pos: 20.5,-14.5
+      parent: 104
+  - uid: 2418
+    components:
+    - type: Transform
+      pos: 24.5,-14.5
+      parent: 104
+- proto: ClothingBackpackDuffelSyndicateFilledMedical
+  entities:
+  - uid: 2437
+    components:
+    - type: Transform
+      pos: 0.5,-12.5
+      parent: 104
+- proto: ClothingBackpackWaterTank
+  entities:
+  - uid: 151
+    components:
+    - type: Transform
+      pos: 9.36168,-4.462339
+      parent: 104
+    - type: SolutionAmmoProvider
+      maxShots: 200
+- proto: ClothingBeltUtilityFilled
+  entities:
+  - uid: 212
+    components:
+    - type: Transform
+      pos: 13.897393,-10.470539
+      parent: 104
+- proto: ClothingEyesGlassesChemical
+  entities:
+  - uid: 1738
+    components:
+    - type: Transform
+      pos: 3.5009227,-11.519134
+      parent: 104
+- proto: ClothingNeckScarfStripedRed
+  entities:
+  - uid: 1150
+    components:
+    - type: Transform
+      pos: -2.530845,-16.461567
+      parent: 104
+- proto: ClothingNeckStethoscope
+  entities:
+  - uid: 1336
+    components:
+    - type: Transform
+      pos: 7.5027137,-12.301802
+      parent: 104
+- proto: ClothingShoesBootsSalvage
+  entities:
+  - uid: 542
+    components:
+    - type: Transform
+      pos: 19.574894,7.069533
+      parent: 104
+  - uid: 545
+    components:
+    - type: Transform
+      pos: 19.246769,6.507033
+      parent: 104
+- proto: CombatKnife
+  entities:
+  - uid: 1694
+    components:
+    - type: Transform
+      pos: 5.483225,11.368477
+      parent: 104
+- proto: ComfyChair
+  entities:
+  - uid: 21
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-8.5
+      parent: 104
+  - uid: 352
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-8.5
+      parent: 104
+- proto: computerBodyScanner
+  entities:
+  - uid: 2436
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-14.5
+      parent: 104
+- proto: ComputerPowerMonitoring
+  entities:
+  - uid: 1730
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 27.5,-14.5
+      parent: 104
+- proto: ComputerSurveillanceWirelessCameraMonitor
+  entities:
+  - uid: 1127
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,6.5
+      parent: 104
+- proto: CyberPen
+  entities:
+  - uid: 696
+    components:
+    - type: Transform
+      pos: -14.478909,9.585995
+      parent: 104
+- proto: DresserFilled
+  entities:
+  - uid: 349
+    components:
+    - type: Transform
+      pos: 13.5,-3.5
+      parent: 104
+- proto: DrinkAbsintheBottleFull
+  entities:
+  - uid: 15
+    components:
+    - type: Transform
+      pos: 3.9415665,-8.34479
+      parent: 104
+- proto: DrinkBeerBottleFull
+  entities:
+  - uid: 157
+    components:
+    - type: Transform
+      pos: 2.5961013,-2.2186527
+      parent: 104
+  - uid: 170
+    components:
+    - type: Transform
+      pos: 3.6117263,-3.1874027
+      parent: 104
+- proto: DrinkGinBottleFull
+  entities:
+  - uid: 134
+    components:
+    - type: Transform
+      pos: 3.2228165,-8.4229965
+      parent: 104
+- proto: DrinkWhiskeyBottleFull
+  entities:
+  - uid: 25
+    components:
+    - type: Transform
+      pos: -0.5303154,-6.2851996
+      parent: 104
+- proto: EmpGrenade
+  entities:
+  - uid: 2456
+    components:
+    - type: Transform
+      pos: 14.40774,-17.385033
+      parent: 104
+  - uid: 2457
+    components:
+    - type: Transform
+      pos: 14.62649,-17.385033
+      parent: 104
+- proto: ExtinguisherCabinetFilled
+  entities:
+  - uid: 139
+    components:
+    - type: Transform
+      pos: 28.5,-14.5
+      parent: 104
+  - uid: 141
+    components:
+    - type: Transform
+      pos: 14.5,-0.5
+      parent: 104
+  - uid: 1812
+    components:
+    - type: Transform
+      pos: -1.5,-2.5
+      parent: 104
+  - uid: 1816
+    components:
+    - type: Transform
+      pos: 8.5,-10.5
+      parent: 104
+  - uid: 1822
+    components:
+    - type: Transform
+      pos: 15.5,-17.5
+      parent: 104
+- proto: FaxMachineSyndie
+  entities:
+  - uid: 81
+    components:
+    - type: Transform
+      pos: 7.5,-4.5
+      parent: 104
+- proto: filingCabinetDrawer
+  entities:
+  - uid: 1140
+    components:
+    - type: Transform
+      pos: -12.5,7.5
+      parent: 104
+- proto: filingCabinetDrawerRandom
+  entities:
+  - uid: 108
+    components:
+    - type: Transform
+      pos: 7.5,-5.5
+      parent: 104
+- proto: FirelockGlass
+  entities:
+  - uid: 1765
+    components:
+    - type: Transform
+      pos: -13.5,5.5
+      parent: 104
+- proto: Fireplace
+  entities:
+  - uid: 1273
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 104
+- proto: FloorDrain
+  entities:
+  - uid: 1361
+    components:
+    - type: Transform
+      pos: -4.5,-2.5
+      parent: 104
+    - type: Fixtures
+      fixtures: {}
+  - uid: 2438
+    components:
+    - type: Transform
+      pos: 10.5,-3.5
+      parent: 104
+    - type: Fixtures
+      fixtures: {}
+  - uid: 2443
+    components:
+    - type: Transform
+      pos: 4.5,-11.5
+      parent: 104
+    - type: Fixtures
+      fixtures: {}
+- proto: FloraRockSolid01
+  entities:
+  - uid: 1707
+    components:
+    - type: Transform
+      pos: 5.5565968,16.377468
+      parent: 104
+- proto: FloraRockSolid02
+  entities:
+  - uid: 1708
+    components:
+    - type: Transform
+      pos: -3.1481876,-0.15203857
+      parent: 104
+  - uid: 1711
+    components:
+    - type: Transform
+      pos: -1.3676796,16.13784
+      parent: 104
+- proto: FloraRockSolid03
+  entities:
+  - uid: 1706
+    components:
+    - type: Transform
+      pos: 13.550529,12.489372
+      parent: 104
+- proto: FloraTreeConifer01
+  entities:
+  - uid: 261
+    components:
+    - type: Transform
+      pos: 7.7892694,4.987089
+      parent: 104
+  - uid: 275
+    components:
+    - type: Transform
+      pos: -3.80645,4.798395
+      parent: 104
+  - uid: 281
+    components:
+    - type: Transform
+      pos: -1.0279694,6.890992
+      parent: 104
+  - uid: 1619
+    components:
+    - type: Transform
+      pos: 16.10984,7.3249645
+      parent: 104
+  - uid: 1622
+    components:
+    - type: Transform
+      pos: 7.42463,16.597832
+      parent: 104
+  - uid: 1626
+    components:
+    - type: Transform
+      pos: 11.605486,16.944057
+      parent: 104
+- proto: FloraTreeConifer02
+  entities:
+  - uid: 219
+    components:
+    - type: Transform
+      pos: 5.5,4.5
+      parent: 104
+  - uid: 260
+    components:
+    - type: Transform
+      pos: 7.7267694,7.536619
+      parent: 104
+  - uid: 267
+    components:
+    - type: Transform
+      pos: 12.789269,3.6888618
+      parent: 104
+  - uid: 268
+    components:
+    - type: Transform
+      pos: -0.17814255,7.5043383
+      parent: 104
+  - uid: 273
+    components:
+    - type: Transform
+      pos: -2.591959,2.9214401
+      parent: 104
+  - uid: 280
+    components:
+    - type: Transform
+      pos: 1.5111885,4.4898434
+      parent: 104
+  - uid: 1618
+    components:
+    - type: Transform
+      pos: 11.32859,10.093473
+      parent: 104
+  - uid: 1620
+    components:
+    - type: Transform
+      pos: 15.85984,13.16621
+      parent: 104
+  - uid: 1621
+    components:
+    - type: Transform
+      pos: 14.582346,17.286049
+      parent: 104
+- proto: FloraTreeConifer03
+  entities:
+  - uid: 271
+    components:
+    - type: Transform
+      pos: -1.1000175,4.26659
+      parent: 104
+  - uid: 1035
+    components:
+    - type: Transform
+      pos: 0.74747276,19.424063
+      parent: 104
+  - uid: 1673
+    components:
+    - type: Transform
+      pos: -3.5,15.5
+      parent: 104
+  - uid: 1830
+    components:
+    - type: Transform
+      pos: 8.497473,19.862019
+      parent: 104
+- proto: FloraTreeSnow01
+  entities:
+  - uid: 262
+    components:
+    - type: Transform
+      pos: 9.630766,6.7434845
+      parent: 104
+- proto: FloraTreeSnow02
+  entities:
+  - uid: 270
+    components:
+    - type: Transform
+      pos: -2.3114033,5.0917635
+      parent: 104
+  - uid: 1630
+    components:
+    - type: Transform
+      pos: 4.558771,16.696045
+      parent: 104
+- proto: FloraTreeSnow03
+  entities:
+  - uid: 274
+    components:
+    - type: Transform
+      pos: -3.3325882,6.8936405
+      parent: 104
+  - uid: 1629
+    components:
+    - type: Transform
+      pos: 9.924105,15.382175
+      parent: 104
+- proto: FloraTreeSnow04
+  entities:
+  - uid: 265
+    components:
+    - type: Transform
+      pos: 0.24603653,5.7335367
+      parent: 104
+  - uid: 276
+    components:
+    - type: Transform
+      pos: 5.8604717,5.2799397
+      parent: 104
+  - uid: 1624
+    components:
+    - type: Transform
+      pos: -3.1344147,13.722986
+      parent: 104
+- proto: FloraTreeSnow05
+  entities:
+  - uid: 269
+    components:
+    - type: Transform
+      pos: 0.30623245,3.9068413
+      parent: 104
+  - uid: 1627
+    components:
+    - type: Transform
+      pos: 13.331816,13.977352
+      parent: 104
+  - uid: 1628
+    components:
+    - type: Transform
+      pos: 15.066191,11.052429
+      parent: 104
+  - uid: 1631
+    components:
+    - type: Transform
+      pos: 2.1525211,16.977589
+      parent: 104
+  - uid: 1672
+    components:
+    - type: Transform
+      pos: -3.5,16.5
+      parent: 104
+- proto: FoodBoxDonkpocket
+  entities:
+  - uid: 11
+    components:
+    - type: Transform
+      pos: 12.527094,-6.308407
+      parent: 104
+- proto: FoodBoxDonkpocketTeriyaki
+  entities:
+  - uid: 2475
+    components:
+    - type: Transform
+      pos: 12.636917,-6.187726
+      parent: 104
+- proto: FoodBoxDonut
+  entities:
+  - uid: 2445
+    components:
+    - type: Transform
+      pos: 2.5389562,-6.3072195
+      parent: 104
+- proto: FoodDonutJellySlugcat
+  entities:
+  - uid: 3327
+    components:
+    - type: Transform
+      pos: -5.7255287,20.539352
+      parent: 104
+- proto: GeneratorBasic15kW
+  entities:
+  - uid: 2326
+    components:
+    - type: Transform
+      pos: 27.5,-19.5
+      parent: 104
+  - uid: 2328
+    components:
+    - type: Transform
+      pos: 17.5,-17.5
+      parent: 104
+  - uid: 2329
+    components:
+    - type: Transform
+      pos: 17.5,-19.5
+      parent: 104
+  - uid: 2330
+    components:
+    - type: Transform
+      pos: 27.5,-17.5
+      parent: 104
+- proto: GeneratorRTG
+  entities:
+  - uid: 2415
+    components:
+    - type: Transform
+      pos: 17.5,-18.5
+      parent: 104
+  - uid: 2416
+    components:
+    - type: Transform
+      pos: 27.5,-18.5
+      parent: 104
+- proto: GravityGenerator
+  entities:
+  - uid: 2327
+    components:
+    - type: Transform
+      pos: 22.5,-15.5
+      parent: 104
+    - type: GravityGenerator
+      charge: 100
+    - type: PointLight
+      radius: 175.75
+- proto: GrenadeFlashBang
+  entities:
+  - uid: 2309
+    components:
+    - type: Transform
+      pos: 11.399388,-16.363453
+      parent: 104
+  - uid: 2310
+    components:
+    - type: Transform
+      pos: 11.571263,-16.363453
+      parent: 104
+- proto: Grille
+  entities:
+  - uid: 95
+    components:
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 104
+  - uid: 115
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 104
+  - uid: 118
+    components:
+    - type: Transform
+      pos: 2.5,1.5
+      parent: 104
+  - uid: 147
+    components:
+    - type: Transform
+      pos: 11.5,1.5
+      parent: 104
+  - uid: 231
+    components:
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 104
+  - uid: 232
+    components:
+    - type: Transform
+      pos: 2.5,3.5
+      parent: 104
+  - uid: 233
+    components:
+    - type: Transform
+      pos: 4.5,2.5
+      parent: 104
+  - uid: 234
+    components:
+    - type: Transform
+      pos: 4.5,3.5
+      parent: 104
+  - uid: 303
+    components:
+    - type: Transform
+      pos: 16.5,-6.5
+      parent: 104
+  - uid: 304
+    components:
+    - type: Transform
+      pos: 16.5,-8.5
+      parent: 104
+  - uid: 526
+    components:
+    - type: Transform
+      pos: 0.5,21.5
+      parent: 104
+  - uid: 527
+    components:
+    - type: Transform
+      pos: 6.5,21.5
+      parent: 104
+  - uid: 528
+    components:
+    - type: Transform
+      pos: 1.5,21.5
+      parent: 104
+  - uid: 1034
+    components:
+    - type: Transform
+      pos: 5.5,21.5
+      parent: 104
+  - uid: 1112
+    components:
+    - type: Transform
+      pos: -1.5,-17.5
+      parent: 104
+  - uid: 1120
+    components:
+    - type: Transform
+      pos: 2.5,-15.5
+      parent: 104
+  - uid: 1121
+    components:
+    - type: Transform
+      pos: 2.5,-13.5
+      parent: 104
+  - uid: 1146
+    components:
+    - type: Transform
+      pos: -12.5,5.5
+      parent: 104
+  - uid: 1148
+    components:
+    - type: Transform
+      pos: -14.5,5.5
+      parent: 104
+  - uid: 1241
+    components:
+    - type: Transform
+      pos: 5.5,-9.5
+      parent: 104
+  - uid: 1243
+    components:
+    - type: Transform
+      pos: 7.5,-9.5
+      parent: 104
+  - uid: 1389
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 104
+  - uid: 1410
+    components:
+    - type: Transform
+      pos: 8.5,-17.5
+      parent: 104
+  - uid: 1823
+    components:
+    - type: Transform
+      pos: 8.5,20.5
+      parent: 104
+  - uid: 1824
+    components:
+    - type: Transform
+      pos: 4.5,21.5
+      parent: 104
+  - uid: 1831
+    components:
+    - type: Transform
+      pos: 8.5,21.5
+      parent: 104
+  - uid: 1832
+    components:
+    - type: Transform
+      pos: 3.5,21.5
+      parent: 104
+  - uid: 1840
+    components:
+    - type: Transform
+      pos: 11.5,-23.5
+      parent: 104
+  - uid: 1841
+    components:
+    - type: Transform
+      pos: 10.5,-23.5
+      parent: 104
+  - uid: 1847
+    components:
+    - type: Transform
+      pos: 12.5,-23.5
+      parent: 104
+  - uid: 1854
+    components:
+    - type: Transform
+      pos: 13.5,-23.5
+      parent: 104
+  - uid: 1860
+    components:
+    - type: Transform
+      pos: 14.5,-23.5
+      parent: 104
+  - uid: 1931
+    components:
+    - type: Transform
+      pos: 0.5,20.5
+      parent: 104
+  - uid: 1932
+    components:
+    - type: Transform
+      pos: 7.5,21.5
+      parent: 104
+  - uid: 1933
+    components:
+    - type: Transform
+      pos: 2.5,21.5
+      parent: 104
+  - uid: 2189
+    components:
+    - type: Transform
+      pos: -0.5,-17.5
+      parent: 104
+  - uid: 2296
+    components:
+    - type: Transform
+      pos: 0.5,-17.5
+      parent: 104
+  - uid: 2318
+    components:
+    - type: Transform
+      pos: 11.5,-8.5
+      parent: 104
+  - uid: 2319
+    components:
+    - type: Transform
+      pos: 11.5,-6.5
+      parent: 104
+- proto: KitchenKnife
+  entities:
+  - uid: 1061
+    components:
+    - type: Transform
+      pos: 18.918644,6.663283
+      parent: 104
+- proto: SyndicateMicrowave
+  entities:
+  - uid: 10
+    components:
+    - type: Transform
+      pos: 13.5,-6.5
+      parent: 104
+- proto: KitchenReagentGrinder
+  entities:
+  - uid: 1257
+    components:
+    - type: Transform
+      pos: 3.5,-10.5
+      parent: 104
+- proto: LargeBeaker
+  entities:
+  - uid: 2021
+    components:
+    - type: Transform
+      pos: 5.039936,-12.489611
+      parent: 104
+- proto: LightPostSmall
+  entities:
+  - uid: 221
+    components:
+    - type: Transform
+      pos: 15.5,16.5
+      parent: 104
+  - uid: 222
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,3.5
+      parent: 104
+  - uid: 291
+    components:
+    - type: Transform
+      pos: 17.5,3.5
+      parent: 104
+  - uid: 540
+    components:
+    - type: Transform
+      pos: 27.5,4.5
+      parent: 104
+  - uid: 541
+    components:
+    - type: Transform
+      pos: 18.5,8.5
+      parent: 104
+  - uid: 629
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,8.5
+      parent: 104
+  - uid: 1226
+    components:
+    - type: Transform
+      pos: -4.5,-0.5
+      parent: 104
+  - uid: 1276
+    components:
+    - type: Transform
+      pos: -34.5,4.5
+      parent: 104
+  - uid: 1279
+    components:
+    - type: Transform
+      pos: -35.5,-23.5
+      parent: 104
+  - uid: 1413
+    components:
+    - type: Transform
+      pos: 0.5,-22.5
+      parent: 104
+  - uid: 1668
+    components:
+    - type: Transform
+      pos: 5.5,17.5
+      parent: 104
+  - uid: 1669
+    components:
+    - type: Transform
+      pos: 10.5,11.5
+      parent: 104
+  - uid: 1671
+    components:
+    - type: Transform
+      pos: -3.5,17.5
+      parent: 104
+  - uid: 1675
+    components:
+    - type: Transform
+      pos: 10.5,2.5
+      parent: 104
+- proto: LockerSyndicatePersonalFilled
+  entities:
+  - uid: 178
+    components:
+    - type: Transform
+      pos: 9.5,-13.5
+      parent: 104
+  - uid: 196
+    components:
+    - type: Transform
+      pos: 11.5,-14.5
+      parent: 104
+  - uid: 197
+    components:
+    - type: Transform
+      pos: 11.5,-13.5
+      parent: 104
+  - uid: 198
+    components:
+    - type: Transform
+      pos: 9.5,-14.5
+      parent: 104
+  - uid: 1271
+    components:
+    - type: Transform
+      pos: 13.5,-13.5
+      parent: 104
+  - uid: 1375
+    components:
+    - type: Transform
+      pos: 13.5,-14.5
+      parent: 104
+  - uid: 2476
+    components:
+    - type: Transform
+      pos: 15.5,-6.5
+      parent: 104
+- proto: MachineCentrifuge
+  entities:
+  - uid: 1728
+    components:
+    - type: Transform
+      pos: 3.5,-11.5
+      parent: 104
+- proto: MachineElectrolysisUnit
+  entities:
+  - uid: 1718
+    components:
+    - type: Transform
+      pos: 3.5,-12.5
+      parent: 104
+- proto: MagazinePistolSubMachineGunPractice
+  entities:
+  - uid: 1648
+    components:
+    - type: Transform
+      pos: 5.7430096,13.989216
+      parent: 104
+    - type: BallisticAmmoProvider
+      unspawnedCount: 35
+- proto: MedicalBed
+  entities:
+  - uid: 1868
+    components:
+    - type: Transform
+      pos: 1.5,-16.5
+      parent: 104
+  - uid: 1874
+    components:
+    - type: Transform
+      pos: -1.5,-12.5
+      parent: 104
+  - uid: 1890
+    components:
+    - type: Transform
+      pos: 1.5,-12.5
+      parent: 104
+  - uid: 1891
+    components:
+    - type: Transform
+      pos: -1.5,-16.5
+      parent: 104
+- proto: MedkitAdvancedFilled
+  entities:
+  - uid: 447
+    components:
+    - type: Transform
+      pos: 7.5183387,-10.279964
+      parent: 104
+- proto: MedkitBruteFilled
+  entities:
+  - uid: 138
+    components:
+    - type: Transform
+      pos: 7.5183387,-10.576839
+      parent: 104
+- proto: MedkitBurnFilled
+  entities:
+  - uid: 1894
+    components:
+    - type: Transform
+      pos: 7.5339637,-10.889339
+      parent: 104
+- proto: MedkitFilled
+  entities:
+  - uid: 770
+    components:
+    - type: Transform
+      pos: 0.48478004,-16.399067
+      parent: 104
+- proto: MedkitOxygenFilled
+  entities:
+  - uid: 1895
+    components:
+    - type: Transform
+      pos: 7.5339637,-11.186214
+      parent: 104
+- proto: MedkitRadiationFilled
+  entities:
+  - uid: 448
+    components:
+    - type: Transform
+      pos: 7.5495887,-11.733089
+      parent: 104
+- proto: MedkitToxinFilled
+  entities:
+  - uid: 1388
+    components:
+    - type: Transform
+      pos: 7.5339637,-11.436214
+      parent: 104
+- proto: Mirror
+  entities:
+  - uid: 142
+    components:
+    - type: Transform
+      pos: 9.5,1.5
+      parent: 104
+  - uid: 146
+    components:
+    - type: Transform
+      pos: 10.5,1.5
+      parent: 104
+- proto: ModularGrenade
+  entities:
+  - uid: 1326
+    components:
+    - type: Transform
+      pos: 4.001747,-17.289776
+      parent: 104
+  - uid: 1328
+    components:
+    - type: Transform
+      pos: 4.204872,-17.508755
+      parent: 104
+- proto: MopBucket
+  entities:
+  - uid: 149
+    components:
+    - type: Transform
+      pos: 11.5,-3.5
+      parent: 104
+- proto: MopItem
+  entities:
+  - uid: 150
+    components:
+    - type: Transform
+      pos: 11.5,-3.5
+      parent: 104
+- proto: Multitool
+  entities:
+  - uid: 1555
+    components:
+    - type: Transform
+      pos: 11.895346,-10.413807
+      parent: 104
+- proto: NukeDiskFake
+  entities:
+  - uid: 282
+    components:
+    - type: Transform
+      pos: 12.149857,15.427643
+      parent: 104
+- proto: OperatingTable
+  entities:
+  - uid: 2435
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 104
+- proto: Paper
+  entities:
+  - uid: 612
+    components:
+    - type: Transform
+      pos: -14.166584,9.634687
+      parent: 104
+- proto: PartRodMetal
+  entities:
+  - uid: 2425
+    components:
+    - type: Transform
+      pos: 24.5,-16.5
+      parent: 104
+  - uid: 2426
+    components:
+    - type: Transform
+      pos: 24.5,-16.5
+      parent: 104
+- proto: PhoneInstrumentSyndicate
+  entities:
+  - uid: 1684
+    components:
+    - type: Transform
+      pos: 1.4424791,-6.340748
+      parent: 104
+- proto: PianoInstrument
+  entities:
+  - uid: 2430
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 104
+- proto: PlasmaReinforcedWindowDirectional
+  entities:
+  - uid: 1817
+    components:
+    - type: Transform
+      pos: 13.5,-18.5
+      parent: 104
+  - uid: 1818
+    components:
+    - type: Transform
+      pos: 12.5,-18.5
+      parent: 104
+  - uid: 1819
+    components:
+    - type: Transform
+      pos: 11.5,-18.5
+      parent: 104
+  - uid: 1858
+    components:
+    - type: Transform
+      pos: 14.5,-18.5
+      parent: 104
+- proto: PlushieBee
+  entities:
+  - uid: 2317
+    components:
+    - type: Transform
+      pos: 1.5,-12.5
+      parent: 104
+- proto: PlushieLizard
+  entities:
+  - uid: 1266
+    components:
+    - type: Transform
+      pos: -15.435635,22.055351
+      parent: 104
+  - uid: 2315
+    components:
+    - type: Transform
+      pos: -1.5,-16.5
+      parent: 104
+  - uid: 3367
+    components:
+    - type: Transform
+      pos: -4.605839,20.481245
+      parent: 104
+- proto: PlushieNuke
+  entities:
+  - uid: 163
+    components:
+    - type: Transform
+      pos: 1.8113766,-6.337348
+      parent: 104
+  - uid: 283
+    components:
+    - type: Transform
+      pos: 12.912951,15.575253
+      parent: 104
+- proto: PlushieRouny
+  entities:
+  - uid: 2316
+    components:
+    - type: Transform
+      pos: -1.5,-12.5
+      parent: 104
+- proto: PlushieVox
+  entities:
+  - uid: 2314
+    components:
+    - type: Transform
+      pos: 1.5,-16.5
+      parent: 104
+- proto: PortableScrubber
+  entities:
+  - uid: 811
+    components:
+    - type: Transform
+      pos: 10.5,-10.5
+      parent: 104
+- proto: PosterBroken
+  entities:
+  - uid: 227
+    components:
+    - type: Transform
+      pos: -0.5,10.5
+      parent: 104
+- proto: PosterContrabandC20r
+  entities:
+  - uid: 1556
+    components:
+    - type: Transform
+      pos: 10.5,-9.5
+      parent: 104
+- proto: PosterContrabandClown
+  entities:
+  - uid: 1681
+    components:
+    - type: Transform
+      pos: 12.5,1.5
+      parent: 104
+- proto: PosterContrabandCybersun600
+  entities:
+  - uid: 2466
+    components:
+    - type: Transform
+      pos: 8.5,-9.5
+      parent: 104
+- proto: PosterContrabandDonk
+  entities:
+  - uid: 12
+    components:
+    - type: Transform
+      pos: 12.5,-5.5
+      parent: 104
+  - uid: 2465
+    components:
+    - type: Transform
+      pos: -10.5,8.5
+      parent: 104
+- proto: PosterContrabandDonutCorp
+  entities:
+  - uid: 2450
+    components:
+    - type: Transform
+      pos: -3.5,-1.5
+      parent: 104
+- proto: PosterContrabandEnergySwords
+  entities:
+  - uid: 1384
+    components:
+    - type: Transform
+      pos: 14.5,-9.5
+      parent: 104
+- proto: PosterContrabandEnlistGorlex
+  entities:
+  - uid: 2461
+    components:
+    - type: Transform
+      pos: -0.5,0.5
+      parent: 104
+- proto: PosterContrabandInterdyne
+  entities:
+  - uid: 2464
+    components:
+    - type: Transform
+      pos: 8.5,-12.5
+      parent: 104
+- proto: PosterContrabandLustyExomorph
+  entities:
+  - uid: 754
+    components:
+    - type: Transform
+      pos: -3.5,-13.5
+      parent: 104
+  - uid: 2447
+    components:
+    - type: Transform
+      pos: 15.5,-15.5
+      parent: 104
+- proto: PosterContrabandMoth
+  entities:
+  - uid: 2462
+    components:
+    - type: Transform
+      pos: 8.5,-2.5
+      parent: 104
+- proto: PosterContrabandNuclearDeviceInformational
+  entities:
+  - uid: 2298
+    components:
+    - type: Transform
+      pos: -1.5,-5.5
+      parent: 104
+- proto: PosterContrabandPower
+  entities:
+  - uid: 1563
+    components:
+    - type: Transform
+      pos: 19.5,-12.5
+      parent: 104
+- proto: PosterContrabandPunchShit
+  entities:
+  - uid: 2451
+    components:
+    - type: Transform
+      pos: 25.5,-12.5
+      parent: 104
+- proto: PosterContrabandRebelsUnite
+  entities:
+  - uid: 2446
+    components:
+    - type: Transform
+      pos: 8.5,-3.5
+      parent: 104
+- proto: PosterContrabandRedRum
+  entities:
+  - uid: 1387
+    components:
+    - type: Transform
+      pos: 2.5,-9.5
+      parent: 104
+- proto: PosterContrabandRevolver
+  entities:
+  - uid: 2452
+    components:
+    - type: Transform
+      pos: -1.5,-7.5
+      parent: 104
+- proto: PosterContrabandRobustSoftdrinks
+  entities:
+  - uid: 1245
+    components:
+    - type: Transform
+      pos: -9.5,8.5
+      parent: 104
+- proto: PosterContrabandSyndicatePistol
+  entities:
+  - uid: 1386
+    components:
+    - type: Transform
+      pos: 12.5,-9.5
+      parent: 104
+- proto: PosterContrabandSyndicateRecruitment
+  entities:
+  - uid: 1242
+    components:
+    - type: Transform
+      pos: -15.5,7.5
+      parent: 104
+  - uid: 1561
+    components:
+    - type: Transform
+      pos: 16.5,-11.5
+      parent: 104
+  - uid: 2453
+    components:
+    - type: Transform
+      pos: -3.5,-5.5
+      parent: 104
+  - uid: 2454
+    components:
+    - type: Transform
+      pos: 12.5,-15.5
+      parent: 104
+- proto: PosterContrabandTheBigGasTruth
+  entities:
+  - uid: 2455
+    components:
+    - type: Transform
+      pos: 10.5,-15.5
+      parent: 104
+- proto: PosterContrabandVoteWeh
+  entities:
+  - uid: 1113
+    components:
+    - type: Transform
+      pos: -3.5,-15.5
+      parent: 104
+  - uid: 1227
+    components:
+    - type: Transform
+      pos: -17.5,24.5
+      parent: 104
+  - uid: 1228
+    components:
+    - type: Transform
+      pos: -16.5,24.5
+      parent: 104
+  - uid: 1229
+    components:
+    - type: Transform
+      pos: -15.5,24.5
+      parent: 104
+  - uid: 1230
+    components:
+    - type: Transform
+      pos: -14.5,24.5
+      parent: 104
+  - uid: 1231
+    components:
+    - type: Transform
+      pos: -13.5,24.5
+      parent: 104
+  - uid: 1248
+    components:
+    - type: Transform
+      pos: -12.5,24.5
+      parent: 104
+  - uid: 1251
+    components:
+    - type: Transform
+      pos: -12.5,23.5
+      parent: 104
+  - uid: 1252
+    components:
+    - type: Transform
+      pos: -12.5,22.5
+      parent: 104
+  - uid: 1253
+    components:
+    - type: Transform
+      pos: -12.5,21.5
+      parent: 104
+  - uid: 1254
+    components:
+    - type: Transform
+      pos: -12.5,20.5
+      parent: 104
+  - uid: 1255
+    components:
+    - type: Transform
+      pos: -12.5,19.5
+      parent: 104
+  - uid: 1256
+    components:
+    - type: Transform
+      pos: -13.5,19.5
+      parent: 104
+  - uid: 1258
+    components:
+    - type: Transform
+      pos: -14.5,19.5
+      parent: 104
+  - uid: 1259
+    components:
+    - type: Transform
+      pos: -15.5,19.5
+      parent: 104
+  - uid: 1260
+    components:
+    - type: Transform
+      pos: -16.5,19.5
+      parent: 104
+  - uid: 1261
+    components:
+    - type: Transform
+      pos: -17.5,19.5
+      parent: 104
+  - uid: 1262
+    components:
+    - type: Transform
+      pos: -17.5,20.5
+      parent: 104
+  - uid: 1263
+    components:
+    - type: Transform
+      pos: -17.5,21.5
+      parent: 104
+  - uid: 1264
+    components:
+    - type: Transform
+      pos: -17.5,22.5
+      parent: 104
+  - uid: 1265
+    components:
+    - type: Transform
+      pos: -17.5,23.5
+      parent: 104
+  - uid: 1565
+    components:
+    - type: Transform
+      pos: 12.5,-3.5
+      parent: 104
+- proto: PosterContrabandWaffleCorp
+  entities:
+  - uid: 2463
+    components:
+    - type: Transform
+      pos: 14.5,-2.5
+      parent: 104
+- proto: PosterLegitAnatomyPoster
+  entities:
+  - uid: 2320
+    components:
+    - type: Transform
+      pos: 2.5,-11.5
+      parent: 104
+- proto: PosterLegitCleanliness
+  entities:
+  - uid: 955
+    components:
+    - type: Transform
+      pos: 0.5,-11.5
+      parent: 104
+- proto: PosterLegitIan
+  entities:
+  - uid: 1551
+    components:
+    - type: Transform
+      pos: -0.5,12.5
+      parent: 104
+- proto: PosterLegitIonRifle
+  entities:
+  - uid: 1558
+    components:
+    - type: Transform
+      pos: 16.5,-14.5
+      parent: 104
+- proto: PosterLegitNanotrasenLogo
+  entities:
+  - uid: 237
+    components:
+    - type: Transform
+      pos: -0.5,14.5
+      parent: 104
+- proto: PosterMapSplit
+  entities:
+  - uid: 350
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 104
+- proto: PosterMapWaystation
+  entities:
+  - uid: 2449
+    components:
+    - type: Transform
+      pos: 10.5,-5.5
+      parent: 104
+- proto: PottedPlant24
+  entities:
+  - uid: 1143
+    components:
+    - type: Transform
+      pos: -14.5,7.5
+      parent: 104
+- proto: PottedPlantBioluminscent
+  entities:
+  - uid: 7
+    components:
+    - type: Transform
+      pos: 15.481667,-8.824032
+      parent: 104
+- proto: PottedPlantRandom
+  entities:
+  - uid: 1656
+    components:
+    - type: Transform
+      pos: 9.5,-1.5
+      parent: 104
+- proto: PottedPlantRandomPlastic
+  entities:
+  - uid: 1654
+    components:
+    - type: Transform
+      pos: 8.5,-6.5
+      parent: 104
+  - uid: 1655
+    components:
+    - type: Transform
+      pos: 5.5,-8.5
+      parent: 104
+- proto: Poweredlight
+  entities:
+  - uid: 1333
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-0.5
+      parent: 104
+- proto: PoweredLightPostSmall
+  entities:
+  - uid: 2525
+    components:
+    - type: Transform
+      pos: -10.5,0.5
+      parent: 104
+  - uid: 2527
+    components:
+    - type: Transform
+      pos: -31.5,0.5
+      parent: 104
+  - uid: 2528
+    components:
+    - type: Transform
+      pos: -27.5,0.5
+      parent: 104
+  - uid: 2529
+    components:
+    - type: Transform
+      pos: -23.5,0.5
+      parent: 104
+  - uid: 2530
+    components:
+    - type: Transform
+      pos: -19.5,0.5
+      parent: 104
+  - uid: 2531
+    components:
+    - type: Transform
+      pos: -15.5,0.5
+      parent: 104
+  - uid: 2532
+    components:
+    - type: Transform
+      pos: -10.5,-19.5
+      parent: 104
+  - uid: 2533
+    components:
+    - type: Transform
+      pos: -15.5,-19.5
+      parent: 104
+  - uid: 2534
+    components:
+    - type: Transform
+      pos: -19.5,-19.5
+      parent: 104
+  - uid: 2535
+    components:
+    - type: Transform
+      pos: -23.5,-19.5
+      parent: 104
+  - uid: 2536
+    components:
+    - type: Transform
+      pos: -27.5,-19.5
+      parent: 104
+  - uid: 2537
+    components:
+    - type: Transform
+      pos: -31.5,-19.5
+      parent: 104
+- proto: PoweredSmallLight
+  entities:
+  - uid: 23
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,-1.5
+      parent: 104
+- proto: Rack
+  entities:
+  - uid: 472
+    components:
+    - type: Transform
+      pos: 11.5,-16.5
+      parent: 104
+  - uid: 1360
+    components:
+    - type: Transform
+      pos: -2.5,-4.5
+      parent: 104
+- proto: Railing
+  entities:
+  - uid: 253
+    components:
+    - type: Transform
+      pos: -31.5,0.5
+      parent: 104
+  - uid: 446
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-6.5
+      parent: 104
+  - uid: 456
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-2.5
+      parent: 104
+  - uid: 457
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-3.5
+      parent: 104
+  - uid: 458
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-4.5
+      parent: 104
+  - uid: 459
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,5.5
+      parent: 104
+  - uid: 461
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-5.5
+      parent: 104
+  - uid: 481
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,6.5
+      parent: 104
+  - uid: 523
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,7.5
+      parent: 104
+  - uid: 585
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-22.5
+      parent: 104
+  - uid: 942
+    components:
+    - type: Transform
+      pos: -20.5,0.5
+      parent: 104
+  - uid: 956
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -34.5,1.5
+      parent: 104
+  - uid: 1080
+    components:
+    - type: Transform
+      pos: -34.5,-23.5
+      parent: 104
+  - uid: 1111
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-0.5
+      parent: 104
+  - uid: 1159
+    components:
+    - type: Transform
+      pos: -22.5,-23.5
+      parent: 104
+  - uid: 1301
+    components:
+    - type: Transform
+      pos: -28.5,-23.5
+      parent: 104
+  - uid: 1302
+    components:
+    - type: Transform
+      pos: -21.5,-23.5
+      parent: 104
+  - uid: 1303
+    components:
+    - type: Transform
+      pos: -26.5,-23.5
+      parent: 104
+  - uid: 1305
+    components:
+    - type: Transform
+      pos: -24.5,-23.5
+      parent: 104
+  - uid: 1306
+    components:
+    - type: Transform
+      pos: -20.5,-23.5
+      parent: 104
+  - uid: 1307
+    components:
+    - type: Transform
+      pos: -19.5,-23.5
+      parent: 104
+  - uid: 1308
+    components:
+    - type: Transform
+      pos: -18.5,-23.5
+      parent: 104
+  - uid: 1309
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,4.5
+      parent: 104
+  - uid: 1310
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,4.5
+      parent: 104
+  - uid: 1311
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -23.5,4.5
+      parent: 104
+  - uid: 1312
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -22.5,4.5
+      parent: 104
+  - uid: 1313
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -25.5,4.5
+      parent: 104
+  - uid: 1314
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -30.5,4.5
+      parent: 104
+  - uid: 1315
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -32.5,4.5
+      parent: 104
+  - uid: 1316
+    components:
+    - type: Transform
+      pos: -32.5,-23.5
+      parent: 104
+  - uid: 1317
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -29.5,4.5
+      parent: 104
+  - uid: 1319
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -31.5,4.5
+      parent: 104
+  - uid: 1323
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -34.5,3.5
+      parent: 104
+  - uid: 1352
+    components:
+    - type: Transform
+      pos: -23.5,-23.5
+      parent: 104
+  - uid: 1353
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -33.5,4.5
+      parent: 104
+  - uid: 1354
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -28.5,4.5
+      parent: 104
+  - uid: 1355
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -27.5,4.5
+      parent: 104
+  - uid: 1357
+    components:
+    - type: Transform
+      pos: -27.5,-23.5
+      parent: 104
+  - uid: 1373
+    components:
+    - type: Transform
+      pos: -31.5,-23.5
+      parent: 104
+  - uid: 1374
+    components:
+    - type: Transform
+      pos: -29.5,-23.5
+      parent: 104
+  - uid: 1378
+    components:
+    - type: Transform
+      pos: -25.5,-23.5
+      parent: 104
+  - uid: 1379
+    components:
+    - type: Transform
+      pos: -30.5,-23.5
+      parent: 104
+  - uid: 1414
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-1.5
+      parent: 104
+  - uid: 1432
+    components:
+    - type: Transform
+      pos: -33.5,-23.5
+      parent: 104
+  - uid: 1800
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-21.5
+      parent: 104
+  - uid: 1838
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-18.5
+      parent: 104
+  - uid: 1839
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-17.5
+      parent: 104
+  - uid: 1845
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-16.5
+      parent: 104
+  - uid: 1846
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-14.5
+      parent: 104
+  - uid: 1851
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-13.5
+      parent: 104
+  - uid: 1852
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-15.5
+      parent: 104
+  - uid: 1857
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-7.5
+      parent: 104
+  - uid: 1882
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -19.5,4.5
+      parent: 104
+  - uid: 1902
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -20.5,4.5
+      parent: 104
+  - uid: 1903
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -21.5,4.5
+      parent: 104
+  - uid: 1916
+    components:
+    - type: Transform
+      pos: -15.5,-23.5
+      parent: 104
+  - uid: 1917
+    components:
+    - type: Transform
+      pos: -14.5,-23.5
+      parent: 104
+  - uid: 1918
+    components:
+    - type: Transform
+      pos: -13.5,-23.5
+      parent: 104
+  - uid: 1919
+    components:
+    - type: Transform
+      pos: -12.5,-23.5
+      parent: 104
+  - uid: 1920
+    components:
+    - type: Transform
+      pos: -11.5,-23.5
+      parent: 104
+  - uid: 1921
+    components:
+    - type: Transform
+      pos: -17.5,-23.5
+      parent: 104
+  - uid: 1922
+    components:
+    - type: Transform
+      pos: -16.5,-23.5
+      parent: 104
+  - uid: 1945
+    components:
+    - type: Transform
+      pos: -10.5,-23.5
+      parent: 104
+  - uid: 1946
+    components:
+    - type: Transform
+      pos: -9.5,-23.5
+      parent: 104
+  - uid: 1951
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -34.5,2.5
+      parent: 104
+  - uid: 2045
+    components:
+    - type: Transform
+      pos: -32.5,0.5
+      parent: 104
+  - uid: 2083
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-9.5
+      parent: 104
+  - uid: 2089
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-12.5
+      parent: 104
+  - uid: 2097
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-8.5
+      parent: 104
+  - uid: 2126
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-10.5
+      parent: 104
+  - uid: 2135
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-11.5
+      parent: 104
+  - uid: 2482
+    components:
+    - type: Transform
+      pos: -30.5,0.5
+      parent: 104
+  - uid: 2483
+    components:
+    - type: Transform
+      pos: -28.5,0.5
+      parent: 104
+  - uid: 2484
+    components:
+    - type: Transform
+      pos: -27.5,0.5
+      parent: 104
+  - uid: 2485
+    components:
+    - type: Transform
+      pos: -26.5,0.5
+      parent: 104
+  - uid: 2486
+    components:
+    - type: Transform
+      pos: -24.5,0.5
+      parent: 104
+  - uid: 2487
+    components:
+    - type: Transform
+      pos: -23.5,0.5
+      parent: 104
+  - uid: 2488
+    components:
+    - type: Transform
+      pos: -22.5,0.5
+      parent: 104
+  - uid: 2489
+    components:
+    - type: Transform
+      pos: -19.5,0.5
+      parent: 104
+  - uid: 2490
+    components:
+    - type: Transform
+      pos: -18.5,0.5
+      parent: 104
+  - uid: 2491
+    components:
+    - type: Transform
+      pos: -16.5,0.5
+      parent: 104
+  - uid: 2492
+    components:
+    - type: Transform
+      pos: -15.5,0.5
+      parent: 104
+  - uid: 2493
+    components:
+    - type: Transform
+      pos: -14.5,0.5
+      parent: 104
+  - uid: 2494
+    components:
+    - type: Transform
+      pos: -12.5,0.5
+      parent: 104
+  - uid: 2495
+    components:
+    - type: Transform
+      pos: -11.5,0.5
+      parent: 104
+  - uid: 2497
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -11.5,-19.5
+      parent: 104
+  - uid: 2498
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -12.5,-19.5
+      parent: 104
+  - uid: 2499
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -14.5,-19.5
+      parent: 104
+  - uid: 2500
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -15.5,-19.5
+      parent: 104
+  - uid: 2501
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -16.5,-19.5
+      parent: 104
+  - uid: 2502
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -18.5,-19.5
+      parent: 104
+  - uid: 2503
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -19.5,-19.5
+      parent: 104
+  - uid: 2504
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -20.5,-19.5
+      parent: 104
+  - uid: 2506
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -22.5,-19.5
+      parent: 104
+  - uid: 2509
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -23.5,-19.5
+      parent: 104
+  - uid: 2510
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,-19.5
+      parent: 104
+  - uid: 2511
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,-19.5
+      parent: 104
+  - uid: 2512
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -27.5,-19.5
+      parent: 104
+  - uid: 2513
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -28.5,-19.5
+      parent: 104
+  - uid: 2516
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -30.5,-19.5
+      parent: 104
+  - uid: 2517
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -31.5,-19.5
+      parent: 104
+  - uid: 2518
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -32.5,-19.5
+      parent: 104
+  - uid: 2519
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -34.5,-19.5
+      parent: 104
+  - uid: 2520
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-20.5
+      parent: 104
+- proto: RailingCorner
+  entities:
+  - uid: 1790
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-23.5
+      parent: 104
+  - uid: 1950
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -34.5,4.5
+      parent: 104
+  - uid: 2496
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -34.5,0.5
+      parent: 104
+  - uid: 2522
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -35.5,-19.5
+      parent: 104
+- proto: RailingCornerSmall
+  entities:
+  - uid: 1285
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-23.5
+      parent: 104
+  - uid: 1761
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,8.5
+      parent: 104
+  - uid: 1869
+    components:
+    - type: Transform
+      pos: -8.5,-24.5
+      parent: 104
+  - uid: 1873
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-24.5
+      parent: 104
+  - uid: 1883
+    components:
+    - type: Transform
+      pos: -18.5,4.5
+      parent: 104
+  - uid: 2523
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,0.5
+      parent: 104
+  - uid: 2524
+    components:
+    - type: Transform
+      pos: -10.5,-19.5
+      parent: 104
+- proto: ReinforcedPlasmaWindow
+  entities:
+  - uid: 1842
+    components:
+    - type: Transform
+      pos: 12.5,-23.5
+      parent: 104
+  - uid: 1848
+    components:
+    - type: Transform
+      pos: 14.5,-23.5
+      parent: 104
+  - uid: 1849
+    components:
+    - type: Transform
+      pos: 11.5,-23.5
+      parent: 104
+  - uid: 1853
+    components:
+    - type: Transform
+      pos: 13.5,-23.5
+      parent: 104
+  - uid: 1855
+    components:
+    - type: Transform
+      pos: 10.5,-23.5
+      parent: 104
+- proto: ReinforcedWindow
+  entities:
+  - uid: 52
+    components:
+    - type: Transform
+      pos: 16.5,-6.5
+      parent: 104
+  - uid: 73
+    components:
+    - type: Transform
+      pos: 11.5,1.5
+      parent: 104
+  - uid: 89
+    components:
+    - type: Transform
+      pos: 7.5,-9.5
+      parent: 104
+  - uid: 99
+    components:
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 104
+  - uid: 103
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 104
+  - uid: 127
+    components:
+    - type: Transform
+      pos: 11.5,-8.5
+      parent: 104
+  - uid: 128
+    components:
+    - type: Transform
+      pos: 11.5,-6.5
+      parent: 104
+  - uid: 129
+    components:
+    - type: Transform
+      pos: 16.5,-8.5
+      parent: 104
+  - uid: 155
+    components:
+    - type: Transform
+      pos: 2.5,3.5
+      parent: 104
+  - uid: 223
+    components:
+    - type: Transform
+      pos: 4.5,2.5
+      parent: 104
+  - uid: 224
+    components:
+    - type: Transform
+      pos: 4.5,3.5
+      parent: 104
+  - uid: 353
+    components:
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 104
+  - uid: 498
+    components:
+    - type: Transform
+      pos: -1.5,-17.5
+      parent: 104
+  - uid: 530
+    components:
+    - type: Transform
+      pos: 8.5,20.5
+      parent: 104
+  - uid: 649
+    components:
+    - type: Transform
+      pos: -12.5,5.5
+      parent: 104
+  - uid: 1037
+    components:
+    - type: Transform
+      pos: 1.5,21.5
+      parent: 104
+  - uid: 1038
+    components:
+    - type: Transform
+      pos: 6.5,21.5
+      parent: 104
+  - uid: 1039
+    components:
+    - type: Transform
+      pos: 8.5,21.5
+      parent: 104
+  - uid: 1040
+    components:
+    - type: Transform
+      pos: 7.5,21.5
+      parent: 104
+  - uid: 1102
+    components:
+    - type: Transform
+      pos: 8.5,-17.5
+      parent: 104
+  - uid: 1103
+    components:
+    - type: Transform
+      pos: 2.5,21.5
+      parent: 104
+  - uid: 1118
+    components:
+    - type: Transform
+      pos: 0.5,-17.5
+      parent: 104
+  - uid: 1142
+    components:
+    - type: Transform
+      pos: -14.5,5.5
+      parent: 104
+  - uid: 1186
+    components:
+    - type: Transform
+      pos: 2.5,-15.5
+      parent: 104
+  - uid: 1196
+    components:
+    - type: Transform
+      pos: -0.5,-17.5
+      parent: 104
+  - uid: 1198
+    components:
+    - type: Transform
+      pos: 2.5,-13.5
+      parent: 104
+  - uid: 1382
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 104
+  - uid: 1385
+    components:
+    - type: Transform
+      pos: 2.5,1.5
+      parent: 104
+  - uid: 1820
+    components:
+    - type: Transform
+      pos: 5.5,21.5
+      parent: 104
+  - uid: 1821
+    components:
+    - type: Transform
+      pos: 0.5,21.5
+      parent: 104
+  - uid: 1828
+    components:
+    - type: Transform
+      pos: 4.5,21.5
+      parent: 104
+  - uid: 1829
+    components:
+    - type: Transform
+      pos: 0.5,20.5
+      parent: 104
+  - uid: 1929
+    components:
+    - type: Transform
+      pos: 3.5,21.5
+      parent: 104
+  - uid: 2081
+    components:
+    - type: Transform
+      pos: 5.5,-9.5
+      parent: 104
+- proto: RemoteSignaller
+  entities:
+  - uid: 1322
+    components:
+    - type: Transform
+      pos: 5.611122,-17.316748
+      parent: 104
+  - uid: 1332
+    components:
+    - type: Transform
+      pos: 5.267372,-17.316748
+      parent: 104
+- proto: Screwdriver
+  entities:
+  - uid: 1325
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.954872,-17.44188
+      parent: 104
+- proto: SheetGlass
+  entities:
+  - uid: 2421
+    components:
+    - type: Transform
+      pos: 20.5,-16.5
+      parent: 104
+  - uid: 2422
+    components:
+    - type: Transform
+      pos: 20.5,-16.5
+      parent: 104
+- proto: SheetPlasteel
+  entities:
+  - uid: 2423
+    components:
+    - type: Transform
+      pos: 24.5,-15.5
+      parent: 104
+  - uid: 2424
+    components:
+    - type: Transform
+      pos: 24.5,-15.5
+      parent: 104
+- proto: SheetPlastic
+  entities:
+  - uid: 460
+    components:
+    - type: Transform
+      pos: 12.60107,-16.44067
+      parent: 104
+- proto: SheetSteel
+  entities:
+  - uid: 286
+    components:
+    - type: Transform
+      pos: 13.50732,-16.456295
+      parent: 104
+  - uid: 1350
+    components:
+    - type: Transform
+      pos: 3.460312,-15.657375
+      parent: 104
+  - uid: 2419
+    components:
+    - type: Transform
+      pos: 20.5,-15.5
+      parent: 104
+  - uid: 2420
+    components:
+    - type: Transform
+      pos: 20.5,-15.5
+      parent: 104
+- proto: SignalTrigger
+  entities:
+  - uid: 1330
+    components:
+    - type: Transform
+      pos: 3.6284866,-16.955233
+      parent: 104
+  - uid: 1331
+    components:
+    - type: Transform
+      pos: 3.3003616,-17.06472
+      parent: 104
+- proto: SignDirectionalBar
+  entities:
+  - uid: 2297
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 104
+- proto: SignEscapePods
+  entities:
+  - uid: 1737
+    components:
+    - type: MetaData
+      desc: steel rain babey
+      name: drop pod sign
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,-8.5
+      parent: 104
+- proto: SignMedical
+  entities:
+  - uid: 351
+    components:
+    - type: Transform
+      pos: 4.5,-9.5
+      parent: 104
+- proto: SignSurgery
+  entities:
+  - uid: 266
+    components:
+    - type: Transform
+      pos: 2.5,-12.5
+      parent: 104
+- proto: SignToxins2
+  entities:
+  - uid: 1318
+    components:
+    - type: Transform
+      pos: 8.5,-15.5
+      parent: 104
+- proto: SinkStemlessWater
+  entities:
+  - uid: 22
+    components:
+    - type: Transform
+      pos: 15.5,-1.5
+      parent: 104
+- proto: SinkWide
+  entities:
+  - uid: 144
+    components:
+    - type: Transform
+      pos: 9.5,0.5
+      parent: 104
+  - uid: 145
+    components:
+    - type: Transform
+      pos: 10.5,0.5
+      parent: 104
+  - uid: 1246
+    components:
+    - type: Transform
+      pos: 9.5,-3.5
+      parent: 104
+  - uid: 1358
+    components:
+    - type: Transform
+      pos: -4.5,-2.5
+      parent: 104
+  - uid: 2311
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-7.5
+      parent: 104
+- proto: SmallLight
+  entities:
+  - uid: 484
+    components:
+    - type: Transform
+      pos: -12.5,7.5
+      parent: 104
+  - uid: 1024
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-6.5
+      parent: 104
+  - uid: 1141
+    components:
+    - type: Transform
+      pos: -13.5,9.5
+      parent: 104
+  - uid: 1766
+    components:
+    - type: Transform
+      pos: 11.5,-16.5
+      parent: 104
+- proto: SMESBasic
+  entities:
+  - uid: 2331
+    components:
+    - type: Transform
+      pos: 21.5,-18.5
+      parent: 104
+  - uid: 2332
+    components:
+    - type: Transform
+      pos: 22.5,-18.5
+      parent: 104
+  - uid: 2333
+    components:
+    - type: Transform
+      pos: 23.5,-18.5
+      parent: 104
+- proto: soda_dispenser
+  entities:
+  - uid: 225
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-8.5
+      parent: 104
+- proto: SpaceVillainArcadeFilled
+  entities:
+  - uid: 1652
+    components:
+    - type: Transform
+      pos: 10.5,-6.5
+      parent: 104
+  - uid: 1653
+    components:
+    - type: Transform
+      pos: 9.5,-6.5
+      parent: 104
+- proto: SpawnMobLizard
+  entities:
+  - uid: 2473
+    components:
+    - type: Transform
+      pos: 5.5,-1.5
+      parent: 104
+- proto: SpawnPointNukies
+  entities:
+  - uid: 167
+    components:
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 104
+  - uid: 172
+    components:
+    - type: Transform
+      pos: 3.5,-7.5
+      parent: 104
+  - uid: 173
+    components:
+    - type: Transform
+      pos: 0.5,-5.5
+      parent: 104
+  - uid: 2477
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 104
+  - uid: 2478
+    components:
+    - type: Transform
+      pos: 3.5,-1.5
+      parent: 104
+  - uid: 2479
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 104
+  - uid: 2480
+    components:
+    - type: Transform
+      pos: 1.5,-2.5
+      parent: 104
+- proto: Spear
+  entities:
+  - uid: 3366
+    components:
+    - type: Transform
+      pos: -5.3505287,20.508072
+      parent: 104
+- proto: SprayBottle
+  entities:
+  - uid: 1699
+    components:
+    - type: Transform
+      pos: 14.060668,-16.439913
+      parent: 104
+- proto: StasisBed
+  entities:
+  - uid: 1130
+    components:
+    - type: Transform
+      pos: -2.5,-14.5
+      parent: 104
+- proto: Stool
+  entities:
+  - uid: 156
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-3.5
+      parent: 104
+  - uid: 158
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-2.5
+      parent: 104
+  - uid: 164
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-3.5
+      parent: 104
+  - uid: 166
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 104
+  - uid: 169
+    components:
+    - type: Transform
+      pos: 3.5,-1.5
+      parent: 104
+  - uid: 194
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-13.5
+      parent: 104
+  - uid: 195
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-14.5
+      parent: 104
+  - uid: 200
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-14.5
+      parent: 104
+  - uid: 507
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-1.5
+      parent: 104
+  - uid: 1334
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,-1.5
+      parent: 104
+  - uid: 1369
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-13.5
+      parent: 104
+  - uid: 1371
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-13.5
+      parent: 104
+  - uid: 1372
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-14.5
+      parent: 104
+- proto: StoolBar
+  entities:
+  - uid: 1
+    components:
+    - type: Transform
+      pos: -0.5,-5.5
+      parent: 104
+  - uid: 2
+    components:
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 104
+  - uid: 3
+    components:
+    - type: Transform
+      pos: 0.5,-5.5
+      parent: 104
+  - uid: 4
+    components:
+    - type: Transform
+      pos: 1.5,-5.5
+      parent: 104
+  - uid: 5
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 104
+  - uid: 6
+    components:
+    - type: Transform
+      pos: 4.5,-5.5
+      parent: 104
+- proto: SubstationBasic
+  entities:
+  - uid: 2366
+    components:
+    - type: Transform
+      pos: 27.5,-13.5
+      parent: 104
+- proto: SurveillanceCameraGeneral
+  entities:
+  - uid: 85
+    components:
+    - type: Transform
+      pos: 1.5,-8.5
+      parent: 104
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Bar
+  - uid: 1144
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-16.5
+      parent: 104
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Dock
+  - uid: 1185
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -10.5,7.5
+      parent: 104
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Surveillance Shack
+  - uid: 1268
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-12.5
+      parent: 104
+  - uid: 1269
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-12.5
+      parent: 104
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Medbay
+  - uid: 1270
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-12.5
+      parent: 104
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Chem and Bombs
+  - uid: 1272
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-0.5
+      parent: 104
+  - uid: 1274
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-2.5
+      parent: 104
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Entrance
+  - uid: 1320
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-4.5
+      parent: 104
+  - uid: 1321
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-3.5
+      parent: 104
+- proto: SurveillanceCameraRouterGeneral
+  entities:
+  - uid: 620
+    components:
+    - type: Transform
+      pos: -15.5,9.5
+      parent: 104
+- proto: SurveillanceCameraWirelessRouterEntertainment
+  entities:
+  - uid: 978
+    components:
+    - type: Transform
+      pos: -15.5,8.5
+      parent: 104
+- proto: SurveillanceWirelessCameraAnchoredEntertainment
+  entities:
+  - uid: 1023
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -13.5,21.5
+      parent: 104
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEntertainment
+      nameSet: True
+      id: Weeh
+- proto: SyndicatePersonalAI
+  entities:
+  - uid: 160
+    components:
+    - type: Transform
+      pos: 1.4711013,-3.6405277
+      parent: 104
+- proto: SyndieFlag
+  entities:
+  - uid: 819
+    components:
+    - type: Transform
+      pos: 11.5,-9.5
+      parent: 104
+- proto: SyndieHandyFlag
+  entities:
+  - uid: 1810
+    components:
+    - type: Transform
+      pos: 3.5076954,-6.413422
+      parent: 104
+- proto: SyringeInaprovaline
+  entities:
+  - uid: 1151
+    components:
+    - type: Transform
+      pos: -2.530845,-12.414692
+      parent: 104
+- proto: Table
+  entities:
+  - uid: 16
+    components:
+    - type: Transform
+      pos: 12.5,-6.5
+      parent: 104
+  - uid: 107
+    components:
+    - type: Transform
+      pos: 7.5,-4.5
+      parent: 104
+  - uid: 1090
+    components:
+    - type: Transform
+      pos: 7.5,-11.5
+      parent: 104
+  - uid: 1193
+    components:
+    - type: Transform
+      pos: 7.5,-12.5
+      parent: 104
+  - uid: 1300
+    components:
+    - type: Transform
+      pos: 7.5,-10.5
+      parent: 104
+  - uid: 1813
+    components:
+    - type: Transform
+      pos: 12.5,-16.5
+      parent: 104
+  - uid: 1814
+    components:
+    - type: Transform
+      pos: 13.5,-16.5
+      parent: 104
+  - uid: 1815
+    components:
+    - type: Transform
+      pos: 14.5,-16.5
+      parent: 104
+  - uid: 1859
+    components:
+    - type: Transform
+      pos: 14.5,-17.5
+      parent: 104
+  - uid: 2321
+    components:
+    - type: Transform
+      pos: 13.5,-6.5
+      parent: 104
+- proto: TableCarpet
+  entities:
+  - uid: 9
+    components:
+    - type: Transform
+      pos: 13.5,-8.5
+      parent: 104
+- proto: TableGlass
+  entities:
+  - uid: 980
+    components:
+    - type: Transform
+      pos: -2.5,-16.5
+      parent: 104
+  - uid: 1125
+    components:
+    - type: Transform
+      pos: -2.5,-12.5
+      parent: 104
+  - uid: 2090
+    components:
+    - type: Transform
+      pos: 0.5,-16.5
+      parent: 104
+  - uid: 2092
+    components:
+    - type: Transform
+      pos: 0.5,-12.5
+      parent: 104
+- proto: TablePlasmaGlass
+  entities:
+  - uid: 2411
+    components:
+    - type: Transform
+      pos: 20.5,-16.5
+      parent: 104
+  - uid: 2412
+    components:
+    - type: Transform
+      pos: 20.5,-15.5
+      parent: 104
+  - uid: 2413
+    components:
+    - type: Transform
+      pos: 24.5,-16.5
+      parent: 104
+  - uid: 2414
+    components:
+    - type: Transform
+      pos: 24.5,-15.5
+      parent: 104
+  - uid: 2431
+    components:
+    - type: Transform
+      pos: 17.5,-16.5
+      parent: 104
+  - uid: 2432
+    components:
+    - type: Transform
+      pos: 17.5,-15.5
+      parent: 104
+  - uid: 2433
+    components:
+    - type: Transform
+      pos: 27.5,-16.5
+      parent: 104
+  - uid: 2434
+    components:
+    - type: Transform
+      pos: 27.5,-15.5
+      parent: 104
+- proto: TableReinforced
+  entities:
+  - uid: 201
+    components:
+    - type: Transform
+      pos: 13.5,-10.5
+      parent: 104
+  - uid: 202
+    components:
+    - type: Transform
+      pos: 12.5,-10.5
+      parent: 104
+  - uid: 203
+    components:
+    - type: Transform
+      pos: 14.5,-10.5
+      parent: 104
+  - uid: 208
+    components:
+    - type: Transform
+      pos: 11.5,-10.5
+      parent: 104
+  - uid: 226
+    components:
+    - type: Transform
+      pos: 5.5,10.5
+      parent: 104
+  - uid: 229
+    components:
+    - type: Transform
+      pos: 5.5,11.5
+      parent: 104
+  - uid: 239
+    components:
+    - type: Transform
+      pos: 5.5,13.5
+      parent: 104
+  - uid: 241
+    components:
+    - type: Transform
+      pos: 5.5,14.5
+      parent: 104
+  - uid: 285
+    components:
+    - type: Transform
+      pos: 5.5,12.5
+      parent: 104
+  - uid: 697
+    components:
+    - type: Transform
+      pos: -13.5,5.5
+      parent: 104
+  - uid: 1129
+    components:
+    - type: Transform
+      pos: -14.5,9.5
+      parent: 104
+  - uid: 1149
+    components:
+    - type: Transform
+      pos: -13.5,9.5
+      parent: 104
+- proto: TableReinforcedGlass
+  entities:
+  - uid: 838
+    components:
+    - type: Transform
+      pos: 5.5,-17.5
+      parent: 104
+  - uid: 975
+    components:
+    - type: Transform
+      pos: 4.5,-17.5
+      parent: 104
+  - uid: 976
+    components:
+    - type: Transform
+      pos: 3.5,-17.5
+      parent: 104
+  - uid: 1192
+    components:
+    - type: Transform
+      pos: 3.5,-16.5
+      parent: 104
+  - uid: 1351
+    components:
+    - type: Transform
+      pos: 3.5,-15.5
+      parent: 104
+  - uid: 1739
+    components:
+    - type: Transform
+      pos: 5.5,-12.5
+      parent: 104
+  - uid: 2016
+    components:
+    - type: Transform
+      pos: 4.5,-12.5
+      parent: 104
+  - uid: 2022
+    components:
+    - type: Transform
+      pos: 3.5,-10.5
+      parent: 104
+  - uid: 2027
+    components:
+    - type: Transform
+      pos: 3.5,-11.5
+      parent: 104
+  - uid: 2028
+    components:
+    - type: Transform
+      pos: 3.5,-12.5
+      parent: 104
+- proto: TableWood
+  entities:
+  - uid: 8
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 104
+  - uid: 28
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-8.5
+      parent: 104
+  - uid: 30
+    components:
+    - type: Transform
+      pos: 3.5,-8.5
+      parent: 104
+  - uid: 31
+    components:
+    - type: Transform
+      pos: 4.5,-8.5
+      parent: 104
+  - uid: 32
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-6.5
+      parent: 104
+  - uid: 33
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-6.5
+      parent: 104
+  - uid: 34
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-6.5
+      parent: 104
+  - uid: 35
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-6.5
+      parent: 104
+  - uid: 36
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-6.5
+      parent: 104
+  - uid: 37
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-6.5
+      parent: 104
+  - uid: 159
+    components:
+    - type: Transform
+      pos: 2.5,-3.5
+      parent: 104
+  - uid: 162
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 104
+  - uid: 355
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 104
+- proto: TargetClown
+  entities:
+  - uid: 1291
+    components:
+    - type: Transform
+      pos: 0.5,12.5
+      parent: 104
+- proto: TargetHuman
+  entities:
+  - uid: 1293
+    components:
+    - type: Transform
+      pos: 0.5,14.5
+      parent: 104
+  - uid: 2308
+    components:
+    - type: Transform
+      pos: 12.5,-21.5
+      parent: 104
+- proto: TargetStrange
+  entities:
+  - uid: 1294
+    components:
+    - type: Transform
+      pos: 0.5,10.5
+      parent: 104
+- proto: TearGasGrenade
+  entities:
+  - uid: 306
+    components:
+    - type: Transform
+      pos: 14.638793,-16.908663
+      parent: 104
+  - uid: 1703
+    components:
+    - type: Transform
+      pos: 14.341918,-16.877413
+      parent: 104
+- proto: Telecrystal1
+  entities:
+  - uid: 2474
+    components:
+    - type: Transform
+      pos: 2.9398513,-3.4842777
+      parent: 104
+- proto: TimerTrigger
+  entities:
+  - uid: 1225
+    components:
+    - type: Transform
+      pos: 3.7048721,-16.445147
+      parent: 104
+  - uid: 1329
+    components:
+    - type: Transform
+      pos: 3.3003616,-16.470352
+      parent: 104
+- proto: ToiletEmpty
+  entities:
+  - uid: 293
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-1.5
+      parent: 104
+- proto: ToolboxElectricalFilled
+  entities:
+  - uid: 206
+    components:
+    - type: Transform
+      pos: 13.241143,-10.4236145
+      parent: 104
+- proto: ToolboxEmergencyFilled
+  entities:
+  - uid: 1368
+    components:
+    - type: Transform
+      pos: -2.4700382,-4.362167
+      parent: 104
+- proto: ToolboxSyndicateFilled
+  entities:
+  - uid: 205
+    components:
+    - type: Transform
+      pos: 12.366143,-10.392332
+      parent: 104
+- proto: ToyFigurineCaptain
+  entities:
+  - uid: 2470
+    components:
+    - type: Transform
+      pos: 2.5657434,-3.260709
+      parent: 104
+- proto: ToyFigurineNukie
+  entities:
+  - uid: 14
+    components:
+    - type: Transform
+      pos: 3.4242263,-2.6717777
+      parent: 104
+  - uid: 161
+    components:
+    - type: Transform
+      pos: 3.5492263,-2.4374027
+      parent: 104
+  - uid: 2468
+    components:
+    - type: Transform
+      pos: 3.6429763,-2.6717777
+      parent: 104
+- proto: ToyFigurineNukieCommander
+  entities:
+  - uid: 2471
+    components:
+    - type: Transform
+      pos: 3.1898513,-2.9530277
+      parent: 104
+- proto: ToyFigurineNukieElite
+  entities:
+  - uid: 2467
+    components:
+    - type: Transform
+      pos: 3.1117263,-2.6874027
+      parent: 104
+- proto: ToyMauler
+  entities:
+  - uid: 2469
+    components:
+    - type: Transform
+      pos: 3.0179763,-2.3124027
+      parent: 104
+- proto: ToyNuke
+  entities:
+  - uid: 26
+    components:
+    - type: Transform
+      pos: 4.4214306,-6.3946886
+      parent: 104
+  - uid: 284
+    components:
+    - type: Transform
+      pos: 12.453509,14.985125
+      parent: 104
+- proto: ToySkeleton
+  entities:
+  - uid: 17
+    components:
+    - type: Transform
+      pos: 3.5882664,-8.344303
+      parent: 104
+- proto: VariantCubeBox
+  entities:
+  - uid: 1826
+    components:
+    - type: Transform
+      pos: 14.485744,-16.427467
+      parent: 104
+- proto: VendingMachineBooze
+  entities:
+  - uid: 1380
+    components:
+    - type: Transform
+      pos: -0.5,-8.5
+      parent: 104
+- proto: VendingMachineChang
+  entities:
+  - uid: 1208
+    components:
+    - type: Transform
+      pos: -10.5,7.5
+      parent: 104
+- proto: VendingMachineChemicalsSyndicate
+  entities:
+  - uid: 1335
+    components:
+    - type: Transform
+      pos: 4.5,-10.5
+      parent: 104
+- proto: VendingMachineCigs
+  entities:
+  - uid: 117
+    components:
+    - type: MetaData
+      name: cigarette machine
+    - type: Transform
+      pos: 7.5,0.5
+      parent: 104
+- proto: VendingMachineClothing
+  entities:
+  - uid: 1617
+    components:
+    - type: Transform
+      pos: 13.5,0.5
+      parent: 104
+- proto: VendingMachineCola
+  entities:
+  - uid: 116
+    components:
+    - type: Transform
+      pos: 5.5,0.5
+      parent: 104
+  - uid: 1244
+    components:
+    - type: Transform
+      pos: -9.5,7.5
+      parent: 104
+- proto: VendingMachineSnack
+  entities:
+  - uid: 2442
+    components:
+    - type: Transform
+      pos: 6.5,0.5
+      parent: 104
+- proto: VendingMachineSyndieDrobe
+  entities:
+  - uid: 1299
+    components:
+    - type: Transform
+      pos: 11.5,0.5
+      parent: 104
+- proto: VendingMachineTheater
+  entities:
+  - uid: 1680
+    components:
+    - type: Transform
+      pos: 12.5,0.5
+      parent: 104
+- proto: VendingMachineYouTool
+  entities:
+  - uid: 204
+    components:
+    - type: Transform
+      pos: 15.5,-10.5
+      parent: 104
+- proto: WallIce
+  entities:
+  - uid: 236
+    components:
+    - type: Transform
+      pos: -0.5,12.5
+      parent: 104
+  - uid: 356
+    components:
+    - type: Transform
+      pos: -6.5,21.5
+      parent: 104
+  - uid: 357
+    components:
+    - type: Transform
+      pos: -3.5,21.5
+      parent: 104
+  - uid: 416
+    components:
+    - type: Transform
+      pos: -4.5,21.5
+      parent: 104
+  - uid: 727
+    components:
+    - type: Transform
+      pos: -6.5,19.5
+      parent: 104
+  - uid: 1132
+    components:
+    - type: Transform
+      pos: -4.5,22.5
+      parent: 104
+  - uid: 1133
+    components:
+    - type: Transform
+      pos: -5.5,22.5
+      parent: 104
+  - uid: 1134
+    components:
+    - type: Transform
+      pos: -6.5,22.5
+      parent: 104
+  - uid: 1221
+    components:
+    - type: Transform
+      pos: -6.5,20.5
+      parent: 104
+  - uid: 1549
+    components:
+    - type: Transform
+      pos: -0.5,10.5
+      parent: 104
+  - uid: 1670
+    components:
+    - type: Transform
+      pos: -0.5,14.5
+      parent: 104
+- proto: WallmountTelevision
+  entities:
+  - uid: 977
+    components:
+    - type: Transform
+      pos: 6.5,1.5
+      parent: 104
+- proto: WallPlastitanium
+  entities:
+  - uid: 38
+    components:
+    - type: Transform
+      pos: 12.5,-4.5
+      parent: 104
+  - uid: 39
+    components:
+    - type: Transform
+      pos: 12.5,-3.5
+      parent: 104
+  - uid: 40
+    components:
+    - type: Transform
+      pos: 9.5,-5.5
+      parent: 104
+  - uid: 41
+    components:
+    - type: Transform
+      pos: 10.5,-5.5
+      parent: 104
+  - uid: 42
+    components:
+    - type: Transform
+      pos: 11.5,-5.5
+      parent: 104
+  - uid: 43
+    components:
+    - type: Transform
+      pos: 12.5,-5.5
+      parent: 104
+  - uid: 44
+    components:
+    - type: Transform
+      pos: 12.5,-5.5
+      parent: 104
+  - uid: 45
+    components:
+    - type: Transform
+      pos: 16.5,-5.5
+      parent: 104
+  - uid: 46
+    components:
+    - type: Transform
+      pos: 20.5,-2.5
+      parent: 104
+  - uid: 47
+    components:
+    - type: Transform
+      pos: 22.5,-2.5
+      parent: 104
+  - uid: 50
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,-12.5
+      parent: 104
+  - uid: 51
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-12.5
+      parent: 104
+  - uid: 53
+    components:
+    - type: Transform
+      pos: 17.5,-2.5
+      parent: 104
+  - uid: 54
+    components:
+    - type: Transform
+      pos: 18.5,-2.5
+      parent: 104
+  - uid: 57
+    components:
+    - type: Transform
+      pos: 13.5,-5.5
+      parent: 104
+  - uid: 59
+    components:
+    - type: Transform
+      pos: 8.5,-5.5
+      parent: 104
+  - uid: 60
+    components:
+    - type: Transform
+      pos: 8.5,-4.5
+      parent: 104
+  - uid: 61
+    components:
+    - type: Transform
+      pos: 8.5,-3.5
+      parent: 104
+  - uid: 62
+    components:
+    - type: Transform
+      pos: 12.5,-9.5
+      parent: 104
+  - uid: 63
+    components:
+    - type: Transform
+      pos: 11.5,-9.5
+      parent: 104
+  - uid: 64
+    components:
+    - type: Transform
+      pos: 10.5,-9.5
+      parent: 104
+  - uid: 66
+    components:
+    - type: Transform
+      pos: 8.5,-1.5
+      parent: 104
+  - uid: 67
+    components:
+    - type: Transform
+      pos: 8.5,-2.5
+      parent: 104
+  - uid: 68
+    components:
+    - type: Transform
+      pos: 9.5,-2.5
+      parent: 104
+  - uid: 69
+    components:
+    - type: Transform
+      pos: 11.5,-2.5
+      parent: 104
+  - uid: 70
+    components:
+    - type: Transform
+      pos: 14.5,1.5
+      parent: 104
+  - uid: 71
+    components:
+    - type: Transform
+      pos: 13.5,1.5
+      parent: 104
+  - uid: 72
+    components:
+    - type: Transform
+      pos: 12.5,1.5
+      parent: 104
+  - uid: 74
+    components:
+    - type: Transform
+      pos: 10.5,1.5
+      parent: 104
+  - uid: 75
+    components:
+    - type: Transform
+      pos: 9.5,1.5
+      parent: 104
+  - uid: 76
+    components:
+    - type: Transform
+      pos: 8.5,0.5
+      parent: 104
+  - uid: 77
+    components:
+    - type: Transform
+      pos: 8.5,1.5
+      parent: 104
+  - uid: 78
+    components:
+    - type: Transform
+      pos: 7.5,1.5
+      parent: 104
+  - uid: 79
+    components:
+    - type: Transform
+      pos: 8.5,-11.5
+      parent: 104
+  - uid: 80
+    components:
+    - type: Transform
+      pos: 8.5,-9.5
+      parent: 104
+  - uid: 82
+    components:
+    - type: Transform
+      pos: 1.5,-9.5
+      parent: 104
+  - uid: 83
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 104
+  - uid: 84
+    components:
+    - type: Transform
+      pos: -0.5,-9.5
+      parent: 104
+  - uid: 86
+    components:
+    - type: Transform
+      pos: 2.5,-9.5
+      parent: 104
+  - uid: 87
+    components:
+    - type: Transform
+      pos: 3.5,-9.5
+      parent: 104
+  - uid: 88
+    components:
+    - type: Transform
+      pos: 4.5,-9.5
+      parent: 104
+  - uid: 90
+    components:
+    - type: Transform
+      pos: -1.5,-8.5
+      parent: 104
+  - uid: 91
+    components:
+    - type: Transform
+      pos: -1.5,-7.5
+      parent: 104
+  - uid: 92
+    components:
+    - type: Transform
+      pos: -1.5,-6.5
+      parent: 104
+  - uid: 93
+    components:
+    - type: Transform
+      pos: -1.5,-5.5
+      parent: 104
+  - uid: 94
+    components:
+    - type: Transform
+      pos: -1.5,-1.5
+      parent: 104
+  - uid: 97
+    components:
+    - type: Transform
+      pos: 6.5,1.5
+      parent: 104
+  - uid: 98
+    components:
+    - type: Transform
+      pos: 5.5,1.5
+      parent: 104
+  - uid: 101
+    components:
+    - type: Transform
+      pos: -0.5,0.5
+      parent: 104
+  - uid: 102
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 104
+  - uid: 105
+    components:
+    - type: Transform
+      pos: -1.5,0.5
+      parent: 104
+  - uid: 106
+    components:
+    - type: Transform
+      pos: 14.5,0.5
+      parent: 104
+  - uid: 110
+    components:
+    - type: Transform
+      pos: 12.5,-2.5
+      parent: 104
+  - uid: 113
+    components:
+    - type: Transform
+      pos: 8.5,-10.5
+      parent: 104
+  - uid: 114
+    components:
+    - type: Transform
+      pos: 16.5,-1.5
+      parent: 104
+  - uid: 119
+    components:
+    - type: Transform
+      pos: 24.5,-2.5
+      parent: 104
+  - uid: 121
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,-12.5
+      parent: 104
+  - uid: 123
+    components:
+    - type: Transform
+      pos: 21.5,-2.5
+      parent: 104
+  - uid: 124
+    components:
+    - type: Transform
+      pos: 19.5,-2.5
+      parent: 104
+  - uid: 125
+    components:
+    - type: Transform
+      pos: 16.5,-3.5
+      parent: 104
+  - uid: 126
+    components:
+    - type: Transform
+      pos: 16.5,-4.5
+      parent: 104
+  - uid: 132
+    components:
+    - type: Transform
+      pos: 23.5,-2.5
+      parent: 104
+  - uid: 133
+    components:
+    - type: Transform
+      pos: 1.5,1.5
+      parent: 104
+  - uid: 137
+    components:
+    - type: Transform
+      pos: 8.5,-12.5
+      parent: 104
+  - uid: 168
+    components:
+    - type: Transform
+      pos: 14.5,-9.5
+      parent: 104
+  - uid: 171
+    components:
+    - type: Transform
+      pos: 13.5,-9.5
+      parent: 104
+  - uid: 174
+    components:
+    - type: Transform
+      pos: 15.5,-9.5
+      parent: 104
+  - uid: 175
+    components:
+    - type: Transform
+      pos: 16.5,-9.5
+      parent: 104
+  - uid: 176
+    components:
+    - type: Transform
+      pos: 15.5,-5.5
+      parent: 104
+  - uid: 177
+    components:
+    - type: Transform
+      pos: 8.5,-13.5
+      parent: 104
+  - uid: 179
+    components:
+    - type: Transform
+      pos: 8.5,-14.5
+      parent: 104
+  - uid: 180
+    components:
+    - type: Transform
+      pos: 8.5,-15.5
+      parent: 104
+  - uid: 181
+    components:
+    - type: Transform
+      pos: 9.5,-15.5
+      parent: 104
+  - uid: 182
+    components:
+    - type: Transform
+      pos: 10.5,-15.5
+      parent: 104
+  - uid: 183
+    components:
+    - type: Transform
+      pos: 11.5,-15.5
+      parent: 104
+  - uid: 184
+    components:
+    - type: Transform
+      pos: 12.5,-15.5
+      parent: 104
+  - uid: 185
+    components:
+    - type: Transform
+      pos: 13.5,-15.5
+      parent: 104
+  - uid: 186
+    components:
+    - type: Transform
+      pos: 14.5,-15.5
+      parent: 104
+  - uid: 187
+    components:
+    - type: Transform
+      pos: 15.5,-15.5
+      parent: 104
+  - uid: 188
+    components:
+    - type: Transform
+      pos: 16.5,-15.5
+      parent: 104
+  - uid: 189
+    components:
+    - type: Transform
+      pos: 16.5,-14.5
+      parent: 104
+  - uid: 191
+    components:
+    - type: Transform
+      pos: 16.5,-12.5
+      parent: 104
+  - uid: 192
+    components:
+    - type: Transform
+      pos: 16.5,-11.5
+      parent: 104
+  - uid: 193
+    components:
+    - type: Transform
+      pos: 16.5,-10.5
+      parent: 104
+  - uid: 199
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-17.5
+      parent: 104
+  - uid: 215
+    components:
+    - type: Transform
+      pos: 16.5,-0.5
+      parent: 104
+  - uid: 242
+    components:
+    - type: Transform
+      pos: -4.5,-5.5
+      parent: 104
+  - uid: 252
+    components:
+    - type: Transform
+      pos: -3.5,-15.5
+      parent: 104
+  - uid: 288
+    components:
+    - type: Transform
+      pos: 14.5,-0.5
+      parent: 104
+  - uid: 290
+    components:
+    - type: Transform
+      pos: 15.5,-0.5
+      parent: 104
+  - uid: 298
+    components:
+    - type: Transform
+      pos: 13.5,-2.5
+      parent: 104
+  - uid: 299
+    components:
+    - type: Transform
+      pos: 14.5,-2.5
+      parent: 104
+  - uid: 300
+    components:
+    - type: Transform
+      pos: 15.5,-2.5
+      parent: 104
+  - uid: 301
+    components:
+    - type: Transform
+      pos: 16.5,-2.5
+      parent: 104
+  - uid: 307
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,-8.5
+      parent: 104
+  - uid: 308
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 19.5,-10.5
+      parent: 104
+  - uid: 309
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-11.5
+      parent: 104
+  - uid: 310
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-12.5
+      parent: 104
+  - uid: 311
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 24.5,-12.5
+      parent: 104
+  - uid: 312
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 21.5,-12.5
+      parent: 104
+  - uid: 313
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,-12.5
+      parent: 104
+  - uid: 314
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 22.5,-12.5
+      parent: 104
+  - uid: 315
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,-12.5
+      parent: 104
+  - uid: 316
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,-6.5
+      parent: 104
+  - uid: 317
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 21.5,-4.5
+      parent: 104
+  - uid: 318
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 17.5,-6.5
+      parent: 104
+  - uid: 319
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 19.5,-4.5
+      parent: 104
+  - uid: 320
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 17.5,-8.5
+      parent: 104
+  - uid: 321
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 21.5,-10.5
+      parent: 104
+  - uid: 322
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,-7.5
+      parent: 104
+  - uid: 339
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-10.5
+      parent: 104
+  - uid: 340
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-9.5
+      parent: 104
+  - uid: 341
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-8.5
+      parent: 104
+  - uid: 342
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-7.5
+      parent: 104
+  - uid: 343
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-6.5
+      parent: 104
+  - uid: 344
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-5.5
+      parent: 104
+  - uid: 345
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-4.5
+      parent: 104
+  - uid: 346
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-3.5
+      parent: 104
+  - uid: 347
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-2.5
+      parent: 104
+  - uid: 378
+    components:
+    - type: Transform
+      pos: -3.5,-16.5
+      parent: 104
+  - uid: 379
+    components:
+    - type: Transform
+      pos: -3.5,-13.5
+      parent: 104
+  - uid: 380
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-11.5
+      parent: 104
+  - uid: 418
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -12.5,8.5
+      parent: 104
+  - uid: 424
+    components:
+    - type: Transform
+      pos: -10.5,8.5
+      parent: 104
+  - uid: 427
+    components:
+    - type: Transform
+      pos: -1.5,-9.5
+      parent: 104
+  - uid: 441
+    components:
+    - type: Transform
+      pos: -2.5,-1.5
+      parent: 104
+  - uid: 443
+    components:
+    - type: Transform
+      pos: -3.5,-1.5
+      parent: 104
+  - uid: 462
+    components:
+    - type: Transform
+      pos: -5.5,-5.5
+      parent: 104
+  - uid: 463
+    components:
+    - type: Transform
+      pos: -4.5,-1.5
+      parent: 104
+  - uid: 474
+    components:
+    - type: Transform
+      pos: -5.5,-1.5
+      parent: 104
+  - uid: 482
+    components:
+    - type: Transform
+      pos: -9.5,8.5
+      parent: 104
+  - uid: 486
+    components:
+    - type: Transform
+      pos: -16.5,8.5
+      parent: 104
+  - uid: 493
+    components:
+    - type: Transform
+      pos: -3.5,-12.5
+      parent: 104
+  - uid: 495
+    components:
+    - type: Transform
+      pos: -2.5,-5.5
+      parent: 104
+  - uid: 497
+    components:
+    - type: Transform
+      pos: -2.5,-17.5
+      parent: 104
+  - uid: 591
+    components:
+    - type: Transform
+      pos: 15.5,-23.5
+      parent: 104
+  - uid: 592
+    components:
+    - type: Transform
+      pos: 9.5,-20.5
+      parent: 104
+  - uid: 593
+    components:
+    - type: Transform
+      pos: 9.5,-22.5
+      parent: 104
+  - uid: 594
+    components:
+    - type: Transform
+      pos: 9.5,-18.5
+      parent: 104
+  - uid: 611
+    components:
+    - type: Transform
+      pos: -5.5,-6.5
+      parent: 104
+  - uid: 613
+    components:
+    - type: Transform
+      pos: -13.5,19.5
+      parent: 104
+  - uid: 623
+    components:
+    - type: Transform
+      pos: -17.5,19.5
+      parent: 104
+  - uid: 651
+    components:
+    - type: Transform
+      pos: -17.5,23.5
+      parent: 104
+  - uid: 671
+    components:
+    - type: Transform
+      pos: -12.5,24.5
+      parent: 104
+  - uid: 675
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -12.5,9.5
+      parent: 104
+  - uid: 683
+    components:
+    - type: Transform
+      pos: -15.5,10.5
+      parent: 104
+  - uid: 698
+    components:
+    - type: Transform
+      pos: -14.5,10.5
+      parent: 104
+  - uid: 710
+    components:
+    - type: Transform
+      pos: -13.5,10.5
+      parent: 104
+  - uid: 730
+    components:
+    - type: Transform
+      pos: -12.5,10.5
+      parent: 104
+  - uid: 731
+    components:
+    - type: Transform
+      pos: -12.5,22.5
+      parent: 104
+  - uid: 732
+    components:
+    - type: Transform
+      pos: -15.5,19.5
+      parent: 104
+  - uid: 739
+    components:
+    - type: Transform
+      pos: -17.5,21.5
+      parent: 104
+  - uid: 743
+    components:
+    - type: Transform
+      pos: -16.5,9.5
+      parent: 104
+  - uid: 744
+    components:
+    - type: Transform
+      pos: -16.5,7.5
+      parent: 104
+  - uid: 750
+    components:
+    - type: Transform
+      pos: -3.5,-14.5
+      parent: 104
+  - uid: 767
+    components:
+    - type: Transform
+      pos: -16.5,10.5
+      parent: 104
+  - uid: 773
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-11.5
+      parent: 104
+  - uid: 1025
+    components:
+    - type: Transform
+      pos: 3.5,-18.5
+      parent: 104
+  - uid: 1026
+    components:
+    - type: Transform
+      pos: 4.5,-18.5
+      parent: 104
+  - uid: 1091
+    components:
+    - type: Transform
+      pos: -5.5,-2.5
+      parent: 104
+  - uid: 1104
+    components:
+    - type: Transform
+      pos: 9.5,-19.5
+      parent: 104
+  - uid: 1110
+    components:
+    - type: Transform
+      pos: -5.5,-4.5
+      parent: 104
+  - uid: 1123
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-11.5
+      parent: 104
+  - uid: 1126
+    components:
+    - type: Transform
+      pos: -17.5,22.5
+      parent: 104
+  - uid: 1128
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -11.5,8.5
+      parent: 104
+  - uid: 1136
+    components:
+    - type: Transform
+      pos: -11.5,5.5
+      parent: 104
+  - uid: 1137
+    components:
+    - type: Transform
+      pos: -15.5,7.5
+      parent: 104
+  - uid: 1138
+    components:
+    - type: Transform
+      pos: -15.5,6.5
+      parent: 104
+  - uid: 1139
+    components:
+    - type: Transform
+      pos: -15.5,5.5
+      parent: 104
+  - uid: 1147
+    components:
+    - type: Transform
+      pos: -11.5,7.5
+      parent: 104
+  - uid: 1181
+    components:
+    - type: Transform
+      pos: 2.5,-16.5
+      parent: 104
+  - uid: 1184
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-11.5
+      parent: 104
+  - uid: 1188
+    components:
+    - type: Transform
+      pos: 2.5,-18.5
+      parent: 104
+  - uid: 1190
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-11.5
+      parent: 104
+  - uid: 1197
+    components:
+    - type: Transform
+      pos: 7.5,-18.5
+      parent: 104
+  - uid: 1199
+    components:
+    - type: Transform
+      pos: 5.5,-18.5
+      parent: 104
+  - uid: 1201
+    components:
+    - type: Transform
+      pos: 6.5,-18.5
+      parent: 104
+  - uid: 1205
+    components:
+    - type: Transform
+      pos: 2.5,-17.5
+      parent: 104
+  - uid: 1206
+    components:
+    - type: Transform
+      pos: 8.5,-18.5
+      parent: 104
+  - uid: 1207
+    components:
+    - type: Transform
+      pos: -17.5,24.5
+      parent: 104
+  - uid: 1209
+    components:
+    - type: Transform
+      pos: -17.5,20.5
+      parent: 104
+  - uid: 1210
+    components:
+    - type: Transform
+      pos: -14.5,19.5
+      parent: 104
+  - uid: 1211
+    components:
+    - type: Transform
+      pos: -12.5,23.5
+      parent: 104
+  - uid: 1212
+    components:
+    - type: Transform
+      pos: -16.5,19.5
+      parent: 104
+  - uid: 1213
+    components:
+    - type: Transform
+      pos: -12.5,19.5
+      parent: 104
+  - uid: 1214
+    components:
+    - type: Transform
+      pos: -16.5,24.5
+      parent: 104
+  - uid: 1215
+    components:
+    - type: Transform
+      pos: -12.5,20.5
+      parent: 104
+  - uid: 1216
+    components:
+    - type: Transform
+      pos: -15.5,24.5
+      parent: 104
+  - uid: 1218
+    components:
+    - type: Transform
+      pos: -14.5,24.5
+      parent: 104
+  - uid: 1219
+    components:
+    - type: Transform
+      pos: -12.5,21.5
+      parent: 104
+  - uid: 1220
+    components:
+    - type: Transform
+      pos: -13.5,24.5
+      parent: 104
+  - uid: 1381
+    components:
+    - type: Transform
+      pos: 16.5,-16.5
+      parent: 104
+  - uid: 1409
+    components:
+    - type: Transform
+      pos: 9.5,-21.5
+      parent: 104
+  - uid: 1411
+    components:
+    - type: Transform
+      pos: 9.5,-23.5
+      parent: 104
+  - uid: 1412
+    components:
+    - type: Transform
+      pos: 15.5,-16.5
+      parent: 104
+  - uid: 1426
+    components:
+    - type: Transform
+      pos: -3.5,-5.5
+      parent: 104
+  - uid: 1783
+    components:
+    - type: Transform
+      pos: -3.5,-11.5
+      parent: 104
+  - uid: 1784
+    components:
+    - type: Transform
+      pos: -3.5,-17.5
+      parent: 104
+  - uid: 1811
+    components:
+    - type: Transform
+      pos: 15.5,-19.5
+      parent: 104
+  - uid: 1833
+    components:
+    - type: Transform
+      pos: 15.5,-17.5
+      parent: 104
+  - uid: 1834
+    components:
+    - type: Transform
+      pos: 15.5,-18.5
+      parent: 104
+  - uid: 1843
+    components:
+    - type: Transform
+      pos: 15.5,-22.5
+      parent: 104
+  - uid: 1850
+    components:
+    - type: Transform
+      pos: 15.5,-21.5
+      parent: 104
+  - uid: 1856
+    components:
+    - type: Transform
+      pos: 15.5,-20.5
+      parent: 104
+  - uid: 1861
+    components:
+    - type: Transform
+      pos: 26.5,-12.5
+      parent: 104
+  - uid: 1862
+    components:
+    - type: Transform
+      pos: 27.5,-12.5
+      parent: 104
+  - uid: 1863
+    components:
+    - type: Transform
+      pos: 28.5,-12.5
+      parent: 104
+  - uid: 1864
+    components:
+    - type: Transform
+      pos: 28.5,-14.5
+      parent: 104
+  - uid: 1866
+    components:
+    - type: Transform
+      pos: 28.5,-13.5
+      parent: 104
+  - uid: 1871
+    components:
+    - type: Transform
+      pos: 28.5,-19.5
+      parent: 104
+  - uid: 1876
+    components:
+    - type: Transform
+      pos: 28.5,-15.5
+      parent: 104
+  - uid: 1881
+    components:
+    - type: Transform
+      pos: 28.5,-16.5
+      parent: 104
+  - uid: 1885
+    components:
+    - type: Transform
+      pos: 28.5,-17.5
+      parent: 104
+  - uid: 1889
+    components:
+    - type: Transform
+      pos: 28.5,-18.5
+      parent: 104
+  - uid: 1893
+    components:
+    - type: Transform
+      pos: 28.5,-20.5
+      parent: 104
+  - uid: 1897
+    components:
+    - type: Transform
+      pos: 27.5,-20.5
+      parent: 104
+  - uid: 1901
+    components:
+    - type: Transform
+      pos: 26.5,-20.5
+      parent: 104
+  - uid: 1905
+    components:
+    - type: Transform
+      pos: 18.5,-20.5
+      parent: 104
+  - uid: 1906
+    components:
+    - type: Transform
+      pos: 17.5,-20.5
+      parent: 104
+  - uid: 1907
+    components:
+    - type: Transform
+      pos: 16.5,-20.5
+      parent: 104
+  - uid: 1908
+    components:
+    - type: Transform
+      pos: 16.5,-19.5
+      parent: 104
+  - uid: 1914
+    components:
+    - type: Transform
+      pos: 25.5,-20.5
+      parent: 104
+  - uid: 1915
+    components:
+    - type: Transform
+      pos: 16.5,-17.5
+      parent: 104
+  - uid: 1943
+    components:
+    - type: Transform
+      pos: 24.5,-20.5
+      parent: 104
+  - uid: 1944
+    components:
+    - type: Transform
+      pos: 16.5,-18.5
+      parent: 104
+  - uid: 1968
+    components:
+    - type: Transform
+      pos: 23.5,-20.5
+      parent: 104
+  - uid: 1969
+    components:
+    - type: Transform
+      pos: 22.5,-20.5
+      parent: 104
+  - uid: 1970
+    components:
+    - type: Transform
+      pos: 21.5,-20.5
+      parent: 104
+  - uid: 1971
+    components:
+    - type: Transform
+      pos: 20.5,-20.5
+      parent: 104
+  - uid: 1972
+    components:
+    - type: Transform
+      pos: 19.5,-20.5
+      parent: 104
+  - uid: 2017
+    components:
+    - type: Transform
+      pos: 2.5,-10.5
+      parent: 104
+  - uid: 2018
+    components:
+    - type: Transform
+      pos: 2.5,-11.5
+      parent: 104
+  - uid: 2019
+    components:
+    - type: Transform
+      pos: 2.5,-12.5
+      parent: 104
+  - uid: 2299
+    components:
+    - type: Transform
+      pos: -1.5,-2.5
+      parent: 104
+  - uid: 2300
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 104
+- proto: WallPlastitaniumDiagonal
+  entities:
+  - uid: 323
+    components:
+    - type: Transform
+      pos: 18.5,-4.5
+      parent: 104
+  - uid: 324
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 22.5,-5.5
+      parent: 104
+  - uid: 325
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 23.5,-9.5
+      parent: 104
+  - uid: 338
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,-9.5
+      parent: 104
+  - uid: 348
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-9.5
+      parent: 104
+  - uid: 650
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,-10.5
+      parent: 104
+  - uid: 1088
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 18.5,-5.5
+      parent: 104
+  - uid: 1089
+    components:
+    - type: Transform
+      pos: 17.5,-5.5
+      parent: 104
+  - uid: 1119
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,-10.5
+      parent: 104
+  - uid: 1689
+    components:
+    - type: Transform
+      pos: 22.5,-9.5
+      parent: 104
+  - uid: 1690
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 23.5,-5.5
+      parent: 104
+  - uid: 1697
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-4.5
+      parent: 104
+- proto: WaterTankFull
+  entities:
+  - uid: 1547
+    components:
+    - type: Transform
+      pos: 11.5,-4.5
+      parent: 104
+- proto: WeaponPistolCobra
+  entities:
+  - uid: 1705
+    components:
+    - type: Transform
+      pos: 5.4793262,12.166912
+      parent: 104
+- proto: WeaponShotgunSawn
+  entities:
+  - uid: 228
+    components:
+    - type: Transform
+      pos: 5.347948,13.528896
+      parent: 104
+    - type: BallisticAmmoProvider
+      unspawnedCount: 2
+- proto: WeaponSprayNozzle
+  entities:
+  - uid: 152
+    components:
+    - type: Transform
+      pos: 9.67418,-4.571714
+      parent: 104
+- proto: WeaponSubMachineGunC20r
+  entities:
+  - uid: 1704
+    components:
+    - type: Transform
+      pos: 5.497257,12.817707
+      parent: 104
+- proto: WelderIndustrial
+  entities:
+  - uid: 207
+    components:
+    - type: Transform
+      pos: 14.5,-10.5
+      parent: 104
+- proto: Windoor
+  entities:
+  - uid: 27
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-7.5
+      parent: 104
+- proto: WindoorSecure
+  entities:
+  - uid: 1145
+    components:
+    - type: Transform
+      pos: -13.5,5.5
+      parent: 104
+  - uid: 1827
+    components:
+    - type: Transform
+      pos: 10.5,-18.5
+      parent: 104
+- proto: WindowReinforcedDirectional
+  entities:
+  - uid: 766
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-12.5
+      parent: 104
+  - uid: 1135
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-16.5
+      parent: 104
+  - uid: 1217
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,9.5
+      parent: 104
+  - uid: 1247
+    components:
+    - type: Transform
+      pos: 4.5,-12.5
+      parent: 104
+  - uid: 1370
+    components:
+    - type: Transform
+      pos: 3.5,-12.5
+      parent: 104
+  - uid: 2082
+    components:
+    - type: Transform
+      pos: 7.5,15.5
+      parent: 104
+  - uid: 2182
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-12.5
+      parent: 104
+  - uid: 2258
+    components:
+    - type: Transform
+      pos: 5.5,-12.5
+      parent: 104
+  - uid: 2290
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,9.5
+      parent: 104
+  - uid: 2293
+    components:
+    - type: Transform
+      pos: 5.5,15.5
+      parent: 104
+  - uid: 2294
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-10.5
+      parent: 104
+...
diff --git a/Resources/Maps/Shuttles/infiltrator.yml b/Resources/Maps/Shuttles/infiltrator.yml
index c6211b74e44..fb2045d7018 100644
--- a/Resources/Maps/Shuttles/infiltrator.yml
+++ b/Resources/Maps/Shuttles/infiltrator.yml
@@ -1,5678 +1,5678 @@
-meta:
-  format: 6
-  postmapinit: false
-tilemap:
-  0: Space
-  3: FloorArcadeRed
-  31: FloorDark
-  36: FloorDarkMono
-  40: FloorDarkPlastic
-  56: FloorGreenCircuit
-  79: FloorReinforced
-  88: FloorShuttleRed
-  89: FloorShuttleWhite
-  93: FloorSteel
-  104: FloorSteelMono
-  110: FloorTechMaint3
-  122: FloorWood
-  125: Lattice
-  126: Plating
-entities:
-- proto: ""
-  entities:
-  - uid: 1
-    components:
-    - type: MetaData
-      name: GX-13 Infiltrator
-    - type: Transform
-      pos: 0.64252126,4.1776605
-      parent: invalid
-    - type: Tag
-      tags:
-      - Syndicate
-    - type: MapGrid
-      chunks:
-        -1,-1:
-          ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAACHwAAAAABHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAWAAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAWAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAWAAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACWAAAAAAAHwAAAAACHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACaAAAAAAAWQAAAAAAHwAAAAADHwAAAAAAHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADWQAAAAAAaAAAAAABWAAAAAAAHwAAAAAAHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADWAAAAAAAHwAAAAACHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        0,-1:
-          ind: 0,-1
-          tiles: HwAAAAABHwAAAAABHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACWAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACWAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABWAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABWAAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADHwAAAAAAHwAAAAAAegAAAAADegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAWAAAAAAAegAAAAAAAwAAAAAAegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADWAAAAAAAfgAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAAAAWAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        -1,-2:
-          ind: -1,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAOAAAAAAAJAAAAAAAOAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAOAAAAAAAJAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAOAAAAAAAJAAAAAAAOAAAAAAAWAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAADWAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAACTwAAAAAAHwAAAAABWAAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAWAAAAAAAfgAAAAAAHwAAAAAAHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAAAWAAAAAAAHwAAAAADHwAAAAAAHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAWAAAAAAAHwAAAAAAWAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAA
-          version: 6
-        0,-2:
-          ind: 0,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABHwAAAAADHwAAAAABHwAAAAADHwAAAAABWAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-    - type: Broadphase
-    - type: Physics
-      bodyStatus: InAir
-      angularDamping: 0.05
-      linearDamping: 0.05
-      fixedRotation: False
-      bodyType: Dynamic
-    - type: Fixtures
-      fixtures: {}
-    - type: Gravity
-      gravityShakeSound: !type:SoundPathSpecifier
-        path: /Audio/Effects/alert.ogg
-    - type: GridAtmosphere
-      version: 2
-      data:
-        tiles:
-          -1,-4:
-            0: 65535
-          -1,-3:
-            0: 65535
-          -1,-2:
-            0: 65535
-          -1,-1:
-            0: 61439
-          0,-4:
-            0: 65535
-          0,-3:
-            0: 65535
-          0,-2:
-            0: 65535
-          0,-1:
-            0: 65535
-          1,-4:
-            0: 30591
-          1,-3:
-            0: 21879
-            1: 512
-          1,-2:
-            0: 30325
-            2: 256
-          1,-1:
-            0: 55
-          0,-5:
-            0: 65535
-          1,-5:
-            0: 65399
-          -1,-5:
-            0: 65535
-          -3,-4:
-            0: 12
-          -2,-4:
-            0: 61439
-          -2,-2:
-            0: 65516
-          -2,-1:
-            0: 2287
-          -2,-3:
-            0: 35054
-            1: 1536
-          -1,0:
-            0: 8
-          -3,-5:
-            0: 52224
-          -2,-8:
-            0: 65504
-          -2,-7:
-            0: 65535
-          -2,-6:
-            0: 65535
-          -2,-5:
-            0: 65535
-          -1,-8:
-            0: 65526
-          -1,-7:
-            0: 65535
-          -1,-6:
-            0: 65535
-          0,-8:
-            0: 65523
-          0,-7:
-            0: 61303
-            3: 4096
-            4: 136
-          0,-6:
-            3: 1
-            0: 65534
-          1,-8:
-            0: 30512
-          1,-7:
-            0: 30549
-            5: 34
-          1,-6:
-            0: 30583
-          -1,-9:
-            0: 26112
-          0,-9:
-            0: 13056
-          2,-4:
-            0: 1
-          2,-5:
-            0: 4352
-        uniqueMixes:
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 21.824879
-          - 82.10312
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.14996
-          moles:
-          - 20.078888
-          - 75.53487
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 20.619795
-          - 77.56971
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 6666.982
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 0
-          - 6666.982
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        chunkSize: 4
-    - type: DecalGrid
-      chunkCollection:
-        version: 2
-        nodes:
-        - node:
-            color: '#FFFFFFFF'
-            id: Arrows
-          decals:
-            115: -6,-24
-        - node:
-            color: '#FFFFFFFF'
-            id: Bot
-          decals:
-            112: -6,-27
-            113: -6,-26
-            114: -6,-25
-        - node:
-            color: '#79150096'
-            id: Box
-          decals:
-            110: -6,-21
-            111: -5,-21
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelCornerNe
-          decals:
-            10: 0,-4
-            43: 0,-9
-            51: 4,-20
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelCornerNw
-          decals:
-            11: -2,-4
-            42: -2,-9
-            45: -2,-20
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelCornerSe
-          decals:
-            36: 0,-14
-            50: 4,-22
-            76: 3,-18
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelCornerSw
-          decals:
-            37: -2,-14
-            46: -2,-22
-            75: -5,-18
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelLineE
-          decals:
-            6: 0,-7
-            9: 0,-5
-            32: 0,-11
-            33: 0,-10
-            34: 0,-12
-            35: 0,-13
-            52: 4,-21
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelLineN
-          decals:
-            12: -1,-4
-            53: 3,-20
-            54: 2,-20
-            55: 1,-20
-            56: 0,-20
-            63: 0,-16
-            64: 1,-16
-            65: 2,-16
-            66: -2,-16
-            67: -3,-16
-            68: -4,-16
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelLineS
-          decals:
-            47: 0,-22
-            48: 1,-22
-            49: 2,-22
-            69: 2,-18
-            70: 1,-18
-            71: 0,-18
-            72: -2,-18
-            73: -3,-18
-            74: -4,-18
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelLineW
-          decals:
-            7: -2,-7
-            8: -2,-5
-            38: -2,-13
-            39: -2,-12
-            40: -2,-11
-            41: -2,-10
-        - node:
-            color: '#79150096'
-            id: BrickTileWhiteCornerNe
-          decals:
-            104: -5,-22
-        - node:
-            color: '#79150096'
-            id: BrickTileWhiteCornerNw
-          decals:
-            103: -7,-22
-        - node:
-            color: '#79150096'
-            id: BrickTileWhiteCornerSe
-          decals:
-            105: -5,-24
-        - node:
-            color: '#79150096'
-            id: BrickTileWhiteCornerSw
-          decals:
-            106: -7,-24
-        - node:
-            color: '#79150096'
-            id: BrickTileWhiteLineE
-          decals:
-            102: -5,-23
-        - node:
-            color: '#79150096'
-            id: BrickTileWhiteLineN
-          decals:
-            109: -6,-22
-        - node:
-            color: '#79150096'
-            id: BrickTileWhiteLineS
-          decals:
-            107: -6,-24
-        - node:
-            color: '#79150096'
-            id: BrickTileWhiteLineW
-          decals:
-            108: -7,-23
-        - node:
-            color: '#79150096'
-            id: Delivery
-          decals:
-            116: -1,-23
-        - node:
-            color: '#DE3A3A96'
-            id: DeliveryGreyscale
-          decals:
-            13: 1,-6
-            31: -3,-6
-            83: -1,-19
-            84: -3,-21
-            85: -1,-15
-            86: 4,-17
-            87: -6,-17
-            88: -5,-15
-            89: 3,-15
-            90: -1,-8
-        - node:
-            color: '#DE3A3A96'
-            id: HalfTileOverlayGreyscale
-          decals:
-            29: -4,-7
-        - node:
-            color: '#DE3A3A96'
-            id: HalfTileOverlayGreyscale180
-          decals:
-            25: -4,-4
-            26: -5,-4
-        - node:
-            color: '#DE3A3A96'
-            id: HalfTileOverlayGreyscale90
-          decals:
-            27: -6,-6
-            28: -6,-5
-        - node:
-            color: '#DE3A3A96'
-            id: MonoOverlay
-          decals:
-            23: -5,-6
-            24: -4,-5
-        - node:
-            color: '#DE3A3A96'
-            id: WarnCornerGreyscaleNE
-          decals:
-            81: 3,-16
-        - node:
-            color: '#DE3A3A96'
-            id: WarnCornerGreyscaleNW
-          decals:
-            80: -5,-16
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnCornerSmallNE
-          decals:
-            99: -7,-24
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnCornerSmallNW
-          decals:
-            98: -5,-24
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnCornerSmallSE
-          decals:
-            97: -7,-22
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnCornerSmallSW
-          decals:
-            101: -5,-22
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineE
-          decals:
-            3: -4,-23
-            4: -4,-24
-            5: -4,-25
-            95: -7,-23
-        - node:
-            color: '#DE3A3A96'
-            id: WarnLineGreyscaleE
-          decals:
-            78: 3,-17
-        - node:
-            color: '#DE3A3A96'
-            id: WarnLineGreyscaleN
-          decals:
-            44: -1,-9
-            59: -1,-20
-            82: -1,-16
-        - node:
-            color: '#DE3A3A96'
-            id: WarnLineGreyscaleS
-          decals:
-            57: -1,-22
-            60: 3,-22
-            77: -1,-18
-        - node:
-            color: '#DE3A3A96'
-            id: WarnLineGreyscaleW
-          decals:
-            58: -2,-21
-            79: -5,-17
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineN
-          decals:
-            91: -5,-28
-            92: -6,-28
-            93: -7,-28
-            100: -6,-22
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineS
-          decals:
-            94: -5,-23
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineW
-          decals:
-            96: -6,-24
-        - node:
-            angle: 1.5707963267948966 rad
-            color: '#FFFFFFFF'
-            id: WarningLine
-          decals:
-            0: -4,-22
-            1: -4,-21
-            2: -4,-20
-        - node:
-            color: '#FFFFFFFF'
-            id: WoodTrimThinEndN
-          decals:
-            62: 3,-4
-        - node:
-            color: '#FFFFFFFF'
-            id: WoodTrimThinEndS
-          decals:
-            61: 3,-5
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo10
-          decals:
-            20: -2,-7
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo11
-          decals:
-            21: -1,-7
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo12
-          decals:
-            22: 0,-7
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo2
-          decals:
-            14: -2,-5
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo3
-          decals:
-            15: -1,-5
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo4
-          decals:
-            16: 0,-5
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo5
-          decals:
-            30: -3,-6
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo6
-          decals:
-            17: -2,-6
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo7
-          decals:
-            18: -1,-6
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo8
-          decals:
-            19: 0,-6
-    - type: IFF
-      color: '#FFC000FF'
-      flags: Hide
-    - type: OccluderTree
-    - type: Shuttle
-    - type: RadiationGridResistance
-    - type: GravityShake
-      shakeTimes: 10
-    - type: GasTileOverlay
-    - type: SpreaderGrid
-    - type: GridPathfinding
-- proto: AirlockExternalGlassShuttleSyndicateLocked
-  entities:
-  - uid: 8
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-16.5
-      parent: 1
-    - type: DeviceLinkSink
-      invokeCounter: 1
-      links:
-      - 13
-    - type: DeviceLinkSource
-      linkedPorts:
-        13:
-        - DoorStatus: Close
-  - uid: 10
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -9.5,-16.5
-      parent: 1
-    - type: DeviceLinkSink
-      invokeCounter: 1
-      links:
-      - 3
-    - type: DeviceLinkSource
-      linkedPorts:
-        3:
-        - DoorStatus: Close
-- proto: AirlockExternalSyndicateLocked
-  entities:
-  - uid: 2
-    components:
-    - type: Transform
-      pos: -0.5,-25.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 14
-    - type: DeviceLinkSource
-      linkedPorts:
-        14:
-        - DoorStatus: DoorBolt
-  - uid: 3
-    components:
-    - type: Transform
-      pos: -5.5,-16.5
-      parent: 1
-    - type: DeviceLinkSink
-      invokeCounter: 1
-      links:
-      - 10
-    - type: DeviceLinkSource
-      linkedPorts:
-        10:
-        - DoorStatus: Close
-  - uid: 7
-    components:
-    - type: Transform
-      pos: -4.5,-14.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 12
-    - type: DeviceLinkSource
-      linkedPorts:
-        12:
-        - DoorStatus: DoorBolt
-  - uid: 9
-    components:
-    - type: Transform
-      pos: 3.5,-14.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 22
-    - type: DeviceLinkSource
-      linkedPorts:
-        22:
-        - DoorStatus: DoorBolt
-  - uid: 12
-    components:
-    - type: Transform
-      pos: -4.5,-10.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 7
-    - type: DeviceLinkSource
-      linkedPorts:
-        7:
-        - DoorStatus: DoorBolt
-  - uid: 13
-    components:
-    - type: Transform
-      pos: 4.5,-16.5
-      parent: 1
-    - type: DeviceLinkSink
-      invokeCounter: 1
-      links:
-      - 8
-    - type: DeviceLinkSource
-      linkedPorts:
-        8:
-        - DoorStatus: Close
-  - uid: 14
-    components:
-    - type: Transform
-      pos: -0.5,-22.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        2:
-        - DoorStatus: DoorBolt
-  - uid: 22
-    components:
-    - type: Transform
-      pos: 3.5,-10.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 9
-    - type: DeviceLinkSource
-      linkedPorts:
-        9:
-        - DoorStatus: DoorBolt
-- proto: AirlockSyndicateGlassLocked
-  entities:
-  - uid: 4
-    components:
-    - type: Transform
-      pos: -0.5,-7.5
-      parent: 1
-  - uid: 5
-    components:
-    - type: Transform
-      pos: 3.5,-22.5
-      parent: 1
-  - uid: 6
-    components:
-    - type: Transform
-      pos: -0.5,-18.5
-      parent: 1
-  - uid: 17
-    components:
-    - type: Transform
-      pos: -2.5,-20.5
-      parent: 1
-- proto: AirlockSyndicateLocked
-  entities:
-  - uid: 15
-    components:
-    - type: Transform
-      pos: -0.5,-14.5
-      parent: 1
-  - uid: 16
-    components:
-    - type: Transform
-      pos: 2.5,-5.5
-      parent: 1
-- proto: APCBasic
-  entities:
-  - uid: 18
-    components:
-    - type: Transform
-      pos: -3.5,-18.5
-      parent: 1
-  - uid: 19
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-8.5
-      parent: 1
-- proto: AtmosFixNitrogenMarker
-  entities:
-  - uid: 25
-    components:
-    - type: Transform
-      pos: 5.5,-26.5
-      parent: 1
-  - uid: 26
-    components:
-    - type: Transform
-      pos: 5.5,-27.5
-      parent: 1
-- proto: AtmosFixOxygenMarker
-  entities:
-  - uid: 27
-    components:
-    - type: Transform
-      pos: 3.5,-26.5
-      parent: 1
-  - uid: 28
-    components:
-    - type: Transform
-      pos: 3.5,-27.5
-      parent: 1
-- proto: BannerSyndicate
-  entities:
-  - uid: 29
-    components:
-    - type: Transform
-      pos: 2.5,-15.5
-      parent: 1
-  - uid: 30
-    components:
-    - type: Transform
-      pos: -3.5,-15.5
-      parent: 1
-- proto: Bed
-  entities:
-  - uid: 31
-    components:
-    - type: Transform
-      pos: 3.5,-3.5
-      parent: 1
-- proto: BedsheetSyndie
-  entities:
-  - uid: 32
-    components:
-    - type: Transform
-      pos: 3.5,-3.5
-      parent: 1
-- proto: BoxEncryptionKeySyndie
-  entities:
-  - uid: 34
-    components:
-    - type: Transform
-      parent: 33
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: BoxFlashbang
-  entities:
-  - uid: 42
-    components:
-    - type: Transform
-      pos: 0.49331844,-13.366474
-      parent: 1
-- proto: BoxHandcuff
-  entities:
-  - uid: 43
-    components:
-    - type: Transform
-      pos: 1.4510483,-2.399527
-      parent: 1
-- proto: Brutepack
-  entities:
-  - uid: 44
-    components:
-    - type: Transform
-      pos: -3.292087,-4.1600046
-      parent: 1
-  - uid: 45
-    components:
-    - type: Transform
-      pos: -3.354587,-4.4256296
-      parent: 1
-- proto: C4
-  entities:
-  - uid: 46
-    components:
-    - type: Transform
-      pos: 1.7857682,-12.631323
-      parent: 1
-  - uid: 47
-    components:
-    - type: Transform
-      pos: 1.5045182,-12.646948
-      parent: 1
-  - uid: 48
-    components:
-    - type: Transform
-      pos: 1.5982682,-12.646948
-      parent: 1
-  - uid: 49
-    components:
-    - type: Transform
-      pos: 1.4107682,-12.646948
-      parent: 1
-  - uid: 50
-    components:
-    - type: Transform
-      pos: 1.6920182,-12.631323
-      parent: 1
-- proto: CableApcExtension
-  entities:
-  - uid: 51
-    components:
-    - type: Transform
-      pos: -3.5,-18.5
-      parent: 1
-  - uid: 52
-    components:
-    - type: Transform
-      pos: -3.5,-17.5
-      parent: 1
-  - uid: 53
-    components:
-    - type: Transform
-      pos: -3.5,-16.5
-      parent: 1
-  - uid: 54
-    components:
-    - type: Transform
-      pos: -4.5,-16.5
-      parent: 1
-  - uid: 55
-    components:
-    - type: Transform
-      pos: -5.5,-16.5
-      parent: 1
-  - uid: 56
-    components:
-    - type: Transform
-      pos: -6.5,-16.5
-      parent: 1
-  - uid: 57
-    components:
-    - type: Transform
-      pos: -7.5,-16.5
-      parent: 1
-  - uid: 58
-    components:
-    - type: Transform
-      pos: -8.5,-16.5
-      parent: 1
-  - uid: 59
-    components:
-    - type: Transform
-      pos: -6.5,-15.5
-      parent: 1
-  - uid: 60
-    components:
-    - type: Transform
-      pos: -6.5,-17.5
-      parent: 1
-  - uid: 61
-    components:
-    - type: Transform
-      pos: -4.5,-15.5
-      parent: 1
-  - uid: 62
-    components:
-    - type: Transform
-      pos: -4.5,-14.5
-      parent: 1
-  - uid: 63
-    components:
-    - type: Transform
-      pos: -4.5,-13.5
-      parent: 1
-  - uid: 64
-    components:
-    - type: Transform
-      pos: -4.5,-12.5
-      parent: 1
-  - uid: 65
-    components:
-    - type: Transform
-      pos: -4.5,-11.5
-      parent: 1
-  - uid: 66
-    components:
-    - type: Transform
-      pos: -4.5,-10.5
-      parent: 1
-  - uid: 67
-    components:
-    - type: Transform
-      pos: -5.5,-12.5
-      parent: 1
-  - uid: 68
-    components:
-    - type: Transform
-      pos: -6.5,-12.5
-      parent: 1
-  - uid: 69
-    components:
-    - type: Transform
-      pos: -2.5,-16.5
-      parent: 1
-  - uid: 70
-    components:
-    - type: Transform
-      pos: -1.5,-16.5
-      parent: 1
-  - uid: 71
-    components:
-    - type: Transform
-      pos: -0.5,-16.5
-      parent: 1
-  - uid: 72
-    components:
-    - type: Transform
-      pos: 0.5,-16.5
-      parent: 1
-  - uid: 73
-    components:
-    - type: Transform
-      pos: 1.5,-16.5
-      parent: 1
-  - uid: 74
-    components:
-    - type: Transform
-      pos: 2.5,-16.5
-      parent: 1
-  - uid: 75
-    components:
-    - type: Transform
-      pos: 3.5,-16.5
-      parent: 1
-  - uid: 76
-    components:
-    - type: Transform
-      pos: 4.5,-16.5
-      parent: 1
-  - uid: 77
-    components:
-    - type: Transform
-      pos: 5.5,-16.5
-      parent: 1
-  - uid: 78
-    components:
-    - type: Transform
-      pos: 5.5,-15.5
-      parent: 1
-  - uid: 79
-    components:
-    - type: Transform
-      pos: 5.5,-17.5
-      parent: 1
-  - uid: 80
-    components:
-    - type: Transform
-      pos: 6.5,-16.5
-      parent: 1
-  - uid: 81
-    components:
-    - type: Transform
-      pos: 7.5,-16.5
-      parent: 1
-  - uid: 82
-    components:
-    - type: Transform
-      pos: 3.5,-15.5
-      parent: 1
-  - uid: 83
-    components:
-    - type: Transform
-      pos: 3.5,-14.5
-      parent: 1
-  - uid: 84
-    components:
-    - type: Transform
-      pos: 3.5,-13.5
-      parent: 1
-  - uid: 85
-    components:
-    - type: Transform
-      pos: 3.5,-12.5
-      parent: 1
-  - uid: 86
-    components:
-    - type: Transform
-      pos: 3.5,-11.5
-      parent: 1
-  - uid: 87
-    components:
-    - type: Transform
-      pos: 3.5,-11.5
-      parent: 1
-  - uid: 88
-    components:
-    - type: Transform
-      pos: 3.5,-10.5
-      parent: 1
-  - uid: 89
-    components:
-    - type: Transform
-      pos: 4.5,-12.5
-      parent: 1
-  - uid: 90
-    components:
-    - type: Transform
-      pos: 5.5,-12.5
-      parent: 1
-  - uid: 91
-    components:
-    - type: Transform
-      pos: -0.5,-6.5
-      parent: 1
-  - uid: 92
-    components:
-    - type: Transform
-      pos: -0.5,-7.5
-      parent: 1
-  - uid: 93
-    components:
-    - type: Transform
-      pos: -0.5,-8.5
-      parent: 1
-  - uid: 94
-    components:
-    - type: Transform
-      pos: -0.5,-9.5
-      parent: 1
-  - uid: 95
-    components:
-    - type: Transform
-      pos: -0.5,-10.5
-      parent: 1
-  - uid: 96
-    components:
-    - type: Transform
-      pos: -0.5,-11.5
-      parent: 1
-  - uid: 97
-    components:
-    - type: Transform
-      pos: -0.5,-12.5
-      parent: 1
-  - uid: 98
-    components:
-    - type: Transform
-      pos: -0.5,-13.5
-      parent: 1
-  - uid: 99
-    components:
-    - type: Transform
-      pos: -0.5,-14.5
-      parent: 1
-  - uid: 100
-    components:
-    - type: Transform
-      pos: -1.5,-12.5
-      parent: 1
-  - uid: 101
-    components:
-    - type: Transform
-      pos: 0.5,-12.5
-      parent: 1
-  - uid: 102
-    components:
-    - type: Transform
-      pos: -0.5,-5.5
-      parent: 1
-  - uid: 103
-    components:
-    - type: Transform
-      pos: 0.5,-5.5
-      parent: 1
-  - uid: 104
-    components:
-    - type: Transform
-      pos: 1.5,-5.5
-      parent: 1
-  - uid: 105
-    components:
-    - type: Transform
-      pos: 2.5,-5.5
-      parent: 1
-  - uid: 106
-    components:
-    - type: Transform
-      pos: 3.5,-5.5
-      parent: 1
-  - uid: 107
-    components:
-    - type: Transform
-      pos: 3.5,-4.5
-      parent: 1
-  - uid: 108
-    components:
-    - type: Transform
-      pos: -0.5,-4.5
-      parent: 1
-  - uid: 109
-    components:
-    - type: Transform
-      pos: -0.5,-3.5
-      parent: 1
-  - uid: 110
-    components:
-    - type: Transform
-      pos: -0.5,-2.5
-      parent: 1
-  - uid: 111
-    components:
-    - type: Transform
-      pos: 0.5,-2.5
-      parent: 1
-  - uid: 112
-    components:
-    - type: Transform
-      pos: 1.5,-2.5
-      parent: 1
-  - uid: 113
-    components:
-    - type: Transform
-      pos: -1.5,-2.5
-      parent: 1
-  - uid: 114
-    components:
-    - type: Transform
-      pos: -2.5,-2.5
-      parent: 1
-  - uid: 115
-    components:
-    - type: Transform
-      pos: -1.5,-4.5
-      parent: 1
-  - uid: 116
-    components:
-    - type: Transform
-      pos: -3.5,-4.5
-      parent: 1
-  - uid: 117
-    components:
-    - type: Transform
-      pos: -2.5,-4.5
-      parent: 1
-  - uid: 118
-    components:
-    - type: Transform
-      pos: -4.5,-4.5
-      parent: 1
-  - uid: 119
-    components:
-    - type: Transform
-      pos: -5.5,-4.5
-      parent: 1
-  - uid: 120
-    components:
-    - type: Transform
-      pos: -5.5,-5.5
-      parent: 1
-  - uid: 121
-    components:
-    - type: Transform
-      pos: -5.5,-6.5
-      parent: 1
-  - uid: 122
-    components:
-    - type: Transform
-      pos: -5.5,-3.5
-      parent: 1
-  - uid: 123
-    components:
-    - type: Transform
-      pos: 4.5,-4.5
-      parent: 1
-  - uid: 124
-    components:
-    - type: Transform
-      pos: 4.5,-3.5
-      parent: 1
-  - uid: 125
-    components:
-    - type: Transform
-      pos: 3.5,-6.5
-      parent: 1
-  - uid: 126
-    components:
-    - type: Transform
-      pos: -0.5,-17.5
-      parent: 1
-  - uid: 127
-    components:
-    - type: Transform
-      pos: -3.5,-20.5
-      parent: 1
-  - uid: 128
-    components:
-    - type: Transform
-      pos: -3.5,-19.5
-      parent: 1
-  - uid: 129
-    components:
-    - type: Transform
-      pos: -3.5,-21.5
-      parent: 1
-  - uid: 130
-    components:
-    - type: Transform
-      pos: -4.5,-21.5
-      parent: 1
-  - uid: 131
-    components:
-    - type: Transform
-      pos: -4.5,-22.5
-      parent: 1
-  - uid: 132
-    components:
-    - type: Transform
-      pos: -4.5,-23.5
-      parent: 1
-  - uid: 133
-    components:
-    - type: Transform
-      pos: -4.5,-24.5
-      parent: 1
-  - uid: 134
-    components:
-    - type: Transform
-      pos: -4.5,-25.5
-      parent: 1
-  - uid: 135
-    components:
-    - type: Transform
-      pos: -4.5,-25.5
-      parent: 1
-  - uid: 136
-    components:
-    - type: Transform
-      pos: -4.5,-26.5
-      parent: 1
-  - uid: 137
-    components:
-    - type: Transform
-      pos: -4.5,-27.5
-      parent: 1
-  - uid: 138
-    components:
-    - type: Transform
-      pos: -5.5,-27.5
-      parent: 1
-  - uid: 139
-    components:
-    - type: Transform
-      pos: -6.5,-27.5
-      parent: 1
-  - uid: 140
-    components:
-    - type: Transform
-      pos: -6.5,-26.5
-      parent: 1
-  - uid: 141
-    components:
-    - type: Transform
-      pos: -6.5,-25.5
-      parent: 1
-  - uid: 142
-    components:
-    - type: Transform
-      pos: -6.5,-24.5
-      parent: 1
-  - uid: 143
-    components:
-    - type: Transform
-      pos: -6.5,-23.5
-      parent: 1
-  - uid: 144
-    components:
-    - type: Transform
-      pos: -6.5,-22.5
-      parent: 1
-  - uid: 145
-    components:
-    - type: Transform
-      pos: -2.5,-20.5
-      parent: 1
-  - uid: 146
-    components:
-    - type: Transform
-      pos: -1.5,-20.5
-      parent: 1
-  - uid: 147
-    components:
-    - type: Transform
-      pos: -0.5,-20.5
-      parent: 1
-  - uid: 148
-    components:
-    - type: Transform
-      pos: -0.5,-21.5
-      parent: 1
-  - uid: 149
-    components:
-    - type: Transform
-      pos: -0.5,-23.5
-      parent: 1
-  - uid: 150
-    components:
-    - type: Transform
-      pos: -0.5,-22.5
-      parent: 1
-  - uid: 151
-    components:
-    - type: Transform
-      pos: -0.5,-24.5
-      parent: 1
-  - uid: 152
-    components:
-    - type: Transform
-      pos: -0.5,-25.5
-      parent: 1
-  - uid: 153
-    components:
-    - type: Transform
-      pos: -0.5,-19.5
-      parent: 1
-  - uid: 154
-    components:
-    - type: Transform
-      pos: 0.5,-20.5
-      parent: 1
-  - uid: 155
-    components:
-    - type: Transform
-      pos: 1.5,-20.5
-      parent: 1
-  - uid: 156
-    components:
-    - type: Transform
-      pos: 2.5,-20.5
-      parent: 1
-  - uid: 157
-    components:
-    - type: Transform
-      pos: 3.5,-20.5
-      parent: 1
-  - uid: 158
-    components:
-    - type: Transform
-      pos: 4.5,-20.5
-      parent: 1
-  - uid: 159
-    components:
-    - type: Transform
-      pos: 3.5,-21.5
-      parent: 1
-  - uid: 160
-    components:
-    - type: Transform
-      pos: 3.5,-22.5
-      parent: 1
-  - uid: 161
-    components:
-    - type: Transform
-      pos: 3.5,-23.5
-      parent: 1
-  - uid: 162
-    components:
-    - type: Transform
-      pos: 3.5,-24.5
-      parent: 1
-  - uid: 163
-    components:
-    - type: Transform
-      pos: 3.5,-25.5
-      parent: 1
-  - uid: 164
-    components:
-    - type: Transform
-      pos: 3.5,-26.5
-      parent: 1
-  - uid: 165
-    components:
-    - type: Transform
-      pos: 3.5,-27.5
-      parent: 1
-  - uid: 166
-    components:
-    - type: Transform
-      pos: 4.5,-27.5
-      parent: 1
-  - uid: 167
-    components:
-    - type: Transform
-      pos: 5.5,-27.5
-      parent: 1
-  - uid: 168
-    components:
-    - type: Transform
-      pos: 5.5,-26.5
-      parent: 1
-  - uid: 169
-    components:
-    - type: Transform
-      pos: 5.5,-25.5
-      parent: 1
-  - uid: 170
-    components:
-    - type: Transform
-      pos: 5.5,-24.5
-      parent: 1
-  - uid: 171
-    components:
-    - type: Transform
-      pos: 5.5,-23.5
-      parent: 1
-  - uid: 172
-    components:
-    - type: Transform
-      pos: 0.5,-8.5
-      parent: 1
-  - uid: 173
-    components:
-    - type: Transform
-      pos: 1.5,-26.5
-      parent: 1
-  - uid: 174
-    components:
-    - type: Transform
-      pos: 1.5,-8.5
-      parent: 1
-  - uid: 175
-    components:
-    - type: Transform
-      pos: -0.5,-26.5
-      parent: 1
-  - uid: 176
-    components:
-    - type: Transform
-      pos: -1.5,-26.5
-      parent: 1
-  - uid: 177
-    components:
-    - type: Transform
-      pos: 0.5,-26.5
-      parent: 1
-  - uid: 178
-    components:
-    - type: Transform
-      pos: -2.5,-26.5
-      parent: 1
-  - uid: 179
-    components:
-    - type: Transform
-      pos: -2.5,-27.5
-      parent: 1
-  - uid: 180
-    components:
-    - type: Transform
-      pos: 1.5,-27.5
-      parent: 1
-  - uid: 181
-    components:
-    - type: Transform
-      pos: -6.5,-28.5
-      parent: 1
-  - uid: 182
-    components:
-    - type: Transform
-      pos: -6.5,-29.5
-      parent: 1
-  - uid: 183
-    components:
-    - type: Transform
-      pos: -2.5,-28.5
-      parent: 1
-  - uid: 184
-    components:
-    - type: Transform
-      pos: -2.5,-29.5
-      parent: 1
-  - uid: 185
-    components:
-    - type: Transform
-      pos: -2.5,-30.5
-      parent: 1
-  - uid: 186
-    components:
-    - type: Transform
-      pos: -3.5,-30.5
-      parent: 1
-  - uid: 187
-    components:
-    - type: Transform
-      pos: -4.5,-30.5
-      parent: 1
-  - uid: 188
-    components:
-    - type: Transform
-      pos: -5.5,-30.5
-      parent: 1
-  - uid: 189
-    components:
-    - type: Transform
-      pos: 1.5,-28.5
-      parent: 1
-  - uid: 190
-    components:
-    - type: Transform
-      pos: 1.5,-29.5
-      parent: 1
-  - uid: 191
-    components:
-    - type: Transform
-      pos: 1.5,-30.5
-      parent: 1
-  - uid: 192
-    components:
-    - type: Transform
-      pos: 2.5,-30.5
-      parent: 1
-  - uid: 193
-    components:
-    - type: Transform
-      pos: 3.5,-30.5
-      parent: 1
-  - uid: 194
-    components:
-    - type: Transform
-      pos: 4.5,-30.5
-      parent: 1
-  - uid: 195
-    components:
-    - type: Transform
-      pos: 5.5,-28.5
-      parent: 1
-  - uid: 196
-    components:
-    - type: Transform
-      pos: 5.5,-29.5
-      parent: 1
-- proto: CableHV
-  entities:
-  - uid: 197
-    components:
-    - type: Transform
-      pos: -2.5,-21.5
-      parent: 1
-  - uid: 198
-    components:
-    - type: Transform
-      pos: -4.5,-26.5
-      parent: 1
-  - uid: 199
-    components:
-    - type: Transform
-      pos: -4.5,-27.5
-      parent: 1
-  - uid: 200
-    components:
-    - type: Transform
-      pos: -5.5,-27.5
-      parent: 1
-  - uid: 201
-    components:
-    - type: Transform
-      pos: -6.5,-27.5
-      parent: 1
-  - uid: 202
-    components:
-    - type: Transform
-      pos: -5.5,-23.5
-      parent: 1
-  - uid: 203
-    components:
-    - type: Transform
-      pos: -5.5,-22.5
-      parent: 1
-  - uid: 204
-    components:
-    - type: Transform
-      pos: -5.5,-20.5
-      parent: 1
-  - uid: 205
-    components:
-    - type: Transform
-      pos: -4.5,-20.5
-      parent: 1
-  - uid: 206
-    components:
-    - type: Transform
-      pos: -5.5,-19.5
-      parent: 1
-  - uid: 207
-    components:
-    - type: Transform
-      pos: -4.5,-19.5
-      parent: 1
-  - uid: 208
-    components:
-    - type: Transform
-      pos: -3.5,-19.5
-      parent: 1
-  - uid: 209
-    components:
-    - type: Transform
-      pos: -5.5,-21.5
-      parent: 1
-  - uid: 210
-    components:
-    - type: Transform
-      pos: -6.5,-26.5
-      parent: 1
-  - uid: 211
-    components:
-    - type: Transform
-      pos: -6.5,-25.5
-      parent: 1
-  - uid: 212
-    components:
-    - type: Transform
-      pos: -6.5,-24.5
-      parent: 1
-  - uid: 213
-    components:
-    - type: Transform
-      pos: -4.5,-23.5
-      parent: 1
-  - uid: 214
-    components:
-    - type: Transform
-      pos: -2.5,-20.5
-      parent: 1
-  - uid: 215
-    components:
-    - type: Transform
-      pos: -2.5,-19.5
-      parent: 1
-  - uid: 216
-    components:
-    - type: Transform
-      pos: -4.5,-25.5
-      parent: 1
-  - uid: 217
-    components:
-    - type: Transform
-      pos: -6.5,-23.5
-      parent: 1
-  - uid: 218
-    components:
-    - type: Transform
-      pos: -6.5,-20.5
-      parent: 1
-  - uid: 219
-    components:
-    - type: Transform
-      pos: -4.5,-24.5
-      parent: 1
-  - uid: 220
-    components:
-    - type: Transform
-      pos: -5.5,-18.5
-      parent: 1
-  - uid: 221
-    components:
-    - type: Transform
-      pos: -4.5,-18.5
-      parent: 1
-  - uid: 222
-    components:
-    - type: Transform
-      pos: -3.5,-18.5
-      parent: 1
-  - uid: 223
-    components:
-    - type: Transform
-      pos: -3.5,-21.5
-      parent: 1
-  - uid: 224
-    components:
-    - type: Transform
-      pos: -4.5,-21.5
-      parent: 1
-- proto: CableMV
-  entities:
-  - uid: 225
-    components:
-    - type: Transform
-      pos: -3.5,-19.5
-      parent: 1
-  - uid: 226
-    components:
-    - type: Transform
-      pos: -3.5,-18.5
-      parent: 1
-  - uid: 227
-    components:
-    - type: Transform
-      pos: -3.5,-17.5
-      parent: 1
-  - uid: 228
-    components:
-    - type: Transform
-      pos: -3.5,-16.5
-      parent: 1
-  - uid: 229
-    components:
-    - type: Transform
-      pos: -2.5,-16.5
-      parent: 1
-  - uid: 230
-    components:
-    - type: Transform
-      pos: -0.5,-16.5
-      parent: 1
-  - uid: 231
-    components:
-    - type: Transform
-      pos: -1.5,-16.5
-      parent: 1
-  - uid: 232
-    components:
-    - type: Transform
-      pos: -0.5,-15.5
-      parent: 1
-  - uid: 233
-    components:
-    - type: Transform
-      pos: -0.5,-14.5
-      parent: 1
-  - uid: 234
-    components:
-    - type: Transform
-      pos: -0.5,-13.5
-      parent: 1
-  - uid: 235
-    components:
-    - type: Transform
-      pos: -0.5,-12.5
-      parent: 1
-  - uid: 236
-    components:
-    - type: Transform
-      pos: -0.5,-11.5
-      parent: 1
-  - uid: 237
-    components:
-    - type: Transform
-      pos: -0.5,-10.5
-      parent: 1
-  - uid: 238
-    components:
-    - type: Transform
-      pos: -0.5,-9.5
-      parent: 1
-  - uid: 239
-    components:
-    - type: Transform
-      pos: -0.5,-8.5
-      parent: 1
-  - uid: 240
-    components:
-    - type: Transform
-      pos: -3.5,-20.5
-      parent: 1
-  - uid: 241
-    components:
-    - type: Transform
-      pos: -3.5,-21.5
-      parent: 1
-  - uid: 242
-    components:
-    - type: Transform
-      pos: -4.5,-21.5
-      parent: 1
-  - uid: 243
-    components:
-    - type: Transform
-      pos: -4.5,-22.5
-      parent: 1
-  - uid: 244
-    components:
-    - type: Transform
-      pos: -4.5,-23.5
-      parent: 1
-  - uid: 245
-    components:
-    - type: Transform
-      pos: -4.5,-24.5
-      parent: 1
-  - uid: 246
-    components:
-    - type: Transform
-      pos: -4.5,-25.5
-      parent: 1
-  - uid: 247
-    components:
-    - type: Transform
-      pos: -4.5,-26.5
-      parent: 1
-  - uid: 248
-    components:
-    - type: Transform
-      pos: -4.5,-27.5
-      parent: 1
-  - uid: 249
-    components:
-    - type: Transform
-      pos: 1.5,-8.5
-      parent: 1
-  - uid: 250
-    components:
-    - type: Transform
-      pos: 0.5,-8.5
-      parent: 1
-- proto: CableTerminal
-  entities:
-  - uid: 251
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-20.5
-      parent: 1
-    - type: Physics
-      canCollide: False
-    - type: Fixtures
-      fixtures: {}
-  - uid: 252
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,-20.5
-      parent: 1
-    - type: Physics
-      canCollide: False
-    - type: Fixtures
-      fixtures: {}
-- proto: Carpet
-  entities:
-  - uid: 253
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-5.5
-      parent: 1
-  - uid: 254
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-4.5
-      parent: 1
-- proto: Catwalk
-  entities:
-  - uid: 255
-    components:
-    - type: Transform
-      pos: -2.5,-26.5
-      parent: 1
-  - uid: 256
-    components:
-    - type: Transform
-      pos: -2.5,-28.5
-      parent: 1
-  - uid: 257
-    components:
-    - type: Transform
-      pos: -8.5,-16.5
-      parent: 1
-  - uid: 258
-    components:
-    - type: Transform
-      pos: -1.5,-16.5
-      parent: 1
-  - uid: 259
-    components:
-    - type: Transform
-      pos: -2.5,-16.5
-      parent: 1
-  - uid: 260
-    components:
-    - type: Transform
-      pos: 4.5,-24.5
-      parent: 1
-  - uid: 261
-    components:
-    - type: Transform
-      pos: 5.5,-24.5
-      parent: 1
-  - uid: 262
-    components:
-    - type: Transform
-      pos: -6.5,-16.5
-      parent: 1
-  - uid: 263
-    components:
-    - type: Transform
-      pos: -7.5,-16.5
-      parent: 1
-  - uid: 264
-    components:
-    - type: Transform
-      pos: -4.5,-13.5
-      parent: 1
-  - uid: 265
-    components:
-    - type: Transform
-      pos: -4.5,-12.5
-      parent: 1
-  - uid: 266
-    components:
-    - type: Transform
-      pos: -4.5,-11.5
-      parent: 1
-  - uid: 267
-    components:
-    - type: Transform
-      pos: 3.5,-13.5
-      parent: 1
-  - uid: 268
-    components:
-    - type: Transform
-      pos: 3.5,-12.5
-      parent: 1
-  - uid: 269
-    components:
-    - type: Transform
-      pos: 3.5,-11.5
-      parent: 1
-  - uid: 270
-    components:
-    - type: Transform
-      pos: 5.5,-16.5
-      parent: 1
-  - uid: 271
-    components:
-    - type: Transform
-      pos: 6.5,-16.5
-      parent: 1
-  - uid: 272
-    components:
-    - type: Transform
-      pos: -0.5,-24.5
-      parent: 1
-  - uid: 273
-    components:
-    - type: Transform
-      pos: -0.5,-23.5
-      parent: 1
-  - uid: 274
-    components:
-    - type: Transform
-      pos: -0.5,-16.5
-      parent: 1
-  - uid: 275
-    components:
-    - type: Transform
-      pos: 5.5,-9.5
-      parent: 1
-  - uid: 276
-    components:
-    - type: Transform
-      pos: 3.5,-9.5
-      parent: 1
-  - uid: 277
-    components:
-    - type: Transform
-      pos: 0.5,-16.5
-      parent: 1
-  - uid: 278
-    components:
-    - type: Transform
-      pos: 0.5,-26.5
-      parent: 1
-  - uid: 279
-    components:
-    - type: Transform
-      pos: 1.5,-27.5
-      parent: 1
-  - uid: 280
-    components:
-    - type: Transform
-      pos: -2.5,-27.5
-      parent: 1
-  - uid: 281
-    components:
-    - type: Transform
-      pos: -2.5,-29.5
-      parent: 1
-  - uid: 282
-    components:
-    - type: Transform
-      pos: 1.5,-26.5
-      parent: 1
-  - uid: 283
-    components:
-    - type: Transform
-      pos: 4.5,-9.5
-      parent: 1
-  - uid: 284
-    components:
-    - type: Transform
-      pos: -0.5,-26.5
-      parent: 1
-  - uid: 285
-    components:
-    - type: Transform
-      pos: 1.5,-28.5
-      parent: 1
-  - uid: 286
-    components:
-    - type: Transform
-      pos: 1.5,-29.5
-      parent: 1
-  - uid: 287
-    components:
-    - type: Transform
-      pos: -1.5,-26.5
-      parent: 1
-  - uid: 288
-    components:
-    - type: Transform
-      pos: -3.5,-9.5
-      parent: 1
-  - uid: 289
-    components:
-    - type: Transform
-      pos: 1.5,-16.5
-      parent: 1
-  - uid: 290
-    components:
-    - type: Transform
-      pos: 2.5,-9.5
-      parent: 1
-  - uid: 291
-    components:
-    - type: Transform
-      pos: -6.5,-9.5
-      parent: 1
-  - uid: 292
-    components:
-    - type: Transform
-      pos: -5.5,-9.5
-      parent: 1
-  - uid: 293
-    components:
-    - type: Transform
-      pos: -4.5,-9.5
-      parent: 1
-  - uid: 294
-    components:
-    - type: Transform
-      pos: 7.5,-16.5
-      parent: 1
-  - uid: 295
-    components:
-    - type: Transform
-      pos: -0.5,-13.5
-      parent: 1
-  - uid: 296
-    components:
-    - type: Transform
-      pos: -0.5,-12.5
-      parent: 1
-  - uid: 297
-    components:
-    - type: Transform
-      pos: -0.5,-11.5
-      parent: 1
-- proto: Chair
-  entities:
-  - uid: 298
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-21.5
-      parent: 1
-  - uid: 299
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-21.5
-      parent: 1
-- proto: ChairOfficeDark
-  entities:
-  - uid: 300
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-3.5
-      parent: 1
-- proto: ChairPilotSeat
-  entities:
-  - uid: 301
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-21.5
-      parent: 1
-  - uid: 302
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-8.5
-      parent: 1
-  - uid: 303
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-9.5
-      parent: 1
-  - uid: 304
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-10.5
-      parent: 1
-  - uid: 305
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-8.5
-      parent: 1
-  - uid: 306
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-10.5
-      parent: 1
-  - uid: 307
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-9.5
-      parent: 1
-  - uid: 308
-    components:
-    - type: Transform
-      pos: -2.5,-15.5
-      parent: 1
-  - uid: 309
-    components:
-    - type: Transform
-      pos: -1.5,-15.5
-      parent: 1
-  - uid: 310
-    components:
-    - type: Transform
-      pos: 0.5,-15.5
-      parent: 1
-  - uid: 311
-    components:
-    - type: Transform
-      pos: 1.5,-15.5
-      parent: 1
-  - uid: 312
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-3.5
-      parent: 1
-- proto: CigPackSyndicate
-  entities:
-  - uid: 313
-    components:
-    - type: Transform
-      pos: -3.5658307,-17.516623
-      parent: 1
-- proto: ClothingBackpackDuffelSyndicateFilledMedical
-  entities:
-  - uid: 314
-    components:
-    - type: Transform
-      pos: -3.5044222,-6.293252
-      parent: 1
-- proto: ClothingHeadHatSyndie
-  entities:
-  - uid: 315
-    components:
-    - type: Transform
-      pos: -3.1200604,-17.289778
-      parent: 1
-- proto: ClothingHeadHatSyndieMAA
-  entities:
-  - uid: 35
-    components:
-    - type: Transform
-      parent: 33
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ClothingHeadPyjamaSyndicateRed
-  entities:
-  - uid: 36
-    components:
-    - type: Transform
-      parent: 33
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ClothingHeadsetAltSyndicate
-  entities:
-  - uid: 316
-    components:
-    - type: Transform
-      pos: 1.3157192,-13.513277
-      parent: 1
-- proto: ClothingMaskGasSyndicate
-  entities:
-  - uid: 317
-    components:
-    - type: Transform
-      pos: 0.94071925,-13.482027
-      parent: 1
-- proto: ClothingNeckMantleHOS
-  entities:
-  - uid: 37
-    components:
-    - type: MetaData
-      desc: Looted from a fallen enemy, the commander earned this in battle.
-      name: commander mantle
-    - type: Transform
-      parent: 33
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ClothingOuterCoatSyndieCap
-  entities:
-  - uid: 38
-    components:
-    - type: Transform
-      parent: 33
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ClothingUniformJumpskirtSyndieFormalDress
-  entities:
-  - uid: 39
-    components:
-    - type: Transform
-      parent: 33
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ClothingUniformJumpsuitPyjamaSyndicateRed
-  entities:
-  - uid: 40
-    components:
-    - type: Transform
-      parent: 33
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ClothingUniformJumpsuitSyndieFormal
-  entities:
-  - uid: 41
-    components:
-    - type: Transform
-      parent: 33
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ComfyChair
-  entities:
-  - uid: 318
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-4.5
-      parent: 1
-- proto: computerBodyScanner
-  entities:
-  - uid: 319
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,-5.5
-      parent: 1
-- proto: ComputerIFFSyndicate
-  entities:
-  - uid: 320
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-3.5
-      parent: 1
-- proto: ComputerPowerMonitoring
-  entities:
-  - uid: 321
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-21.5
-      parent: 1
-- proto: ComputerRadar
-  entities:
-  - uid: 322
-    components:
-    - type: Transform
-      pos: 0.5,-2.5
-      parent: 1
-- proto: ComputerShuttleSyndie
-  entities:
-  - uid: 323
-    components:
-    - type: Transform
-      pos: -0.5,-2.5
-      parent: 1
-- proto: CrowbarRed
-  entities:
-  - uid: 324
-    components:
-    - type: Transform
-      pos: -3.492848,-22.485775
-      parent: 1
-- proto: DisposalBend
-  entities:
-  - uid: 325
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-6.5
-      parent: 1
-- proto: DisposalJunction
-  entities:
-  - uid: 326
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-19.5
-      parent: 1
-- proto: DisposalPipe
-  entities:
-  - uid: 327
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-6.5
-      parent: 1
-  - uid: 328
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-19.5
-      parent: 1
-  - uid: 329
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-19.5
-      parent: 1
-  - uid: 330
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-19.5
-      parent: 1
-  - uid: 331
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-19.5
-      parent: 1
-  - uid: 332
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,-19.5
-      parent: 1
-  - uid: 333
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,-19.5
-      parent: 1
-  - uid: 334
-    components:
-    - type: Transform
-      pos: -0.5,-18.5
-      parent: 1
-  - uid: 335
-    components:
-    - type: Transform
-      pos: -0.5,-17.5
-      parent: 1
-  - uid: 336
-    components:
-    - type: Transform
-      pos: -0.5,-16.5
-      parent: 1
-  - uid: 337
-    components:
-    - type: Transform
-      pos: -0.5,-15.5
-      parent: 1
-  - uid: 338
-    components:
-    - type: Transform
-      pos: -0.5,-14.5
-      parent: 1
-  - uid: 339
-    components:
-    - type: Transform
-      pos: -0.5,-13.5
-      parent: 1
-  - uid: 340
-    components:
-    - type: Transform
-      pos: -0.5,-12.5
-      parent: 1
-  - uid: 341
-    components:
-    - type: Transform
-      pos: -0.5,-11.5
-      parent: 1
-  - uid: 342
-    components:
-    - type: Transform
-      pos: -0.5,-10.5
-      parent: 1
-  - uid: 343
-    components:
-    - type: Transform
-      pos: -0.5,-9.5
-      parent: 1
-  - uid: 344
-    components:
-    - type: Transform
-      pos: -0.5,-8.5
-      parent: 1
-  - uid: 345
-    components:
-    - type: Transform
-      pos: -0.5,-7.5
-      parent: 1
-- proto: DisposalTrunk
-  entities:
-  - uid: 346
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-6.5
-      parent: 1
-  - uid: 347
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -7.5,-19.5
-      parent: 1
-  - uid: 348
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-19.5
-      parent: 1
-- proto: DisposalUnit
-  entities:
-  - uid: 349
-    components:
-    - type: Transform
-      pos: 1.5,-6.5
-      parent: 1
-  - uid: 350
-    components:
-    - type: Transform
-      pos: 0.5,-19.5
-      parent: 1
-- proto: DoubleEmergencyOxygenTankFilled
-  entities:
-  - uid: 351
-    components:
-    - type: Transform
-      pos: -1.6924903,-23.407444
-      parent: 1
-  - uid: 352
-    components:
-    - type: Transform
-      pos: -1.4112403,-23.458082
-      parent: 1
-  - uid: 353
-    components:
-    - type: Transform
-      pos: 5.390987,-17.346693
-      parent: 1
-  - uid: 354
-    components:
-    - type: Transform
-      pos: -6.6334953,-17.346693
-      parent: 1
-- proto: DrinkGlass
-  entities:
-  - uid: 355
-    components:
-    - type: Transform
-      pos: 2.0779252,-19.21155
-      parent: 1
-  - uid: 356
-    components:
-    - type: Transform
-      pos: 2.3123002,-19.21155
-      parent: 1
-- proto: DrinkMugDog
-  entities:
-  - uid: 357
-    components:
-    - type: Transform
-      pos: 2.2843437,-19.542192
-      parent: 1
-- proto: DrinkMugMetal
-  entities:
-  - uid: 358
-    components:
-    - type: Transform
-      pos: 2.0968437,-19.526567
-      parent: 1
-- proto: DrinkMugRed
-  entities:
-  - uid: 359
-    components:
-    - type: Transform
-      pos: 1.9918958,-17.588755
-      parent: 1
-- proto: DrinkVacuumFlask
-  entities:
-  - uid: 360
-    components:
-    - type: Transform
-      pos: 5.6435027,-21.180143
-      parent: 1
-  - uid: 361
-    components:
-    - type: Transform
-      pos: 5.7372527,-21.398893
-      parent: 1
-- proto: ExtendedEmergencyOxygenTankFilled
-  entities:
-  - uid: 362
-    components:
-    - type: Transform
-      pos: -5.678572,-12.319441
-      parent: 1
-  - uid: 363
-    components:
-    - type: Transform
-      pos: 4.305803,-12.272566
-      parent: 1
-- proto: FireAxeFlaming
-  entities:
-  - uid: 23
-    components:
-    - type: Transform
-      pos: -1.5018963,-3.4569345
-      parent: 1
-- proto: FoodBoxDonkpocketPizza
-  entities:
-  - uid: 364
-    components:
-    - type: Transform
-      pos: 2.7185502,-19.320925
-      parent: 1
-- proto: FoodBoxDonut
-  entities:
-  - uid: 365
-    components:
-    - type: Transform
-      pos: 5.5401826,-21.187487
-      parent: 1
-- proto: FoodPizzaDonkpocket
-  entities:
-  - uid: 366
-    components:
-    - type: Transform
-      pos: 1.4776825,-21.296862
-      parent: 1
-- proto: FoodSnackSyndi
-  entities:
-  - uid: 367
-    components:
-    - type: Transform
-      pos: 1.5361897,-17.367903
-      parent: 1
-- proto: GasMinerNitrogen
-  entities:
-  - uid: 368
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-27.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: GasMinerOxygen
-  entities:
-  - uid: 369
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-27.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: GasMixer
-  entities:
-  - uid: 370
-    components:
-    - type: MetaData
-      name: O2+N2 mixer
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-24.5
-      parent: 1
-    - type: GasMixer
-      inletTwoConcentration: 0.78
-      inletOneConcentration: 0.22
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-- proto: GasPassiveVent
-  entities:
-  - uid: 371
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-26.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 372
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-26.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 373
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-19.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: GasPipeBend
-  entities:
-  - uid: 374
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-5.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 375
-    components:
-    - type: Transform
-      pos: 5.5,-24.5
-      parent: 1
-  - uid: 376
-    components:
-    - type: Transform
-      pos: 3.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 377
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 378
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-5.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 379
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-4.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 380
-    components:
-    - type: Transform
-      pos: 0.5,-8.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 381
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-8.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 382
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-4.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 383
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-21.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-- proto: GasPipeFourway
-  entities:
-  - uid: 384
-    components:
-    - type: Transform
-      pos: 3.5,-23.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 385
-    components:
-    - type: Transform
-      pos: -0.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 386
-    components:
-    - type: Transform
-      pos: -0.5,-16.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 387
-    components:
-    - type: Transform
-      pos: 0.5,-17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-- proto: GasPipeStraight
-  entities:
-  - uid: 388
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-25.5
-      parent: 1
-  - uid: 389
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-25.5
-      parent: 1
-  - uid: 390
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-24.5
-      parent: 1
-  - uid: 391
-    components:
-    - type: Transform
-      pos: 3.5,-22.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 392
-    components:
-    - type: Transform
-      pos: 3.5,-21.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 393
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 394
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 395
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 396
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 397
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 398
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 399
-    components:
-    - type: Transform
-      pos: -0.5,-19.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 400
-    components:
-    - type: Transform
-      pos: -0.5,-18.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 401
-    components:
-    - type: Transform
-      pos: -0.5,-17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 402
-    components:
-    - type: Transform
-      pos: -0.5,-15.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 403
-    components:
-    - type: Transform
-      pos: -0.5,-14.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 404
-    components:
-    - type: Transform
-      pos: -0.5,-13.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 405
-    components:
-    - type: Transform
-      pos: -0.5,-12.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 406
-    components:
-    - type: Transform
-      pos: -0.5,-10.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 407
-    components:
-    - type: Transform
-      pos: -0.5,-9.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 408
-    components:
-    - type: Transform
-      pos: -0.5,-8.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 409
-    components:
-    - type: Transform
-      pos: -0.5,-7.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 410
-    components:
-    - type: Transform
-      pos: -0.5,-6.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 411
-    components:
-    - type: Transform
-      pos: 0.5,-18.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 412
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-16.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 413
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-16.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 414
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-16.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 415
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-16.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 416
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-16.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 417
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-16.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 418
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-19.5
-      parent: 1
-  - uid: 419
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-19.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 420
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-19.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 421
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-6.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 422
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 423
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 424
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 425
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 426
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 427
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 428
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-16.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 429
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-15.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 430
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-14.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 431
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-13.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 432
-    components:
-    - type: Transform
-      pos: 0.5,-11.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 433
-    components:
-    - type: Transform
-      pos: 0.5,-10.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 434
-    components:
-    - type: Transform
-      pos: 0.5,-9.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 435
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-8.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 436
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-7.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 437
-    components:
-    - type: Transform
-      pos: 0.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 438
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-21.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 439
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-21.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 440
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-21.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 441
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-5.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 442
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-4.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-- proto: GasPipeTJunction
-  entities:
-  - uid: 443
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-11.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 444
-    components:
-    - type: Transform
-      pos: 2.5,-19.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 445
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-19.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 446
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-12.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-- proto: GasPort
-  entities:
-  - uid: 447
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-23.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-- proto: GasPressurePump
-  entities:
-  - uid: 448
-    components:
-    - type: MetaData
-      name: waste pump
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-19.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-- proto: GasVentPump
-  entities:
-  - uid: 449
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-11.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 450
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-21.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 451
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-23.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 452
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,-21.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 453
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-16.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 454
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-16.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 455
-    components:
-    - type: Transform
-      pos: 0.5,-3.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-- proto: GasVentScrubber
-  entities:
-  - uid: 456
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-12.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 457
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-17.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 458
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-20.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 459
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-17.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 460
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-21.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 461
-    components:
-    - type: Transform
-      pos: -0.5,-3.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-- proto: GeneratorBasic15kW
-  entities:
-  - uid: 462
-    components:
-    - type: Transform
-      pos: -4.5,-26.5
-      parent: 1
-  - uid: 463
-    components:
-    - type: Transform
-      pos: -4.5,-25.5
-      parent: 1
-  - uid: 464
-    components:
-    - type: Transform
-      pos: -4.5,-24.5
-      parent: 1
-  - uid: 465
-    components:
-    - type: Transform
-      pos: -6.5,-24.5
-      parent: 1
-  - uid: 466
-    components:
-    - type: Transform
-      pos: -6.5,-25.5
-      parent: 1
-  - uid: 467
-    components:
-    - type: Transform
-      pos: -6.5,-26.5
-      parent: 1
-- proto: GeneratorWallmountAPU
-  entities:
-  - uid: 468
-    components:
-    - type: Transform
-      pos: -6.5,-20.5
-      parent: 1
-- proto: GravityGeneratorMini
-  entities:
-  - uid: 469
-    components:
-    - type: Transform
-      pos: -5.5,-22.5
-      parent: 1
-- proto: Grille
-  entities:
-  - uid: 470
-    components:
-    - type: Transform
-      pos: 2.5,-12.5
-      parent: 1
-  - uid: 471
-    components:
-    - type: Transform
-      pos: -3.5,-12.5
-      parent: 1
-  - uid: 472
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-7.5
-      parent: 1
-  - uid: 473
-    components:
-    - type: Transform
-      pos: -2.5,-1.5
-      parent: 1
-  - uid: 474
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 475
-    components:
-    - type: Transform
-      pos: -4.5,-2.5
-      parent: 1
-  - uid: 476
-    components:
-    - type: Transform
-      pos: -6.5,-4.5
-      parent: 1
-  - uid: 477
-    components:
-    - type: Transform
-      pos: 3.5,-2.5
-      parent: 1
-  - uid: 478
-    components:
-    - type: Transform
-      pos: -1.5,-1.5
-      parent: 1
-  - uid: 479
-    components:
-    - type: Transform
-      pos: 5.5,-4.5
-      parent: 1
-  - uid: 480
-    components:
-    - type: Transform
-      pos: 0.5,-1.5
-      parent: 1
-  - uid: 481
-    components:
-    - type: Transform
-      pos: 1.5,-9.5
-      parent: 1
-  - uid: 482
-    components:
-    - type: Transform
-      pos: -2.5,-9.5
-      parent: 1
-  - uid: 483
-    components:
-    - type: Transform
-      pos: 1.5,-1.5
-      parent: 1
-  - uid: 484
-    components:
-    - type: Transform
-      pos: -2.5,-21.5
-      parent: 1
-  - uid: 485
-    components:
-    - type: Transform
-      pos: -2.5,-19.5
-      parent: 1
-  - uid: 486
-    components:
-    - type: Transform
-      pos: 2.5,-22.5
-      parent: 1
-  - uid: 487
-    components:
-    - type: Transform
-      pos: 4.5,-22.5
-      parent: 1
-  - uid: 488
-    components:
-    - type: Transform
-      pos: -1.5,-18.5
-      parent: 1
-  - uid: 489
-    components:
-    - type: Transform
-      pos: 0.5,-7.5
-      parent: 1
-  - uid: 490
-    components:
-    - type: Transform
-      pos: 3.5,-25.5
-      parent: 1
-  - uid: 491
-    components:
-    - type: Transform
-      pos: 5.5,-25.5
-      parent: 1
-  - uid: 492
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-19.5
-      parent: 1
-  - uid: 493
-    components:
-    - type: Transform
-      pos: 0.5,-18.5
-      parent: 1
-- proto: Gyroscope
-  entities:
-  - uid: 494
-    components:
-    - type: Transform
-      pos: -5.5,-13.5
-      parent: 1
-  - uid: 495
-    components:
-    - type: Transform
-      pos: 4.5,-13.5
-      parent: 1
-- proto: HospitalCurtainsOpen
-  entities:
-  - uid: 496
-    components:
-    - type: Transform
-      pos: 3.5,-3.5
-      parent: 1
-- proto: KitchenMicrowave
-  entities:
-  - uid: 497
-    components:
-    - type: Transform
-      pos: 3.5,-19.5
-      parent: 1
-- proto: KnifePlastic
-  entities:
-  - uid: 498
-    components:
-    - type: Transform
-      pos: 5.3509636,-21.445768
-      parent: 1
-- proto: Lamp
-  entities:
-  - uid: 499
-    components:
-    - type: Transform
-      pos: -1.483297,-2.2444057
-      parent: 1
-- proto: LockerSyndicatePersonal
-  entities:
-  - uid: 33
-    components:
-    - type: Transform
-      pos: 4.5,-5.5
-      parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 37
-          - 39
-          - 36
-          - 40
-          - 41
-          - 38
-          - 35
-          - 34
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-- proto: MedicalBed
-  entities:
-  - uid: 500
-    components:
-    - type: Transform
-      pos: -4.5,-3.5
-      parent: 1
-- proto: MedkitCombatFilled
-  entities:
-  - uid: 501
-    components:
-    - type: Transform
-      pos: -3.401462,-3.5350046
-      parent: 1
-  - uid: 502
-    components:
-    - type: Transform
-      pos: -3.557712,-3.4256296
-      parent: 1
-- proto: Mirror
-  entities:
-  - uid: 503
-    components:
-    - type: Transform
-      pos: 4.5,-3.5
-      parent: 1
-- proto: Multitool
-  entities:
-  - uid: 504
-    components:
-    - type: Transform
-      pos: -3.383473,-22.548275
-      parent: 1
-- proto: NitrogenTankFilled
-  entities:
-  - uid: 505
-    components:
-    - type: Transform
-      pos: 4.633928,-12.616316
-      parent: 1
-  - uid: 506
-    components:
-    - type: Transform
-      pos: -5.397322,-12.569441
-      parent: 1
-  - uid: 507
-    components:
-    - type: Transform
-      pos: -6.3522453,-17.549818
-      parent: 1
-  - uid: 508
-    components:
-    - type: Transform
-      pos: 5.6633797,-17.565443
-      parent: 1
-- proto: NuclearBombUnanchored
-  entities:
-  - uid: 509
-    components:
-    - type: Transform
-      pos: -2.5,-12.5
-      parent: 1
-- proto: NukeCodePaper
-  entities:
-  - uid: 510
-    components:
-    - type: Transform
-      pos: -2.5286522,-11.44479
-      parent: 1
-- proto: Ointment
-  entities:
-  - uid: 511
-    components:
-    - type: Transform
-      pos: -3.651462,-4.5193796
-      parent: 1
-  - uid: 512
-    components:
-    - type: Transform
-      pos: -3.667087,-4.2225046
-      parent: 1
-- proto: OperatingTable
-  entities:
-  - uid: 513
-    components:
-    - type: Transform
-      pos: -5.5,-4.5
-      parent: 1
-- proto: OxygenCanister
-  entities:
-  - uid: 514
-    components:
-    - type: Transform
-      pos: -1.5,-24.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: OxygenTankFilled
-  entities:
-  - uid: 515
-    components:
-    - type: Transform
-      pos: -5.600447,-12.569441
-      parent: 1
-  - uid: 516
-    components:
-    - type: Transform
-      pos: 4.399553,-12.522566
-      parent: 1
-  - uid: 517
-    components:
-    - type: Transform
-      pos: 5.5227547,-17.440443
-      parent: 1
-  - uid: 518
-    components:
-    - type: Transform
-      pos: -6.4928703,-17.440443
-      parent: 1
-- proto: PinpointerNuclear
-  entities:
-  - uid: 519
-    components:
-    - type: Transform
-      pos: -2.4942985,-13.37949
-      parent: 1
-- proto: PlasmaReinforcedWindowDirectional
-  entities:
-  - uid: 520
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-4.5
-      parent: 1
-  - uid: 521
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-6.5
-      parent: 1
-  - uid: 522
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-3.5
-      parent: 1
-- proto: PlushieNuke
-  entities:
-  - uid: 523
-    components:
-    - type: Transform
-      pos: -2.4227936,-2.3320491
-      parent: 1
-- proto: PosterContrabandC20r
-  entities:
-  - uid: 524
-    components:
-    - type: Transform
-      pos: 1.5,-14.5
-      parent: 1
-- proto: PosterContrabandCC64KAd
-  entities:
-  - uid: 525
-    components:
-    - type: Transform
-      pos: -5.5,-18.5
-      parent: 1
-- proto: PosterContrabandCybersun600
-  entities:
-  - uid: 526
-    components:
-    - type: Transform
-      pos: 2.5,-6.5
-      parent: 1
-- proto: PosterContrabandDonk
-  entities:
-  - uid: 527
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-18.5
-      parent: 1
-- proto: PosterContrabandDonutCorp
-  entities:
-  - uid: 528
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-22.5
-      parent: 1
-- proto: PosterContrabandEnergySwords
-  entities:
-  - uid: 529
-    components:
-    - type: Transform
-      pos: 2.5,-18.5
-      parent: 1
-- proto: PosterContrabandEnlistGorlex
-  entities:
-  - uid: 530
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-13.5
-      parent: 1
-- proto: PosterContrabandFreeSyndicateEncryptionKey
-  entities:
-  - uid: 531
-    components:
-    - type: Transform
-      pos: -2.5,-8.5
-      parent: 1
-- proto: PosterContrabandInterdyne
-  entities:
-  - uid: 532
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,-6.5
-      parent: 1
-- proto: PosterContrabandKosmicheskayaStantsiya
-  entities:
-  - uid: 533
-    components:
-    - type: Transform
-      pos: -2.5,-22.5
-      parent: 1
-- proto: PosterContrabandMoth
-  entities:
-  - uid: 534
-    components:
-    - type: Transform
-      pos: -2.5,-14.5
-      parent: 1
-  - uid: 535
-    components:
-    - type: Transform
-      pos: 2.5,-3.5
-      parent: 1
-- proto: PosterContrabandNuclearDeviceInformational
-  entities:
-  - uid: 536
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-13.5
-      parent: 1
-  - uid: 537
-    components:
-    - type: Transform
-      pos: 0.5,-14.5
-      parent: 1
-- proto: PosterContrabandSyndicatePistol
-  entities:
-  - uid: 538
-    components:
-    - type: Transform
-      pos: 1.5,-10.5
-      parent: 1
-- proto: PosterContrabandSyndicateRecruitment
-  entities:
-  - uid: 539
-    components:
-    - type: Transform
-      pos: -1.5,-14.5
-      parent: 1
-- proto: PosterContrabandWaffleCorp
-  entities:
-  - uid: 540
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-23.5
-      parent: 1
-- proto: Poweredlight
-  entities:
-  - uid: 541
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-8.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 542
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-4.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 543
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -6.5,-23.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 544
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -6.5,-26.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 545
-    components:
-    - type: Transform
-      pos: -4.5,-19.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 546
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-13.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 547
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-27.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 548
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-27.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 549
-    components:
-    - type: Transform
-      pos: 2.5,-15.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 550
-    components:
-    - type: Transform
-      pos: -3.5,-15.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 551
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,-5.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 552
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-2.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 553
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-6.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-- proto: PoweredSmallLight
-  entities:
-  - uid: 554
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-13.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 555
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-21.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 556
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-5.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 557
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-24.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 558
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-13.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 559
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-24.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 560
-    components:
-    - type: Transform
-      pos: -6.5,-15.5
-      parent: 1
-  - uid: 561
-    components:
-    - type: Transform
-      pos: 5.5,-15.5
-      parent: 1
-  - uid: 562
-    components:
-    - type: Transform
-      pos: 2.5,-19.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 563
-    components:
-    - type: Transform
-      pos: -1.5,-26.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 564
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-9.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 565
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-9.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-- proto: Rack
-  entities:
-  - uid: 566
-    components:
-    - type: Transform
-      pos: -3.5,-22.5
-      parent: 1
-  - uid: 567
-    components:
-    - type: Transform
-      pos: 5.5,-23.5
-      parent: 1
-  - uid: 568
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-12.5
-      parent: 1
-  - uid: 569
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-12.5
-      parent: 1
-  - uid: 570
-    components:
-    - type: Transform
-      pos: -1.5,-23.5
-      parent: 1
-  - uid: 571
-    components:
-    - type: Transform
-      pos: -6.5,-17.5
-      parent: 1
-  - uid: 572
-    components:
-    - type: Transform
-      pos: 5.5,-17.5
-      parent: 1
-- proto: ReinforcedPlasmaWindow
-  entities:
-  - uid: 573
-    components:
-    - type: Transform
-      pos: 3.5,-2.5
-      parent: 1
-  - uid: 574
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-19.5
-      parent: 1
-  - uid: 575
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 576
-    components:
-    - type: Transform
-      pos: -6.5,-4.5
-      parent: 1
-  - uid: 577
-    components:
-    - type: Transform
-      pos: -2.5,-1.5
-      parent: 1
-  - uid: 578
-    components:
-    - type: Transform
-      pos: -4.5,-2.5
-      parent: 1
-  - uid: 579
-    components:
-    - type: Transform
-      pos: 5.5,-4.5
-      parent: 1
-  - uid: 580
-    components:
-    - type: Transform
-      pos: -1.5,-1.5
-      parent: 1
-  - uid: 581
-    components:
-    - type: Transform
-      pos: 0.5,-1.5
-      parent: 1
-  - uid: 582
-    components:
-    - type: Transform
-      pos: 1.5,-1.5
-      parent: 1
-  - uid: 583
-    components:
-    - type: Transform
-      pos: -1.5,-7.5
-      parent: 1
-  - uid: 584
-    components:
-    - type: Transform
-      pos: 4.5,-22.5
-      parent: 1
-  - uid: 585
-    components:
-    - type: Transform
-      pos: 2.5,-22.5
-      parent: 1
-  - uid: 586
-    components:
-    - type: Transform
-      pos: -2.5,-21.5
-      parent: 1
-  - uid: 587
-    components:
-    - type: Transform
-      pos: -2.5,-19.5
-      parent: 1
-  - uid: 588
-    components:
-    - type: Transform
-      pos: -2.5,-9.5
-      parent: 1
-  - uid: 589
-    components:
-    - type: Transform
-      pos: 1.5,-9.5
-      parent: 1
-  - uid: 590
-    components:
-    - type: Transform
-      pos: 0.5,-18.5
-      parent: 1
-  - uid: 591
-    components:
-    - type: Transform
-      pos: 3.5,-25.5
-      parent: 1
-  - uid: 592
-    components:
-    - type: Transform
-      pos: 5.5,-25.5
-      parent: 1
-  - uid: 593
-    components:
-    - type: Transform
-      pos: 2.5,-12.5
-      parent: 1
-  - uid: 594
-    components:
-    - type: Transform
-      pos: -3.5,-12.5
-      parent: 1
-  - uid: 595
-    components:
-    - type: Transform
-      pos: 0.5,-7.5
-      parent: 1
-  - uid: 596
-    components:
-    - type: Transform
-      pos: -1.5,-18.5
-      parent: 1
-- proto: ShuttersNormalOpen
-  entities:
-  - uid: 597
-    components:
-    - type: Transform
-      pos: -6.5,-4.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 21
-  - uid: 598
-    components:
-    - type: Transform
-      pos: 5.5,-4.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 20
-  - uid: 599
-    components:
-    - type: Transform
-      pos: 1.5,-9.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 609
-  - uid: 600
-    components:
-    - type: Transform
-      pos: -2.5,-9.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 609
-  - uid: 601
-    components:
-    - type: Transform
-      pos: -4.5,-2.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 21
-  - uid: 602
-    components:
-    - type: Transform
-      pos: 3.5,-2.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 20
-  - uid: 603
-    components:
-    - type: Transform
-      pos: 1.5,-1.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 21
-  - uid: 604
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 21
-  - uid: 605
-    components:
-    - type: Transform
-      pos: 5.5,-19.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 611
-  - uid: 606
-    components:
-    - type: Transform
-      pos: -1.5,-1.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 21
-  - uid: 607
-    components:
-    - type: Transform
-      pos: 0.5,-1.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 21
-  - uid: 608
-    components:
-    - type: Transform
-      pos: -2.5,-1.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 21
-- proto: SignalButton
-  entities:
-  - uid: 609
-    components:
-    - type: Transform
-      pos: -2.5,-10.5
-      parent: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        600:
-        - Pressed: Toggle
-        599:
-        - Pressed: Toggle
-  - uid: 611
-    components:
-    - type: Transform
-      pos: 5.5,-20.5
-      parent: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        605:
-        - Pressed: Toggle
-- proto: SignalButtonDirectional
-  entities:
-  - uid: 20
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-4.5
-      parent: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        602:
-        - Pressed: Toggle
-        598:
-        - Pressed: Toggle
-  - uid: 21
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-7.5
-      parent: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        597:
-        - Pressed: Toggle
-        601:
-        - Pressed: Toggle
-        608:
-        - Pressed: Toggle
-        606:
-        - Pressed: Toggle
-        604:
-        - Pressed: Toggle
-        607:
-        - Pressed: Toggle
-        603:
-        - Pressed: Toggle
-- proto: SignDirectionalEvac
-  entities:
-  - uid: 613
-    components:
-    - type: Transform
-      pos: 0.5,-22.5
-      parent: 1
-  - uid: 614
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-15.5
-      parent: 1
-  - uid: 615
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-14.5
-      parent: 1
-  - uid: 616
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-14.5
-      parent: 1
-  - uid: 617
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,-15.5
-      parent: 1
-- proto: SignElectricalMed
-  entities:
-  - uid: 618
-    components:
-    - type: Transform
-      pos: -2.5,-18.5
-      parent: 1
-- proto: SignNosmoking
-  entities:
-  - uid: 619
-    components:
-    - type: Transform
-      pos: 5.5,-22.5
-      parent: 1
-- proto: SignSecureSmallRed
-  entities:
-  - uid: 620
-    components:
-    - type: Transform
-      pos: -3.5,-11.5
-      parent: 1
-  - uid: 621
-    components:
-    - type: Transform
-      pos: 4.5,-17.5
-      parent: 1
-  - uid: 622
-    components:
-    - type: Transform
-      pos: 2.5,-11.5
-      parent: 1
-- proto: SMESBasic
-  entities:
-  - uid: 623
-    components:
-    - type: Transform
-      pos: -5.5,-19.5
-      parent: 1
-  - uid: 624
-    components:
-    - type: Transform
-      pos: -4.5,-19.5
-      parent: 1
-- proto: SoapSyndie
-  entities:
-  - uid: 625
-    components:
-    - type: Transform
-      pos: 2.4424396,-17.430403
-      parent: 1
-- proto: soda_dispenser
-  entities:
-  - uid: 626
-    components:
-    - type: Transform
-      pos: 1.5,-19.5
-      parent: 1
-- proto: StorageCanister
-  entities:
-  - uid: 627
-    components:
-    - type: Transform
-      pos: 2.5,-23.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: SubstationBasic
-  entities:
-  - uid: 628
-    components:
-    - type: Transform
-      pos: -3.5,-19.5
-      parent: 1
-- proto: SuitStorageEVASyndicate
-  entities:
-  - uid: 629
-    components:
-    - type: Transform
-      pos: 0.5,-24.5
-      parent: 1
-  - uid: 630
-    components:
-    - type: Transform
-      pos: 0.5,-23.5
-      parent: 1
-  - uid: 631
-    components:
-    - type: Transform
-      pos: 3.5,-17.5
-      parent: 1
-  - uid: 632
-    components:
-    - type: Transform
-      pos: -4.5,-17.5
-      parent: 1
-- proto: SyndieMiniBomb
-  entities:
-  - uid: 633
-    components:
-    - type: Transform
-      pos: 1.4127003,-11.973867
-      parent: 1
-  - uid: 634
-    components:
-    - type: Transform
-      pos: 1.6939503,-11.973867
-      parent: 1
-- proto: SyringeInaprovaline
-  entities:
-  - uid: 635
-    components:
-    - type: Transform
-      pos: -3.510837,-4.3787546
-      parent: 1
-  - uid: 636
-    components:
-    - type: Transform
-      pos: -3.510837,-4.0193796
-      parent: 1
-- proto: Table
-  entities:
-  - uid: 637
-    components:
-    - type: Transform
-      pos: 5.5,-21.5
-      parent: 1
-  - uid: 638
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-21.5
-      parent: 1
-  - uid: 639
-    components:
-    - type: Transform
-      pos: 3.5,-19.5
-      parent: 1
-  - uid: 640
-    components:
-    - type: Transform
-      pos: 2.5,-19.5
-      parent: 1
-  - uid: 641
-    components:
-    - type: Transform
-      pos: 1.5,-19.5
-      parent: 1
-- proto: TablePlasmaGlass
-  entities:
-  - uid: 642
-    components:
-    - type: Transform
-      pos: -3.5,-4.5
-      parent: 1
-  - uid: 643
-    components:
-    - type: Transform
-      pos: -3.5,-6.5
-      parent: 1
-  - uid: 644
-    components:
-    - type: Transform
-      pos: -3.5,-3.5
-      parent: 1
-- proto: TableReinforced
-  entities:
-  - uid: 645
-    components:
-    - type: Transform
-      pos: -2.5,-11.5
-      parent: 1
-  - uid: 646
-    components:
-    - type: Transform
-      pos: -2.5,-13.5
-      parent: 1
-  - uid: 647
-    components:
-    - type: Transform
-      pos: -1.5,-3.5
-      parent: 1
-  - uid: 648
-    components:
-    - type: Transform
-      pos: -2.5,-2.5
-      parent: 1
-  - uid: 649
-    components:
-    - type: Transform
-      pos: 0.5,-13.5
-      parent: 1
-  - uid: 650
-    components:
-    - type: Transform
-      pos: 1.5,-13.5
-      parent: 1
-  - uid: 651
-    components:
-    - type: Transform
-      pos: 1.5,-12.5
-      parent: 1
-  - uid: 652
-    components:
-    - type: Transform
-      pos: 1.5,-11.5
-      parent: 1
-  - uid: 653
-    components:
-    - type: Transform
-      pos: 2.5,-17.5
-      parent: 1
-  - uid: 654
-    components:
-    - type: Transform
-      pos: 1.5,-17.5
-      parent: 1
-  - uid: 655
-    components:
-    - type: Transform
-      pos: -2.5,-17.5
-      parent: 1
-  - uid: 656
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-2.5
-      parent: 1
-  - uid: 657
-    components:
-    - type: Transform
-      pos: -3.5,-17.5
-      parent: 1
-  - uid: 658
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-2.5
-      parent: 1
-- proto: Thruster
-  entities:
-  - uid: 659
-    components:
-    - type: Transform
-      pos: -6.5,-2.5
-      parent: 1
-  - uid: 660
-    components:
-    - type: Transform
-      pos: 5.5,-2.5
-      parent: 1
-  - uid: 661
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,-7.5
-      parent: 1
-  - uid: 662
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-7.5
-      parent: 1
-  - uid: 663
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -7.5,-13.5
-      parent: 1
-  - uid: 664
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-13.5
-      parent: 1
-  - uid: 665
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-30.5
-      parent: 1
-  - uid: 666
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,-30.5
-      parent: 1
-  - uid: 667
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-30.5
-      parent: 1
-  - uid: 668
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-30.5
-      parent: 1
-- proto: ToolboxSyndicate
-  entities:
-  - uid: 669
-    components:
-    - type: Transform
-      pos: -2.5731854,-17.414778
-      parent: 1
-- proto: ToolboxSyndicateFilled
-  entities:
-  - uid: 670
-    components:
-    - type: Transform
-      pos: 1.5034143,-11.298322
-      parent: 1
-- proto: VendingMachineTankDispenserEVA
-  entities:
-  - uid: 671
-    components:
-    - type: Transform
-      pos: 5.5,-15.5
-      parent: 1
-  - uid: 672
-    components:
-    - type: MetaData
-      name: tank dispenser
-    - type: Transform
-      pos: 2.5,-24.5
-      parent: 1
-  - uid: 673
-    components:
-    - type: Transform
-      pos: -6.5,-15.5
-      parent: 1
-- proto: VendingMachineYouTool
-  entities:
-  - uid: 674
-    components:
-    - type: Transform
-      pos: -3.5,-24.5
-      parent: 1
-- proto: WallPlastitanium
-  entities:
-  - uid: 11
-    components:
-    - type: Transform
-      pos: -1.5,-25.5
-      parent: 1
-  - uid: 675
-    components:
-    - type: Transform
-      pos: 2.5,-2.5
-      parent: 1
-  - uid: 676
-    components:
-    - type: Transform
-      pos: 4.5,-3.5
-      parent: 1
-  - uid: 677
-    components:
-    - type: Transform
-      pos: -3.5,-11.5
-      parent: 1
-  - uid: 678
-    components:
-    - type: Transform
-      pos: 2.5,-14.5
-      parent: 1
-  - uid: 679
-    components:
-    - type: Transform
-      pos: 4.5,-14.5
-      parent: 1
-  - uid: 680
-    components:
-    - type: Transform
-      pos: -2.5,-14.5
-      parent: 1
-  - uid: 681
-    components:
-    - type: Transform
-      pos: 2.5,-18.5
-      parent: 1
-  - uid: 682
-    components:
-    - type: Transform
-      pos: 1.5,-25.5
-      parent: 1
-  - uid: 683
-    components:
-    - type: Transform
-      pos: 1.5,-18.5
-      parent: 1
-  - uid: 684
-    components:
-    - type: Transform
-      pos: 7.5,-17.5
-      parent: 1
-  - uid: 685
-    components:
-    - type: Transform
-      pos: -3.5,-26.5
-      parent: 1
-  - uid: 686
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-7.5
-      parent: 1
-  - uid: 687
-    components:
-    - type: Transform
-      pos: 2.5,-13.5
-      parent: 1
-  - uid: 688
-    components:
-    - type: Transform
-      pos: -3.5,-28.5
-      parent: 1
-  - uid: 689
-    components:
-    - type: Transform
-      pos: 2.5,-10.5
-      parent: 1
-  - uid: 690
-    components:
-    - type: Transform
-      pos: 4.5,-18.5
-      parent: 1
-  - uid: 691
-    components:
-    - type: Transform
-      pos: -2.5,-10.5
-      parent: 1
-  - uid: 692
-    components:
-    - type: Transform
-      pos: -3.5,-10.5
-      parent: 1
-  - uid: 693
-    components:
-    - type: Transform
-      pos: -6.5,-11.5
-      parent: 1
-  - uid: 694
-    components:
-    - type: Transform
-      pos: 4.5,-10.5
-      parent: 1
-  - uid: 695
-    components:
-    - type: Transform
-      pos: 4.5,-2.5
-      parent: 1
-  - uid: 696
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-7.5
-      parent: 1
-  - uid: 697
-    components:
-    - type: Transform
-      pos: -6.5,-6.5
-      parent: 1
-  - uid: 698
-    components:
-    - type: Transform
-      pos: -5.5,-6.5
-      parent: 1
-  - uid: 699
-    components:
-    - type: Transform
-      pos: 4.5,-6.5
-      parent: 1
-  - uid: 700
-    components:
-    - type: Transform
-      pos: -6.5,-5.5
-      parent: 1
-  - uid: 701
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-8.5
-      parent: 1
-  - uid: 702
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-7.5
-      parent: 1
-  - uid: 703
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-8.5
-      parent: 1
-  - uid: 704
-    components:
-    - type: Transform
-      pos: 2.5,-11.5
-      parent: 1
-  - uid: 705
-    components:
-    - type: Transform
-      pos: 5.5,-18.5
-      parent: 1
-  - uid: 706
-    components:
-    - type: Transform
-      pos: -8.5,-15.5
-      parent: 1
-  - uid: 707
-    components:
-    - type: Transform
-      pos: -8.5,-17.5
-      parent: 1
-  - uid: 708
-    components:
-    - type: Transform
-      pos: -7.5,-17.5
-      parent: 1
-  - uid: 709
-    components:
-    - type: Transform
-      pos: -5.5,-10.5
-      parent: 1
-  - uid: 710
-    components:
-    - type: Transform
-      pos: -3.5,-13.5
-      parent: 1
-  - uid: 711
-    components:
-    - type: Transform
-      pos: 3.5,-18.5
-      parent: 1
-  - uid: 712
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-6.5
-      parent: 1
-  - uid: 713
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-7.5
-      parent: 1
-  - uid: 714
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-8.5
-      parent: 1
-  - uid: 715
-    components:
-    - type: Transform
-      pos: 5.5,-14.5
-      parent: 1
-  - uid: 716
-    components:
-    - type: Transform
-      pos: 7.5,-15.5
-      parent: 1
-  - uid: 717
-    components:
-    - type: Transform
-      pos: -6.5,-19.5
-      parent: 1
-  - uid: 718
-    components:
-    - type: Transform
-      pos: -6.5,-18.5
-      parent: 1
-  - uid: 719
-    components:
-    - type: Transform
-      pos: -3.5,-25.5
-      parent: 1
-  - uid: 720
-    components:
-    - type: Transform
-      pos: 2.5,-25.5
-      parent: 1
-  - uid: 721
-    components:
-    - type: Transform
-      pos: 2.5,-27.5
-      parent: 1
-  - uid: 722
-    components:
-    - type: Transform
-      pos: 4.5,-17.5
-      parent: 1
-  - uid: 723
-    components:
-    - type: Transform
-      pos: -7.5,-21.5
-      parent: 1
-  - uid: 724
-    components:
-    - type: Transform
-      pos: -7.5,-27.5
-      parent: 1
-  - uid: 725
-    components:
-    - type: Transform
-      pos: -7.5,-24.5
-      parent: 1
-  - uid: 726
-    components:
-    - type: Transform
-      pos: 6.5,-21.5
-      parent: 1
-  - uid: 727
-    components:
-    - type: Transform
-      pos: 6.5,-24.5
-      parent: 1
-  - uid: 728
-    components:
-    - type: Transform
-      pos: 6.5,-26.5
-      parent: 1
-  - uid: 729
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-3.5
-      parent: 1
-  - uid: 730
-    components:
-    - type: Transform
-      pos: 1.5,-10.5
-      parent: 1
-  - uid: 731
-    components:
-    - type: Transform
-      pos: -3.5,-27.5
-      parent: 1
-  - uid: 732
-    components:
-    - type: Transform
-      pos: -6.5,-12.5
-      parent: 1
-  - uid: 733
-    components:
-    - type: Transform
-      pos: 5.5,-12.5
-      parent: 1
-  - uid: 734
-    components:
-    - type: Transform
-      pos: 5.5,-11.5
-      parent: 1
-  - uid: 735
-    components:
-    - type: Transform
-      pos: -5.5,-11.5
-      parent: 1
-  - uid: 736
-    components:
-    - type: Transform
-      pos: -6.5,-20.5
-      parent: 1
-  - uid: 737
-    components:
-    - type: Transform
-      pos: 0.5,-14.5
-      parent: 1
-  - uid: 738
-    components:
-    - type: Transform
-      pos: -1.5,-14.5
-      parent: 1
-  - uid: 739
-    components:
-    - type: Transform
-      pos: 5.5,-20.5
-      parent: 1
-  - uid: 740
-    components:
-    - type: Transform
-      pos: -5.5,-14.5
-      parent: 1
-  - uid: 741
-    components:
-    - type: Transform
-      pos: 6.5,-17.5
-      parent: 1
-  - uid: 742
-    components:
-    - type: Transform
-      pos: -3.5,-14.5
-      parent: 1
-  - uid: 743
-    components:
-    - type: Transform
-      pos: -2.5,-18.5
-      parent: 1
-  - uid: 744
-    components:
-    - type: Transform
-      pos: 2.5,-26.5
-      parent: 1
-  - uid: 745
-    components:
-    - type: Transform
-      pos: 2.5,-28.5
-      parent: 1
-  - uid: 746
-    components:
-    - type: Transform
-      pos: 6.5,-25.5
-      parent: 1
-  - uid: 747
-    components:
-    - type: Transform
-      pos: 6.5,-22.5
-      parent: 1
-  - uid: 748
-    components:
-    - type: Transform
-      pos: -7.5,-23.5
-      parent: 1
-  - uid: 749
-    components:
-    - type: Transform
-      pos: -7.5,-26.5
-      parent: 1
-  - uid: 750
-    components:
-    - type: Transform
-      pos: -7.5,-22.5
-      parent: 1
-  - uid: 751
-    components:
-    - type: Transform
-      pos: -7.5,-20.5
-      parent: 1
-  - uid: 752
-    components:
-    - type: Transform
-      pos: 4.5,-15.5
-      parent: 1
-  - uid: 753
-    components:
-    - type: Transform
-      pos: 6.5,-28.5
-      parent: 1
-  - uid: 754
-    components:
-    - type: Transform
-      pos: 6.5,-27.5
-      parent: 1
-  - uid: 755
-    components:
-    - type: Transform
-      pos: 6.5,-23.5
-      parent: 1
-  - uid: 756
-    components:
-    - type: Transform
-      pos: 6.5,-20.5
-      parent: 1
-  - uid: 757
-    components:
-    - type: Transform
-      pos: -7.5,-25.5
-      parent: 1
-  - uid: 758
-    components:
-    - type: Transform
-      pos: -7.5,-28.5
-      parent: 1
-  - uid: 759
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-15.5
-      parent: 1
-  - uid: 760
-    components:
-    - type: Transform
-      pos: -5.5,-18.5
-      parent: 1
-  - uid: 761
-    components:
-    - type: Transform
-      pos: -5.5,-3.5
-      parent: 1
-  - uid: 762
-    components:
-    - type: Transform
-      pos: 5.5,-5.5
-      parent: 1
-  - uid: 763
-    components:
-    - type: Transform
-      pos: -3.5,-2.5
-      parent: 1
-  - uid: 764
-    components:
-    - type: Transform
-      pos: -6.5,-3.5
-      parent: 1
-  - uid: 765
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-7.5
-      parent: 1
-  - uid: 766
-    components:
-    - type: Transform
-      pos: -3.5,-18.5
-      parent: 1
-  - uid: 767
-    components:
-    - type: Transform
-      pos: -3.5,-1.5
-      parent: 1
-  - uid: 768
-    components:
-    - type: Transform
-      pos: 2.5,-1.5
-      parent: 1
-  - uid: 769
-    components:
-    - type: Transform
-      pos: -6.5,-14.5
-      parent: 1
-  - uid: 770
-    components:
-    - type: Transform
-      pos: -5.5,-2.5
-      parent: 1
-  - uid: 771
-    components:
-    - type: Transform
-      pos: 5.5,-6.5
-      parent: 1
-  - uid: 772
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-7.5
-      parent: 1
-  - uid: 773
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-8.5
-      parent: 1
-  - uid: 774
-    components:
-    - type: Transform
-      pos: 4.5,-11.5
-      parent: 1
-  - uid: 775
-    components:
-    - type: Transform
-      pos: -6.5,-13.5
-      parent: 1
-  - uid: 776
-    components:
-    - type: Transform
-      pos: -3.5,-30.5
-      parent: 1
-  - uid: 777
-    components:
-    - type: Transform
-      pos: 6.5,-15.5
-      parent: 1
-  - uid: 778
-    components:
-    - type: Transform
-      pos: 5.5,-13.5
-      parent: 1
-  - uid: 779
-    components:
-    - type: Transform
-      pos: -7.5,-15.5
-      parent: 1
-  - uid: 780
-    components:
-    - type: Transform
-      pos: 1.5,-14.5
-      parent: 1
-  - uid: 781
-    components:
-    - type: Transform
-      pos: -4.5,-18.5
-      parent: 1
-  - uid: 782
-    components:
-    - type: Transform
-      pos: -2.5,-25.5
-      parent: 1
-  - uid: 783
-    components:
-    - type: Transform
-      pos: 0.5,-25.5
-      parent: 1
-  - uid: 785
-    components:
-    - type: Transform
-      pos: -1.5,-22.5
-      parent: 1
-  - uid: 786
-    components:
-    - type: Transform
-      pos: 0.5,-22.5
-      parent: 1
-  - uid: 787
-    components:
-    - type: Transform
-      pos: 1.5,-24.5
-      parent: 1
-  - uid: 788
-    components:
-    - type: Transform
-      pos: 1.5,-23.5
-      parent: 1
-  - uid: 789
-    components:
-    - type: Transform
-      pos: 1.5,-22.5
-      parent: 1
-  - uid: 790
-    components:
-    - type: Transform
-      pos: -2.5,-24.5
-      parent: 1
-  - uid: 791
-    components:
-    - type: Transform
-      pos: -2.5,-23.5
-      parent: 1
-  - uid: 792
-    components:
-    - type: Transform
-      pos: -2.5,-22.5
-      parent: 1
-  - uid: 793
-    components:
-    - type: Transform
-      pos: 5.5,-22.5
-      parent: 1
-  - uid: 794
-    components:
-    - type: Transform
-      pos: -7.5,-14.5
-      parent: 1
-  - uid: 795
-    components:
-    - type: Transform
-      pos: -7.5,-18.5
-      parent: 1
-  - uid: 796
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-28.5
-      parent: 1
-  - uid: 797
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,-28.5
-      parent: 1
-  - uid: 798
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,-28.5
-      parent: 1
-  - uid: 799
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-28.5
-      parent: 1
-  - uid: 800
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-28.5
-      parent: 1
-  - uid: 801
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-28.5
-      parent: 1
-  - uid: 802
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-6.5
-      parent: 1
-  - uid: 803
-    components:
-    - type: Transform
-      pos: 4.5,-27.5
-      parent: 1
-  - uid: 804
-    components:
-    - type: Transform
-      pos: 4.5,-26.5
-      parent: 1
-  - uid: 805
-    components:
-    - type: Transform
-      pos: 4.5,-25.5
-      parent: 1
-  - uid: 806
-    components:
-    - type: Transform
-      pos: 2.5,-4.5
-      parent: 1
-  - uid: 807
-    components:
-    - type: Transform
-      pos: 3.5,-6.5
-      parent: 1
-  - uid: 808
-    components:
-    - type: Transform
-      pos: 2.5,-30.5
-      parent: 1
-  - uid: 809
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-17.5
-      parent: 1
-  - uid: 810
-    components:
-    - type: Transform
-      pos: 3.5,-29.5
-      parent: 1
-  - uid: 811
-    components:
-    - type: Transform
-      pos: -5.5,-29.5
-      parent: 1
-  - uid: 812
-    components:
-    - type: Transform
-      pos: 4.5,-29.5
-      parent: 1
-  - uid: 813
-    components:
-    - type: Transform
-      pos: -4.5,-29.5
-      parent: 1
-  - uid: 814
-    components:
-    - type: Transform
-      pos: 5.5,-29.5
-      parent: 1
-  - uid: 815
-    components:
-    - type: Transform
-      pos: -3.5,-29.5
-      parent: 1
-  - uid: 816
-    components:
-    - type: Transform
-      pos: 2.5,-29.5
-      parent: 1
-  - uid: 817
-    components:
-    - type: Transform
-      pos: 6.5,-14.5
-      parent: 1
-  - uid: 818
-    components:
-    - type: Transform
-      pos: 6.5,-18.5
-      parent: 1
-  - uid: 819
-    components:
-    - type: Transform
-      pos: 5.5,-3.5
-      parent: 1
-  - uid: 820
-    components:
-    - type: Transform
-      pos: -6.5,-29.5
-      parent: 1
-  - uid: 821
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,-30.5
-      parent: 1
-  - uid: 822
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-30.5
-      parent: 1
-  - uid: 823
-    components:
-    - type: Transform
-      pos: 8.5,-15.5
-      parent: 1
-  - uid: 824
-    components:
-    - type: Transform
-      pos: 8.5,-17.5
-      parent: 1
-  - uid: 825
-    components:
-    - type: Transform
-      pos: -9.5,-17.5
-      parent: 1
-  - uid: 826
-    components:
-    - type: Transform
-      pos: -9.5,-15.5
-      parent: 1
-- proto: WarningN2
-  entities:
-  - uid: 827
-    components:
-    - type: Transform
-      pos: 4.5,-25.5
-      parent: 1
-- proto: WarningO2
-  entities:
-  - uid: 828
-    components:
-    - type: Transform
-      pos: 2.5,-25.5
-      parent: 1
-- proto: WarningWaste
-  entities:
-  - uid: 829
-    components:
-    - type: Transform
-      pos: 4.5,-18.5
-      parent: 1
-- proto: WaterCooler
-  entities:
-  - uid: 830
-    components:
-    - type: Transform
-      pos: 0.5,-17.5
-      parent: 1
-- proto: WeaponTurretSyndicate
-  entities:
-  - uid: 24
-    components:
-    - type: Transform
-      pos: -2.5,-6.5
-      parent: 1
-  - uid: 610
-    components:
-    - type: Transform
-      pos: -1.5,-19.5
-      parent: 1
-- proto: WindoorSecure
-  entities:
-  - uid: 831
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-5.5
-      parent: 1
-- proto: Wrench
-  entities:
-  - uid: 832
-    components:
-    - type: Transform
-      pos: 5.4749,-23.512577
-      parent: 1
-  - uid: 833
-    components:
-    - type: Transform
-      pos: 5.63115,-23.481327
-      parent: 1
-  - uid: 834
-    components:
-    - type: Transform
-      pos: 1.6061028,-13.284962
-      parent: 1
-...
+meta:
+  format: 6
+  postmapinit: false
+tilemap:
+  0: Space
+  3: FloorArcadeRed
+  31: FloorDark
+  36: FloorDarkMono
+  40: FloorDarkPlastic
+  56: FloorGreenCircuit
+  79: FloorReinforced
+  88: FloorShuttleRed
+  89: FloorShuttleWhite
+  93: FloorSteel
+  104: FloorSteelMono
+  110: FloorTechMaint3
+  122: FloorWood
+  125: Lattice
+  126: Plating
+entities:
+- proto: ""
+  entities:
+  - uid: 1
+    components:
+    - type: MetaData
+      name: GX-13 Infiltrator
+    - type: Transform
+      pos: 0.64252126,4.1776605
+      parent: invalid
+    - type: Tag
+      tags:
+      - Syndicate
+    - type: MapGrid
+      chunks:
+        -1,-1:
+          ind: -1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAACHwAAAAABHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAWAAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAWAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAWAAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACWAAAAAAAHwAAAAACHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACaAAAAAAAWQAAAAAAHwAAAAADHwAAAAAAHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADWQAAAAAAaAAAAAABWAAAAAAAHwAAAAAAHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADWAAAAAAAHwAAAAACHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        0,-1:
+          ind: 0,-1
+          tiles: HwAAAAABHwAAAAABHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACWAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACWAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABWAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABWAAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADHwAAAAAAHwAAAAAAegAAAAADegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAWAAAAAAAegAAAAAAAwAAAAAAegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADWAAAAAAAfgAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAAAAWAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,-2:
+          ind: -1,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAOAAAAAAAJAAAAAAAOAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAOAAAAAAAJAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAOAAAAAAAJAAAAAAAOAAAAAAAWAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAADWAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAACTwAAAAAAHwAAAAABWAAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAWAAAAAAAfgAAAAAAHwAAAAAAHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAAAWAAAAAAAHwAAAAADHwAAAAAAHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAWAAAAAAAHwAAAAAAWAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAA
+          version: 6
+        0,-2:
+          ind: 0,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABHwAAAAADHwAAAAABHwAAAAADHwAAAAABWAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+    - type: Broadphase
+    - type: Physics
+      bodyStatus: InAir
+      angularDamping: 0.05
+      linearDamping: 0.05
+      fixedRotation: False
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures: {}
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: GridAtmosphere
+      version: 2
+      data:
+        tiles:
+          -1,-4:
+            0: 65535
+          -1,-3:
+            0: 65535
+          -1,-2:
+            0: 65535
+          -1,-1:
+            0: 61439
+          0,-4:
+            0: 65535
+          0,-3:
+            0: 65535
+          0,-2:
+            0: 65535
+          0,-1:
+            0: 65535
+          1,-4:
+            0: 30591
+          1,-3:
+            0: 21879
+            1: 512
+          1,-2:
+            0: 30325
+            2: 256
+          1,-1:
+            0: 55
+          0,-5:
+            0: 65535
+          1,-5:
+            0: 65399
+          -1,-5:
+            0: 65535
+          -3,-4:
+            0: 12
+          -2,-4:
+            0: 61439
+          -2,-2:
+            0: 65516
+          -2,-1:
+            0: 2287
+          -2,-3:
+            0: 35054
+            1: 1536
+          -1,0:
+            0: 8
+          -3,-5:
+            0: 52224
+          -2,-8:
+            0: 65504
+          -2,-7:
+            0: 65535
+          -2,-6:
+            0: 65535
+          -2,-5:
+            0: 65535
+          -1,-8:
+            0: 65526
+          -1,-7:
+            0: 65535
+          -1,-6:
+            0: 65535
+          0,-8:
+            0: 65523
+          0,-7:
+            0: 61303
+            3: 4096
+            4: 136
+          0,-6:
+            3: 1
+            0: 65534
+          1,-8:
+            0: 30512
+          1,-7:
+            0: 30549
+            5: 34
+          1,-6:
+            0: 30583
+          -1,-9:
+            0: 26112
+          0,-9:
+            0: 13056
+          2,-4:
+            0: 1
+          2,-5:
+            0: 4352
+        uniqueMixes:
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.14996
+          moles:
+          - 20.078888
+          - 75.53487
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 20.619795
+          - 77.56971
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 6666.982
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 0
+          - 6666.982
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        chunkSize: 4
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes:
+        - node:
+            color: '#FFFFFFFF'
+            id: Arrows
+          decals:
+            115: -6,-24
+        - node:
+            color: '#FFFFFFFF'
+            id: Bot
+          decals:
+            112: -6,-27
+            113: -6,-26
+            114: -6,-25
+        - node:
+            color: '#79150096'
+            id: Box
+          decals:
+            110: -6,-21
+            111: -5,-21
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelCornerNe
+          decals:
+            10: 0,-4
+            43: 0,-9
+            51: 4,-20
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelCornerNw
+          decals:
+            11: -2,-4
+            42: -2,-9
+            45: -2,-20
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelCornerSe
+          decals:
+            36: 0,-14
+            50: 4,-22
+            76: 3,-18
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelCornerSw
+          decals:
+            37: -2,-14
+            46: -2,-22
+            75: -5,-18
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelLineE
+          decals:
+            6: 0,-7
+            9: 0,-5
+            32: 0,-11
+            33: 0,-10
+            34: 0,-12
+            35: 0,-13
+            52: 4,-21
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelLineN
+          decals:
+            12: -1,-4
+            53: 3,-20
+            54: 2,-20
+            55: 1,-20
+            56: 0,-20
+            63: 0,-16
+            64: 1,-16
+            65: 2,-16
+            66: -2,-16
+            67: -3,-16
+            68: -4,-16
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelLineS
+          decals:
+            47: 0,-22
+            48: 1,-22
+            49: 2,-22
+            69: 2,-18
+            70: 1,-18
+            71: 0,-18
+            72: -2,-18
+            73: -3,-18
+            74: -4,-18
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelLineW
+          decals:
+            7: -2,-7
+            8: -2,-5
+            38: -2,-13
+            39: -2,-12
+            40: -2,-11
+            41: -2,-10
+        - node:
+            color: '#79150096'
+            id: BrickTileWhiteCornerNe
+          decals:
+            104: -5,-22
+        - node:
+            color: '#79150096'
+            id: BrickTileWhiteCornerNw
+          decals:
+            103: -7,-22
+        - node:
+            color: '#79150096'
+            id: BrickTileWhiteCornerSe
+          decals:
+            105: -5,-24
+        - node:
+            color: '#79150096'
+            id: BrickTileWhiteCornerSw
+          decals:
+            106: -7,-24
+        - node:
+            color: '#79150096'
+            id: BrickTileWhiteLineE
+          decals:
+            102: -5,-23
+        - node:
+            color: '#79150096'
+            id: BrickTileWhiteLineN
+          decals:
+            109: -6,-22
+        - node:
+            color: '#79150096'
+            id: BrickTileWhiteLineS
+          decals:
+            107: -6,-24
+        - node:
+            color: '#79150096'
+            id: BrickTileWhiteLineW
+          decals:
+            108: -7,-23
+        - node:
+            color: '#79150096'
+            id: Delivery
+          decals:
+            116: -1,-23
+        - node:
+            color: '#DE3A3A96'
+            id: DeliveryGreyscale
+          decals:
+            13: 1,-6
+            31: -3,-6
+            83: -1,-19
+            84: -3,-21
+            85: -1,-15
+            86: 4,-17
+            87: -6,-17
+            88: -5,-15
+            89: 3,-15
+            90: -1,-8
+        - node:
+            color: '#DE3A3A96'
+            id: HalfTileOverlayGreyscale
+          decals:
+            29: -4,-7
+        - node:
+            color: '#DE3A3A96'
+            id: HalfTileOverlayGreyscale180
+          decals:
+            25: -4,-4
+            26: -5,-4
+        - node:
+            color: '#DE3A3A96'
+            id: HalfTileOverlayGreyscale90
+          decals:
+            27: -6,-6
+            28: -6,-5
+        - node:
+            color: '#DE3A3A96'
+            id: MonoOverlay
+          decals:
+            23: -5,-6
+            24: -4,-5
+        - node:
+            color: '#DE3A3A96'
+            id: WarnCornerGreyscaleNE
+          decals:
+            81: 3,-16
+        - node:
+            color: '#DE3A3A96'
+            id: WarnCornerGreyscaleNW
+          decals:
+            80: -5,-16
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallNE
+          decals:
+            99: -7,-24
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallNW
+          decals:
+            98: -5,-24
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallSE
+          decals:
+            97: -7,-22
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallSW
+          decals:
+            101: -5,-22
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineE
+          decals:
+            3: -4,-23
+            4: -4,-24
+            5: -4,-25
+            95: -7,-23
+        - node:
+            color: '#DE3A3A96'
+            id: WarnLineGreyscaleE
+          decals:
+            78: 3,-17
+        - node:
+            color: '#DE3A3A96'
+            id: WarnLineGreyscaleN
+          decals:
+            44: -1,-9
+            59: -1,-20
+            82: -1,-16
+        - node:
+            color: '#DE3A3A96'
+            id: WarnLineGreyscaleS
+          decals:
+            57: -1,-22
+            60: 3,-22
+            77: -1,-18
+        - node:
+            color: '#DE3A3A96'
+            id: WarnLineGreyscaleW
+          decals:
+            58: -2,-21
+            79: -5,-17
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineN
+          decals:
+            91: -5,-28
+            92: -6,-28
+            93: -7,-28
+            100: -6,-22
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineS
+          decals:
+            94: -5,-23
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineW
+          decals:
+            96: -6,-24
+        - node:
+            angle: 1.5707963267948966 rad
+            color: '#FFFFFFFF'
+            id: WarningLine
+          decals:
+            0: -4,-22
+            1: -4,-21
+            2: -4,-20
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinEndN
+          decals:
+            62: 3,-4
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinEndS
+          decals:
+            61: 3,-5
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo10
+          decals:
+            20: -2,-7
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo11
+          decals:
+            21: -1,-7
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo12
+          decals:
+            22: 0,-7
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo2
+          decals:
+            14: -2,-5
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo3
+          decals:
+            15: -1,-5
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo4
+          decals:
+            16: 0,-5
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo5
+          decals:
+            30: -3,-6
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo6
+          decals:
+            17: -2,-6
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo7
+          decals:
+            18: -1,-6
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo8
+          decals:
+            19: 0,-6
+    - type: IFF
+      color: '#FFC000FF'
+      flags: Hide
+    - type: OccluderTree
+    - type: Shuttle
+    - type: RadiationGridResistance
+    - type: GravityShake
+      shakeTimes: 10
+    - type: GasTileOverlay
+    - type: SpreaderGrid
+    - type: GridPathfinding
+- proto: AirlockExternalGlassShuttleSyndicateLocked
+  entities:
+  - uid: 8
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-16.5
+      parent: 1
+    - type: DeviceLinkSink
+      invokeCounter: 1
+      links:
+      - 13
+    - type: DeviceLinkSource
+      linkedPorts:
+        13:
+        - DoorStatus: Close
+  - uid: 10
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-16.5
+      parent: 1
+    - type: DeviceLinkSink
+      invokeCounter: 1
+      links:
+      - 3
+    - type: DeviceLinkSource
+      linkedPorts:
+        3:
+        - DoorStatus: Close
+- proto: AirlockExternalSyndicateLocked
+  entities:
+  - uid: 2
+    components:
+    - type: Transform
+      pos: -0.5,-25.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 14
+    - type: DeviceLinkSource
+      linkedPorts:
+        14:
+        - DoorStatus: DoorBolt
+  - uid: 3
+    components:
+    - type: Transform
+      pos: -5.5,-16.5
+      parent: 1
+    - type: DeviceLinkSink
+      invokeCounter: 1
+      links:
+      - 10
+    - type: DeviceLinkSource
+      linkedPorts:
+        10:
+        - DoorStatus: Close
+  - uid: 7
+    components:
+    - type: Transform
+      pos: -4.5,-14.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 12
+    - type: DeviceLinkSource
+      linkedPorts:
+        12:
+        - DoorStatus: DoorBolt
+  - uid: 9
+    components:
+    - type: Transform
+      pos: 3.5,-14.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 22
+    - type: DeviceLinkSource
+      linkedPorts:
+        22:
+        - DoorStatus: DoorBolt
+  - uid: 12
+    components:
+    - type: Transform
+      pos: -4.5,-10.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 7
+    - type: DeviceLinkSource
+      linkedPorts:
+        7:
+        - DoorStatus: DoorBolt
+  - uid: 13
+    components:
+    - type: Transform
+      pos: 4.5,-16.5
+      parent: 1
+    - type: DeviceLinkSink
+      invokeCounter: 1
+      links:
+      - 8
+    - type: DeviceLinkSource
+      linkedPorts:
+        8:
+        - DoorStatus: Close
+  - uid: 14
+    components:
+    - type: Transform
+      pos: -0.5,-22.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        2:
+        - DoorStatus: DoorBolt
+  - uid: 22
+    components:
+    - type: Transform
+      pos: 3.5,-10.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 9
+    - type: DeviceLinkSource
+      linkedPorts:
+        9:
+        - DoorStatus: DoorBolt
+- proto: AirlockSyndicateGlassLocked
+  entities:
+  - uid: 4
+    components:
+    - type: Transform
+      pos: -0.5,-7.5
+      parent: 1
+  - uid: 5
+    components:
+    - type: Transform
+      pos: 3.5,-22.5
+      parent: 1
+  - uid: 6
+    components:
+    - type: Transform
+      pos: -0.5,-18.5
+      parent: 1
+  - uid: 17
+    components:
+    - type: Transform
+      pos: -2.5,-20.5
+      parent: 1
+- proto: AirlockSyndicateLocked
+  entities:
+  - uid: 15
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 1
+  - uid: 16
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 1
+- proto: APCBasic
+  entities:
+  - uid: 18
+    components:
+    - type: Transform
+      pos: -3.5,-18.5
+      parent: 1
+  - uid: 19
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-8.5
+      parent: 1
+- proto: AtmosFixNitrogenMarker
+  entities:
+  - uid: 25
+    components:
+    - type: Transform
+      pos: 5.5,-26.5
+      parent: 1
+  - uid: 26
+    components:
+    - type: Transform
+      pos: 5.5,-27.5
+      parent: 1
+- proto: AtmosFixOxygenMarker
+  entities:
+  - uid: 27
+    components:
+    - type: Transform
+      pos: 3.5,-26.5
+      parent: 1
+  - uid: 28
+    components:
+    - type: Transform
+      pos: 3.5,-27.5
+      parent: 1
+- proto: BannerSyndicate
+  entities:
+  - uid: 29
+    components:
+    - type: Transform
+      pos: 2.5,-15.5
+      parent: 1
+  - uid: 30
+    components:
+    - type: Transform
+      pos: -3.5,-15.5
+      parent: 1
+- proto: Bed
+  entities:
+  - uid: 31
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 1
+- proto: BedsheetSyndie
+  entities:
+  - uid: 32
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 1
+- proto: BoxEncryptionKeySyndie
+  entities:
+  - uid: 34
+    components:
+    - type: Transform
+      parent: 33
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: BoxFlashbang
+  entities:
+  - uid: 42
+    components:
+    - type: Transform
+      pos: 0.49331844,-13.366474
+      parent: 1
+- proto: BoxHandcuff
+  entities:
+  - uid: 43
+    components:
+    - type: Transform
+      pos: 1.4510483,-2.399527
+      parent: 1
+- proto: Brutepack
+  entities:
+  - uid: 44
+    components:
+    - type: Transform
+      pos: -3.292087,-4.1600046
+      parent: 1
+  - uid: 45
+    components:
+    - type: Transform
+      pos: -3.354587,-4.4256296
+      parent: 1
+- proto: C4
+  entities:
+  - uid: 46
+    components:
+    - type: Transform
+      pos: 1.7857682,-12.631323
+      parent: 1
+  - uid: 47
+    components:
+    - type: Transform
+      pos: 1.5045182,-12.646948
+      parent: 1
+  - uid: 48
+    components:
+    - type: Transform
+      pos: 1.5982682,-12.646948
+      parent: 1
+  - uid: 49
+    components:
+    - type: Transform
+      pos: 1.4107682,-12.646948
+      parent: 1
+  - uid: 50
+    components:
+    - type: Transform
+      pos: 1.6920182,-12.631323
+      parent: 1
+- proto: CableApcExtension
+  entities:
+  - uid: 51
+    components:
+    - type: Transform
+      pos: -3.5,-18.5
+      parent: 1
+  - uid: 52
+    components:
+    - type: Transform
+      pos: -3.5,-17.5
+      parent: 1
+  - uid: 53
+    components:
+    - type: Transform
+      pos: -3.5,-16.5
+      parent: 1
+  - uid: 54
+    components:
+    - type: Transform
+      pos: -4.5,-16.5
+      parent: 1
+  - uid: 55
+    components:
+    - type: Transform
+      pos: -5.5,-16.5
+      parent: 1
+  - uid: 56
+    components:
+    - type: Transform
+      pos: -6.5,-16.5
+      parent: 1
+  - uid: 57
+    components:
+    - type: Transform
+      pos: -7.5,-16.5
+      parent: 1
+  - uid: 58
+    components:
+    - type: Transform
+      pos: -8.5,-16.5
+      parent: 1
+  - uid: 59
+    components:
+    - type: Transform
+      pos: -6.5,-15.5
+      parent: 1
+  - uid: 60
+    components:
+    - type: Transform
+      pos: -6.5,-17.5
+      parent: 1
+  - uid: 61
+    components:
+    - type: Transform
+      pos: -4.5,-15.5
+      parent: 1
+  - uid: 62
+    components:
+    - type: Transform
+      pos: -4.5,-14.5
+      parent: 1
+  - uid: 63
+    components:
+    - type: Transform
+      pos: -4.5,-13.5
+      parent: 1
+  - uid: 64
+    components:
+    - type: Transform
+      pos: -4.5,-12.5
+      parent: 1
+  - uid: 65
+    components:
+    - type: Transform
+      pos: -4.5,-11.5
+      parent: 1
+  - uid: 66
+    components:
+    - type: Transform
+      pos: -4.5,-10.5
+      parent: 1
+  - uid: 67
+    components:
+    - type: Transform
+      pos: -5.5,-12.5
+      parent: 1
+  - uid: 68
+    components:
+    - type: Transform
+      pos: -6.5,-12.5
+      parent: 1
+  - uid: 69
+    components:
+    - type: Transform
+      pos: -2.5,-16.5
+      parent: 1
+  - uid: 70
+    components:
+    - type: Transform
+      pos: -1.5,-16.5
+      parent: 1
+  - uid: 71
+    components:
+    - type: Transform
+      pos: -0.5,-16.5
+      parent: 1
+  - uid: 72
+    components:
+    - type: Transform
+      pos: 0.5,-16.5
+      parent: 1
+  - uid: 73
+    components:
+    - type: Transform
+      pos: 1.5,-16.5
+      parent: 1
+  - uid: 74
+    components:
+    - type: Transform
+      pos: 2.5,-16.5
+      parent: 1
+  - uid: 75
+    components:
+    - type: Transform
+      pos: 3.5,-16.5
+      parent: 1
+  - uid: 76
+    components:
+    - type: Transform
+      pos: 4.5,-16.5
+      parent: 1
+  - uid: 77
+    components:
+    - type: Transform
+      pos: 5.5,-16.5
+      parent: 1
+  - uid: 78
+    components:
+    - type: Transform
+      pos: 5.5,-15.5
+      parent: 1
+  - uid: 79
+    components:
+    - type: Transform
+      pos: 5.5,-17.5
+      parent: 1
+  - uid: 80
+    components:
+    - type: Transform
+      pos: 6.5,-16.5
+      parent: 1
+  - uid: 81
+    components:
+    - type: Transform
+      pos: 7.5,-16.5
+      parent: 1
+  - uid: 82
+    components:
+    - type: Transform
+      pos: 3.5,-15.5
+      parent: 1
+  - uid: 83
+    components:
+    - type: Transform
+      pos: 3.5,-14.5
+      parent: 1
+  - uid: 84
+    components:
+    - type: Transform
+      pos: 3.5,-13.5
+      parent: 1
+  - uid: 85
+    components:
+    - type: Transform
+      pos: 3.5,-12.5
+      parent: 1
+  - uid: 86
+    components:
+    - type: Transform
+      pos: 3.5,-11.5
+      parent: 1
+  - uid: 87
+    components:
+    - type: Transform
+      pos: 3.5,-11.5
+      parent: 1
+  - uid: 88
+    components:
+    - type: Transform
+      pos: 3.5,-10.5
+      parent: 1
+  - uid: 89
+    components:
+    - type: Transform
+      pos: 4.5,-12.5
+      parent: 1
+  - uid: 90
+    components:
+    - type: Transform
+      pos: 5.5,-12.5
+      parent: 1
+  - uid: 91
+    components:
+    - type: Transform
+      pos: -0.5,-6.5
+      parent: 1
+  - uid: 92
+    components:
+    - type: Transform
+      pos: -0.5,-7.5
+      parent: 1
+  - uid: 93
+    components:
+    - type: Transform
+      pos: -0.5,-8.5
+      parent: 1
+  - uid: 94
+    components:
+    - type: Transform
+      pos: -0.5,-9.5
+      parent: 1
+  - uid: 95
+    components:
+    - type: Transform
+      pos: -0.5,-10.5
+      parent: 1
+  - uid: 96
+    components:
+    - type: Transform
+      pos: -0.5,-11.5
+      parent: 1
+  - uid: 97
+    components:
+    - type: Transform
+      pos: -0.5,-12.5
+      parent: 1
+  - uid: 98
+    components:
+    - type: Transform
+      pos: -0.5,-13.5
+      parent: 1
+  - uid: 99
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 1
+  - uid: 100
+    components:
+    - type: Transform
+      pos: -1.5,-12.5
+      parent: 1
+  - uid: 101
+    components:
+    - type: Transform
+      pos: 0.5,-12.5
+      parent: 1
+  - uid: 102
+    components:
+    - type: Transform
+      pos: -0.5,-5.5
+      parent: 1
+  - uid: 103
+    components:
+    - type: Transform
+      pos: 0.5,-5.5
+      parent: 1
+  - uid: 104
+    components:
+    - type: Transform
+      pos: 1.5,-5.5
+      parent: 1
+  - uid: 105
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 1
+  - uid: 106
+    components:
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 1
+  - uid: 107
+    components:
+    - type: Transform
+      pos: 3.5,-4.5
+      parent: 1
+  - uid: 108
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 1
+  - uid: 109
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 1
+  - uid: 110
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 1
+  - uid: 111
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 1
+  - uid: 112
+    components:
+    - type: Transform
+      pos: 1.5,-2.5
+      parent: 1
+  - uid: 113
+    components:
+    - type: Transform
+      pos: -1.5,-2.5
+      parent: 1
+  - uid: 114
+    components:
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 1
+  - uid: 115
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 1
+  - uid: 116
+    components:
+    - type: Transform
+      pos: -3.5,-4.5
+      parent: 1
+  - uid: 117
+    components:
+    - type: Transform
+      pos: -2.5,-4.5
+      parent: 1
+  - uid: 118
+    components:
+    - type: Transform
+      pos: -4.5,-4.5
+      parent: 1
+  - uid: 119
+    components:
+    - type: Transform
+      pos: -5.5,-4.5
+      parent: 1
+  - uid: 120
+    components:
+    - type: Transform
+      pos: -5.5,-5.5
+      parent: 1
+  - uid: 121
+    components:
+    - type: Transform
+      pos: -5.5,-6.5
+      parent: 1
+  - uid: 122
+    components:
+    - type: Transform
+      pos: -5.5,-3.5
+      parent: 1
+  - uid: 123
+    components:
+    - type: Transform
+      pos: 4.5,-4.5
+      parent: 1
+  - uid: 124
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 1
+  - uid: 125
+    components:
+    - type: Transform
+      pos: 3.5,-6.5
+      parent: 1
+  - uid: 126
+    components:
+    - type: Transform
+      pos: -0.5,-17.5
+      parent: 1
+  - uid: 127
+    components:
+    - type: Transform
+      pos: -3.5,-20.5
+      parent: 1
+  - uid: 128
+    components:
+    - type: Transform
+      pos: -3.5,-19.5
+      parent: 1
+  - uid: 129
+    components:
+    - type: Transform
+      pos: -3.5,-21.5
+      parent: 1
+  - uid: 130
+    components:
+    - type: Transform
+      pos: -4.5,-21.5
+      parent: 1
+  - uid: 131
+    components:
+    - type: Transform
+      pos: -4.5,-22.5
+      parent: 1
+  - uid: 132
+    components:
+    - type: Transform
+      pos: -4.5,-23.5
+      parent: 1
+  - uid: 133
+    components:
+    - type: Transform
+      pos: -4.5,-24.5
+      parent: 1
+  - uid: 134
+    components:
+    - type: Transform
+      pos: -4.5,-25.5
+      parent: 1
+  - uid: 135
+    components:
+    - type: Transform
+      pos: -4.5,-25.5
+      parent: 1
+  - uid: 136
+    components:
+    - type: Transform
+      pos: -4.5,-26.5
+      parent: 1
+  - uid: 137
+    components:
+    - type: Transform
+      pos: -4.5,-27.5
+      parent: 1
+  - uid: 138
+    components:
+    - type: Transform
+      pos: -5.5,-27.5
+      parent: 1
+  - uid: 139
+    components:
+    - type: Transform
+      pos: -6.5,-27.5
+      parent: 1
+  - uid: 140
+    components:
+    - type: Transform
+      pos: -6.5,-26.5
+      parent: 1
+  - uid: 141
+    components:
+    - type: Transform
+      pos: -6.5,-25.5
+      parent: 1
+  - uid: 142
+    components:
+    - type: Transform
+      pos: -6.5,-24.5
+      parent: 1
+  - uid: 143
+    components:
+    - type: Transform
+      pos: -6.5,-23.5
+      parent: 1
+  - uid: 144
+    components:
+    - type: Transform
+      pos: -6.5,-22.5
+      parent: 1
+  - uid: 145
+    components:
+    - type: Transform
+      pos: -2.5,-20.5
+      parent: 1
+  - uid: 146
+    components:
+    - type: Transform
+      pos: -1.5,-20.5
+      parent: 1
+  - uid: 147
+    components:
+    - type: Transform
+      pos: -0.5,-20.5
+      parent: 1
+  - uid: 148
+    components:
+    - type: Transform
+      pos: -0.5,-21.5
+      parent: 1
+  - uid: 149
+    components:
+    - type: Transform
+      pos: -0.5,-23.5
+      parent: 1
+  - uid: 150
+    components:
+    - type: Transform
+      pos: -0.5,-22.5
+      parent: 1
+  - uid: 151
+    components:
+    - type: Transform
+      pos: -0.5,-24.5
+      parent: 1
+  - uid: 152
+    components:
+    - type: Transform
+      pos: -0.5,-25.5
+      parent: 1
+  - uid: 153
+    components:
+    - type: Transform
+      pos: -0.5,-19.5
+      parent: 1
+  - uid: 154
+    components:
+    - type: Transform
+      pos: 0.5,-20.5
+      parent: 1
+  - uid: 155
+    components:
+    - type: Transform
+      pos: 1.5,-20.5
+      parent: 1
+  - uid: 156
+    components:
+    - type: Transform
+      pos: 2.5,-20.5
+      parent: 1
+  - uid: 157
+    components:
+    - type: Transform
+      pos: 3.5,-20.5
+      parent: 1
+  - uid: 158
+    components:
+    - type: Transform
+      pos: 4.5,-20.5
+      parent: 1
+  - uid: 159
+    components:
+    - type: Transform
+      pos: 3.5,-21.5
+      parent: 1
+  - uid: 160
+    components:
+    - type: Transform
+      pos: 3.5,-22.5
+      parent: 1
+  - uid: 161
+    components:
+    - type: Transform
+      pos: 3.5,-23.5
+      parent: 1
+  - uid: 162
+    components:
+    - type: Transform
+      pos: 3.5,-24.5
+      parent: 1
+  - uid: 163
+    components:
+    - type: Transform
+      pos: 3.5,-25.5
+      parent: 1
+  - uid: 164
+    components:
+    - type: Transform
+      pos: 3.5,-26.5
+      parent: 1
+  - uid: 165
+    components:
+    - type: Transform
+      pos: 3.5,-27.5
+      parent: 1
+  - uid: 166
+    components:
+    - type: Transform
+      pos: 4.5,-27.5
+      parent: 1
+  - uid: 167
+    components:
+    - type: Transform
+      pos: 5.5,-27.5
+      parent: 1
+  - uid: 168
+    components:
+    - type: Transform
+      pos: 5.5,-26.5
+      parent: 1
+  - uid: 169
+    components:
+    - type: Transform
+      pos: 5.5,-25.5
+      parent: 1
+  - uid: 170
+    components:
+    - type: Transform
+      pos: 5.5,-24.5
+      parent: 1
+  - uid: 171
+    components:
+    - type: Transform
+      pos: 5.5,-23.5
+      parent: 1
+  - uid: 172
+    components:
+    - type: Transform
+      pos: 0.5,-8.5
+      parent: 1
+  - uid: 173
+    components:
+    - type: Transform
+      pos: 1.5,-26.5
+      parent: 1
+  - uid: 174
+    components:
+    - type: Transform
+      pos: 1.5,-8.5
+      parent: 1
+  - uid: 175
+    components:
+    - type: Transform
+      pos: -0.5,-26.5
+      parent: 1
+  - uid: 176
+    components:
+    - type: Transform
+      pos: -1.5,-26.5
+      parent: 1
+  - uid: 177
+    components:
+    - type: Transform
+      pos: 0.5,-26.5
+      parent: 1
+  - uid: 178
+    components:
+    - type: Transform
+      pos: -2.5,-26.5
+      parent: 1
+  - uid: 179
+    components:
+    - type: Transform
+      pos: -2.5,-27.5
+      parent: 1
+  - uid: 180
+    components:
+    - type: Transform
+      pos: 1.5,-27.5
+      parent: 1
+  - uid: 181
+    components:
+    - type: Transform
+      pos: -6.5,-28.5
+      parent: 1
+  - uid: 182
+    components:
+    - type: Transform
+      pos: -6.5,-29.5
+      parent: 1
+  - uid: 183
+    components:
+    - type: Transform
+      pos: -2.5,-28.5
+      parent: 1
+  - uid: 184
+    components:
+    - type: Transform
+      pos: -2.5,-29.5
+      parent: 1
+  - uid: 185
+    components:
+    - type: Transform
+      pos: -2.5,-30.5
+      parent: 1
+  - uid: 186
+    components:
+    - type: Transform
+      pos: -3.5,-30.5
+      parent: 1
+  - uid: 187
+    components:
+    - type: Transform
+      pos: -4.5,-30.5
+      parent: 1
+  - uid: 188
+    components:
+    - type: Transform
+      pos: -5.5,-30.5
+      parent: 1
+  - uid: 189
+    components:
+    - type: Transform
+      pos: 1.5,-28.5
+      parent: 1
+  - uid: 190
+    components:
+    - type: Transform
+      pos: 1.5,-29.5
+      parent: 1
+  - uid: 191
+    components:
+    - type: Transform
+      pos: 1.5,-30.5
+      parent: 1
+  - uid: 192
+    components:
+    - type: Transform
+      pos: 2.5,-30.5
+      parent: 1
+  - uid: 193
+    components:
+    - type: Transform
+      pos: 3.5,-30.5
+      parent: 1
+  - uid: 194
+    components:
+    - type: Transform
+      pos: 4.5,-30.5
+      parent: 1
+  - uid: 195
+    components:
+    - type: Transform
+      pos: 5.5,-28.5
+      parent: 1
+  - uid: 196
+    components:
+    - type: Transform
+      pos: 5.5,-29.5
+      parent: 1
+- proto: CableHV
+  entities:
+  - uid: 197
+    components:
+    - type: Transform
+      pos: -2.5,-21.5
+      parent: 1
+  - uid: 198
+    components:
+    - type: Transform
+      pos: -4.5,-26.5
+      parent: 1
+  - uid: 199
+    components:
+    - type: Transform
+      pos: -4.5,-27.5
+      parent: 1
+  - uid: 200
+    components:
+    - type: Transform
+      pos: -5.5,-27.5
+      parent: 1
+  - uid: 201
+    components:
+    - type: Transform
+      pos: -6.5,-27.5
+      parent: 1
+  - uid: 202
+    components:
+    - type: Transform
+      pos: -5.5,-23.5
+      parent: 1
+  - uid: 203
+    components:
+    - type: Transform
+      pos: -5.5,-22.5
+      parent: 1
+  - uid: 204
+    components:
+    - type: Transform
+      pos: -5.5,-20.5
+      parent: 1
+  - uid: 205
+    components:
+    - type: Transform
+      pos: -4.5,-20.5
+      parent: 1
+  - uid: 206
+    components:
+    - type: Transform
+      pos: -5.5,-19.5
+      parent: 1
+  - uid: 207
+    components:
+    - type: Transform
+      pos: -4.5,-19.5
+      parent: 1
+  - uid: 208
+    components:
+    - type: Transform
+      pos: -3.5,-19.5
+      parent: 1
+  - uid: 209
+    components:
+    - type: Transform
+      pos: -5.5,-21.5
+      parent: 1
+  - uid: 210
+    components:
+    - type: Transform
+      pos: -6.5,-26.5
+      parent: 1
+  - uid: 211
+    components:
+    - type: Transform
+      pos: -6.5,-25.5
+      parent: 1
+  - uid: 212
+    components:
+    - type: Transform
+      pos: -6.5,-24.5
+      parent: 1
+  - uid: 213
+    components:
+    - type: Transform
+      pos: -4.5,-23.5
+      parent: 1
+  - uid: 214
+    components:
+    - type: Transform
+      pos: -2.5,-20.5
+      parent: 1
+  - uid: 215
+    components:
+    - type: Transform
+      pos: -2.5,-19.5
+      parent: 1
+  - uid: 216
+    components:
+    - type: Transform
+      pos: -4.5,-25.5
+      parent: 1
+  - uid: 217
+    components:
+    - type: Transform
+      pos: -6.5,-23.5
+      parent: 1
+  - uid: 218
+    components:
+    - type: Transform
+      pos: -6.5,-20.5
+      parent: 1
+  - uid: 219
+    components:
+    - type: Transform
+      pos: -4.5,-24.5
+      parent: 1
+  - uid: 220
+    components:
+    - type: Transform
+      pos: -5.5,-18.5
+      parent: 1
+  - uid: 221
+    components:
+    - type: Transform
+      pos: -4.5,-18.5
+      parent: 1
+  - uid: 222
+    components:
+    - type: Transform
+      pos: -3.5,-18.5
+      parent: 1
+  - uid: 223
+    components:
+    - type: Transform
+      pos: -3.5,-21.5
+      parent: 1
+  - uid: 224
+    components:
+    - type: Transform
+      pos: -4.5,-21.5
+      parent: 1
+- proto: CableMV
+  entities:
+  - uid: 225
+    components:
+    - type: Transform
+      pos: -3.5,-19.5
+      parent: 1
+  - uid: 226
+    components:
+    - type: Transform
+      pos: -3.5,-18.5
+      parent: 1
+  - uid: 227
+    components:
+    - type: Transform
+      pos: -3.5,-17.5
+      parent: 1
+  - uid: 228
+    components:
+    - type: Transform
+      pos: -3.5,-16.5
+      parent: 1
+  - uid: 229
+    components:
+    - type: Transform
+      pos: -2.5,-16.5
+      parent: 1
+  - uid: 230
+    components:
+    - type: Transform
+      pos: -0.5,-16.5
+      parent: 1
+  - uid: 231
+    components:
+    - type: Transform
+      pos: -1.5,-16.5
+      parent: 1
+  - uid: 232
+    components:
+    - type: Transform
+      pos: -0.5,-15.5
+      parent: 1
+  - uid: 233
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 1
+  - uid: 234
+    components:
+    - type: Transform
+      pos: -0.5,-13.5
+      parent: 1
+  - uid: 235
+    components:
+    - type: Transform
+      pos: -0.5,-12.5
+      parent: 1
+  - uid: 236
+    components:
+    - type: Transform
+      pos: -0.5,-11.5
+      parent: 1
+  - uid: 237
+    components:
+    - type: Transform
+      pos: -0.5,-10.5
+      parent: 1
+  - uid: 238
+    components:
+    - type: Transform
+      pos: -0.5,-9.5
+      parent: 1
+  - uid: 239
+    components:
+    - type: Transform
+      pos: -0.5,-8.5
+      parent: 1
+  - uid: 240
+    components:
+    - type: Transform
+      pos: -3.5,-20.5
+      parent: 1
+  - uid: 241
+    components:
+    - type: Transform
+      pos: -3.5,-21.5
+      parent: 1
+  - uid: 242
+    components:
+    - type: Transform
+      pos: -4.5,-21.5
+      parent: 1
+  - uid: 243
+    components:
+    - type: Transform
+      pos: -4.5,-22.5
+      parent: 1
+  - uid: 244
+    components:
+    - type: Transform
+      pos: -4.5,-23.5
+      parent: 1
+  - uid: 245
+    components:
+    - type: Transform
+      pos: -4.5,-24.5
+      parent: 1
+  - uid: 246
+    components:
+    - type: Transform
+      pos: -4.5,-25.5
+      parent: 1
+  - uid: 247
+    components:
+    - type: Transform
+      pos: -4.5,-26.5
+      parent: 1
+  - uid: 248
+    components:
+    - type: Transform
+      pos: -4.5,-27.5
+      parent: 1
+  - uid: 249
+    components:
+    - type: Transform
+      pos: 1.5,-8.5
+      parent: 1
+  - uid: 250
+    components:
+    - type: Transform
+      pos: 0.5,-8.5
+      parent: 1
+- proto: CableTerminal
+  entities:
+  - uid: 251
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-20.5
+      parent: 1
+    - type: Physics
+      canCollide: False
+    - type: Fixtures
+      fixtures: {}
+  - uid: 252
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-20.5
+      parent: 1
+    - type: Physics
+      canCollide: False
+    - type: Fixtures
+      fixtures: {}
+- proto: Carpet
+  entities:
+  - uid: 253
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-5.5
+      parent: 1
+  - uid: 254
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-4.5
+      parent: 1
+- proto: Catwalk
+  entities:
+  - uid: 255
+    components:
+    - type: Transform
+      pos: -2.5,-26.5
+      parent: 1
+  - uid: 256
+    components:
+    - type: Transform
+      pos: -2.5,-28.5
+      parent: 1
+  - uid: 257
+    components:
+    - type: Transform
+      pos: -8.5,-16.5
+      parent: 1
+  - uid: 258
+    components:
+    - type: Transform
+      pos: -1.5,-16.5
+      parent: 1
+  - uid: 259
+    components:
+    - type: Transform
+      pos: -2.5,-16.5
+      parent: 1
+  - uid: 260
+    components:
+    - type: Transform
+      pos: 4.5,-24.5
+      parent: 1
+  - uid: 261
+    components:
+    - type: Transform
+      pos: 5.5,-24.5
+      parent: 1
+  - uid: 262
+    components:
+    - type: Transform
+      pos: -6.5,-16.5
+      parent: 1
+  - uid: 263
+    components:
+    - type: Transform
+      pos: -7.5,-16.5
+      parent: 1
+  - uid: 264
+    components:
+    - type: Transform
+      pos: -4.5,-13.5
+      parent: 1
+  - uid: 265
+    components:
+    - type: Transform
+      pos: -4.5,-12.5
+      parent: 1
+  - uid: 266
+    components:
+    - type: Transform
+      pos: -4.5,-11.5
+      parent: 1
+  - uid: 267
+    components:
+    - type: Transform
+      pos: 3.5,-13.5
+      parent: 1
+  - uid: 268
+    components:
+    - type: Transform
+      pos: 3.5,-12.5
+      parent: 1
+  - uid: 269
+    components:
+    - type: Transform
+      pos: 3.5,-11.5
+      parent: 1
+  - uid: 270
+    components:
+    - type: Transform
+      pos: 5.5,-16.5
+      parent: 1
+  - uid: 271
+    components:
+    - type: Transform
+      pos: 6.5,-16.5
+      parent: 1
+  - uid: 272
+    components:
+    - type: Transform
+      pos: -0.5,-24.5
+      parent: 1
+  - uid: 273
+    components:
+    - type: Transform
+      pos: -0.5,-23.5
+      parent: 1
+  - uid: 274
+    components:
+    - type: Transform
+      pos: -0.5,-16.5
+      parent: 1
+  - uid: 275
+    components:
+    - type: Transform
+      pos: 5.5,-9.5
+      parent: 1
+  - uid: 276
+    components:
+    - type: Transform
+      pos: 3.5,-9.5
+      parent: 1
+  - uid: 277
+    components:
+    - type: Transform
+      pos: 0.5,-16.5
+      parent: 1
+  - uid: 278
+    components:
+    - type: Transform
+      pos: 0.5,-26.5
+      parent: 1
+  - uid: 279
+    components:
+    - type: Transform
+      pos: 1.5,-27.5
+      parent: 1
+  - uid: 280
+    components:
+    - type: Transform
+      pos: -2.5,-27.5
+      parent: 1
+  - uid: 281
+    components:
+    - type: Transform
+      pos: -2.5,-29.5
+      parent: 1
+  - uid: 282
+    components:
+    - type: Transform
+      pos: 1.5,-26.5
+      parent: 1
+  - uid: 283
+    components:
+    - type: Transform
+      pos: 4.5,-9.5
+      parent: 1
+  - uid: 284
+    components:
+    - type: Transform
+      pos: -0.5,-26.5
+      parent: 1
+  - uid: 285
+    components:
+    - type: Transform
+      pos: 1.5,-28.5
+      parent: 1
+  - uid: 286
+    components:
+    - type: Transform
+      pos: 1.5,-29.5
+      parent: 1
+  - uid: 287
+    components:
+    - type: Transform
+      pos: -1.5,-26.5
+      parent: 1
+  - uid: 288
+    components:
+    - type: Transform
+      pos: -3.5,-9.5
+      parent: 1
+  - uid: 289
+    components:
+    - type: Transform
+      pos: 1.5,-16.5
+      parent: 1
+  - uid: 290
+    components:
+    - type: Transform
+      pos: 2.5,-9.5
+      parent: 1
+  - uid: 291
+    components:
+    - type: Transform
+      pos: -6.5,-9.5
+      parent: 1
+  - uid: 292
+    components:
+    - type: Transform
+      pos: -5.5,-9.5
+      parent: 1
+  - uid: 293
+    components:
+    - type: Transform
+      pos: -4.5,-9.5
+      parent: 1
+  - uid: 294
+    components:
+    - type: Transform
+      pos: 7.5,-16.5
+      parent: 1
+  - uid: 295
+    components:
+    - type: Transform
+      pos: -0.5,-13.5
+      parent: 1
+  - uid: 296
+    components:
+    - type: Transform
+      pos: -0.5,-12.5
+      parent: 1
+  - uid: 297
+    components:
+    - type: Transform
+      pos: -0.5,-11.5
+      parent: 1
+- proto: Chair
+  entities:
+  - uid: 298
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-21.5
+      parent: 1
+  - uid: 299
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-21.5
+      parent: 1
+- proto: ChairOfficeDark
+  entities:
+  - uid: 300
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-3.5
+      parent: 1
+- proto: ChairPilotSeat
+  entities:
+  - uid: 301
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-21.5
+      parent: 1
+  - uid: 302
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-8.5
+      parent: 1
+  - uid: 303
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-9.5
+      parent: 1
+  - uid: 304
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-10.5
+      parent: 1
+  - uid: 305
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-8.5
+      parent: 1
+  - uid: 306
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-10.5
+      parent: 1
+  - uid: 307
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-9.5
+      parent: 1
+  - uid: 308
+    components:
+    - type: Transform
+      pos: -2.5,-15.5
+      parent: 1
+  - uid: 309
+    components:
+    - type: Transform
+      pos: -1.5,-15.5
+      parent: 1
+  - uid: 310
+    components:
+    - type: Transform
+      pos: 0.5,-15.5
+      parent: 1
+  - uid: 311
+    components:
+    - type: Transform
+      pos: 1.5,-15.5
+      parent: 1
+  - uid: 312
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-3.5
+      parent: 1
+- proto: CigPackSyndicate
+  entities:
+  - uid: 313
+    components:
+    - type: Transform
+      pos: -3.5658307,-17.516623
+      parent: 1
+- proto: ClothingBackpackDuffelSyndicateFilledMedical
+  entities:
+  - uid: 314
+    components:
+    - type: Transform
+      pos: -3.5044222,-6.293252
+      parent: 1
+- proto: ClothingHeadHatSyndie
+  entities:
+  - uid: 315
+    components:
+    - type: Transform
+      pos: -3.1200604,-17.289778
+      parent: 1
+- proto: ClothingHeadHatSyndieMAA
+  entities:
+  - uid: 35
+    components:
+    - type: Transform
+      parent: 33
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingHeadPyjamaSyndicateRed
+  entities:
+  - uid: 36
+    components:
+    - type: Transform
+      parent: 33
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingHeadsetAltSyndicate
+  entities:
+  - uid: 316
+    components:
+    - type: Transform
+      pos: 1.3157192,-13.513277
+      parent: 1
+- proto: ClothingMaskGasSyndicate
+  entities:
+  - uid: 317
+    components:
+    - type: Transform
+      pos: 0.94071925,-13.482027
+      parent: 1
+- proto: ClothingNeckMantleHOS
+  entities:
+  - uid: 37
+    components:
+    - type: MetaData
+      desc: Looted from a fallen enemy, the commander earned this in battle.
+      name: commander mantle
+    - type: Transform
+      parent: 33
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingOuterCoatSyndieCap
+  entities:
+  - uid: 38
+    components:
+    - type: Transform
+      parent: 33
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingUniformJumpskirtSyndieFormalDress
+  entities:
+  - uid: 39
+    components:
+    - type: Transform
+      parent: 33
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingUniformJumpsuitPyjamaSyndicateRed
+  entities:
+  - uid: 40
+    components:
+    - type: Transform
+      parent: 33
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingUniformJumpsuitSyndieFormal
+  entities:
+  - uid: 41
+    components:
+    - type: Transform
+      parent: 33
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ComfyChair
+  entities:
+  - uid: 318
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-4.5
+      parent: 1
+- proto: computerBodyScanner
+  entities:
+  - uid: 319
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-5.5
+      parent: 1
+- proto: ComputerIFFSyndicate
+  entities:
+  - uid: 320
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-3.5
+      parent: 1
+- proto: ComputerPowerMonitoring
+  entities:
+  - uid: 321
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-21.5
+      parent: 1
+- proto: ComputerRadar
+  entities:
+  - uid: 322
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 1
+- proto: ComputerShuttleSyndie
+  entities:
+  - uid: 323
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 1
+- proto: CrowbarRed
+  entities:
+  - uid: 324
+    components:
+    - type: Transform
+      pos: -3.492848,-22.485775
+      parent: 1
+- proto: DisposalBend
+  entities:
+  - uid: 325
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-6.5
+      parent: 1
+- proto: DisposalJunction
+  entities:
+  - uid: 326
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-19.5
+      parent: 1
+- proto: DisposalPipe
+  entities:
+  - uid: 327
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-6.5
+      parent: 1
+  - uid: 328
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-19.5
+      parent: 1
+  - uid: 329
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-19.5
+      parent: 1
+  - uid: 330
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-19.5
+      parent: 1
+  - uid: 331
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-19.5
+      parent: 1
+  - uid: 332
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-19.5
+      parent: 1
+  - uid: 333
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-19.5
+      parent: 1
+  - uid: 334
+    components:
+    - type: Transform
+      pos: -0.5,-18.5
+      parent: 1
+  - uid: 335
+    components:
+    - type: Transform
+      pos: -0.5,-17.5
+      parent: 1
+  - uid: 336
+    components:
+    - type: Transform
+      pos: -0.5,-16.5
+      parent: 1
+  - uid: 337
+    components:
+    - type: Transform
+      pos: -0.5,-15.5
+      parent: 1
+  - uid: 338
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 1
+  - uid: 339
+    components:
+    - type: Transform
+      pos: -0.5,-13.5
+      parent: 1
+  - uid: 340
+    components:
+    - type: Transform
+      pos: -0.5,-12.5
+      parent: 1
+  - uid: 341
+    components:
+    - type: Transform
+      pos: -0.5,-11.5
+      parent: 1
+  - uid: 342
+    components:
+    - type: Transform
+      pos: -0.5,-10.5
+      parent: 1
+  - uid: 343
+    components:
+    - type: Transform
+      pos: -0.5,-9.5
+      parent: 1
+  - uid: 344
+    components:
+    - type: Transform
+      pos: -0.5,-8.5
+      parent: 1
+  - uid: 345
+    components:
+    - type: Transform
+      pos: -0.5,-7.5
+      parent: 1
+- proto: DisposalTrunk
+  entities:
+  - uid: 346
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-6.5
+      parent: 1
+  - uid: 347
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-19.5
+      parent: 1
+  - uid: 348
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-19.5
+      parent: 1
+- proto: DisposalUnit
+  entities:
+  - uid: 349
+    components:
+    - type: Transform
+      pos: 1.5,-6.5
+      parent: 1
+  - uid: 350
+    components:
+    - type: Transform
+      pos: 0.5,-19.5
+      parent: 1
+- proto: DoubleEmergencyOxygenTankFilled
+  entities:
+  - uid: 351
+    components:
+    - type: Transform
+      pos: -1.6924903,-23.407444
+      parent: 1
+  - uid: 352
+    components:
+    - type: Transform
+      pos: -1.4112403,-23.458082
+      parent: 1
+  - uid: 353
+    components:
+    - type: Transform
+      pos: 5.390987,-17.346693
+      parent: 1
+  - uid: 354
+    components:
+    - type: Transform
+      pos: -6.6334953,-17.346693
+      parent: 1
+- proto: DrinkGlass
+  entities:
+  - uid: 355
+    components:
+    - type: Transform
+      pos: 2.0779252,-19.21155
+      parent: 1
+  - uid: 356
+    components:
+    - type: Transform
+      pos: 2.3123002,-19.21155
+      parent: 1
+- proto: DrinkMugDog
+  entities:
+  - uid: 357
+    components:
+    - type: Transform
+      pos: 2.2843437,-19.542192
+      parent: 1
+- proto: DrinkMugMetal
+  entities:
+  - uid: 358
+    components:
+    - type: Transform
+      pos: 2.0968437,-19.526567
+      parent: 1
+- proto: DrinkMugRed
+  entities:
+  - uid: 359
+    components:
+    - type: Transform
+      pos: 1.9918958,-17.588755
+      parent: 1
+- proto: DrinkVacuumFlask
+  entities:
+  - uid: 360
+    components:
+    - type: Transform
+      pos: 5.6435027,-21.180143
+      parent: 1
+  - uid: 361
+    components:
+    - type: Transform
+      pos: 5.7372527,-21.398893
+      parent: 1
+- proto: ExtendedEmergencyOxygenTankFilled
+  entities:
+  - uid: 362
+    components:
+    - type: Transform
+      pos: -5.678572,-12.319441
+      parent: 1
+  - uid: 363
+    components:
+    - type: Transform
+      pos: 4.305803,-12.272566
+      parent: 1
+- proto: FireAxeFlaming
+  entities:
+  - uid: 23
+    components:
+    - type: Transform
+      pos: -1.5018963,-3.4569345
+      parent: 1
+- proto: FoodBoxDonkpocketPizza
+  entities:
+  - uid: 364
+    components:
+    - type: Transform
+      pos: 2.7185502,-19.320925
+      parent: 1
+- proto: FoodBoxDonut
+  entities:
+  - uid: 365
+    components:
+    - type: Transform
+      pos: 5.5401826,-21.187487
+      parent: 1
+- proto: FoodPizzaDonkpocket
+  entities:
+  - uid: 366
+    components:
+    - type: Transform
+      pos: 1.4776825,-21.296862
+      parent: 1
+- proto: FoodSnackSyndi
+  entities:
+  - uid: 367
+    components:
+    - type: Transform
+      pos: 1.5361897,-17.367903
+      parent: 1
+- proto: GasMinerNitrogen
+  entities:
+  - uid: 368
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-27.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+- proto: GasMinerOxygen
+  entities:
+  - uid: 369
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-27.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+- proto: GasMixer
+  entities:
+  - uid: 370
+    components:
+    - type: MetaData
+      name: O2+N2 mixer
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-24.5
+      parent: 1
+    - type: GasMixer
+      inletTwoConcentration: 0.78
+      inletOneConcentration: 0.22
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+- proto: GasPassiveVent
+  entities:
+  - uid: 371
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-26.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+  - uid: 372
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-26.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+  - uid: 373
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-19.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+- proto: GasPipeBend
+  entities:
+  - uid: 374
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 375
+    components:
+    - type: Transform
+      pos: 5.5,-24.5
+      parent: 1
+  - uid: 376
+    components:
+    - type: Transform
+      pos: 3.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 377
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 378
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 379
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 380
+    components:
+    - type: Transform
+      pos: 0.5,-8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 381
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 382
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 383
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GasPipeFourway
+  entities:
+  - uid: 384
+    components:
+    - type: Transform
+      pos: 3.5,-23.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 385
+    components:
+    - type: Transform
+      pos: -0.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 386
+    components:
+    - type: Transform
+      pos: -0.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 387
+    components:
+    - type: Transform
+      pos: 0.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GasPipeStraight
+  entities:
+  - uid: 388
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-25.5
+      parent: 1
+  - uid: 389
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-25.5
+      parent: 1
+  - uid: 390
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-24.5
+      parent: 1
+  - uid: 391
+    components:
+    - type: Transform
+      pos: 3.5,-22.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 392
+    components:
+    - type: Transform
+      pos: 3.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 393
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 394
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 395
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 396
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 397
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 398
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 399
+    components:
+    - type: Transform
+      pos: -0.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 400
+    components:
+    - type: Transform
+      pos: -0.5,-18.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 401
+    components:
+    - type: Transform
+      pos: -0.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 402
+    components:
+    - type: Transform
+      pos: -0.5,-15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 403
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 404
+    components:
+    - type: Transform
+      pos: -0.5,-13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 405
+    components:
+    - type: Transform
+      pos: -0.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 406
+    components:
+    - type: Transform
+      pos: -0.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 407
+    components:
+    - type: Transform
+      pos: -0.5,-9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 408
+    components:
+    - type: Transform
+      pos: -0.5,-8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 409
+    components:
+    - type: Transform
+      pos: -0.5,-7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 410
+    components:
+    - type: Transform
+      pos: -0.5,-6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 411
+    components:
+    - type: Transform
+      pos: 0.5,-18.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 412
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 413
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 414
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 415
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 416
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 417
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 418
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-19.5
+      parent: 1
+  - uid: 419
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 420
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 421
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 422
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 423
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 424
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 425
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 426
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 427
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 428
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 429
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 430
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-14.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 431
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 432
+    components:
+    - type: Transform
+      pos: 0.5,-11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 433
+    components:
+    - type: Transform
+      pos: 0.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 434
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 435
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 436
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 437
+    components:
+    - type: Transform
+      pos: 0.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 438
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 439
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 440
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 441
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 442
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+- proto: GasPipeTJunction
+  entities:
+  - uid: 443
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 444
+    components:
+    - type: Transform
+      pos: 2.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 445
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 446
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GasPort
+  entities:
+  - uid: 447
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-23.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+- proto: GasPressurePump
+  entities:
+  - uid: 448
+    components:
+    - type: MetaData
+      name: waste pump
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-19.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GasVentPump
+  entities:
+  - uid: 449
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-11.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 450
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-21.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 451
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-23.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 452
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-21.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 453
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-16.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 454
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-16.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 455
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+- proto: GasVentScrubber
+  entities:
+  - uid: 456
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-12.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 457
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-17.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 458
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-20.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 459
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-17.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 460
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-21.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 461
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GeneratorBasic15kW
+  entities:
+  - uid: 462
+    components:
+    - type: Transform
+      pos: -4.5,-26.5
+      parent: 1
+  - uid: 463
+    components:
+    - type: Transform
+      pos: -4.5,-25.5
+      parent: 1
+  - uid: 464
+    components:
+    - type: Transform
+      pos: -4.5,-24.5
+      parent: 1
+  - uid: 465
+    components:
+    - type: Transform
+      pos: -6.5,-24.5
+      parent: 1
+  - uid: 466
+    components:
+    - type: Transform
+      pos: -6.5,-25.5
+      parent: 1
+  - uid: 467
+    components:
+    - type: Transform
+      pos: -6.5,-26.5
+      parent: 1
+- proto: GeneratorWallmountAPU
+  entities:
+  - uid: 468
+    components:
+    - type: Transform
+      pos: -6.5,-20.5
+      parent: 1
+- proto: GravityGeneratorMini
+  entities:
+  - uid: 469
+    components:
+    - type: Transform
+      pos: -5.5,-22.5
+      parent: 1
+- proto: Grille
+  entities:
+  - uid: 470
+    components:
+    - type: Transform
+      pos: 2.5,-12.5
+      parent: 1
+  - uid: 471
+    components:
+    - type: Transform
+      pos: -3.5,-12.5
+      parent: 1
+  - uid: 472
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-7.5
+      parent: 1
+  - uid: 473
+    components:
+    - type: Transform
+      pos: -2.5,-1.5
+      parent: 1
+  - uid: 474
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 1
+  - uid: 475
+    components:
+    - type: Transform
+      pos: -4.5,-2.5
+      parent: 1
+  - uid: 476
+    components:
+    - type: Transform
+      pos: -6.5,-4.5
+      parent: 1
+  - uid: 477
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 1
+  - uid: 478
+    components:
+    - type: Transform
+      pos: -1.5,-1.5
+      parent: 1
+  - uid: 479
+    components:
+    - type: Transform
+      pos: 5.5,-4.5
+      parent: 1
+  - uid: 480
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 1
+  - uid: 481
+    components:
+    - type: Transform
+      pos: 1.5,-9.5
+      parent: 1
+  - uid: 482
+    components:
+    - type: Transform
+      pos: -2.5,-9.5
+      parent: 1
+  - uid: 483
+    components:
+    - type: Transform
+      pos: 1.5,-1.5
+      parent: 1
+  - uid: 484
+    components:
+    - type: Transform
+      pos: -2.5,-21.5
+      parent: 1
+  - uid: 485
+    components:
+    - type: Transform
+      pos: -2.5,-19.5
+      parent: 1
+  - uid: 486
+    components:
+    - type: Transform
+      pos: 2.5,-22.5
+      parent: 1
+  - uid: 487
+    components:
+    - type: Transform
+      pos: 4.5,-22.5
+      parent: 1
+  - uid: 488
+    components:
+    - type: Transform
+      pos: -1.5,-18.5
+      parent: 1
+  - uid: 489
+    components:
+    - type: Transform
+      pos: 0.5,-7.5
+      parent: 1
+  - uid: 490
+    components:
+    - type: Transform
+      pos: 3.5,-25.5
+      parent: 1
+  - uid: 491
+    components:
+    - type: Transform
+      pos: 5.5,-25.5
+      parent: 1
+  - uid: 492
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-19.5
+      parent: 1
+  - uid: 493
+    components:
+    - type: Transform
+      pos: 0.5,-18.5
+      parent: 1
+- proto: Gyroscope
+  entities:
+  - uid: 494
+    components:
+    - type: Transform
+      pos: -5.5,-13.5
+      parent: 1
+  - uid: 495
+    components:
+    - type: Transform
+      pos: 4.5,-13.5
+      parent: 1
+- proto: HospitalCurtainsOpen
+  entities:
+  - uid: 496
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 1
+- proto: SyndicateMicrowave
+  entities:
+  - uid: 497
+    components:
+    - type: Transform
+      pos: 3.5,-19.5
+      parent: 1
+- proto: KnifePlastic
+  entities:
+  - uid: 498
+    components:
+    - type: Transform
+      pos: 5.3509636,-21.445768
+      parent: 1
+- proto: Lamp
+  entities:
+  - uid: 499
+    components:
+    - type: Transform
+      pos: -1.483297,-2.2444057
+      parent: 1
+- proto: LockerSyndicatePersonal
+  entities:
+  - uid: 33
+    components:
+    - type: Transform
+      pos: 4.5,-5.5
+      parent: 1
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.1496
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 37
+          - 39
+          - 36
+          - 40
+          - 41
+          - 38
+          - 35
+          - 34
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+- proto: MedicalBed
+  entities:
+  - uid: 500
+    components:
+    - type: Transform
+      pos: -4.5,-3.5
+      parent: 1
+- proto: MedkitCombatFilled
+  entities:
+  - uid: 501
+    components:
+    - type: Transform
+      pos: -3.401462,-3.5350046
+      parent: 1
+  - uid: 502
+    components:
+    - type: Transform
+      pos: -3.557712,-3.4256296
+      parent: 1
+- proto: Mirror
+  entities:
+  - uid: 503
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 1
+- proto: Multitool
+  entities:
+  - uid: 504
+    components:
+    - type: Transform
+      pos: -3.383473,-22.548275
+      parent: 1
+- proto: NitrogenTankFilled
+  entities:
+  - uid: 505
+    components:
+    - type: Transform
+      pos: 4.633928,-12.616316
+      parent: 1
+  - uid: 506
+    components:
+    - type: Transform
+      pos: -5.397322,-12.569441
+      parent: 1
+  - uid: 507
+    components:
+    - type: Transform
+      pos: -6.3522453,-17.549818
+      parent: 1
+  - uid: 508
+    components:
+    - type: Transform
+      pos: 5.6633797,-17.565443
+      parent: 1
+- proto: NuclearBombUnanchored
+  entities:
+  - uid: 509
+    components:
+    - type: Transform
+      pos: -2.5,-12.5
+      parent: 1
+- proto: NukeCodePaper
+  entities:
+  - uid: 510
+    components:
+    - type: Transform
+      pos: -2.5286522,-11.44479
+      parent: 1
+- proto: Ointment
+  entities:
+  - uid: 511
+    components:
+    - type: Transform
+      pos: -3.651462,-4.5193796
+      parent: 1
+  - uid: 512
+    components:
+    - type: Transform
+      pos: -3.667087,-4.2225046
+      parent: 1
+- proto: OperatingTable
+  entities:
+  - uid: 513
+    components:
+    - type: Transform
+      pos: -5.5,-4.5
+      parent: 1
+- proto: OxygenCanister
+  entities:
+  - uid: 514
+    components:
+    - type: Transform
+      pos: -1.5,-24.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+- proto: OxygenTankFilled
+  entities:
+  - uid: 515
+    components:
+    - type: Transform
+      pos: -5.600447,-12.569441
+      parent: 1
+  - uid: 516
+    components:
+    - type: Transform
+      pos: 4.399553,-12.522566
+      parent: 1
+  - uid: 517
+    components:
+    - type: Transform
+      pos: 5.5227547,-17.440443
+      parent: 1
+  - uid: 518
+    components:
+    - type: Transform
+      pos: -6.4928703,-17.440443
+      parent: 1
+- proto: PinpointerNuclear
+  entities:
+  - uid: 519
+    components:
+    - type: Transform
+      pos: -2.4942985,-13.37949
+      parent: 1
+- proto: PlasmaReinforcedWindowDirectional
+  entities:
+  - uid: 520
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-4.5
+      parent: 1
+  - uid: 521
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-6.5
+      parent: 1
+  - uid: 522
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-3.5
+      parent: 1
+- proto: PlushieNuke
+  entities:
+  - uid: 523
+    components:
+    - type: Transform
+      pos: -2.4227936,-2.3320491
+      parent: 1
+- proto: PosterContrabandC20r
+  entities:
+  - uid: 524
+    components:
+    - type: Transform
+      pos: 1.5,-14.5
+      parent: 1
+- proto: PosterContrabandCC64KAd
+  entities:
+  - uid: 525
+    components:
+    - type: Transform
+      pos: -5.5,-18.5
+      parent: 1
+- proto: PosterContrabandCybersun600
+  entities:
+  - uid: 526
+    components:
+    - type: Transform
+      pos: 2.5,-6.5
+      parent: 1
+- proto: PosterContrabandDonk
+  entities:
+  - uid: 527
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-18.5
+      parent: 1
+- proto: PosterContrabandDonutCorp
+  entities:
+  - uid: 528
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-22.5
+      parent: 1
+- proto: PosterContrabandEnergySwords
+  entities:
+  - uid: 529
+    components:
+    - type: Transform
+      pos: 2.5,-18.5
+      parent: 1
+- proto: PosterContrabandEnlistGorlex
+  entities:
+  - uid: 530
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-13.5
+      parent: 1
+- proto: PosterContrabandFreeSyndicateEncryptionKey
+  entities:
+  - uid: 531
+    components:
+    - type: Transform
+      pos: -2.5,-8.5
+      parent: 1
+- proto: PosterContrabandInterdyne
+  entities:
+  - uid: 532
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-6.5
+      parent: 1
+- proto: PosterContrabandKosmicheskayaStantsiya
+  entities:
+  - uid: 533
+    components:
+    - type: Transform
+      pos: -2.5,-22.5
+      parent: 1
+- proto: PosterContrabandMoth
+  entities:
+  - uid: 534
+    components:
+    - type: Transform
+      pos: -2.5,-14.5
+      parent: 1
+  - uid: 535
+    components:
+    - type: Transform
+      pos: 2.5,-3.5
+      parent: 1
+- proto: PosterContrabandNuclearDeviceInformational
+  entities:
+  - uid: 536
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-13.5
+      parent: 1
+  - uid: 537
+    components:
+    - type: Transform
+      pos: 0.5,-14.5
+      parent: 1
+- proto: PosterContrabandSyndicatePistol
+  entities:
+  - uid: 538
+    components:
+    - type: Transform
+      pos: 1.5,-10.5
+      parent: 1
+- proto: PosterContrabandSyndicateRecruitment
+  entities:
+  - uid: 539
+    components:
+    - type: Transform
+      pos: -1.5,-14.5
+      parent: 1
+- proto: PosterContrabandWaffleCorp
+  entities:
+  - uid: 540
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-23.5
+      parent: 1
+- proto: Poweredlight
+  entities:
+  - uid: 541
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-8.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 542
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-4.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 543
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-23.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 544
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-26.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 545
+    components:
+    - type: Transform
+      pos: -4.5,-19.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 546
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-13.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 547
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-27.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 548
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-27.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 549
+    components:
+    - type: Transform
+      pos: 2.5,-15.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 550
+    components:
+    - type: Transform
+      pos: -3.5,-15.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 551
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-5.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 552
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-2.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 553
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-6.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+- proto: PoweredSmallLight
+  entities:
+  - uid: 554
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-13.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 555
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-21.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 556
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-5.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 557
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-24.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 558
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-13.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 559
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-24.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 560
+    components:
+    - type: Transform
+      pos: -6.5,-15.5
+      parent: 1
+  - uid: 561
+    components:
+    - type: Transform
+      pos: 5.5,-15.5
+      parent: 1
+  - uid: 562
+    components:
+    - type: Transform
+      pos: 2.5,-19.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 563
+    components:
+    - type: Transform
+      pos: -1.5,-26.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 564
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-9.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 565
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-9.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+- proto: Rack
+  entities:
+  - uid: 566
+    components:
+    - type: Transform
+      pos: -3.5,-22.5
+      parent: 1
+  - uid: 567
+    components:
+    - type: Transform
+      pos: 5.5,-23.5
+      parent: 1
+  - uid: 568
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-12.5
+      parent: 1
+  - uid: 569
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-12.5
+      parent: 1
+  - uid: 570
+    components:
+    - type: Transform
+      pos: -1.5,-23.5
+      parent: 1
+  - uid: 571
+    components:
+    - type: Transform
+      pos: -6.5,-17.5
+      parent: 1
+  - uid: 572
+    components:
+    - type: Transform
+      pos: 5.5,-17.5
+      parent: 1
+- proto: ReinforcedPlasmaWindow
+  entities:
+  - uid: 573
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 1
+  - uid: 574
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-19.5
+      parent: 1
+  - uid: 575
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 1
+  - uid: 576
+    components:
+    - type: Transform
+      pos: -6.5,-4.5
+      parent: 1
+  - uid: 577
+    components:
+    - type: Transform
+      pos: -2.5,-1.5
+      parent: 1
+  - uid: 578
+    components:
+    - type: Transform
+      pos: -4.5,-2.5
+      parent: 1
+  - uid: 579
+    components:
+    - type: Transform
+      pos: 5.5,-4.5
+      parent: 1
+  - uid: 580
+    components:
+    - type: Transform
+      pos: -1.5,-1.5
+      parent: 1
+  - uid: 581
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 1
+  - uid: 582
+    components:
+    - type: Transform
+      pos: 1.5,-1.5
+      parent: 1
+  - uid: 583
+    components:
+    - type: Transform
+      pos: -1.5,-7.5
+      parent: 1
+  - uid: 584
+    components:
+    - type: Transform
+      pos: 4.5,-22.5
+      parent: 1
+  - uid: 585
+    components:
+    - type: Transform
+      pos: 2.5,-22.5
+      parent: 1
+  - uid: 586
+    components:
+    - type: Transform
+      pos: -2.5,-21.5
+      parent: 1
+  - uid: 587
+    components:
+    - type: Transform
+      pos: -2.5,-19.5
+      parent: 1
+  - uid: 588
+    components:
+    - type: Transform
+      pos: -2.5,-9.5
+      parent: 1
+  - uid: 589
+    components:
+    - type: Transform
+      pos: 1.5,-9.5
+      parent: 1
+  - uid: 590
+    components:
+    - type: Transform
+      pos: 0.5,-18.5
+      parent: 1
+  - uid: 591
+    components:
+    - type: Transform
+      pos: 3.5,-25.5
+      parent: 1
+  - uid: 592
+    components:
+    - type: Transform
+      pos: 5.5,-25.5
+      parent: 1
+  - uid: 593
+    components:
+    - type: Transform
+      pos: 2.5,-12.5
+      parent: 1
+  - uid: 594
+    components:
+    - type: Transform
+      pos: -3.5,-12.5
+      parent: 1
+  - uid: 595
+    components:
+    - type: Transform
+      pos: 0.5,-7.5
+      parent: 1
+  - uid: 596
+    components:
+    - type: Transform
+      pos: -1.5,-18.5
+      parent: 1
+- proto: ShuttersNormalOpen
+  entities:
+  - uid: 597
+    components:
+    - type: Transform
+      pos: -6.5,-4.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 21
+  - uid: 598
+    components:
+    - type: Transform
+      pos: 5.5,-4.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 20
+  - uid: 599
+    components:
+    - type: Transform
+      pos: 1.5,-9.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 609
+  - uid: 600
+    components:
+    - type: Transform
+      pos: -2.5,-9.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 609
+  - uid: 601
+    components:
+    - type: Transform
+      pos: -4.5,-2.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 21
+  - uid: 602
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 20
+  - uid: 603
+    components:
+    - type: Transform
+      pos: 1.5,-1.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 21
+  - uid: 604
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 21
+  - uid: 605
+    components:
+    - type: Transform
+      pos: 5.5,-19.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 611
+  - uid: 606
+    components:
+    - type: Transform
+      pos: -1.5,-1.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 21
+  - uid: 607
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 21
+  - uid: 608
+    components:
+    - type: Transform
+      pos: -2.5,-1.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 21
+- proto: SignalButton
+  entities:
+  - uid: 609
+    components:
+    - type: Transform
+      pos: -2.5,-10.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        600:
+        - Pressed: Toggle
+        599:
+        - Pressed: Toggle
+  - uid: 611
+    components:
+    - type: Transform
+      pos: 5.5,-20.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        605:
+        - Pressed: Toggle
+- proto: SignalButtonDirectional
+  entities:
+  - uid: 20
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-4.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        602:
+        - Pressed: Toggle
+        598:
+        - Pressed: Toggle
+  - uid: 21
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-7.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        597:
+        - Pressed: Toggle
+        601:
+        - Pressed: Toggle
+        608:
+        - Pressed: Toggle
+        606:
+        - Pressed: Toggle
+        604:
+        - Pressed: Toggle
+        607:
+        - Pressed: Toggle
+        603:
+        - Pressed: Toggle
+- proto: SignDirectionalEvac
+  entities:
+  - uid: 613
+    components:
+    - type: Transform
+      pos: 0.5,-22.5
+      parent: 1
+  - uid: 614
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-15.5
+      parent: 1
+  - uid: 615
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-14.5
+      parent: 1
+  - uid: 616
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-14.5
+      parent: 1
+  - uid: 617
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-15.5
+      parent: 1
+- proto: SignElectricalMed
+  entities:
+  - uid: 618
+    components:
+    - type: Transform
+      pos: -2.5,-18.5
+      parent: 1
+- proto: SignNosmoking
+  entities:
+  - uid: 619
+    components:
+    - type: Transform
+      pos: 5.5,-22.5
+      parent: 1
+- proto: SignSecureSmallRed
+  entities:
+  - uid: 620
+    components:
+    - type: Transform
+      pos: -3.5,-11.5
+      parent: 1
+  - uid: 621
+    components:
+    - type: Transform
+      pos: 4.5,-17.5
+      parent: 1
+  - uid: 622
+    components:
+    - type: Transform
+      pos: 2.5,-11.5
+      parent: 1
+- proto: SMESBasic
+  entities:
+  - uid: 623
+    components:
+    - type: Transform
+      pos: -5.5,-19.5
+      parent: 1
+  - uid: 624
+    components:
+    - type: Transform
+      pos: -4.5,-19.5
+      parent: 1
+- proto: SoapSyndie
+  entities:
+  - uid: 625
+    components:
+    - type: Transform
+      pos: 2.4424396,-17.430403
+      parent: 1
+- proto: soda_dispenser
+  entities:
+  - uid: 626
+    components:
+    - type: Transform
+      pos: 1.5,-19.5
+      parent: 1
+- proto: StorageCanister
+  entities:
+  - uid: 627
+    components:
+    - type: Transform
+      pos: 2.5,-23.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+- proto: SubstationBasic
+  entities:
+  - uid: 628
+    components:
+    - type: Transform
+      pos: -3.5,-19.5
+      parent: 1
+- proto: SuitStorageEVASyndicate
+  entities:
+  - uid: 629
+    components:
+    - type: Transform
+      pos: 0.5,-24.5
+      parent: 1
+  - uid: 630
+    components:
+    - type: Transform
+      pos: 0.5,-23.5
+      parent: 1
+  - uid: 631
+    components:
+    - type: Transform
+      pos: 3.5,-17.5
+      parent: 1
+  - uid: 632
+    components:
+    - type: Transform
+      pos: -4.5,-17.5
+      parent: 1
+- proto: SyndieMiniBomb
+  entities:
+  - uid: 633
+    components:
+    - type: Transform
+      pos: 1.4127003,-11.973867
+      parent: 1
+  - uid: 634
+    components:
+    - type: Transform
+      pos: 1.6939503,-11.973867
+      parent: 1
+- proto: SyringeInaprovaline
+  entities:
+  - uid: 635
+    components:
+    - type: Transform
+      pos: -3.510837,-4.3787546
+      parent: 1
+  - uid: 636
+    components:
+    - type: Transform
+      pos: -3.510837,-4.0193796
+      parent: 1
+- proto: Table
+  entities:
+  - uid: 637
+    components:
+    - type: Transform
+      pos: 5.5,-21.5
+      parent: 1
+  - uid: 638
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-21.5
+      parent: 1
+  - uid: 639
+    components:
+    - type: Transform
+      pos: 3.5,-19.5
+      parent: 1
+  - uid: 640
+    components:
+    - type: Transform
+      pos: 2.5,-19.5
+      parent: 1
+  - uid: 641
+    components:
+    - type: Transform
+      pos: 1.5,-19.5
+      parent: 1
+- proto: TablePlasmaGlass
+  entities:
+  - uid: 642
+    components:
+    - type: Transform
+      pos: -3.5,-4.5
+      parent: 1
+  - uid: 643
+    components:
+    - type: Transform
+      pos: -3.5,-6.5
+      parent: 1
+  - uid: 644
+    components:
+    - type: Transform
+      pos: -3.5,-3.5
+      parent: 1
+- proto: TableReinforced
+  entities:
+  - uid: 645
+    components:
+    - type: Transform
+      pos: -2.5,-11.5
+      parent: 1
+  - uid: 646
+    components:
+    - type: Transform
+      pos: -2.5,-13.5
+      parent: 1
+  - uid: 647
+    components:
+    - type: Transform
+      pos: -1.5,-3.5
+      parent: 1
+  - uid: 648
+    components:
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 1
+  - uid: 649
+    components:
+    - type: Transform
+      pos: 0.5,-13.5
+      parent: 1
+  - uid: 650
+    components:
+    - type: Transform
+      pos: 1.5,-13.5
+      parent: 1
+  - uid: 651
+    components:
+    - type: Transform
+      pos: 1.5,-12.5
+      parent: 1
+  - uid: 652
+    components:
+    - type: Transform
+      pos: 1.5,-11.5
+      parent: 1
+  - uid: 653
+    components:
+    - type: Transform
+      pos: 2.5,-17.5
+      parent: 1
+  - uid: 654
+    components:
+    - type: Transform
+      pos: 1.5,-17.5
+      parent: 1
+  - uid: 655
+    components:
+    - type: Transform
+      pos: -2.5,-17.5
+      parent: 1
+  - uid: 656
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-2.5
+      parent: 1
+  - uid: 657
+    components:
+    - type: Transform
+      pos: -3.5,-17.5
+      parent: 1
+  - uid: 658
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-2.5
+      parent: 1
+- proto: Thruster
+  entities:
+  - uid: 659
+    components:
+    - type: Transform
+      pos: -6.5,-2.5
+      parent: 1
+  - uid: 660
+    components:
+    - type: Transform
+      pos: 5.5,-2.5
+      parent: 1
+  - uid: 661
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-7.5
+      parent: 1
+  - uid: 662
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-7.5
+      parent: 1
+  - uid: 663
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-13.5
+      parent: 1
+  - uid: 664
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-13.5
+      parent: 1
+  - uid: 665
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-30.5
+      parent: 1
+  - uid: 666
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-30.5
+      parent: 1
+  - uid: 667
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-30.5
+      parent: 1
+  - uid: 668
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-30.5
+      parent: 1
+- proto: ToolboxSyndicate
+  entities:
+  - uid: 669
+    components:
+    - type: Transform
+      pos: -2.5731854,-17.414778
+      parent: 1
+- proto: ToolboxSyndicateFilled
+  entities:
+  - uid: 670
+    components:
+    - type: Transform
+      pos: 1.5034143,-11.298322
+      parent: 1
+- proto: VendingMachineTankDispenserEVA
+  entities:
+  - uid: 671
+    components:
+    - type: Transform
+      pos: 5.5,-15.5
+      parent: 1
+  - uid: 672
+    components:
+    - type: MetaData
+      name: tank dispenser
+    - type: Transform
+      pos: 2.5,-24.5
+      parent: 1
+  - uid: 673
+    components:
+    - type: Transform
+      pos: -6.5,-15.5
+      parent: 1
+- proto: VendingMachineYouTool
+  entities:
+  - uid: 674
+    components:
+    - type: Transform
+      pos: -3.5,-24.5
+      parent: 1
+- proto: WallPlastitanium
+  entities:
+  - uid: 11
+    components:
+    - type: Transform
+      pos: -1.5,-25.5
+      parent: 1
+  - uid: 675
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 1
+  - uid: 676
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 1
+  - uid: 677
+    components:
+    - type: Transform
+      pos: -3.5,-11.5
+      parent: 1
+  - uid: 678
+    components:
+    - type: Transform
+      pos: 2.5,-14.5
+      parent: 1
+  - uid: 679
+    components:
+    - type: Transform
+      pos: 4.5,-14.5
+      parent: 1
+  - uid: 680
+    components:
+    - type: Transform
+      pos: -2.5,-14.5
+      parent: 1
+  - uid: 681
+    components:
+    - type: Transform
+      pos: 2.5,-18.5
+      parent: 1
+  - uid: 682
+    components:
+    - type: Transform
+      pos: 1.5,-25.5
+      parent: 1
+  - uid: 683
+    components:
+    - type: Transform
+      pos: 1.5,-18.5
+      parent: 1
+  - uid: 684
+    components:
+    - type: Transform
+      pos: 7.5,-17.5
+      parent: 1
+  - uid: 685
+    components:
+    - type: Transform
+      pos: -3.5,-26.5
+      parent: 1
+  - uid: 686
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-7.5
+      parent: 1
+  - uid: 687
+    components:
+    - type: Transform
+      pos: 2.5,-13.5
+      parent: 1
+  - uid: 688
+    components:
+    - type: Transform
+      pos: -3.5,-28.5
+      parent: 1
+  - uid: 689
+    components:
+    - type: Transform
+      pos: 2.5,-10.5
+      parent: 1
+  - uid: 690
+    components:
+    - type: Transform
+      pos: 4.5,-18.5
+      parent: 1
+  - uid: 691
+    components:
+    - type: Transform
+      pos: -2.5,-10.5
+      parent: 1
+  - uid: 692
+    components:
+    - type: Transform
+      pos: -3.5,-10.5
+      parent: 1
+  - uid: 693
+    components:
+    - type: Transform
+      pos: -6.5,-11.5
+      parent: 1
+  - uid: 694
+    components:
+    - type: Transform
+      pos: 4.5,-10.5
+      parent: 1
+  - uid: 695
+    components:
+    - type: Transform
+      pos: 4.5,-2.5
+      parent: 1
+  - uid: 696
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-7.5
+      parent: 1
+  - uid: 697
+    components:
+    - type: Transform
+      pos: -6.5,-6.5
+      parent: 1
+  - uid: 698
+    components:
+    - type: Transform
+      pos: -5.5,-6.5
+      parent: 1
+  - uid: 699
+    components:
+    - type: Transform
+      pos: 4.5,-6.5
+      parent: 1
+  - uid: 700
+    components:
+    - type: Transform
+      pos: -6.5,-5.5
+      parent: 1
+  - uid: 701
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-8.5
+      parent: 1
+  - uid: 702
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-7.5
+      parent: 1
+  - uid: 703
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-8.5
+      parent: 1
+  - uid: 704
+    components:
+    - type: Transform
+      pos: 2.5,-11.5
+      parent: 1
+  - uid: 705
+    components:
+    - type: Transform
+      pos: 5.5,-18.5
+      parent: 1
+  - uid: 706
+    components:
+    - type: Transform
+      pos: -8.5,-15.5
+      parent: 1
+  - uid: 707
+    components:
+    - type: Transform
+      pos: -8.5,-17.5
+      parent: 1
+  - uid: 708
+    components:
+    - type: Transform
+      pos: -7.5,-17.5
+      parent: 1
+  - uid: 709
+    components:
+    - type: Transform
+      pos: -5.5,-10.5
+      parent: 1
+  - uid: 710
+    components:
+    - type: Transform
+      pos: -3.5,-13.5
+      parent: 1
+  - uid: 711
+    components:
+    - type: Transform
+      pos: 3.5,-18.5
+      parent: 1
+  - uid: 712
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-6.5
+      parent: 1
+  - uid: 713
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-7.5
+      parent: 1
+  - uid: 714
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-8.5
+      parent: 1
+  - uid: 715
+    components:
+    - type: Transform
+      pos: 5.5,-14.5
+      parent: 1
+  - uid: 716
+    components:
+    - type: Transform
+      pos: 7.5,-15.5
+      parent: 1
+  - uid: 717
+    components:
+    - type: Transform
+      pos: -6.5,-19.5
+      parent: 1
+  - uid: 718
+    components:
+    - type: Transform
+      pos: -6.5,-18.5
+      parent: 1
+  - uid: 719
+    components:
+    - type: Transform
+      pos: -3.5,-25.5
+      parent: 1
+  - uid: 720
+    components:
+    - type: Transform
+      pos: 2.5,-25.5
+      parent: 1
+  - uid: 721
+    components:
+    - type: Transform
+      pos: 2.5,-27.5
+      parent: 1
+  - uid: 722
+    components:
+    - type: Transform
+      pos: 4.5,-17.5
+      parent: 1
+  - uid: 723
+    components:
+    - type: Transform
+      pos: -7.5,-21.5
+      parent: 1
+  - uid: 724
+    components:
+    - type: Transform
+      pos: -7.5,-27.5
+      parent: 1
+  - uid: 725
+    components:
+    - type: Transform
+      pos: -7.5,-24.5
+      parent: 1
+  - uid: 726
+    components:
+    - type: Transform
+      pos: 6.5,-21.5
+      parent: 1
+  - uid: 727
+    components:
+    - type: Transform
+      pos: 6.5,-24.5
+      parent: 1
+  - uid: 728
+    components:
+    - type: Transform
+      pos: 6.5,-26.5
+      parent: 1
+  - uid: 729
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-3.5
+      parent: 1
+  - uid: 730
+    components:
+    - type: Transform
+      pos: 1.5,-10.5
+      parent: 1
+  - uid: 731
+    components:
+    - type: Transform
+      pos: -3.5,-27.5
+      parent: 1
+  - uid: 732
+    components:
+    - type: Transform
+      pos: -6.5,-12.5
+      parent: 1
+  - uid: 733
+    components:
+    - type: Transform
+      pos: 5.5,-12.5
+      parent: 1
+  - uid: 734
+    components:
+    - type: Transform
+      pos: 5.5,-11.5
+      parent: 1
+  - uid: 735
+    components:
+    - type: Transform
+      pos: -5.5,-11.5
+      parent: 1
+  - uid: 736
+    components:
+    - type: Transform
+      pos: -6.5,-20.5
+      parent: 1
+  - uid: 737
+    components:
+    - type: Transform
+      pos: 0.5,-14.5
+      parent: 1
+  - uid: 738
+    components:
+    - type: Transform
+      pos: -1.5,-14.5
+      parent: 1
+  - uid: 739
+    components:
+    - type: Transform
+      pos: 5.5,-20.5
+      parent: 1
+  - uid: 740
+    components:
+    - type: Transform
+      pos: -5.5,-14.5
+      parent: 1
+  - uid: 741
+    components:
+    - type: Transform
+      pos: 6.5,-17.5
+      parent: 1
+  - uid: 742
+    components:
+    - type: Transform
+      pos: -3.5,-14.5
+      parent: 1
+  - uid: 743
+    components:
+    - type: Transform
+      pos: -2.5,-18.5
+      parent: 1
+  - uid: 744
+    components:
+    - type: Transform
+      pos: 2.5,-26.5
+      parent: 1
+  - uid: 745
+    components:
+    - type: Transform
+      pos: 2.5,-28.5
+      parent: 1
+  - uid: 746
+    components:
+    - type: Transform
+      pos: 6.5,-25.5
+      parent: 1
+  - uid: 747
+    components:
+    - type: Transform
+      pos: 6.5,-22.5
+      parent: 1
+  - uid: 748
+    components:
+    - type: Transform
+      pos: -7.5,-23.5
+      parent: 1
+  - uid: 749
+    components:
+    - type: Transform
+      pos: -7.5,-26.5
+      parent: 1
+  - uid: 750
+    components:
+    - type: Transform
+      pos: -7.5,-22.5
+      parent: 1
+  - uid: 751
+    components:
+    - type: Transform
+      pos: -7.5,-20.5
+      parent: 1
+  - uid: 752
+    components:
+    - type: Transform
+      pos: 4.5,-15.5
+      parent: 1
+  - uid: 753
+    components:
+    - type: Transform
+      pos: 6.5,-28.5
+      parent: 1
+  - uid: 754
+    components:
+    - type: Transform
+      pos: 6.5,-27.5
+      parent: 1
+  - uid: 755
+    components:
+    - type: Transform
+      pos: 6.5,-23.5
+      parent: 1
+  - uid: 756
+    components:
+    - type: Transform
+      pos: 6.5,-20.5
+      parent: 1
+  - uid: 757
+    components:
+    - type: Transform
+      pos: -7.5,-25.5
+      parent: 1
+  - uid: 758
+    components:
+    - type: Transform
+      pos: -7.5,-28.5
+      parent: 1
+  - uid: 759
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-15.5
+      parent: 1
+  - uid: 760
+    components:
+    - type: Transform
+      pos: -5.5,-18.5
+      parent: 1
+  - uid: 761
+    components:
+    - type: Transform
+      pos: -5.5,-3.5
+      parent: 1
+  - uid: 762
+    components:
+    - type: Transform
+      pos: 5.5,-5.5
+      parent: 1
+  - uid: 763
+    components:
+    - type: Transform
+      pos: -3.5,-2.5
+      parent: 1
+  - uid: 764
+    components:
+    - type: Transform
+      pos: -6.5,-3.5
+      parent: 1
+  - uid: 765
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-7.5
+      parent: 1
+  - uid: 766
+    components:
+    - type: Transform
+      pos: -3.5,-18.5
+      parent: 1
+  - uid: 767
+    components:
+    - type: Transform
+      pos: -3.5,-1.5
+      parent: 1
+  - uid: 768
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 1
+  - uid: 769
+    components:
+    - type: Transform
+      pos: -6.5,-14.5
+      parent: 1
+  - uid: 770
+    components:
+    - type: Transform
+      pos: -5.5,-2.5
+      parent: 1
+  - uid: 771
+    components:
+    - type: Transform
+      pos: 5.5,-6.5
+      parent: 1
+  - uid: 772
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-7.5
+      parent: 1
+  - uid: 773
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-8.5
+      parent: 1
+  - uid: 774
+    components:
+    - type: Transform
+      pos: 4.5,-11.5
+      parent: 1
+  - uid: 775
+    components:
+    - type: Transform
+      pos: -6.5,-13.5
+      parent: 1
+  - uid: 776
+    components:
+    - type: Transform
+      pos: -3.5,-30.5
+      parent: 1
+  - uid: 777
+    components:
+    - type: Transform
+      pos: 6.5,-15.5
+      parent: 1
+  - uid: 778
+    components:
+    - type: Transform
+      pos: 5.5,-13.5
+      parent: 1
+  - uid: 779
+    components:
+    - type: Transform
+      pos: -7.5,-15.5
+      parent: 1
+  - uid: 780
+    components:
+    - type: Transform
+      pos: 1.5,-14.5
+      parent: 1
+  - uid: 781
+    components:
+    - type: Transform
+      pos: -4.5,-18.5
+      parent: 1
+  - uid: 782
+    components:
+    - type: Transform
+      pos: -2.5,-25.5
+      parent: 1
+  - uid: 783
+    components:
+    - type: Transform
+      pos: 0.5,-25.5
+      parent: 1
+  - uid: 785
+    components:
+    - type: Transform
+      pos: -1.5,-22.5
+      parent: 1
+  - uid: 786
+    components:
+    - type: Transform
+      pos: 0.5,-22.5
+      parent: 1
+  - uid: 787
+    components:
+    - type: Transform
+      pos: 1.5,-24.5
+      parent: 1
+  - uid: 788
+    components:
+    - type: Transform
+      pos: 1.5,-23.5
+      parent: 1
+  - uid: 789
+    components:
+    - type: Transform
+      pos: 1.5,-22.5
+      parent: 1
+  - uid: 790
+    components:
+    - type: Transform
+      pos: -2.5,-24.5
+      parent: 1
+  - uid: 791
+    components:
+    - type: Transform
+      pos: -2.5,-23.5
+      parent: 1
+  - uid: 792
+    components:
+    - type: Transform
+      pos: -2.5,-22.5
+      parent: 1
+  - uid: 793
+    components:
+    - type: Transform
+      pos: 5.5,-22.5
+      parent: 1
+  - uid: 794
+    components:
+    - type: Transform
+      pos: -7.5,-14.5
+      parent: 1
+  - uid: 795
+    components:
+    - type: Transform
+      pos: -7.5,-18.5
+      parent: 1
+  - uid: 796
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-28.5
+      parent: 1
+  - uid: 797
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-28.5
+      parent: 1
+  - uid: 798
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-28.5
+      parent: 1
+  - uid: 799
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-28.5
+      parent: 1
+  - uid: 800
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-28.5
+      parent: 1
+  - uid: 801
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-28.5
+      parent: 1
+  - uid: 802
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-6.5
+      parent: 1
+  - uid: 803
+    components:
+    - type: Transform
+      pos: 4.5,-27.5
+      parent: 1
+  - uid: 804
+    components:
+    - type: Transform
+      pos: 4.5,-26.5
+      parent: 1
+  - uid: 805
+    components:
+    - type: Transform
+      pos: 4.5,-25.5
+      parent: 1
+  - uid: 806
+    components:
+    - type: Transform
+      pos: 2.5,-4.5
+      parent: 1
+  - uid: 807
+    components:
+    - type: Transform
+      pos: 3.5,-6.5
+      parent: 1
+  - uid: 808
+    components:
+    - type: Transform
+      pos: 2.5,-30.5
+      parent: 1
+  - uid: 809
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-17.5
+      parent: 1
+  - uid: 810
+    components:
+    - type: Transform
+      pos: 3.5,-29.5
+      parent: 1
+  - uid: 811
+    components:
+    - type: Transform
+      pos: -5.5,-29.5
+      parent: 1
+  - uid: 812
+    components:
+    - type: Transform
+      pos: 4.5,-29.5
+      parent: 1
+  - uid: 813
+    components:
+    - type: Transform
+      pos: -4.5,-29.5
+      parent: 1
+  - uid: 814
+    components:
+    - type: Transform
+      pos: 5.5,-29.5
+      parent: 1
+  - uid: 815
+    components:
+    - type: Transform
+      pos: -3.5,-29.5
+      parent: 1
+  - uid: 816
+    components:
+    - type: Transform
+      pos: 2.5,-29.5
+      parent: 1
+  - uid: 817
+    components:
+    - type: Transform
+      pos: 6.5,-14.5
+      parent: 1
+  - uid: 818
+    components:
+    - type: Transform
+      pos: 6.5,-18.5
+      parent: 1
+  - uid: 819
+    components:
+    - type: Transform
+      pos: 5.5,-3.5
+      parent: 1
+  - uid: 820
+    components:
+    - type: Transform
+      pos: -6.5,-29.5
+      parent: 1
+  - uid: 821
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,-30.5
+      parent: 1
+  - uid: 822
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-30.5
+      parent: 1
+  - uid: 823
+    components:
+    - type: Transform
+      pos: 8.5,-15.5
+      parent: 1
+  - uid: 824
+    components:
+    - type: Transform
+      pos: 8.5,-17.5
+      parent: 1
+  - uid: 825
+    components:
+    - type: Transform
+      pos: -9.5,-17.5
+      parent: 1
+  - uid: 826
+    components:
+    - type: Transform
+      pos: -9.5,-15.5
+      parent: 1
+- proto: WarningN2
+  entities:
+  - uid: 827
+    components:
+    - type: Transform
+      pos: 4.5,-25.5
+      parent: 1
+- proto: WarningO2
+  entities:
+  - uid: 828
+    components:
+    - type: Transform
+      pos: 2.5,-25.5
+      parent: 1
+- proto: WarningWaste
+  entities:
+  - uid: 829
+    components:
+    - type: Transform
+      pos: 4.5,-18.5
+      parent: 1
+- proto: WaterCooler
+  entities:
+  - uid: 830
+    components:
+    - type: Transform
+      pos: 0.5,-17.5
+      parent: 1
+- proto: WeaponTurretSyndicate
+  entities:
+  - uid: 24
+    components:
+    - type: Transform
+      pos: -2.5,-6.5
+      parent: 1
+  - uid: 610
+    components:
+    - type: Transform
+      pos: -1.5,-19.5
+      parent: 1
+- proto: WindoorSecure
+  entities:
+  - uid: 831
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-5.5
+      parent: 1
+- proto: Wrench
+  entities:
+  - uid: 832
+    components:
+    - type: Transform
+      pos: 5.4749,-23.512577
+      parent: 1
+  - uid: 833
+    components:
+    - type: Transform
+      pos: 5.63115,-23.481327
+      parent: 1
+  - uid: 834
+    components:
+    - type: Transform
+      pos: 1.6061028,-13.284962
+      parent: 1
+...
diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/meta.json b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/meta.json
new file mode 100644
index 00000000000..932ea0c4829
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from /tg/station at commit 9065b811726ae52be5d1889f436c01a24efbf47a, edited by github user @Flareguy for Space Station 14, modified by Vermidia",
+    "states": [
+        {
+            "name": "mw"
+        },
+        {
+            "name": "mw_unlit"
+        },
+        {
+            "name": "mw0"
+        },
+        {
+            "name": "mw_running_unlit"
+        },
+        {
+            "name": "mwb"
+        },
+        {
+            "name": "mwbloody0"
+        },
+        {
+            "name": "mwbloody1"
+        },
+        {
+            "name": "mwo"
+        }
+      ]
+    }
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdad6aaf282a2970b7ff66daf56f7a1fee299a94
GIT binary patch
literal 836
zcmV-K1H1f*P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004QX+uL$X=7sm
z04R}lkvU5PQ51#0Bx*z>DHIg3NTFg8!3D%pBA6yx#0W-hk}->rWtf>D!B()b2v~?V
zZiW9qTftUA5EMbg(%P+&Fy5C05+uIiz58+Ioy(mw;0$H7tl2UH*_>sBg8|=ibj9a>
zqYV$ea*oF|Q=ea)i}3IIe!!vX{iy2o|GlQGb3I{d;Aj_~(saWTmT3rWTDsz0;T|m=
zTNgeS_8T&w@Qu>rRen{Rs`95|BNCnkr|RiTHE_IvwX~5H9uXeQW(rzu9`z-jL~dzO
zYQO9OOu_^S;3H0f4Ki4aO3g`T&3$7P-vW8@XmaWlF~pG~EndH<1?ifQniM@DPllq(
z{coOTa&n^D-4lS;7u)_A0{0%2OSb)UV%z0Ya6Q9SuI|rEPSanam+IQ!5qP)Z;<~QI
z_u+B}`kwTd5vxcp+0JAV-p`>c3f*_mv0BZl_MWpxh-}F(x`l&77?%6qwO=8DXc>h9
zjxqoM010qNS#tmY4#EHc4#EKyC`y0;00DeSL_t(oN9|OxPJ}=ZoikR@SP%+I0|^Nx
zhRTB4KhR(BH;kV^>o4FJcr^)D#DatfF(KCx3L82TW$^ZLyV+&%j%c&f4D8O#d;4Z~
zS0Gpr1YhFX(*H$KtXR!cS@FknA3k2!OXI@X<u%;Bmt5VG#Zi7)P!srf1*AiWZN!23
z3zHIfe&Z)~Q6d7OQh_Js4o&Cg6F`=a>!MA<n5Idi2@!qY?^cT2;^+GwAh-ymwa6j#
zJa0^#>!m0U>T{3;s;U~n+qRwb7^k#B0hN)RX5hAMk0ewc<3ticvXwnKQUMAa_Yu5l
z8V<>IU2q%+(5sAW0XrE*0>R@rhOX;&SYa4K6h(mk;1=x9z!V7tC`<nRNYj+OMYCpL
z4hb0&o}O8f$OnNWz`!XlBd~}9SeQ*W<?}q}co>FpTnqMJHL8+jS&(HJpoi^~Th}#}
z2GSO6>JqNVR7JpW3pT@+EFagw_qjwVffpg@P%b)8E1(t73TOr9DDVx4p2fh*v9~b*
O0000<MNUMnLSTaSHFvE5

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw0.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw0.png
new file mode 100644
index 0000000000000000000000000000000000000000..532e4e63acd8c5236d9c2f7f910a3b7d44744ab8
GIT binary patch
literal 825
zcmV-91IGM`P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004QX+uL$X=7sm
z04R}lkvU5PQ51#0Bx*z>DHIg3NTFg8!3D%pBA6yx#0W-hk}->rWtf>D!B()b2v~?V
zZiW9qTftUA5EMbg(%P+&Fy5C05+uIiz58+Ioy(mw;0$H7tl2UH*_>sBg8|=ibj9a>
zqYV$ea*oF|Q=ea)i}3IIe!!vX{iy2o|GlQGb3I{d;Aj_~(saWTmT3rWTDsz0;T|m=
zTNgeS_8T&w@Qu>rRen{Rs`95|BNCnkr|RiTHE_IvwX~5H9uXeQW(rzu9`z-jL~dzO
zYQO9OOu_^S;3H0f4Ki4aO3g`T&3$7P-vW8@XmaWlF~pG~EndH<1?ifQniM@DPllq(
z{coOTa&n^D-4lS;7u)_A0{0%2OSb)UV%z0Ya6Q9SuI|rEPSanam+IQ!5qP)Z;<~QI
z_u+B}`kwTd5vxcp+0JAV-p`>c3f*_mv0BZl_MWpxh-}F(x`l&77?%6qwO=8DXc>h9
zjxqoM010qNS#tmY4#EHc4#EKyC`y0;00D7HL_t(oN9|OxYJ@-#oeQb7Ng)=NK|$Ce
zSf#MeALJYIKeqV=^94yQm`YLz5+xwliA5T_Kyo8lahF}kyOX5ZX+~#f<~`qxy93D>
zW8ZRY>-VxOcf9ANs`=w}2%m2+TjRpj%^f^^R6^g2%~6hQXbAkf0?H-CG2+7fg((R<
zzl)o?DG>=#tH6`?gr;-<1)!?OxNM6swr$gBQpPY0Q>27)dS<|sy~rgDf?zCM>yKqj
z5~%BX1n;_T(PQ2zMoyZ8yRJKu(0R<0N$6ys6J4bM1&-$k-nOkEg75p_c^;tG8A*VD
z8ASrYlO%z@?<cG%iXe_-K(8}$1oItOB7p!^CEg!dmXT{g65t9@yP!hCujiJgsgevy
zfGa?GRrgI4z{Y&LDPI(Yz{9ev^F}bg)u>L6<3OJ0fF6FY+@@)$GEk0S-&Al*mTD3X
zf5HB6q^id_grQKVB=9OFoyx`383l|2MggP18U=m;@65t#CE#KB00000NkvXXu0mjf
D88&(m

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_running_unlit.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_running_unlit.png
new file mode 100644
index 0000000000000000000000000000000000000000..b751f308a6a25c0884e8c5f8bd83b64e50b7f121
GIT binary patch
literal 617
zcmV-v0+#)WP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004QX+uL$X=7sm
z04R}lkvU5PQ51#0Bx*z>DHIg3NTFg8!3D%pBA6yx#0W-hk}->rWtf>D!B()b2v~?V
zZiW9qTftUA5EMbg(%P+&Fy5C05+uIiz58+Ioy(mw;0$H7tl2UH*_>sBg8|=ibj9a>
zqYV$ea*oF|Q=ea)i}3IIe!!vX{iy2o|GlQGb3I{d;Aj_~(saWTmT3rWTDsz0;T|m=
zTNgeS_8T&w@Qu>rRen{Rs`95|BNCnkr|RiTHE_IvwX~5H9uXeQW(rzu9`z-jL~dzO
zYQO9OOu_^S;3H0f4Ki4aO3g`T&3$7P-vW8@XmaWlF~pG~EndH<1?ifQniM@DPllq(
z{coOTa&n^D-4lS;7u)_A0{0%2OSb)UV%z0Ya6Q9SuI|rEPSanam+IQ!5qP)Z;<~QI
z_u+B}`kwTd5vxcp+0JAV-p`>c3f*_mv0BZl_MWpxh-}F(x`l&77?%6qwO=8DXc>h9
zjxqoM010qNS#tmY3ljhU3ljkVnw%H_005y$L_t(oN9~ls4S*mFMd4srg7Mr#25}!(
zaR&}aRbq^R+QtMAA3}QIxBWZ<#$bQ|2!KFm0=CtEn1>|w7sq(j4Cct6^0IkK2N?)?
zy4Agk55r`jENOGnQ^C^QFMc;si=?X>NGA!Yi9&#DUiLLt*7PJLAUz<fmk?l!X#^4i
zn)+<cuLy8Ykv&aC@YzRn`+&4=kOu-F00JNY0zC+9jK%h3Br14?00000NkvXXu0mjf
D{O$_;

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_unlit.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_unlit.png
new file mode 100644
index 0000000000000000000000000000000000000000..11e691d0317e35db97579f0fe7214e7a936ad7ba
GIT binary patch
literal 1772
zcmbVNJ&fZ-6!z+l)v>3gp#UKY<D&qHiO0XOt%N0)gxw&#toDK~RNQ1dPOObR#&$N@
z6clt6Xpx{oG?eJ1lhDy2fe;1NA$lYV8booTLC{d}Y$rJ*g}W7&{4?Y4eeeIx`$vcS
zyF1V92!gQNJLnw4Tg>k(+we>mi$CDCl^*Y37w-J<>~FBRJZiZuLHOeQ>fhusSU(;g
zyp;;V)hF|NOZeo|rv+iV5%dSyz<u4JJggCq4_R#<#()-t#@;+8^n_*Nkd1<<DgFM{
zH<B25P3flLVmEHHad5Cm*p0<upDs?Q?MZtt@9s3_4lsl)BjP-qM5!}xN(He4-}$yI
zi3KD(X-chJqd0Jn#5PZuXw*zZ72Oi+c1<yLteG!~DpqV6Te6}dtT@<ojJmkIBv2=c
zjl}bv<Ibx~b+Bqm<1C9ES)R>iwV77q$w*dg8)#HnRS_UidKP75j-vEhNwTEru#_f2
zoCQ1*b6PUw)2u0h#ic7@yylM5WxODA@|?u7Qp34x1<<2wTs%!Cg#{j!*@T5G%2L28
zYivB`8BfRjKd9Hg|D^yz?7C|m8*K^0wTd+Bo`M_8sBA>1{j-?K$1LU3gtG1_n0YPt
zCU)8hBN<QnoKIE>J6f46s^GQw!p$J^_$+;~BEUK%V@*lLDn?jGs@+%Wj$%3*q|tCN
zE}<^>0{^TEH6Y7<tT~G1XdqdELg{!UBaZ}o)bV)|5^y*O$%x5uG?K)17@ans@B|ct
zby{`5*KQvr+z%%3Bkv=z*KM1MZJJ1}DTTSN>-3^DBN1i2PE&&5)Plfse9JP4su5&+
zd65#`Mubog>CCe<4>MCY%$0nH(`jA;xqR6b9;d+Zz&z^vielIp*@o>S+tM)_VqzeQ
zbxpTz)6gtq#r8%LKxdLkl{L4@14gQ<ME4m+7FG=8tGbSeImC$8iRByhdR;Y*RqaFd
z7X{@U1SzEYtmvz<$%^i}!QQECEqi4Wh(%pFgy#LylxSWk%#)Ve!G=&>$f%|KY|Mc4
zAq7-wPr0AXNWxkp2<xK@RK9>CDLH+(8yCxXX<yZijm7=H+$e?Um_#E66B#<a>R3b0
zhgUUg4S7?7OI&5>l>@bqhKUL*kXw!Oe6>CjSOi)V82IOJ?)?mhh2874`h)%ZKPpea
zk#zan@6K<_PZ=M7IllYRhv>O0!n=3JAAC0b>94`px4S3z#=qR#`t=fsz4BV}{QXPY
U-+%t++xd~x>mGLQT)*|+KbGbdxc~qF

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwb.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwb.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d6462c92e22f0817b4e4a119758369f5022933a
GIT binary patch
literal 1193
zcmV;a1XlZrP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004QX+uL$X=7sm
z04R}lkvU5PQ51#0Bx*z>DHIg3NTFg8!3D%pBA6yx#0W-hk}->rWtf>D!B()b2v~?V
zZiW9qTftUA5EMbg(%P+&Fy5C05+uIiz58+Ioy(mw;0$H7tl2UH*_>sBg8|=ibj9a>
zqYV$ea*oF|Q=ea)i}3IIe!!vX{iy2o|GlQGb3I{d;Aj_~(saWTmT3rWTDsz0;T|m=
zTNgeS_8T&w@Qu>rRen{Rs`95|BNCnkr|RiTHE_IvwX~5H9uXeQW(rzu9`z-jL~dzO
zYQO9OOu_^S;3H0f4Ki4aO3g`T&3$7P-vW8@XmaWlF~pG~EndH<1?ifQniM@DPllq(
z{coOTa&n^D-4lS;7u)_A0{0%2OSb)UV%z0Ya6Q9SuI|rEPSanam+IQ!5qP)Z;<~QI
z_u+B}`kwTd5vxcp+0JAV-p`>c3f*_mv0BZl_MWpxh-}F(x`l&77?%6qwO=8DXc>h9
zjxqoM010qNS#tmY4#EHc4#EKyC`y0;00QAjL_t(oN9|V6i&9Y(J~qw9&}tO?F$-fx
zP!I!KG=br+g{`6)|AJcN%D=_k5cC&Vk&7~#U1U&;qD0WpNQTi7behy6hGM$kozCO>
z-u0;v&Bg<d`|iEpJ>NOsIq&iuWU^Q+c5GhzSMzGM>M;8{t8;#TElP(UcC@@Zzc12_
zrLUH~kLTCv^0%gCo$(k+Bxerd%(U#_SRVdsOpbLJ?=!i&j(y;9-nX(sNX)FTRskk^
zwD+AhNo2J|Mi6kw*<$P-98hzwMYI}{B$xxQs)6;B`I;qPTLm^(&k=&)OgMWu1NrO9
zdr7`7$gu}<wLGkxt~4BptpWfc2sV}%bLljmFi3U1p$3DqDNVh#0X%s2gzntDH3onA
z<um;}I-+;=DqV@hqyni+LQ*`!GE<sKM~)+w&jL-d_3Omj_F<3iUGPqEJ>T|2k+S+F
zOe_J&A78yrx8J@ZuXny6kN}9x#)+xxQ+oj5e!o9cnjVj54A*YAsaU*5#k);<zPzmU
zVH?1UPc?Z6j)%h`1p)!vKw7Pq#HyCcmdHQw)4pe)wkT#fKlLKw6Cm$&I^=e{jS=ts
z*hL0%f8Vc#%p3qtM<NmF1Y^Bkr@>%gj5_bZU{EfD96{*JQi5KuN82{(fK&}eg@!^Q
z8jVKAQaBu@;Ey0V!%k{68q*c<`FzLue4et|>=+nLi28yYBdk)X$OrRuIxR=u<HLzW
zLMnuDl35g})oN5I6vpuJc-)xtJF-RnVWm=ucpaV3RxX!ixiC($nR)=3vO$GpGHED+
zIR~QRfJgSg;+a_i9gwpF0p5`@E5M|f>&z~D;4KP7qfyFa#&346H`ku)t!8YlKd{^b
zPN#D=1-jj?BbUore#y+2%S3Oc4RpTC<(l{f0B&hQ-1{4%5uYmeKj!n;t^jXn4q%;x
z!m4Sn;x_<^`(U>rh(#cBej0{*;WT&`oC^gO3M>@(uL}GD)IdW%E4V=z00000NkvXX
Hu0mjf{IoPg

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody0.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody0.png
new file mode 100644
index 0000000000000000000000000000000000000000..a51302a2537666447aab9729ffd9e99629aed1ba
GIT binary patch
literal 268
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|3<7*YT(z~e
z5ANE!baHbw14CnRW*h^9nVA`bHiIPtgR85nxVX5#zyFFAD;gRaQX&I^n)GFge*-Cj
zk|4j}|EPfBfpV-QP%h8Y#WBR9_vr+0t^)=fF3imj&i%f>?b&6wPDhXMrF<z1^&hLa
zPSTpsG=X6OZ_zA9Z3nHeg?wkXy)@vwXk66rZDr<JhQ|+{Gbc!Her|VzQFhmM7R8IQ
yyIxtTCNc{7yR5%)mC@m%{f#8ghVPR9IAbF6EI0A4dJzh=nZeW5&t;ucLK6Uz>tqH1

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody1.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody1.png
new file mode 100644
index 0000000000000000000000000000000000000000..8cfdf34281a32ce8dd087a52b77d1284ec461e3c
GIT binary patch
literal 230
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}3p`yMLn2z=
zPBP?TG8Ax)f0L4*xbjAoXs&If&h^ztjE-E2jyQgZlTFZ!rRi+FK%JW8Gycg90!|&Q
zHYp7$QVQxP4kqRQo@Cw<GV|}<JsFY3rT2sHZ#DZ^qs^X>{oFi(NvR-f&DXP8ng^Zl
zHO|)h%w51Pm$vU^VP5V7o^>|PCXY?$Yra`KF_BkgwgXGw)R$LHX7D||?ygg~)`>&0
c<;6qR_z=%p$19>CK({h@y85}Sb4q9e0Qr+vJOBUy

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwo.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwo.png
new file mode 100644
index 0000000000000000000000000000000000000000..7545ff0035ab035f67ba083c11411ca94b5b8bcc
GIT binary patch
literal 947
zcmV;k15EshP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004QX+uL$X=7sm
z04R}lkvU5PQ51#0Bx*z>DHIg3NTFg8!3D%pBA6yx#0W-hk}->rWtf>D!B()b2v~?V
zZiW9qTftUA5EMbg(%P+&Fy5C05+uIiz58+Ioy(mw;0$H7tl2UH*_>sBg8|=ibj9a>
zqYV$ea*oF|Q=ea)i}3IIe!!vX{iy2o|GlQGb3I{d;Aj_~(saWTmT3rWTDsz0;T|m=
zTNgeS_8T&w@Qu>rRen{Rs`95|BNCnkr|RiTHE_IvwX~5H9uXeQW(rzu9`z-jL~dzO
zYQO9OOu_^S;3H0f4Ki4aO3g`T&3$7P-vW8@XmaWlF~pG~EndH<1?ifQniM@DPllq(
z{coOTa&n^D-4lS;7u)_A0{0%2OSb)UV%z0Ya6Q9SuI|rEPSanam+IQ!5qP)Z;<~QI
z_u+B}`kwTd5vxcp+0JAV-p`>c3f*_mv0BZl_MWpxh-}F(x`l&77?%6qwO=8DXc>h9
zjxqoM010qNS#tmY4#EHc4#EKyC`y0;00HYsL_t(oN9|TIYr;SjewI!yItbZCN+5;e
zQU$yA50vH?L`pYz9ZH9|7AK{cUy#zROS@LE-8uw95tmMZ47xZK?7i5Fm-AwhHt3Qs
z%iX(o@B8xI%aI&#P!wg!$I_l#mX)J54@JfA%QDP9Uee};;>kH&P3=J4gVb3P7R&_f
z-2q_};xS^w>;ggo&!4MK9n4&~E|${O!7+w9faH&-XK?ZU3Z+sq5trWp4}!`V=MgG^
zO`H$sv0W%M3x2MpTC4F5fO4z|Yit!jj{<i#>rG*SGL-#zd)yWay$#p@@2_AA(`a{y
z17V1D1W^nqf^~xCE9S55W&#1O>%t(4QLrv@qEe~AVzGdHJ`a=0B)SJANm}-LJ+N&X
z`u)DY!Lc0BEgd990vz*T;{{kZVYOQIQ)3ChY$P|$pl2Pe;}sf?hd{?@Ielw3Zr-i;
zjz*(MFJtw9Zs=fWhW8~P8INwg>xDE!gCp`#G#U+m%)b;}h$R3m#^MMR!k;%?!#oy$
zazK`4P*pY116Y(6r(`S<PfXXa`JxbTz;T>htJT{0C1Y<lw#lN3hczC%Z{rB?-mj5H
zd}8i@oF~B-Nv;VtU>u0UTLs|a8zzza;A=vNi4bqT58%D958jM3b0Bjdb6}?q`~YNO
VkNCdzgV_K8002ovPDHLkV1mPAuDAdI

literal 0
HcmV?d00001


From 8487f1c7151cf3a3d898fb2850862122b3d379c1 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 04:47:20 -0400
Subject: [PATCH 138/366] try fix errors

---
 Content.Server/GameTicking/GameTicker.Player.cs | 12 +++---------
 Content.Server/GameTicking/GameTicker.cs        |  2 ++
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Content.Server/GameTicking/GameTicker.Player.cs b/Content.Server/GameTicking/GameTicker.Player.cs
index 54e7f1bf920..debe8e2f1f8 100644
--- a/Content.Server/GameTicking/GameTicker.Player.cs
+++ b/Content.Server/GameTicking/GameTicker.Player.cs
@@ -20,14 +20,8 @@ namespace Content.Server.GameTicking
     [UsedImplicitly]
     public sealed partial class GameTicker
     {
-        [Dependency] private readonly IPlayerManager _playerManager = default!;
-        [Dependency] private readonly IServerDbManager _dbManager = default!;
-        [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
-
-        private void InitializePlayer()
-        {
+        private void InitializePlayer() =>
             _playerManager.PlayerStatusChanged += PlayerStatusChanged;
-        }
 
         private async void PlayerStatusChanged(object? sender, SessionStatusEventArgs args)
         {
@@ -61,7 +55,7 @@ private async void PlayerStatusChanged(object? sender, SessionStatusEventArgs ar
                         session.Data.ContentDataUncast = data;
                     }
 
-                    var record = await _dbManager.GetPlayerRecordByUserId(args.Session.UserId);
+                    var record = await _db.GetPlayerRecordByUserId(args.Session.UserId);
                     var firstConnection = record != null &&
                                           Math.Abs((record.FirstSeenTime - record.LastSeenTime).TotalMinutes) < 1;
 
@@ -72,7 +66,7 @@ private async void PlayerStatusChanged(object? sender, SessionStatusEventArgs ar
                     RaiseNetworkEvent(GetConnectionStatusMsg(), session.Channel);
 
                     if (firstConnection && _configurationManager.GetCVar(CCVars.AdminNewPlayerJoinSound))
-                        _audioSystem.PlayGlobal(new SoundPathSpecifier("/Audio/Effects/newplayerping.ogg"),
+                        _audio.PlayGlobal(new SoundPathSpecifier("/Audio/Effects/newplayerping.ogg"),
                             Filter.Empty().AddPlayers(_adminManager.ActiveAdmins), false,
                             audioParams: new AudioParams { Volume = -5f });
 
diff --git a/Content.Server/GameTicking/GameTicker.cs b/Content.Server/GameTicking/GameTicker.cs
index fa23312268f..33cb7b22f03 100644
--- a/Content.Server/GameTicking/GameTicker.cs
+++ b/Content.Server/GameTicking/GameTicker.cs
@@ -19,6 +19,7 @@
 using Robust.Server;
 using Robust.Server.GameObjects;
 using Robust.Server.GameStates;
+using Robust.Server.Player;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
@@ -71,6 +72,7 @@ public sealed partial class GameTicker : SharedGameTicker
         [Dependency] private readonly MetaDataSystem _metaData = default!;
         [Dependency] private readonly SharedRoleSystem _roles = default!;
         [Dependency] private readonly ServerDbEntryManager _dbEntryManager = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
 
         [ViewVariables] private bool _initialized;
         [ViewVariables] private bool _postInitialized;

From b0837ed791fc1b07e70c4da311e9cd330704772f Mon Sep 17 00:00:00 2001
From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Date: Fri, 17 May 2024 01:48:22 -0700
Subject: [PATCH 139/366] Add data field for id card microwave behaviour
 (#28087)

---
 Content.Shared/Access/Components/IdCardComponent.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Content.Shared/Access/Components/IdCardComponent.cs b/Content.Shared/Access/Components/IdCardComponent.cs
index 884658c7c41..9879a02dbcd 100644
--- a/Content.Shared/Access/Components/IdCardComponent.cs
+++ b/Content.Shared/Access/Components/IdCardComponent.cs
@@ -46,4 +46,7 @@ public sealed partial class IdCardComponent : Component
 
     [DataField]
     public LocId FullNameLocId = "access-id-card-component-owner-full-name-job-title-text";
+
+    [DataField]
+    public bool CanMicrowave = true;
 }

From 442ab28fbbaa3284e66ea0718c55d0fed26463d1 Mon Sep 17 00:00:00 2001
From: themias <89101928+themias@users.noreply.github.com>
Date: Mon, 19 Aug 2024 14:57:29 -0400
Subject: [PATCH 140/366] Uplink: Combat Bakery Kit (#31179)

* save

* sprites

* mime survival kit has baguette

* add weapon/uplink

* cherry-pick croissant changes

* uplink

* Switch baguette to slashing damage

* fixes

* update attribution

* fix typos

* review comments

* reduce TC cost

* switch to regular box

* fix regular baguette rotation
---
 .../Catalog/Fills/Boxes/emergency.yml         |  49 +++++++++++++++++-
 .../Objects/Consumable/Food/Baked/bread.yml   |  15 ++++++
 .../Objects/Consumable/Food/Baked/misc.yml    |   6 ++-
 .../Objects/Weapons/Melee/baguette.yml        |   2 +
 .../Objects/Weapons/Throwable/croissant.yml   |   2 +
 .../bread.rsi/baguette-equipped-BELT.png      | Bin 0 -> 440 bytes
 .../Baked/bread.rsi/baguette-inhand-left.png  | Bin 0 -> 454 bytes
 .../Baked/bread.rsi/baguette-inhand-right.png | Bin 0 -> 485 bytes
 .../Food/Baked/bread.rsi/baguette.png         | Bin 393 -> 303 bytes
 .../Consumable/Food/Baked/bread.rsi/meta.json |  14 ++++-
 .../Objects/Storage/boxes.rsi/france.png      | Bin 0 -> 139 bytes
 .../Objects/Storage/boxes.rsi/meta.json       |   6 +++
 12 files changed, 91 insertions(+), 3 deletions(-)
 create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-equipped-BELT.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-inhand-left.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-inhand-right.png
 create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/france.png

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
index fa7196f82fa..5333b2ae07f 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
@@ -128,7 +128,54 @@
       - BoxHug
 
 - type: entity
-  name: extended-capacity survival box
+  parent: BoxHug
+  id: BoxHugNitrogen
+  suffix: Emergency N2
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingMaskBreath
+    - id: EmergencyNitrogenTankFilled
+    - id: EmergencyMedipen
+    - id: Flare
+    - id: FoodSnackNutribrick
+    - id: DrinkWaterBottleFull
+  - type: Label
+    currentLabel: reagent-name-nitrogen
+
+- type: entity
+  parent: BoxSurvival
+  id: BoxMime
+  name: survival box
+  description: It's a box with basic internals inside.
+  suffix: Emergency
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingMaskBreath
+    - id: EmergencyOxygenTankFilled
+    - id: EmergencyMedipen
+    - id: Flare
+    - id: FoodBreadBaguette
+    - id: DrinkWaterBottleFull
+
+- type: entity
+  parent: BoxSurvivalNitrogen
+  id: BoxMimeNitrogen
+  suffix: Emergency N2
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingMaskBreath
+    - id: EmergencyNitrogenTankFilled
+    - id: EmergencyMedipen
+    - id: Flare
+    - id: FoodBreadBaguette
+    - id: DrinkWaterBottleFull
+  - type: Label
+    currentLabel: reagent-name-nitrogen
+
+- type: entity
   parent: BoxCardboard
   id: BoxSurvivalSyndicate
   description: It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank.
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
index 22c1fe021b9..20d99623f0b 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
@@ -624,6 +624,21 @@
           Quantity: 1
         - ReagentId: Blackpepper
           Quantity: 1
+  - type: Clothing
+    slots: [ BELT ]
+    equippedPrefix: baguette
+    quickEquip: false
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: baguette-inhand-left
+      right:
+      - state: baguette-inhand-right
+  - type: MeleeWeapon
+    wideAnimationRotation: -120
+    damage:
+      types:
+        Blunt: 1 # bonk
 # Tastes like France.
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
index a78df427cee..73483c0cf62 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
@@ -635,4 +635,8 @@
         - ReagentId: Butter
           Quantity: 2
         - ReagentId: Vitamin
-          Quantity: 1
\ No newline at end of file
+          Quantity: 1
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Blunt: 0 # so the damage stats icon doesn't immediately give away the syndie ones
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml
index 4492d31320f..46bd430e5ac 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml
@@ -1,6 +1,8 @@
 - type: entity
+  name: baguette
   parent: FoodBreadBaguette
   id: WeaponBaguette
+  description: Bon appétit!
   suffix: Weapon
   components:
   - type: MeleeWeapon
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml
index d2f53857acb..8ae52f4d735 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml
@@ -1,6 +1,8 @@
 - type: entity
   parent: FoodBakedCroissant
   id: WeaponCroissant
+  name: croissant
+  description: Buttery, flaky goodness.
   suffix: Weapon
   components:
   - type: Fixtures
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-equipped-BELT.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-equipped-BELT.png
new file mode 100644
index 0000000000000000000000000000000000000000..93437dd65872e15487bf635580772235480f2c51
GIT binary patch
literal 440
zcmV;p0Z0CcP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$a!Eu%RCt{2+OcZGFc1ddzom;wp&hgZ(>?SJ`~Z2Qjv6}p6-pjQc>)(owqQCn
ztuZ*WIs}!F#gZety5#?M!*O?#1$O`u5fKp)5s|m5gf&{(|BmBaw?jUvO4xak$Bsn~
zqm{L*nfU4h13I88VHe8`@8A0|;+foC=m%}508``n1vg^^G_{}(Fk0EgGCL&U8dW7O
z=IlE`9WXC)thd=%u|)Ir_T*h8?*vpO?BmDJu!tt)-X<YQ@Y0xE%)`fMWqlLi)d5nf
ze=1rRNUFZ$+XcNHAhr4cu&MXGUC^6=wo_PdGZe2oQ4b#%@20+t7b_7F5fKp)5fKql
zTBOYloIxuxry7%6KxPuoPJq$sZ*U@Qb^t_3z{CAc<lrO<yPAn#m>5*G#^m<X)Mz_(
zeU*1>GAUkoL&o7jcYwR?Q$F*dNeEt%NxALaBsltxkc7$uhu^SEg6|RaUXVz+^2d&o
i5QWhy$qSE&qWA?bBDypyPSni+0000<MNUMnLSTaJfxgiI

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..085c8faf2e6a753764d8df325ea648d7f1a54229
GIT binary patch
literal 454
zcmV;%0XhDOP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$fJsC_RCt{2+A(gzFcb#hKiv>W(8_DnwF?)3<8Y5ibmR`)g~gnJffYq;5h)U=
zqdQQiRaL2q?U(Z4|8_(D{5M!H4<I5UA|h(V7RLSe-;lyX$RfY_+UDwu5LAHaYn1`O
zXnRnfgrEWdmm;ipJq!nx>Lg^bAK;dK2LS6`uStd`!3prP*||x=YCcw%gk&e?lkoQP
zgvV*ACJE6A@O%>Xwp9I0h-M4pd>ZbS_MgV2HVZ@*BX<2?l05@{6MJLy>r^MoKNH%X
z<YocqmVGC^dC>#_UpL0%$+TK`JQ=l@D<UEyA|fIpBBD>B{XNOPpm<Nv3+?bq&mweE
z09zP0+8zL)b(2$i7D2oKwawjdP(^ikC1(*tTh6vHZu0zo`J&nRDrXVI60n+&o0Ctm
zc|c|sK_mgS&71%ERGa@U<t#$-1k^Tnds`+w`Jb+O7NLvxdEQmdB6R&GSM{6Y)Iw$n
wI=cx<yQS&XU?H;zH<JJ$d=`O-h=}gf2L|lj-0ojz{Qv*}07*qoM6N<$f-iH*H~;_u

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..d737e6fa96b40c83555d98cda88c0981c6507f0a
GIT binary patch
literal 485
zcmV<B0UG{^P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$pGibPRCt{2+A(gzFcb#hpSBAE30irLx_03L<v83U5{%q|yRbMXU|{Hi5K^l~
zq)0)Py1WjRDXKtC9LLn@|INYpInPP-`~V^%A|fJdI#zP&IoP_YIzXl)0m5B`N(-Q4
zCH>_V05F`SEhjVb?ArE+nU3V+<rz<}y<md}0IP}XSjpr4`_}-YeXzj;7F%FG9!Rg7
zB3ZSA4<0C)0hx{td%g+510^yb(~)fSx-oaYG?{fI)K{Go|1$W+6u}4mTMTEP0il24
z0pD{su@ttLLYlJYb*w~Y9XXc?Co^D|D<rFS&|i4QaFVu?RU5lpU3w}+L_|bHL_|c?
zY_|18-*w2!{Q;-gR+O!)xD_~GfGRx$=KB6}>n#(UE<mQE!^yF2McGtwd)?GaCO9j5
zyY3l~Sw{fWUY>W70d@2Yv_|_wCd|i!+A^W?Wb5u3Fq!c7aEIIB+WGjEGQdaAfXRf7
zUVD8z6yo#z(46u4_^-lzf3*CG!`deF3>+)<3}`~nfVC#|3>>>Ddf_ftNb+!7Vu^@|
bh<^G6-nrk?cvltO00000NkvXXu0mjfI0N1X

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette.png
index de137b2a6268b491d92530e467a51b7ee386593f..e5de3c0bc09387457d0a15996b29c9b41c38c7c0 100644
GIT binary patch
delta 288
zcmV+*0pI?K1Fr&*7=Hu<0001iRA<Kk001OVOjJbx004z834lNVsbD3$dp)318Sckm
z_S}%vpH0Y&LHzc<Lly`S%$u?R0004WQchC<K<3zH0002FNkl<ZD3P_#Jr06E5Cz~}
zPT*oNF;)^TV1_NMccM^IP<a5NHI1|ykbYyBp2XPMb2%&a=YIf9_f6iLWEfj~!g%Fb
zq^j^-J@Mc;&f2?j7DBzK1zQoPh6trO%G16ZHJC<_4E@k58%U}zVP-GH`OqN3VGaa2
z(Yv+<zWHd4k5bHqt-jR=@?t*HgjXeZzqxQ85pytRYwA$R!k8a1Ls?Ab2d)voF^j-A
mi^@{CX5rp9;~A6hMdlB>A~1T6&4(`l0000<MNUMnLSTZUFnc)w

delta 378
zcmV-=0fqjr0*M2V7=H)`0001UdV2H#00B@*L_t(|ob8jbO2beThCiiJDh=2=Xz3E9
z4i$ZZA~>i|;Oy!{xO8#yEu00x%}sEUA`U`ZXrKyBEy!(yy?9k3agc;sXqz?>m-{W3
z<R<z4bM6UfG#ZWOpPBoMkDeXmy<~ck5BbL7xjohqYk=|&UVo{yjgd*v@40mC4z<Sy
z<?GR&L|o#cxz65EiKMZ@{l#stw;)o08u@Od4*241eib8=z*Qaq8@nc#r&rhwhvNqo
z{}BvV+^kfQLITk5x!5%;lzi#{<0@{~1<#f<l{|ESL2<6I6jTe4UQQ#042I6SYlW7F
z3NYMmfM%r%@N=u}v&dn>UocpCyDpI830HY+?yu3RzC@N!3;+b@4L|J$sNXbkm4|x&
ziX;b^pY(uTvv9;`&~AT?Lk=Nlz|7{z7Yo6?uH8Ys%BiM(<^Vn?TPbhwI;vQs(P(_W
Y0pO&=5t%G(82|tP07*qoM6N<$f<6bbH~;_u

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json
index 29bd53c9f0a..2761d79f986 100644
--- a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by potato1234x at https://github.com/tgstation/tgstation/commit/0631fe5bde73a68b4c12bdfa633c30b2cee442d5. Crostini created by Github user deathride58",
+  "copyright": "Taken from tgstation and modified by potato1234x at https://github.com/tgstation/tgstation/commit/0631fe5bde73a68b4c12bdfa633c30b2cee442d5. Crostini created by Github user deathride58, baguette taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955",
   "size": {
     "x": 32,
     "y": 32
@@ -34,6 +34,18 @@
     {
       "name": "baguette"
     },
+    {
+      "name": "baguette-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "baguette-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "baguette-inhand-right",
+      "directions": 4
+    },
     {
       "name": "banana"
     },
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/france.png b/Resources/Textures/Objects/Storage/boxes.rsi/france.png
new file mode 100644
index 0000000000000000000000000000000000000000..f18dd0ca93f8f72e9b872e378c5ef8e1f76fbbfb
GIT binary patch
literal 139
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}uAVNAArY-_
z&utWJP!M6ccvVP;sW^L~cemm(H4Vn>2mHqNH>ck}+oa+dv`Kl3Rw>h&e@qwFNjId|
koUTvTNKj_J#H`|JpL&Cxt7^HsGtfW=Pgg&ebxsLQ0ADdHCjbBd

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
index 0cba2f59d93..bf72088bae0 100644
--- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
+++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
@@ -214,6 +214,12 @@
         },
         {
             "name": "vials"
+        },
+        {
+            "name": "envelope"
+        },
+        {
+            "name": "france"
         }
     ]
 }

From 098529d60c98b2b27c9dccc859aef155cd4a8a57 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 14:46:13 -0400
Subject: [PATCH 141/366] yeag

---
 .../Catalog/Fills/Boxes/emergency.yml         |  2 +-
 .../Objects/Storage/boxes.rsi/meta.json       | 27 +++++++++----------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
index 5333b2ae07f..dcb5042edac 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
@@ -160,7 +160,7 @@
     - id: DrinkWaterBottleFull
 
 - type: entity
-  parent: BoxSurvivalNitrogen
+  parent: BoxSurvival
   id: BoxMimeNitrogen
   suffix: Emergency N2
   components:
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
index bf72088bae0..bec1257f2a3 100644
--- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
+++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
@@ -1,11 +1,11 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, throwing_knives and vials was drawn by Ubaser, evidence_markers by moomoobeef, Boxes by mefinks.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, throwing_knives and vials was drawn by Ubaser, evidence_markers by moomoobeef, Boxes by mefinks.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
     "states": [
         {
             "name": "beaker"
@@ -35,7 +35,7 @@
             "name": "sechud"
         },
         {
-        "name": "bottle"
+            "name": "bottle"
         },
         {
             "name": "box"
@@ -155,12 +155,12 @@
             "name": "writing_of_doom"
         },
         {
-        "name": "headset"
+            "name": "headset"
         },
         {
             "name": "encryptokey"
-    },
-    {
+        },
+        {
             "name": "inhand-left",
             "directions": 4
         },
@@ -215,11 +215,8 @@
         {
             "name": "vials"
         },
-        {
-            "name": "envelope"
-        },
         {
             "name": "france"
         }
     ]
-}
+}
\ No newline at end of file

From 6d1fd45b2ea9f79ee430fdbcc97a054565c2718c Mon Sep 17 00:00:00 2001
From: themias <89101928+themias@users.noreply.github.com>
Date: Thu, 15 Aug 2024 15:30:08 -0400
Subject: [PATCH 142/366] Cook-able cutlets for kebabs/tacos (#31048)

---
 .../Construction/Graphs/food/steak.yml        | 122 ++++++++++++++++++
 1 file changed, 122 insertions(+)

diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/food/steak.yml b/Resources/Prototypes/Recipes/Construction/Graphs/food/steak.yml
index bbf8f5ef54d..4c104003319 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/food/steak.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/food/steak.yml
@@ -173,3 +173,125 @@
       - minTemperature: 345
   - node: bacon
     entity: FoodMeatBaconCooked
+
+# cutlets
+
+- type: constructionGraph
+  id: Cutlet
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: cutlet
+      completed:
+      - !type:PlaySound
+        sound: /Audio/Effects/sizzle.ogg
+      steps:
+      - minTemperature: 335
+  - node: cutlet
+    entity: FoodMeatCutletCooked
+
+- type: constructionGraph
+  id: BearCutlet
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: bear cutlet
+      completed:
+      - !type:PlaySound
+        sound: /Audio/Effects/sizzle.ogg
+      steps:
+      - minTemperature: 345
+  - node: bear cutlet
+    entity: FoodMeatBearCutletCooked
+
+- type: constructionGraph
+  id: PenguinCutlet
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: penguin cutlet
+      completed:
+      - !type:PlaySound
+        sound: /Audio/Effects/sizzle.ogg
+      steps:
+      - minTemperature: 345
+  - node: penguin cutlet
+    entity: FoodMeatPenguinCutletCooked
+
+- type: constructionGraph
+  id: ChickenCutlet
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: chicken cutlet
+      completed:
+      - !type:PlaySound
+        sound: /Audio/Effects/sizzle.ogg
+      steps:
+      - minTemperature: 345
+  - node: chicken cutlet
+    entity: FoodMeatChickenCutletCooked
+
+- type: constructionGraph
+  id: DuckCutlet
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: duck cutlet
+      completed:
+      - !type:PlaySound
+        sound: /Audio/Effects/sizzle.ogg
+      steps:
+      - minTemperature: 335
+  - node: duck cutlet
+    entity: FoodMeatDuckCutletCooked
+
+- type: constructionGraph
+  id: LizardCutlet
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: lizard cutlet
+      completed:
+      - !type:PlaySound
+        sound: /Audio/Effects/sizzle.ogg
+      steps:
+      - minTemperature: 345
+  - node: lizard cutlet
+    entity: FoodMeatLizardCutletCooked
+
+- type: constructionGraph
+  id: SpiderCutlet
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: spider cutlet
+      completed:
+      - !type:PlaySound
+        sound: /Audio/Effects/sizzle.ogg
+      steps:
+      - minTemperature: 345
+  - node: spider cutlet
+    entity: FoodMeatSpiderCutletCooked
+
+- type: constructionGraph
+  id: XenoCutlet
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: xeno cutlet
+      completed:
+      - !type:PlaySound
+        sound: /Audio/Effects/sizzle.ogg
+      steps:
+      - minTemperature: 345
+  - node: xeno cutlet
+    entity: FoodMeatXenoCutletCooked
\ No newline at end of file

From ab36db69e197d9f9c3e5939bb707203e9b7dcb0d Mon Sep 17 00:00:00 2001
From: Sphiral <145869023+SphiraI@users.noreply.github.com>
Date: Sun, 21 Jul 2024 12:16:58 -0500
Subject: [PATCH 143/366] The Shelfs Update (#27858)

* goofed up

* wip, mostly test sprites

* Nearly done, just need to fix storage locks

* everything done to my knowledge

* Alright, construction tested and working, and updated health spread

* remove a single comment I forgot. Pending sprite changes.

* Update sprites and add chemistry locked preset

* Forgot to remove a comment
---
 .../Objects/Consumable/Drinks/drinks.yml      |   3 +
 .../Objects/Consumable/Food/ingredients.yml   |   6 +
 .../Entities/Structures/Wallmounts/shelfs.yml | 475 ++++++++++++++++++
 .../Construction/Graphs/furniture/shelfs.yml  | 268 ++++++++++
 .../Recipes/Construction/storage.yml          | 148 ++++++
 Resources/Prototypes/tags.yml                 |   6 +
 .../Medical/chemistry.rsi/base.png            | Bin 0 -> 692 bytes
 .../Medical/chemistry.rsi/chem-0.png          | Bin 0 -> 108 bytes
 .../Medical/chemistry.rsi/chem-1.png          | Bin 0 -> 233 bytes
 .../Medical/chemistry.rsi/chem-2.png          | Bin 0 -> 311 bytes
 .../Medical/chemistry.rsi/chem-3.png          | Bin 0 -> 393 bytes
 .../Medical/chemistry.rsi/chem-4.png          | Bin 0 -> 520 bytes
 .../Medical/chemistry.rsi/chem-5.png          | Bin 0 -> 605 bytes
 .../Medical/chemistry.rsi/chem-6.png          | Bin 0 -> 710 bytes
 .../Medical/chemistry.rsi/closed.png          | Bin 0 -> 267 bytes
 .../Medical/chemistry.rsi/locked.png          | Bin 0 -> 109 bytes
 .../Medical/chemistry.rsi/meta.json           |  47 ++
 .../Medical/chemistry.rsi/open.png            | Bin 0 -> 267 bytes
 .../Medical/chemistry.rsi/unlocked.png        | Bin 0 -> 107 bytes
 .../Departments/Service/bar.rsi/bar-0.png     | Bin 0 -> 170 bytes
 .../Departments/Service/bar.rsi/bar-1.png     | Bin 0 -> 238 bytes
 .../Departments/Service/bar.rsi/bar-10.png    | Bin 0 -> 652 bytes
 .../Departments/Service/bar.rsi/bar-11.png    | Bin 0 -> 690 bytes
 .../Departments/Service/bar.rsi/bar-12.png    | Bin 0 -> 729 bytes
 .../Departments/Service/bar.rsi/bar-2.png     | Bin 0 -> 306 bytes
 .../Departments/Service/bar.rsi/bar-3.png     | Bin 0 -> 305 bytes
 .../Departments/Service/bar.rsi/bar-4.png     | Bin 0 -> 417 bytes
 .../Departments/Service/bar.rsi/bar-5.png     | Bin 0 -> 445 bytes
 .../Departments/Service/bar.rsi/bar-6.png     | Bin 0 -> 489 bytes
 .../Departments/Service/bar.rsi/bar-7.png     | Bin 0 -> 546 bytes
 .../Departments/Service/bar.rsi/bar-8.png     | Bin 0 -> 577 bytes
 .../Departments/Service/bar.rsi/bar-9.png     | Bin 0 -> 613 bytes
 .../Departments/Service/bar.rsi/base.png      | Bin 0 -> 672 bytes
 .../Departments/Service/bar.rsi/meta.json     |  53 ++
 .../Departments/Service/kitchen.rsi/base.png  | Bin 0 -> 420 bytes
 .../Service/kitchen.rsi/kitchen-0.png         | Bin 0 -> 108 bytes
 .../Service/kitchen.rsi/kitchen-1.png         | Bin 0 -> 188 bytes
 .../Service/kitchen.rsi/kitchen-10.png        | Bin 0 -> 741 bytes
 .../Service/kitchen.rsi/kitchen-11.png        | Bin 0 -> 804 bytes
 .../Service/kitchen.rsi/kitchen-12.png        | Bin 0 -> 818 bytes
 .../Service/kitchen.rsi/kitchen-2.png         | Bin 0 -> 275 bytes
 .../Service/kitchen.rsi/kitchen-3.png         | Bin 0 -> 342 bytes
 .../Service/kitchen.rsi/kitchen-4.png         | Bin 0 -> 387 bytes
 .../Service/kitchen.rsi/kitchen-5.png         | Bin 0 -> 465 bytes
 .../Service/kitchen.rsi/kitchen-6.png         | Bin 0 -> 547 bytes
 .../Service/kitchen.rsi/kitchen-7.png         | Bin 0 -> 564 bytes
 .../Service/kitchen.rsi/kitchen-8.png         | Bin 0 -> 585 bytes
 .../Service/kitchen.rsi/kitchen-9.png         | Bin 0 -> 650 bytes
 .../Departments/Service/kitchen.rsi/meta.json |  53 ++
 .../Storage/Shelfs/glass.rsi/base.png         | Bin 0 -> 223 bytes
 .../Storage/Shelfs/glass.rsi/closed.png       | Bin 0 -> 267 bytes
 .../Storage/Shelfs/glass.rsi/locked.png       | Bin 0 -> 109 bytes
 .../Storage/Shelfs/glass.rsi/meta.json        |  29 ++
 .../Storage/Shelfs/glass.rsi/open.png         | Bin 0 -> 267 bytes
 .../Storage/Shelfs/glass.rsi/rbase.png        | Bin 0 -> 549 bytes
 .../Storage/Shelfs/glass.rsi/unlocked.png     | Bin 0 -> 107 bytes
 .../Storage/Shelfs/metal.rsi/base.png         | Bin 0 -> 352 bytes
 .../Storage/Shelfs/metal.rsi/closed.png       | Bin 0 -> 267 bytes
 .../Storage/Shelfs/metal.rsi/locked.png       | Bin 0 -> 109 bytes
 .../Storage/Shelfs/metal.rsi/meta.json        |  29 ++
 .../Storage/Shelfs/metal.rsi/open.png         | Bin 0 -> 267 bytes
 .../Storage/Shelfs/metal.rsi/rbase.png        | Bin 0 -> 352 bytes
 .../Storage/Shelfs/metal.rsi/unlocked.png     | Bin 0 -> 107 bytes
 .../Storage/Shelfs/wood.rsi/base.png          | Bin 0 -> 525 bytes
 .../Storage/Shelfs/wood.rsi/closed.png        | Bin 0 -> 375 bytes
 .../Storage/Shelfs/wood.rsi/locked.png        | Bin 0 -> 108 bytes
 .../Storage/Shelfs/wood.rsi/meta.json         |  29 ++
 .../Storage/Shelfs/wood.rsi/open.png          | Bin 0 -> 483 bytes
 .../Storage/Shelfs/wood.rsi/rbase.png         | Bin 0 -> 525 bytes
 .../Storage/Shelfs/wood.rsi/unlocked.png      | Bin 0 -> 107 bytes
 70 files changed, 1146 insertions(+)
 create mode 100644 Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml
 create mode 100644 Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/base.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-0.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-1.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-2.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-3.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-4.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-5.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-6.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/closed.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/locked.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/meta.json
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/open.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/unlocked.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-0.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-1.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-10.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-11.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-12.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-2.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-3.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-4.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-5.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-6.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-7.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-8.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-9.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/base.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/meta.json
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/base.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-0.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-1.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-10.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-11.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-12.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-2.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-3.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-4.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-5.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-6.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-7.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-8.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-9.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/meta.json
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/glass.rsi/base.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/glass.rsi/closed.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/glass.rsi/locked.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/glass.rsi/meta.json
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/glass.rsi/open.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/glass.rsi/rbase.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/glass.rsi/unlocked.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/metal.rsi/base.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/metal.rsi/closed.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/metal.rsi/locked.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/metal.rsi/meta.json
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/metal.rsi/open.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/metal.rsi/rbase.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/metal.rsi/unlocked.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/wood.rsi/base.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/wood.rsi/closed.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/wood.rsi/locked.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/wood.rsi/meta.json
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/wood.rsi/open.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/wood.rsi/rbase.png
 create mode 100644 Resources/Textures/Structures/Storage/Shelfs/wood.rsi/unlocked.png

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
index ea6889a6158..55fda71f0fd 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -118,6 +118,9 @@
     solution: drink
   - type: FitsInDispenser
     solution: drink
+  - type: Tag
+    tags:
+      - DrinkGlass
 
 # Transformable container - normal glass
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
index e12fe8a13cb..a458147aa39 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -34,6 +34,9 @@
     solution: food
   - type: TrashOnSolutionEmpty
     solution: food
+  - type: Tag
+    tags:
+      - Ingredient
 
 - type: entity
   abstract: true
@@ -272,6 +275,9 @@
         reagents:
         - ReagentId: Nutriment
           Quantity: 15
+  - type: Tag
+    tags:
+      - Ingredient
 
 - type: entity
   name: dough
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml
new file mode 100644
index 00000000000..af68f5898d2
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml
@@ -0,0 +1,475 @@
+# Parents
+- type: entity
+  abstract: true
+  id: ShelfBase
+  parent: BaseStructure
+  name: shelf
+  description: a strange place to place, well, anything really. You feel like you shouldn't be seeing this.'
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    sprite: Structures/Storage/Shelfs/wood.rsi
+    state: base
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.35,-0.35,0.35,0.35"
+        density: 35
+        layer:
+        - BulletImpassable
+  - type: Transform
+  - type: Damageable
+    damageModifierSet: Wood
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 60
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroyHeavy
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: WallMount
+    arc: 175
+  - type: Storage
+    grid:
+    - 0,0,3,1
+    - 0,3,3,4
+    maxItemSize: Normal
+  - type: UserInterface
+    interfaces:
+     enum.StorageUiKey.Key:
+      type: StorageBoundUserInterface
+  - type: InteractionOutline
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+  - type: Tag
+    tags:
+    - Structure
+
+- type: entity
+  abstract: true
+  id: ShelfBaseReinforced
+  parent: ShelfBase
+  name: reinforced shelf
+  description: It looks as strong as reality itself.
+  components:
+  - type: Lock
+  - type: LockVisuals
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/wood.rsi
+    state: base
+    layers:
+    - state: rbase
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: unlocked
+      shader: unshaded
+      # used to keep the unlocked light visible while open. 
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+      shader: unshaded
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateDoorOpen: open
+    stateDoorClosed: closed
+
+  - type: AccessReader
+
+# Normal
+- type: entity
+  id: ShelfWood
+  parent: ShelfBase
+  name: wooden shelf
+  description: A convenient place to place, well, anything really.
+  components:
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 60
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroyHeavy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialWoodPlank1:
+            min: 1
+            max: 3
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Tag
+    tags:
+    - Structure
+    - Wooden
+  - type: Construction
+    graph: Shelf
+    node: ShelfWood
+
+- type: entity
+  id: ShelfMetal
+  parent: ShelfBase
+  name: metal shelf
+  description: A sturdy place to place, well, anything really.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/metal.rsi
+    state: base
+  - type: Damageable
+    damageModifierSet: Metallic
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 120
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 2
+            max: 4
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Tag
+    tags:
+    - Structure
+  - type: Construction
+    graph: Shelf
+    node: ShelfMetal
+
+- type: entity
+  id: ShelfGlass
+  parent: ShelfBase
+  name: glass shelf
+  description: A fragile place to place, well, anything really.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/glass.rsi
+    state: base
+  - type: Damageable
+    damageModifierSet: Glass
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlass:
+            min: 0
+            max: 2
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Tag
+    tags:
+    - Structure
+  - type: Construction
+    graph: Shelf
+    node: ShelfGlass
+
+# Reinforced
+- type: entity
+  id: ShelfRWood
+  parent: ShelfBaseReinforced
+  name: sturdy wood shelf
+  description: A safe place to put your favorite bottle of whiskey
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/wood.rsi
+    state: base
+    layers:
+    - state: rbase
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+      shader: unshaded
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 215
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroyHeavy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialWoodPlank:
+            min: 2
+            max: 5
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Construction
+    graph: Shelf
+    node: ShelfRWood
+
+- type: entity
+  id: ShelfRMetal
+  parent: ShelfBaseReinforced
+  name: sturdy metal shelf
+  description: A strong & shiny place to keep all your vials safe
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/metal.rsi
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 450
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetPlasteel1:
+            min: 2
+            max: 3
+          ShardGlass:
+            min: 1
+            max: 2
+          PartRodMetal1:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Construction
+    graph: Shelf
+    node: ShelfRMetal
+
+- type: entity
+  id: ShelfRGlass
+  parent: ShelfBaseReinforced
+  name: sturdy glass shelf
+  description: Crystal clear reinforced glass doors to show off all your fancy bottles you definitely didn't sell a co-worker's favorite mothroach for.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/glass.rsi
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 250
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetPlastic1:
+            min: 1
+            max: 3
+          ShardGlass:
+            min: 1
+            max: 2
+          PartRodMetal1:
+            min: 0
+            max: 1
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Construction
+    graph: Shelf
+    node: ShelfRGlass
+
+# Departmental
+- type: entity
+  id: ShelfBar
+  parent: ShelfBase
+  name: bar shelf
+  description: Made out of the finest synthetic wood for all alcohol holding needs.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/Departments/Service/bar.rsi
+    state: base
+    layers:
+      - state: base
+      - state: bar-0
+      - map: ["enum.StorageFillLayers.Fill"]
+  - type: Appearance
+  - type: StorageFillVisualizer
+    maxFillLevels: 13
+    fillBaseName: bar
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroyHeavy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialWoodPlank1:
+            min: 1
+            max: 4
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Storage
+    grid:
+    - 0,0,5,1
+    - 0,3,5,4
+    maxItemSize: Normal
+    whitelist:
+      tags:
+        - DrinkGlass
+        - DrinkBottle
+        - DrinkCan
+        - Beer
+  - type: Construction
+    graph: Shelf
+    node: ShelfBar
+
+- type: entity
+  id: ShelfKitchen
+  parent: ShelfBase
+  name: cooking shelf
+  description: Holds knifes, spice, and everything nice!
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/Departments/Service/kitchen.rsi
+    state: base
+    layers:
+      - state: base
+      - state: kitchen-0
+      - map: ["enum.StorageFillLayers.Fill"]
+  - type: Appearance
+  - type: StorageFillVisualizer
+    maxFillLevels: 13
+    fillBaseName: kitchen
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 150
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 4
+          MaterialWoodPlank1:
+            min: 0
+            max: 1
+          PartRodMetal1:
+            min: 0
+            max: 2
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Storage
+    grid:
+    - 0,0,5,1
+    - 0,3,5,4
+    maxItemSize: Normal
+    whitelist:
+      tags:
+        - DrinkGlass
+        - BoxCardboard
+        - MonkeyCube
+        - Enzyme
+        - Mayo
+        - Packet
+        - Cleaver
+        - Knife
+        - KitchenKnife
+        - RollingPin
+        - Ingredient
+        - Trash
+  - type: Construction
+    graph: Shelf
+    node: ShelfKitchen
+
+- type: entity
+  id: ShelfChemistry
+  parent: ShelfBaseReinforced
+  name: chemical shelf
+  description: Keeps all your chemicals safe and out of the clow- er, public hands!
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: unlocked
+      shader: unshaded
+    - state: chem-0
+    - map: ["enum.StorageFillLayers.Fill"]
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+      shader: unshaded
+  - type: StorageFillVisualizer
+    maxFillLevels: 7
+    fillBaseName: chem
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 330
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetPlasteel1:
+            min: 1
+            max: 2
+          SheetPlastic1:
+            min: 1
+            max: 2
+          ShardGlass:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Storage
+    grid:
+    - 0,0,5,1
+    - 0,3,5,4
+    maxItemSize: Normal
+    whitelist:
+      tags:
+        - ChemDispensable
+        - GlassBeaker
+        - Bottle
+  - type: Construction
+    graph: Shelf
+    node: ShelfChemistry
+
+
+
+# Access presets
+# Try to keep alphabetical sorting if adding more
+
+- type: entity
+  parent: ShelfChemistry
+  id: ShelfChemistryChemistrySecure
+  suffix: Chemistry, Secure
+  components:
+  - type: AccessReader
+    access: [["Chemistry"]]
+
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml
new file mode 100644
index 00000000000..61a903f7a0a
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml
@@ -0,0 +1,268 @@
+- type: constructionGraph
+  id: Shelf
+  start: start
+  graph:
+    - node: start
+      actions:
+        - !type:DeleteEntity {}
+      edges:
+# Normal
+        - to: ShelfWood
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: WoodPlank
+              amount: 4
+              doAfter: 2
+        - to: ShelfMetal
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: Steel
+              amount: 5
+              doAfter: 3
+        - to: ShelfGlass
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: Glass
+              amount: 4
+              doAfter: 2
+# Reinforced
+        - to: ShelfRWood
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: WoodPlank
+              amount: 8
+              doAfter: 3
+            - material: Cable
+              amount: 2
+              doAfter: 1
+        - to: ShelfRMetal
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: Plasteel
+              amount: 5
+              doAfter: 3
+            - material: ReinforcedGlass
+              amount: 5
+              doAfter: 2
+            - material: Cable
+              amount: 3
+              doAfter: 1
+        - to: ShelfRGlass
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: Plastic
+              amount: 5
+              doAfter: 2
+            - material: ReinforcedGlass
+              amount: 5
+              doAfter: 3
+            - material: Cable
+              amount: 2
+              doAfter: 1
+# Departmental
+        - to: ShelfBar
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: WoodPlank
+              amount: 6
+              doAfter: 2
+        - to: ShelfKitchen
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: MetalRod
+              amount: 2
+              doAfter: 1
+            - material: Steel
+              amount: 5
+            - material: WoodPlank
+              amount: 3
+              doAfter: 2
+        - to: ShelfChemistry
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: Plasteel
+              amount: 2
+              doAfter: 2
+            - material: ReinforcedGlass
+              amount: 5
+              doAfter: 2
+            - material: Plastic
+              amount: 5
+              doAfter: 2
+            - material: Cable
+              amount: 2
+              doAfter: 1
+
+# Normal deconstructs
+    - node: ShelfWood
+      entity: ShelfWood
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+                prototype: MaterialWoodPlank1
+                amount: 4
+          steps:
+            - tool: Prying
+              doAfter: 2
+
+    - node: ShelfMetal
+      entity: ShelfMetal
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+                prototype: SheetSteel1
+                amount: 5
+          steps:
+            - tool: Screwing
+              doAfter: 5
+
+    - node: ShelfGlass
+      entity: ShelfGlass
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+                prototype: SheetGlass1
+                amount: 4
+          steps:
+            - tool: Screwing
+              doAfter: 2
+# Reinforced deconstructs
+    - node: ShelfRWood
+      entity: ShelfRWood
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+                prototype: MaterialWoodPlank1
+                amount: 8
+            - !type:SpawnPrototype
+                prototype: CableApcStack1
+                amount: 2
+          steps:
+            - tool: Screwing
+              doAfter: 5
+            - tool: Prying
+              doAfter: 2
+
+    - node: ShelfRMetal
+      entity: ShelfRMetal
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+                prototype: SheetPlasteel1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: SheetRGlass1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: CableApcStack1
+                amount: 3
+          steps:
+            - tool: Screwing
+              doAfter: 2
+            - tool: Welding
+              doAfter: 5
+
+    - node: ShelfRGlass
+      entity: ShelfRGlass
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+                prototype: SheetPlastic1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: SheetRGlass1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: CableApcStack1
+                amount: 2
+          steps:
+            - tool: Welding
+              doAfter: 2
+            - tool: Screwing
+              doAfter: 4
+
+# Departmental deconstructs
+    - node: ShelfBar
+      entity: ShelfBar
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+                prototype: MaterialWoodPlank1
+                amount: 6
+          steps:
+            - tool: Prying
+              doAfter: 3
+
+    - node: ShelfKitchen
+      entity: ShelfKitchen
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+                prototype: PartRodMetal
+                amount: 2
+            - !type:SpawnPrototype
+                prototype: SheetSteel1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: MaterialWoodPlank1
+                amount: 3
+          steps:
+            - tool: Screwing
+              doAfter: 2
+            - tool: Welding
+              doAfter: 2
+            - tool: Prying
+              doAfter: 1
+
+    - node: ShelfChemistry
+      entity: ShelfChemistry
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+                prototype: SheetPlasteel1
+                amount: 2
+            - !type:SpawnPrototype
+                prototype: SheetPlastic1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: SheetRGlass1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: CableApcStack1
+                amount: 2
+          steps:
+            - tool: Welding
+              doAfter: 2
+            - tool: Screwing
+              doAfter: 1
+            - tool: Anchoring
+              doAfter: 2
+            - tool: Prying
+              doAfter: 4
diff --git a/Resources/Prototypes/Recipes/Construction/storage.yml b/Resources/Prototypes/Recipes/Construction/storage.yml
index c8edebc5096..7128c79eee8 100644
--- a/Resources/Prototypes/Recipes/Construction/storage.yml
+++ b/Resources/Prototypes/Recipes/Construction/storage.yml
@@ -67,3 +67,151 @@
   canBuildInImpassable: false
   conditions:
     - !type:TileNotBlocked
+
+# Shelfs
+# Normals
+- type: construction
+  id: ShelfWood
+  name: wooden shelf
+  description: A convenient place to place, well, anything really.
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfWood
+  icon:
+    sprite: Structures/Storage/Shelfs/wood.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+- type: construction
+  id: ShelfMetal
+  name: metal shelf
+  description: A sturdy place to place, well, anything really.
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfMetal
+  icon:
+    sprite: Structures/Storage/Shelfs/metal.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+- type: construction
+  id: ShelfGlass
+  name: glass shelf
+  description: Just like a normal shelf! But fragile and without the walls!
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfGlass
+  icon:
+    sprite: Structures/Storage/Shelfs/glass.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+# Reinforced
+- type: construction
+  id: ShelfRWood
+  name: sturdy wooden shelf
+  description: The perfect place to store all your vintage records.
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfRWood
+  icon:
+    sprite: Structures/Storage/Shelfs/wood.rsi
+    state: rbase
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+- type: construction
+  id: ShelfRMetal
+  name: sturdy metal shelf
+  description: Nice and strong, and keeps your maints loot secure.
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfRMetal
+  icon:
+    sprite: Structures/Storage/Shelfs/metal.rsi
+    state: rbase
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+- type: construction
+  id: ShelfRGlass
+  name: sturdy glass shelf
+  description: See through, decent strength, shiny plastic case. Whats not to love?
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfRGlass
+  icon:
+    sprite: Structures/Storage/Shelfs/glass.rsi
+    state: rbase
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+# Departmental
+- type: construction
+  id: ShelfBar
+  name: bar shelf
+  description: A convenient place for all your extra booze, specifically designed to hold more bottles!
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfBar
+  icon:
+    sprite: Structures/Storage/Shelfs/Departments/Service/bar.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+- type: construction
+  id: ShelfKitchen
+  name: cooking shelf
+  description: Holds your knifes, spice, and everything nice!
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfKitchen
+  icon:
+    sprite: Structures/Storage/Shelfs/Departments/Service/kitchen.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+- type: construction
+  id: ShelfChemistry
+  name: chemical shelf
+  description: Perfect for keeping the most important chemicals safe, and out of the clumsy clowns hands!
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfChemistry
+  icon:
+    sprite: Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 46a2f5f70e0..9e611d75153 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -561,6 +561,9 @@
 - type: Tag
   id: DrinkCan
 
+- type: Tag
+  id: DrinkGlass
+
 - type: Tag
   id: DrinkSpaceGlue
 
@@ -789,6 +792,9 @@
 - type: Tag
   id: Igniter
 
+- type: Tag
+  id: Ingredient
+
 - type: Tag #Drop this innate tool instead of deleting it.
   id: InnateDontDelete
 
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/base.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d67101d2fc367f5c3efabe8639b97017257635c
GIT binary patch
literal 692
zcmV;l0!#ggP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%Zb?KzR9J=WRzGMHQ5gT_PjkIX!d*;Fa-kHD#GymMrHj;)=%Q05g(3wP$?WXx
ztec1g1aVOuGQ~v#MO?b1RSb=SrIbsfiOqRUV&!Zd^zQO5?=DG|bTGf^eed_Z@B6(!
z-^T+c_}}5_HL}_4(KwP83I#K--%jT9d9W;N+8oDO<XuZ|=XRS|$K4BB#vN-PoleIb
zYnp~!E=R2E6953!YL%*-{bY^1HXnj3m#OPTQG~}s96BkWmwfc<;~D@&_R5PlZ(K)B
zQJ^gsE$8Mg5y;Mo$s`^>eTKcrxitW|bveCA6Xm5%8pqc7cF?76Wds;8dauG&K)qi7
zXUXj%n$2b(M|}gsApGPiVQVWz2TylUuV9=Qcmkgj5*}7I5%Q5*y_fD2_TfHRmiv`W
zs0j)9@)rWwxV|(k1RyX0=(-NCy5s2E%N_Ew5SRcCP6hD8t1ory{?|hbh(@DmwOWYH
zL7q!Sab{))0I=0)U^W&905F_@ou>2Fj+kk%em?>c9}t0en^9#W_CNs!);Hc@eZw)w
z$XK42sPlvXRaMQgD4bsffU`d<veAg_FW(8;O3`dYAAIwxf2L)7jy?eZy;gez8#qoG
z(qf-@8J@TR$0`_v<8;1}s=&Z*Lc)W0??+CCudSgPk?R$NMP26OK{ppy@bMtRqAt7n
zP)|Tn6lx=i@d5yVoAP6;(HKfZA{4^*lqxHVf>bIsSU{~-0{~p)8KC_gX#Z}p5`cvl
z7fe6TmFL8|g_qaN@mm`w@eC2$RR92_(`o8%PIJyaZk!v44_YRZ8OyJ@R4RD}drdIG
anD7hV)XtMD4qp-g0000<MNUMnLSTXj%{2S~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-0.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..199a65fb95992da0169ade39d85b1d6884fc5323
GIT binary patch
literal 108
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}YMw5RArY-_
z&l&PE7;rEc_{o)=*?&lpStyFN7bv~sN$9_q%x^B=Gi0>cq@Gs=6k_mn^>bP0l+XkK
DN_QQ_

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-1.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..47ee108f18c6ba3e19ba03b4510b862b4e703184
GIT binary patch
literal 233
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}i#=T&Ln2y}
z6C_v{Cy4Zv9PsdHJbY}nyM%<q8q0n4J2omGikW<iFF`5crxhC;TXwl?-(q_URuh}>
zITnt&>;l3}{}bOZ|9i!9HTWtcpLG7Z-AkfY{m#3;*O~_i<|!4kY<G`{2)N8xvAChJ
zu`%)Q>!hj8yMk?3WNI2EC@xv>ubG7z2%4MUMDe%1fA4?klp@F-O@RhnZU;3aSe3;Y
Z7&H>pj7p#CZvi@&!PC{xWt~$(695g5P=f#f

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-2.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..77a54a15cef75cea27d1362369af7614827dae4b
GIT binary patch
literal 311
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}A3a?hLn2y}
z6C_v{Cy4Zv9PsdHJbY}nyM%<q8q0n4J2omGiV;?uH*@As`D63!YONfLPZTu(6}$#2
zV7e=6+4pYG|HHFB|NcGswz7^6P*7r?O(j!#Lr)J+t_(vd%bi8c|6Ub*)$@2%J>kg8
zR}AgF=GS9`bg$NKe}7Mw4G8=vS~h{S#+co+Ns`(WFrl%rQE{4T-_DYM$Nxu9T+}Xd
zz{TU>uj@y(*h`mJB~1Q&<MFz$RmZ(ci*(u;#hkca*?Sm(fW?V*UlV@(`={db=f|vy
ywU6Z$a`M{vr|d`+>1hfy;Bq^t0rFuBGlTO(_f$i#-`jznXYh3Ob6Mw<&;$V1`F_>_

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-3.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..ddd26ba62701212cd38959dfa7b0b63db2337528
GIT binary patch
literal 393
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<&YmugArY;~
z2@<S}6GVDS4tRJp9zHhPT|z=)jpe@j9UGMo#R#j-n>q8R{IPj<wN_o0deZrFiU0pO
zR%lPE+9dN}!^dY<Y;0`~<*t2;t>6FO@a)gOe^0(~aC5T(Mb-W19gtN}RzA$J`3FC9
z^VZ!;#{)s)%;s^?oB#Z-W}ffd!O6J8mHp4vhp%EM9Qm%$sl3|#y0cNijf&#A7fkox
z<_Rv@X6$qE=DVGbj&QDc>aG>JdR^G2u-LuFDj&Cf@0xr)@lpE~$#<q+hB3KQl6F*i
z%zY^5!zZ4g^rYkK`tDG^SAJg)s6F3!Jofe1zUi+{B>lEGu1QZwNGN!c`k-awM@BIx
zu2=RR1|VQ@V%^t-AOHTT`26`Xt77eAd4-%jHjd=}{kwRXO)ko{dC1;<ygtwQL|>o*
jm)k)NNPsm><Yib`P=5LIGDcBg*fMy!`njxgN@xNAVJWE{

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-4.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..942f3df3ad2dad9a5cfe08b0553ee4c01300003d
GIT binary patch
literal 520
zcmV+j0{8uiP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$!bwCyR9J;$U>F6XU=)mWz(`1e!^WFO7#J9=Ilh0mu_MA<6DFRSnfV{ao<4m#
zia9PDZysU){y}&vl6tZn;IQ%LItB)YKzBusqdV{au;%>!{^a%u3kwDY28Jh3p1>U-
zBO}8Iv-l4KgSERN$593b28IJSUR$&L`+EbQLx>3hxJ3v2)#2)0ki_>Oi6g5=*F!RJ
z*m!fD&^5o?3{!NrGfdIh?z!T`38>{qDp{+pR<c%Iy~cUthWCn-*J0v^)EVwIN-<n*
zlw!DgNS)yxOb!=dBIJnmuZvX<>Q42*Cg-uoUF-FZm+Hu3`#&>$XJBApaO7p+gt74f
z7D5W@KS(ezFfcGU$gcHZ`2PMRO#Jwoc&+0fAZ%_12xE`Gx(x#~(H@3K9o^%vZbQh9
zQ81u@U>0#In)VXL-q)8UPHhL^O@!{1EAN?^s=tBpS=m?K+u0tjL`?_a4T0l#@1JO#
zbJrZkuTN1vX{oGeK}`n`%!ZTW`Ch(Z6%}V-U|`sG@uN8*^`rv41ySRiyKD>$3=AT_
zU%wRj{rctU({IjG+W`a<p-1H&c-g+A-G%&eeH4s>Q7{SyD*ym^+n>E~C=Pr80000<
KMNUMnLSTZVlj>^#

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-5.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-5.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b7430d80959724d2f248e5c254936089d2e0ebe
GIT binary patch
literal 605
zcmV-j0;2tiP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%7fD1xR9J;$U>F6XU=)mWz(`1e!^WFO7#J9=Ilh0mu_MA<6DFRSnfV{ao<4m#
zia9PDZysU){y}&vl6tZn;IQ%LItB)YKzBusqdV{au;%>!{^a%u3kwDY28Jh3p1>U-
zBO}8Iv-l4KgSERN$593b28IJSUR$&L`+EbQLx>3hxJ3v2)#2)0ki_>Oi6g5=*F!RJ
z*m!fD&^5o?3{!NrGfdIh?z!T`38>{qDp{+pR<c%Iy~cUthWCn-*J0v^)EVwIN-<n*
zlw!DgNS)yxOb!=dBIJnmuZvX<>Q42*Cg-uoUF-FZm+Hu3`#&>$XJBApaO7p+gt74f
z7D5W@KS(ezFfcGU$gcHZ`2PMRO#Jwoc&+0fAZ%_12xE`Gx(x#~(H@3K9o^%vZbQh9
zQ81u@U>0#In)VXL-q)8U4r4nPF1W|Qz`(G#KS7BS2jESF?v*R=nVG7;f$>?{SKiy%
z9<JnExZs|ZtpPNJFStjEBk*R!h7_|`r%%7pg5ib~vsVlZ3=FIsG9S*Jd8>8q%v-IN
z9Q#+~TF$^gL^hlp&-d~TtEe~w0|UdhiyzGy7#JApQ<Q(zd6_?J+ICWE`z44Nxd3kn
zG|sup#=yY9AoBb5OOfBNU!Few<~*`^otOEuQ>P$e<N|_;(4%q>ylmgm?gCfuUA6Z=
r0|NuY);4GI%lc6;3P!;w7z_Xa8xYH1*bm_900000NkvXXu0mjf_}~@3

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-6.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-6.png
new file mode 100644
index 0000000000000000000000000000000000000000..e415ee1a7e8898bca03da2d4cb2b7b4d7fa4e2c6
GIT binary patch
literal 710
zcmV;%0y+JOP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%fJsC_R9J=WlU+ztVHn5%E9bT%f|3%M7qj5tH2Q$lHlx)hTMimsC3ca7H<ND6
zs|_@*XjkQp=}p9L1cf!(g*a&|v)S2)%x-2Ia?ZK2XdmLBiv^~qi}{YD=uUOxMdt^H
z^SuA(f6nu~FV71|NJ#we$ixf=Un&GZuPo$~{*LB)qTB6up2TBgV>|w1@})wGLjL5m
z!2eGT7<?%&fZJw`a$%PHsaF-&BQqT>Eda2(x>{;LtyarO;a`B>tWhoiz+5t`uh`m5
zmTTlsPM}n1&PJ8|CV?Ih=tBSQZ~hvCFXcV4d}{?GjWZZ&oVhs>4sRC^IpofSL+(s0
ztCC6UMC1$6=P9s5HAoEAATdvYCAs}LB-X@Kw(snRb1yA><tzcSHtSDQLhbzz6ae7*
zF{nsfjtViuqkJ_0z)<_fg2H-)=(Ojamd+RBqbLRe8`X;Kq5W7)Ed*>-t5^+*14Z<T
z+;}*eCh@x$J*P=*>~*sM5FGBRBU)SEc<BnheSTL)GaL^9SI%hmty6Xg&5lX7=`xig
zYq?^Qops%*GxoY!-PH@*6Yge%!(DZ4edBzKzG0box3=8u!00Ej{guClgWXM;SS+U{
z&tP{`1_0zrbw0khrj0MIX`ep0mLdN3^T)Lwk51+B=u}Eot>$r$E>fwe7Hwi*Xod@~
zB%|MHhU005<NLjzd7`&br@qn*#}7;uHLEko*LNOaX@=YJwmO4+xf*3pVCWT72>?|a
z*>u%LHXV!QmW291d-Jzww5aXoet!e^`bi?QS5AoN5Lz68(hmGCQ^`+uHvP;f6L{l?
sWwMK8y~*=SewXQzSPcmY35f&cH@C12VU!4N-T(jq07*qoM6N<$f|40ef&c&j

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/closed.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..c79f80c0c2310f301d6313426bec0a4a53311631
GIT binary patch
literal 267
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}M?GB}Ln2y}
z6C_v{Cy4MEBpgvql)tpGf0meROz^`N-#M()*;s?u9&X_=y)wzbvh0@_KQr@T#v<8c
zF6-Q~8UxvTtQeLvFH(A2!jXAz)29_;%*@QqJ+qj;$~yEYM-}NjG@JaIV-8=$wm%m{
zlVlDaIB?*@lWWYIWE;&{I4l>Xo%+Z=#i}Vm>cDf3`30}DPfVNim}Ai;2E&Vv>y$at
zoTIFp5|mVq2^w&pEMy7noG`6VL4x&%%)*uHzcoj=_cR3>aJez+F)&okPTdx?G;ANx
OLkym-elF{r5}E+_<zO`c

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/locked.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..3156cb9fa1ede110d5df6a043f7574c1460e3aa5
GIT binary patch
literal 109
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}>Ygr+ArY-_
z&lxf@FmNy{B(JG=WzOK>m-lcGEx2&9#OOXh14F}P)<<txT=#`0yaH-r@O1TaS?83{
F1OPIS9Kiqp

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/meta.json b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/meta.json
new file mode 100644
index 00000000000..a3fb20976ef
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/meta.json
@@ -0,0 +1,47 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "chem-0"
+    },
+    {
+      "name": "chem-1"
+    },
+    {
+      "name": "chem-2"
+    },
+    {
+      "name": "chem-3"
+    },
+    {
+      "name": "chem-4"
+    },
+    {
+      "name": "chem-5"
+    },
+    {
+      "name": "chem-6"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/open.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce50773db8745e7981db0dc15c2d8c064bad556d
GIT binary patch
literal 267
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}M?GB}Ln2y}
z6C_v{Cy4MEBpgvql)tpGf0meROz^`N-#M()*;s?u9<KlYr|dxbifOB6JZaVDzZqtF
zRAa(x1GOU4AnqQkge!~|vI3%+%NH+FTHEUXxpD1tm&|7jY(QWddh+@YnTu00^&E`Z
zb)xHDa2fV3n8_>w1lw}$KTFM5ezk1=AE4ZUOAL1I78TNam(66JpsOk(WKzsvE8}P&
zc<Gj)i>gyhpMb!FsY_Neb67e#xO~{SKtca#>qQNat5cX6F8&C9wPEE|TcC#+JYD@<
J);T3K0RU(OUmpMf

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/unlocked.png
new file mode 100644
index 0000000000000000000000000000000000000000..39d2fb77884f3e7d5ec21c0538d18761652efca5
GIT binary patch
literal 107
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}s-7;6ArY-_
z&lxf@FmN2+P<d#-nZ<+y2Pa=~5Pq<r>i0jO8VkuLc9xTmmm7EjISihzelF{r5}E**
CYagWm

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-0.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..c090326148dd2c90eda107a749782cd9a2c9f7ba
GIT binary patch
literal 170
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}DV{ElArY;~
z2@<S}6GVEN0v(he%nko{#d`f8O~q0llal5s9cv!V|M5<epZy5quXT3iOH8-a8yXm#
zco=-#Nt@lkz+i>I;*M#72S8xM29xHA*UEs#7;w2A)Bu|qz{1cqk>{w5yu=cqeGHzi
KelF{r5}E+2SvuSR

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-1.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d698e0020f00e0d34ad9d97cc5a45c60703f879
GIT binary patch
literal 238
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}D?D8sLn2y}
z6C_v{Cy4Yg2|0K*ysgigebQx8mY-zS?ehmb)*RAF|5~nd#>b}q-@o5Rx$k`yonGzz
zd}_Xtfq_BJ+$);B{<0Sp6*3dFf4sd|9_Gm$?WnZXqw|E;zs~pbK2Ff$O8|li-^&!E
z*6v$<UN)2WZ9ESTPtlJn8wIi-eCBSye|S-YhpyI<S-!#nTYrA|zv^uJ%6Zvt2Q?s0
gY6>*qTEWL~T~}T6mg%CuKsPgZy85}Sb4q9e020Jr>;M1&

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-10.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-10.png
new file mode 100644
index 0000000000000000000000000000000000000000..5acb43b17992e3a4febbfbf730ad8712a3205eb4
GIT binary patch
literal 652
zcmV;70(1R|P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%MoC0LR9J=WlwC+uVHn5%XFIx9Yi(_QE{i$Kp|urVj6T$xjSUQ1nRHhdeIUUG
zAxn0=DuOU2(1?Z(DH^d0w?Oft79!Q^Li(_<h*j!fESlQ67z(!S?V^$?rRQwb)%n4D
z@xJf>d7l6K2?z)X2=L&vy^dt}wWS*JCoNY*TtxoMwjYJ0TL1uq)gl4_y2IKe0Ngxl
z%Gn6TMf5D_CU<TGztUonES1hApVDrns-kz65{o1xo!M|swVrC~c(^QAqq8jr0K+{U
zn$>c1+JQu2Dav-&Dd(dL1rsu-5&+oG$K*T1tgKlsfiyISK%4o+im-BZg*J7v(=(m7
zfnRKEG~=360`ZqV^q!X&NUau(Y+@;2a~c6fLXoXCS`K~C=xY}NY|YC+@LuPqnA?j=
zLwP3gCj2dXZY(*LJU*|&`1J)eu|?Vyp;bTIs?ci*0HEa32>_VxdGN0C5k-%q_>AGy
zRlI(6|B12qigCi|kk$l{c>BB9+pZQ)_e_8n`!4J!^%ooR{)7M?uOKu$wDg=d+SE`S
zEdc<G4s`t$BWo5P0f_%rKLLOvb~|B)9+T05E@C-YPyV?H4-mQw5DyT_9(T98NWV@*
z+^w#h4RAVwIK!CVucHxX7&8D2+G+>@L?@@vCo>>AIhAXD{&-D#vc0O7cuo3ctB&}(
zBi05hiTJuBeDd-BBwBQ3L{&&*b}<Fd$M{nG-aQ8rip^>@J2x}){AIX^Z{ED|w>x6h
mJ9ZI&yCe4Biwg({<imH{#=bL)n=~c>0000<MNUMnLSTZk$R=O_

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-11.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-11.png
new file mode 100644
index 0000000000000000000000000000000000000000..328ca05ab739234b57d8248e3ea4bf5cf4e2b9e7
GIT binary patch
literal 690
zcmV;j0!{siP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%Y)M2xR9J=WlwC+uVHn5%XCAfHvaQYUEaogl%OzcmKGd6u0|PCS?(D(}5fnm}
zY+fZnm?O}L#uO=%*u^$MQK-e7*6Kp~u&{_#e!y5XwOtGab9=g|WV5n!9CUSla4z2W
z{GaFlyyv{n0|*ER2=L&1O({jMl^NOeH!W90TtwEZx*ta3Jph2Ad=UYFs#+NWfZG=}
zTP}p*B6{X9(7juZuWW)yvKEenp0Wm+Jjb%gB#4qJ9NEz%-_F!_K8ndz)zanzfRUcg
z?9Fm>`T~KZ3}hZIl`YS&Bu-0OWB?HSd?w|fCn%{)Nru?D1bdtI#fGpfMUHaqT$gz+
z?gD<XuS$y>Ey+mu(hJL_ltgi51zfv=%s^cjc4<HwtyNc?{E%Hxv<hHvTm?7=yFU30
zeaJ1&iUi(xzD2*A3{8g4F3T}>a|N}*RON=yyr0jeu>TSOKzc_#0L=9~e3v`Huv198
zP~31GuU|cQqE5S}o>n)D3+)KJ{Zs5+eIuuPCculMmyc1|mGYS0w{+Cggib}4j(T1*
zfpZr)M~2tiX{SyB>FIO;fZJvw0AL13k<`=xW^j~`KX-E%K-N3`1OTUMYREYJnA|oK
zRh%dzx6MT3V=n3~QPB99EAH|98)m?HA0RW}jNUi2>ZxBPB15Zw%ch)uf!}D<zTd{e
zZ!~HFU`SU;05Cr@i(W}F=4WQN>d&7(O#$uCE22J4LCmSW1Kr-r@=Ed!bbI;a<2@uA
zRhcADVzIco2J=V%di;@+;{oYzg(A4Lu<-n)CzWsBxUsf3`|=MQB5QlI@4uT12nfW(
YcMSv4Nr;lodH?_b07*qoM6N<$f&^+mUH||9

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-12.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-12.png
new file mode 100644
index 0000000000000000000000000000000000000000..77469720a635ab8497a7de25b3a39cdf1bc8560a
GIT binary patch
literal 729
zcmV;~0w(>5P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%lSxEDR9J=Wlv_ws0T{>sXHIQ3*KG5i#hj&Rxugf_qP|QV*vMwmn>|<|f<lPN
z=2IesDS<{brbv;*9^6DlSuN(JtOx00VG*mmG0dj6hk3!&uZK!DDLtn}Pv-~c;hgjT
z{@?#xz7OEx;o;%Hh5StNJy%4>(Vw(z5wH=NYc)R_iS_~jx{?G00Ls$}F96)Wl=0U=
z7&fA3Rz2OjW&J7)5{OsV*1b=K`fypiX^sgJgwopju2R`frl9VTpI2Ual?woRn(E@V
z@@Dl0+#%73Ig%N^IJp!&DlQKP0MF;Ml0!otaiJs>BKtfnRq7X;%3|g5iq-S=#)*If
z{9=Ee8aK*A5%i@QrpuCGQEm<#yFE->;TkMbx71gw$~pBRE;)4tz`lS2SUc)Jx%4ea
zNQ+%}zZv@GdvDk~>^-+A!^q7g6nG*On@SUZ9$O;ZP5=N=HAMh0(e&_L!XP6YLFC1>
z;_G<*>cJCL<Tcf(s!Wt(f&1<6YVTH-u=>w<IC1RCamu=y?Kk_Tnj#w1D9Kb)#Azq6
zo&tMM_r^GdY2=XVq5uH>?F|F~Oh+$5N{hjC^a22Ct+s%-q+fFfK;}EG1OR99^U2Wt
znEKlrDCcAr^|v?BK%aw})8#bK=O9O?g>*J8IXW%>CWH~N-v`JD*nO|-D=Mi~DIk4C
zrC%eRO-or-YSP)X+Xi6u38oDO_4^${OdAYp0O-=B5CBY$jiXtdhRLyUKmGF5!c17K
z1j|zkGi>}h(UOr&2NF}MB_rAI>6~qi&fM%=a<(-(x%hEj5+%wQl7$E{x3UW3$LWpw
zqv<Ey(misyXMT3}`OBdQuD$_dt}b&W9Xw3t>N3}VZ_dNR6A0e{4eIL&hCb1N00000
LNkvXXu0mjf`A1iX

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-2.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5eab596dd4648c3d0651b52b21a060968028c6de
GIT binary patch
literal 306
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Z#-QbLn2y}
z6C_v{Cy4Yg2|0K*ysb~!x2WYyeN0v-tB=acXHy&>YW>!(TX==B=ZMysqOkhoht3@N
z{QUiX{mb9(i4^&5tU7$+%#nZp-|wGa{ai-aG5r19@PAVp8ygc}FY(K)c_t*wG>L6n
z(|x(x^r<ErL{kzH5`KJte&2lVV)=@He}8`GZ5PuNj67=p@vgC4&{0MnAoz4oPou`K
zJbX^p*Vx*39@!cHlM)gp98Oo`-Z;&Ef58u19WDtVm=Q5!hhM$r-`397PVROw(WJA>
xI9J@N`B8uM*<q3AlL8I6+zx6$eKw1kA#j}o^RCM#mx2Cf@O1TaS?83{1OP;6fwlku

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-3.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..116080939b629693556f290eba1899d9c843d3e1
GIT binary patch
literal 305
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}uRUEHLn2y}
z6C_v{Cy4Yg2|0K*ysb~!x2WYyeN0v-tB=acXHy&>YW>!(TX==B=ZMysqOkhoht3@N
z{QUiX{mb9(i4^&5tU7$+%#nZp-`l_2Tilmeam0H4A5CUv=EK)K=U)18M%9W%g*S(F
zzwNJcTA2yjCk`Aq@ZtUW{rOhz_8<QI{`_8^Pd7+uQ&;_?-RU+<x|k(^;K|<DfFE<-
zt+TlLYWJ@@6R%zPcl5vkh4%A4VoAF7bq_yOM~E1Jz(#|@x&MlOaSL+`oAc>v9hv1T
z9I*B0hySb2wrieK1$n3`(16SBpoRpi2|L4W4SOCA9-aL_Z!>th`njxgN@xNAdkTZQ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-4.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..15c03124e69b1c62484d2e10751603caa0312ce4
GIT binary patch
literal 417
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<(Vi}jArY;~
z2@<S}6GVELgdDsY-qxq=Th#KUJ|?S^)kkIJvnh@bwSH^YB_<>!%$S$vx6Qeu%wgK*
zU)Jlki`S)FuHK&vlqm4qSjD{be<$asq!r)KY1hA+8~$%f7T*Mu4WfU(y|7-rq;ahR
zGc)ty{r3O&y_ETTK={=0a|d?*mOXr{XnJu*)Do8z(f>!v&sTJuj}c3fJpcp>@832Z
zdR|hVdgFL`!$j3D@<83$j4772;q$F|fWSXLCiGys+C{|=e-1tTzFuGc?_UrDB;}*y
z6SI8(oPR?9d}lm-^yEFyL3tO^i(6JW7{(p&Si@Y<xT5UuYM{C(Aih2=H10}UXLzpN
zpZSfAjSJ6SpO$3pcJKki?(KQUX3x#Y`)SA4_Fr4<%;Fs{RJqS2B;45B)A;Z|4_n*a
zD`vA-6g{X6oqF1rPps{EXsBLGXn#|n0hilB4Fz5Xh6TNeDQUSE41i(I;OXk;vd$@?
F2>_62xpM#j

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-5.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-5.png
new file mode 100644
index 0000000000000000000000000000000000000000..ece06f2d7866b49989b8ee21e84ca5c1d753c47f
GIT binary patch
literal 445
zcmV;u0Yd(XP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$cS%G+R9J;$U>F6XU=)l35<p6T?SEvxqJ;E+Txy90OvET!(c%HIh*JhdT-jgo
z3j+fK!}K(BvK>N{1LU;~8M2(!-*LUY@H@*{{T%}X1A}vl)f*`NPfU;(Lyvb}`BU$_
z@~2dBz-u-M21x^3!EcYgvq~D+3NkP-F#P-T@0-ri4?LlK><pZ{-!ZH$cR7cqO-e*o
z@lSmBjEDHlW+BD_Fd*;kg2Lx?cV*becYu*4^dAEQ!)pO#Iek~3I}8jA3{P)dRl#Q_
z!4O!tzWd(O$~g>5dQ$&hUq1T#`Gv#p85kHCm{^#&PJcQ5CH$K(!^O$p8G=8EDxzss
zfnvOXs1Oiuieq44V0bub*L5YB*xotEL>L$t7{uE3uj=P=YOQ5>eGQx5g{2vc#Mm(k
z20z%nbu-@VM03mcF);jJv0xs>MK4)k1_Q(HWeg1eXD~4ArncEcm4wf$s$6bzurNHY
ns&XN$dK8R;Q7{Td0cijL)3<BMR9KaF00000NkvXXu0mjfFSWj$

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-6.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-6.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ec7b1f612314181ab17ded713de31275d19bdaf
GIT binary patch
literal 489
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<i#=T&Ln2y}
z6C_v{Cy4Yg2|0K*ysb~!x2WYyeN0v-tIrXQsEdynH+BTGxyIa#|H#eE%zXHZN%1CG
zrzy-&w(>}BnsfDj;oiL;tWQV&l?6&R7k6Ei*7)o1GeO+BzdY_|@cTWVmWLD`$Ts6-
z^JI=bnBTu|vzOEjE+Yd2gFnANzn^{XBEQYTnm0UicHcK#qg!s-zRcIlCG4Yr&G(-6
zA7|1Ok1-l3ynowt=y^$b>W$;&4HH$r$OGMw&6r|Y8$REf2MGN0V?qz6s~r@G*uL-g
zz00R8dAzEE{>R1J{rdg0_3(R12?>cA5i@r9)m#2m{WII(@X?d^C7bL!v=(KCHYV+9
zSRo*g-<6z@kWgWfdA(G1#*KTH$6bJWB#zwry8hMkqO7&46}7yx@3k(K>^XA7kjsN<
zT58z;w^DC4^;#q(I?l9#+^~ClUR%0)9KRr2qe5ZU4gWdJW%+miOt^VFJnv{z<$sVH
zcBmT~zOXs5w2Qfe$yh?7Og}l{hkbKnqWRXdYFaGw!b5l7d6JM=5f}Q@DdMXJG(s*h
ZFa)p_u24=pt_+Mj22WQ%mvv4FO#r6D%&Y(a

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-7.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-7.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9468e2cdfe0803e96cb8900071461a19c86d8a7
GIT binary patch
literal 546
zcmV+-0^R+IP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$+(|@1R9J;$U>F6XU=)l35<p6T?SEvxqJ;E+Txy90OvET!(c%HIh*JhdT-jgo
z3j+fK!}K(BvK>N{1LU;~8M2(!-*LUY@H@*{{T%}X1A}vl)f*`NPfU;(Lyvb}`BU$_
z@~2dBz-u-M21x^3!EcYgvq~D+3NkP-F#P-T@0-ri4?LlK><pZ{-!ZH$cR7cqO-e*o
z@lSmBjEDHlW+BD_Fd*;kg2Lx?cV*becYu*4^dAEQ!)pO#Iek~3I}8jA3{P)dRl#Q_
z!4O!tzWd(O$~g>5dQ$&hUq1T#`Gv#p85kHCm{^#&PJcQ5CH$K(!^O$p8G=8EDxzss
zfnvOXs1Oiuieq44V0bub*L5YB*xotEL>L$t7{uE3uj=P=YOQ5>eGQx5g{2vc#Mm(k
zNCK8+R{!l9?I|vV7#N7mh71f047;~(hG!>U4-p1|AaQEgPn-jGZ{7Tm+1poc#e#YN
z85kHCxF<0&=sd`!iUWuOGZ+|lFJoZ%KZAi`H?_?sDg>TaRk_^cU}1P(Rpmlh^#Fm}
zOD5iSw|D=4d&$Jxr0AnsAz^H2{aQdsMC8M}H*e0KKPpPBKB990AyDdN^y|svdkm#s
kM!%?K<|r5iqkt{|09xgT$Sc6)6#xJL07*qoM6N<$g8Fdm^#A|>

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-8.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-8.png
new file mode 100644
index 0000000000000000000000000000000000000000..d01b2a6bc8774dd113d4aa31f2cba9f46c8b37b2
GIT binary patch
literal 577
zcmV-H0>1r;P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$`$<GWR9J;$U>F6XU=)l35<p6T?SEvxqJ;E+Txy90OvET!(c%HIh*O4vfq{Wx
zlRDFX1_lNOWq-vl3=9km)6>k!b_gReijJ?V{J(hWy7w&1Ogw-7{`+!_rBYB>cGg=)
zW+wLkfB$i333D+9ckV$k%R8_9DFXuo!`4Zi()i3KDg<7$Niawn*b07o^quu8Po5wH
z0|Uc{7a@E)M?dg{^06~;?taIxw%p|$nl>pBS;ar`-7_9i>;M>$_jY0E%VTF?el?q6
zRv{lNr@Je|KK>7kOG5uLtQB}IfUH*E)#r}1hW0N81_n8b9I$SE_r0f;a~PELr2f6W
zeDpW6-03f;zl47iX1F-{J45gXQAISZDo~6Uun<zfz`(#D-W12cz`*cu(yr@DhZtEd
zGKi(>C3i7gy0G(zzF52dRsCE}t+foVuVK@>ur!0HbT$e|0+wY~|Lq#>DK3N<7)Zzk
zySHwJXD40{5e9)EacbC4oC9`m-TaW*+gEPIf_eWL7#JA1CowVTJjkVr1Be1M7#Mah
zV_^6{gMnc;waq3f1fEw_x!mMnVR&9u<w9)-Pz~H(GV!*%z5D;$OD5hXMIY4)31dU+
z*8)N!A|Kwpd2{ysQBh*`kyIDp1EpR@zn(n4$585J^ov?%j)GAz3g`j=RF;&!R({Ca
P00000NkvXXu0mjf5Y+!s

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-9.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-9.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5b86d3e4cd07a8e44c1e5c6876ea5a0f8955e31
GIT binary patch
literal 613
zcmV-r0-F7aP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%A4x<(R9J;$U>F6XU=)l35<p6T?SEvxqJ;E+Txy90OvET!(c%HIh*O4vfq{Wx
zlRDFX1_lNOWq-vl3=9km)6>k!b_gReijJ?V{J(hWy7w&1Ogw-7{`+!_rBYB>cGg=)
zW+wLkfB$i333D+9ckV$k%R8_9DFXuo!`4Zi()i3KDg<7$Niawn*b07o^quu8Po5wH
z0|Uc{7a@E)M?dg{^06~;?taIxw%p|$nl>pBS;ar`-7_9i>;M>$_jY0E%VTF?el?q6
zRv{lNr@Je|KK>7kOG5uLtQB}IfUH*E)#r}1hW0N81_n8b9I$SE_r0f;a~PELr2f6W
zeDpW6-03f;zl47iX1F-{J45gXQAISZDo~6Uun<zfz`(#D-W12cz`*cu(yr@DhZtEd
zGKi(>C3i7gy0G(zzF52dRsCE}t+foVuVK@>ur!0HbT$e|0+wY~|Lq#>DK3N<7)Zzk
zySHwJXD40{5e9)EacbC4oC9`m-TaW*+gEPIf_eWL7#JA1CowVTJjkVr1Be1M7#Mah
zV_^6{gMnc;waq3f1fEw_x!mMnVR&9u<-)+gz_7_fiz@L?7MNqM@n2O%`~Mts4HQS*
zUNZ5vyS@AW+e;?iCdE9G3yBP6$^XJ^EDUdd{b87K_c>g@v7z;A0U;5Q5AWW*IeY%7
zD5>UB3|3U<K2=xK{lB6*_bJ^i9|fae6i@;Hld_{O)i*nh00000NkvXXu0mjf8TJwY

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/base.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff9dd093b6b86c22e61b548f783c5fb7051d2699
GIT binary patch
literal 672
zcmV;R0$=@!P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%T1iAfR9J=WR$Xh;U=)7x(X{E(mC!n7u@}OsOu9KlLGi*HKduDv(m&yk@?N~H
z>}FRA7MXJxx^C*|Hb-nNH8tN&yeN51nzw7CMKA0Fft=@@Jm=&j=kNk^{O@4G#+_x!
z{~JlSPWvP;Kk9sR{}#F5xN;HQz5!VhBQf2+K^3OO$&!fe51$D4;^nJIOsoI^c>Sgh
zo@KDJ{T5lCjrere0|3|qAFelS7|${gxZz9D;)B?mH?GHWQ48Q%21gwm&5lKLPei4V
zjyzi_q;a7jP-EFqB4umjZDt99W0117$prxMHqHX$G-sbFA?5|dra;w9GHOq*74Wrh
z!X0?vITq)n%vAR0j*G|ZGSPg0tV4G_sG2#s0AM)d08o_ku)x8wOr+8o6lG~D8=W5H
z{NgXcW1VPDRe<aHsFp-DPTH^sJ_L>d=h$ee-$-|~z5(^SJ``aY2%d?CVIs@3sFp+=
zwY%imYDq-fa3>dV`okrHyC(**{}js$JXu7en$({#SVWpRAlJQ1ixE2sAJ!ZN^%De3
zW38Np?s!;{(|Eqq#e>y6_PZ9cDK-%g$De)?E#)%gJ`k%ZJpe#W>0w1qC+2C|V+#o5
z>XJyr0@RdVV*V^pKS6-4eT&-Or2I!UKK}uz9SBAZ0P2TMq`mb+=ePK<=9wK(_72F>
zc>1tP_ywhjjnxWnuSesj;h$~3gFWz}>>b1kh|I?2T*kj!$)Rny<dieZ6H!s*vDwtn
z(9H2?LI5a=L;8HVOmip3msV@6FV=yXWSoF-2j-aLpW`Ql@R3vi+r;ev0000<MNUMn
GLSTaZEImE|

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/meta.json b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/meta.json
new file mode 100644
index 00000000000..79e0904dd92
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/meta.json
@@ -0,0 +1,53 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "bar-0"
+    },
+    {
+      "name": "bar-1"
+    },
+    {
+      "name": "bar-2"
+    },
+    {
+      "name": "bar-3"
+    },
+    {
+      "name": "bar-4"
+    },
+    {
+      "name": "bar-5"
+    },
+    {
+      "name": "bar-6"
+    },
+    {
+      "name": "bar-7"
+    },
+    {
+      "name": "bar-8"
+    },
+    {
+      "name": "bar-9"
+    },
+    {
+      "name": "bar-10"
+    },
+    {
+      "name": "bar-11"
+    },
+    {
+      "name": "bar-12"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/base.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..b302518d3dead8e2875e3b3dbfb2f494459ead49
GIT binary patch
literal 420
zcmV;V0bBlwP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$UP(kjR9J=WmpzJuKpe$ivSKl85rp6t9w3Fi*tn&w)!u85-~|@XV4(+C7oxR|
z2th5TShC3$;;bKIh#Qqa{8jVu_q~VA{9%BFM`u-^SeA93!_;vc<}0)}4a2~0w_|fj
zlDHy=!=W+1rf$FA!*$)pekT9`*tX3TyA@5-I&0hj0O0#R8!L)}EXxL&Z8jUkam?nr
zu5;_wgH$J=6M#}WnHf*}{{Fz+^d7<rLI^0O5Jhp2Fr}1z`|kj<EMvRf4l-_&rYVvn
zxjq0P1OQ-~CRA0u$-E*60u)8Tv@ZszD2f7}=ZzBJ5{&?Pp0n{(ji~McEPdb}1Mp7j
zSPZ%a^^YE_5mijlh^`6{h9Q7y8d0TvF#u3Dk-6vuh@xmV^MzhsU!F&Qp!8|>Uc>h{
zZPXAS?iY8xH-PsUL0GRKK9#R1BK&o2dOYF#=Zxd2%vja6YXCIrc>Ds2D35#B$#J^?
O0000<MNUMnLSTYV+P1y`

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-0.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..199a65fb95992da0169ade39d85b1d6884fc5323
GIT binary patch
literal 108
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}YMw5RArY-_
z&l&PE7;rEc_{o)=*?&lpStyFN7bv~sN$9_q%x^B=Gi0>cq@Gs=6k_mn^>bP0l+XkK
DN_QQ_

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-1.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..ded931cadfcd6e0e6785420f851a6e1d88a349f8
GIT binary patch
literal 188
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Wu7jMArY;~
z2@<S}6GVDS4tRJRJXhQPPx<rRxo<dLDY9;OFuCUczrX+6`Q?*3IJvlj&I(q@e)#q_
znys?3lE*NMX%C-(nAoum0TB^1>iBll{4{D_w@$B3!j$pg4x17VQ^8v|1I-2dngR{D
f+zx6$Y++(Z3s;mkZ;F}@bOD2>tDnm{r-UW|VP8OD

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-10.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-10.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d71c464f6e186f7c34473f5b2f9dbff18d36277
GIT binary patch
literal 741
zcmV<B0vi2^P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%pGibPR9J=Wms>~_Q5?p<kqT`U*%UPs6k^+uHc%oZma!Y;OGF`TT0Im-7m|#~
z4SZF|0-G=-!sx**U!;e&hwSFMh)iJ;E@A84+F49@++f`b#ZFI7Gmd-a6dOV8_cG`F
z&VSGUW9B>T42L+$YPFK(vET3KSbw*Mwm2_eC*S6pQGVkI-rn62b5rM)IuZy3l)1@d
zA_D^hOeUyBvm-fVUFv?MOGD_r?1Q~$L02CN1qc94438pj*AWEz9%1x@9{^B!>Wra@
zB--MIlgUVzhJf+!Xj#f#wI(w&PieAV;1$l&958qU0N`?^K#nA#57C%4V`CCR;V5P-
zr-5)3A7{U?^k$R8UO*i70%BBG={QQ%*MwMQ7?iG8Ud=5%u$N~(<1C_vFdPn(si`R)
zGn>sE0JPn?rI@QedyxYGucwpzSeyp{B&|&azq^8Jm})?lW#s4Q>lgrZyW5F%>ox#@
z=eZl*?sl^0;0dm%Fb{)0O#p!HWlq}m#s)GnGL(jD1^`(6sx(*6)3QntnGu!o@lDyp
zC4G*07pMk&J|Ap0n~niM*NYwiz{Z?x%{($AA}y;_8J{aUL~CIjLa$dFLZ1H>!mH=2
zl(lQE4><rBdDEn+x9oJrHM9x+f1(EDSYwM4s0Z~me<e)RW0<mh<{8ykV%MC2`q#aN
zrl|&M%8Kzc7-4FDpWjCc1wq4dYimiNAYemUGAtI$s%8vdNLaObA&T+g_c~TmZ2R;7
zf{sb{Hyd6QIj<m)m5h0Vg#MMN&*<j8XGET!$Fwwuw$^IycUWB1`B<F2^s=1v^-D`?
z)^NB=#{fXhSVjFX0RVAu48h>1IW-%a9M`c4PcvD`;$om~ONWkCG~Cv)cTrx)5@OL$
Xz2p}k6(iR800000NkvXXu0mjfKblOx

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-11.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-11.png
new file mode 100644
index 0000000000000000000000000000000000000000..5885ae1c6e3c0603b261730d78d52eb6ea6cf7d8
GIT binary patch
literal 804
zcmV+<1Ka$GP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%-bqA3R9J=Wmt9CxVHn4MM=G)<Vv3dt2C)ojK@lY}j(tJhL=*#SwTq(YgGNTA
zffo@dWI-*8h$y;f)lGDfU1Xm+LROSSBg}8DO>8=6%u`|5+fAOfPCMsRgSzm4bKd9o
zK6{@(?|I&{b0kuvqM{-(K5lJomCXKblHTM<<b?P%bc%H+@9^T{lBA1P9<C6<U{H-M
z7K><ZZZ>5?H))`KrkFB)4Vj@9o*W8bZyeR+4-N(eKzCaQ1<N-PY`R6qn^pj}?AUE+
zB28~{|Msb5hFYNOGiS&0f0>h$Q=k@^=8;uyrZ^bf0syZ!ok%Q=CX}Q(ot+^DqY7c`
zE{H0;9T+xK+nmbmb3~bajxfsGQnp#dUngW%hK*AH$d|CCYgfsp&$t=sHeoax6}`Q^
z8kUunB>`Nza7Hz^bI$<@z}Ik7eEl*4K-%Q#$SWMWhII`@A`uD;3pEVjaotr>G=BjA
z4fpGKTz6HhT<?+=6&LWTu@-=ZrImWi8ym>Z&Q=S?GXTDPREx*Q8M!6I!hUtUZFZjU
zhTbRL1ziJyKmeP~reOf}4;lfOH8U?Ej)nbX<d&%8y^A*Jl`w8XpD(cqW%)-F9@*zq
z=Z>GhE&;SZt4+waF0D*y(@yCBki+Q`4yP+6&wSkm*;;c}Epn~OEdjV)UI8$ygi(|a
z+^RqJS52mS4AaNY{CBxsUNNkM)!1UmWYgNCV%$W{GJC?VR6TuSXinFFyL2&k`(kPw
z3b!ZCy&|s`#U4)r%P%h%#U2kcGNxj+T7PNA@P#B^vvaM)?*M?Jd;nnXs6toU>x8+v
zqYBFw+y4B&;6{)6HyhdSmwX<N_?ekrU_$>&y7%bx<$EI1KSF<Kh)d^pO25NWqMNt<
z0|y_j6HU)UWAUtdqf^5G;+a|LewYCGUv<*g_iiYjwe)mpSa-uI@iR+_fr@!IG|W+b
iPQzX*vW88_jJ^TZ6E{9A06Xyj0000<MNUMnLSTX<EN%Y)

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-12.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-12.png
new file mode 100644
index 0000000000000000000000000000000000000000..5afb489f643396761c07c5585094bc2b999aa874
GIT binary patch
literal 818
zcmV-21I_%2P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%>`6pHR9J=Wmt9B{Q5c4wkqT`UF-0u}h1d+qD2bAgwLi$4h(a)}y(o%)Xvv5)
z=pq7ze!w;gi7>io(;M+3yU2cZ5!s?7k}&_XcBNL=)pRNpJKf~8>$o#x33cInGv|BH
zJKy(m<~uWIB<2WdX=!3=+}_?U8NF|T*5sJ)lK3`MPVVLVyt=tAWYUt;#lr1&E3wIB
z5-lw)hD>OR209bPqR4GTd)jC^)k=2bxJo}b=oSFI9bF`E+>N`rmacd002CZJtZO1n
zYx4O1aH2hJ(DR*Zlgnn*#Kk2mMHbsF3U8!1=sW@dha&>tXc*1NAvN9I9tQm~Uh^UF
z%X}CZHd5Od^0QM#es-$R(-q|J5rNlv7=>=5)IW6wE$Q|x7Q=ho2sE3}@Ar$ozCINf
z6B8o=RNlC%m^*mngaqJhs1ZLV#sCOg7>Q+5o~B_<13sURl#~<|2k@-!j!0X%3V?=3
zbv&!PBR21_N^8@TdDD0ifYmuATIux-#Ky)d1p_$%CcY}g1LLUpEJnR9WxOvbK{!00
zL#~3Rf!5YmGBPq$96<f!MgW#3CIrQ!UKdgES<3k6+MQY@^qbJ>3~oY;<#!XFIaa95
zU8ty%06Je>4APs|m&|F?&g1_;UZGXw6<X)yov+y-d&{mVMed%pNdPvhLjVlRUSxTM
z+WPZ<)nuC6Fk))Y|ANix5W})piA|<xc5go?rc9J=$PQYSv(KA!&1o92<z(`pe^iM*
z-p-KP+m@{&-EI%!mK7C=bi17;QQ?@)<{8cC9!LU_6mKSQ1ps7u1c2q^GCdt{gXWfx
z%WTNZ`15Z;^?Tzd8;i>&Iqh~aoim(Z9{&oO&*;jnhr;)1j8C2+Dk~03f6L7pHTPTt
zC!ges=9iwyK(2IGp^5{T&JB033DV63%^wp0*PCwo`#%l^a&7N>R9tUExtPvP^nX?9
wW^JH&MYW2{E4{AbUdt90*Yu@IFa13D2@k?kk3Ej8IRF3v07*qoM6N<$f-jVP-v9sr

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-2.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..03799bb6889c95e57db990a3ae4af1ba91c97d6a
GIT binary patch
literal 275
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}XFXjULn2y}
z6C_v{Cy4Zv9Pscsc&@hnpYrFsbKh{hQe@rmU~<j>e}DhC^UEi7aB^`O85tNDoSA7T
z_-@CPo|;WEZQ+;aT9^Oh=H_19vA6d3G)Gt0*24eKj{d)DS|R}gd~fcZQP5m{;=v1P
z?@h`d+8Q=&FgSdBd%ocjuykF0b9CRC<*S(W;`g0duzGd3;;{n<4s0ks@5lxMo}7gu
zb}JhaCdgW~%;I?aMxb+pk~Wv#b;DfAP~qnq5LY(^8gRKCJi*A|&1wC0!uRtwK#wta
My85}Sb4q9e0AJc`u>b%7

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-3.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..5daaf7dda8978a6e6b8f0fce0a66da66843c5f3a
GIT binary patch
literal 342
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<0-i38ArY;~
z2@<S}6GVDS4tRJRJXhQPPx<rRxo<dLDY9;OFuCUczrX+6`Q?*3IJvltj0_A6&df9v
ze79ptPt7Kow(!eyt;_#$b8|25*jxL1nxm_0YvKQANB>_nEs+2LzBl*IC}^%e@!*BD
z_a@~JZ4DbX7#zO6J>T#MSh}vhIlAx6@>R@w@%zp!SiQPi@z{X_2R0O+cVq(rPtHOS
zyOj+I6J)JgW^ufIBha})Nt;XWx?!$lsPJ<Qh^w0>GJgnD_*-25xBmAd?!(>7-%C96
z@m}bedbq_uC~V66v*F#5Jf5EO{%0gwI<f=ZZ!l*^$@GUeHy?k`c7`!E>vU%7cZ~!P
aU|_IR3kqbKwOa`oPz;`~elF{r5}E*J&x+On

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-4.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc7be0c7da2abdb4ba0d8f50301695b36fb59dcb
GIT binary patch
literal 387
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<ww^AIArY;~
z2@<S}6GVDS4tRJRJXhQPPx<rRxo<dLDY9;OFuCUczrX+6`Q?*3IJvltj0_A6&df9v
ze79ptPt7Kow(!eyt;_#$b8|25*jxL1nxm_0YvKQANB>_nEs+2LzBl*IC}^%e@!*BD
z_a@~JZ4DbX7#zO6J>T#MSh}vhIlAx6@>R@w@%zp!SiQPi@z{X_2R0O+cVq(rPtHOS
zyOj+I6J)JgW^ufIBha})Nt;XWx?!$lsPJ<Q2}_3jL!EhZdHhqnR~KhaI`JXR*>8(e
z$2-0gTg{Vhe0*c<D|^5t_;M#hg>%BsX8tcl$2BA@8qD**pTGO{|J!bT9{qXyl4ls}
zwyHg4xEG_Ked_zO)kk&OmZ+Ss-?CxO0%njK{bF{V{_y7J<8tO_4Mtm^ZrM~V0t^EK
b0|tgig)yZG^}o*mLzThP)z4*}Q$iB}EEJ=r

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-5.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-5.png
new file mode 100644
index 0000000000000000000000000000000000000000..150e8f3ec78c5dc6bbe287407329006c4a33afbc
GIT binary patch
literal 465
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<-JULvArY;~
z2@<S}6GVDS4tRJRJXhQPPx<rRxo<dLDY9;OFuCUczrX+6`Q?*3IJvltj0_A6&df9v
ze79ptPt7Kow(!eyt;_#$b8|25*jxL1nxm_0YvKQANB>_nEs+2LzBl*IC}^%e@!*BD
z_a@~JZ4DbX7#zO6J>T#MSh}vhIlAx6@>R@w@%zp!SiQPi@z{X_2R0O+cVq(rPtHOS
zyOj+I6J)JgW^ufIBha})Nt;XWx?!$lsPJ<Q2}_3jL!EhZdHhqnR~KhaI`JXR*>8&z
zhkV5LYU{&aXN66XS^V#}^qq@}&(BSK*AP>!+$MY8PWWj<|5@ArvCI731$T!9e2C9J
z#KNW+$H&GN8oEZY<2vIKhNtoIlJD;B>QYS0TheX*>Vs9n&t`rX>j%EYwu?)0AJ>-{
zvW5FEIxE4-%=AHR!oQun|Lw2+*!uA3<#L|lWlJwCkx4kDuBm<M`?J+Yb=sDwoUh-q
zVa@_(kdOUhcAft4=H}ya=4TB?Tc2*(R4oDwQ3C@81`nnh)qCDr{lGY4@O1TaS?83{
F1OWFm#&!Sz

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-6.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-6.png
new file mode 100644
index 0000000000000000000000000000000000000000..653ca142c23ffbfa161d82435316b30c49cbebde
GIT binary patch
literal 547
zcmV+;0^I$HP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$-AP12R9J=WmtQDDQ5?s=TM`dwZZf3E{7Lr00}pE=k_T@}`SV~&lEsr0lB6Vs
zRwMD`-<uZ?{^rk;JZKLVijgIw<``|0ERMI!HJ!W3ZEE|zo$op4{yzQg_nhtp{<GX<
zm^#jtw4nKr1_i)zuB1=5^%RE%bgwv45(qhKvaK-+aW|*H<qHgN$x_rugxG?)xo8lV
z9Q*J{0wAgyO&YDyqy;AfAt9OAg0(G^p#2r4TG2g$h#5ks(@AYMn~$eZC}aRIJvq+9
zHMO+=3XHkQYPC|1;{+Zd1S*wEw!J({vvcwQ06QDYNJ>pdNmWC@5X=s690x*(j|Two
zKJ&%Dj{g+EVzEH2R{MAWu(r7i07z0M3dVs-v}GofFoas|X9&AmYx%h$<HDbYGpx`N
zGdOjF20mo--Fitv#yp16-!37RmNr&!+A}CPG1=Z{9=h6W4je#VoR3wz%P)YZfe~6Z
zF(L3yIyz|X*cjqtqJYfIA3G@eLE^76UOl)xJNEGk^VQ5(#{^isdh{FMexOg5(%VnJ
zdnm8;`x#*cMa+PV&a6{%=f>U51E!5llH3E#|AN$n*n3aW6m+`EcPWaC0sz3l(FN@G
l>xZBLbY?9|RXZ#Izy}@eon9gux1#_6002ovPDHLkV1g^q^Pm6#

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-7.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-7.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fb7d79932d64e321e67d2b086b91c77069c3c0c
GIT binary patch
literal 564
zcmV-40?Yl0P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$?ny*JR9J=WmrE!_Q5?p<k;Fn8cVUns<B`mUg^fl;SlB7$u~3pk*hnEsN|Hwk
z3sznmS+MYaO_IeVnNW<!q#0@)LySZ^c9&~7=U$mcncwdG&v(xG`rq%|?gjob52TaY
zk2N&8+(<oQz<#WucbCN!#$>vg=I0g@KCH>AQhx+l4}sGs^uLC=<9zt?1Y=_XAoo7l
zg3~PqxD=#D(t^}T&t%|VpyCM@Rt=K&XJ_cSYm~qYp~K;z7K_EDrdF#}05Ck%Cz>m(
zsQHmG<|4D%Oa(!Z)CeKaYPG7h*-;u7p9lb0Uz$Z|L=@8VN)(%5c0dpW5JFsP0DzZA
z@$ir1Uo~JdnV{3@TxtNYu)F~P2-Sp0#!BI~%wUj)P_KUvVMAr1IM*>S@vGtV@_%3k
zr>MPO4B2>NwOc~QyoLdvUP3IUm*#NT)GoO(aW9Xe>HM7?<p!$Lk}z+(mu29tt&3(3
z4oYeVwY4;%w->>I{y<F3mmTDOkjN$a*@@GmeV1BFl8*W4m<A@#Z)F>}ZfjA6H@DKy
zHDu+=-ouMWU<RaTWRa4q2V7ZiFg#H9tyZp1F;g?!_PUiEx@EM!@^k>e(|rZ=#{>Yj
z_fBB5UEJ_=XY1Wmj!v<G`q)WX8|^yvO3(HJ0C)q4)Virsyl~q90000<MNUMnLSTY1
CQwQk)

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-8.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-8.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca197f5ba5f69725c1daebee5efbe6d808c7cc45
GIT binary patch
literal 585
zcmV-P0=E5$P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%14%?dR9J;$U>MBc%iFI1uWw8IH%>eAe?T1Y`nJUXkI!TNGn_I0f5e`RCXQgj
zCz+GT!NC9YIs?PK9}JWKO3}i81{OjJmMr09c>9@&;TXeLnmB+U2)9xAA8w;CFlk^!
z07gOzcJ4cb68!E?b_Dg10`Mln_wV2TfB5hrhM1tBAR_|<1H+sd6XA|a$;c<mVR$v&
zxpU{gu&^+S*xR>n8B|nM824{p{9j!|hk=2Cf#JaJ%?y&ViVTjvu_QYJZwLqr3p2cZ
z`xZltfq{X6;rBPV<;Z-hI^go<%M7}@x)@>%3=9lA_Z(zkU|?X7ln_VZlL`n1*`Y(I
ziO|jtkq9fYqTq5J)0R;+agKtK1MnuC=+?>bM7Fd#mnMk}Z#LvaD}?ZYb-TAST(4<G
z$ua7`zrh_Ha_$`I4#>4PV%YKQGf@us*xd8qW%_g!v1<hd|FtGeU=ZTvU|>*H#TtSH
z8zjU6<zHVJ?%leIA!cr*i#O`<I$-&O4@5iQO>;e?bZz5*bTI~3Pom8j1p@-`CXoKQ
zyZ*m@@rB{V({~JWrll~FB1RRkX48q+g?l~zA3O8(FS1xmU=)TJ0|NsCvKX-dZ^wjz
zfq~(~rMnEzo;`ktEO!0DJq)q?2m1b_i&4b^WopYY#6nu8V2EA#YDcQwqkw^dfq?-4
XqfONM&j)!600000NkvXXu0mjfV|5M)

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-9.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-9.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f61aeeb480158a0f8cfd103194e23f0f605a558
GIT binary patch
literal 650
zcmV;50(Jd~P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%L`g(JR9J=Wmr+PlQ5?p9cT^}Ou?D&_m=Md57N}4@$gC);hlpSxm^}m%6-oAz
zK}CcL8BvCzJ=l{gU!;fjP-dl$kP$<|QG-V2h?%*j$yB0Yr>Aba-n#cL9E;lbbk6Ub
zd;TAPzQes2{$|a^u8L^LD$0-fMMexnLsl{Sp;q887tgC!rNx9vYw^_49M(jFF!qJ^
z#r5f^&kDT_Zg(!RxQSur(_%nZ)s;n}y0R!U8Tc<G>22tH=2f(R?=GkAGpR^3gflZU
zA{-8@nAvQW0J?79l+D#0KP>@x2Ybc0#2f&om8)^?aA_LWG!To$u-R-X1~B017R8&l
z05I6^VZhTZb{;q)m6mK^bf^`8tyPU$$LkxgSS)hEWClQDK`x#=&&#hMKIN0gwS@)3
z9r^g%E@&DE1Ohl54iy9Fdol#TI%|Pq9-s1&mtP@|Pm~_iDxn`juU8pDr}JkB&z-E1
z*RFKjlK?_5S{3{4+ZvZOv|0Uo(hSJqmUcN%chA?SB}|&vF!#ruH=z6d4+&mqQQUyy
z#DZ+vH8PUAf%>X49!<mz8JKOlCU$prD%k6W22s-1#@f6bu-kvxLER4$quTg&p0PKt
zRBU^h<Imp(J>#DZ8~D_8Nh-W}SuADj*>CuatTH0afZVwASi~mhn2b!*)lny<!j?t7
z4}8%xPxpyoe`GP4H6N-`F@R)dRGL2~0KU<;Oia9=PG-UJF%^3^cwH=I%VOZ{rXCe@
kHQ!RPm-Eh4Yi9+(cW)2#1&?7nLI3~&07*qoM6N<$f+zSZ`Tzg`

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/meta.json b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/meta.json
new file mode 100644
index 00000000000..2daba51b6c9
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/meta.json
@@ -0,0 +1,53 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "kitchen-0"
+    },
+    {
+      "name": "kitchen-1"
+    },
+    {
+      "name": "kitchen-2"
+    },
+    {
+      "name": "kitchen-3"
+    },
+    {
+      "name": "kitchen-4"
+    },
+    {
+      "name": "kitchen-5"
+    },
+    {
+      "name": "kitchen-6"
+    },
+    {
+      "name": "kitchen-7"
+    },
+    {
+      "name": "kitchen-8"
+    },
+    {
+      "name": "kitchen-9"
+    },
+    {
+      "name": "kitchen-10"
+    },
+    {
+      "name": "kitchen-11"
+    },
+    {
+      "name": "kitchen-12"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/base.png b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..ccaf278a5436598f94f57d348befcee28e40b6d2
GIT binary patch
literal 223
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|bOU@sT!D1<
z%4PG89kI>J>e{xsa_QoRHLJR|ZAqQjzv|TSxqJ6)*|O!v_3M$5k^ley|06s98c+j&
zNswPK!`72P5jeOwztIjT<?89;7-G?zoFKv4%>Us-Lb@{pyRfpfy1FvYhK+_sMvG4v
z8yOlJDXnB+<ZH1p=H}*BS7%XXY>_-;!N6PNr6|FxA;rv4=gPFZ_2cV$pn(jYu6{1-
HoD!M<u*gxF

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/closed.png b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..c79f80c0c2310f301d6313426bec0a4a53311631
GIT binary patch
literal 267
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}M?GB}Ln2y}
z6C_v{Cy4MEBpgvql)tpGf0meROz^`N-#M()*;s?u9&X_=y)wzbvh0@_KQr@T#v<8c
zF6-Q~8UxvTtQeLvFH(A2!jXAz)29_;%*@QqJ+qj;$~yEYM-}NjG@JaIV-8=$wm%m{
zlVlDaIB?*@lWWYIWE;&{I4l>Xo%+Z=#i}Vm>cDf3`30}DPfVNim}Ai;2E&Vv>y$at
zoTIFp5|mVq2^w&pEMy7noG`6VL4x&%%)*uHzcoj=_cR3>aJez+F)&okPTdx?G;ANx
OLkym-elF{r5}E+_<zO`c

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/locked.png b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..3156cb9fa1ede110d5df6a043f7574c1460e3aa5
GIT binary patch
literal 109
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}>Ygr+ArY-_
z&lxf@FmNy{B(JG=WzOK>m-lcGEx2&9#OOXh14F}P)<<txT=#`0yaH-r@O1TaS?83{
F1OPIS9Kiqp

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/meta.json b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/meta.json
new file mode 100644
index 00000000000..544b43a1e80
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "rbase"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/open.png b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce50773db8745e7981db0dc15c2d8c064bad556d
GIT binary patch
literal 267
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}M?GB}Ln2y}
z6C_v{Cy4MEBpgvql)tpGf0meROz^`N-#M()*;s?u9<KlYr|dxbifOB6JZaVDzZqtF
zRAa(x1GOU4AnqQkge!~|vI3%+%NH+FTHEUXxpD1tm&|7jY(QWddh+@YnTu00^&E`Z
zb)xHDa2fV3n8_>w1lw}$KTFM5ezk1=AE4ZUOAL1I78TNam(66JpsOk(WKzsvE8}P&
zc<Gj)i>gyhpMb!FsY_Neb67e#xO~{SKtca#>qQNat5cX6F8&C9wPEE|TcC#+JYD@<
J);T3K0RU(OUmpMf

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/rbase.png b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/rbase.png
new file mode 100644
index 0000000000000000000000000000000000000000..584a185caabdcd79c22e51feea45a1cb9f52088a
GIT binary patch
literal 549
zcmV+=0^0qFP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$-$_J4R9J=Wl(BBwP!xtg(<H<sks(9@GeotZ16!9Y6>^6@09&P~OP7e9mx-bZ
zsY{n`JV2KWU9vQ&3W9csP-KVHG&l&_NHlc82*a(x0?|m}lPvk%dvyNa$M+ss^4O7v
zgKRe2TZCw_SRClCjBXYR1!P$s#Gz0~SftbGxZ-K@TCEnjT+X#WW&ogCtqP0HimIwe
zlB?-%1H+r|K7Bt0h}?YHfBWV&reXLKOC)&z;UhPZ=cfRNuTuM>yntxYX`6L>_sf^6
z0H?<2FZ-u~dc8h3@lg|vMq{#pMf2Yc2yekK*Kv*Ga>ajTyMi6p;D>jbX9wh1H?zLI
zh6MEP?|nTIu)e*99P4JhG{!m*jYerUo9ynP?<Jx<-Pr-)!m`*^!T^L;SGce&?@t4e
zWrz@{1#R7_J<))}S?M!prO6u8a*)=9>n;PfZ4chn@QV|GXMf82EQ9FVlk`b{Ngve!
z!5I+U)p@a;15+6goz!{Z>lQd%#Wjw;p8Hq(*_?e4ZK+*diEa27@1w*v*iyT?SB|g)
zhGEQS5CQScO=_#QZWsp1WOA|r(=-8isRW_@8`_ruXaMc2L7sT5h|!dwtG1^BfK)2w
nqx@`)8OZ1J3lm?m<U#NkF`2l0JcD4C00000NkvXXu0mjfC7A-b

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/unlocked.png
new file mode 100644
index 0000000000000000000000000000000000000000..39d2fb77884f3e7d5ec21c0538d18761652efca5
GIT binary patch
literal 107
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}s-7;6ArY-_
z&lxf@FmN2+P<d#-nZ<+y2Pa=~5Pq<r>i0jO8VkuLc9xTmmm7EjISihzelF{r5}E**
CYagWm

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/base.png b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..430b603aa3af9356e29b3ea3dce738733060e9ed
GIT binary patch
literal 352
zcmV-m0iXVfP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$8c9S!R9J=Wlrf5hFc^eqm&GEL2x8*_EbPU`*48U}1J7Wg7qC!k8xcfPq}?r+
z1bt@3?0XU6`BnK%oEanzaP#hbEQcgXzRxhtvP}4XJ#I!(1kdxtY+066WE{uUeB@kR
z*U0mHwZ91f0BM>^#hxVyg3U8&001b<QmkFq#WYPyW~OPP>pC%qVJJQKsidlbO#sH2
zHZz&_^}fK_{CNpEgb*;sU>JsyFk?)-`|kjb<G{9UCF4hiVL;#a#{&>T0040u!}tBC
z%sEw6fl?~8cLQ)Jr6`KxB?0zW1(@eqtaTO9(gV1A;EDlcH}zF0{RPXH-m8c>I*RB}
yfTn2x=qVzuy&C}dEs?X>1Zdm#H1nIAOYj3E`*YfR{bVBm0000<MNUMnLSTX|7MC~x

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/closed.png b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..c79f80c0c2310f301d6313426bec0a4a53311631
GIT binary patch
literal 267
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}M?GB}Ln2y}
z6C_v{Cy4MEBpgvql)tpGf0meROz^`N-#M()*;s?u9&X_=y)wzbvh0@_KQr@T#v<8c
zF6-Q~8UxvTtQeLvFH(A2!jXAz)29_;%*@QqJ+qj;$~yEYM-}NjG@JaIV-8=$wm%m{
zlVlDaIB?*@lWWYIWE;&{I4l>Xo%+Z=#i}Vm>cDf3`30}DPfVNim}Ai;2E&Vv>y$at
zoTIFp5|mVq2^w&pEMy7noG`6VL4x&%%)*uHzcoj=_cR3>aJez+F)&okPTdx?G;ANx
OLkym-elF{r5}E+_<zO`c

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/locked.png b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..3156cb9fa1ede110d5df6a043f7574c1460e3aa5
GIT binary patch
literal 109
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}>Ygr+ArY-_
z&lxf@FmNy{B(JG=WzOK>m-lcGEx2&9#OOXh14F}P)<<txT=#`0yaH-r@O1TaS?83{
F1OPIS9Kiqp

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/meta.json b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/meta.json
new file mode 100644
index 00000000000..544b43a1e80
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "rbase"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/open.png b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce50773db8745e7981db0dc15c2d8c064bad556d
GIT binary patch
literal 267
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}M?GB}Ln2y}
z6C_v{Cy4MEBpgvql)tpGf0meROz^`N-#M()*;s?u9<KlYr|dxbifOB6JZaVDzZqtF
zRAa(x1GOU4AnqQkge!~|vI3%+%NH+FTHEUXxpD1tm&|7jY(QWddh+@YnTu00^&E`Z
zb)xHDa2fV3n8_>w1lw}$KTFM5ezk1=AE4ZUOAL1I78TNam(66JpsOk(WKzsvE8}P&
zc<Gj)i>gyhpMb!FsY_Neb67e#xO~{SKtca#>qQNat5cX6F8&C9wPEE|TcC#+JYD@<
J);T3K0RU(OUmpMf

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/rbase.png b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/rbase.png
new file mode 100644
index 0000000000000000000000000000000000000000..430b603aa3af9356e29b3ea3dce738733060e9ed
GIT binary patch
literal 352
zcmV-m0iXVfP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$8c9S!R9J=Wlrf5hFc^eqm&GEL2x8*_EbPU`*48U}1J7Wg7qC!k8xcfPq}?r+
z1bt@3?0XU6`BnK%oEanzaP#hbEQcgXzRxhtvP}4XJ#I!(1kdxtY+066WE{uUeB@kR
z*U0mHwZ91f0BM>^#hxVyg3U8&001b<QmkFq#WYPyW~OPP>pC%qVJJQKsidlbO#sH2
zHZz&_^}fK_{CNpEgb*;sU>JsyFk?)-`|kjb<G{9UCF4hiVL;#a#{&>T0040u!}tBC
z%sEw6fl?~8cLQ)Jr6`KxB?0zW1(@eqtaTO9(gV1A;EDlcH}zF0{RPXH-m8c>I*RB}
yfTn2x=qVzuy&C}dEs?X>1Zdm#H1nIAOYj3E`*YfR{bVBm0000<MNUMnLSTX|7MC~x

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/unlocked.png
new file mode 100644
index 0000000000000000000000000000000000000000..39d2fb77884f3e7d5ec21c0538d18761652efca5
GIT binary patch
literal 107
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}s-7;6ArY-_
z&lxf@FmN2+P<d#-nZ<+y2Pa=~5Pq<r>i0jO8VkuLc9xTmmm7EjISihzelF{r5}E**
CYagWm

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/base.png b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1054e575dd9260e6df82eacddc12818bc603784
GIT binary patch
literal 525
zcmV+o0`mQdP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$$4Nv%R9J=WR!d6)Q562>;pD_vN@5~Kwuuq~p@LdT1g-n0wT>WMNI?(8K*Nw+
zg-D?`laFB>TMTni=lH_uLHVubo_pqe-<>(<;{r4McW~W{L|Ey32WhgTF<!BM^W^w|
zJ;!6~sAvrY6uBp-qBY3ER9--lk<LD|*xC72PmV(X09@bPLgYDQ()XAb`JTPHVFCd3
zb_a%OeK3*dAPLr?sC+wje{a{pMG6pk4wreAt)oj4RNbUf2f`=uD8A`zeYoKx^Z5RN
zM_1Wt+=L`>@aU=|?hpVtKcgEMRMUN?3Gw3s$R_MYEG(niY-3KCOsn3u-p!WiksT<Y
ztTx%G#lkW+L*9vqDP&6x)D075wK-Y<V9of^_6icQ$kgQVEg+eFf!?Z-`=kKF>>vmY
zsmvqvb_bHcu`V9hh-?Fr1P%)#k5`j+`5pnK4}%pveW<dyn?_`F*dROWtBi=k?=zy1
zZ~Cqu1giGTh)4nUsO?1kh_5bAMBESATf<$k%4&`jkjocbHKMi1GW<Tvh;sSDXaRs_
zL}IIkROa248<E+SJC=Z;Y=src`QNG7FenlaZHS3E1YA5hZ!I&-@Tc(!M7+W#h^sQo
P00000NkvXXu0mjfzHssc

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/closed.png b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..df740ed7b0f0b4a735cde70902a4e71e7951527d
GIT binary patch
literal 375
zcmV--0f_#IP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$F-b&0R9J=Wl{rp>F%X5H7c5~ANI-!ET@FIU4RVPThyze_07Sthasw(3LI)BB
zi4>MZ*qN9D0RcQ-5(y~$RhHiK%=>?DK%>$4V+1E0?rjDLR{kV}qDGguqi8YBO^{Mx
zXG6j$0juQ~Z9JX9QNZ9aAOvK6_YX5R7#qN74Wk0=$@%ej%>uyb(b<Z6YnbyH&9;GL
z72wAgaayUbI>2x6zXOb?{N^boS0fp~5r4#n&lDZk)JO*KL@<iK2RhvzJP|w*I^7=Y
zGfKb{ACNsC6X#*|Dm(Grlf!C>iF;x7h4;X9{~|iBsgVtkTEDF|6&=^q$OcI5fl_ic
z7QP8fS?VTCt>3&>>WjhtpM%}?u)l4RuiVYR0RT#TS9ec!&oO|H202Q7jYgvp;}s)=
Vg1{w;ek%X~002ovPDHLkV1g*Km?;1N

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/locked.png b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..421688fcda8a1eb453d5a02967f22689105b4a0c
GIT binary patch
literal 108
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}YMw5RArY-_
z&p8S*Ft9Kf7=Br=!5}-wdcN*KB?bnIfSG@585*`Sw#73kb8gP^1?ph%boFyt=akR{
E030V9oB#j-

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/meta.json b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/meta.json
new file mode 100644
index 00000000000..544b43a1e80
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "rbase"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/open.png b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0e25c446bdc9bd77db14ca156f03395faa3d608
GIT binary patch
literal 483
zcmV<90UZ8`P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$ok>JNR9J=Wl}}2;KorKm%uFYtmLyuNg;qC}UZbnx1$v2sn5Bz?3&8`l2wuV)
zxN_?mbf+K@q{ct3Go8joO)+I6VuzxT-!8nD@B8xJFadIMa{elN+v``RwAwW<&Z@Dj
zX3nT7e>l7_*S)xVva|t`hMjT&!*>-40oPap0B(ug`Zle%kq$!IH7{=0ytwRAG`BdM
z-XQR8YSbJ6e4Eyt-XLghag<$(#Fr6bVbdk>j!uK5*<lud%(eZBnI?e4eozL$j`#Zy
z(G-L;2G2IP@1Nq?6r3>-UGZ%)HEx)tsSO~M+3|m;sSUuX1*w!VbEy<KwX`*DfFdIp
z327|ANJtc!)@l~u@iqOmt2hIRCy`2_(dnj&t2hIVP8U)s5Z$P=_O%Q;&5@9^72KSk
zr3zX5T82f<#FGHP#@gyHqQsK`z<840&*HNQvNTh_<MGKs9{?g@?hZ(J77F;(cY1>$
z31qdZrMTi3;Bt!Va6EtE^8Ur>No-Y1^AYS;97IAP9Lm`Q!l6V6Y25TH3)<#)oRjl!
Z`2ZmpllAvCI~4!`002ovPDHLkV1gx{+;ji{

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/rbase.png b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/rbase.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1054e575dd9260e6df82eacddc12818bc603784
GIT binary patch
literal 525
zcmV+o0`mQdP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$$4Nv%R9J=WR!d6)Q562>;pD_vN@5~Kwuuq~p@LdT1g-n0wT>WMNI?(8K*Nw+
zg-D?`laFB>TMTni=lH_uLHVubo_pqe-<>(<;{r4McW~W{L|Ey32WhgTF<!BM^W^w|
zJ;!6~sAvrY6uBp-qBY3ER9--lk<LD|*xC72PmV(X09@bPLgYDQ()XAb`JTPHVFCd3
zb_a%OeK3*dAPLr?sC+wje{a{pMG6pk4wreAt)oj4RNbUf2f`=uD8A`zeYoKx^Z5RN
zM_1Wt+=L`>@aU=|?hpVtKcgEMRMUN?3Gw3s$R_MYEG(niY-3KCOsn3u-p!WiksT<Y
ztTx%G#lkW+L*9vqDP&6x)D075wK-Y<V9of^_6icQ$kgQVEg+eFf!?Z-`=kKF>>vmY
zsmvqvb_bHcu`V9hh-?Fr1P%)#k5`j+`5pnK4}%pveW<dyn?_`F*dROWtBi=k?=zy1
zZ~Cqu1giGTh)4nUsO?1kh_5bAMBESATf<$k%4&`jkjocbHKMi1GW<Tvh;sSDXaRs_
zL}IIkROa248<E+SJC=Z;Y=src`QNG7FenlaZHS3E1YA5hZ!I&-@Tc(!M7+W#h^sQo
P00000NkvXXu0mjfzHssc

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/unlocked.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a00217edae1de24c3884312476e34054877290a
GIT binary patch
literal 107
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}s-7;6ArY-_
z&pGlkFmSLaSjYa)xpi>o&qkIIMuq}~x&Q1K4%}jJHDXHr^zz&@paup{S3j3^P6<r_
DVoo1C

literal 0
HcmV?d00001


From 93e0f26317fa15db87c7751c16bb0ad5b3dbe8b4 Mon Sep 17 00:00:00 2001
From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Sat, 13 Jul 2024 15:15:57 +0300
Subject: [PATCH 144/366] Shiny Diamonds (#25750)

* shiny

* add

* reresprite

* rereresprite

* Add files via upload

* Update ore.yml
---
 .../Locale/en-US/materials/materials.ftl      |   2 +
 .../Locale/en-US/salvage/salvage-magnet.ftl   |   1 +
 .../Entities/Objects/Materials/ore.yml        |  31 ++++
 .../Entities/Structures/Walls/asteroid.yml    | 155 +++++++++++++++++-
 .../Entities/World/Debris/asteroids.yml       |   3 +
 .../Prototypes/Procedural/Magnet/asteroid.yml |   1 +
 .../Procedural/biome_ore_templates.yml        |  14 ++
 .../Prototypes/Procedural/salvage_loot.yml    |   7 +
 .../Prototypes/Reagents/Materials/ores.yml    |   9 +
 Resources/Prototypes/Recipes/Lathes/sheet.yml |   7 +
 Resources/Prototypes/Stacks/Materials/ore.yml |   8 +-
 Resources/Prototypes/ore.yml                  |   6 +
 .../materials.rsi/diamond-inhand-left.png     | Bin 223 -> 236 bytes
 .../materials.rsi/diamond-inhand-right.png    | Bin 231 -> 244 bytes
 .../Materials/materials.rsi/diamond.png       | Bin 297 -> 255 bytes
 .../Materials/materials.rsi/diamond_2.png     | Bin 0 -> 345 bytes
 .../Materials/materials.rsi/diamond_3.png     | Bin 0 -> 419 bytes
 .../Objects/Materials/materials.rsi/meta.json |   6 +
 .../Objects/Materials/ore.rsi/diamond.png     | Bin 0 -> 390 bytes
 .../Objects/Materials/ore.rsi/meta.json       |   5 +-
 .../Structures/Walls/rock.rsi/meta.json       |  18 +-
 .../Walls/rock.rsi/rock_diamond.png           | Bin 1307 -> 1916 bytes
 22 files changed, 269 insertions(+), 4 deletions(-)
 create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/diamond_2.png
 create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/diamond_3.png
 create mode 100644 Resources/Textures/Objects/Materials/ore.rsi/diamond.png

diff --git a/Resources/Locale/en-US/materials/materials.ftl b/Resources/Locale/en-US/materials/materials.ftl
index b213e7d1e9a..73a731de4a3 100644
--- a/Resources/Locale/en-US/materials/materials.ftl
+++ b/Resources/Locale/en-US/materials/materials.ftl
@@ -25,6 +25,8 @@ materials-meat = meat
 materials-web = silk
 materials-bones = bone
 materials-coal = coal
+materials-diamond = diamond
+materials-gunpowder = gunpowder
 materials-bluespace = bluespace
 materials-normality = normality
 
diff --git a/Resources/Locale/en-US/salvage/salvage-magnet.ftl b/Resources/Locale/en-US/salvage/salvage-magnet.ftl
index 027afffef2f..48bd321656a 100644
--- a/Resources/Locale/en-US/salvage/salvage-magnet.ftl
+++ b/Resources/Locale/en-US/salvage/salvage-magnet.ftl
@@ -13,6 +13,7 @@ salvage-magnet-resources = {$resource ->
     [OreQuartz] Quartz
     [OreSalt] Salt
     [OreGold] Gold
+    [OreDiamond] Diamond
     [OreSilver] Silver
     [OrePlasma] Plasma
     [OreUranium] Uranium
diff --git a/Resources/Prototypes/Entities/Objects/Materials/ore.yml b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
index 521d3cf1ec8..690e7e36d26 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/ore.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
@@ -66,6 +66,37 @@
   - type: Stack
     count: 1
 
+- type: entity
+  parent: OreBase
+  id: DiamondOre
+  name: diamond ore
+  suffix: Full
+  components:
+  - type: Stack
+    stackType: DiamondOre
+  - type: Sprite
+    state: diamond
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      RawDiamond: 500
+  - type: Extractable
+    grindableSolutionName: diamondore
+  - type: SolutionContainerManager
+    solutions:
+      diamondore:
+        reagents:
+        - ReagentId: Carbon
+          Quantity: 20
+
+- type: entity
+  parent: DiamondOre
+  id: DiamondOre1
+  suffix: Single
+  components:
+  - type: Stack
+    count: 1
+
 - type: entity
   parent: OreBase
   id: SteelOre
diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
index 7b8d145e624..552e3fc6a5f 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -91,6 +91,28 @@
           state: rock_asteroid_west
         - state: rock_gold
 
+- type: entity
+  id: AsteroidRockDiamond
+  parent: AsteroidRock
+  description: An ore vein rich with diamonds.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreDiamond
+    - type: Sprite
+      layers:
+        - state: rock_asteroid
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_asteroid_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_asteroid_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_asteroid_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_asteroid_west
+        - state: rock_diamond
+
 - type: entity
   id: AsteroidRockPlasma
   parent: AsteroidRock
@@ -498,6 +520,28 @@
           state: rock_west
         - state: rock_gold
 
+- type: entity
+  id: WallRockDiamond
+  parent: WallRock
+  description: An ore vein rich with diamonds.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreDiamond
+    - type: Sprite
+      layers:
+        - state: rock
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_west
+        - state: rock_diamond
+
 - type: entity
   id: WallRockPlasma
   parent: WallRock
@@ -786,6 +830,28 @@
           state: rock_wall_west
         - state: rock_gold
 
+- type: entity
+  id: WallRockBasaltDiamond
+  parent: WallRockBasalt
+  description: An ore vein rich with diamonds.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreDiamond
+    - type: Sprite
+      layers:
+        - state: rock_wall
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_wall_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_wall_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_wall_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_wall_west
+        - state: rock_diamond
+
 - type: entity
   id: WallRockBasaltPlasma
   parent: WallRockBasalt
@@ -1073,6 +1139,28 @@
           state: rock_snow_west
         - state: rock_gold
 
+- type: entity
+  id: WallRockSnowDiamond
+  parent: WallRockSnow
+  description: An ore vein rich with diamonds.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreDiamond
+    - type: Sprite
+      layers:
+        - state: rock_snow
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_snow_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_snow_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_snow_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_snow_west
+        - state: rock_diamond
+
 - type: entity
   id: WallRockSnowPlasma
   parent: WallRockSnow
@@ -1360,6 +1448,28 @@
           state: rock_sand_west
         - state: rock_gold
 
+- type: entity
+  id: WallRockSandDiamond
+  parent: WallRockSand
+  description: An ore vein rich with diamonds.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreDiamond
+    - type: Sprite
+      layers:
+        - state: rock_sand
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_sand_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_sand_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_sand_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_sand_west
+        - state: rock_diamond
+
 - type: entity
   id: WallRockSandPlasma
   parent: WallRockSand
@@ -1470,7 +1580,6 @@
           state: rock_sand_west
         - state: rock_uranium
 
-
 - type: entity
   id: WallRockSandBananium
   parent: WallRockSand
@@ -1647,6 +1756,28 @@
           state: rock_chromite_west
         - state: rock_gold
 
+- type: entity
+  id: WallRockChromiteDiamond
+  parent: WallRockChromite
+  description: An ore vein rich with diamonds.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreDiamond
+    - type: Sprite
+      layers:
+        - state: rock_chromite
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_chromite_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_chromite_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_chromite_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_chromite_west
+        - state: rock_diamond
+
 - type: entity
   id: WallRockChromitePlasma
   parent: WallRockChromite
@@ -1934,6 +2065,28 @@
           state: rock_andesite_west
         - state: rock_gold
 
+- type: entity
+  id: WallRockAndesiteDiamond
+  parent: WallRockAndesite
+  description: An ore vein rich with diamonds.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreDiamond
+    - type: Sprite
+      layers:
+        - state: rock_andesite
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_andesite_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_andesite_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_andesite_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_andesite_west
+        - state: rock_diamond
+
 - type: entity
   id: WallRockAndesitePlasma
   parent: WallRockAndesite
diff --git a/Resources/Prototypes/Entities/World/Debris/asteroids.yml b/Resources/Prototypes/Entities/World/Debris/asteroids.yml
index 1541190cd21..b4ac7435c2b 100644
--- a/Resources/Prototypes/Entities/World/Debris/asteroids.yml
+++ b/Resources/Prototypes/Entities/World/Debris/asteroids.yml
@@ -32,6 +32,9 @@
           - id: WallRockGold
             prob: 0.05
             orGroup: rock
+          - id: WallRockDiamond
+            prob: 0.005
+            orGroup: rock
           - id: WallRockSilver
             prob: 0.05
             orGroup: rock
diff --git a/Resources/Prototypes/Procedural/Magnet/asteroid.yml b/Resources/Prototypes/Procedural/Magnet/asteroid.yml
index 8fcd265297d..6fc762a67dc 100644
--- a/Resources/Prototypes/Procedural/Magnet/asteroid.yml
+++ b/Resources/Prototypes/Procedural/Magnet/asteroid.yml
@@ -6,6 +6,7 @@
     OreCoal: 1.0
     OreSalt: 1.0
     OreGold: 0.25
+    OreDiamond: 0.05
     OreSilver: 0.25
     OrePlasma: 0.15
     OreUranium: 0.15
diff --git a/Resources/Prototypes/Procedural/biome_ore_templates.yml b/Resources/Prototypes/Procedural/biome_ore_templates.yml
index c0001367d5c..158f58a2670 100644
--- a/Resources/Prototypes/Procedural/biome_ore_templates.yml
+++ b/Resources/Prototypes/Procedural/biome_ore_templates.yml
@@ -130,6 +130,20 @@
   maxGroupSize: 10
   radius: 4
 
+- type: biomeMarkerLayer
+  id: OreDiamond
+  entityMask:
+    AsteroidRock: AsteroidRockDiamond
+    WallRock: WallRockDiamond
+    WallRockBasalt: WallRockBasaltDiamond
+    WallRockChromite: WallRockChromiteDiamond
+    WallRockSand: WallRockSandDiamond
+    WallRockSnow: WallRockSnowDiamond
+  maxCount: 6
+  minGroupSize: 1
+  maxGroupSize: 2
+  radius: 4
+
 # Artifact Fragment
 - type: biomeMarkerLayer
   id: OreArtifactFragment
diff --git a/Resources/Prototypes/Procedural/salvage_loot.yml b/Resources/Prototypes/Procedural/salvage_loot.yml
index b256c73dfd9..7e7ddf6ff9f 100644
--- a/Resources/Prototypes/Procedural/salvage_loot.yml
+++ b/Resources/Prototypes/Procedural/salvage_loot.yml
@@ -179,6 +179,13 @@
     - !type:BiomeMarkerLoot
       proto: OreBananium
 
+- type: salvageLoot
+  id: OreDiamond
+  guaranteed: true
+  loots:
+    - !type:BiomeMarkerLoot
+      proto: OreDiamond
+
 - type: salvageLoot
   id: OreArtifactFragment
   guaranteed: true
diff --git a/Resources/Prototypes/Reagents/Materials/ores.yml b/Resources/Prototypes/Reagents/Materials/ores.yml
index 7b887b2f43c..44f13faac1d 100644
--- a/Resources/Prototypes/Reagents/Materials/ores.yml
+++ b/Resources/Prototypes/Reagents/Materials/ores.yml
@@ -24,6 +24,15 @@
   color: "#FFD700"
   price: 0.2
 
+- type: material
+  id: RawDiamond
+  stackEntity: DiamondOre1
+  name: materials-raw-diamond
+  unit: materials-unit-piece
+  icon: { sprite: Objects/Materials/ore.rsi, state: diamond }
+  color: "#C9D8F2"
+  price: 0.5
+
 - type: material
   id: RawSilver
   stackEntity: SilverOre1
diff --git a/Resources/Prototypes/Recipes/Lathes/sheet.yml b/Resources/Prototypes/Recipes/Lathes/sheet.yml
index 9f83c58e66c..f6cfad8d24c 100644
--- a/Resources/Prototypes/Recipes/Lathes/sheet.yml
+++ b/Resources/Prototypes/Recipes/Lathes/sheet.yml
@@ -127,6 +127,13 @@
   materials:
     RawBananium: 3000
 
+- type: latheRecipe
+  id: MaterialDiamond
+  result: MaterialDiamond1
+  completetime: 3
+  materials:
+    RawDiamond: 1000
+
 - type: latheRecipe
   id: SheetUranium1
   result: SheetUranium1
diff --git a/Resources/Prototypes/Stacks/Materials/ore.yml b/Resources/Prototypes/Stacks/Materials/ore.yml
index cf7fcb04836..cf01903aca0 100644
--- a/Resources/Prototypes/Stacks/Materials/ore.yml
+++ b/Resources/Prototypes/Stacks/Materials/ore.yml
@@ -4,7 +4,13 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: gold }
   spawn: GoldOre1
   maxCount: 30
-  itemSize: 2
+  
+- type: stack
+  id: DiamondOre
+  name: rough diamond
+  icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: diamond }
+  spawn: DiamondOre1
+  maxCount: 30
 
 - type: stack
   id: SteelOre
diff --git a/Resources/Prototypes/ore.yml b/Resources/Prototypes/ore.yml
index 41eeedcb5f3..8845e993ac5 100644
--- a/Resources/Prototypes/ore.yml
+++ b/Resources/Prototypes/ore.yml
@@ -58,6 +58,12 @@
   minOreYield: 1
   maxOreYield: 3
 
+- type: ore
+  id: OreDiamond
+  oreEntity: DiamondOre1
+  minOreYield: 1
+  maxOreYield: 2
+
 - type: ore
   id: OreQuartzCrab
   oreEntity: MobSpawnCrabQuartz
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-left.png b/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-left.png
index c9b55e9daa52ea2f352f43917ffa03611e0c5512..9eae45d039abc1b118d047edae3ca52f3b28bb1f 100644
GIT binary patch
delta 59
zcmcc5_=a(U3KwH>kh>GZx^prwCn}2ZTki6(^2$hD_K{2WaO4v0iEeGe?YVjOf1)Nc
O0D-5gpUXO@geCxoViiyT

delta 48
zcmaFEc%N~C%0xq9ep@RKE3b^iWgod@4@)jFo*3LFoS&QbXX>LG1|aZs^>bP0l+XkK
DuM!c9

diff --git a/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-right.png b/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-right.png
index 295c2c4eca1dddeb5fb91200177af77b78a76710..3353eb6f7caea4fa57c518ff3ecf7cf12666714b 100644
GIT binary patch
delta 198
zcmaFP_=RzT3KwH>kh>GZx^prwCn}27%jgKX6`nSk64_`t$2CGx_imuV5|LvZ4?QX`
z{tw;Oy}bD0DRo8$2#9mredSv8x9n$Eq`pjOdwMf)mY(L^|0lNZTK)FvzvySq*%8x9
zrmJ~cc^+Qtd|+#8=^2|_soQLC_kCg6l_vLA=;^0?L1Sj9Squ!(!W)e*7=GF)A0WKd
u_`;<(>{n8bzUC<r1&Yf4f6vfRTfwwsU+&VGd-;4odOThIT-G@yGywo&c~ztU

delta 187
zcmeyu_?&Tq%0xrqdO02;H_y{1Q{oy8=Qz$#)V&+1utek-N5K-CFZEO3K6)9m<C7-?
z1T?hgOutoi+V1R}sOG#&8*FZSU)Egu`1{9e<=gh&*?)RZHm|g5>{8E3e3uG-+TMTV
zR(fX6Tcg|aa^0(#VvW;xyX^cEeB=z&ECz-H*IeH4Y%$#PhW(1mTb?Z@zZp#zKPqM0
k)pbMiMc@B&h6D9Gn3pWeUD_Nmi4mm9)78&qol`;+04q0CTL1t6

diff --git a/Resources/Textures/Objects/Materials/materials.rsi/diamond.png b/Resources/Textures/Objects/Materials/materials.rsi/diamond.png
index 5eb8aabf8796f2a3b5ffce29119ea1b73dbdbb9b..8b39437d0ac358f85f04f69f9a743c0325c6dbc9 100644
GIT binary patch
delta 239
zcmV<L01*GF0{;P!7=H)`0001UdV2H#0004VQb$4nuFf3k0002FNkl<ZScUD9yA8rH
z6h%)E1tlGAO3G|t)?o{_$T-9sq@)XNDn__8v1Elvu~A4Q^iK2S?>+v2VHk$7F-7iz
zT59IzT#MrJ6M<T4dT<UXC&r(E2TtHqC3fG0S3}r1yaF81gJ?^+DS&;dK)?^R0@|oQ
zwEf451qH(C<4{KJAo57uGy4ym!Ii*~=^JQ)L&hJ-rk0vcQYYyp=^oXaq|~=xTw=BG
pDT&p?V~NeeV~Nee4Z|@0f;X-}f8ffY1=Rom002ovPDHLkV1gYHY!Uzf

delta 282
zcmey*xRPmtL_G^L0|P^2NcwRg#aJBV?!<WWq)t7M!&%@FS<Jw|Eeyhp4727)00mV7
zd_r7-^z{G#*Z=>&|NsAn|Nr~{|9}7g|C#^)&;S2_|NsB_|Nj^K|L<^4gdeDmrzFTP
znBl;G5CD@C)eo!&inn>XIEGZrNlvJjxYH0A5FpU1pOTZ)qN5}<CvKjMQbT}%#)_OZ
z8WJ4>8v;Z{M6MdNaCi9S$K>qUP^%Twzu?oMZ=a4G?J8i*bPP;Q4t31j!H_&b>4K~m
zhqGi$x`cGJk6Xm)0~uj)acvt|max1qU`%0jGY(;OP@T*gz$zhbw1APZgz*;>LyK^%
W=;V3o>MMY5V(@hJb6Mw<&;$V4^l+vC

diff --git a/Resources/Textures/Objects/Materials/materials.rsi/diamond_2.png b/Resources/Textures/Objects/Materials/materials.rsi/diamond_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..410d83f1c29f1e958fb38d3c0594d059846ffe0e
GIT binary patch
literal 345
zcmV-f0jB<mP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$6G=otR9J=Wlrc`jFcgNr07481b?b)8#)fYY#Kcv&1-Hm;Ah|&V3tL&cv_k6s
zGuTE}sFY_y>45(wvJ>n3{GMYdDJl8yseZb!k=n6u9;)hgF9MC!uAr`g#g6yyKnKjB
z8<RMi0(Sv6ggc-HR#1;s>LgbnrVCF8^vQf2ci&b_5E$&@<_b6m*1%Jkyc<YFk+-P=
z)_!k+%LLp5XNEIyY=t}gZe|0x^B{WQ0{93*GXorqEwJ``3%p`G{bqr<`xMGx97SF-
z;b6E28mYa8dVw$ht_t+{|M@f%ZW4$R_r4fk5^4G8p$ob2tTa-)l(dwzk@PI-QIh3K
r-iySa!&8Za!BdHY!AnX?N`5<^je?AP5zqM<00000NkvXXu0mjf=b4q3

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Materials/materials.rsi/diamond_3.png b/Resources/Textures/Objects/Materials/materials.rsi/diamond_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..152da2befe8759f54f5ab9a0778331a07199c82b
GIT binary patch
literal 419
zcmV;U0bKrxP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$T}ebiR9J=Wls!(vKoo?(MF^#!h@hZD$pyeCz!nu(am5w5h3`Q{1@;XhXwoHZ
znvfz5)lhg%R>t<)`B92^Bx}9veV*BQ?=AG`(c{!%whc_A)VC)#COU|KL`oMBhQO%e
z`y9xC8_0Yj&UPUWELoX60775^q0g!Ft^x{Vb_{@tvtG=ze-T>>s5rs>7`OzMz&r3*
z+7LKGrn?Aeo9i`j>yS_EGiXr*wF1hyo|Ht)$sHI2E8qvX243xakPlvXQ&5-dCGbUF
zY!4N2a~Ni}2%B7J?1B(@w&aC~phUiFC)7F+8xz^Ua0Cq5IIy<kK03jB5hYUklpp3#
z#1gn-<4hB5C)5^WtDCS&#3yh^UYM>s(5(|%-Gs3*(VKO2MgDRD+0<Ec>!h&1O&fMX
zBBd{q+@eaPbS7yg>08o=r1GA<qUy)4h=Y>*gdL6C6>&839zA+&i(e?myS|8_8-D-*
N002ovPDHLkV1hl2wF>|M

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Materials/materials.rsi/meta.json b/Resources/Textures/Objects/Materials/materials.rsi/meta.json
index 016ccddc294..3fbe1a893e2 100644
--- a/Resources/Textures/Objects/Materials/materials.rsi/meta.json
+++ b/Resources/Textures/Objects/Materials/materials.rsi/meta.json
@@ -78,6 +78,12 @@
     {
       "name": "diamond"
     },
+    {
+      "name": "diamond_2"
+    },
+    {
+      "name": "diamond_3"
+    },
     {
       "name": "diamond-inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/diamond.png b/Resources/Textures/Objects/Materials/ore.rsi/diamond.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2a3c788d34c3190e6ff143d2b0cc324597bad94
GIT binary patch
literal 390
zcmV;10eSw3P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$KuJVFR9J=Wl(9<0KoExih!1epam8)g%X$!NjkqZ+?Cllod<9=5*XJb!3wK2X
zOD(eHL8=gtq_7{G+jTt<v*tSYgC)#l_~&P46Ce->1Og){h-5(|$7t;P6ifNlOA8?n
z08s(T&Aa4z{;TGmj{z-&)I!*9F@SSGxVi0`oly`;MMNDD@ie2OvkT&BW@E+@x_@{f
zQ#W)qUMq+J93P%wGMxbcCezus`1<k+Z?zTxPz}`dTES_|ZL_{@tO@g+FP2DSj^0Ca
zuz{N>%1z_GZSeg1WK9_Qw!wU{#2uhKJPb!l3C0pyZ|(wP3Gp<urz4{ECjZlyv5nUq
z0D#+Cs~Qj{{^;KAyENvu25Q(4yzYRD8FN{#BG=qwt-W--CjbByptw?bS+3xk(15J}
kBDhP&{+a`UK;ZxJ3FzpW(hhKks{jB107*qoM6N<$g2ptf3;+NC

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Materials/ore.rsi/meta.json b/Resources/Textures/Objects/Materials/ore.rsi/meta.json
index bc5dde90121..597fa0499fb 100644
--- a/Resources/Textures/Objects/Materials/ore.rsi/meta.json
+++ b/Resources/Textures/Objects/Materials/ore.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-NC-SA-3.0",
-  "copyright": "silver, plasma taken from https://github.com/vgstation-coders/vgstation13 at commit f2ef221849675915a78fd92fe622c32ab740e085, spacequartz taken from https://github.com/goonstation/goonstation at commit b51daf824df46a3a1426475f982c09479818e522 and reshaded by Alekshhh, bananium; uranium; iron; gold; coal by Alekshhh. Bluespace and Normality taken from tgstation at https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, reshaded by Aidenkrz",
+  "copyright": "silver, plasma taken from https://github.com/vgstation-coders/vgstation13 at commit f2ef221849675915a78fd92fe622c32ab740e085, spacequartz taken from https://github.com/goonstation/goonstation at commit b51daf824df46a3a1426475f982c09479818e522 and reshaded by Alekshhh, bananium; uranium; iron; gold; coal by Alekshhh, diamond at commit https://github.com/tgstation/tgstation/pull/78524, edited by TheShuEd",
   "size": {
     "x": 32,
     "y": 32
@@ -39,6 +39,9 @@
     },
     {
       "name": "normality"
+    },
+    {
+      "name": "diamond"
     }
   ]
 }
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/meta.json b/Resources/Textures/Structures/Walls/rock.rsi/meta.json
index 27935ec089d..a37805dfb6f 100644
--- a/Resources/Textures/Structures/Walls/rock.rsi/meta.json
+++ b/Resources/Textures/Structures/Walls/rock.rsi/meta.json
@@ -104,7 +104,23 @@
             "name": "rock_copper"
         },
         {
-            "name": "rock_diamond"
+            "name": "rock_diamond",
+            "delays": [
+              [
+               0.2,
+               0.2,
+               0.2,
+               0.2,
+               0.2,
+               0.2,
+               0.2,
+               0.2,
+               0.2,
+               0.2,
+               0.2,
+               0.2
+              ]
+            ]
         },
         {
             "name": "rock_gold"
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_diamond.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_diamond.png
index eb05ebd3d11d956ea2df824d59d4578fca94f0a5..cc54b642f4548b270577283654c62ba308d31450 100644
GIT binary patch
delta 1901
zcmV-z2a@=k3j7X`B!2;OQb$4nuFf3k000LzNkl<Zc%1E>U2GIZ9Ke6)0cT606jQbG
zQRE{KAT|iZ_@G97B0gzCOpGRgkw7Q`%SZ6l2Oq$|gAhqffCr;S6MPb5jF`ZKsjL#K
zk#Cfb3YC<P(q3C=^Y>wP%k_G_?%nR*+}_MDxomE)z2EH2?0?MO&VOdXVzF4_!(I`w
zev8E~n>stS))>?M7E6Wj>dBJ@pGsTq+zIXU)8!X&k|Iv(HRq&=I4Kb)8Kysxy<?Av
zv?LNE_7}=g5$W!M?>et=sIk%a_htLt10Dw?fk9v(kytiZ3cu@~3`_&6fL@>-=o%{x
ze*J+nIv?A*yMN`Qnwp{=K{6nyKf}EkSPHBL4g<defBH#-AAh6;5QK~jSO7EuYk&hl
z8*mOt`zeHg?!~}Mz$V~PAPwvVP5@`{SrPK_NU)?9&RZ8Q_-&WRp=y2;uob8WHUqPO
zr`*q@@_X*3sLZbc#seu}1F*#Xyx=rs`+XO{&f|UZ-hbV@fjhO&=Fatd)+JHR&Ke-u
zcC+^BpZcdZ0qani;kz>|!tc3PqiTMl{a#horGctC_x)P;^Mccm?e|>(ue^|AZ*A?c
zf8Koi_NWE2p`#;cVGW|%`~yH&ZG9Clr*549_5lxo!3h1H`!K56>6<ty$?S2x*WLFA
zf!?im=701A^~a$Pn2l<7)}b>0Z{RYe>jR!gH9KA(@G;OzNPR%r761%oL^Z0-ACIc}
z{}N&5XSuzLfF-DA=OA#3kTM_2ya1s1-vJ@Ii@pplDeG_C(0bD;O23Gc@Lpm2L%R&^
z>FMF!_I7QB5T!qnSSH>}hu>0;e64w8$SD68B7gE}d-1{@>2#pP8smTC^y!>`_@jud
zY;E=RCA$LD4AcFVxbpsqeyyc$wEvx}SG69z>3&}v)Z8wb?zdPf2;G-iru!`xi^XCv
zy5r+b_gmtI?)Z4q{T54wVCwvUlKb~$_43{X1revZkO>M$MdYh)ku{eu7nF!>f3d{X
zKYt82^Xo*M#UjpfcU$MT5Vm!9YwdvI;2$;6NN0S$N#qO6(ixv08L{!ZZT@l*r&Ywc
z^!tD3<yhY(5plkEo1*H7(>jc><|mY!Ki?UkGd_O=8s;aI#P6pMD0zIoN#qSr*BPI0
z3S-U>&>5d^DS%3z9}uPA&JU;%zopa|6@Q<v+iy&Keh7XMXT;yx`2i*Ji#W1NL~<2^
zr9^1Se52#@b^CS4$D8i=h3@!x)BP4p1))1W-gLjkVzF2ZMt6L?>3&Px&>bIdy5C}{
z5R8e>*X`FGA8)!pRN@eyU&($;ITD-r{BrYGYJ7fN{QQukb1G$gzUh98#bPOE;(r>S
zuiGEm{D5>%59{08rO+AmVWB%dzgT}Lk1&bVqdv-vqR#*?K0a$k{fodS?sfq%IjS?E
zQsxKvDu7(^@v9y_aMPPnzXaG0%yhRyPn(M(K7Z9H4;&2?pC5uh7y10d3ShMO_{V`G
z*M1r8JG`gPtpz6DU}8Nmk&LI!?SHDS_LbNo{X>X2vYVwN3ZYbf$Q`(q&mXuC5OGq#
zJXEu@9hLb#z;56;a6XY()*sYUKzbyRSXTCr=kf^SDrn$?pBMdsdcfIk;EKCFh3be0
zLU80IGd^EO=4+oH5OiIkp#G>G<?J6K-^yCL<Ks>DTPziX?)Z4q{T7SGVt+9h-SP32
z=8w%ilR}8oGHaoYh-KpbDxM(XRBh?(lv0k4WsFbE0~URFcSau(j!TS|2Jf!GSjQjw
z8Q{vQP%G_D0PX`ff!?TVVb<W#64Wj6gQy#WXDGo4U7;&YhI$5MWd1au5jf&*rvX(Z
zsD)nUKL@m+GNHwNAL$4k41de~Mqm!G%iT5t)w$fh3&3Z5d=gdj8-N2}rk_}dT6wp@
z-Cy*<kL4F}5<DE4YX(wn4{92Kl>2^Ygf0rd%Q#e_&jhx9(_6n1weI#zMp<urL;;Kz
zAOG$0<$jv0B&ylj-^Q%@3z8E!)H!KBu;1N3W&s5Bdn0qzH>jIFg?|*krBl;UwQ^{L
zE<%42)$BC?#f%m6k`ws+)}$4v3NSvGdqe@W6foAAgF#fAzwsIVIeU%));xCaEU?kt
zKW6(I(BF${^V3gq`&w7xKF?P7Ujx$a{@$_D5W?|40QN29>amM5z?)O=9V27C?d*RD
zwG+<j0~$~@e<N@mHGeu5X-6#L)bX$nXhzliG%5pHiMS)q>H}uFY1oGvCCs_rcBq}O
z`{iCt&}HCtcRQ5%5y$6up)$D@*n_(I*h5C<zkP8^WJ9Fx@uyM8d=c2;Zig~I`}lpI
z0XvWPNq<xSh$Y-};noE2H3$p_t#y9=Q3Z(=as1)_5Y!zXUuKA3#7Q=Hbc7lvsr&dX
z7K^2viEDhmZohqgK!x}%rKVEi^JC$U)B63f_Q!qw{<!-samDEM`*r(u$H$xQ_l55G
nc+>qBO9i3(GRt(oC1m~wF?fKdtyPz}00000NkvXXu0mjfAd}HG

literal 1307
zcmeAS@N?(olHy`uVBq!ia0vp^2|(Py!3HG1+{xJmq&N#aB8wRq_>O=u<5X=vX$A(C
zvz{)FAr*7p&OPWI;wW=GUD3cNXrkAIv(0isO?=N(KP-`3Rb28ig`>11DCm>EfXS8@
z0RoaC0vC7gdanCfOybGWGXYK^1*-m+`wV}TeLs1wI{#Vi{p#O;n>Os;@q6aa+WY6;
zoI5w&QcYt;21A4i!<qwZXFN39i+9dp(9HgGfK9=AzU#iviZ9L`Ypc0*iAg)^($90e
z4rO+{HGYQ@B&7>V>*DHOyyPq~y?guCr2bj6*2FYMJ`I;Jh@JD)y+&=;f)D*iuiw<<
z*tmC(PW-m*()Qc0{SamAiJ0|ty-57?f9L!boKv5v|1^B&=~$CG-QazfEgvL0H*e)M
z$Y9L*Bx>y=?ek-!{~_~f)1J&ecg~@eGnzrV=Ipn7{g>K`_HAV3xBEY}TKwA)pXB5v
zOf9<qe%z^C_#=>8VB3#b_O+kfmzYiY+{^po^;%)(osU)h_wC-PDQ|B6+w94=U%P6m
zp7}gcbSMoejrjQcsQJUUJF@qst-d{Lz5Mp0=4J^8(u=IP)}<`|5w%O;X?Uzm&DnS2
z-0a_TKLvkw)p>P8erj&=zmLILJPxO?vL>8uh|bRb6q&94M$1?G{w&5;Cr6&O>rOq-
z&7GjMWNQA|hU>Dj7ebG3`Q$A9A<nCk_s3(8upe%0dqTOr_qR%9S+lS;_P>31>g2Cq
z7kbYc?LX4+y1V;RY<T!l`+0i*_Wt^Ml*24C=S@W9V;}4I?mt4ze;#<%I^OB~ux*X&
zzNwxSHF^GiU#=ZI_SodJvUEXls;l3V!nyv|_L~^>KmA<w;pU?q7B5~1d*AxGQOA|1
z>H8;@ndi4EY+#ap@ZC_`FSS?xMuXvp+m_iie2xhh88!e@!5Q|3pU8Ml%fTc&hBN6<
zY%bR{;rHjmTD&#N%s@u2cIKZ|Yzp6>SGS&0-|;Nmlwqg+eeDptgQoX0IGo;{zwY!*
zIObEYdg7CRe{{O<qnZUV^MKL)_m8bUGa7yj{kYtvyp{6|`;jC3lhxDg4j9?L5D$CC
ze4qw~*ReJptznpP9)uM+bfg%>cp18XG8oK9#*+<DJh9T!USaj0kU8=bQtKX_=RaX(
z|M59{%G~)~pP4tEc`j~<?&)iv8Q1acHhg+~smn9wKCdh4mG%2__svf_$^PQe>c1Zs
zCoNne;CXL;{^b4Vo#x6f_<pSamrO;P){%cTvujje{AASQw=sUW`gVsy<)U-^9lIIM
zus@l}-*E`!+2>ILaHq*M9azK&3iBEK44-F0vGH8~ANvg=4*z60a%#o&xh-ZP$=0XY
zHGX_3TfUWv<>Bi`+W&kWPnv4B<JJDjH4RO5LU$hpeZ0zEKaVS<VMR@Bjeh;NH}a3o
zj@+$R|JiUj{`k4K<#s2oicejCbNbPy3pIZ$WNPxIeSW>q;dA(F^(@tY?vJ_x`KxT%
z#SS;zrr3*J|MzDxmq5DRfhGTEo@4(Z+VHbs!mDIEh1tJ9U#wZz*5t~3068r@|H+tO
zcOK~U$~s_td<MqTJb8v^pZ_4mN48^vAyCX1i2pMSraLA6Y34QqmUaxDu6{1-oD!M<
D5<h#K


From bf4a9377f083f9c4c0e204fd1162a951f9345b05 Mon Sep 17 00:00:00 2001
From: "Mr. 27" <45323883+Dutch-VanDerLinde@users.noreply.github.com>
Date: Thu, 14 Mar 2024 00:27:08 -0400
Subject: [PATCH 145/366] Pipebombs and IED rework (#25705)

* inital

* 2-9

* add crafting function, rename ied to fire bomb

* add firebomb ignition

* fikss

* change damage values

* add note

* fix tests i think

* ok

* good

* Review

* warning

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
---
 .../ExplosionSystem.Processing.cs             |  54 ++++++++++-----
 .../EntitySystems/ExplosionSystem.cs          |   4 +-
 .../Explosion/ExplosionPrototype.cs           |   6 ++
 Resources/Migrations/migration.yml            |   7 +-
 .../Weapons/Bombs/{ied.yml => firebomb.yml}   |  30 ++++-----
 .../Objects/Weapons/Bombs/pipebomb.yml        |  62 ++++++++++++++++++
 .../Reagents/Materials/materials.yml          |   8 +++
 .../improvised/{ied.yml => firebomb.yml}      |  12 ++--
 .../Crafting/Graphs/improvised/pipebomb.yml   |  43 ++++++++++++
 .../Recipes/Crafting/improvised.yml           |  21 ++++--
 .../Prototypes/Recipes/Reactions/fun.yml      |  16 +++++
 .../Prototypes/Stacks/Materials/materials.yml |   2 +-
 Resources/Prototypes/explosion.yml            |  16 +++++
 .../Weapons/Bombs/pipebomb.rsi/base.png       | Bin 0 -> 338 bytes
 .../Weapons/Bombs/pipebomb.rsi/icon.png       | Bin 0 -> 350 bytes
 .../Weapons/Bombs/pipebomb.rsi/meta.json      |  31 +++++++++
 .../Weapons/Bombs/pipebomb.rsi/primed.png     | Bin 0 -> 494 bytes
 .../Weapons/Bombs/pipebomb.rsi/wires.png      | Bin 0 -> 163 bytes
 18 files changed, 266 insertions(+), 46 deletions(-)
 rename Resources/Prototypes/Entities/Objects/Weapons/Bombs/{ied.yml => firebomb.yml} (83%)
 create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Bombs/pipebomb.yml
 rename Resources/Prototypes/Recipes/Crafting/Graphs/improvised/{ied.yml => firebomb.yml} (90%)
 create mode 100644 Resources/Prototypes/Recipes/Crafting/Graphs/improvised/pipebomb.yml
 create mode 100644 Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/base.png
 create mode 100644 Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/primed.png
 create mode 100644 Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/wires.png

diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
index 086ab7dd316..7dac935da5e 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
@@ -17,11 +17,15 @@
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using TimedDespawnComponent = Robust.Shared.Spawners.TimedDespawnComponent;
+using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
 
 namespace Content.Server.Explosion.EntitySystems;
 
 public sealed partial class ExplosionSystem
 {
+    [Dependency] private readonly FlammableSystem _flammableSystem = default!;
+
     /// <summary>
     ///     Used to limit explosion processing time. See <see cref="MaxProcessingTime"/>.
     /// </summary>
@@ -95,7 +99,7 @@ public override void Update(float frameTime)
             {
                 // EXPLOSION TODO allow explosion spawning to be interrupted by time limit. In the meantime, ensure that
                 // there is at-least 1ms of time left before creating a new explosion
-                if (MathF.Max(MaxProcessingTime - 1, 0.1f)  < Stopwatch.Elapsed.TotalMilliseconds)
+                if (MathF.Max(MaxProcessingTime - 1, 0.1f) < Stopwatch.Elapsed.TotalMilliseconds)
                     break;
 
                 if (!_explosionQueue.TryDequeue(out var queued))
@@ -129,11 +133,11 @@ public override void Update(float frameTime)
             try
             {
 #endif
-                var processed = _activeExplosion.Process(tilesRemaining);
-                tilesRemaining -= processed;
+            var processed = _activeExplosion.Process(tilesRemaining);
+            tilesRemaining -= processed;
 
-                // has the explosion finished processing?
-                if (_activeExplosion.FinishedProcessing)
+            // has the explosion finished processing?
+            if (_activeExplosion.FinishedProcessing)
             {
                 var comp = EnsureComp<TimedDespawnComponent>(_activeExplosion.VisualEnt);
                 comp.Lifetime = _cfg.GetCVar(CCVars.ExplosionPersistence);
@@ -202,7 +206,8 @@ internal bool ExplodeTile(BroadphaseComponent lookup,
         DamageSpecifier damage,
         MapCoordinates epicenter,
         HashSet<EntityUid> processed,
-        string id)
+        string id,
+        float? fireStacks)
     {
         var size = grid.Comp.TileSize;
         var gridBox = new Box2(tile * size, (tile + 1) * size);
@@ -221,7 +226,7 @@ internal bool ExplodeTile(BroadphaseComponent lookup,
         // process those entities
         foreach (var (uid, xform) in list)
         {
-            ProcessEntity(uid, epicenter, damage, throwForce, id, xform);
+            ProcessEntity(uid, epicenter, damage, throwForce, id, xform, fireStacks);
         }
 
         // process anchored entities
@@ -231,7 +236,7 @@ internal bool ExplodeTile(BroadphaseComponent lookup,
         foreach (var entity in _anchored)
         {
             processed.Add(entity);
-            ProcessEntity(entity, epicenter, damage, throwForce, id, null);
+            ProcessEntity(entity, epicenter, damage, throwForce, id, null, fireStacks);
         }
 
         // Walls and reinforced walls will break into girders. These girders will also be considered turf-blocking for
@@ -267,7 +272,7 @@ internal bool ExplodeTile(BroadphaseComponent lookup,
         {
             // Here we only throw, no dealing damage. Containers n such might drop their entities after being destroyed, but
             // they should handle their own damage pass-through, with their own damage reduction calculation.
-            ProcessEntity(uid, epicenter, null, throwForce, id, xform);
+            ProcessEntity(uid, epicenter, null, throwForce, id, xform, null);
         }
 
         return !tileBlocked;
@@ -302,7 +307,8 @@ internal void ExplodeSpace(BroadphaseComponent lookup,
         DamageSpecifier damage,
         MapCoordinates epicenter,
         HashSet<EntityUid> processed,
-        string id)
+        string id,
+        float? fireStacks)
     {
         var gridBox = Box2.FromDimensions(tile * DefaultTileSize, new Vector2(DefaultTileSize, DefaultTileSize));
         var worldBox = spaceMatrix.TransformBox(gridBox);
@@ -318,7 +324,7 @@ internal void ExplodeSpace(BroadphaseComponent lookup,
         foreach (var (uid, xform) in state.Item1)
         {
             processed.Add(uid);
-            ProcessEntity(uid, epicenter, damage, throwForce, id, xform);
+            ProcessEntity(uid, epicenter, damage, throwForce, id, xform, fireStacks);
         }
 
         if (throwForce <= 0)
@@ -332,7 +338,7 @@ internal void ExplodeSpace(BroadphaseComponent lookup,
 
         foreach (var (uid, xform) in list)
         {
-            ProcessEntity(uid, epicenter, null, throwForce, id, xform);
+            ProcessEntity(uid, epicenter, null, throwForce, id, xform, fireStacks);
         }
     }
 
@@ -429,7 +435,8 @@ private void ProcessEntity(
         DamageSpecifier? originalDamage,
         float throwForce,
         string id,
-        TransformComponent? xform)
+        TransformComponent? xform,
+        float? fireStacksOnIgnite)
     {
         if (originalDamage != null)
         {
@@ -438,6 +445,17 @@ private void ProcessEntity(
             {
                 // TODO EXPLOSIONS turn explosions into entities, and pass the the entity in as the damage origin.
                 _damageableSystem.TryChangeDamage(entity, damage, ignoreResistances: true);
+
+            }
+        }
+
+        // ignite
+        if (fireStacksOnIgnite != null)
+        {
+            if (_flammableQuery.TryGetComponent(uid, out var flammable))
+            {
+                flammable.FireStacks += fireStacksOnIgnite.Value;
+                _flammableSystem.Ignite(uid, uid, flammable);
             }
         }
 
@@ -706,14 +724,14 @@ private bool TryGetNextTileEnumerator()
         {
             _currentIntensity = _tileSetIntensity[CurrentIteration];
 
-            #if DEBUG
+#if DEBUG
             if (_expectedDamage != null)
             {
                 // Check that explosion processing hasn't somehow accidentally mutated the damage set.
                 DebugTools.Assert(_expectedDamage.Equals(_currentDamage));
                 _expectedDamage = ExplosionType.DamagePerIntensity * _currentIntensity;
             }
-            #endif
+#endif
 
             _currentDamage = ExplosionType.DamagePerIntensity * _currentIntensity;
 
@@ -812,7 +830,8 @@ public int Process(int processingTarget)
                     _currentDamage,
                     Epicenter,
                     ProcessedEntities,
-                    ExplosionType.ID);
+                    ExplosionType.ID,
+                    ExplosionType.FireStacks);
 
                 // If the floor is not blocked by some dense object, damage the floor tiles.
                 if (canDamageFloor)
@@ -829,7 +848,8 @@ public int Process(int processingTarget)
                     _currentDamage,
                     Epicenter,
                     ProcessedEntities,
-                    ExplosionType.ID);
+                    ExplosionType.ID,
+                    ExplosionType.FireStacks);
             }
 
             if (!MoveNext())
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
index 71f3025748a..8734c054d64 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
@@ -52,7 +52,7 @@ public sealed partial class ExplosionSystem : EntitySystem
     [Dependency] private readonly SharedMapSystem _map = default!;
 
     private EntityQuery<TransformComponent> _transformQuery;
-    private EntityQuery<DamageableComponent> _damageQuery;
+    private EntityQuery<FlammableComponent> _flammableQuery;
     private EntityQuery<PhysicsComponent> _physicsQuery;
     private EntityQuery<ProjectileComponent> _projectileQuery;
 
@@ -104,7 +104,7 @@ public override void Initialize()
         InitVisuals();
 
         _transformQuery = GetEntityQuery<TransformComponent>();
-        _damageQuery = GetEntityQuery<DamageableComponent>();
+        _flammableQuery = GetEntityQuery<FlammableComponent>();
         _physicsQuery = GetEntityQuery<PhysicsComponent>();
         _projectileQuery = GetEntityQuery<ProjectileComponent>();
     }
diff --git a/Content.Shared/Explosion/ExplosionPrototype.cs b/Content.Shared/Explosion/ExplosionPrototype.cs
index b2aa83c40dd..df2fb18360e 100644
--- a/Content.Shared/Explosion/ExplosionPrototype.cs
+++ b/Content.Shared/Explosion/ExplosionPrototype.cs
@@ -25,6 +25,12 @@ public sealed partial class ExplosionPrototype : IPrototype
     [DataField("damagePerIntensity", required: true)]
     public DamageSpecifier DamagePerIntensity = default!;
 
+    /// <summary>
+    ///     Amount of firestacks to apply in addition to igniting.
+    /// </summary>
+    [DataField]
+    public float? FireStacks;
+
     /// <summary>
     ///     This set of points, together with <see cref="_tileBreakIntensity"/> define a function that maps the
     ///     explosion intensity to a tile break chance via linear interpolation.
diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml
index ca24012e956..7220520dab3 100644
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@@ -305,4 +305,9 @@ FoodMeatRatdoubleKebab: FoodKebabSkewer
 FoodMeatSnakeKebab: FoodKebabSkewer
 FoodMeatHawaiianKebab: FoodKebabSkewer
 FoodMeatKebab: FoodKebabSkewer
-FoodMeatFiestaKebab: FoodKebabSkewer
\ No newline at end of file
+FoodMeatFiestaKebab: FoodKebabSkewer
+
+# 2024-03-11
+ImprovisedExplosive: FireBomb
+ImprovisedExplosiveEmpty: FireBombEmpty
+ImprovisedExplosiveFuel: FireBombFuel
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/ied.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml
similarity index 83%
rename from Resources/Prototypes/Entities/Objects/Weapons/Bombs/ied.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml
index c4420a43a36..a0e6fe77287 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/ied.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml
@@ -3,8 +3,8 @@
 # with that you could make napalm ied instead of welding fuel with no additional complexity
 - type: entity
   parent: BaseItem
-  id: ImprovisedExplosive
-  name: improvised explosive device
+  id: FireBomb
+  name: fire bomb
   description: A weak, improvised incendiary device.
   components:
   - type: Sprite
@@ -26,10 +26,10 @@
         volume: 1
   - type: RandomTimerTrigger
     min: 0
-    max: 60
-  - type: Explosive # Weak explosion in a very small radius. Doesn't break underplating.
-    explosionType: Default
-    totalIntensity: 20
+    max: 15
+  - type: Explosive # Weak explosion in a very small radius. Ignites surrounding entities.
+    explosionType: FireBomb
+    totalIntensity: 25
     intensitySlope: 5
     maxIntensity: 3
     canCreateVacuum: false
@@ -50,14 +50,14 @@
         acts: ["Destruction"]
       - !type:ExplodeBehavior
   - type: Construction
-    graph: ImprovisedExplosive
-    node: ied
+    graph: FireBomb
+    node: firebomb
 
 # has igniter but no fuel or wires
 - type: entity
   parent: DrinkColaCanEmpty
-  id: ImprovisedExplosiveEmpty
-  name: improvised explosive device
+  id: FireBombEmpty
+  name: fire bomb
   suffix: empty
   description: A weak, improvised incendiary device. This one has no fuel.
   components:
@@ -74,17 +74,17 @@
           True: {state: "base"}
           False: {state: "base"}
   - type: Construction
-    graph: ImprovisedExplosive
+    graph: FireBomb
     node: empty
-    defaultTarget: ied
+    defaultTarget: firebomb
   - type: Tag
     tags:
     - Trash
     # no DrinkCan, prevent using it to make another ied
 
 - type: entity
-  parent: ImprovisedExplosiveEmpty
-  id: ImprovisedExplosiveFuel
+  parent: FireBombEmpty
+  id: FireBombFuel
   suffix: fuel
   description: A weak, improvised incendiary device. This one is missing wires.
   components:
@@ -102,6 +102,6 @@
           Quantity: 30
   - type: Construction
     node: fuel
-    defaultTarget: ied
+    defaultTarget: firebomb
   - type: Tag
     tags: []
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pipebomb.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pipebomb.yml
new file mode 100644
index 00000000000..5fb6829ac2b
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pipebomb.yml
@@ -0,0 +1,62 @@
+- type: entity
+  parent: GrenadeBase
+  id: PipeBomb
+  name: pipe bomb
+  description: An improvised explosive made from pipes and wire.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Bombs/pipebomb.rsi
+    layers:
+    - state: base
+      map: ["enum.TriggerVisualLayers.Base"]
+    - state: wires
+  - type: OnUseTimerTrigger # todo: make it activate through welder/lighter/fire instead
+    delay: 5
+    examinable: false
+    initialBeepDelay: 0
+    beepSound: /Audio/Effects/lightburn.ogg
+  - type: RandomTimerTrigger
+    min: 1
+    max: 10
+  - type: ExplodeOnTrigger
+  - type: Explosive # Weak explosion in a very small radius. Doesn't break underplating.
+    explosionType: Default
+    totalIntensity: 50
+    intensitySlope: 5
+    maxIntensity: 6
+    canCreateVacuum: false
+  - type: Appearance
+  - type: TimerTriggerVisuals
+  - type: Construction
+    graph: PipeBomb
+    node: pipebomb
+
+- type: entity
+  parent: BaseItem
+  id: PipeBombGunpowder
+  name: pipe bomb
+  description: An improvised explosive made from a pipe. This one has no gunpowder.
+  suffix: Gunpowder
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Bombs/pipebomb.rsi
+    state: base
+  - type: Construction
+    graph: PipeBomb
+    node: gunpowder
+    defaultTarget: pipebomb
+
+- type: entity
+  parent: BaseItem
+  id: PipeBombCable
+  name: pipe bomb
+  description: An improvised explosive made from a pipe. This one has no cable.
+  suffix: Cable
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Bombs/pipebomb.rsi
+    state: base
+  - type: Construction
+    graph: PipeBomb
+    node: cable
+    defaultTarget: pipebomb
\ No newline at end of file
diff --git a/Resources/Prototypes/Reagents/Materials/materials.yml b/Resources/Prototypes/Reagents/Materials/materials.yml
index f56a712cd8e..9e536614b1e 100644
--- a/Resources/Prototypes/Reagents/Materials/materials.yml
+++ b/Resources/Prototypes/Reagents/Materials/materials.yml
@@ -134,3 +134,11 @@
   icon: { sprite: Objects/Materials/materials.rsi, state: normality }
   color: "#53a9ff"
   price: 7.5
+
+- type: material
+  id: Gunpowder
+  name: materials-gunpowder
+  unit: materials-unit-piece
+  icon: { sprite: Objects/Misc/reagent_fillings.rsi, state: powderpile }
+  color: "#A9A9A9"
+  price: 0
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/ied.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/firebomb.yml
similarity index 90%
rename from Resources/Prototypes/Recipes/Crafting/Graphs/improvised/ied.yml
rename to Resources/Prototypes/Recipes/Crafting/Graphs/improvised/firebomb.yml
index bdf06e558f1..529585583ca 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/ied.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/firebomb.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: ImprovisedExplosive
+  id: FireBomb
   start: start
   graph:
   - node: start
@@ -19,7 +19,7 @@
           state: icon
         doAfter: 1
   - node: empty
-    entity: ImprovisedExplosiveEmpty
+    entity: FireBombEmpty
     edges:
     - to: start
       completed:
@@ -42,7 +42,7 @@
       - tool: Screwing
         doAfter: 1
   - node: fuel
-    entity: ImprovisedExplosiveFuel
+    entity: FireBombFuel
     edges:
     - to: empty
       conditions:
@@ -51,7 +51,7 @@
       steps:
       - tool: Screwing
         doAfter: 1
-    - to: ied
+    - to: firebomb
       conditions: # no dumping out 29u of the fuel then adding wires :)
       - !type:MinSolution
         solution: drink
@@ -62,8 +62,8 @@
       - material: Cable
         amount: 5
         doAfter: 2
-  - node: ied
-    entity: ImprovisedExplosive
+  - node: firebomb
+    entity: FireBomb
     edges:
     - to: fuel
       completed:
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/pipebomb.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/pipebomb.yml
new file mode 100644
index 00000000000..bc661b47d93
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/pipebomb.yml
@@ -0,0 +1,43 @@
+- type: constructionGraph
+  id: PipeBomb
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: gunpowder
+      steps:
+      - tag: Pipe
+        icon:
+          sprite: Structures/Piping/Atmospherics/pipe.rsi
+          state: pipeStraight
+        name: pipe
+      - material: Steel
+        amount: 1
+        doAfter: 3
+  - node: gunpowder
+    entity: PipeBombGunpowder
+    edges:
+    - to: cable
+      steps:
+      - material: Gunpowder
+        amount: 5
+        doAfter: 3
+  - node: cable
+    entity: PipeBombCable
+    edges:
+    - to: pipebomb
+      steps:
+      - material: Cable
+        amount: 5
+        doAfter: 2
+  - node: pipebomb
+    entity: PipeBomb
+    edges:
+    - to: cable
+      completed:
+      - !type:SpawnPrototype
+        prototype: CableApcStack1
+        amount: 5
+      steps:
+      - tool: Cutting
+        doAfter: 2
diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml
index 3f8458f58d1..cfb90e7d457 100644
--- a/Resources/Prototypes/Recipes/Crafting/improvised.yml
+++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml
@@ -164,11 +164,11 @@
     state: icon
 
 - type: construction
-  name: improvised explosive device
-  id: improvisedexplosive
-  graph: ImprovisedExplosive
+  name: fire bomb
+  id: firebomb
+  graph: FireBomb
   startNode: start
-  targetNode: ied
+  targetNode: firebomb
   category: construction-category-weapons
   objectType: Item
   description: A weak, improvised incendiary device.
@@ -201,3 +201,16 @@
     sprite: Clothing/Head/Hats/straw_hat.rsi
     state: icon
   objectType: Item
+
+- type: construction
+  name: pipe bomb
+  id: pipebomb
+  graph: PipeBomb
+  startNode: start
+  targetNode: pipebomb
+  category: construction-category-weapons
+  objectType: Item
+  description: An improvised explosive made from pipes and wire.
+  icon:
+    sprite: Objects/Weapons/Bombs/pipebomb.rsi
+    state: icon
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Reactions/fun.yml b/Resources/Prototypes/Recipes/Reactions/fun.yml
index 4e838816f20..5a5dfa986f4 100644
--- a/Resources/Prototypes/Recipes/Reactions/fun.yml
+++ b/Resources/Prototypes/Recipes/Reactions/fun.yml
@@ -185,3 +185,19 @@
   effects:
     - !type:CreateEntityReactionEffect
       entity: ShardCrystalRandom
+
+- type: reaction
+  id: Gunpowder
+  impact: Low
+  quantized: true
+  minTemp: 374
+  reactants:
+    Potassium:
+      amount: 6
+    Sulfur:
+      amount: 2
+    Charcoal:
+      amount: 2
+  effects:
+    - !type:CreateEntityReactionEffect
+      entity: MaterialGunpowder
\ No newline at end of file
diff --git a/Resources/Prototypes/Stacks/Materials/materials.yml b/Resources/Prototypes/Stacks/Materials/materials.yml
index e671152f67a..95afb0cd1ab 100644
--- a/Resources/Prototypes/Stacks/Materials/materials.yml
+++ b/Resources/Prototypes/Stacks/Materials/materials.yml
@@ -105,4 +105,4 @@
   name: goliath hide
   icon: { sprite: /Textures/Objects/Materials/hide.rsi, state: goliath_hide }
   spawn: MaterialGoliathHide1
-  maxCount: 30
+  maxCount: 30
\ No newline at end of file
diff --git a/Resources/Prototypes/explosion.yml b/Resources/Prototypes/explosion.yml
index 7ef2e774a71..492b7525914 100644
--- a/Resources/Prototypes/explosion.yml
+++ b/Resources/Prototypes/explosion.yml
@@ -133,3 +133,19 @@
   fireColor: Green
   texturePath: /Textures/Effects/fire_greyscale.rsi
   fireStates: 3
+
+- type: explosion
+  id: FireBomb
+  damagePerIntensity:
+    types:
+      Heat: 1
+      Blunt: 2
+      Piercing: 3
+  lightColor: Orange
+  texturePath: /Textures/Effects/fire.rsi
+  fireStates: 6
+  fireStacks: 2
+
+# STOP
+# BEFORE YOU ADD MORE EXPLOSION TYPES CONSIDER IF AN EXISTING ONE IS SUITABLE
+# ADDING NEW ONES IS PROHIBITIVELY EXPENSIVE
diff --git a/Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/base.png b/Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..14d0ec58705ad336eb9384c7e64e3752c7be1f15
GIT binary patch
literal 338
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCik_0(?ST`T6<f<m7yPecRgFTwPr`I5?!Fq#`3D*R5OE+1V*CFE1@E9Tyk3
zW5<r3o}TU7w@XS&?%cVvp`oF<xj88*31|#^UeXmHB~}vT7yKU^U|_s-;0aI#XMsm#
zF#`kNK@eu#F){lsP_W$7#WBRf|LLWJTn!354G(9|N{yQK^WS=@ZceR-d~+B5H+h)c
z!q)k+n!#XJ@zY4284H9%nFJy>FJcPPRNc++x?zdotYT4#vnJ6%Dq>E&<c7kAn*u%W
z>zxaJA8fqAY&FO3)-xq9hVQPS*3uvT>F$t!wlTh8ieB7H-zyt<ix&c&z~JfX=d#Wz
Gp$PzAmV;~n

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/icon.png b/Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..e388313f0ed646a079b35ddd05c1adb6178fe6f6
GIT binary patch
literal 350
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCikF1AIbUr5wfi`T6DK<a~X7+uGV(U0pdiIHaVcA|oT$ty|aG*(onCFD)${
z7Z<l<$Bv$!p6%PWOG--a+_|%%p`p3CIVmX#XwsW2drN?ncuA07@PDj;;hDp;IG_^F
z0*}aI1_r)EAj~ML;ne^XtoL+r46*Qkdhs+@gMxrV;Bohxr#GGX|Nn}CTY<`)&@C_4
zxmk9s=<tbesA`VB%*&w2@H~cdNsyCfr}i2ah2X1#EE&l?c}*eANAy~Y`x@@?J#GO~
zm4({OW_$+f6|ZlVe>h!Nps>Z^xxe_bSBhQ?-<|jV7N2m)()~d2eg?z1Z_<H_xs=i>
QfKFlXboFyt=akR{014oQwg3PC

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/meta.json b/Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/meta.json
new file mode 100644
index 00000000000..b7585556c63
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/meta.json
@@ -0,0 +1,31 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Pipebomb sprites made by girthquake",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "base"
+    },
+    {
+      "name": "wires"
+    },
+    {
+      "name": "primed",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/primed.png b/Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/primed.png
new file mode 100644
index 0000000000000000000000000000000000000000..27a70981fe77d1117ea1bf2c293436c2d89799e7
GIT binary patch
literal 494
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O_~K2Ka=yzF(w%b)xd4S*lWw;{5#la&mIMzP@d3ZLY4a92^`{Qc{tTk?Yp2
z>+I~5mzS58mX3>y+p%LuPfySG?b{_KC3o)J+0f9?+}xa$lytIF5oqex)sy}JDe00R
zzu^Bk0fV{;w<%B=XMsm#F#`kNVGw3Kp1&dmDEQyg#W5tp{q3}ed`$`>ZlMCEr?==_
z{$78<ZFg?WkA_QO(U1RpJXCI5%)@?j)5Ps8D{js@{l!AdRC>-cn@@F)=hfFKEI;I&
zD4El^U^%~fI+JGWgb?L`JT9-LEkUZiF$sBGDJwtLGo6{aVAbngTpR)CSZ7UOc#<P1
z&3lz&it)j9cjc{C32LM_CEL$&Vww`&RP6HL+5Epv8)cia8;bN^=wDyJ@MK#;7ss4C
zA|{V>XITArYuKqdp}$w?Mki3${r}uS&ZbOHeKxeIcrcy4&gxfRb0}$>RgB{igYzK*
zW!1anm;65X?Xu-v{trL%C%t3W|HJ*_kGZ3z@ES$Ve-0aT%5C(TC;T<zdJPN;22WQ%
Jmvv4FO#qtC&)Wb1

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/wires.png b/Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/wires.png
new file mode 100644
index 0000000000000000000000000000000000000000..e564f71eab924c50e930d84c852c1f159ce25761
GIT binary patch
literal 163
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=Dh+L6~vJ#O${~K?_e8$B+p3x91OXGAQscA9y6xbbH7DfUXBj
zi!@H$RsXBXdm}U}@AIDbE|s%(zIpll@MlH_h6CzKR!1JQ9>1JDvkPbjgQu&X%Q~lo
FCIAEaHZcGI

literal 0
HcmV?d00001


From fedbf2fb2c5b13eb68541cdd412de0c682e3c906 Mon Sep 17 00:00:00 2001
From: Alzore <140123969+Blackern5000@users.noreply.github.com>
Date: Sun, 11 Aug 2024 20:49:09 -0500
Subject: [PATCH 146/366] Add diamond mining drills, buff regular mining drills
 (#30814)

* why do I have to change so much just to add drills

* diamon
---
 .../Locale/en-US/research/technologies.ftl    |   2 +-
 .../Entities/Objects/Weapons/Melee/mining.yml |  88 ++++++++++++++++++
 .../Objects/Weapons/Melee/pickaxe.yml         |  85 -----------------
 .../Entities/Structures/Machines/lathe.yml    |   3 +-
 .../Reagents/Materials/materials.yml          |  10 +-
 .../Prototypes/Recipes/Lathes/salvage.yml     |  20 ++++
 Resources/Prototypes/Research/industrial.yml  |  29 +++---
 .../Tools/handdrilldiamond.rsi/handdrill.png  | Bin 0 -> 416 bytes
 .../handdrilldiamond.rsi/inhand-left.png      | Bin 0 -> 392 bytes
 .../handdrilldiamond.rsi/inhand-right.png     | Bin 0 -> 392 bytes
 .../Tools/handdrilldiamond.rsi/meta.json      |  22 +++++
 11 files changed, 157 insertions(+), 102 deletions(-)
 delete mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
 create mode 100644 Resources/Textures/Objects/Tools/handdrilldiamond.rsi/handdrill.png
 create mode 100644 Resources/Textures/Objects/Tools/handdrilldiamond.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Tools/handdrilldiamond.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Tools/handdrilldiamond.rsi/meta.json

diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl
index b4d14468aa2..ded5bbcf58b 100644
--- a/Resources/Locale/en-US/research/technologies.ftl
+++ b/Resources/Locale/en-US/research/technologies.ftl
@@ -21,6 +21,7 @@ research-technology-super-powercells = Super Powercells
 research-technology-bluespace-storage = Bluespace Storage
 research-technology-portable-fission = Portable Fission
 research-technology-space-scanning = Space Scanning
+research-technology-excavation = Mass Excavation
 
 research-technology-salvage-weapons = Salvage Weapons
 research-technology-draconic-munitions = Draconic Munitions
@@ -45,7 +46,6 @@ research-technology-magnets-tech = Localized Magnetism
 research-technology-advanced-parts = Advanced Parts
 research-technology-advanced-bluespace = Advanced Bluespace Research
 research-technology-anomaly-harnessing = Anomaly Core Harnessing
-research-technology-grappling = Grappling
 research-technology-abnormal-artifact-manipulation = Artifact Recycling
 research-technology-gravity-manipulation = Gravity Manipulation
 research-technology-quantum-leaping = Quantum Leaping
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
index 900950cb9ec..31c93d81e33 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -1,3 +1,91 @@
+- type: entity
+  name: pickaxe
+  parent: BaseItem
+  id: Pickaxe
+  description: Notched to perfection, for jamming it into rocks.
+  components:
+  - type: Tag
+    tags:
+    - Pickaxe
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/pickaxe.rsi
+    state: pickaxe
+  - type: MeleeWeapon
+    attackRate: 0.7
+    wideAnimationRotation: -135
+    soundHit:
+      path: "/Audio/Weapons/smash.ogg"
+      params:
+        volume: -3
+    damage:
+      groups:
+        Brute: 5
+  - type: Wieldable
+  - type: IncreaseDamageOnWield
+    damage:
+      groups:
+        Brute: 10
+      types:
+        Structural: 30
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,2,0
+    - 1,1,1,2
+    sprite: Objects/Weapons/Melee/pickaxe.rsi
+    storedRotation: -45
+  - type: UseDelay
+
+- type: entity
+  name: mining drill
+  parent: BaseItem
+  id: MiningDrill
+  description: Powerful tool used to quickly drill through rocks.
+  components:
+  - type: Item
+    storedRotation: -90
+  - type: Tag
+    tags:
+    - Pickaxe
+  - type: Sprite
+    sprite: Objects/Tools/handdrill.rsi
+    state: handdrill
+  - type: MeleeWeapon
+    autoAttack: true
+    angle: 0
+    wideAnimationRotation: -90
+    soundHit:
+      path: "/Audio/Items/drill_hit.ogg"
+    attackRate: 4
+    damage:
+      groups:
+        Brute: 3
+      types:
+        Structural: 15
+
+- type: entity
+  name: diamond tipped mining drill
+  parent: MiningDrill
+  id: MiningDrillDiamond
+  description: A significantly more efficient mining drill tipped with diamond.
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/handdrilldiamond.rsi
+    state: handdrill
+  - type: MeleeWeapon
+    autoAttack: true
+    angle: 0
+    wideAnimationRotation: -90
+    soundHit:
+      path: "/Audio/Items/drill_hit.ogg"
+    attackRate: 4
+    damage:
+      groups:
+        Brute: 6
+      types:
+        Structural: 30
+
+
 - type: entity
   abstract: true
   parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
deleted file mode 100644
index ff01e5692eb..00000000000
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
+++ /dev/null
@@ -1,85 +0,0 @@
-- type: entity
-  name: pickaxe
-  parent: BaseItem
-  id: Pickaxe
-  description: Notched to perfection, for jamming it into rocks
-  components:
-  - type: Tag
-    tags:
-    - Pickaxe
-  - type: Sprite
-    sprite: Objects/Weapons/Melee/pickaxe.rsi
-    state: pickaxe
-  - type: MeleeWeapon
-    attackRate: 1.17
-    range: 1.5
-    wideAnimationRotation: -135
-    soundHit:
-      path: "/Audio/Weapons/smash.ogg"
-      params:
-        volume: -3
-    damage:
-      types:
-        Blunt: 6
-        Piercing: 3
-    bluntStaminaDamageFactor: 2.0
-    heavyDamageBaseModifier: 1.75
-    maxTargets: 5
-    angle: 80
-  - type: DamageOtherOnHit
-    staminaCost: 5
-  - type: Wieldable
-  - type: IncreaseDamageOnWield
-    damage:
-      types:
-        Blunt: 5
-        Structural: 30
-  - type: Item
-    size: Normal
-    shape:
-    - 0,0,2,0
-    - 1,1,1,2
-    sprite: Objects/Weapons/Melee/pickaxe.rsi
-    storedRotation: -45
-  - type: UseDelay
-
-- type: entity
-  name: mining drill
-  parent: BaseItem
-  id: MiningDrill
-  description: Powerful tool used to quickly drill through rocks
-  components:
-  - type: Item
-    storedRotation: -90
-  - type: Tag
-    tags:
-    - Pickaxe
-  - type: Sprite
-    sprite: Objects/Tools/handdrill.rsi
-    state: handdrill
-  - type: MeleeWeapon
-    autoAttack: true
-    wideAnimationRotation: -90
-    soundHit:
-      path: "/Audio/Items/drill_hit.ogg"
-    attackRate: .83
-    range: 1.5
-    damage:
-      types:
-        Blunt: 6
-        Slash: 3
-        Structural: 12
-    bluntStaminaDamageFactor: 4.0
-    heavyRateModifier: 1
-    heavyRangeModifier: 2
-    heavyDamageBaseModifier: 1
-    angle: 20
-  - type: DamageOtherOnHit
-    staminaCost: 8
-  - type: ThrowingAngle
-    angle: 270
-
-  - type: ReverseEngineering # Nyano
-    difficulty: 2
-    recipes:
-      - MiningDrill
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 573717def82..7d77168a10e 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -16,7 +16,7 @@
         mask:
         - MachineMask
         layer:
-          - MachineLayer
+          - MachineLayer  
   - type: Lathe
   - type: MaterialStorage
   - type: Destructible
@@ -270,6 +270,7 @@
     dynamicRecipes:
       - PowerDrill
       - MiningDrill
+      - MiningDrillDiamond
       - AnomalyScanner
       - AnomalyLocator
       - AnomalyLocatorWide
diff --git a/Resources/Prototypes/Reagents/Materials/materials.yml b/Resources/Prototypes/Reagents/Materials/materials.yml
index 9e536614b1e..9fe532233cc 100644
--- a/Resources/Prototypes/Reagents/Materials/materials.yml
+++ b/Resources/Prototypes/Reagents/Materials/materials.yml
@@ -141,4 +141,12 @@
   unit: materials-unit-piece
   icon: { sprite: Objects/Misc/reagent_fillings.rsi, state: powderpile }
   color: "#A9A9A9"
-  price: 0
\ No newline at end of file
+  price: 0
+
+- type: material
+  id: Diamond
+  name: materials-diamond
+  unit: materials-unit-piece
+  icon: { sprite: Objects/Materials/materials.rsi, state: diamond }
+  color: "#80ffff"
+  price: 20 # big diamond gaslit us so hard diamonds actually became extremely rare
diff --git a/Resources/Prototypes/Recipes/Lathes/salvage.yml b/Resources/Prototypes/Recipes/Lathes/salvage.yml
index 9b3cb086433..84047ae75d8 100644
--- a/Resources/Prototypes/Recipes/Lathes/salvage.yml
+++ b/Resources/Prototypes/Recipes/Lathes/salvage.yml
@@ -14,3 +14,23 @@
     Steel: 1000
     Glass: 500
     # If they get spammed make it cost silver.
+
+- type: latheRecipe
+  id: MiningDrill
+  result: MiningDrill
+  category: Tools
+  completetime: 3
+  materials:
+    Steel: 500
+    Plastic: 100
+
+- type: latheRecipe
+  id: MiningDrillDiamond
+  result: MiningDrillDiamond
+  category: Tools
+  completetime: 3
+  materials:
+    Steel: 600
+    Plastic: 200
+    Silver: 200
+    Diamond: 100
diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml
index c2b05a18abe..99e000d37fc 100644
--- a/Resources/Prototypes/Research/industrial.yml
+++ b/Resources/Prototypes/Research/industrial.yml
@@ -11,9 +11,10 @@
   cost: 7500
   recipeUnlocks:
   - MiningDrill
+  - WeaponGrapplingGun
   - BorgModuleMining
+  - BorgModuleGrapplingGun
   - OreProcessorIndustrialMachineCircuitboard
-  - OreBagOfHolding
   - ClothingMaskWeldingGas
   - SalvageExpeditionsComputerCircuitboard
 
@@ -108,19 +109,6 @@
   - RipleyPeripheralsElectronics
   - MechEquipmentGrabber
 
-- type: technology
-  id: Grappling
-  name: research-technology-grappling
-  icon:
-    sprite: Objects/Weapons/Guns/Launchers/grappling_gun.rsi
-    state: base
-  discipline: Industrial
-  tier: 1
-  cost: 5000
-  recipeUnlocks:
-  - WeaponGrapplingGun
-  - BorgModuleGrapplingGun
-
 # Tier 2
 
 - type: technology
@@ -182,6 +170,19 @@
     - BorgModuleAdvancedTool
     - BorgModuleRCD
 
+- type: technology
+  id: MassExcavation
+  name: research-technology-excavation
+  icon:
+    sprite: Objects/Tools/handdrilldiamond.rsi
+    state: handdrill
+  discipline: Industrial
+  tier: 2
+  cost: 12500
+  recipeUnlocks:
+    - OreBagOfHolding
+    - MiningDrillDiamond
+
 - type: technology
   id: MechanizedSalvaging
   name: research-technology-mechanized-salvaging
diff --git a/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/handdrill.png b/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/handdrill.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b913e2bd9bd9304ab6aa7081c8f7e3a50aa9bf2
GIT binary patch
literal 416
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCikF1AIbUm1Lxhv^ApqTq@H;W6iS`v?U$i(7nfNwyA|<?&i%khYlS(d-?tU
z|BF^`EU#|f|NnnjRC1+NgN%%hlch<+|Np*9zCe@wXROr&QsN~+e!>5-0)}S}&*Fee
zI14-?iy0XBj({-ZRBb+Kpx{AI7sn6_|F`Gw@--Rous)bO?clNZ5;wlrhn$}y)ykc`
z=j(=^lD`UbH}n5&o~7T=-0|Sc!OsU)7Kqz+x%0Lz%v7k^|CF!d-NmxG>;g&hzwNHM
zF&;LUvB32;=bogFWSQfO-X+XhHZ%4IQ;5M))xMY-4~`%&;}FZEyEge3yw*SZ)m%X5
zsgB8Ots7hsWo6}lLH`BLIGu93kPvKsyjFkpIZpu&ohQCqcIKS3yw}9M@6IB%4W)%T
l^VLn;Kh3dU@l$k0EaOX4pWU<0t^oxCgQu&X%Q~loCIDjpvgQB)

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..db6873b739fc833b6287a5fb3387aa04cbac9b66
GIT binary patch
literal 392
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`1E1o(uwI$4@1$w=+-n!TVc$<)HJGCedbD!Jy+p-QWUhX4Qf|NjqE_(|c&
zR3ODu666>B9|0JI?w>mc6z44Ph%9Dc;5!Jyj5{V~zXb|j^>lFziEw{A?X*y{0*@;*
zBjeBi|8+|)MV(ptsw6qR$ZXQbqMDo?A@xUC)LzUuz%sX*OV87B#vC2Lg{)6@N;diE
z-|E@x<#5Jsm+P|Lqpp#?8jebRl7CrGZIZa@9_%S{v95F3^H0sOW^0#9rZ}uAs$I;o
zy6V`0g$lLz>wj=wH*DmzQZsNo&hlOK%+^<YeY<8lma|Xc>9aL!c*oFm(Di%|&kE}U
zF?~KSdR*=@?#s&NSgU?w1LJOHkt^HwuPBx)XV-a=so-!oQH{ZuvAlid1D$&P6<-<c
XwAL(-+PK37=s^ZgS3j3^P6<r_VDp`w

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..37f9d3f44d54e70e4ef989f4d0867d36a646437a
GIT binary patch
literal 392
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`1E1o(uwI$4@1$w--6I4)>Q+T%4lEGoG&J+#uQq2|z`hX4Qf|NjqE7~E}l
z3`p^m1o;L3M*s$)`{&L9#W@Q+B8wRq_zr?F<Bo~hZ-IhWJzX3_BHZ6j^Au}Q;9+%U
zH$3q7{q2Oy5-A0@UR1B_oiITtyzYa!U?Yc;l7Qor$R=+iyCv%+{u$3V=>N6AQTKWM
zlZl>^y%lE?u1pF0Bb;EyF~ux7?VH>_6Nj?%8@~Ls?KX{kUB;tlYaAo+=iRac!f!cN
zeRC_26YNk>ViI(5`QYJr|HiwJt9c#`AA<7(WaL{}E}W=)rTz3}od<(UZb+Y~_UyxV
zCpa{;9dA0b?HVWNLNTk%-~iFtij8x4+qP(ChDa+WPLPheWu?NC<or8My<+cy-}=`!
WtvUbio*dA(3=E#GelF{r5}E+a!<_2?

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/meta.json b/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/meta.json
new file mode 100644
index 00000000000..e9341a75be5
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/8fdee6e4e3dacdb7a12efaac132933dc0fc649b4 and modified by alzore_",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "handdrill"
+    },
+	{
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

From 3845b3de481410129b2952ce1402e226d8db109e Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 15:34:57 -0400
Subject: [PATCH 147/366] Meow

---
 .../Psionics/PsionicAbilitiesSystem.cs        | 714 +++++++++---------
 .../DeltaV/Entities/Mobs/NPCs/nukiemouse.yml  |   2 +-
 .../Entities/Clothing/Head/hoods.yml          |   2 +-
 .../Prototypes/Entities/Mobs/NPCs/xenopet.yml |   2 +-
 .../Circuitboards/Machine/production.yml      |  14 +
 .../Objects/Misc/identification_cards.yml     |  57 --
 .../Objects/Specific/Medical/surgery.yml      |   2 +-
 .../Objects/Weapons/Melee/home_run_bat.yml    |   2 +-
 .../Objects/Weapons/Melee/pickaxe.yml         |  85 +++
 .../Prototypes/Entities/Surgery/surgeries.yml |  10 +-
 .../Weapons/Melee/breaching_hammer.yml        |   2 +-
 Resources/Prototypes/Store/presets.yml        |   7 -
 12 files changed, 467 insertions(+), 432 deletions(-)
 create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml

diff --git a/Content.Server/Abilities/Psionics/PsionicAbilitiesSystem.cs b/Content.Server/Abilities/Psionics/PsionicAbilitiesSystem.cs
index a657af150f4..a19aab5def0 100644
--- a/Content.Server/Abilities/Psionics/PsionicAbilitiesSystem.cs
+++ b/Content.Server/Abilities/Psionics/PsionicAbilitiesSystem.cs
@@ -1,431 +1,431 @@
+using Content.Server.Chat.Managers;
+using Content.Server.Ghost;
+using Content.Server.Mind;
+using Content.Server.NPC.HTN;
 using Content.Shared.Abilities.Psionics;
 using Content.Shared.Actions;
-using Content.Shared.Popups;
+using Content.Shared.CCVar;
 using Content.Shared.Chat;
+using Content.Shared.NPC.Systems;
+using Content.Shared.Popups;
 using Content.Shared.Psionics.Glimmer;
+using Content.Shared.Psionics;
 using Content.Shared.Random;
-using Content.Shared.Random.Helpers;
 using Content.Shared.StatusEffect;
-using Robust.Shared.Random;
+using Robust.Server.Player;
+using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager;
-using Content.Shared.Psionics;
 using System.Linq;
-using Robust.Server.Player;
-using Content.Server.Chat.Managers;
-using Robust.Shared.Configuration;
-using Content.Shared.CCVar;
-using Content.Server.NPC.Systems;
-using Content.Server.NPC.HTN;
-using Content.Server.Ghost;
-using Content.Server.Mind;
-namespace Content.Server.Abilities.Psionics
+
+namespace Content.Server.Abilities.Psionics;
+
+public sealed class PsionicAbilitiesSystem : EntitySystem
 {
-    public sealed class PsionicAbilitiesSystem : EntitySystem
+    [Dependency] private readonly GhostSystem _ghost = default!;
+    [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
+    [Dependency] private readonly IChatManager _chatManager = default!;
+    [Dependency] private readonly IConfigurationManager _config = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly ISerializationManager _serialization = default!;
+    [Dependency] private readonly MindSystem _mind = default!;
+    [Dependency] private readonly NpcFactionSystem _npcFaction = default!;
+    [Dependency] private readonly PsionicFamiliarSystem _psionicFamiliar = default!;
+    [Dependency] private readonly SharedActionsSystem _actions = default!;
+    [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popups = default!;
+    [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
+    [Dependency] private readonly IComponentFactory _componentFactory = default!;
+
+    private ProtoId<WeightedRandomPrototype> _pool = "RandomPsionicPowerPool";
+    private const string GenericInitializationMessage = "generic-power-initialization-feedback";
+
+    public override void Initialize()
     {
-        [Dependency] private readonly IComponentFactory _componentFactory = default!;
-        [Dependency] private readonly IRobustRandom _random = default!;
-        [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
-        [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
-        [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly SharedActionsSystem _actions = default!;
-        [Dependency] private readonly SharedPopupSystem _popups = default!;
-        [Dependency] private readonly ISerializationManager _serialization = default!;
-        [Dependency] private readonly IPlayerManager _playerManager = default!;
-        [Dependency] private readonly IChatManager _chatManager = default!;
-        [Dependency] private readonly PsionicFamiliarSystem _psionicFamiliar = default!;
-        [Dependency] private readonly IConfigurationManager _config = default!;
-        [Dependency] private readonly NpcFactionSystem _npcFaction = default!;
-        [Dependency] private readonly GhostSystem _ghost = default!;
-        [Dependency] private readonly MindSystem _mind = default!;
-
-        private ProtoId<WeightedRandomPrototype> _pool = "RandomPsionicPowerPool";
-        private const string GenericInitializationMessage = "generic-power-initialization-feedback";
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<InnatePsionicPowersComponent, MapInitEvent>(InnatePowerStartup);
-            SubscribeLocalEvent<PsionicComponent, ComponentShutdown>(OnPsionicShutdown);
-        }
-
-        /// <summary>
-        ///     Special use-case for a InnatePsionicPowers, which allows an entity to start with any number of Psionic Powers.
-        /// </summary>
-        private void InnatePowerStartup(EntityUid uid, InnatePsionicPowersComponent comp, MapInitEvent args)
-        {
-            // Any entity with InnatePowers should also be psionic, but in case they aren't already...
-            EnsureComp<PsionicComponent>(uid, out var psionic);
+        base.Initialize();
+        SubscribeLocalEvent<InnatePsionicPowersComponent, MapInitEvent>(InnatePowerStartup);
+        SubscribeLocalEvent<PsionicComponent, ComponentShutdown>(OnPsionicShutdown);
+    }
 
-            foreach (var proto in comp.PowersToAdd)
-                if (!psionic.ActivePowers.Contains(_prototypeManager.Index(proto)))
-                    InitializePsionicPower(uid, _prototypeManager.Index(proto), psionic, false);
-        }
+    /// <summary>
+    ///     Special use-case for a InnatePsionicPowers, which allows an entity to start with any number of Psionic Powers.
+    /// </summary>
+    private void InnatePowerStartup(EntityUid uid, InnatePsionicPowersComponent comp, MapInitEvent args)
+    {
+        // Any entity with InnatePowers should also be psionic, but in case they aren't already...
+        EnsureComp<PsionicComponent>(uid, out var psionic);
 
-        private void OnPsionicShutdown(EntityUid uid, PsionicComponent component, ComponentShutdown args)
-        {
-            if (!EntityManager.EntityExists(uid)
-                || HasComp<MindbrokenComponent>(uid))
-                return;
+        foreach (var proto in comp.PowersToAdd)
+            if (!psionic.ActivePowers.Contains(_prototypeManager.Index(proto)))
+                InitializePsionicPower(uid, _prototypeManager.Index(proto), psionic, false);
+    }
 
-            KillFamiliars(component);
-            RemoveAllPsionicPowers(uid);
-        }
+    private void OnPsionicShutdown(EntityUid uid, PsionicComponent component, ComponentShutdown args)
+    {
+        if (!EntityManager.EntityExists(uid)
+            || HasComp<MindbrokenComponent>(uid))
+            return;
 
-        /// <summary>
-        ///     The most shorthand route to creating a Psion. If an entity is not already psionic, it becomes one. This also adds a random new PsionicPower.
-        ///     To create a "Latent Psychic"(Psion with no powers) just add or ensure the PsionicComponent normally.
-        /// </summary>
-        public void AddPsionics(EntityUid uid)
-        {
-            if (Deleted(uid))
-                return;
+        KillFamiliars(component);
+        RemoveAllPsionicPowers(uid);
+    }
 
-            AddRandomPsionicPower(uid);
-        }
+    /// <summary>
+    ///     The most shorthand route to creating a Psion. If an entity is not already psionic, it becomes one. This also adds a random new PsionicPower.
+    ///     To create a "Latent Psychic"(Psion with no powers) just add or ensure the PsionicComponent normally.
+    /// </summary>
+    public void AddPsionics(EntityUid uid)
+    {
+        if (Deleted(uid))
+            return;
 
-        /// <summary>
-        ///     Pretty straightforward, adds a random psionic power to a given Entity. If that Entity is not already Psychic, it will be made one.
-        ///     If an entity already has all possible powers, this will not add any new ones.
-        /// </summary>
-        public void AddRandomPsionicPower(EntityUid uid)
-        {
-            // We need to EnsureComp here to make sure that we aren't iterating over a component that:
-            // A: Isn't fully initialized
-            // B: Is in the process of being shutdown/deleted
-            // Imagine my surprise when I found out Resolve doesn't check for that.
-            // TODO: This EnsureComp will be 1984'd in a separate PR, when I rework how you get psionics in the first place.
-            EnsureComp<PsionicComponent>(uid, out var psionic);
+        AddRandomPsionicPower(uid);
+    }
 
-            if (!_prototypeManager.TryIndex<WeightedRandomPrototype>(_pool.Id, out var pool))
-                return;
+    /// <summary>
+    ///     Pretty straightforward, adds a random psionic power to a given Entity. If that Entity is not already Psychic, it will be made one.
+    ///     If an entity already has all possible powers, this will not add any new ones.
+    /// </summary>
+    public void AddRandomPsionicPower(EntityUid uid)
+    {
+        // We need to EnsureComp here to make sure that we aren't iterating over a component that:
+        // A: Isn't fully initialized
+        // B: Is in the process of being shutdown/deleted
+        // Imagine my surprise when I found out Resolve doesn't check for that.
+        // TODO: This EnsureComp will be 1984'd in a separate PR, when I rework how you get psionics in the first place.
+        EnsureComp<PsionicComponent>(uid, out var psionic);
 
-            var newPool = pool.Weights.Keys.ToList();
-            newPool.RemoveAll(s =>
-                _prototypeManager.TryIndex<PsionicPowerPrototype>(s, out var p) &&
-                psionic.ActivePowers.Contains(p));
+        if (!_prototypeManager.TryIndex<WeightedRandomPrototype>(_pool.Id, out var pool))
+            return;
 
-            if (newPool.Count == 0)
-                return;
+        var newPool = pool.Weights.Keys.ToList();
+        newPool.RemoveAll(s =>
+            _prototypeManager.TryIndex<PsionicPowerPrototype>(s, out var p) &&
+            psionic.ActivePowers.Contains(p));
 
-            var newProto = _random.Pick(newPool);
-            if (!_prototypeManager.TryIndex<PsionicPowerPrototype>(newProto, out var newPower))
-                return;
+        if (newPool.Count == 0)
+            return;
 
-            InitializePsionicPower(uid, newPower);
+        var newProto = _random.Pick(newPool);
+        if (!_prototypeManager.TryIndex<PsionicPowerPrototype>(newProto, out var newPower))
+            return;
 
-            _glimmerSystem.Glimmer += _random.Next(1, (int) Math.Round(1 + psionic.CurrentAmplification + psionic.CurrentDampening));
-        }
+        InitializePsionicPower(uid, newPower);
 
-        /// <summary>
-        ///     Initializes a new Psionic Power on a given entity, assuming the entity does not already have said power initialized.
-        /// </summary>
-        public void InitializePsionicPower(EntityUid uid, PsionicPowerPrototype proto, PsionicComponent psionic, bool playFeedback = true)
-        {
-            if (!_prototypeManager.HasIndex<PsionicPowerPrototype>(proto.ID)
-                || psionic.ActivePowers.Contains(proto))
-                return;
-
-            psionic.ActivePowers.Add(proto);
-
-            AddPsionicActions(uid, proto, psionic);
-            AddPsionicPowerComponents(uid, proto);
-            AddPsionicStatSources(proto, psionic);
-            RefreshPsionicModifiers(uid, psionic);
-            SendFeedbackMessage(uid, proto, playFeedback);
-            UpdatePowerSlots(psionic);
-            //UpdatePsionicDanger(uid, psionic); // TODO: After Glimmer Refactor
-            //SendFeedbackAudio(uid, proto, playPopup); // TODO: This one is coming next!
-        }
+        _glimmerSystem.Glimmer += _random.Next(1, (int) Math.Round(1 + psionic.CurrentAmplification + psionic.CurrentDampening));
+    }
 
-        /// <summary>
-        ///     Initializes a new Psionic Power on a given entity, assuming the entity does not already have said power initialized.
-        /// </summary>
-        public void InitializePsionicPower(EntityUid uid, PsionicPowerPrototype proto, bool playFeedback = true)
-        {
-            EnsureComp<PsionicComponent>(uid, out var psionic);
+    /// <summary>
+    ///     Initializes a new Psionic Power on a given entity, assuming the entity does not already have said power initialized.
+    /// </summary>
+    public void InitializePsionicPower(EntityUid uid, PsionicPowerPrototype proto, PsionicComponent psionic, bool playFeedback = true)
+    {
+        if (!_prototypeManager.HasIndex<PsionicPowerPrototype>(proto.ID)
+            || psionic.ActivePowers.Contains(proto))
+            return;
+
+        psionic.ActivePowers.Add(proto);
+
+        AddPsionicActions(uid, proto, psionic);
+        AddPsionicPowerComponents(uid, proto);
+        AddPsionicStatSources(proto, psionic);
+        RefreshPsionicModifiers(uid, psionic);
+        SendFeedbackMessage(uid, proto, playFeedback);
+        UpdatePowerSlots(psionic);
+        //UpdatePsionicDanger(uid, psionic); // TODO: After Glimmer Refactor
+        //SendFeedbackAudio(uid, proto, playPopup); // TODO: This one is coming next!
+    }
 
-            InitializePsionicPower(uid, proto, psionic, playFeedback);
-        }
+    /// <summary>
+    ///     Initializes a new Psionic Power on a given entity, assuming the entity does not already have said power initialized.
+    /// </summary>
+    public void InitializePsionicPower(EntityUid uid, PsionicPowerPrototype proto, bool playFeedback = true)
+    {
+        EnsureComp<PsionicComponent>(uid, out var psionic);
 
-        /// <summary>
-        ///     Updates a Psion's casting stats, call this anytime a system adds a new source of Amp or Damp.
-        /// </summary>
-        public void RefreshPsionicModifiers(EntityUid uid, PsionicComponent comp)
-        {
-            var ampModifier = 0f;
-            var dampModifier = 0f;
-            foreach (var (_, source) in comp.AmplificationSources)
-                ampModifier += source;
-            foreach (var (_, source) in comp.DampeningSources)
-                dampModifier += source;
-
-            var ev = new OnSetPsionicStatsEvent(ampModifier, dampModifier);
-            RaiseLocalEvent(uid, ref ev);
-            ampModifier = ev.AmplificationChangedAmount;
-            dampModifier = ev.DampeningChangedAmount;
+        InitializePsionicPower(uid, proto, psionic, playFeedback);
+    }
 
-            comp.CurrentAmplification = ampModifier;
-            comp.CurrentDampening = dampModifier;
-        }
+    /// <summary>
+    ///     Updates a Psion's casting stats, call this anytime a system adds a new source of Amp or Damp.
+    /// </summary>
+    public void RefreshPsionicModifiers(EntityUid uid, PsionicComponent comp)
+    {
+        var ampModifier = 0f;
+        var dampModifier = 0f;
+        foreach (var (_, source) in comp.AmplificationSources)
+            ampModifier += source;
+        foreach (var (_, source) in comp.DampeningSources)
+            dampModifier += source;
+
+        var ev = new OnSetPsionicStatsEvent(ampModifier, dampModifier);
+        RaiseLocalEvent(uid, ref ev);
+        ampModifier = ev.AmplificationChangedAmount;
+        dampModifier = ev.DampeningChangedAmount;
+
+        comp.CurrentAmplification = ampModifier;
+        comp.CurrentDampening = dampModifier;
+    }
 
-        /// <summary>
-        ///     Updates a Psion's casting stats, call this anytime a system adds a new source of Amp or Damp.
-        ///     Variant function for systems that didn't already have the PsionicComponent.
-        /// </summary>
-        public void RefreshPsionicModifiers(EntityUid uid)
-        {
-            if (!TryComp<PsionicComponent>(uid, out var comp))
-                return;
+    /// <summary>
+    ///     Updates a Psion's casting stats, call this anytime a system adds a new source of Amp or Damp.
+    ///     Variant function for systems that didn't already have the PsionicComponent.
+    /// </summary>
+    public void RefreshPsionicModifiers(EntityUid uid)
+    {
+        if (!TryComp<PsionicComponent>(uid, out var comp))
+            return;
 
-            RefreshPsionicModifiers(uid, comp);
-        }
+        RefreshPsionicModifiers(uid, comp);
+    }
 
-        /// <summary>
-        ///     A more advanced form of removing powers. Mindbreaking not only removes all psionic powers,
-        ///     it also disables the possibility of obtaining new ones.
-        /// </summary>
-        public void MindBreak(EntityUid uid)
-        {
-            if (!HasComp<PsionicComponent>(uid))
-                return;
+    /// <summary>
+    ///     A more advanced form of removing powers. Mindbreaking not only removes all psionic powers,
+    ///     it also disables the possibility of obtaining new ones.
+    /// </summary>
+    public void MindBreak(EntityUid uid)
+    {
+        if (!HasComp<PsionicComponent>(uid))
+            return;
 
-            RemoveAllPsionicPowers(uid, true);
-            if (_config.GetCVar(CCVars.ScarierMindbreaking))
-                ScarierMindbreak(uid);
-        }
+        RemoveAllPsionicPowers(uid, true);
+        if (_config.GetCVar(CCVars.ScarierMindbreaking))
+            ScarierMindbreak(uid);
+    }
 
-        /// <summary>
-        ///     An even more advanced form of Mindbreaking. Turn the victim into an NPC.
-        ///     For the people who somehow didn't intuit from the absolutely horrifying text that mindbreaking people is very fucking bad.
-        /// </summary>
-        public void ScarierMindbreak(EntityUid uid)
-        {
-            if (!_playerManager.TryGetSessionByEntity(uid, out var session) || session is null)
-                return;
-
-            var feedbackMessage = $"[font size=24][color=#ff0000]{"Your characters personhood has been obliterated. If you wish to continue playing, consider respawning as a new character."}[/color][/font]";
-            _chatManager.ChatMessageToOne(
-                ChatChannel.Emotes,
-                feedbackMessage,
-                feedbackMessage,
-                EntityUid.Invalid,
-                false,
-                session.Channel);
+    /// <summary>
+    ///     An even more advanced form of Mindbreaking. Turn the victim into an NPC.
+    ///     For the people who somehow didn't intuit from the absolutely horrifying text that mindbreaking people is very fucking bad.
+    /// </summary>
+    public void ScarierMindbreak(EntityUid uid)
+    {
+        if (!_playerManager.TryGetSessionByEntity(uid, out var session) || session is null)
+            return;
+
+        var feedbackMessage = $"[font size=24][color=#ff0000]{"Your characters personhood has been obliterated. If you wish to continue playing, consider respawning as a new character."}[/color][/font]";
+        _chatManager.ChatMessageToOne(
+            ChatChannel.Emotes,
+            feedbackMessage,
+            feedbackMessage,
+            EntityUid.Invalid,
+            false,
+            session.Channel);
+
+        if (!_mind.TryGetMind(session, out var mindId, out var mind))
+            return;
+
+        _ghost.SpawnGhost((mindId, mind), Transform(uid).Coordinates, false);
+        _npcFaction.AddFaction(uid, "SimpleNeutral");
+        var htn = EnsureComp<HTNComponent>(uid);
+        htn.RootTask = new HTNCompoundTask() { Task = "IdleCompound" };
+    }
 
-            if (!_mind.TryGetMind(session, out var mindId, out var mind))
-                return;
+    /// <summary>
+    ///     Remove all Psionic powers, with accompanying actions, components, and casting stat sources, from a given Psion.
+    ///     Optionally, the Psion can also be rendered permanently non-Psionic.
+    /// </summary>
+    public void RemoveAllPsionicPowers(EntityUid uid, bool mindbreak = false)
+    {
+        if (!TryComp<PsionicComponent>(uid, out var psionic)
+            || !psionic.Removable)
+            return;
 
-            _ghost.SpawnGhost((mindId, mind), Transform(uid).Coordinates, false);
-            _npcFaction.AddFaction(uid, "SimpleNeutral");
-            var htn = EnsureComp<HTNComponent>(uid);
-            htn.RootTask = new HTNCompoundTask() { Task = "IdleCompound" };
-        }
+        RemovePsionicActions(uid, psionic);
 
-        /// <summary>
-        ///     Remove all Psionic powers, with accompanying actions, components, and casting stat sources, from a given Psion.
-        ///     Optionally, the Psion can also be rendered permanently non-Psionic.
-        /// </summary>
-        public void RemoveAllPsionicPowers(EntityUid uid, bool mindbreak = false)
+        var newPsionic = psionic.ActivePowers.ToList();
+        foreach (var proto in newPsionic)
         {
-            if (!TryComp<PsionicComponent>(uid, out var psionic)
-                || !psionic.Removable)
-                return;
+            if (!_prototypeManager.TryIndex<PsionicPowerPrototype>(proto.ID, out var power))
+                continue;
 
-            RemovePsionicActions(uid, psionic);
+            RemovePsionicPowerComponents(uid, proto);
 
-            var newPsionic = psionic.ActivePowers.ToList();
-            foreach (var proto in newPsionic)
-            {
-                if (!_prototypeManager.TryIndex<PsionicPowerPrototype>(proto.ID, out var power))
-                    continue;
-
-                RemovePsionicPowerComponents(uid, proto);
-
-                // If we're mindbreaking, we can skip the casting stats since the PsionicComponent is getting 1984'd.
-                if (!mindbreak)
-                    RemovePsionicStatSources(uid, power, psionic);
-            }
+            // If we're mindbreaking, we can skip the casting stats since the PsionicComponent is getting 1984'd.
+            if (!mindbreak)
+                RemovePsionicStatSources(uid, power, psionic);
+        }
 
-            if (mindbreak)
-            {
-                EnsureComp<MindbrokenComponent>(uid);
-                _statusEffectsSystem.TryAddStatusEffect(uid, psionic.MindbreakingStutterCondition,
-                    TimeSpan.FromMinutes(psionic.MindbreakingStutterTime * psionic.CurrentAmplification * psionic.CurrentDampening),
-                    false,
-                    psionic.MindbreakingStutterAccent);
+        if (mindbreak)
+        {
+            EnsureComp<MindbrokenComponent>(uid);
+            _statusEffectsSystem.TryAddStatusEffect(uid, psionic.MindbreakingStutterCondition,
+                TimeSpan.FromMinutes(psionic.MindbreakingStutterTime * psionic.CurrentAmplification * psionic.CurrentDampening),
+                false,
+                psionic.MindbreakingStutterAccent);
 
-                _popups.PopupEntity(Loc.GetString(psionic.MindbreakingFeedback, ("entity", MetaData(uid).EntityName)), uid, uid, PopupType.MediumCaution);
+            _popups.PopupEntity(Loc.GetString(psionic.MindbreakingFeedback, ("entity", MetaData(uid).EntityName)), uid, uid, PopupType.MediumCaution);
 
-                KillFamiliars(psionic);
-                RemComp<PsionicComponent>(uid);
-                RemComp<InnatePsionicPowersComponent>(uid);
+            KillFamiliars(psionic);
+            RemComp<PsionicComponent>(uid);
+            RemComp<InnatePsionicPowersComponent>(uid);
 
-                var ev = new OnMindbreakEvent();
-                RaiseLocalEvent(uid, ref ev);
+            var ev = new OnMindbreakEvent();
+            RaiseLocalEvent(uid, ref ev);
 
-                return;
-            }
-            RefreshPsionicModifiers(uid, psionic);
+            return;
         }
+        RefreshPsionicModifiers(uid, psionic);
+    }
 
-        /// <summary>
-        ///     Add all actions associated with a specific Psionic Power
-        /// </summary>
-        private void AddPsionicActions(EntityUid uid, PsionicPowerPrototype proto, PsionicComponent psionic)
+    /// <summary>
+    ///     Add all actions associated with a specific Psionic Power
+    /// </summary>
+    private void AddPsionicActions(EntityUid uid, PsionicPowerPrototype proto, PsionicComponent psionic)
+    {
+        foreach (var id in proto.Actions)
         {
-            foreach (var id in proto.Actions)
+            EntityUid? actionId = null;
+            if (_actions.AddAction(uid, ref actionId, id))
             {
-                EntityUid? actionId = null;
-                if (_actions.AddAction(uid, ref actionId, id))
-                {
-                    _actions.StartUseDelay(actionId);
-                    psionic.Actions.Add(id, actionId);
-                }
+                _actions.StartUseDelay(actionId);
+                psionic.Actions.Add(id, actionId);
             }
         }
+    }
 
-        /// <summary>
-        ///     Add all components associated with a specific Psionic power.
-        /// </summary>
-        private void AddPsionicPowerComponents(EntityUid uid, PsionicPowerPrototype proto)
-        {
-            if (proto.Components is null)
-                return;
+    /// <summary>
+    ///     Add all components associated with a specific Psionic power.
+    /// </summary>
+    private void AddPsionicPowerComponents(EntityUid uid, PsionicPowerPrototype proto)
+    {
+        if (proto.Components is null)
+            return;
 
-            foreach (var entry in proto.Components.Values)
-            {
-                if (HasComp(uid, entry.Component.GetType()))
-                    continue;
+        foreach (var entry in proto.Components.Values)
+        {
+            if (HasComp(uid, entry.Component.GetType()))
+                continue;
 
-                var comp = (Component) _serialization.CreateCopy(entry.Component, notNullableOverride: true);
-                comp.Owner = uid;
-                EntityManager.AddComponent(uid, comp);
-            }
+            var comp = (Component) _serialization.CreateCopy(entry.Component, notNullableOverride: true);
+            comp.Owner = uid;
+            EntityManager.AddComponent(uid, comp);
         }
+    }
 
-        /// <summary>
-        ///     Update the Amplification and Dampening sources of a Psion to include a new Power.
-        /// </summary>
-        private void AddPsionicStatSources(PsionicPowerPrototype proto, PsionicComponent psionic)
-        {
-            if (proto.AmplificationModifier != 0)
-                psionic.AmplificationSources.Add(proto.Name, proto.AmplificationModifier);
+    /// <summary>
+    ///     Update the Amplification and Dampening sources of a Psion to include a new Power.
+    /// </summary>
+    private void AddPsionicStatSources(PsionicPowerPrototype proto, PsionicComponent psionic)
+    {
+        if (proto.AmplificationModifier != 0)
+            psionic.AmplificationSources.Add(proto.Name, proto.AmplificationModifier);
 
-            if (proto.DampeningModifier != 0)
-                psionic.DampeningSources.Add(proto.Name, proto.DampeningModifier);
-        }
+        if (proto.DampeningModifier != 0)
+            psionic.DampeningSources.Add(proto.Name, proto.DampeningModifier);
+    }
 
-        /// <summary>
-        ///     Displays a message to alert the player when they have obtained a new psionic power. These generally will not play for Innate powers.
-        ///     Chat messages of this nature should be written in the first-person.
-        ///     Popup feedback should be no more than a sentence, while the full Initialization Feedback can be as much as a paragraph of text.
-        /// </summary>
-        private void SendFeedbackMessage(EntityUid uid, PsionicPowerPrototype proto, bool playFeedback = true)
-        {
-            if (!playFeedback
-                || !_playerManager.TryGetSessionByEntity(uid, out var session)
-                || session is null)
-                return;
-
-            if (proto.InitializationPopup is null)
-                _popups.PopupEntity(Loc.GetString(GenericInitializationMessage), uid, uid, PopupType.MediumCaution);
-            else _popups.PopupEntity(Loc.GetString(proto.InitializationPopup), uid, uid, PopupType.MediumCaution);
-
-            if (proto.InitializationFeedback is null)
-                return;
-
-            if (!Loc.TryGetString(proto.InitializationFeedback, out var feedback))
-                return;
-            var feedbackMessage = $"[font size={proto.InitializationFeedbackFontSize}][color={proto.InitializationFeedbackColor}]{feedback}[/color][/font]";
-            _chatManager.ChatMessageToOne(
-                proto.InitializationFeedbackChannel,
-                feedbackMessage,
-                feedbackMessage,
-                EntityUid.Invalid,
-                false,
-                session.Channel);
-        }
+    /// <summary>
+    ///     Displays a message to alert the player when they have obtained a new psionic power. These generally will not play for Innate powers.
+    ///     Chat messages of this nature should be written in the first-person.
+    ///     Popup feedback should be no more than a sentence, while the full Initialization Feedback can be as much as a paragraph of text.
+    /// </summary>
+    private void SendFeedbackMessage(EntityUid uid, PsionicPowerPrototype proto, bool playFeedback = true)
+    {
+        if (!playFeedback
+            || !_playerManager.TryGetSessionByEntity(uid, out var session)
+            || session is null)
+            return;
+
+        if (proto.InitializationPopup is null)
+            _popups.PopupEntity(Loc.GetString(GenericInitializationMessage), uid, uid, PopupType.MediumCaution);
+        else _popups.PopupEntity(Loc.GetString(proto.InitializationPopup), uid, uid, PopupType.MediumCaution);
+
+        if (proto.InitializationFeedback is null)
+            return;
+
+        if (!Loc.TryGetString(proto.InitializationFeedback, out var feedback))
+            return;
+        var feedbackMessage = $"[font size={proto.InitializationFeedbackFontSize}][color={proto.InitializationFeedbackColor}]{feedback}[/color][/font]";
+        _chatManager.ChatMessageToOne(
+            proto.InitializationFeedbackChannel,
+            feedbackMessage,
+            feedbackMessage,
+            EntityUid.Invalid,
+            false,
+            session.Channel);
+    }
 
-        private void UpdatePowerSlots(PsionicComponent psionic)
-        {
-            var slotsUsed = 0;
-            foreach (var power in psionic.ActivePowers)
-                slotsUsed += power.PowerSlotCost;
+    private void UpdatePowerSlots(PsionicComponent psionic)
+    {
+        var slotsUsed = 0;
+        foreach (var power in psionic.ActivePowers)
+            slotsUsed += power.PowerSlotCost;
 
-            psionic.PowerSlotsTaken = slotsUsed;
-        }
+        psionic.PowerSlotsTaken = slotsUsed;
+    }
 
-        /// <summary>
-        ///     Psions over a certain power threshold become a glimmer source. This cannot be fully implemented until after I rework Glimmer
-        /// </summary>
-        //private void UpdatePsionicDanger(EntityUid uid, PsionicComponent psionic)
-        //{
-        //   if (psionic.PowerSlotsTaken <= psionic.PowerSlots)
-        //        return;
-        //
-        //    EnsureComp<GlimmerSourceComponent>(uid, out var glimmerSource);
-        //    glimmerSource.SecondsPerGlimmer = 10 / (psionic.PowerSlotsTaken - psionic.PowerSlots);
-        //}
-
-        /// <summary>
-        ///     Remove all Psychic Actions listed in an entity's Psionic Component. Unfortunately, removing actions associated with a specific Power Prototype is not supported.
-        /// </summary>
-        private void RemovePsionicActions(EntityUid uid, PsionicComponent psionic)
-        {
-            if (psionic.Actions is null)
-                return;
+    /// <summary>
+    ///     Psions over a certain power threshold become a glimmer source. This cannot be fully implemented until after I rework Glimmer
+    /// </summary>
+    //private void UpdatePsionicDanger(EntityUid uid, PsionicComponent psionic)
+    //{
+    //   if (psionic.PowerSlotsTaken <= psionic.PowerSlots)
+    //        return;
+    //
+    //    EnsureComp<GlimmerSourceComponent>(uid, out var glimmerSource);
+    //    glimmerSource.SecondsPerGlimmer = 10 / (psionic.PowerSlotsTaken - psionic.PowerSlots);
+    //}
+
+    /// <summary>
+    ///     Remove all Psychic Actions listed in an entity's Psionic Component. Unfortunately, removing actions associated with a specific Power Prototype is not supported.
+    /// </summary>
+    private void RemovePsionicActions(EntityUid uid, PsionicComponent psionic)
+    {
+        if (psionic.Actions is null)
+            return;
 
-            foreach (var action in psionic.Actions)
-                _actionsSystem.RemoveAction(uid, action.Value);
-        }
+        foreach (var action in psionic.Actions)
+            _actionsSystem.RemoveAction(uid, action.Value);
+    }
 
-        /// <summary>
-        ///     Remove all Components associated with a specific Psionic Power.
-        /// </summary>
-        private void RemovePsionicPowerComponents(EntityUid uid, PsionicPowerPrototype proto)
-        {
-            if (proto.Components is null)
-                return;
+    /// <summary>
+    ///     Remove all Components associated with a specific Psionic Power.
+    /// </summary>
+    private void RemovePsionicPowerComponents(EntityUid uid, PsionicPowerPrototype proto)
+    {
+        if (proto.Components is null)
+            return;
 
-            foreach (var comp in proto.Components)
-            {
-                var powerComp = (Component) _componentFactory.GetComponent(comp.Key);
-                if (!EntityManager.HasComponent(uid, powerComp.GetType()))
-                    continue;
+        foreach (var comp in proto.Components)
+        {
+            var powerComp = (Component) _componentFactory.GetComponent(comp.Key);
+            if (!EntityManager.HasComponent(uid, powerComp.GetType()))
+                continue;
 
-                EntityManager.RemoveComponent(uid, powerComp.GetType());
-            }
+            EntityManager.RemoveComponent(uid, powerComp.GetType());
         }
+    }
 
-        /// <summary>
-        ///     Remove all stat sources associated with a specific Psionic Power.
-        /// </summary>
-        private void RemovePsionicStatSources(EntityUid uid, PsionicPowerPrototype proto, PsionicComponent psionic)
-        {
-            if (proto.AmplificationModifier != 0)
-                psionic.AmplificationSources.Remove(proto.Name);
+    /// <summary>
+    ///     Remove all stat sources associated with a specific Psionic Power.
+    /// </summary>
+    private void RemovePsionicStatSources(EntityUid uid, PsionicPowerPrototype proto, PsionicComponent psionic)
+    {
+        if (proto.AmplificationModifier != 0)
+            psionic.AmplificationSources.Remove(proto.Name);
 
-            if (proto.DampeningModifier != 0)
-                psionic.DampeningSources.Remove(proto.Name);
+        if (proto.DampeningModifier != 0)
+            psionic.DampeningSources.Remove(proto.Name);
 
-            RefreshPsionicModifiers(uid, psionic);
-        }
+        RefreshPsionicModifiers(uid, psionic);
+    }
 
-        private void KillFamiliars(PsionicComponent component)
-        {
-            if (component.Familiars.Count <= 0)
-                return;
+    private void KillFamiliars(PsionicComponent component)
+    {
+        if (component.Familiars.Count <= 0)
+            return;
 
-            foreach (var familiar in component.Familiars)
-            {
-                if (!TryComp<PsionicFamiliarComponent>(familiar, out var familiarComponent)
-                    || !familiarComponent.DespawnOnMasterDeath)
-                    continue;
+        foreach (var familiar in component.Familiars)
+        {
+            if (!TryComp<PsionicFamiliarComponent>(familiar, out var familiarComponent)
+                || !familiarComponent.DespawnOnMasterDeath)
+                continue;
 
-                _psionicFamiliar.DespawnFamiliar(familiar, familiarComponent);
-            }
+            _psionicFamiliar.DespawnFamiliar(familiar, familiarComponent);
         }
     }
 }
+
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml
index 2784bd213e1..b9e4fedd5b2 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml
@@ -159,7 +159,7 @@
     - Syndicate
   # make the player a traitor once its taken
   - type: AutoTraitor
-    preset: TraitorReinforcement
+    profile: TraitorReinforcement
   - type: InteractionPopup
     successChance: 0.6
     interactSuccessString: petting-success-nukie-mouse
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
index 9d9cdfce38f..3a5056340cc 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
@@ -209,7 +209,7 @@
 - type: entity
   parent: ClothingHeadHatHoodCarp
   id: ClothingHeadHelmetHardsuitCarp
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: PressureProtection
     highPressureMultiplier: 0.6
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml
index 97240dd1eec..290d832f261 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml
@@ -177,7 +177,7 @@
     factions:
     - PetsNT
   - type: Tool
-    speed: 3
+    speedModifier: 3
     qualities:
       - Prying
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 453259e4381..ba76cd32991 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -1232,6 +1232,20 @@
       tags:
       - MicrowaveMachineBoard
 
+- type: entity
+  id: SyndicateMicrowaveMachineCircuitboard
+  parent: BaseMachineCircuitboard
+  name: donk co. microwave machine board
+  components:
+    - type: Sprite
+      state: service
+    - type: MachineBoard
+      prototype: SyndicateMicrowave
+      stackRequirements:
+        Capacitor: 1
+        Glass: 2
+        Cable: 2
+
 - type: entity
   id: FatExtractorMachineCircuitboard
   parent: BaseMachineCircuitboard
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index 621fb4557d0..b6ddf00d215 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -834,63 +834,6 @@
       color: "#878787"
     - state: passenger
   - type: AgentIDCard
-    icons:
-    # TODO figure out a better way of doing this.
-    # Probably by adding a bool or icon-category data-field to the icon prototype?
-    - JobIconDetective
-    - JobIconQuarterMaster
-    - JobIconBotanist
-    - JobIconBoxer
-    - JobIconAtmosphericTechnician
-    - JobIconNanotrasen
-    - JobIconPrisoner
-    - JobIconJanitor
-    - JobIconChemist
-    - JobIconStationEngineer
-    - JobIconSecurityOfficer
-    - JobIconChiefMedicalOfficer
-    - JobIconRoboticist
-    - JobIconChaplain
-    - JobIconLawyer
-    - JobIconUnknown
-    - JobIconLibrarian
-    - JobIconCargoTechnician
-    - JobIconScientist
-    - JobIconResearchAssistant
-    - JobIconGeneticist
-    - JobIconClown
-    - JobIconCaptain
-    - JobIconHeadOfPersonnel
-    - JobIconVirologist
-    - JobIconShaftMiner
-    - JobIconPassenger
-    - JobIconChiefEngineer
-    - JobIconBartender
-    - JobIconHeadOfSecurity
-    - JobIconBrigmedic
-    - JobIconMedicalDoctor
-    - JobIconParamedic
-    - JobIconChef
-    - JobIconWarden
-    - JobIconResearchDirector
-    - JobIconMime
-    - JobIconMusician
-    - JobIconReporter
-    - JobIconPsychologist
-    - JobIconMedicalIntern
-    - JobIconTechnicalAssistant
-    - JobIconServiceWorker
-    - JobIconSecurityCadet
-    - JobIconZookeeper
-    - JobIconPrisonGuard # Nyanotrasen - PrisonGuard, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml
-    - JobIconMailCarrier # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml
-    - JobIconMartialArtist # Nyanotrasen - MartialArtist, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml
-    - JobIconGladiator # Nyanotrasen - Gladiator, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml
-    - JobIconForensicMantis  # Nyanotrasen - ForensicMantis, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
-    - JobIconClerk # Delta V - Added justice dept
-    - JobIconChiefJustice # Delta V - Added justice dept
-    - JobIconProsecutor # Delta V - Added justice dept
-    - JobIconVisitor
   - type: ActivatableUI
     key: enum.AgentIDCardUiKey.Key
     inHandsOnly: true
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
index baf26c65b2f..0ddc38fcbe6 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
@@ -475,7 +475,7 @@
   - type: Tool
     qualities:
       - Sawing
-    speed: 0.5
+    speedModifier: 0.5
   - type: BoneSaw
     speed: 0.5
 
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/home_run_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/home_run_bat.yml
index 75e0e0764c0..aad5a410fdd 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/home_run_bat.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/home_run_bat.yml
@@ -28,7 +28,7 @@
   - type: Item
     size: Large
   - type: Tool
-    speed: 0.5 # it's very heavy, it rolls slower than a wooden bat
+    speedModifier: 0.5 # it's very heavy, it rolls slower than a wooden bat
   - type: UseDelay
     delay: 2
   - type: PhysicalComposition
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
new file mode 100644
index 00000000000..ff01e5692eb
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
@@ -0,0 +1,85 @@
+- type: entity
+  name: pickaxe
+  parent: BaseItem
+  id: Pickaxe
+  description: Notched to perfection, for jamming it into rocks
+  components:
+  - type: Tag
+    tags:
+    - Pickaxe
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/pickaxe.rsi
+    state: pickaxe
+  - type: MeleeWeapon
+    attackRate: 1.17
+    range: 1.5
+    wideAnimationRotation: -135
+    soundHit:
+      path: "/Audio/Weapons/smash.ogg"
+      params:
+        volume: -3
+    damage:
+      types:
+        Blunt: 6
+        Piercing: 3
+    bluntStaminaDamageFactor: 2.0
+    heavyDamageBaseModifier: 1.75
+    maxTargets: 5
+    angle: 80
+  - type: DamageOtherOnHit
+    staminaCost: 5
+  - type: Wieldable
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 5
+        Structural: 30
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,2,0
+    - 1,1,1,2
+    sprite: Objects/Weapons/Melee/pickaxe.rsi
+    storedRotation: -45
+  - type: UseDelay
+
+- type: entity
+  name: mining drill
+  parent: BaseItem
+  id: MiningDrill
+  description: Powerful tool used to quickly drill through rocks
+  components:
+  - type: Item
+    storedRotation: -90
+  - type: Tag
+    tags:
+    - Pickaxe
+  - type: Sprite
+    sprite: Objects/Tools/handdrill.rsi
+    state: handdrill
+  - type: MeleeWeapon
+    autoAttack: true
+    wideAnimationRotation: -90
+    soundHit:
+      path: "/Audio/Items/drill_hit.ogg"
+    attackRate: .83
+    range: 1.5
+    damage:
+      types:
+        Blunt: 6
+        Slash: 3
+        Structural: 12
+    bluntStaminaDamageFactor: 4.0
+    heavyRateModifier: 1
+    heavyRangeModifier: 2
+    heavyDamageBaseModifier: 1
+    angle: 20
+  - type: DamageOtherOnHit
+    staminaCost: 8
+  - type: ThrowingAngle
+    angle: 270
+
+  - type: ReverseEngineering # Nyano
+    difficulty: 2
+    recipes:
+      - MiningDrill
diff --git a/Resources/Prototypes/Entities/Surgery/surgeries.yml b/Resources/Prototypes/Entities/Surgery/surgeries.yml
index 3e967c70302..e7d5dda57b4 100644
--- a/Resources/Prototypes/Entities/Surgery/surgeries.yml
+++ b/Resources/Prototypes/Entities/Surgery/surgeries.yml
@@ -93,11 +93,11 @@
         - type: RatvarianLanguage
         - type: Clumsy
           gunShootFailDamage:
-          types:
-            Blunt: 5
-            Piercing: 4
-          groups:
-            Burn: 3
+            types:
+              Blunt: 5
+              Piercing: 4
+            groups:
+              Burn: 3
 
 - type: entity
   parent: SurgeryBase
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/breaching_hammer.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/breaching_hammer.yml
index 2c6bba1cbef..5d4b98b5fab 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/breaching_hammer.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/breaching_hammer.yml
@@ -35,7 +35,7 @@
   - type: Tool
     qualities:
       - Prying
-    speed: 0.8
+    speedModifier: 0.8
   - type: Prying
     pryPowered: !type:Bool
       true
diff --git a/Resources/Prototypes/Store/presets.yml b/Resources/Prototypes/Store/presets.yml
index 356cf5a4ecf..1e9f495530b 100644
--- a/Resources/Prototypes/Store/presets.yml
+++ b/Resources/Prototypes/Store/presets.yml
@@ -21,13 +21,6 @@
     - Telecrystal
     balance:
       Telecrystal: 0
-    sales:
-      enabled: true
-      minMultiplier: 0.2
-      maxMultiplier: 0.8
-      minItems: 3
-      maxItems: 8
-      salesCategory: UplinkSales
 
 - type: entity
   id: StorePresetSpellbook

From 34d463b0eddff07b4b0248dc0837198d64e15f4f Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 15:38:28 -0400
Subject: [PATCH 148/366] hm!

---
 .../Objects/Consumable/Food/produce.yml       | 144 ++++++++++++++++++
 .../Structures/Machines/microwave.yml         |   1 -
 2 files changed, 144 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index d9978289fff..91dd73a8170 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -681,6 +681,47 @@
       Burger: Orange
       Taco: Orange
 
+- type: entity
+  name: extradimensional orange
+  parent: FoodProduceBase
+  id: FoodExtradimensionalOrange
+  description: You can hardly wrap your head around this thing.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - truenature
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 14
+        reagents:
+        - ReagentId: Haloperidol
+          Quantity: 5
+        - ReagentId: Nutriment
+          Quantity: 5
+        - ReagentId: Vitamin
+          Quantity: 4
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/extradimensional_orange.rsi
+    scale: 0.5,0.5
+  - type: Produce
+    seedId: extradimensionalOrange
+  - type: PotencyVisuals
+    minimumScale: 0.5 # reduce this in size because the sprite is way too big
+    maximumScale: 1
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: JuiceOrange
+        Quantity: 10
+  - type: Tag
+    tags:
+    - Fruit
+  - type: FoodSequenceElement
+    entries:
+      Burger: ExtradimensionalOrangeBurger
+      Taco: ExtradimensionalOrange
+
 - type: entity
   name: pineapple
   parent: FoodProduceBase
@@ -1999,6 +2040,109 @@
       Taco: WatermelonSlice
       Skewer: WatermelonSliceSkewer
 
+- type: entity
+  name: holymelon
+  parent: [FoodProduceBase, ItemHeftyBase]
+  id: FoodHolymelon
+  description: The water within this melon has been blessed by some deity that's particularly fond of watermelon.
+  components:
+  - type: Item
+    size: Small
+  - type: FlavorProfile
+    flavors:
+      - holy
+      - watermelon
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 25
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+        - ReagentId: Vitamin
+          Quantity: 5
+        - ReagentId: Holywater
+          Quantity: 10
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/holymelon.rsi
+  - type: Produce
+    seedId: watermelon
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Wine
+        Quantity: 20
+  - type: Damageable
+    damageContainer: Biological
+  - type: DamageOnHighSpeedImpact
+    minimumSpeed: 0.1
+    damage:
+      types:
+        Blunt: 1
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: desecration
+      - !type:SpillBehavior
+        solution: food
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: SliceableFood
+    count: 5
+    slice: FoodHolymelonSlice
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: ClothingHeadHatHolyWatermelon
+  - type: Tag
+    tags:
+    - Fruit
+
+- type: entity
+  name: holymelon slice
+  parent: ProduceSliceBase
+  id: FoodHolymelonSlice
+  description: Juicy golden and red slice.
+  components:
+  - type: Item
+    size: Tiny
+  - type: FlavorProfile
+    flavors:
+      - holy
+      - watermelon
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/holymelon.rsi
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 2
+        - ReagentId: Vitamin
+          Quantity: 1
+        - ReagentId: Holywater
+          Quantity: 2
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Wine
+        Quantity: 4
+  - type: Tag
+    tags:
+    - Fruit
+    - Slice
+  - type: FoodSequenceElement
+    entries:
+      Burger: HolymelonSliceBurger
+      Taco: HolymelonSlice
+      Skewer: HolymelonSliceSkewer
+
 - type: entity
   name: grapes
   parent: FoodProduceBase
diff --git a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
index b415551ad2b..b43ae829064 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
@@ -105,7 +105,6 @@
   - type: GuideHelp
     guides:
     - Chef
-    - FoodRecipes
 
 - type: entity
   id: SyndicateMicrowave

From e1de660adcf633354ad26636e0fc6b89996264c2 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 15:42:57 -0400
Subject: [PATCH 149/366] bwah

---
 .../Entities/Objects/Weapons/Melee/mining.yml |  1 -
 .../Objects/Weapons/Melee/pickaxe.yml         | 85 -------------------
 2 files changed, 86 deletions(-)
 delete mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
index 31c93d81e33..b2506325862 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -85,7 +85,6 @@
       types:
         Structural: 30
 
-
 - type: entity
   abstract: true
   parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
deleted file mode 100644
index ff01e5692eb..00000000000
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
+++ /dev/null
@@ -1,85 +0,0 @@
-- type: entity
-  name: pickaxe
-  parent: BaseItem
-  id: Pickaxe
-  description: Notched to perfection, for jamming it into rocks
-  components:
-  - type: Tag
-    tags:
-    - Pickaxe
-  - type: Sprite
-    sprite: Objects/Weapons/Melee/pickaxe.rsi
-    state: pickaxe
-  - type: MeleeWeapon
-    attackRate: 1.17
-    range: 1.5
-    wideAnimationRotation: -135
-    soundHit:
-      path: "/Audio/Weapons/smash.ogg"
-      params:
-        volume: -3
-    damage:
-      types:
-        Blunt: 6
-        Piercing: 3
-    bluntStaminaDamageFactor: 2.0
-    heavyDamageBaseModifier: 1.75
-    maxTargets: 5
-    angle: 80
-  - type: DamageOtherOnHit
-    staminaCost: 5
-  - type: Wieldable
-  - type: IncreaseDamageOnWield
-    damage:
-      types:
-        Blunt: 5
-        Structural: 30
-  - type: Item
-    size: Normal
-    shape:
-    - 0,0,2,0
-    - 1,1,1,2
-    sprite: Objects/Weapons/Melee/pickaxe.rsi
-    storedRotation: -45
-  - type: UseDelay
-
-- type: entity
-  name: mining drill
-  parent: BaseItem
-  id: MiningDrill
-  description: Powerful tool used to quickly drill through rocks
-  components:
-  - type: Item
-    storedRotation: -90
-  - type: Tag
-    tags:
-    - Pickaxe
-  - type: Sprite
-    sprite: Objects/Tools/handdrill.rsi
-    state: handdrill
-  - type: MeleeWeapon
-    autoAttack: true
-    wideAnimationRotation: -90
-    soundHit:
-      path: "/Audio/Items/drill_hit.ogg"
-    attackRate: .83
-    range: 1.5
-    damage:
-      types:
-        Blunt: 6
-        Slash: 3
-        Structural: 12
-    bluntStaminaDamageFactor: 4.0
-    heavyRateModifier: 1
-    heavyRangeModifier: 2
-    heavyDamageBaseModifier: 1
-    angle: 20
-  - type: DamageOtherOnHit
-    staminaCost: 8
-  - type: ThrowingAngle
-    angle: 270
-
-  - type: ReverseEngineering # Nyano
-    difficulty: 2
-    recipes:
-      - MiningDrill

From 3589ab9af0ec5613ba65fc79064ccbda23e1dddd Mon Sep 17 00:00:00 2001
From: ravage <142820619+ravage123321@users.noreply.github.com>
Date: Sun, 22 Sep 2024 13:33:08 +0300
Subject: [PATCH 150/366] Adding a holy watermelon helmet (#32272)

* lolkekhatholy

alalalla

* animationcreate

blelebleblbeleb
---
 .../Entities/Clothing/Head/hats.yml           |  15 +++++
 .../Hats/holyhatmelon.rsi/equipped-HELMET.png | Bin 0 -> 593 bytes
 .../Head/Hats/holyhatmelon.rsi/icon.png       | Bin 0 -> 334 bytes
 .../Hats/holyhatmelon.rsi/inhand-left.png     | Bin 0 -> 491 bytes
 .../Hats/holyhatmelon.rsi/inhand-right.png    | Bin 0 -> 502 bytes
 .../Head/Hats/holyhatmelon.rsi/meta.json      |  52 ++++++++++++++++++
 6 files changed, 67 insertions(+)
 create mode 100644 Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/equipped-HELMET.png
 create mode 100644 Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/meta.json

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 6bba9320e8b..2d1723ad66c 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -822,6 +822,21 @@
       coefficients:
         Blunt: 0.95
 
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatHolyWatermelon
+  name: watermelon halo
+  description: Holy moly.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/holyhatmelon.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/holyhatmelon.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Caustic: 0.95
+
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatSyndie
diff --git a/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfd047d7cf604c487a4ef9231659042d2f84e4ba
GIT binary patch
literal 593
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-HD>VB+?4aSW-L
z^Y-q>tl&Tywh#4P&8N>M>`oEX5pn6Mo;K-jdcm7Z3%f0Tu<%_{b)Me0uZdq^SBVCn
zsVkSP$n=I4&hH;xxxFxRr9iv1U(ueE@6F{n;(uCPcv-Vul-F2>@A1vapI@C%m2_R+
zQ519RaG7BIKD*qnzyB^h@Bh~EuKW|dgyO$TetmqYQD;|mw=3Q}U0VG2)n{Rmt}fX(
zKL>x0|IPG7@4@Zk{1@-u?EUs*$u3*%dHZ`VK0LT*@&E2WSN>k#$FP%o$1C2b<>`Xi
z$E&aY-TZ=AY0>^KKUe-<Uz^-^IMKyNQ$cCg5Bm+7U-*Guhl35Dp8cC;zV%N2<D%!w
z%`V$Hxa?!P*7tqYyK{L{Uax<5uIpT-X{D_7cka2?_ND)~{(rEzTtAOXVtRQx&?grk
zI_B*EYxA9HU;n-E>Ee^We-xJ9|9$nhYh^a?_C@{zx$B?fJEkK2DNoM%-~I3No8k19
ziI+`&vBRwgG9oH_@38OqZ>Fat_RCJMye`Z5E%Otdgj>%qD~o;S{Cx-P1;!$AgSVew
z3U>c)seOm)-+KL&JM-N01qA;tg<2x`UqfNm&dHZm&@KALC^c>VtlEaQr?=TR@F&P0
luxqGon7Xtc**OhU%Xt^ncP)N#{K;;RxTmY1%Q~loCIDE46V?C#

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..6161c05f12086787d1e3c5c296aeceddae630eed
GIT binary patch
literal 334
zcmV-U0kQsxP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$2uVaiR9J=W(lJZJKor37e}Y4n%V1RyL1-r_RR>+VNcMb}F5;&UmkwPz3Vs5!
zhb|q0gTx`h#RwvZWJs4zJqL~SK;#bGd_TD1j(6`J?;Qvsg!u0~m*6x_js5YU&;a)j
z2S%PKimY?`E)M|k=Of+k7P{BTbbHq8WV+uiv_Bu|-|qfo!?ifTvRUwSd(CP%_S*C9
z)1&nm>&`lj;5on4L8y4UOL*TrH|}oLS9<3pX4x#*KfJKc>okJqarP%M>zqbVmlcq(
zcNP=AX2!hLAm(M3e8t#v>cDC^_Uf`CpH2uuh1&gGL8!>56Y8@1{uj2KI?z4>ptv!A
gylY`0gb<?j0mn~OIDu{A*Z=?k07*qoM6N<$g7RdUOaK4?

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f8c72da91e5bc8545534ec11dd0c1ab0a9d1e0f
GIT binary patch
literal 491
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zmwLK5hE&XX
zd&}PYu!98K2lb-|RatWdT>^MGl&;-%-SoYf<LE)xKRkR#k2-So{pI@0;4a?&AVgqc
z^H%SLAuVZzpJZ~Jq_xk^KYV@Gb91@3x6S?ERTaoMxIn=a?P)8WyfkIr*uDI|k-z$K
zoBfB4QCmL#*pt6=o%QF)wO@0DujNQPuI-&WOH{W1+N^crYlV+{J<9)cK(n&y$Ax1V
ze-9mceLZ4l_1d|%@ydx89Ceq5SUlVH?oRvpQxOb%!-S_^HWp!z`%(4wu$EQ%_L*6^
z;d;6Z71E|(qIRa`9AoRzV`R{{Gryg&M&^D5!@j*cExZ--*1oLDoYwHs<#B|F!>y{!
zS0YA#KiMB(SRy@P+HZ!Q+~!D^|04C1H!`TmD|O$|XJk{j+hBs1*kWI(AT;&s6pPL~
z=NaHCw=Csx&}@C^?fl)kR94pi)Q!62PZ2d2&2GHE@^y#x&TfN=-`*VvI@b`lx^wMh
ztvQpH&z-cqxjjE#R<(}X+md<GJ$VHsC8b4{c8pG|dU6gu(z*$ZJqAx#KbLh*2~7Z0
C3)7nb

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a4eb8bbe3a3c788a4cc2b5abec21655cbab91ef
GIT binary patch
literal 502
zcmV<S0SW$zP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$ut`KgRCt{2*)dB3VH^hV=c1wIgwiE~paUTy+gs#zKSxVLOY|8U!lfaEM!$j|
z;Kilka1tVDNLz%%3UX=c-*6~my~^3Ef90Ovc;el25AXZl=?f4M5fKp)5fKq(if8-4
z7=xpOC;9puz~A*T=nb%y^YQp{=!IeUuZxOEa&gak`MDTlFqtjx)?`}dP20(Wd?azJ
ziT=)|hqvTd;khb7aUhsdoTlMT8e>Ms;#L*YGFuDiH0mgwog>$aWO&R!uAqH?=P2%C
zeDrIwT?jn@cx~UvtjtrV003+}T#O3%KE3q-{2FFyEpiF~i^=Sih>S|mwxJzB8w=15
zpe^$SSRaGyAk9K*d*V1NU{zN2w46PNSD}D;-YYV{2Cx9_0NPl9b^vWGKs$go7N8wK
z8w=15pp6A+2hf)K=hM3W>a(89*_mdr73cb|@wApU1+;I}hHHR!fWM~3GDl11M*s^*
z`-SnXXCT>ujk`6OJiadGo^0bcTzIcau2{x?>B`A_#Y(RM&Fd2ZlI`XoA4!mpWUpL7
sr%`vGZV6IX?RpPhdjt>>5fNq950ll8lzgB7&Hw-a07*qoM6N<$f`a4ZhyVZp

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/meta.json
new file mode 100644
index 00000000000..302f4371e8c
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/meta.json
@@ -0,0 +1,52 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3 and modified by ravage",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+        "name": "equipped-HELMET",
+        "directions": 4,
+        "delays": [
+          [
+            0.5,
+            0.5,
+            0.5,
+            0.5
+          ],
+          [
+            0.5,
+            0.5,
+            0.5,
+            0.5
+          ],
+          [
+            0.5,
+            0.5,
+            0.5,
+            0.5
+          ],
+          [
+            0.5,
+            0.5,
+            0.5,
+            0.5
+          ]
+        ]
+      },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

From 09e6aa8b55f15b14567904118cfd3f6c33130c88 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 16:04:28 -0400
Subject: [PATCH 151/366] remove duplicate mining drill

---
 Resources/Prototypes/Recipes/Lathes/tools.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/Resources/Prototypes/Recipes/Lathes/tools.yml b/Resources/Prototypes/Recipes/Lathes/tools.yml
index 03d8a8511e3..79d47728a4f 100644
--- a/Resources/Prototypes/Recipes/Lathes/tools.yml
+++ b/Resources/Prototypes/Recipes/Lathes/tools.yml
@@ -207,15 +207,6 @@
     Plastic: 150
     Gold: 50
 
-- type: latheRecipe
-  id: MiningDrill
-  result: MiningDrill
-  category: Tools
-  completetime: 3
-  materials:
-    Steel: 500
-    Plastic: 100
-
 - type: latheRecipe
   id: WelderExperimental
   result: WelderExperimental

From b8bac27b3c222fa11dec0853f753435d5e2166f5 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Fri, 2 Aug 2024 19:12:08 +0200
Subject: [PATCH 152/366] Add haloperidol, potassium iodide (#27454)

* add haloperidol, potassium iodide

* review fixes

* review and tuning

* shader review

* use timespan and AutoPausedField
---
 .../Drowsiness/DrowsinessOverlay.cs           | 80 +++++++++++++++++
 Content.Client/Drowsiness/DrowsinessSystem.cs | 53 +++++++++++
 Content.Server/Drowsiness/DrowsinessSystem.cs | 50 +++++++++++
 .../RadiationProtectionComponent.cs           | 18 ++++
 .../Systems/RadiationProtectionSystem.cs      | 38 ++++++++
 .../DamageProtectionBuffComponent.cs          | 17 ++++
 .../Systems/DamageProtectionBuffSystem.cs     | 19 ++++
 .../Drowsiness/DrowsinessComponent.cs         | 28 ++++++
 Content.Shared/Drowsiness/DrowsinessSystem.cs |  9 ++
 .../guidebook/chemistry/statuseffects.ftl     |  2 +
 .../Locale/en-US/reagents/meta/medicine.ftl   |  6 ++
 .../Catalog/Fills/Items/firstaidkits.yml      |  2 +-
 Resources/Prototypes/Damage/modifier_sets.yml |  6 ++
 .../Entities/Mobs/NPCs/simplemob.yml          |  4 +
 .../Prototypes/Entities/Mobs/Species/base.yml |  6 +-
 .../Objects/Specific/Medical/healing.yml      | 40 ++++++++-
 .../Reagents/Consumable/Drink/alcohol.yml     | 24 +++++
 .../Reagents/Consumable/Drink/drinks.yml      | 35 ++++++++
 .../Reagents/Consumable/Drink/soda.yml        | 13 +++
 Resources/Prototypes/Reagents/medicine.yml    | 87 +++++++++++++++++++
 Resources/Prototypes/Reagents/narcotics.yml   | 24 +++++
 Resources/Prototypes/Reagents/toxins.yml      | 15 ++--
 .../Prototypes/Recipes/Reactions/medicine.yml | 26 ++++++
 Resources/Prototypes/Shaders/shaders.yml      |  5 ++
 Resources/Prototypes/status_effects.yml       |  6 ++
 Resources/Textures/Shaders/radial_blur.swsl   | 14 +++
 26 files changed, 616 insertions(+), 11 deletions(-)
 create mode 100644 Content.Client/Drowsiness/DrowsinessOverlay.cs
 create mode 100644 Content.Client/Drowsiness/DrowsinessSystem.cs
 create mode 100644 Content.Server/Drowsiness/DrowsinessSystem.cs
 create mode 100644 Content.Server/Radiation/Components/RadiationProtectionComponent.cs
 create mode 100644 Content.Server/Radiation/Systems/RadiationProtectionSystem.cs
 create mode 100644 Content.Shared/Damage/Components/DamageProtectionBuffComponent.cs
 create mode 100644 Content.Shared/Damage/Systems/DamageProtectionBuffSystem.cs
 create mode 100644 Content.Shared/Drowsiness/DrowsinessComponent.cs
 create mode 100644 Content.Shared/Drowsiness/DrowsinessSystem.cs
 create mode 100644 Resources/Textures/Shaders/radial_blur.swsl

diff --git a/Content.Client/Drowsiness/DrowsinessOverlay.cs b/Content.Client/Drowsiness/DrowsinessOverlay.cs
new file mode 100644
index 00000000000..a316f31ae64
--- /dev/null
+++ b/Content.Client/Drowsiness/DrowsinessOverlay.cs
@@ -0,0 +1,80 @@
+using Content.Shared.Drowsiness;
+using Content.Shared.StatusEffect;
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Shared.Enums;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Drowsiness;
+
+public sealed class DrowsinessOverlay : Overlay
+{
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly IEntitySystemManager _sysMan = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    public override OverlaySpace Space => OverlaySpace.WorldSpace;
+    public override bool RequestScreenTexture => true;
+    private readonly ShaderInstance _drowsinessShader;
+
+    public float CurrentPower = 0.0f;
+
+    private const float PowerDivisor = 250.0f;
+    private const float Intensity = 0.2f; // for adjusting the visual scale
+    private float _visualScale = 0; // between 0 and 1
+
+    public DrowsinessOverlay()
+    {
+        IoCManager.InjectDependencies(this);
+        _drowsinessShader = _prototypeManager.Index<ShaderPrototype>("Drowsiness").InstanceUnique();
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        var playerEntity = _playerManager.LocalEntity;
+
+        if (playerEntity == null)
+            return;
+
+        if (!_entityManager.HasComponent<DrowsinessComponent>(playerEntity)
+            || !_entityManager.TryGetComponent<StatusEffectsComponent>(playerEntity, out var status))
+            return;
+
+        var statusSys = _sysMan.GetEntitySystem<StatusEffectsSystem>();
+        if (!statusSys.TryGetTime(playerEntity.Value, SharedDrowsinessSystem.DrowsinessKey, out var time, status))
+            return;
+
+        var curTime = _timing.CurTime;
+        var timeLeft = (float)(time.Value.Item2 - curTime).TotalSeconds;
+
+        CurrentPower += 8f * (0.5f * timeLeft - CurrentPower) * args.DeltaSeconds / (timeLeft + 1);
+    }
+
+    protected override bool BeforeDraw(in OverlayDrawArgs args)
+    {
+        if (!_entityManager.TryGetComponent(_playerManager.LocalEntity, out EyeComponent? eyeComp))
+            return false;
+
+        if (args.Viewport.Eye != eyeComp.Eye)
+            return false;
+
+        _visualScale = Math.Clamp(CurrentPower / PowerDivisor, 0.0f, 1.0f);
+        return _visualScale > 0;
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        if (ScreenTexture == null)
+            return;
+
+        var handle = args.WorldHandle;
+        _drowsinessShader.SetParameter("SCREEN_TEXTURE", ScreenTexture);
+        _drowsinessShader.SetParameter("Strength", _visualScale * Intensity);
+        handle.UseShader(_drowsinessShader);
+        handle.DrawRect(args.WorldBounds, Color.White);
+        handle.UseShader(null);
+    }
+}
diff --git a/Content.Client/Drowsiness/DrowsinessSystem.cs b/Content.Client/Drowsiness/DrowsinessSystem.cs
new file mode 100644
index 00000000000..bc8862b19d2
--- /dev/null
+++ b/Content.Client/Drowsiness/DrowsinessSystem.cs
@@ -0,0 +1,53 @@
+using Content.Shared.Drowsiness;
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Shared.Player;
+
+namespace Content.Client.Drowsiness;
+
+public sealed class DrowsinessSystem : SharedDrowsinessSystem
+{
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IOverlayManager _overlayMan = default!;
+
+    private DrowsinessOverlay _overlay = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DrowsinessComponent, ComponentInit>(OnDrowsinessInit);
+        SubscribeLocalEvent<DrowsinessComponent, ComponentShutdown>(OnDrowsinessShutdown);
+
+        SubscribeLocalEvent<DrowsinessComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
+        SubscribeLocalEvent<DrowsinessComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
+
+        _overlay = new();
+    }
+
+    private void OnPlayerAttached(EntityUid uid, DrowsinessComponent component, LocalPlayerAttachedEvent args)
+    {
+        _overlayMan.AddOverlay(_overlay);
+    }
+
+    private void OnPlayerDetached(EntityUid uid, DrowsinessComponent component, LocalPlayerDetachedEvent args)
+    {
+        _overlay.CurrentPower = 0;
+        _overlayMan.RemoveOverlay(_overlay);
+    }
+
+    private void OnDrowsinessInit(EntityUid uid, DrowsinessComponent component, ComponentInit args)
+    {
+        if (_player.LocalEntity == uid)
+            _overlayMan.AddOverlay(_overlay);
+    }
+
+    private void OnDrowsinessShutdown(EntityUid uid, DrowsinessComponent component, ComponentShutdown args)
+    {
+        if (_player.LocalEntity == uid)
+        {
+            _overlay.CurrentPower = 0;
+            _overlayMan.RemoveOverlay(_overlay);
+        }
+    }
+}
diff --git a/Content.Server/Drowsiness/DrowsinessSystem.cs b/Content.Server/Drowsiness/DrowsinessSystem.cs
new file mode 100644
index 00000000000..2511bc790e9
--- /dev/null
+++ b/Content.Server/Drowsiness/DrowsinessSystem.cs
@@ -0,0 +1,50 @@
+using Content.Shared.Bed.Sleep;
+using Content.Shared.Drowsiness;
+using Content.Shared.StatusEffect;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Server.Drowsiness;
+
+public sealed class DrowsinessSystem : SharedDrowsinessSystem
+{
+    [ValidatePrototypeId<StatusEffectPrototype>]
+    private const string SleepKey = "ForcedSleep"; // Same one used by N2O and other sleep chems.
+
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<DrowsinessComponent, ComponentStartup>(OnInit);
+    }
+
+    private void OnInit(EntityUid uid, DrowsinessComponent component, ComponentStartup args)
+    {
+        component.NextIncidentTime = _timing.CurTime + TimeSpan.FromSeconds(_random.NextFloat(component.TimeBetweenIncidents.X, component.TimeBetweenIncidents.Y));
+    }
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<DrowsinessComponent>();
+        while (query.MoveNext(out var uid, out var component))
+        {
+            if (_timing.CurTime < component.NextIncidentTime)
+                continue;
+
+            // Set the new time.
+            component.NextIncidentTime = _timing.CurTime + TimeSpan.FromSeconds(_random.NextFloat(component.TimeBetweenIncidents.X, component.TimeBetweenIncidents.Y));
+
+            // sleep duration
+            var duration = TimeSpan.FromSeconds(_random.NextFloat(component.DurationOfIncident.X, component.DurationOfIncident.Y));
+
+            // Make sure the sleep time doesn't cut into the time to next incident.
+            component.NextIncidentTime += duration;
+
+            _statusEffects.TryAddStatusEffect<ForcedSleepingComponent>(uid, SleepKey, duration, false);
+        }
+    }
+}
diff --git a/Content.Server/Radiation/Components/RadiationProtectionComponent.cs b/Content.Server/Radiation/Components/RadiationProtectionComponent.cs
new file mode 100644
index 00000000000..44b11af8347
--- /dev/null
+++ b/Content.Server/Radiation/Components/RadiationProtectionComponent.cs
@@ -0,0 +1,18 @@
+using Robust.Shared.Prototypes;
+using Content.Shared.Damage.Prototypes;
+
+namespace Content.Server.Radiation.Components;
+
+/// <summary>
+///     Exists for use as a status effect.
+///     Adds the DamageProtectionBuffComponent to the entity and adds the specified DamageModifierSet to its list of modifiers.
+/// </summary>
+[RegisterComponent]
+public sealed partial class RadiationProtectionComponent : Component
+{
+    /// <summary>
+    ///     The radiation damage modifier for entities with this component.
+    /// </summary>
+    [DataField("modifier")]
+    public ProtoId<DamageModifierSetPrototype> RadiationProtectionModifierSetId = "PotassiumIodide";
+}
diff --git a/Content.Server/Radiation/Systems/RadiationProtectionSystem.cs b/Content.Server/Radiation/Systems/RadiationProtectionSystem.cs
new file mode 100644
index 00000000000..5222c31bfe6
--- /dev/null
+++ b/Content.Server/Radiation/Systems/RadiationProtectionSystem.cs
@@ -0,0 +1,38 @@
+using Content.Server.Radiation.Components;
+using Content.Shared.Damage.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Radiation.EntitySystems;
+
+public sealed class RadiationProtectionSystem : EntitySystem
+{
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<RadiationProtectionComponent, ComponentInit>(OnInit);
+        SubscribeLocalEvent<RadiationProtectionComponent, ComponentShutdown>(OnShutdown);
+    }
+
+    private void OnInit(EntityUid uid, RadiationProtectionComponent component, ComponentInit args)
+    {
+        if (!_prototypeManager.TryIndex(component.RadiationProtectionModifierSetId, out var modifier))
+            return;
+        var buffComp = EnsureComp<DamageProtectionBuffComponent>(uid);
+        // add the damage modifier if it isn't in the dict yet
+        if (!buffComp.Modifiers.ContainsKey(component.RadiationProtectionModifierSetId))
+            buffComp.Modifiers.Add(component.RadiationProtectionModifierSetId, modifier);
+    }
+
+    private void OnShutdown(EntityUid uid, RadiationProtectionComponent component, ComponentShutdown args)
+    {
+        if (!TryComp<DamageProtectionBuffComponent>(uid, out var buffComp))
+            return;
+        // remove the damage modifier from the dict
+        buffComp.Modifiers.Remove(component.RadiationProtectionModifierSetId);
+        // if the dict is empty now, remove the buff component
+        if (buffComp.Modifiers.Count == 0)
+            RemComp<DamageProtectionBuffComponent>(uid);
+    }
+}
diff --git a/Content.Shared/Damage/Components/DamageProtectionBuffComponent.cs b/Content.Shared/Damage/Components/DamageProtectionBuffComponent.cs
new file mode 100644
index 00000000000..99b055a6456
--- /dev/null
+++ b/Content.Shared/Damage/Components/DamageProtectionBuffComponent.cs
@@ -0,0 +1,17 @@
+using Content.Shared.Damage.Prototypes;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Damage.Components;
+
+/// <summary>
+///     Applies the specified DamageModifierSets when the entity takes damage.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class DamageProtectionBuffComponent : Component
+{
+    /// <summary>
+    ///     The damage modifiers for entities with this component.
+    /// </summary>
+    [DataField]
+    public Dictionary<string, DamageModifierSetPrototype> Modifiers = new();
+}
diff --git a/Content.Shared/Damage/Systems/DamageProtectionBuffSystem.cs b/Content.Shared/Damage/Systems/DamageProtectionBuffSystem.cs
new file mode 100644
index 00000000000..bbb7bfda323
--- /dev/null
+++ b/Content.Shared/Damage/Systems/DamageProtectionBuffSystem.cs
@@ -0,0 +1,19 @@
+using Content.Shared.Damage.Components;
+
+namespace Content.Shared.Damage.Systems;
+
+public sealed class DamageProtectionBuffSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DamageProtectionBuffComponent, DamageModifyEvent>(OnDamageModify);
+    }
+
+    private void OnDamageModify(EntityUid uid, DamageProtectionBuffComponent component, DamageModifyEvent args)
+    {
+        foreach (var modifier in component.Modifiers.Values)
+            args.Damage = DamageSpecifier.ApplyModifierSet(args.Damage, modifier);
+    }
+}
diff --git a/Content.Shared/Drowsiness/DrowsinessComponent.cs b/Content.Shared/Drowsiness/DrowsinessComponent.cs
new file mode 100644
index 00000000000..7e170ed232e
--- /dev/null
+++ b/Content.Shared/Drowsiness/DrowsinessComponent.cs
@@ -0,0 +1,28 @@
+using System.Numerics;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Drowsiness;
+
+/// <summary>
+///     Exists for use as a status effect. Adds a shader to the client that scales with the effect duration.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentPause]
+public sealed partial class DrowsinessComponent : Component
+{
+    /// <summary>
+    /// The random time between sleeping incidents, (min, max).
+    /// </summary>
+    [DataField(required: true)]
+    public Vector2 TimeBetweenIncidents = new Vector2(5f, 60f);
+
+    /// <summary>
+    /// The duration of sleeping incidents, (min, max).
+    /// </summary>
+    [DataField(required: true)]
+    public Vector2 DurationOfIncident = new Vector2(2, 5);
+
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
+    public TimeSpan NextIncidentTime = TimeSpan.Zero;
+}
diff --git a/Content.Shared/Drowsiness/DrowsinessSystem.cs b/Content.Shared/Drowsiness/DrowsinessSystem.cs
new file mode 100644
index 00000000000..97d7c0952dc
--- /dev/null
+++ b/Content.Shared/Drowsiness/DrowsinessSystem.cs
@@ -0,0 +1,9 @@
+using Content.Shared.StatusEffect;
+
+namespace Content.Shared.Drowsiness;
+
+public abstract class SharedDrowsinessSystem : EntitySystem
+{
+    [ValidatePrototypeId<StatusEffectPrototype>]
+    public const string DrowsinessKey = "Drowsiness";
+}
diff --git a/Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl b/Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl
index 3db8a3c5b0e..9a8f2f6c8a3 100644
--- a/Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl
+++ b/Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl
@@ -11,3 +11,5 @@ reagent-effect-status-effect-PressureImmunity = pressure immunity
 reagent-effect-status-effect-Pacified = combat pacification
 reagent-effect-status-effect-RatvarianLanguage = ratvarian language patterns
 reagent-effect-status-effect-StaminaModifier = modified stamina
+reagent-effect-status-effect-RadiationProtection = radiation protection
+reagent-effect-status-effect-Drowsiness = drowsiness
diff --git a/Resources/Locale/en-US/reagents/meta/medicine.ftl b/Resources/Locale/en-US/reagents/meta/medicine.ftl
index a84e8315fda..1e34411efbb 100644
--- a/Resources/Locale/en-US/reagents/meta/medicine.ftl
+++ b/Resources/Locale/en-US/reagents/meta/medicine.ftl
@@ -141,3 +141,9 @@ reagent-desc-mannitol = Efficiently restores brain damage.
 
 reagent-name-psicodine = psicodine
 reagent-desc-psicodine = Suppresses anxiety and other various forms of mental distress. Overdose causes hallucinations and minor toxin damage.
+
+reagent-name-potassium-iodide = potassium iodide
+reagent-desc-potassium-iodide = Will reduce the damaging effects of radiation by 90%. Prophylactic use only.
+
+reagent-name-haloperidol = haloperidol
+reagent-desc-haloperidol = Removes most stimulating and hallucinogenic drugs. Reduces druggy effects and jitteriness. Causes drowsiness.
diff --git a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
index f1b259f829c..6b6929c038a 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
@@ -71,7 +71,7 @@
     contents:
       - id: SyringePhalanximine
       - id: RadAutoInjector
-      - id: EmergencyMedipen
+      - id: PillCanisterPotassiumIodide
       - id: PillCanisterHyronalin
 
 - type: entity
diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml
index 8366453e587..817653a6e97 100644
--- a/Resources/Prototypes/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/Damage/modifier_sets.yml
@@ -389,3 +389,9 @@
     Cold: 0.5
     Heat: 0.8
     Shock: 0.5
+
+# protects against radiation
+- type: damageModifierSet
+  id: PotassiumIodide
+  coefficients:
+    Radiation: 0.1
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
index 8e84f46a693..bf7087fa03e 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -25,6 +25,8 @@
     - ForcedSleep
     - TemporaryBlindness
     - Pacified
+    - RadiationProtection
+    - Drowsiness
   - type: Buckle
   - type: StandingState
   - type: Tag
@@ -99,6 +101,8 @@
       - TemporaryBlindness
       - Pacified
       - StaminaModifier
+      - RadiationProtection
+      - Drowsiness
   - type: Bloodstream
     bloodMaxVolume: 150
   - type: MobPrice
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index 7ae38f707e9..affdada43ee 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -141,10 +141,10 @@
     - TemporaryBlindness
     - Pacified
     - StaminaModifier
+    - RadiationProtection
+    - Drowsiness
     - PsionicsDisabled
     - PsionicallyInsulated
-  - type: Reflect
-    reflectProb: 0
   - type: Body
     prototype: Human
     requiredLegs: 2
@@ -281,6 +281,8 @@
     - StaminaModifier
     - PsionicsDisabled
     - PsionicallyInsulated
+    - RadiationProtection
+    - Drowsiness
   - type: Blindable
   # Other
   - type: Temperature
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index 6a0f0a3c23d..e852b217cba 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -444,7 +444,41 @@
       amount: 5
 
 - type: entity
-  name: pill (iron 10u)
+  name: pill
+  suffix: Potassium iodide 10u
+  parent: Pill
+  id: PillPotassiumIodide
+  components:
+  - type: Pill
+    pillType: 8
+  - type: Sprite
+    state: pill9
+  - type: Label
+    currentLabel: potassium iodide 10u
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: PotassiumIodide
+          Quantity: 10
+
+- type: entity
+  name: pill canister
+  parent: PillCanister
+  id: PillCanisterPotassiumIodide
+  suffix: Potassium iodide 10u, 5
+  components:
+  - type: Label
+    currentLabel: potassium iodide 10u
+  - type: StorageFill
+    contents:
+    - id: PillPotassiumIodide
+      amount: 5
+
+- type: entity
+  name: pill
+  suffix: Iron 10u
   parent: Pill
   id: PillIron
   components:
@@ -782,6 +816,10 @@
       prob: 0.10
       maxAmount: 7
       orGroup: RandomPill
+    - id: PillPotassiumIodide
+      prob: 0.10
+      maxAmount: 7
+      orGroup: RandomPill
     - id: PillIron
       prob: 0.10
       maxAmount: 7
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
index f374a3debf1..2bafbbc0f0b 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -2086,6 +2086,10 @@
         - !type:AdjustReagent
           reagent: Theobromine
           amount: 0.05
+        - !type:GenericStatusEffect
+          key: Drowsiness
+          time: 1.0
+          type: Remove
   fizziness: 0.25
 
 - type: reagent
@@ -2113,6 +2117,10 @@
         - !type:AdjustReagent
           reagent: Theobromine
           amount: 0.05
+        - !type:GenericStatusEffect
+          key: Drowsiness
+          time: 1.0
+          type: Remove
   fizziness: 0.15
 
 - type: reagent
@@ -2140,6 +2148,10 @@
         - !type:AdjustReagent
           reagent: Theobromine
           amount: 0.05
+        - !type:GenericStatusEffect
+          key: Drowsiness
+          time: 1.0
+          type: Remove
   fizziness: 0.15
 
 - type: reagent
@@ -2167,6 +2179,10 @@
         - !type:AdjustReagent
           reagent: Theobromine
           amount: 0.05
+        - !type:GenericStatusEffect
+          key: Drowsiness
+          time: 1.0
+          type: Remove
   fizziness: 0.25
 
 - type: reagent
@@ -2194,6 +2210,10 @@
         - !type:AdjustReagent
           reagent: Theobromine
           amount: 0.05
+        - !type:GenericStatusEffect
+          key: Drowsiness
+          time: 1.0
+          type: Remove
   fizziness: 0.15
 
 - type: reagent
@@ -2221,4 +2241,8 @@
         - !type:AdjustReagent
           reagent: Theobromine
           amount: 0.05
+        - !type:GenericStatusEffect
+          key: Drowsiness
+          time: 1.0
+          type: Remove
   fizziness: 0.25
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
index 52a01d973f6..3f9fb7b53d2 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -12,6 +12,10 @@
       effects:
       - !type:SatiateThirst
         factor: 2
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 2.0
+        type: Remove
       - !type:AdjustReagent
         reagent: Theobromine
         amount: 0.05
@@ -96,6 +100,15 @@
   metamorphicMaxFillLevels: 1
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 2.0
+        type: Remove
 
 - type: reagent
   id: GreenTea
@@ -145,6 +158,15 @@
   metamorphicMaxFillLevels: 5
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 2.0
+        type: Remove
 
 - type: reagent
   id: IcedGreenTea
@@ -322,6 +344,10 @@
       effects:
       - !type:SatiateThirst
         factor: 6
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 3.0
+        type: Remove
     Poison:
       effects:
       - !type:HealthChange
@@ -354,6 +380,15 @@
   metamorphicMaxFillLevels: 1
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 2.0
+        type: Remove
 
 - type: reagent
   id: Tea
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
index d78b0351cee..49290677a1e 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
@@ -13,6 +13,15 @@
   metamorphicMaxFillLevels: 5
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 1.0
+        type: Remove
 
 - type: reagent
   id: RoyRogers
@@ -68,6 +77,10 @@
       effects:
       - !type:SatiateThirst
         factor: 2
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 2.0
+        type: Remove
       - !type:AdjustReagent
         reagent: Theobromine
         amount: 0.1
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index 0c261b1dbf6..445a5344104 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -907,6 +907,10 @@
       - !type:GenericStatusEffect
         key: Stutter
         component: StutteringAccent
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 10
+        type: Remove
       - !type:ResetNarcolepsy
         conditions:
         - !type:ReagentThreshold
@@ -928,6 +932,10 @@
   metabolisms:
     Medicine:
       effects:
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 10
+        type: Remove
       - !type:ResetNarcolepsy
         conditions:
         - !type:ReagentThreshold
@@ -1265,6 +1273,85 @@
         - "psicodine-effect-at-peace"
         probability: 0.2
 
+- type: reagent
+  id: PotassiumIodide
+  name: reagent-name-potassium-iodide
+  group: Medicine
+  desc: reagent-desc-potassium-iodide
+  physicalDesc: reagent-physical-desc-grainy
+  flavor: medicine
+  color: "#baa15d"
+  metabolisms:
+    Medicine:
+      effects:
+      - !type:GenericStatusEffect
+        key: RadiationProtection
+        component: RadiationProtection
+        time: 2
+        type: Add
+        refresh: false
+      - !type:HealthChange
+        conditions:
+          - !type:ReagentThreshold
+            min: 20
+        damage:
+          types:
+            Poison: 1
+
+- type: reagent
+  id: Haloperidol
+  name: reagent-name-haloperidol
+  group: Medicine
+  desc: reagent-desc-haloperidol
+  physicalDesc: reagent-physical-desc-crystalline
+  flavor: medicine
+  color: "#27870a"
+  metabolisms:
+    Medicine:
+      effects:
+      - !type:Emote
+        emote: Yawn
+        showInChat: true
+        probability: 0.1
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        component: Drowsiness
+        time: 4
+        type: Add
+        refresh: false
+      - !type:GenericStatusEffect
+        key: Jitter
+        time: 4.0
+        type: Remove
+      - !type:GenericStatusEffect
+        key: SeeingRainbows
+        time: 10.0
+        type: Remove
+      - !type:AdjustReagent
+        reagent: Desoxyephedrine
+        amount: -3.0
+      - !type:AdjustReagent
+        reagent: Ephedrine
+        amount: -3.0
+      - !type:AdjustReagent
+        reagent: Stimulants
+        amount: -3.0
+      - !type:AdjustReagent
+        reagent: THC
+        amount: -3.0
+      - !type:AdjustReagent
+        reagent: SpaceDrugs
+        amount: -3.0
+      - !type:AdjustReagent
+        reagent: Bananadine
+        amount: -3.0
+      - !type:AdjustReagent
+        reagent: SpaceGlue
+        amount: -3.0
+      - !type:AdjustReagent
+        reagent: MindbreakerToxin
+        amount: -3.0
+
 - type: reagent
   id: HolyWater
   name: reagent-name-holywater
diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml
index ebb8b0fc43b..08912357a34 100644
--- a/Resources/Prototypes/Reagents/narcotics.yml
+++ b/Resources/Prototypes/Reagents/narcotics.yml
@@ -40,6 +40,14 @@
         key: KnockedDown
         time: 3
         type: Remove
+      - !type:GenericStatusEffect
+        conditions:
+        - !type:ReagentThreshold
+          reagent: Haloperidol
+          max: 0.01
+        key: Drowsiness
+        time: 10
+        type: Remove
     Medicine:
       effects:
       - !type:ResetNarcolepsy
@@ -80,6 +88,14 @@
         key: KnockedDown
         time: 1
         type: Remove
+      - !type:GenericStatusEffect
+        conditions:
+        - !type:ReagentThreshold
+          reagent: Haloperidol
+          max: 0.01
+        key: Drowsiness
+        time: 10
+        type: Remove
       - !type:PopupMessage
         visualType: Medium
         messages: ["ephedrine-effect-tight-pain", "ephedrine-effect-heart-pounds"]
@@ -140,6 +156,14 @@
         key: ForcedSleep
         time: 3
         type: Remove
+      - !type:GenericStatusEffect
+        conditions:
+        - !type:ReagentThreshold
+          reagent: Haloperidol
+          max: 0.01
+        key: Drowsiness
+        time: 10
+        type: Remove
     Medicine:
       metabolismRate: 1.0
       effects:
diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
index abb33f832a4..1c529b4dd9b 100644
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -56,18 +56,19 @@
   metabolisms:
     Poison:
       effects:
+      - !type:Emote
+        emote: Yawn
+        showInChat: true
+        probability: 0.1
       - !type:MovespeedModifier
         walkSpeedModifier: 0.65
         sprintSpeedModifier: 0.65
       - !type:GenericStatusEffect
-        conditions:
-        - !type:ReagentThreshold
-          reagent: ChloralHydrate
-          min: 10
-        key: ForcedSleep
-        component: ForcedSleeping
-        refresh: false
+        key: Drowsiness
+        component: Drowsiness
+        time: 4
         type: Add
+        refresh: false
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml
index 2e9b1d4f854..a99015fe90b 100644
--- a/Resources/Prototypes/Recipes/Reactions/medicine.yml
+++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml
@@ -636,3 +636,29 @@
       catalyst: true
   products:
     Happiness: 4
+
+- type: reaction
+  id: PotassiumIodide
+  reactants:
+    Potassium:
+      amount: 1
+    Iodine:
+      amount: 1
+  products:
+    PotassiumIodide: 2
+
+- type: reaction
+  id: Haloperidol
+  reactants:
+    Aluminium:
+      amount: 1
+    Chlorine:
+      amount: 1
+    Fluorine:
+      amount: 1
+    Oil:
+      amount: 1
+    PotassiumIodide:
+      amount: 1
+  products:
+    Haloperidol: 5
diff --git a/Resources/Prototypes/Shaders/shaders.yml b/Resources/Prototypes/Shaders/shaders.yml
index 41d04137bbe..108b9f778b5 100644
--- a/Resources/Prototypes/Shaders/shaders.yml
+++ b/Resources/Prototypes/Shaders/shaders.yml
@@ -57,6 +57,11 @@
   kind: source
   path: "/Textures/Shaders/drunk.swsl"
 
+- type: shader
+  id: Drowsiness
+  kind: source
+  path: "/Textures/Shaders/radial_blur.swsl"
+
 - type: shader
   id: Texture
   kind: source
diff --git a/Resources/Prototypes/status_effects.yml b/Resources/Prototypes/status_effects.yml
index bed635c7026..2bfa7ef7a0f 100644
--- a/Resources/Prototypes/status_effects.yml
+++ b/Resources/Prototypes/status_effects.yml
@@ -62,3 +62,9 @@
 
 - type: statusEffect
   id: PhaseShifted
+
+- type: statusEffect
+  id: RadiationProtection
+
+- type: statusEffect
+  id: Drowsiness #blurs your vision and makes you randomly fall asleep
diff --git a/Resources/Textures/Shaders/radial_blur.swsl b/Resources/Textures/Shaders/radial_blur.swsl
new file mode 100644
index 00000000000..f3224ce06c9
--- /dev/null
+++ b/Resources/Textures/Shaders/radial_blur.swsl
@@ -0,0 +1,14 @@
+uniform sampler2D SCREEN_TEXTURE;
+uniform highp float Strength;
+const highp int SampleCount = 10; // a higher number makes the shader look better, but has a big performance impact
+
+// a simple radial blur
+void fragment() {
+    highp vec2 uv = FRAGCOORD.xy * SCREEN_PIXEL_SIZE.xy;
+    highp vec2 direction = vec2(0.5, 0.5) - uv;
+    for (int i=1; i <= SampleCount; i++)
+    {
+        COLOR += zTextureSpec(SCREEN_TEXTURE, uv + float(i) * Strength / float(SampleCount) * direction);
+    }
+    COLOR = COLOR / float(SampleCount);
+}

From 4de3556bb19e983ecc44a92576364e1290a7458e Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 16:41:50 -0400
Subject: [PATCH 153/366] maaaow

---
 Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml         | 6 +++---
 .../Entities/Objects/Specific/Medical/surgery.yml           | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml
index 290d832f261..bc532e65d7b 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml
@@ -225,7 +225,7 @@
     factions:
     - PetsNT
   - type: Tool
-    speed: 3
+    speedModifier: 3
     qualities:
       - Prying
   - type: Inventory
@@ -259,7 +259,7 @@
     factions:
     - PetsNT
   - type: Tool
-    speed: 3
+    speedModifier: 3
     qualities:
       - Prying
   - type: Inventory
@@ -293,7 +293,7 @@
     factions:
      - PetsNT
   - type: Tool
-    speed: 3
+    speedModifier: 3
     qualities:
       - Prying
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
index 0ddc38fcbe6..26b15b57bf6 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
@@ -559,7 +559,7 @@
   - type: Tool
     qualities:
       - Sawing
-    speed: 2.0
+    speedModifier: 2.0
   - type: BoneSaw
     speed: 1.5
 

From e877ccd433b19f31f2d3aa6d02fa21b63986ea04 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 17:10:49 -0400
Subject: [PATCH 154/366] yeag!

---
 .../nutrition/components/food-sequence.ftl    |  1 +
 .../Prototypes/Catalog/uplink_catalog.yml     |  8 +--
 .../Objects/Consumable/Food/produce.yml       |  4 +-
 .../Circuitboards/Machine/production.yml      |  3 +-
 .../Objects/Specific/Medical/surgery.yml      |  2 +-
 Resources/Prototypes/Hydroponics/seeds.yml    |  2 +-
 .../Recipes/Cooking/food_sequence_element.yml | 52 +++++++++++++++++++
 7 files changed, 63 insertions(+), 9 deletions(-)

diff --git a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
index 36383a2c247..336d3d75fc6 100644
--- a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
+++ b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
@@ -67,6 +67,7 @@ food-sequence-content-glasstle = glasstle
 food-sequence-content-gatfruit = gatfruit
 food-sequence-content-koibean = koibean
 food-sequence-content-watermelon = watermelon
+food-sequence-content-holymelon = holymelon
 food-sequence-content-cannabis = cannabis
 food-sequence-content-rainbow-cannabis = rainbow cannabis
 food-sequence-content-tobacco = tobacco
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 325dffa1315..0bc47d74eb7 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -557,7 +557,7 @@
   id: UplinkHypopen
   name: uplink-hypopen-name
   description: uplink-hypopen-desc
-  icon: { sprite: /Textures/Objects/Misc/pens.rsi, state: pen }
+  icon: { sprite: /Textures/Objects/Misc/bureaucracy.rsi, state: pen }
   productEntity: HypopenBox
   discountCategory: rareDiscounts
   discountDownTo:
@@ -1341,7 +1341,7 @@
   cost:
     Telecrystal: 4
   categories:
-  - UplinkBundles
+  - UplinkWearables
 
 - type: listing
   id: UplinkVoiceMask
@@ -1354,7 +1354,7 @@
   cost:
     Telecrystal: 6
   categories:
-  - UplinkBundles
+  - UplinkWearables
 
 # Disruption
 
@@ -1474,7 +1474,7 @@
   cost:
     Telecrystal: 2
   categories:
-  - UplinkBundles
+  - UplinkWearables
   conditions:
   - !type:StoreWhitelistCondition
     blacklist:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index 91dd73a8170..476658ef576 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -2061,7 +2061,7 @@
           Quantity: 10
         - ReagentId: Vitamin
           Quantity: 5
-        - ReagentId: Holywater
+        - ReagentId: HolyWater
           Quantity: 10
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/holymelon.rsi
@@ -2126,7 +2126,7 @@
           Quantity: 2
         - ReagentId: Vitamin
           Quantity: 1
-        - ReagentId: Holywater
+        - ReagentId: HolyWater
           Quantity: 2
   - type: Extractable
     juiceSolution:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index ba76cd32991..f3ff3210257 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -1241,8 +1241,9 @@
       state: service
     - type: MachineBoard
       prototype: SyndicateMicrowave
-      stackRequirements:
+      requirements:
         Capacitor: 1
+      materialRequirements:
         Glass: 2
         Cable: 2
 
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
index 26b15b57bf6..973da9675c8 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
@@ -516,7 +516,7 @@
   - type: Tool
     qualities:
       - Sawing
-    speed: 1.5
+    speedModifier: 1.5
   - type: SurgeryTool
     startSound:
       path: /Audio/Medical/Surgery/saw.ogg
diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index ea841919057..284ef764c7c 100644
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -1609,7 +1609,7 @@
       Min: 1
       Max: 10
       PotencyDivisor: 10
-    Holywater:
+    HolyWater:
       Min: 1
       Max: 10
       PotencyDivisor: 10
diff --git a/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml b/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml
index d843e7b985b..c7dd752866e 100644
--- a/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml
+++ b/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml
@@ -575,6 +575,28 @@
   tags:
     - Fruit
 
+# Extradimensional Orange
+
+- type: foodSequenceElement
+  id: ExtradimensionalOrange
+  name: food-sequence-content-orange
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/extradimensional_orange.rsi
+    state: produce
+  scale: 0.5,0.5
+  tags:
+    - Fruit
+
+- type: foodSequenceElement
+  id: ExtradimensionalOrangeBurger
+  name: food-sequence-burger-content-extradimensional-orange
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/extradimensional_orange.rsi
+    state: produce
+  scale: 0.5,0.5
+  tags:
+    - Fruit
+
 # Potato
 
 - type: foodSequenceElement
@@ -752,6 +774,36 @@
   - Fruit
   - Slice
 
+- type: foodSequenceElement
+  id: HolymelonSliceBurger
+  name: food-sequence-burger-content-holymelon
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/holymelon.rsi
+    state: slice
+  tags:
+  - Fruit
+  - Slice
+
+- type: foodSequenceElement
+  id: HolymelonSlice
+  name: food-sequence-content-holymelon
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/holymelon.rsi
+    state: slice
+  tags:
+  - Fruit
+  - Slice
+
+- type: foodSequenceElement
+  id: HolymelonSliceSkewer
+  name: food-sequence-content-holymelon
+  sprites:
+  - sprite: Objects/Consumable/Food/skewer.rsi
+    state: skewer-holymelon
+  tags:
+  - Fruit
+  - Slice
+
 # Chili pepper
 
 - type: foodSequenceElement

From fa96dd4f700211b619dc349df4c2aab7f360c2dc Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 17:17:47 -0400
Subject: [PATCH 155/366] fix PotencyDivisors capitalization

---
 Content.Server/Botany/SeedPrototype.cs                        | 2 +-
 Resources/Maps/Salvage/vegan-meatball.yml                     | 4 ++--
 .../Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml    | 1 -
 Resources/Prototypes/Nyanotrasen/Hydroponics/seeds.yml        | 4 ++--
 .../Prototypes/Recipes/Cooking/food_sequence_element.yml      | 2 --
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Content.Server/Botany/SeedPrototype.cs b/Content.Server/Botany/SeedPrototype.cs
index dd3555f143f..e9cf34e6ba6 100644
--- a/Content.Server/Botany/SeedPrototype.cs
+++ b/Content.Server/Botany/SeedPrototype.cs
@@ -70,7 +70,7 @@ public partial struct SeedChemQuantity
     /// When chemicals are added to produce, the potency of the seed is divided with this value. Final chemical amount is the result plus the `Min` value.
     /// Example: PotencyDivisor of 20 with seed potency of 55 results in 2.75, 55/20 = 2.75. If minimum is 1 then final result will be 3.75 of that chemical, 55/20+1 = 3.75.
     /// </summary>
-    [DataField] public int PotencyDivisor;
+    [DataField("PotencyDivisor")] public int PotencyDivisor;
 
     /// <summary>
     /// Inherent chemical is one that is NOT result of mutation or crossbreeding. These chemicals are removed if species mutation is executed.
diff --git a/Resources/Maps/Salvage/vegan-meatball.yml b/Resources/Maps/Salvage/vegan-meatball.yml
index ab67aabadbf..824e3d0b7ea 100644
--- a/Resources/Maps/Salvage/vegan-meatball.yml
+++ b/Resources/Maps/Salvage/vegan-meatball.yml
@@ -505,7 +505,7 @@ entities:
         chemicals:
           THC:
             Inherent: True
-            potencyDivisor: 10
+            PotencyDivisor: 10
             Max: 10
             Min: 1
         productPrototypes:
@@ -578,7 +578,7 @@ entities:
         chemicals:
           Stellibinin:
             Inherent: True
-            potencyDivisor: 4
+            PotencyDivisor: 4
             Max: 25
             Min: 1
         productPrototypes:
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
index dc0629a745c..efc0d2c9a1a 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
@@ -9,7 +9,6 @@
         map: [ "enum.AmmoVisualLayers.Base" ]
   - type: CartridgeAmmo
     proto: PelletShotgunSoulbreaker
-    count: 1
   - type: ChemicalAmmo
   - type: SolutionContainerManager
     solutions:
diff --git a/Resources/Prototypes/Nyanotrasen/Hydroponics/seeds.yml b/Resources/Prototypes/Nyanotrasen/Hydroponics/seeds.yml
index 08f4482787f..12744b1e06a 100644
--- a/Resources/Prototypes/Nyanotrasen/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Nyanotrasen/Hydroponics/seeds.yml
@@ -22,8 +22,8 @@
     Nutriment:
       Min: 1
       Max: 10
-      potencyDivisor: 10
+      PotencyDivisor: 10
     DemonsBlood:
       Min: 1
       Max: 4
-      potencyDivisor: 25
+      PotencyDivisor: 25
diff --git a/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml b/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml
index c7dd752866e..68605e08d80 100644
--- a/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml
+++ b/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml
@@ -583,7 +583,6 @@
   sprites:
   - sprite: Objects/Specific/Hydroponics/extradimensional_orange.rsi
     state: produce
-  scale: 0.5,0.5
   tags:
     - Fruit
 
@@ -593,7 +592,6 @@
   sprites:
   - sprite: Objects/Specific/Hydroponics/extradimensional_orange.rsi
     state: produce
-  scale: 0.5,0.5
   tags:
     - Fruit
 

From c362b9c6a2073edfa14c8b53a78e458176315c19 Mon Sep 17 00:00:00 2001
From: Intoxicating-Innocence
 <188202277+Intoxicating-Innocence@users.noreply.github.com>
Date: Tue, 17 Dec 2024 04:17:06 +1100
Subject: [PATCH 156/366] Chem master UI (#33328)

* chemmaster buffer has colors now

* I have saved chemists everywhere

* implimented panelcontainers instead of labels, slight visual rework

* added UI changes to input buffer

* fixed some unsightly indentation on brackets and removed redundant minheight specification from verticalstretch elements

* Formatting and code cleanup

* pills still not rendering correctly

* more tinkering, entities finally display correctly

* entities display correctly, pill fields default to max now

* fixed stripes

* fixed excess pillCount bug

* removed cache, fixed tab swapping

---------

Co-authored-by: Saphire <lattice@saphi.re>
---
 .../Chemistry/UI/ChemMasterWindow.xaml.cs     | 285 ++++++++++--------
 1 file changed, 161 insertions(+), 124 deletions(-)

diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
index a0871c16a1f..5755bfdc075 100644
--- a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
+++ b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
@@ -12,6 +12,7 @@
 using System.Linq;
 using System.Numerics;
 using Content.Shared.FixedPoint;
+using Robust.Client.Graphics;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Chemistry.UI
@@ -90,10 +91,40 @@ public ChemMasterWindow()
 
         private ReagentButton MakeReagentButton(string text, ChemMasterReagentAmount amount, ReagentId id, bool isBuffer, string styleClass)
         {
-            var button = new ReagentButton(text, amount, id, isBuffer, styleClass);
-            button.OnPressed += args
-                => OnReagentButtonPressed?.Invoke(args, button);
-            return button;
+            var reagentTransferButton = new ReagentButton(text, amount, id, isBuffer, styleClass);
+            reagentTransferButton.OnPressed += args
+                => OnReagentButtonPressed?.Invoke(args, reagentTransferButton);
+            return reagentTransferButton;
+        }
+        /// <summary>
+        /// Conditionally generates a set of reagent buttons based on the supplied boolean argument.
+        /// This was moved outside of BuildReagentRow to facilitate conditional logic, stops indentation depth getting out of hand as well.
+        /// </summary>
+        private List<ReagentButton> CreateReagentTransferButtons(ReagentId reagent, bool isBuffer, bool addReagentButtons)
+        {
+            if (!addReagentButtons)
+                return new List<ReagentButton>(); // Return an empty list if reagentTransferButton creation is disabled.
+
+            var buttonConfigs = new (string text, ChemMasterReagentAmount amount, string styleClass)[]
+            {
+                ("1", ChemMasterReagentAmount.U1, StyleBase.ButtonOpenBoth),
+                ("5", ChemMasterReagentAmount.U5, StyleBase.ButtonOpenBoth),
+                ("10", ChemMasterReagentAmount.U10, StyleBase.ButtonOpenBoth),
+                ("25", ChemMasterReagentAmount.U25, StyleBase.ButtonOpenBoth),
+                ("50", ChemMasterReagentAmount.U50, StyleBase.ButtonOpenBoth),
+                ("100", ChemMasterReagentAmount.U100, StyleBase.ButtonOpenBoth),
+                (Loc.GetString("chem-master-window-buffer-all-amount"), ChemMasterReagentAmount.All, StyleBase.ButtonOpenLeft),
+            };
+
+            var buttons = new List<ReagentButton>();
+
+            foreach (var (text, amount, styleClass) in buttonConfigs)
+            {
+                var reagentTransferButton = MakeReagentButton(text, amount, reagent, isBuffer, styleClass);
+                buttons.Add(reagentTransferButton);
+            }
+
+            return buttons;
         }
 
         /// <summary>
@@ -102,25 +133,36 @@ private ReagentButton MakeReagentButton(string text, ChemMasterReagentAmount amo
         /// <param name="state">State data sent by the server.</param>
         public void UpdateState(BoundUserInterfaceState state)
         {
-            var castState = (ChemMasterBoundUserInterfaceState) state;
+            var castState = (ChemMasterBoundUserInterfaceState)state;
+
             if (castState.UpdateLabel)
                 LabelLine = GenerateLabel(castState);
-            UpdatePanelInfo(castState);
-
-            var output = castState.OutputContainerInfo;
 
+            // Ensure the Panel Info is updated, including UI elements for Buffer Volume, Output Container and so on
+            UpdatePanelInfo(castState);
+    
             BufferCurrentVolume.Text = $" {castState.BufferCurrentVolume?.Int() ?? 0}u";
-
+    
             InputEjectButton.Disabled = castState.InputContainerInfo is null;
-            OutputEjectButton.Disabled = output is null;
-            CreateBottleButton.Disabled = output?.Reagents == null;
-            CreatePillButton.Disabled = output?.Entities == null;
-
+            OutputEjectButton.Disabled = castState.OutputContainerInfo is null;
+            CreateBottleButton.Disabled = castState.OutputContainerInfo?.Reagents == null;
+            CreatePillButton.Disabled = castState.OutputContainerInfo?.Entities == null;
+            
+            UpdateDosageFields(castState);
+        }
+        
+        //assign default values for pill and bottle fields.
+        private void UpdateDosageFields(ChemMasterBoundUserInterfaceState castState)
+        {
+            var output = castState.OutputContainerInfo;
             var remainingCapacity = output is null ? 0 : (output.MaxVolume - output.CurrentVolume).Int();
             var holdsReagents = output?.Reagents != null;
             var pillNumberMax = holdsReagents ? 0 : remainingCapacity;
             var bottleAmountMax = holdsReagents ? remainingCapacity : 0;
+            var bufferVolume = castState.BufferCurrentVolume?.Int() ?? 0;
 
+            PillDosage.Value = (int)Math.Min(bufferVolume, castState.PillDosageLimit);
+            
             PillTypeButtons[castState.SelectedPillType].Pressed = true;
             PillNumber.IsValid = x => x >= 0 && x <= pillNumberMax;
             PillDosage.IsValid = x => x > 0 && x <= castState.PillDosageLimit;
@@ -130,8 +172,19 @@ public void UpdateState(BoundUserInterfaceState state)
                 PillNumber.Value = pillNumberMax;
             if (BottleDosage.Value > bottleAmountMax)
                 BottleDosage.Value = bottleAmountMax;
-        }
 
+            // Avoid division by zero
+            if (PillDosage.Value > 0)
+            {
+                PillNumber.Value = Math.Min(bufferVolume / PillDosage.Value, pillNumberMax);
+            }
+            else
+            {
+                PillNumber.Value = 0;
+            }
+
+            BottleDosage.Value = Math.Min(bottleAmountMax, bufferVolume);
+        }
         /// <summary>
         /// Generate a product label based on reagents in the buffer.
         /// </summary>
@@ -178,46 +231,23 @@ private void UpdatePanelInfo(ChemMasterBoundUserInterfaceState state)
             var bufferVol = new Label
             {
                 Text = $"{state.BufferCurrentVolume}u",
-                StyleClasses = {StyleNano.StyleClassLabelSecondaryColor}
+                StyleClasses = { StyleNano.StyleClassLabelSecondaryColor }
             };
             bufferHBox.AddChild(bufferVol);
 
+            // initialises rowCount to allow for striped rows
+
+            var rowCount = 0;
             foreach (var (reagent, quantity) in state.BufferReagents.OrderBy(x => x.Reagent.Prototype))
             {
-                // Try to get the prototype for the given reagent. This gives us its name.
-                _prototypeManager.TryIndex(reagent.Prototype, out ReagentPrototype? proto);
+                var reagentId = reagent;
+                _prototypeManager.TryIndex(reagentId.Prototype, out ReagentPrototype? proto);
                 var name = proto?.LocalizedName ?? Loc.GetString("chem-master-window-unknown-reagent-text");
-
-                if (proto != null)
-                {
-                    BufferInfo.Children.Add(new BoxContainer
-                    {
-                        Orientation = LayoutOrientation.Horizontal,
-                        Children =
-                        {
-                            new Label {Text = $"{name}: "},
-                            new Label
-                            {
-                                Text = $"{quantity}u",
-                                StyleClasses = {StyleNano.StyleClassLabelSecondaryColor}
-                            },
-
-                            // Padding
-                            new Control {HorizontalExpand = true},
-
-                            MakeReagentButton("1", ChemMasterReagentAmount.U1, reagent, true, StyleBase.ButtonOpenRight),
-                            MakeReagentButton("5", ChemMasterReagentAmount.U5, reagent, true, StyleBase.ButtonOpenBoth),
-                            MakeReagentButton("10", ChemMasterReagentAmount.U10, reagent, true, StyleBase.ButtonOpenBoth),
-                            MakeReagentButton("25", ChemMasterReagentAmount.U25, reagent, true, StyleBase.ButtonOpenBoth),
-                            MakeReagentButton("50", ChemMasterReagentAmount.U50, reagent, true, StyleBase.ButtonOpenBoth),
-                            MakeReagentButton("100", ChemMasterReagentAmount.U100, reagent, true, StyleBase.ButtonOpenBoth),
-                            MakeReagentButton(Loc.GetString("chem-master-window-buffer-all-amount"), ChemMasterReagentAmount.All, reagent, true, StyleBase.ButtonOpenLeft),
-                        }
-                    });
-                }
+                var reagentColor = proto?.SubstanceColor ?? default(Color);
+                BufferInfo.Children.Add(BuildReagentRow(reagentColor, rowCount++, name, reagentId, quantity, true, true));
             }
         }
-
+        
         private void BuildContainerUI(Control control, ContainerInfo? info, bool addReagentButtons)
         {
             control.Children.Clear();
@@ -228,104 +258,111 @@ private void BuildContainerUI(Control control, ContainerInfo? info, bool addReag
                 {
                     Text = Loc.GetString("chem-master-window-no-container-loaded-text")
                 });
+                return;
             }
-            else
+
+            // Name of the container and its fill status (Ex: 44/100u)
+            control.Children.Add(new BoxContainer
             {
-                // Name of the container and its fill status (Ex: 44/100u)
-                control.Children.Add(new BoxContainer
+                Orientation = LayoutOrientation.Horizontal,
+                Children =
                 {
-                    Orientation = LayoutOrientation.Horizontal,
-                    Children =
+                    new Label { Text = $"{info.DisplayName}: " },
+                    new Label
                     {
-                        new Label {Text = $"{info.DisplayName}: "},
-                        new Label
-                        {
-                            Text = $"{info.CurrentVolume}/{info.MaxVolume}",
-                            StyleClasses = {StyleNano.StyleClassLabelSecondaryColor}
-                        }
+                        Text = $"{info.CurrentVolume}/{info.MaxVolume}",
+                        StyleClasses = { StyleNano.StyleClassLabelSecondaryColor }
                     }
-                });
-
-                IEnumerable<(string Name, ReagentId Id, FixedPoint2 Quantity)> contents;
+                }
+            });
+            // Initialises rowCount to allow for striped rows
+            var rowCount = 0;
 
-                if (info.Entities != null)
+            // Handle entities if they are not null
+            if (info.Entities != null)
+            {
+                foreach (var (id, quantity) in info.Entities.Select(x => (x.Id, x.Quantity)))
                 {
-                    contents = info.Entities.Select(x => (x.Id, default(ReagentId), x.Quantity));
+                    control.Children.Add(BuildReagentRow(default(Color), rowCount++, id, default(ReagentId), quantity, false, addReagentButtons));
                 }
-                else if (info.Reagents != null)
-                {
-                    contents = info.Reagents.Select(x =>
-                        {
-                            _prototypeManager.TryIndex(x.Reagent.Prototype, out ReagentPrototype? proto);
-                            var name = proto?.LocalizedName
-                                       ?? Loc.GetString("chem-master-window-unknown-reagent-text");
+            }
 
-                            return (name, Id: x.Reagent, x.Quantity);
-                        })
-                        .OrderBy(r => r.Item1);
-                }
-                else
+            // Handle reagents if they are not null
+            if (info.Reagents != null)
+            {
+                foreach (var reagent in info.Reagents)
                 {
-                    return;
+                    _prototypeManager.TryIndex(reagent.Reagent.Prototype, out ReagentPrototype? proto);
+                    var name = proto?.LocalizedName ?? Loc.GetString("chem-master-window-unknown-reagent-text");
+                    var reagentColor = proto?.SubstanceColor ?? default(Color);
+        
+                    control.Children.Add(BuildReagentRow(reagentColor, rowCount++, name, reagent.Reagent, reagent.Quantity, false, addReagentButtons));
                 }
-
-
-                foreach (var (name, id, quantity) in contents)
+            }
+        }
+        /// <summary>
+        /// Take reagent/entity data and present rows, labels, and buttons appropriately. todo sprites?
+        /// </summary>
+        private Control BuildReagentRow(Color reagentColor, int rowCount, string name, ReagentId reagent, FixedPoint2 quantity, bool isBuffer, bool addReagentButtons)
+        {
+            //Colors rows and sets fallback for reagentcolor to the same as background, this will hide colorPanel for entities hopefully
+            var rowColor1 = Color.FromHex("#1B1B1E");
+            var rowColor2 = Color.FromHex("#202025");
+            var currentRowColor = (rowCount % 2 == 1) ? rowColor1 : rowColor2;
+            if ((reagentColor == default(Color))|(!addReagentButtons))
+            {
+                reagentColor = currentRowColor;
+            }
+            //this calls the separated button builder, and stores the return to render after labels
+            var reagentButtonConstructors = CreateReagentTransferButtons(reagent, isBuffer, addReagentButtons);
+            
+            // Create the row layout with the color panel
+            var rowContainer = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal,
+                Children =
                 {
-                    var inner = new BoxContainer
+                    new Label { Text = $"{name}: " },
+                    new Label
                     {
-                        Orientation = LayoutOrientation.Horizontal,
-                        Children =
-                        {
-                            new Label { Text = $"{name}: " },
-                            new Label
-                            {
-                                Text = $"{quantity}u",
-                                StyleClasses = { StyleNano.StyleClassLabelSecondaryColor },
-                            }
-                        }
-                    };
-
-                    if (addReagentButtons)
+                        Text = $"{quantity}u",
+                        StyleClasses = { StyleNano.StyleClassLabelSecondaryColor }
+                    },
+
+                    // Padding
+                    new Control { HorizontalExpand = true },
+                    // Colored panels for reagents
+                    new PanelContainer
                     {
-                        var cs = inner.Children;
-
-                        // Padding
-                        cs.Add(new Control { HorizontalExpand = true });
-
-                        cs.Add(MakeReagentButton(
-                            "1", ChemMasterReagentAmount.U1, id, false, StyleBase.ButtonOpenRight));
-                        cs.Add(MakeReagentButton(
-                            "5", ChemMasterReagentAmount.U5, id, false, StyleBase.ButtonOpenBoth));
-                        cs.Add(MakeReagentButton(
-                            "10", ChemMasterReagentAmount.U10, id, false, StyleBase.ButtonOpenBoth));
-                        cs.Add(MakeReagentButton(
-                            "25", ChemMasterReagentAmount.U25, id, false, StyleBase.ButtonOpenBoth));
-                        cs.Add(MakeReagentButton(
-                            "50", ChemMasterReagentAmount.U50, id, false, StyleBase.ButtonOpenBoth));
-                        cs.Add(MakeReagentButton(
-                            "100", ChemMasterReagentAmount.U100, id, false, StyleBase.ButtonOpenBoth));
-                        cs.Add(MakeReagentButton(
-                            Loc.GetString("chem-master-window-buffer-all-amount"),
-                            ChemMasterReagentAmount.All, id, false, StyleBase.ButtonOpenLeft));
+                        Name = "colorPanel",
+                        VerticalExpand = true,
+                        MinWidth = 4,
+                        PanelOverride = new StyleBoxFlat
+                        {
+                            BackgroundColor = reagentColor
+                        },
+                        Margin = new Thickness(0, 1)
                     }
-
-                    control.Children.Add(inner);
                 }
+            };
 
-            }
-        }
-
-        public String LabelLine
-        {
-            get
+            // Add the reagent buttons after the color panel
+            foreach (var reagentTransferButton in reagentButtonConstructors)
             {
-                return LabelLineEdit.Text;
+                rowContainer.AddChild(reagentTransferButton);
             }
-            set
+            //Apply panencontainer to allow for striped rows
+            return new PanelContainer
             {
-                LabelLineEdit.Text = value;
-            }
+                PanelOverride = new StyleBoxFlat(currentRowColor),
+                Children = { rowContainer }
+            };
+        }
+        
+        public string LabelLine
+        {
+            get => LabelLineEdit.Text;
+            set => LabelLineEdit.Text = value;
         }
     }
 

From 4e8bca41fcccbc27eb0986e507dab75f9af08333 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Sat, 31 Aug 2024 12:35:30 +1000
Subject: [PATCH 157/366] Fix test threading (#31669)

---
 .../Tests/Actions/ActionPvsDetachTest.cs                  | 8 +++++---
 Content.IntegrationTests/Tests/CargoTest.cs               | 2 ++
 .../Tests/Commands/SuicideCommandTests.cs                 | 6 +++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Content.IntegrationTests/Tests/Actions/ActionPvsDetachTest.cs b/Content.IntegrationTests/Tests/Actions/ActionPvsDetachTest.cs
index 45addff00bf..b07c352c81d 100644
--- a/Content.IntegrationTests/Tests/Actions/ActionPvsDetachTest.cs
+++ b/Content.IntegrationTests/Tests/Actions/ActionPvsDetachTest.cs
@@ -32,14 +32,16 @@ public async Task TestActionDetach()
         // PVS-detach action entities
         // We do this by just giving them the ghost layer
         var visSys = server.System<VisibilitySystem>();
-        server.Post(() =>
+
+        await server.WaitPost(() =>
         {
             var enumerator = server.Transform(ent).ChildEnumerator;
             while (enumerator.MoveNext(out var child))
             {
-                visSys.AddLayer(child, (int) VisibilityFlags.Ghost);
+                visSys.AddLayer(child, (int)VisibilityFlags.Ghost);
             }
         });
+
         await pair.RunTicksSync(5);
 
         // Client's actions have left been detached / are out of view, but action comp state has not changed
@@ -47,7 +49,7 @@ public async Task TestActionDetach()
         Assert.That(cSys.GetActions(cEnt).Count(), Is.EqualTo(initActions));
 
         // Re-enter PVS view
-        server.Post(() =>
+        await server.WaitPost(() =>
         {
             var enumerator = server.Transform(ent).ChildEnumerator;
             while (enumerator.MoveNext(out var child))
diff --git a/Content.IntegrationTests/Tests/CargoTest.cs b/Content.IntegrationTests/Tests/CargoTest.cs
index 99160df3c66..9ae620e324c 100644
--- a/Content.IntegrationTests/Tests/CargoTest.cs
+++ b/Content.IntegrationTests/Tests/CargoTest.cs
@@ -180,6 +180,8 @@ await server.WaitAssertion(() =>
         {
             var priceSystem = entManager.System<PricingSystem>();
 
+        await server.WaitAssertion(() =>
+        {
             var ent = entManager.SpawnEntity("StackEnt", MapCoordinates.Nullspace);
             var price = priceSystem.GetPrice(ent);
             Assert.That(price, Is.EqualTo(100.0));
diff --git a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
index 540e86c650a..e1eef2be4a9 100644
--- a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
+++ b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
@@ -143,10 +143,10 @@ await server.WaitPost(() =>
             mobStateComp = entManager.GetComponent<MobStateComponent>(player);
             mobThresholdsComp = entManager.GetComponent<MobThresholdsComponent>(player);
             damageableComp = entManager.GetComponent<DamageableComponent>(player);
-        });
 
-        if (protoMan.TryIndex<DamageTypePrototype>("Slash", out var slashProto))
-            damageableSystem.TryChangeDamage(player, new DamageSpecifier(slashProto, FixedPoint2.New(46.5)));
+            if (protoMan.TryIndex<DamageTypePrototype>("Slash", out var slashProto))
+                damageableSystem.TryChangeDamage(player, new DamageSpecifier(slashProto, FixedPoint2.New(46.5)));
+        });
 
         // Check that running the suicide command kills the player
         // and properly ghosts them without them being able to return to their body

From f9f8a79d85507f089da3b45b747825f72093540c Mon Sep 17 00:00:00 2001
From: Errant <35878406+Errant-4@users.noreply.github.com>
Date: Fri, 11 Oct 2024 21:17:01 +0200
Subject: [PATCH 158/366] Fix random test fail in DeleteAllThenGhost (#32753)

It's simple. We kill the heisentest
---
 Content.Shared/Roles/SharedRoleSystem.cs | 31 ++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/Content.Shared/Roles/SharedRoleSystem.cs b/Content.Shared/Roles/SharedRoleSystem.cs
index d5ac2e5923a..c0d015ae20a 100644
--- a/Content.Shared/Roles/SharedRoleSystem.cs
+++ b/Content.Shared/Roles/SharedRoleSystem.cs
@@ -242,6 +242,37 @@ public bool IsAntagonistRole<T>()
     public bool IsAntagonistRole(Type component)
     {
         return _antagTypes.Contains(component);
+        }
+
+        return CheckAntagonistStatus(mindId.Value).Item2;
+    }
+
+   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);
+       }
+
+        var antagonist = false;
+        var exclusiveAntag = false;
+        foreach (var role in mind.MindRoles)
+        {
+            if (!TryComp<MindRoleComponent>(role, out var roleComp))
+            {
+                //If this ever shows up outside of an integration test, then we need to look into this further.
+                Log.Warning($"Mind Role Entity {role} does not have MindRoleComponent!");
+                continue;
+            }
+
+            if (roleComp.Antag || exclusiveAntag)
+                antagonist = true;
+            if (roleComp.ExclusiveAntag)
+                exclusiveAntag = true;
+        }
+
+        return (antagonist, exclusiveAntag);
     }
 
     /// <summary>

From 2905bae9cfb9a07db3e369ca526f3fbb22e18078 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 18:08:09 -0400
Subject: [PATCH 159/366] integration test fails

---
 .../Lobby/UI/HumanoidProfileEditor.xaml.cs    |  2 +-
 Content.Client/Nyanotrasen/Mail/MailSystem.cs |  2 +-
 .../Tests/Commands/SuicideCommandTests.cs     | 10 ++++-
 .../NPC/Roboisseur/RoboisseurComponent.cs     |  2 +-
 .../BloodCultist/BloodCultLeaderComponent.cs  |  2 +-
 .../BloodCultist/BloodCultistComponent.cs     |  2 +-
 .../Constructs/ConstructComponent.cs          |  2 +-
 .../station-events/events/vent-critters.ftl   |  2 +
 .../Objects/Devices/Medical/portafib.yml      | 40 +------------------
 .../Prototypes/Roles/Jobs/Command/captain.yml |  2 +-
 10 files changed, 18 insertions(+), 48 deletions(-)

diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index b2187cef626..3924138c4c5 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -771,7 +771,7 @@ public void RefreshJobs()
                         TextureScale = new(2, 2),
                         VerticalAlignment = VAlignment.Center
                     };
-                    var jobIcon = _prototypeManager.Index<StatusIconPrototype>(job.Icon);
+                    var jobIcon = _prototypeManager.Index<JobIconPrototype>(job.Icon);
                     icon.Texture = jobIcon.Icon.Frame0();
                     selector.Setup(items, job.LocalizedName, 200, job.LocalizedDescription, icon);
 
diff --git a/Content.Client/Nyanotrasen/Mail/MailSystem.cs b/Content.Client/Nyanotrasen/Mail/MailSystem.cs
index de63d74099b..5827aaa473c 100644
--- a/Content.Client/Nyanotrasen/Mail/MailSystem.cs
+++ b/Content.Client/Nyanotrasen/Mail/MailSystem.cs
@@ -40,7 +40,7 @@ protected override void OnAppearanceChange(EntityUid uid, MailComponent componen
         if (string.IsNullOrEmpty(job))
             job = "JobIconUnknown";
 
-        if (!_prototypeManager.TryIndex<StatusIconPrototype>(job, out var icon))
+        if (!_prototypeManager.TryIndex<JobIconPrototype>(job, out var icon))
         {
             args.Sprite.LayerSetTexture(MailVisualLayers.JobStamp, _spriteSystem.Frame0(_prototypeManager.Index("JobIconUnknown")));
             return;
diff --git a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
index e1eef2be4a9..18e4c6b16e2 100644
--- a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
+++ b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
@@ -168,7 +168,7 @@ await server.WaitAssertion(() =>
         await pair.CleanReturnAsync();
     }
 
-        /// <summary>
+    /// <summary>
     /// Run the suicide command in the console
     /// Should only ghost the player but not kill them
     /// </summary>
@@ -241,6 +241,7 @@ public async Task TestSuicideByHeldItem()
         var mindSystem = entManager.System<SharedMindSystem>();
         var mobStateSystem = entManager.System<MobStateSystem>();
         var transformSystem = entManager.System<TransformSystem>();
+        var damageableSystem = entManager.System<DamageableSystem>();
 
         // We need to know the player and whether they can be hurt, killed, and whether they have a mind
         var player = playerMan.Sessions.First().AttachedEntity!.Value;
@@ -276,6 +277,8 @@ await server.WaitPost(() =>
         // and that all the damage is concentrated in the Slash category
         await server.WaitAssertion(() =>
         {
+            // Heal all damage first (possible low pressure damage taken)
+            damageableSystem.SetAllDamage(player, damageableComp, 0);
             consoleHost.GetSessionShell(playerMan.Sessions.First()).ExecuteCommand("suicide");
             var lethalDamageThreshold = mobThresholdsComp.Thresholds.Keys.Last();
 
@@ -313,6 +316,7 @@ public async Task TestSuicideByHeldItemSpreadDamage()
         var mindSystem = entManager.System<SharedMindSystem>();
         var mobStateSystem = entManager.System<MobStateSystem>();
         var transformSystem = entManager.System<TransformSystem>();
+        var damageableSystem = entManager.System<DamageableSystem>();
 
         // We need to know the player and whether they can be hurt, killed, and whether they have a mind
         var player = playerMan.Sessions.First().AttachedEntity!.Value;
@@ -348,6 +352,8 @@ await server.WaitPost(() =>
         // and that slash damage is split in half
         await server.WaitAssertion(() =>
         {
+            // Heal all damage first (possible low pressure damage taken)
+            damageableSystem.SetAllDamage(player, damageableComp, 0);
             consoleHost.GetSessionShell(playerMan.Sessions.First()).ExecuteCommand("suicide");
             var lethalDamageThreshold = mobThresholdsComp.Thresholds.Keys.Last();
 
@@ -362,4 +368,4 @@ await server.WaitAssertion(() =>
 
         await pair.CleanReturnAsync();
     }
-}
+}
\ No newline at end of file
diff --git a/Content.Server/DeltaV/NPC/Roboisseur/RoboisseurComponent.cs b/Content.Server/DeltaV/NPC/Roboisseur/RoboisseurComponent.cs
index 0e0d2e4e683..7c29ae1ccb9 100644
--- a/Content.Server/DeltaV/NPC/Roboisseur/RoboisseurComponent.cs
+++ b/Content.Server/DeltaV/NPC/Roboisseur/RoboisseurComponent.cs
@@ -159,7 +159,7 @@ public sealed partial class RoboisseurComponent : Component
             "FoodBurgerHuman",
             "FoodNoodlesBoiled",
             "FoodMothOatStew",
-            "FoodMeatLizardtailKebab",
+            "FoodKebabSkewer",
             "FoodSoupTomato",
             "FoodDonkpocketBerryWarm",
             "FoodBreadButteredToast",
diff --git a/Content.Shared/WhiteDream/BloodCult/BloodCultist/BloodCultLeaderComponent.cs b/Content.Shared/WhiteDream/BloodCult/BloodCultist/BloodCultLeaderComponent.cs
index 69e9194229f..34e53efdb8d 100644
--- a/Content.Shared/WhiteDream/BloodCult/BloodCultist/BloodCultLeaderComponent.cs
+++ b/Content.Shared/WhiteDream/BloodCult/BloodCultist/BloodCultLeaderComponent.cs
@@ -9,7 +9,7 @@ namespace Content.Shared.WhiteDream.BloodCult.BloodCultist;
 public sealed partial class BloodCultLeaderComponent : Component
 {
     [DataField]
-    public ProtoId<StatusIconPrototype> StatusIcon { get; set; } = "BloodCultLeader";
+    public ProtoId<FactionIconPrototype> StatusIcon { get; set; } = "BloodCultLeader";
 
     [DataField]
     public bool IconVisibleToGhost { get; set; } = true;
diff --git a/Content.Shared/WhiteDream/BloodCult/BloodCultist/BloodCultistComponent.cs b/Content.Shared/WhiteDream/BloodCult/BloodCultist/BloodCultistComponent.cs
index bb1cea074c3..d9ad12bbcea 100644
--- a/Content.Shared/WhiteDream/BloodCult/BloodCultist/BloodCultistComponent.cs
+++ b/Content.Shared/WhiteDream/BloodCult/BloodCultist/BloodCultistComponent.cs
@@ -19,7 +19,7 @@ public sealed partial class BloodCultistComponent : Component
     public int MaximumAllowedEmpowers = 4;
 
     [DataField]
-    public ProtoId<StatusIconPrototype> StatusIcon { get; set; } = "BloodCultMember";
+    public ProtoId<FactionIconPrototype> StatusIcon { get; set; } = "BloodCultMember";
 
     [DataField]
     public bool IconVisibleToGhost { get; set; } = true;
diff --git a/Content.Shared/WhiteDream/BloodCult/Constructs/ConstructComponent.cs b/Content.Shared/WhiteDream/BloodCult/Constructs/ConstructComponent.cs
index 6c226b92d65..81921cbe79b 100644
--- a/Content.Shared/WhiteDream/BloodCult/Constructs/ConstructComponent.cs
+++ b/Content.Shared/WhiteDream/BloodCult/Constructs/ConstructComponent.cs
@@ -17,7 +17,7 @@ public sealed partial class ConstructComponent : Component
     public float TransformDelay = 1;
 
     [DataField]
-    public ProtoId<StatusIconPrototype> StatusIcon { get; set; } = "BloodCultMember";
+    public ProtoId<FactionIconPrototype> StatusIcon { get; set; } = "BloodCultMember";
 
     [DataField]
     public bool IconVisibleToGhost { get; set; } = true;
diff --git a/Resources/Locale/en-US/station-events/events/vent-critters.ftl b/Resources/Locale/en-US/station-events/events/vent-critters.ftl
index d99906be4a3..31cac5f73ac 100644
--- a/Resources/Locale/en-US/station-events/events/vent-critters.ftl
+++ b/Resources/Locale/en-US/station-events/events/vent-critters.ftl
@@ -1,4 +1,6 @@
 station-event-cockroach-migration-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity.
+station-event-snail-migration-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity.
+station-event-snail-migration-low-pop-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity.
 station-event-slimes-spawn-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity.
 station-event-vent-critters-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity.
 station-event-spider-spawn-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity.
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Medical/portafib.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Medical/portafib.yml
index 0f3095663d3..31ac4e0c179 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Medical/portafib.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Medical/portafib.yml
@@ -1,55 +1,17 @@
 - type: entity
   id: Portafib
-  parent: [ BaseItem, PowerCellSlotSmallItem ]
+  parent: Defibrillator
   name: portafib
   description: Less weight, same great ZZZAP!
   components:
   - type: Sprite
     sprite: DeltaV/Objects/Medical/portafib.rsi
-    layers:
-    - state: icon
-    - state: screen
-      map: [ "enum.ToggleVisuals.Layer" ]
-      visible: false
-      shader: unshaded
-    - state: ready
-      map: ["enum.PowerDeviceVisualLayers.Powered"]
-      shader: unshaded
-  - type: GenericVisualizer
-    visuals:
-      enum.ToggleVisuals.Toggled:
-        enum.ToggleVisuals.Layer:
-          True: { visible: true }
-          False: { visible: false }
-      enum.DefibrillatorVisuals.Ready:
-        enum.PowerDeviceVisualLayers.Powered:
-          True: { visible: true }
-          False: { visible: false }
   - type: Item
     size: Normal
-  - type: MultiHandedItem
-  - type: Speech
-  - type: Defibrillator
-    zapHeal:
-      types:
-        Asphyxiation: -40
   - type: PowerCellDraw
     useRate: 140
-  - type: Appearance
-  - type: DoAfter
-  - type: UseDelay
   - type: StaticPrice
     price: 100
-  - type: GuideHelp
-    guides:
-    - Medical Doctor
-  - type: DamageOtherOnHit
-    damage:
-      types:
-        Blunt: 6.5
-    staminaCost: 8
-    soundHit:
-      path: /Audio/Weapons/smash.ogg
 
 - type: entity
   id: PortafibEmpty
diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
index 7e4d4e19a9e..30b9a69d12f 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
@@ -27,7 +27,7 @@
     - !type:CharacterWhitelistRequirement
   weight: 20
   startingGear: CaptainGear
-  icon: "JobIconCaptain"
+  icon: JobIconCaptain
   requireAdminNotify: true
   joinNotifyCrew: true
   supervisors: job-supervisors-centcom

From 430a8c68624927601249e37ab6a0a5a359a02e6d Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 18:11:34 -0400
Subject: [PATCH 160/366] build fail...

---
 Content.IntegrationTests/Tests/CargoTest.cs | 81 ++++++++++++++++++++-
 1 file changed, 79 insertions(+), 2 deletions(-)

diff --git a/Content.IntegrationTests/Tests/CargoTest.cs b/Content.IntegrationTests/Tests/CargoTest.cs
index 9ae620e324c..37fd3a80f9a 100644
--- a/Content.IntegrationTests/Tests/CargoTest.cs
+++ b/Content.IntegrationTests/Tests/CargoTest.cs
@@ -3,8 +3,13 @@
 using System.Numerics;
 using Content.Server.Cargo.Components;
 using Content.Server.Cargo.Systems;
+using Content.Server.Nutrition.Components;
+using Content.Server.Nutrition.EntitySystems;
 using Content.Shared.Cargo.Prototypes;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Stacks;
+using Content.Shared.Tag;
+using Content.Shared.Whitelist;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
@@ -149,6 +154,80 @@ await server.WaitAssertion(() =>
         await pair.CleanReturnAsync();
     }
 
+    /// <summary>
+    /// Tests to see if any items that are valid for cargo bounties can be sliced into items that
+    /// are also valid for the same bounty entry.
+    /// </summary>
+    [Test]
+    public async Task NoSliceableBountyArbitrageTest()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var server = pair.Server;
+
+        var testMap = await pair.CreateTestMap();
+
+        var entManager = server.ResolveDependency<IEntityManager>();
+        var mapManager = server.ResolveDependency<IMapManager>();
+        var protoManager = server.ResolveDependency<IPrototypeManager>();
+        var componentFactory = server.ResolveDependency<IComponentFactory>();
+        var whitelist = entManager.System<EntityWhitelistSystem>();
+        var cargo = entManager.System<CargoSystem>();
+        var sliceableSys = entManager.System<SliceableFoodSystem>();
+
+        var bounties = protoManager.EnumeratePrototypes<CargoBountyPrototype>().ToList();
+
+        await server.WaitAssertion(() =>
+        {
+            var mapId = testMap.MapId;
+            var grid = mapManager.CreateGridEntity(mapId);
+            var coord = new EntityCoordinates(grid.Owner, 0, 0);
+
+            var sliceableEntityProtos = protoManager.EnumeratePrototypes<EntityPrototype>()
+                .Where(p => !p.Abstract)
+                .Where(p => !pair.IsTestPrototype(p))
+                .Where(p => p.TryGetComponent<SliceableFoodComponent>(out _, componentFactory))
+                .Select(p => p.ID)
+                .ToList();
+
+            foreach (var proto in sliceableEntityProtos)
+            {
+                var ent = entManager.SpawnEntity(proto, coord);
+                var sliceable = entManager.GetComponent<SliceableFoodComponent>(ent);
+
+                // Check each bounty
+                foreach (var bounty in bounties)
+                {
+                    // Check each entry in the bounty
+                    foreach (var entry in bounty.Entries)
+                    {
+                        // See if the entity counts as part of this bounty entry
+                        if (!cargo.IsValidBountyEntry(ent, entry))
+                            continue;
+
+                        // Spawn a slice
+                        var slice = entManager.SpawnEntity(sliceable.Slice, coord);
+
+                        // See if the slice also counts for this bounty entry
+                        if (!cargo.IsValidBountyEntry(slice, entry))
+                        {
+                            entManager.DeleteEntity(slice);
+                            continue;
+                        }
+
+                        entManager.DeleteEntity(slice);
+
+                        // If for some reason it can only make one slice, that's okay, I guess
+                        Assert.That(sliceable.TotalCount, Is.EqualTo(1), $"{proto} counts as part of cargo bounty {bounty.ID} and slices into {sliceable.TotalCount} slices which count for the same bounty!");
+                    }
+                }
+
+                entManager.DeleteEntity(ent);
+            }
+            mapManager.DeleteMap(mapId);
+        });
+
+        await pair.CleanReturnAsync();
+    }
 
     [TestPrototypes]
     private const string StackProto = @"
@@ -180,8 +259,6 @@ await server.WaitAssertion(() =>
         {
             var priceSystem = entManager.System<PricingSystem>();
 
-        await server.WaitAssertion(() =>
-        {
             var ent = entManager.SpawnEntity("StackEnt", MapCoordinates.Nullspace);
             var price = priceSystem.GetPrice(ent);
             Assert.That(price, Is.EqualTo(100.0));

From ed68f2d2fb8a31c1a431e50bcd6aa4177ac2d28f Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Mon, 3 Jun 2024 12:24:32 -0400
Subject: [PATCH 161/366] Add a test for sliceable cargo bounty exploits
 (#28357)

---
 .../Cargo/Systems/CargoSystem.Bounty.cs         | 17 ++++++++++++++++-
 .../Prototypes/Catalog/Bounties/bounties.yml    |  6 ++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
index d9e0c9fe157..743b90f5647 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
@@ -300,6 +300,21 @@ public bool IsBountyComplete(EntityUid container, IEnumerable<CargoBountyItemEnt
         return IsBountyComplete(GetBountyEntities(container), entries, out bountyEntities);
     }
 
+    /// <summary>
+    /// Determines whether the <paramref name="entity"/> meets the criteria for the bounty <paramref name="entry"/>.
+    /// </summary>
+    /// <returns>true if <paramref name="entity"/> is a valid item for the bounty entry, otherwise false</returns>
+    public bool IsValidBountyEntry(EntityUid entity, CargoBountyItemEntry entry)
+    {
+        if (!_whitelistSys.IsValid(entry.Whitelist, entity))
+            return false;
+
+        if (entry.Blacklist != null && _whitelistSys.IsValid(entry.Blacklist, entity))
+            return false;
+
+        return true;
+    }
+
     public bool IsBountyComplete(HashSet<EntityUid> entities, IEnumerable<CargoBountyItemEntry> entries, out HashSet<EntityUid> bountyEntities)
     {
         bountyEntities = new();
@@ -313,7 +328,7 @@ public bool IsBountyComplete(HashSet<EntityUid> entities, IEnumerable<CargoBount
             var temp = new HashSet<EntityUid>();
             foreach (var entity in entities)
             {
-                if (!_whitelistSys.IsValid(entry.Whitelist, entity) || (entry.Blacklist != null && _whitelistSys.IsValid(entry.Blacklist, entity)))
+                if (!IsValidBountyEntry(entity, entry))
                     continue;
 
                 count += _stackQuery.CompOrNull(entity)?.Count ?? 1;
diff --git a/Resources/Prototypes/Catalog/Bounties/bounties.yml b/Resources/Prototypes/Catalog/Bounties/bounties.yml
index bedfe442872..08bb2a14225 100644
--- a/Resources/Prototypes/Catalog/Bounties/bounties.yml
+++ b/Resources/Prototypes/Catalog/Bounties/bounties.yml
@@ -42,6 +42,9 @@
     whitelist:
       tags:
       - Bread
+    blacklist:
+      tags:
+      - Slice
 
 - type: cargoBounty
   id: BountyCarrot
@@ -533,6 +536,9 @@
     whitelist:
       tags:
       - Meat
+    blacklist:
+      components:
+      - SliceableFood
 
 - type: cargoBounty
   id: BountyFruit

From e01d6bad384b78b90e6405035c86e0a2e92e92da Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 18:14:01 -0400
Subject: [PATCH 162/366] more fixes

---
 Content.Shared/Roles/SharedRoleSystem.cs | 31 ------------------------
 1 file changed, 31 deletions(-)

diff --git a/Content.Shared/Roles/SharedRoleSystem.cs b/Content.Shared/Roles/SharedRoleSystem.cs
index c0d015ae20a..d5ac2e5923a 100644
--- a/Content.Shared/Roles/SharedRoleSystem.cs
+++ b/Content.Shared/Roles/SharedRoleSystem.cs
@@ -242,37 +242,6 @@ public bool IsAntagonistRole<T>()
     public bool IsAntagonistRole(Type component)
     {
         return _antagTypes.Contains(component);
-        }
-
-        return CheckAntagonistStatus(mindId.Value).Item2;
-    }
-
-   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);
-       }
-
-        var antagonist = false;
-        var exclusiveAntag = false;
-        foreach (var role in mind.MindRoles)
-        {
-            if (!TryComp<MindRoleComponent>(role, out var roleComp))
-            {
-                //If this ever shows up outside of an integration test, then we need to look into this further.
-                Log.Warning($"Mind Role Entity {role} does not have MindRoleComponent!");
-                continue;
-            }
-
-            if (roleComp.Antag || exclusiveAntag)
-                antagonist = true;
-            if (roleComp.ExclusiveAntag)
-                exclusiveAntag = true;
-        }
-
-        return (antagonist, exclusiveAntag);
     }
 
     /// <summary>

From 76cdddb3b5165d1c0454509e7e0a3d84b16a12da Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 18:26:59 -0400
Subject: [PATCH 163/366] use IsBlacklistPass

---
 Content.Server/Cargo/Systems/CargoSystem.Bounty.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
index 743b90f5647..6723b423c6f 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
@@ -306,10 +306,10 @@ public bool IsBountyComplete(EntityUid container, IEnumerable<CargoBountyItemEnt
     /// <returns>true if <paramref name="entity"/> is a valid item for the bounty entry, otherwise false</returns>
     public bool IsValidBountyEntry(EntityUid entity, CargoBountyItemEntry entry)
     {
-        if (!_whitelistSys.IsValid(entry.Whitelist, entity))
+        if (!_whitelistSys.IsWhitelistPass(entry.Whitelist, entity))
             return false;
 
-        if (entry.Blacklist != null && _whitelistSys.IsValid(entry.Blacklist, entity))
+        if (entry.Blacklist != null && _whitelistSys.IsBlacklistPass(entry.Blacklist, entity))
             return false;
 
         return true;

From 06d8918a1c5f08eb84b3cfeafa86de789eac510e Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 18:28:00 -0400
Subject: [PATCH 164/366] Sliceable

---
 .../DeltaV/Entities/Objects/Consumable/Food/Baked/pie.yml        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Baked/pie.yml
index d86b5142dbf..b83cf87fb26 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Baked/pie.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Baked/pie.yml
@@ -36,4 +36,5 @@
     tags:
     - Fruit
     - Pie
+    - Slice
 # Tastes like pie, pumpkin.

From d2ed345407f940def220804a3f022e5dfb5fff85 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 18:36:12 -0400
Subject: [PATCH 165/366] Fix slices

---
 .../Entities/Objects/Consumable/Food/Baked/pizza.yml            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/Baked/pizza.yml
index 8c96635b06b..010a98e157e 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/Baked/pizza.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/Baked/pizza.yml
@@ -223,6 +223,7 @@
     tags:
     - Pizza
     - Fruit
+    - Slice
 # Tastes like crust, pesto, cheese
 
 - type: entity
@@ -286,4 +287,5 @@
     tags:
     - Pizza
     - ClothMade
+    - Slice
 # Tastes like crust, cotton, cheese

From bd3206da3e682d1ed77718d2125a7524e539fbb8 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Wed, 14 Feb 2024 18:14:40 +1100
Subject: [PATCH 166/366] Fix tests?

---
 Resources/Prototypes/Entities/Objects/Materials/materials.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index 75a02f05a49..56f872bc154 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -132,9 +132,6 @@
       - ClothMade
       - Gauze
       - RawMaterial
-  - type: Construction
-    graph: WebObjects # not sure if I should either keep this here or just make another prototype. Will keep it here just in case.
-    node: cloth
 
 - type: entity
   parent: MaterialCloth

From b4f70933c03189eda75db99f551b602372fe5985 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 18:49:13 -0400
Subject: [PATCH 167/366] hm

---
 Content.Server/DeltaV/NPC/Roboisseur/RoboisseurComponent.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Content.Server/DeltaV/NPC/Roboisseur/RoboisseurComponent.cs b/Content.Server/DeltaV/NPC/Roboisseur/RoboisseurComponent.cs
index 7c29ae1ccb9..075afeb7895 100644
--- a/Content.Server/DeltaV/NPC/Roboisseur/RoboisseurComponent.cs
+++ b/Content.Server/DeltaV/NPC/Roboisseur/RoboisseurComponent.cs
@@ -167,7 +167,6 @@ public sealed partial class RoboisseurComponent : Component
             "LeavesTobaccoDried",
             "FoodSoupEyeball",
             "FoodMothKachumbariSalad",
-            "FoodMeatHumanKebab",
             "FoodMeatRatdoubleKebab",
             "FoodBurgerCorgi",
             "FoodBreadPlain",

From 4a6e365c1e030d62fc8fc244dc7a91f2e8229d17 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 18:55:56 -0400
Subject: [PATCH 168/366] Yeag!

---
 .../Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml | 2 ++
 .../Nyanotrasen/Entities/Markers/Spawners/ghost_roles.yml       | 1 +
 2 files changed, 3 insertions(+)

diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml
index f313d30f8f0..4bcca6ca675 100644
--- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml
@@ -47,6 +47,7 @@
       - state: green
       - sprite: Structures/Wallmounts/signs.rsi
         state: radiation
+  - type: GhostRoleAntagSpawner
 
 - type: entity
   parent: MarkerBase
@@ -58,6 +59,7 @@
     description: ghost-role-information-paradox-anomaly-description
     rules: ghost-role-information-paradox-anomaly-rules
   - type: ParadoxAnomalySpawner
+  - type: GhostRoleAntagSpawner
   - type: Sprite
     sprite: Markers/jobs.rsi
     layers:
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/ghost_roles.yml
index d0207e362e3..4ddfc9bcd4d 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/ghost_roles.yml
@@ -26,6 +26,7 @@
   components:
   # - type: GhostRoleMobSpawner
   #   prototype: MobHumanFugitive # Todo
+  - type: GhostRoleAntagSpawner
   - type: GhostRole
     name: Fugitive
     description: You're an escaped prisoner. Make it out alive.

From 72ddf8066d2e76e170b4ef6a99b16e9ecb5e4a08 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 16 Dec 2024 19:03:00 -0400
Subject: [PATCH 169/366] construction is weird

---
 Resources/Prototypes/Entities/Objects/Materials/materials.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index 56f872bc154..75a02f05a49 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -132,6 +132,9 @@
       - ClothMade
       - Gauze
       - RawMaterial
+  - type: Construction
+    graph: WebObjects # not sure if I should either keep this here or just make another prototype. Will keep it here just in case.
+    node: cloth
 
 - type: entity
   parent: MaterialCloth

From b96307e855aa065dffff28be5ee0dca2f26405f6 Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Thu, 11 Jul 2024 02:14:34 -0400
Subject: [PATCH 170/366] Fix AtmosDeviceSystem debug assert Heisenbug (#29752)

Fix AtmosDeviceSystem debug assertion Heisenbug
---
 .../Tests/Atmos/GridJoinTest.cs               | 53 +++++++++++++++++++
 .../Piping/EntitySystems/AtmosDeviceSystem.cs | 11 +++-
 2 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 Content.IntegrationTests/Tests/Atmos/GridJoinTest.cs

diff --git a/Content.IntegrationTests/Tests/Atmos/GridJoinTest.cs b/Content.IntegrationTests/Tests/Atmos/GridJoinTest.cs
new file mode 100644
index 00000000000..3a1ec7fd40e
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Atmos/GridJoinTest.cs
@@ -0,0 +1,53 @@
+using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
+using Content.Server.Atmos.Piping.Components;
+using Content.Server.Atmos.Piping.EntitySystems;
+using Robust.Shared.GameObjects;
+
+namespace Content.IntegrationTests.Tests.Atmos;
+
+[TestFixture]
+public sealed class GridJoinTest
+{
+    private const string CanisterProtoId = "AirCanister";
+
+    [Test]
+    public async Task TestGridJoinAtmosphere()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var server = pair.Server;
+
+        var entMan = server.EntMan;
+        var protoMan = server.ProtoMan;
+        var atmosSystem = entMan.System<AtmosphereSystem>();
+        var atmosDeviceSystem = entMan.System<AtmosDeviceSystem>();
+        var transformSystem = entMan.System<SharedTransformSystem>();
+
+        var testMap = await pair.CreateTestMap();
+
+        await server.WaitPost(() =>
+        {
+            // Spawn an atmos device on the grid
+            var canister = entMan.Spawn(CanisterProtoId);
+            transformSystem.SetCoordinates(canister, testMap.GridCoords);
+            var deviceComp = entMan.GetComponent<AtmosDeviceComponent>(canister);
+            var canisterEnt = (canister, deviceComp);
+
+            // Make sure the canister is tracked as an off-grid device
+            Assert.That(atmosDeviceSystem.IsJoinedOffGrid(canisterEnt));
+
+            // Add an atmosphere to the grid
+            entMan.AddComponent<GridAtmosphereComponent>(testMap.Grid);
+
+            // Force AtmosDeviceSystem to update off-grid devices
+            // This means the canister is now considered on-grid,
+            // but it's still tracked as off-grid!
+            Assert.DoesNotThrow(() => atmosDeviceSystem.Update(atmosSystem.AtmosTime));
+
+            // Make sure that the canister is now properly tracked as on-grid
+            Assert.That(atmosDeviceSystem.IsJoinedOffGrid(canisterEnt), Is.False);
+        });
+
+        await pair.CleanReturnAsync();
+    }
+}
diff --git a/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs
index 3c73a8f64ee..f932ef36208 100644
--- a/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs
+++ b/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs
@@ -132,10 +132,19 @@ public override void Update(float frameTime)
             var ev = new AtmosDeviceUpdateEvent(_atmosphereSystem.AtmosTime, null, null);
             foreach (var device in _joinedDevices)
             {
-                DebugTools.Assert(!HasComp<GridAtmosphereComponent>(Transform(device).GridUid));
+                var deviceGrid = Transform(device).GridUid;
+                if (HasComp<GridAtmosphereComponent>(deviceGrid))
+                {
+                    RejoinAtmosphere(device);
+                }
                 RaiseLocalEvent(device, ref ev);
                 device.Comp.LastProcess = time;
             }
         }
+
+        public bool IsJoinedOffGrid(Entity<AtmosDeviceComponent> device)
+        {
+            return _joinedDevices.Contains(device);
+        }
     }
 }

From bbb1b85453144ab37d6d576367526209b00cce1a Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Sat, 12 Oct 2024 20:54:48 +0200
Subject: [PATCH 171/366] Fix SpawnAndDeleteAllEntitiesInTheSameSpot heisentest
 (#32330)

What happened was that the new tech anomaly randomly triggered a signal sink on the portable generator, which is currently broken and throws an error if the that sink is activated.

The resolve needed logMissing = false because it does not expect the ActiveGeneratorRevvingComponent to exist.
---
 .../Power/Generator/ActiveGeneratorRevvingComponent.cs        | 2 +-
 .../Power/Generator/ActiveGeneratorRevvingSystem.cs           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Content.Shared/Power/Generator/ActiveGeneratorRevvingComponent.cs b/Content.Shared/Power/Generator/ActiveGeneratorRevvingComponent.cs
index 25f97dc15a0..fde0319a37d 100644
--- a/Content.Shared/Power/Generator/ActiveGeneratorRevvingComponent.cs
+++ b/Content.Shared/Power/Generator/ActiveGeneratorRevvingComponent.cs
@@ -3,7 +3,7 @@
 namespace Content.Shared.Power.Generator;
 
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class ActiveGeneratorRevvingComponent: Component
+public sealed partial class ActiveGeneratorRevvingComponent : Component
 {
     [DataField, ViewVariables(VVAccess.ReadOnly), AutoNetworkedField]
     public TimeSpan CurrentTime = TimeSpan.Zero;
diff --git a/Content.Shared/Power/Generator/ActiveGeneratorRevvingSystem.cs b/Content.Shared/Power/Generator/ActiveGeneratorRevvingSystem.cs
index 9cd11ae6045..459b2fd78de 100644
--- a/Content.Shared/Power/Generator/ActiveGeneratorRevvingSystem.cs
+++ b/Content.Shared/Power/Generator/ActiveGeneratorRevvingSystem.cs
@@ -1,6 +1,6 @@
 namespace Content.Shared.Power.Generator;
 
-public sealed class ActiveGeneratorRevvingSystem: EntitySystem
+public sealed class ActiveGeneratorRevvingSystem : EntitySystem
 {
     public override void Initialize()
     {
@@ -25,7 +25,7 @@ private void OnAnchorStateChanged(EntityUid uid, ActiveGeneratorRevvingComponent
     /// <param name="component">ActiveGeneratorRevvingComponent of the generator entity.</param>
     public void StartAutoRevving(EntityUid uid, ActiveGeneratorRevvingComponent? component = null)
     {
-        if (Resolve(uid, ref component))
+        if (Resolve(uid, ref component, false))
         {
             // reset the revving
             component.CurrentTime = TimeSpan.FromSeconds(0);

From 7e44cf9817573a153e9425b363b6ffda72642188 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Sat, 12 Oct 2024 20:52:05 +0200
Subject: [PATCH 172/366] Don't error on missing component in ChangeHeat
 (#32451)

---
 Content.Server/Temperature/Systems/TemperatureSystem.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.cs b/Content.Server/Temperature/Systems/TemperatureSystem.cs
index 2f4497bdbbc..afc7458f395 100644
--- a/Content.Server/Temperature/Systems/TemperatureSystem.cs
+++ b/Content.Server/Temperature/Systems/TemperatureSystem.cs
@@ -126,7 +126,7 @@ public void ForceChangeTemperature(EntityUid uid, float temp, TemperatureCompone
     public void ChangeHeat(EntityUid uid, float heatAmount, bool ignoreHeatResistance = false,
         TemperatureComponent? temperature = null)
     {
-        if (!Resolve(uid, ref temperature))
+        if (!Resolve(uid, ref temperature, false))
             return;
 
         if (!ignoreHeatResistance)
@@ -302,6 +302,11 @@ private void OnTemperatureChangeAttempt(EntityUid uid, TemperatureProtectionComp
         args.Args.TemperatureDelta *= ev.Coefficient;
     }
 
+    private void ChangeTemperatureOnCollide(Entity<ChangeTemperatureOnCollideComponent> ent, ref ProjectileHitEvent args)
+    {
+        _temperature.ChangeHeat(args.Target, ent.Comp.Heat, ent.Comp.IgnoreHeatResistance);// adjust the temperature
+    }
+
     private void OnParentChange(EntityUid uid, TemperatureComponent component,
         ref EntParentChangedMessage args)
     {

From 94ac824c4b750a3924d7bff6ff4c2f8dded2721c Mon Sep 17 00:00:00 2001
From: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Date: Mon, 16 Dec 2024 19:37:18 -0400
Subject: [PATCH 173/366] Update TemperatureSystem.cs

Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
---
 Content.Server/Temperature/Systems/TemperatureSystem.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.cs b/Content.Server/Temperature/Systems/TemperatureSystem.cs
index afc7458f395..ee13cb96a5e 100644
--- a/Content.Server/Temperature/Systems/TemperatureSystem.cs
+++ b/Content.Server/Temperature/Systems/TemperatureSystem.cs
@@ -302,11 +302,6 @@ private void OnTemperatureChangeAttempt(EntityUid uid, TemperatureProtectionComp
         args.Args.TemperatureDelta *= ev.Coefficient;
     }
 
-    private void ChangeTemperatureOnCollide(Entity<ChangeTemperatureOnCollideComponent> ent, ref ProjectileHitEvent args)
-    {
-        _temperature.ChangeHeat(args.Target, ent.Comp.Heat, ent.Comp.IgnoreHeatResistance);// adjust the temperature
-    }
-
     private void OnParentChange(EntityUid uid, TemperatureComponent component,
         ref EntParentChangedMessage args)
     {

From 55d9581e3289c3d9505b3716691d8c2088f88dcc Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Tue, 17 Dec 2024 10:21:29 -0400
Subject: [PATCH 174/366] test stuff

---
 Content.IntegrationTests/Tests/CargoTest.cs   | 11 +++-
 .../Construction/ConstructionPrototypeTest.cs | 19 +++++--
 .../NPC/Roboisseur/RoboisseurComponent.cs     |  2 -
 Content.Shared/Chat/SharedSuicideSystem.cs    | 11 ++++
 .../Objects/Weapons/Guns/SMGs/smgs.yml        | 54 +------------------
 5 files changed, 38 insertions(+), 59 deletions(-)

diff --git a/Content.IntegrationTests/Tests/CargoTest.cs b/Content.IntegrationTests/Tests/CargoTest.cs
index 37fd3a80f9a..5b6ebef8bd0 100644
--- a/Content.IntegrationTests/Tests/CargoTest.cs
+++ b/Content.IntegrationTests/Tests/CargoTest.cs
@@ -125,7 +125,16 @@ await server.WaitAssertion(() =>
 
             foreach (var proto in protoIds)
             {
-                var ent = entManager.SpawnEntity(proto, coord);
+                EntityUid? ent = null;
+                try
+                {
+                    ent = entManager.SpawnEntity(proto, coord);
+                }
+                catch (Exception e)
+                {
+                    Assert.Fail(proto);
+                    return;
+                }
 
                 if (entManager.TryGetComponent<StackPriceComponent>(ent, out var stackpricecomp)
                     && stackpricecomp.Price > 0)
diff --git a/Content.IntegrationTests/Tests/Construction/ConstructionPrototypeTest.cs b/Content.IntegrationTests/Tests/Construction/ConstructionPrototypeTest.cs
index d3a10dcfaf4..9779ded87c8 100644
--- a/Content.IntegrationTests/Tests/Construction/ConstructionPrototypeTest.cs
+++ b/Content.IntegrationTests/Tests/Construction/ConstructionPrototypeTest.cs
@@ -36,9 +36,22 @@ await server.WaitAssertion(() =>
                     if (!proto.Components.ContainsKey("Construction"))
                         continue;
 
-                    var ent = entMan.SpawnEntity(proto.ID, new MapCoordinates(Vector2.Zero, map.MapId));
-                    var construction = entMan.GetComponent<ConstructionComponent>(ent);
-
+                    EntityUid? ent = null;
+
+                    try
+                    {
+                        ent = entMan.SpawnEntity(proto.ID, new MapCoordinates(Vector2.Zero, map.MapId));
+                    }
+                    catch (Exception e)
+                    {
+                        Assert.Fail(proto.ID);
+                        return;
+                    }
+
+                    if (ent == null)
+                        return;
+
+                    var construction = entMan.GetComponent<ConstructionComponent>(ent.Value);
                     var graph = protoMan.Index<ConstructionGraphPrototype>(construction.Graph);
                     entMan.DeleteEntity(ent);
 
diff --git a/Content.Server/DeltaV/NPC/Roboisseur/RoboisseurComponent.cs b/Content.Server/DeltaV/NPC/Roboisseur/RoboisseurComponent.cs
index 075afeb7895..55eda0d68bc 100644
--- a/Content.Server/DeltaV/NPC/Roboisseur/RoboisseurComponent.cs
+++ b/Content.Server/DeltaV/NPC/Roboisseur/RoboisseurComponent.cs
@@ -170,7 +170,6 @@ public sealed partial class RoboisseurComponent : Component
             "FoodMeatRatdoubleKebab",
             "FoodBurgerCorgi",
             "FoodBreadPlain",
-            "FoodMeatKebab",
             "FoodBreadBun",
             "FoodBurgerCat",
             "FoodSoupTomatoBlood",
@@ -190,7 +189,6 @@ public sealed partial class RoboisseurComponent : Component
             // "FoodBreadMoldySlice",
             "FoodRiceBoiled",
             "FoodMothEyeballSoup",
-            "FoodMeatRatKebab",
             "FoodBreadCreamcheese",
             "FoodSoupOnion",
             "FoodBurgerAppendix",
diff --git a/Content.Shared/Chat/SharedSuicideSystem.cs b/Content.Shared/Chat/SharedSuicideSystem.cs
index d341ea89a8f..ebdbd40eeb8 100644
--- a/Content.Shared/Chat/SharedSuicideSystem.cs
+++ b/Content.Shared/Chat/SharedSuicideSystem.cs
@@ -10,6 +10,16 @@ public sealed class SharedSuicideSystem : EntitySystem
 {
     [Dependency] private readonly DamageableSystem _damageableSystem = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly ILogManager _logManager = default!;
+
+    private ISawmill _sawmill = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _sawmill = _logManager.GetSawmill("sharedsuicidesystem");
+    }
 
     /// <summary>
     /// Applies lethal damage spread out across the damage types given.
@@ -35,6 +45,7 @@ public void ApplyLethalDamage(Entity<DamageableComponent> target, DamageSpecifie
         // Split the total amount of damage needed to kill the target by every damage type in the DamageSpecifier
         foreach (var (key, value) in appliedDamageSpecifier.DamageDict)
         {
+            _sawmill.Info($"{key}: {(double) value}");
             appliedDamageSpecifier.DamageDict[key] = Math.Ceiling((double) (value * lethalAmountOfDamage / totalDamage));
         }
 
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index da372d0ed84..cf6dfde7bcc 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -318,56 +318,4 @@
   description: A prized possession of the station's Head of Security. The smell of dried blood lingers on this weapon's muzzle. A small torch with 24 stars surrounding it has been engraved on the grip.
   components:
     - type: StealTarget
-      stealGroup: HoSAntiqueWeapon
-
-# Rubber
-- type: entity
-  name: Drozd
-  parent: WeaponSubMachineGunDrozd
-  id: WeaponSubMachineGunDrozdRubber
-  suffix: Non-Lethal
-  components:
-    - type: ItemSlots
-      slots:
-        gun_magazine:
-          name: Magazine
-          startingItem: MagazinePistolSubMachineGunRubber
-          insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
-          ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
-          priority: 2
-          whitelist:
-            tags:
-              - MagazinePistolSubMachineGun
-        gun_chamber:
-          name: Chamber
-          startingItem: CartridgePistolRubber
-          priority: 1
-          whitelist:
-            tags:
-              - CartridgePistol
-
-- type: entity
-  name: Vector
-  parent: WeaponSubMachineGunVector
-  id: WeaponSubMachineGunVectorRubber
-  description: An excellent fully automatic Heavy SMG. Uses .45 magnum ammo.
-  suffix: Non-Lethal
-  components:
-  - type: ItemSlots
-    slots:
-      gun_magazine:
-        name: Magazine
-        startingItem: MagazineMagnumSubMachineGunRubber
-        insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
-        ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
-        priority: 2
-        whitelist:
-          tags:
-            - MagazineMagnumSubMachineGun
-      gun_chamber:
-        name: Chamber
-        startingItem: CartridgeMagnumRubber
-        priority: 1
-        whitelist:
-          tags:
-            - CartridgeMagnum
+      stealGroup: HoSAntiqueWeapon
\ No newline at end of file

From 2fa78d3cbbe3d0abcbd34f5592ece962b45c0828 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Tue, 17 Dec 2024 11:02:39 -0400
Subject: [PATCH 175/366] i could be The Stupid

---
 .../Guns/Ammunition/Magazines/pistol.yml      |  2 +-
 .../Weapons/Guns/Projectiles/projectiles.yml  |  3 +
 .../Objects/Weapons/Guns/SMGs/smgs.yml        | 62 +++++++++++++++++--
 Resources/Prototypes/tags.yml                 |  3 +
 4 files changed, 65 insertions(+), 5 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
index bde2731937a..c57a8adaa5f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
@@ -332,7 +332,7 @@
 
 - type: entity
   id: MagazinePistolSubMachineGunUranium
-  name: SMG magazine (.35 auto rubber)
+  name: SMG magazine (.35 auto uranium)
   parent: BaseMagazinePistolSubMachineGun
   components:
   - type: BallisticAmmoProvider
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index acf22532232..877327a4bc2 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -122,6 +122,9 @@
       path: /Audio/Weapons/Guns/Hits/snap.ogg
   - type: StaminaDamageOnCollide
     damage: 22 # 5 hits to stun sounds reasonable
+  - type: Tags
+    tags:
+    - BulletRubber
 
 - type: entity
   id: BaseBulletIncendiary
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index cf6dfde7bcc..a8aab8fb380 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -149,7 +149,7 @@
 
 - type: entity
   name: Drozd
-  parent: [BaseWeaponSubMachineGun, BaseGunWieldable]
+  parent: [BaseWeaponSubMachineGun, BaseRestrictedContraband]
   id: WeaponSubMachineGunDrozd
   description: An excellent fully automatic Heavy SMG.
   components:
@@ -163,6 +163,7 @@
     - type: Clothing
       sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
     - type: Wieldable
+      unwieldOnUse: false
     - type: GunWieldBonus
       minAngle: -19
       maxAngle: -16
@@ -171,12 +172,11 @@
       maxAngle: 32
       fireRate: 12
       burstFireRate: 12
-      selectedMode: Burst
+      selectedMode: FullAuto
       soundGunshot:
         path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
       availableModes:
         - FullAuto
-      fireOnDropChance: 0.2
     - type: ItemSlots
       slots:
         gun_magazine:
@@ -188,6 +188,7 @@
           whitelist:
             tags:
               - MagazinePistolSubMachineGun
+          whitelistFailPopup: gun-magazine-whitelist-fail
         gun_chamber:
           name: Chamber
           startingItem: CartridgePistol
@@ -318,4 +319,57 @@
   description: A prized possession of the station's Head of Security. The smell of dried blood lingers on this weapon's muzzle. A small torch with 24 stars surrounding it has been engraved on the grip.
   components:
     - type: StealTarget
-      stealGroup: HoSAntiqueWeapon
\ No newline at end of file
+      stealGroup: HoSAntiqueWeapon
+
+
+# Rubber
+- type: entity
+  name: Drozd
+  parent: WeaponSubMachineGunDrozd
+  id: WeaponSubMachineGunDrozdRubber
+  suffix: Non-Lethal
+  components:
+    - type: ItemSlots
+      slots:
+        gun_magazine:
+          name: Magazine
+          startingItem: MagazinePistolSubMachineGunRubber
+          insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
+          ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
+          priority: 2
+          whitelist:
+            tags:
+              - MagazinePistolSubMachineGun
+        gun_chamber:
+          name: Chamber
+          startingItem: CartridgePistolRubber
+          priority: 1
+          whitelist:
+            tags:
+              - CartridgePistol
+
+- type: entity
+  name: Vector
+  parent: WeaponSubMachineGunVector
+  id: WeaponSubMachineGunVectorRubber
+  description: An excellent fully automatic Heavy SMG. Uses .45 magnum ammo.
+  suffix: Non-Lethal
+  components:
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineMagnumSubMachineGunRubber
+        insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazineMagnumSubMachineGun
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgeMagnumRubber
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgeMagnum
\ No newline at end of file
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 9e611d75153..59c87c9e400 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -253,6 +253,9 @@
 - type: Tag
   id: BulletFoam
 
+- type: Tag
+  id: BulletRubber
+
 - type: Tag
   id: Burnt
 

From 2615eab486a7c9ec41a2c462ab31e3099f819347 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Tue, 17 Dec 2024 11:10:35 -0400
Subject: [PATCH 176/366] Fix gun...

---
 .../Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml   | 2 +-
 .../Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 877327a4bc2..5bbbbc9381e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -122,7 +122,7 @@
       path: /Audio/Weapons/Guns/Hits/snap.ogg
   - type: StaminaDamageOnCollide
     damage: 22 # 5 hits to stun sounds reasonable
-  - type: Tags
+  - type: Tag
     tags:
     - BulletRubber
 
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index a8aab8fb380..a4e85ca822a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -149,7 +149,7 @@
 
 - type: entity
   name: Drozd
-  parent: [BaseWeaponSubMachineGun, BaseRestrictedContraband]
+  parent: BaseWeaponSubMachineGun
   id: WeaponSubMachineGunDrozd
   description: An excellent fully automatic Heavy SMG.
   components:

From af118ce9652de65189a952d58301807bdc406721 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Tue, 17 Dec 2024 11:29:46 -0400
Subject: [PATCH 177/366] Prevent executions if the bullet chambered is rubber.

---
 .../Execution/SharedExecutionSystem.cs        | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/Content.Shared/Execution/SharedExecutionSystem.cs b/Content.Shared/Execution/SharedExecutionSystem.cs
index 4f0617b4881..4b5e4e1981b 100644
--- a/Content.Shared/Execution/SharedExecutionSystem.cs
+++ b/Content.Shared/Execution/SharedExecutionSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.ActionBlocker;
 using Content.Shared.Chat;
 using Content.Shared.CombatMode;
+using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Damage;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
@@ -12,6 +13,8 @@
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Mind;
+using Content.Shared.Tag;
+using Content.Shared.Weapons.Ranged.Components;
 using Robust.Shared.Player;
 using Robust.Shared.Audio.Systems;
 
@@ -33,6 +36,8 @@ public sealed class SharedExecutionSystem : EntitySystem
     [Dependency] private readonly SharedMeleeWeaponSystem _melee = default!;
     [Dependency] private readonly SharedMindSystem _mind = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly TagSystem _tag = default!;
+    [Dependency] private readonly ItemSlotsSystem _itemSlots = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -54,7 +59,7 @@ private void OnGetInteractionsVerbs(EntityUid uid, ExecutionComponent comp, GetV
         var weapon = args.Using.Value;
         var victim = args.Target;
 
-        if (!CanBeExecuted(victim, attacker))
+        if (!CanBeExecuted(victim, attacker, weapon))
             return;
 
         UtilityVerb verb = new()
@@ -70,7 +75,7 @@ private void OnGetInteractionsVerbs(EntityUid uid, ExecutionComponent comp, GetV
 
     private void TryStartExecutionDoAfter(EntityUid weapon, EntityUid victim, EntityUid attacker, ExecutionComponent comp)
     {
-        if (!CanBeExecuted(victim, attacker))
+        if (!CanBeExecuted(victim, attacker, weapon))
             return;
 
         if (attacker == victim)
@@ -96,7 +101,7 @@ private void TryStartExecutionDoAfter(EntityUid weapon, EntityUid victim, Entity
 
     }
 
-    public bool CanBeExecuted(EntityUid victim, EntityUid attacker)
+    public bool CanBeExecuted(EntityUid victim, EntityUid attacker, EntityUid weapon)
     {
         // No point executing someone if they can't take damage
         if (!HasComp<DamageableComponent>(victim))
@@ -118,6 +123,13 @@ public bool CanBeExecuted(EntityUid victim, EntityUid attacker)
         if (victim != attacker && _actionBlocker.CanInteract(victim, null))
             return false;
 
+        // If the gun has rubber bullets chambered, we can't execute them.
+        if (TryComp<GunComponent>(weapon, out _)
+            && _itemSlots.TryGetSlot(weapon, "gun_chamber", out var itemSlot)
+            && itemSlot.Item != null
+            && _tag.HasTag(itemSlot.Item!.Value, "BulletRubber"))
+            return false;
+
         // All checks passed
         return true;
     }
@@ -197,7 +209,7 @@ private void OnExecutionDoAfter(Entity<ExecutionComponent> entity, ref Execution
         var victim = args.Target.Value;
         var weapon = args.Used.Value;
 
-        if (!_execution.CanBeExecuted(victim, attacker))
+        if (!_execution.CanBeExecuted(victim, attacker, weapon))
             return;
 
         // This is needed so the melee system does not stop it.

From 2b5ac70e43c7e6a8ecd9d1c6ad67898828a081a7 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Tue, 17 Dec 2024 11:38:22 -0400
Subject: [PATCH 178/366] fix executions

---
 Content.Shared/Execution/SharedExecutionSystem.cs | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/Content.Shared/Execution/SharedExecutionSystem.cs b/Content.Shared/Execution/SharedExecutionSystem.cs
index 4b5e4e1981b..616b43b1a8f 100644
--- a/Content.Shared/Execution/SharedExecutionSystem.cs
+++ b/Content.Shared/Execution/SharedExecutionSystem.cs
@@ -123,13 +123,6 @@ public bool CanBeExecuted(EntityUid victim, EntityUid attacker, EntityUid weapon
         if (victim != attacker && _actionBlocker.CanInteract(victim, null))
             return false;
 
-        // If the gun has rubber bullets chambered, we can't execute them.
-        if (TryComp<GunComponent>(weapon, out _)
-            && _itemSlots.TryGetSlot(weapon, "gun_chamber", out var itemSlot)
-            && itemSlot.Item != null
-            && _tag.HasTag(itemSlot.Item!.Value, "BulletRubber"))
-            return false;
-
         // All checks passed
         return true;
     }
@@ -137,9 +130,7 @@ public bool CanBeExecuted(EntityUid victim, EntityUid attacker, EntityUid weapon
     private void OnGetMeleeDamage(Entity<ExecutionComponent> entity, ref GetMeleeDamageEvent args)
     {
         if (!TryComp<MeleeWeaponComponent>(entity, out var melee) || !entity.Comp.Executing)
-        {
             return;
-        }
 
         var bonus = melee.Damage * entity.Comp.DamageMultiplier - melee.Damage;
         args.Damage += bonus;
@@ -229,9 +220,7 @@ private void OnExecutionDoAfter(Entity<ExecutionComponent> entity, ref Execution
             RaiseLocalEvent(victim, suicideGhostEvent);
         }
         else
-        {
             _melee.AttemptLightAttack(attacker, weapon, meleeWeaponComp, victim);
-        }
 
         _combat.SetInCombatMode(attacker, prev);
         entity.Comp.Executing = false;

From 310c0d0de8650ac84e7633ccadc2c91b685bc35d Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Tue, 17 Dec 2024 11:49:11 -0400
Subject: [PATCH 179/366] cleanup so I can read this

---
 .../Weapons/Ranged/Systems/SharedGunSystem.cs     | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index c7cc09e618b..86255fdc3ef 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -297,9 +297,7 @@ private void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun)
                     throw new ArgumentOutOfRangeException($"No implemented shooting behavior for {gun.SelectedMode}!");
             }
         } else
-        {
             shots = Math.Min(shots, gun.ShotsPerBurstModified - gun.ShotCounter);
-        }
 
         var attemptEv = new AttemptShootEvent(user, null);
         RaiseLocalEvent(gunUid, ref attemptEv);
@@ -307,9 +305,8 @@ private void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun)
         if (attemptEv.Cancelled)
         {
             if (attemptEv.Message != null)
-            {
                 PopupSystem.PopupClient(attemptEv.Message, gunUid, user);
-            }
+
             gun.BurstActivated = false;
             gun.BurstShotsCount = 0;
             gun.NextFire = TimeSpan.FromSeconds(Math.Max(lastFire.TotalSeconds + SafetyNextFire, gun.NextFire.TotalSeconds));
@@ -378,7 +375,15 @@ private void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun)
         }
 
         // Shoot confirmed - sounds also played here in case it's invalid (e.g. cartridge already spent).
-        Shoot(gunUid, gun, ev.Ammo, fromCoordinates, toCoordinates.Value, out var userImpulse, user, throwItems: attemptEv.ThrowItems);
+        Shoot(
+            gunUid,
+            gun,
+            ev.Ammo,
+            fromCoordinates,
+            toCoordinates.Value,
+            out var userImpulse,
+            user,
+            throwItems: attemptEv.ThrowItems);
         var shotEv = new GunShotEvent(user, ev.Ammo);
         RaiseLocalEvent(gunUid, ref shotEv);
 

From de62b3aefc1e814666b06bb654b3eb83193b392e Mon Sep 17 00:00:00 2001
From: CaasGit <87243814+CaasGit@users.noreply.github.com>
Date: Fri, 12 Jul 2024 23:12:57 -0700
Subject: [PATCH 180/366] fix(SharedGunSystem): Return and debug log on
 CreateEffect. (#29656)

Sometimes CreateEffect is called on a Invalid Entity. This now causes
that to check, thus returning out and printing some hopefully helpful
logs to try to track down the real source of this issue.
---
 Content.Client/Weapons/Ranged/Systems/GunSystem.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
index 2e2ef04fae1..46cdf79785b 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
@@ -275,6 +275,14 @@ protected override void CreateEffect(EntityUid gunUid, MuzzleFlashEvent message,
         if (!Timing.IsFirstTimePredicted)
             return;
 
+        // EntityUid check added to stop throwing exceptions due to https://github.com/space-wizards/space-station-14/issues/28252
+        // TODO: Check to see why invalid entities are firing effects.
+        if (gunUid == EntityUid.Invalid)
+        {
+            Log.Debug($"Invalid Entity sent MuzzleFlashEvent (proto: {message.Prototype}, user: {user})");
+            return;
+        }
+
         var gunXform = Transform(gunUid);
         var gridUid = gunXform.GridUid;
         EntityCoordinates coordinates;

From 26bc5020c8b182659de7d6af5a1f12a2a76e962b Mon Sep 17 00:00:00 2001
From: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com>
Date: Wed, 11 Dec 2024 17:21:04 +0100
Subject: [PATCH 181/366] Rework the HoS's Energy Shotgun (Varying energy
 consumption depending on fire-mode + re-adds a toned down self recharge.)
 (#32104)

* Rebalance HoS's Energy Shotgun

* SLIGHTLY Up the max charge so the gun properly recharges all of its charges, which matters a lot more with the self charge cooldown system.

* Prevent recharge cooldown if 0 power is used.

* Makes the clientside HUD actually update to reflect the changes in firecost and thus max/current charges.

* Properly fix that recharging to just under full issue instead of applying a budget fix to only the eshotgun.

* Clean up the client ammo UI fix.

* Update the self recharger component to comply with maintainer request.

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Remove code that was made redundant by a hotfix from another PR.

* Make the recharge pause on EMP, document things where needed, clean up code as per maintainer request, add a note to make the code better when power is moved to shared.

* Fix another internal issue

* Code cleanup + fix the rapid recharge verb to remove pause.

* cleanup

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
---
 .../Weapons/Ranged/Systems/GunSystem.cs       |  6 +++
 .../Systems/AdminVerbSystem.Tools.cs          |  2 +
 .../BatterySelfRechargerComponent.cs          | 27 +++++++++-
 .../Power/EntitySystems/BatterySystem.cs      | 53 ++++++++++++++++++-
 .../Ranged/Events/UpdateClientAmmoEvent.cs    |  4 ++
 .../Systems/BatteryWeaponFireModesSystem.cs   | 15 ++++--
 .../Weapons/Guns/Battery/battery_guns.yml     | 52 ++++++++++++++++++
 7 files changed, 153 insertions(+), 6 deletions(-)
 create mode 100644 Content.Shared/Weapons/Ranged/Events/UpdateClientAmmoEvent.cs

diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
index 46cdf79785b..b809bb85efc 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
@@ -76,6 +76,7 @@ public override void Initialize()
         base.Initialize();
         UpdatesOutsidePrediction = true;
         SubscribeLocalEvent<AmmoCounterComponent, ItemStatusCollectMessage>(OnAmmoCounterCollect);
+        SubscribeLocalEvent<AmmoCounterComponent, UpdateClientAmmoEvent>(OnUpdateClientAmmo);
         SubscribeAllEvent<MuzzleFlashEvent>(OnMuzzleFlash);
 
         // Plays animated effects on the client.
@@ -85,6 +86,11 @@ public override void Initialize()
         InitializeSpentAmmo();
     }
 
+    private void OnUpdateClientAmmo(EntityUid uid, AmmoCounterComponent ammoComp, ref UpdateClientAmmoEvent args)
+    {
+        UpdateAmmoCount(uid, ammoComp);
+    }
+
     private void OnMuzzleFlash(MuzzleFlashEvent args)
     {
         CreateEffect(GetEntity(args.Uid), args);
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
index 328fa744846..3aa1c20cb02 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
@@ -205,6 +205,7 @@ private void AddTricksVerbs(GetVerbsEvent<Verb> args)
                         var recharger = EnsureComp<BatterySelfRechargerComponent>(args.Target);
                         recharger.AutoRecharge = true;
                         recharger.AutoRechargeRate = battery.MaxCharge; // Instant refill.
+                        recharger.AutoRechargePause = false; // No delay.
                     },
                     Impact = LogImpact.Medium,
                     Message = Loc.GetString("admin-trick-infinite-battery-object-description"),
@@ -604,6 +605,7 @@ private void AddTricksVerbs(GetVerbsEvent<Verb> args)
 
                         recharger.AutoRecharge = true;
                         recharger.AutoRechargeRate = battery.MaxCharge; // Instant refill.
+                        recharger.AutoRechargePause = false; // No delay.
                     }
                 },
                 Impact = LogImpact.Extreme,
diff --git a/Content.Server/Power/Components/BatterySelfRechargerComponent.cs b/Content.Server/Power/Components/BatterySelfRechargerComponent.cs
index 4798beb7573..1cb92d9cd63 100644
--- a/Content.Server/Power/Components/BatterySelfRechargerComponent.cs
+++ b/Content.Server/Power/Components/BatterySelfRechargerComponent.cs
@@ -1,3 +1,5 @@
+using System;
+
 namespace Content.Server.Power.Components
 {
     /// <summary>
@@ -6,8 +8,29 @@ namespace Content.Server.Power.Components
     [RegisterComponent]
     public sealed partial class BatterySelfRechargerComponent : Component
     {
-        [ViewVariables(VVAccess.ReadWrite)] [DataField("autoRecharge")] public bool AutoRecharge { get; set; }
+        /// <summary>
+        /// Does the entity auto recharge?
+        /// </summary>
+        [DataField] public bool AutoRecharge;
+
+        /// <summary>
+        /// At what rate does the entity automatically recharge?
+        /// </summary>
+        [DataField] public float AutoRechargeRate;
+
+        /// <summary>
+        /// Should this entity stop automatically recharging if a charge is used?
+        /// </summary>
+        [DataField] public bool AutoRechargePause = false;
+
+        /// <summary>
+        /// How long should the entity stop automatically recharging if a charge is used?
+        /// </summary>
+        [DataField] public float AutoRechargePauseTime = 0f;
 
-        [ViewVariables(VVAccess.ReadWrite)] [DataField("autoRechargeRate")] public float AutoRechargeRate { get; set; }
+        /// <summary>
+        /// Do not auto recharge if this timestamp has yet to happen, set for the auto recharge pause system.
+        /// </summary>
+        [DataField] public TimeSpan NextAutoRecharge = TimeSpan.FromSeconds(0f);
     }
 }
diff --git a/Content.Server/Power/EntitySystems/BatterySystem.cs b/Content.Server/Power/EntitySystems/BatterySystem.cs
index cbe61f66717..8d261622152 100644
--- a/Content.Server/Power/EntitySystems/BatterySystem.cs
+++ b/Content.Server/Power/EntitySystems/BatterySystem.cs
@@ -4,14 +4,18 @@
 using Content.Server.Power.Components;
 using Content.Shared.Examine;
 using Content.Shared.Rejuvenate;
+using Content.Shared.Timing;
 using JetBrains.Annotations;
 using Robust.Shared.Utility;
+using Robust.Shared.Timing;
 
 namespace Content.Server.Power.EntitySystems
 {
     [UsedImplicitly]
     public sealed class BatterySystem : EntitySystem
     {
+        [Dependency] protected readonly IGameTiming Timing = default!;
+
         public override void Initialize()
         {
             base.Initialize();
@@ -86,7 +90,14 @@ public override void Update(float frameTime)
             {
                 if (!comp.AutoRecharge) continue;
                 if (batt.IsFullyCharged) continue;
-                TrySetCharge(uid, batt.CurrentCharge + comp.AutoRechargeRate * frameTime, batt);
+
+                if (comp.AutoRechargePause)
+                {
+                    if (comp.NextAutoRecharge > Timing.CurTime)
+                        continue;
+                }
+
+                SetCharge(uid, batt.CurrentCharge + comp.AutoRechargeRate * frameTime, batt);
             }
         }
 
@@ -103,6 +114,8 @@ private void OnEmpPulse(EntityUid uid, BatteryComponent component, ref EmpPulseE
             args.Affected = true;
             args.Disabled = true;
             UseCharge(uid, args.EnergyConsumption, component);
+            // Apply a cooldown to the entity's self recharge if needed to avoid it immediately self recharging after an EMP.
+            TrySetChargeCooldown(uid);
         }
 
         public float UseCharge(EntityUid uid, float value, BatteryComponent? battery = null)
@@ -113,6 +126,10 @@ public float UseCharge(EntityUid uid, float value, BatteryComponent? battery = n
             var newValue = Math.Clamp(0, battery.CurrentCharge - value, battery.MaxCharge);
             var delta = newValue - battery.CurrentCharge;
             battery.CurrentCharge = newValue;
+
+            // Apply a cooldown to the entity's self recharge if needed.
+            TrySetChargeCooldown(uid);
+
             var ev = new ChargeChangedEvent(battery.CurrentCharge, battery.MaxCharge);
             RaiseLocalEvent(uid, ref ev);
             return delta;
@@ -146,6 +163,40 @@ public void SetCharge(EntityUid uid, float value, BatteryComponent? battery = nu
             var ev = new ChargeChangedEvent(battery.CurrentCharge, battery.MaxCharge);
             RaiseLocalEvent(uid, ref ev);
         }
+        /// <summary>
+        /// Checks if the entity has a self recharge and puts it on cooldown if applicable.
+        /// </summary>
+        public void TrySetChargeCooldown(EntityUid uid, float value = -1)
+        {
+            if (!TryComp<BatterySelfRechargerComponent>(uid, out var batteryself))
+                return;
+
+            if (!batteryself.AutoRechargePause)
+                return;
+
+            // If no answer or a negative is given for value, use the default from AutoRechargePauseTime.
+            if (value < 0)
+                value = batteryself.AutoRechargePauseTime;
+
+            if (Timing.CurTime + TimeSpan.FromSeconds(value) <= batteryself.NextAutoRecharge)
+                return;
+
+            SetChargeCooldown(uid, batteryself.AutoRechargePauseTime, batteryself);
+        }
+
+        /// <summary>
+        /// Puts the entity's self recharge on cooldown for the specified time.
+        /// </summary>
+        public void SetChargeCooldown(EntityUid uid, float value, BatterySelfRechargerComponent? batteryself = null)
+        {
+            if (!Resolve(uid, ref batteryself))
+                return;
+
+            if (value >= 0)
+                batteryself.NextAutoRecharge = Timing.CurTime + TimeSpan.FromSeconds(value);
+            else
+                batteryself.NextAutoRecharge = Timing.CurTime;
+        }
 
         /// <summary>
         ///     If sufficient charge is available on the battery, use it. Otherwise, don't.
diff --git a/Content.Shared/Weapons/Ranged/Events/UpdateClientAmmoEvent.cs b/Content.Shared/Weapons/Ranged/Events/UpdateClientAmmoEvent.cs
new file mode 100644
index 00000000000..57f731889a4
--- /dev/null
+++ b/Content.Shared/Weapons/Ranged/Events/UpdateClientAmmoEvent.cs
@@ -0,0 +1,4 @@
+namespace Content.Shared.Weapons.Ranged.Events;
+
+[ByRefEvent]
+public readonly record struct UpdateClientAmmoEvent();
\ No newline at end of file
diff --git a/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs b/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs
index 8e44576d283..bae5b95a193 100644
--- a/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs
@@ -5,6 +5,7 @@
 using Content.Shared.Popups;
 using Content.Shared.Verbs;
 using Content.Shared.Weapons.Ranged.Components;
+using Content.Shared.Weapons.Ranged.Events;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Weapons.Ranged.Systems;
@@ -99,13 +100,21 @@ private void SetFireMode(EntityUid uid, BatteryWeaponFireModesComponent componen
         component.CurrentFireMode = index;
         Dirty(uid, component);
 
-        if (TryComp(uid, out ProjectileBatteryAmmoProviderComponent? projectileBatteryAmmoProvider))
+        if (TryComp(uid, out ProjectileBatteryAmmoProviderComponent? projectileBatteryAmmoProviderComponent))
         {
             if (!_prototypeManager.TryIndex<EntityPrototype>(fireMode.Prototype, out var prototype))
                 return;
 
-            projectileBatteryAmmoProvider.Prototype = fireMode.Prototype;
-            projectileBatteryAmmoProvider.FireCost = fireMode.FireCost;
+            // TODO: Have this get the info directly from the batteryComponent when power is moved to shared.
+            var OldFireCost = projectileBatteryAmmoProviderComponent.FireCost;
+            projectileBatteryAmmoProviderComponent.Prototype = fireMode.Prototype;
+            projectileBatteryAmmoProviderComponent.FireCost = fireMode.FireCost;
+            float FireCostDiff = (float)fireMode.FireCost / (float)OldFireCost;
+            projectileBatteryAmmoProviderComponent.Shots = (int)Math.Round(projectileBatteryAmmoProviderComponent.Shots/FireCostDiff);
+            projectileBatteryAmmoProviderComponent.Capacity = (int)Math.Round(projectileBatteryAmmoProviderComponent.Capacity/FireCostDiff);
+            Dirty(uid, projectileBatteryAmmoProviderComponent);
+            var updateClientAmmoEvent = new UpdateClientAmmoEvent();
+            RaiseLocalEvent(uid, ref updateClientAmmoEvent);
 
             if (user != null)
             {
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 6763599ebb2..dfe5a61a62b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -856,3 +856,55 @@
   - type: Appearance
   - type: StaticPrice
     price: 750
+
+- type: entity
+  name: energy shotgun
+  parent: [BaseWeaponBattery, BaseGunWieldable, BaseGrandTheftContraband]
+  id: WeaponEnergyShotgun
+  description: A one-of-a-kind prototype energy weapon that uses various shotgun configurations. It offers the possibility of both lethal and non-lethal shots, making it a versatile weapon.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-unshaded-4
+        map: ["enum.GunVisualLayers.MagUnshaded"]
+        shader: unshaded
+  - type: Clothing
+    sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi
+  - type: Gun
+    fireRate: 2
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: BulletLaserSpread
+    fireCost: 150
+  - type: BatteryWeaponFireModes
+    fireModes:
+    - proto: BulletLaserSpread
+      fireCost: 150
+    - proto: BulletLaserSpreadNarrow
+      fireCost: 200
+    - proto: BulletDisablerSmgSpread
+      fireCost: 120
+  - type: Item
+    size: Large
+    shape:
+    - 0,0,3,1
+    sprite: Objects/Weapons/Guns/Battery/inhands_64x.rsi
+    heldPrefix: energy
+  - type: Tag
+    tags:
+    - HighRiskItem
+  - type: StealTarget
+    stealGroup: WeaponEnergyShotgun
+  - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
+  - type: Battery
+    maxCharge: 1200
+    startingCharge: 1200
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 24
+    autoRechargePause: true
+    autoRechargePauseTime: 10
\ No newline at end of file

From 0ce6bd3c27b81947f279471381af662d7345a181 Mon Sep 17 00:00:00 2001
From: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Date: Mon, 19 Aug 2024 13:14:30 +0200
Subject: [PATCH 182/366] New head of security weapon:Energy Shotgun (#30643)

* Reset hopefully?

* removes the emergency security orders

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

Rewrites the description based on review

Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com>

* 7 shots, recharge taking 42 seconds

* minor renaming :godo:

* please work

* Revert "please work"

This reverts commit e84a2618d95ec17f5fd608331176df2ab8b0966c.

* please fix

---------

Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com>
---
 .../Catalog/Fills/Lockers/heads.yml           |   2 +-
 .../Objects/Misc/secret_documents.yml         |  16 ----
 .../Weapons/Guns/Battery/battery_guns.yml     |   2 +-
 .../Weapons/Guns/Projectiles/projectiles.yml  |  85 ++++++++++++++++++
 .../Prototypes/Objectives/objectiveGroups.yml |   2 +-
 .../Objectives/stealTargetGroups.yml          |  16 ++--
 Resources/Prototypes/Objectives/traitor.yml   |   7 +-
 .../Guidebook/Antagonist/Traitors.xml         |   4 +
 .../Guns/Battery/energy_shotgun.rsi/base.png  | Bin 0 -> 824 bytes
 .../energy_shotgun.rsi/equipped-BACKPACK.png  | Bin 0 -> 873 bytes
 .../equipped-SUITSTORAGE.png                  | Bin 0 -> 873 bytes
 .../Guns/Battery/energy_shotgun.rsi/icon.png  | Bin 0 -> 807 bytes
 .../energy_shotgun.rsi/mag-unshaded-1.png     | Bin 0 -> 156 bytes
 .../energy_shotgun.rsi/mag-unshaded-2.png     | Bin 0 -> 157 bytes
 .../energy_shotgun.rsi/mag-unshaded-3.png     | Bin 0 -> 166 bytes
 .../energy_shotgun.rsi/mag-unshaded-4.png     | Bin 0 -> 166 bytes
 .../Guns/Battery/energy_shotgun.rsi/meta.json |  37 ++++++++
 .../inhands_64x.rsi/energy-inhand-left.png    | Bin 0 -> 979 bytes
 .../inhands_64x.rsi/energy-inhand-right.png   | Bin 0 -> 997 bytes
 .../Guns/Battery/inhands_64x.rsi/meta.json    |  27 ++++++
 .../inhands_64x.rsi/wielded-inhand-left.png   | Bin 0 -> 1132 bytes
 .../inhands_64x.rsi/wielded-inhand-right.png  | Bin 0 -> 1147 bytes
 .../projectiles_tg.rsi/heavylaser.png         | Bin 0 -> 340 bytes
 .../Projectiles/projectiles_tg.rsi/meta.json  |   3 +
 24 files changed, 171 insertions(+), 30 deletions(-)
 delete mode 100644 Resources/Prototypes/Entities/Objects/Misc/secret_documents.yml
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/base.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-BACKPACK.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-SUITSTORAGE.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-1.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-2.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-3.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-4.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-left.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-right.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-left.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-right.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/heavylaser.png

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index e7f44398731..229183c8d9b 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -331,4 +331,4 @@
     - id: JetpackBlue
     - id: SpaceCash1000
     - id: BeachBall
-    - id: BikeHorn
+    - id: BikeHorn
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Misc/secret_documents.yml b/Resources/Prototypes/Entities/Objects/Misc/secret_documents.yml
deleted file mode 100644
index ae6238d87cc..00000000000
--- a/Resources/Prototypes/Entities/Objects/Misc/secret_documents.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: BookSecretDocuments
-  name: "emergency security orders"
-  description: TOP SECRET. These documents specify the Emergency Orders that the HoS must carry out when ordered by Central Command.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/bureaucracy.rsi
-      layers:
-        - state: folder-sec-doc
-    - type: Tag
-      tags:
-        - Book
-        - HighRiskItem
-    - type: StealTarget
-      stealGroup: BookSecretDocuments
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 dfe5a61a62b..312b2012244 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -859,7 +859,7 @@
 
 - type: entity
   name: energy shotgun
-  parent: [BaseWeaponBattery, BaseGunWieldable, BaseGrandTheftContraband]
+  parent: [BaseWeaponBattery, BaseGunWieldable]
   id: WeaponEnergyShotgun
   description: A one-of-a-kind prototype energy weapon that uses various shotgun configurations. It offers the possibility of both lethal and non-lethal shots, making it a versatile weapon.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 5bbbbc9381e..a46dc964ff4 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -1044,3 +1044,88 @@
         Heat: 20 # Slightly more damage than the 17heat from the Captain's Hitscan lasgun
     soundHit:
       collection: MeatLaserImpact
+
+- type: entity
+  name: laser bolt 
+  id: BulletLaser
+  parent: BaseBullet
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Reflective
+    reflective:
+    - Energy
+  - type: FlyBySound
+    sound:
+      collection: EnergyMiss
+      params:
+        volume: 5
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
+    layers:
+    - state: heavylaser
+      shader: unshaded
+  - type: Physics
+  - type: Fixtures
+    fixtures:
+      projectile:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.15,-0.3,0.15,0.3"
+        hard: false
+        mask:
+        - Impassable
+        - BulletImpassable
+      fly-by: *flybyfixture
+  - type: Ammo
+  - type: Projectile
+    impactEffect: BulletImpactEffectOrangeDisabler
+    damage:
+      types:
+        Heat: 10
+    soundHit:
+      collection: WeakHit
+    forceSound: true
+
+- type: entity
+  name: wide laser barrage
+  id: BulletLaserSpread
+  noSpawn: true
+  parent: BulletLaser
+  components:
+  - type: ProjectileSpread
+    proto: BulletLaser
+    count: 5 #50 heat damage if you hit all your shots, but wide spread
+    spread: 30 
+
+- type: entity
+  name : heavy laser bolt
+  id: BulletLaserHeavy
+  parent: BulletLaser
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Heat: 15
+
+- type: entity
+  name: narrow laser barrage
+  id: BulletLaserHeavySpread
+  noSpawn: true
+  parent: BulletLaser
+  components:
+  - type: ProjectileSpread
+    proto: BulletLaser
+    count: 3 #45 heat damage if you hit all your shots, but narrower spread
+    spread: 10
+
+- type: entity
+  name: disabling laser barrage
+  id: BulletDisablerSmgSpread
+  noSpawn: true
+  parent: BulletDisablerSmg
+  components:
+  - type: ProjectileSpread
+    proto: BulletDisablerSmg
+    count: 3 #bit stronger than a disabler if you hit your shots you goober, still not a 2 hit stun though
+    spread: 9 
\ No newline at end of file
diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml
index d7e08841307..16dc7c6d310 100644
--- a/Resources/Prototypes/Objectives/objectiveGroups.yml
+++ b/Resources/Prototypes/Objectives/objectiveGroups.yml
@@ -22,11 +22,11 @@
     CaptainGunStealObjective: 0.5
     CaptainJetpackStealObjective: 0.5
     HandTeleporterStealObjective: 0.5
-    SecretDocumentsStealObjective: 0.5
     LOLuckyBillStealObjective: 0.5 # DeltaV - LO steal objective, see Resources/Prototypes/DeltaV/Objectives/traitor.yml
     HoPBookIanDossierStealObjective: 1 # DeltaV - HoP steal objective, see Resources/Prototypes/DeltaV/Objectives/traitor.yml
     HoSGunStealObjective: 0.5
     StealSupermatterSliverObjective: 0.5
+    EnergyShotgunStealObjective: 0.5
 
 - type: weightedRandom
   id: TraitorObjectiveGroupKill
diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml
index 03d0e84c717..c0c839a66cc 100644
--- a/Resources/Prototypes/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml
@@ -35,13 +35,6 @@
     sprite: Objects/Devices/hand_teleporter.rsi
     state: icon
 
-- type: stealTargetGroup
-  id: BookSecretDocuments
-  name: "emergency security orders"
-  sprite:
-    sprite: Objects/Misc/bureaucracy.rsi
-    state: folder-sec-doc
-
 - type: stealTargetGroup
   id: ClothingShoesBootsMagAdv
   name: advanced magboots
@@ -98,6 +91,13 @@
     sprite: Objects/Weapons/Guns/Battery/pulse_pistol.rsi
     state: base
 
+- type: stealTargetGroup
+  id: WeaponEnergyShotgun
+  name: energy shotgun
+  sprite:
+    sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi
+    state: base
+
 # Thief Collection
 
 - type: stealTargetGroup
@@ -408,3 +408,5 @@
   sprite:
     sprite: Mobs/Animals/crab.rsi
     state: crab
+
+
diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml
index f9dfe5c3109..9b9cac1e61e 100644
--- a/Resources/Prototypes/Objectives/traitor.yml
+++ b/Resources/Prototypes/Objectives/traitor.yml
@@ -227,16 +227,15 @@
 - type: entity
   categories: [HideSpawnMenu]
   parent: BaseTraitorStealObjective
-  id: SecretDocumentsStealObjective
+  id: EnergyShotgunStealObjective
   components:
   - type: Objective
-    # hos has a gun ce does not, higher difficulty than most
+    # HoS will have this on them a lot of the time so..
     difficulty: 3
   - type: NotJobRequirement
     job: HeadOfSecurity
   - type: StealCondition
-    stealGroup: BookSecretDocuments
-    verifyMapExistence: true
+    stealGroup: WeaponEnergyShotgun
     owner: job-name-hos
 
 ## ce
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
index e19f2ae6547..255e4ca5109 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
@@ -60,6 +60,10 @@
   <Box>
     <GuideEntityEmbed Entity="ClothingShoesBootsMagAdv" Caption="Advanced Magboots"/>
   </Box>
+  - Stealing the [color=#cb0000]Head of Security[/color]'s [bold]energy shotgun[/bold].
+  <Box>
+    <GuideEntityEmbed Entity="WeaponEnergyShotgun" Caption=""/>
+  </Box>
   - Steal the [color=#a4885c]Nuke Disk[/color].
   <Box>
     <GuideEntityEmbed Entity="NukeDisk" Caption="Nuke Disk"/>
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d7177f4eab5ce8e6ba5b97eb1f12bc6f079e936
GIT binary patch
literal 824
zcmV-81IPS{P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0?kQ8K~z{r?Ucz+
z6LA#BzrPu}&>2b>Qb4vTEv+VEBrYd4VxlK6UWguyM&sE(!HbDEk8&{)ml#0}CR{zK
zH!($Af`+YN*=(^R?NDgipTAjJ_EI2G5B(&Q-}}Aa^1koQn?Z>ZB})8jh%x>(q`)!C
z^E{T9)0iCjKne;t-%>{-q6c+}IjkP5k}*UDH?rwCK7Jn4?r8G2QE(LD?*n8jTWV>e
zqG*LsQGuDMp9l|!bOG)LiK^pzu6iPv+24Vhp`JBk<wy@?UkAwObG(Vv!0mP$Ckj(u
zUT#=A(P$Jz4L%x~#cz%`+&VI$xaJg%+2$;<J&MVUBPULR=Q+c>HNjxeuyh_jd!h^I
zi^{lE?=##hyc-)bEY>WnR%G29OM#-xn#MhAE&R>3hIf0y<6&?Xf~jzXXaZg`0auuS
zsX#X@Z~Ng3b|RC>Vqrl6WiO|!jE7fhL|mSSqAVKMfUQxsXA!BStl8>ASS2f*l`tI|
z#M0n#{A|4d&p<a4atu~mT05sCc*J89S~i-1%ZoC4ojz7Z9)e(nO%##MW|2~ont(H>
zPl00>6OzWmM^Cjt$b$Je7La32<z#2fn46u3V0XdkG2>uo2m{yK!CkzIOxF!0mXnzH
z8q$KgYMbc%bXXVQ@-$P??ttAcz+|;xVscpZ=Q$t+aqet8-iN-SulE7*wjQNppZbZb
zTB3sJ(#}zmMIxo-12hEMsFH{?Q4W@E9D>7<Uvsz{X)b#eqN<@8eWJdX*yMPAQLWD5
z>U#88%(xlwW9HX9UcY*=vcAttZ7h4j(|myKSe^YEswD4*PqA9^(P+J&szMCco^X1a
zHr%u2w{z?E9s0#&!~GvCO}AIn3KwL3rs_QR7_METmfkQ6qn4@Y%|)>5`}QiN*z?<V
zZmw|%`%`b)y{p*C-W)}3%8?7O89NDDqC|=R2;dJTK_MBTWQ@}Q0000<MNUMnLSTY%
CFL>_&

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-BACKPACK.png
new file mode 100644
index 0000000000000000000000000000000000000000..a382ba66ba1a8d1a102d8fcfa21598c0a1142bae
GIT binary patch
literal 873
zcmV-v1D5=WP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0{%%vK~#8N?V3$*
z5<wWphmumT#YjO+i-Ja>77q=v+LqL#2461R{RCe90DcZn9=(`&@TJ^MP@@TrMh-2I
zswJeB`cg45(RB2`nQ5skb(h^`ciZQeOm=42?DPEp^RP>pWduPG1kp+O#7Qo?t_NDW
z=@}5mUEt(eeQjTu01d-K5i#mS)c|m3)Xx?hO;?*B#d|zrLWQmdJPe&?^QX?b(gft&
zE<P9xh)+7{YJkKoCR|R%713yK);1WL6hG)65@&VNwKzt{5{ls9$Wivawaz{_-g|B&
zWBl=QeUE~&hr36-{Mn?JEv$|!!n279Wxn;ZsT{$^$CcjlmPW+SO!M342RVW%A2<Z8
z{Hs8KUyL5(bzhJtlG93)d7BDMKrjRqQ?`P|xH;$BB_6^p5ifxWw`T3H1htiq$K%$D
zm)KniFdvH`#ZOLU74c}|6zhQrD8Ec5(^nJzU3rK%Quc=K=rG~Z%mgc!%dAu?S^ji@
z+2{Q4*itpbsw}{G+qV!;Dbdx%e}4z;#fQpkPo-L8>2z92PE1<@u8%lUyad8~6%Py<
z0A9X$zHP#MHfxCqQas|wl}9roTw>S&AWgWE%dxD<Cg6Jcd|nY>sWrCC-VE`;)bH)g
z>>R&-?J6r23anTx8ooBf=l+`d<mrMX;(@6KfMhzwm&;40TsM_U@y*Q^`?ck>M7%42
z38G671VIo4K@bE%5dB8(yNRJ=(VM5Pzr;rT5rz#2F?1Xd{;2s)jI^Q4fcvXe(c3?m
z@~5bq>B)dlv=94lI_Wj1o+|(WonS<J9zJhSnX?4kVAM7r?KD9xHgdG&DKPBW5<Tam
zCs#u^L9BrP&|xv^KZtF#0yP^D4u{#;cub6TXso=oZKFahHgZI+S}{}s`vF4+eEDSm
zHdWtpz-uXZGeZm=3v$%+{*vYjco2=TdsDx~$hja#<f;|T2K<N|XNv<D#K^fIN93v%
zx(SM-Cf2|1yn5<X^yYZrD}W#ff*^>43S)l&9Nj;FN`sj000000NkvXXu0mjf&C8D)

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000000000000000000000000000000000..a382ba66ba1a8d1a102d8fcfa21598c0a1142bae
GIT binary patch
literal 873
zcmV-v1D5=WP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0{%%vK~#8N?V3$*
z5<wWphmumT#YjO+i-Ja>77q=v+LqL#2461R{RCe90DcZn9=(`&@TJ^MP@@TrMh-2I
zswJeB`cg45(RB2`nQ5skb(h^`ciZQeOm=42?DPEp^RP>pWduPG1kp+O#7Qo?t_NDW
z=@}5mUEt(eeQjTu01d-K5i#mS)c|m3)Xx?hO;?*B#d|zrLWQmdJPe&?^QX?b(gft&
zE<P9xh)+7{YJkKoCR|R%713yK);1WL6hG)65@&VNwKzt{5{ls9$Wivawaz{_-g|B&
zWBl=QeUE~&hr36-{Mn?JEv$|!!n279Wxn;ZsT{$^$CcjlmPW+SO!M342RVW%A2<Z8
z{Hs8KUyL5(bzhJtlG93)d7BDMKrjRqQ?`P|xH;$BB_6^p5ifxWw`T3H1htiq$K%$D
zm)KniFdvH`#ZOLU74c}|6zhQrD8Ec5(^nJzU3rK%Quc=K=rG~Z%mgc!%dAu?S^ji@
z+2{Q4*itpbsw}{G+qV!;Dbdx%e}4z;#fQpkPo-L8>2z92PE1<@u8%lUyad8~6%Py<
z0A9X$zHP#MHfxCqQas|wl}9roTw>S&AWgWE%dxD<Cg6Jcd|nY>sWrCC-VE`;)bH)g
z>>R&-?J6r23anTx8ooBf=l+`d<mrMX;(@6KfMhzwm&;40TsM_U@y*Q^`?ck>M7%42
z38G671VIo4K@bE%5dB8(yNRJ=(VM5Pzr;rT5rz#2F?1Xd{;2s)jI^Q4fcvXe(c3?m
z@~5bq>B)dlv=94lI_Wj1o+|(WonS<J9zJhSnX?4kVAM7r?KD9xHgdG&DKPBW5<Tam
zCs#u^L9BrP&|xv^KZtF#0yP^D4u{#;cub6TXso=oZKFahHgZI+S}{}s`vF4+eEDSm
zHdWtpz-uXZGeZm=3v$%+{*vYjco2=TdsDx~$hja#<f;|T2K<N|XNv<D#K^fIN93v%
zx(SM-Cf2|1yn5<X^yYZrD}W#ff*^>43S)l&9Nj;FN`sj000000NkvXXu0mjf&C8D)

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4cdf7dc401909bd9e4d0aa57df160ddbcdd2bb81
GIT binary patch
literal 807
zcmV+?1K9kDP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0=!8?K~z{r?Uc`N
z5<wKlzrzBB-IeaLE!av6{Q;;^TVm8pJ$lm^Z|cP#|A-z;JnNyx#6%N4*n^42|3E!z
z)J7X)tSwY1O<4s&`jd`3y8|VbQraf!VL!>+dGqGYym@bC7B)6EHvbyJ+rLI6c8m&w
zfaT>C%uK!^4sLJA>F7RsTXoa=_O2q(Q?XvN9XixUxhukh2^x+KoBhr7NHjrZ$%&3m
z9~@+jnXC$EJ(1c%^;{05arUzl&tj{!_WXns_lH(-<-HTPhAViH-V06B_>AUwy<V<a
z<Z?L>7W`{^4nG|NH(L}4#Z^`2y~ZpVK4q61M@LRV5SkX#Bp#1*&EnzXN7e?O=L)zG
z8sO%2UQK=Cno%mFR)l@(SOmob&k9C8T^Q`|;?}K6PAB1LBgiDv#N5CWV*{6r4P;_t
zXnXk@1MxekRMt=|mO=U9u-KyLwmKYY3>J$ESo~Embtc59<Q}yht|Q}E8b6Nt!{-oq
zH-=I{heup7=aowW@_Ne5#;n^@iG6{d$&2WVjv9^<ypjZ;Pc(%E_jm=&WizH^XVb{0
z)0od@v9wTx+^!)Q>W0JZfb3VH1U)!$-36bjAUbjevh0Q2shSxxak$qjN&JC+D*F^8
zkOY^f4XK$ge8}QJB#s}tj%;3so|z)O2NN_k@s{|55h}@ka~?HrbZM~+W@mGHVhLI<
z<sr(7k!>E5qSVF|t(R7_XApl^n9_>XVdtXHOxFh4@eBt;7&9{6PuCzCrA>XX7Gh}K
zeN^0|f(W!0U@KU>@3YB`z8#VEH(ezd8KAk)Al>YlZWlEW-muQ5Z|B;LoAjeg#Jz6|
z+_HOEg`4tcrmSBTZrU-d^jvKYD^ttPEwJPDcDs>Q=Wls)s~3kDf9i&}w~p=jR%ywp
lN;N<uwiDFG#^yf)_zjsO2M=+34m1D&002ovPDHLkV1hg<ZDIfb

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d794f801384b6dde7e212d215f0848df08eb5b0
GIT binary patch
literal 156
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!prNOWV@QPi+hdAc3<?4a2b~YT^RHR`UUW;0
x=;YjGZ`c_0H*cT&+x28zZ|G+Rh6n8(%qv)!Ze3gJ;04so;OXk;vd$@?2>{xHE`<O9

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..35f97fbe1482210eb8bf9abfa5bc023009379385
GIT binary patch
literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!ppmDGV@QPi+oKD4859K=HgKy{m?efi`}@R@
xLx80@$CtTbcHHUx|DtBeZ`IFdW;hTn$Sfkty77i@LIF@WgQu&X%Q~loCIF5>D=Gj0

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..2008e393d1d71ead1ee221a244aa7d9784c0478f
GIT binary patch
literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!ptYxqV@QPi+oKz~7z9KdE{cCm`{!bJ^;z)L
zMJWjrp7ws%ac5w#SAAu%{^0txJN^d0`e$Vx%M8?L=At(57Dw;xOX636JO)o!KbLh*
G2~7Yck2C)O

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd4685d5b0ad5582061fdd83a66b2f3fb2483d3a
GIT binary patch
literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!ptYxqV@QPi+oOtH3<^9B7aty2V=maA^?60p
zf};<bB*Ok{`!g`u>mDz?KY7;PLqAvgm|hn=3)I)pe}YZu9CxPi^fP)uE`z75pUXO@
GgeCw2xib*}

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/meta.json
new file mode 100644
index 00000000000..9ffc0030820
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/meta.json
@@ -0,0 +1,37 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Icon sprite made by Papermaker48 for SS14, other sprites made by Boaz1111 with that sprite as reference.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+		{
+			"name": "icon"
+		},
+		{
+			"name": "base"
+		},
+		{
+			"name": "mag-unshaded-1"
+		},
+		{
+			"name": "mag-unshaded-2"
+		},
+		{
+			"name": "mag-unshaded-3"
+		},
+		{
+			"name": "mag-unshaded-4"
+		},
+  	 	{
+   		   	"name": "equipped-BACKPACK",
+   		   	"directions": 4
+ 	   	},
+ 	   	{
+		"name": "equipped-SUITSTORAGE",
+		"directions": 4
+		}
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f7c40c4f9d7d43c237ee95c20dc1d2d20891912
GIT binary patch
literal 979
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1qt-49ppxE{-7;ac}SX`wKft9RKJT=wQ(x;32%V
zW1`2C1)cSJv*y_pe(_k;*_rOYk8#~T?)Xl%dtU<<8+Hirg-+0DYo3wubo;xc&0B7_
zm6XrF`L}M;vNzv07=N}gwvL@;!w0k$1$;8DtlPFSykf>moAr17)en`w&-gIkrcOle
zsq=MxC!q@W=6#zsP5RBV<x*eJ#RPqQeR;mBr9mfCKP-NI>~^!r-P!vKQZ{_{W9XdZ
z@Rr+u;e9jq<FmFeOYb{l!p*6WHT~A|vbN=W9voE*Fn;~-X5jb2j3aMz*73J2_YK^A
z#cu26<x>yTFlD&Ct-Eh7`^RGnOV)aQ?Z%fZ9}=G(|G7(O#^UO%wPD_OVxO1(?^lVn
zUwL=hj2Om62XEiL&D}RqZZhWvi*Vk1*SD87l`lD-!gS@jSyOrZyWe)kyE*4bNb%&c
z?o(^je`_|K;p%DgS;>ck^GZug7iefV{0gx*&H7Zh@uX-%P0gCueDU+mrFvt8U9P`h
zI``H2OK+O0FaMBQlQm7~U<^~nhPLxPyXNorFZW^MKG?6K+IViY{Hy+7rOzKtRp9*h
z#{6uJugUf!_txo}+V5GtJ3m_5@%Am=byFW~_sV*Hq-3k*{tYkg?W=pBmOgK1`22gj
zv!`mB?R=ZD;gCJI>)%Up500K_Ik}g?Xn~5t50r?(!Z{FqtxH#=@#ZYYLasfpzAkPN
zsd@Ef`jn=7QAYcME5$@6WWC?U7Vpt8Dd21F)yMt%zf~OSXWn7?6=8ZO{F#u0as1cs
zr{!wa)_lCG&-+ZMVdj7RAFFgFL}&5%Pj?P#KV9_yx<rQRnMG&jnDaNCayoeJO!(A`
zbM^i29xk5V<h3|ck+G-pXQegAKCiQJd;i_}d*iO%nnknNgbqlE&g^@ozJ1z-qm7H+
zGTyp-`>OliO<D_2b4?JoeH}4pb({PDl@GSW9agVzO}~_?#<=TjUTxmStRICg=dE64
zOF#WR>w4$3J${}SbS-NZ&Ak6kuskNL*35kIt<pUn#`~|c$GS#+ELd=TrheqQiX0~6
z1q=M|?>TM1{glVS{{PDs&Q^L`>E-Kaf6o7=M+1|>57p%d+z-AtUBR;dz%Ewv^$#{H
lpA86_@ber$Qi%RKymP;0Trb;ohO4b0VNX{-mvv4FO#q##z108!

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b45368663314b7ad36ae0e24e2872bff461d0e5
GIT binary patch
literal 997
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1qt-49r!YE{-7;ac}RQ_nzV?bNr*Bj%n+bLjqd5
zo>TU)TwQr1czK_!EsNuGzrW1?H1ArMy_$49PmsHDMuyzBKY^0mTib8_@Hu~AlkWL-
zzimFhd1L%uT<7&?jUR8y?W~RMy5gCE_96p?F!6OdCSN`H3>hkW4z7H%Q~&%tyN%)#
zWfnQC+WpEtU{}Z2ucc{CO{{_6ckZ<OeYR9EJ3G5&fx_FbWsd`PT+4r>_v+xKP^SkI
zU)}zf#;wG#sC$=n^~#;*R<0a20kNU?uN|DehVjG}&YaRM+l@aJ<{YxIvd^46YmOUV
zi2v2luc31%U*35_m*J69!JoZ}!n5bNv8`JC>Sgi=)$0r##*TG0`#u*>-1aYH?Wz#1
zKP3|aqyB!n!SKwEdCRKnufNR{XgQtDQ1-3=&F5END}VQVsNijg-oEPg?r#zgKZ-H%
z?pyY6=EjRpcz!*s{`|a_?Z&NJQZuFYXFSWllO}(m^`61i%ahM4Wlz;)*cz3)<hEbP
z{Q2|ddG%fBWQ*%B-|GCiAo1vmxV=|Gzxwn2o>s}`!QFW7|F7C(J@e;o(dYVq`N027
zlU}y}_qL`+t6%jl^<JGV*Q~#Dt^QoSYq3wxys0V9Ouf42ZpG75TWPm<bJriV|Mlt4
zojqR<<<za1mH&J9wy?}nSuHNdPl~rRSn}1<-rVw^tF%<W;0JQ-U}L8&{{MZody$36
zo-&?JLEW#)%MUJJTDK&on4Q-S$h&gu?%~#kZ#xAu^WQHLXt@_O-*<s~)@<=A<y@u*
zGr1jC=ziVH?r=Hb&FqEOW-4e&RV<A=J0XeFak*K(Ux(=jGv*gZ_u1HN`}^Tu{om`Z
zGN6DgJzP^$dC|-{gyV{g;kTs<F87!goSSan$DgC_v(-72!^}=zWxlJ%o;)T|rmc>p
zdz-IHSf=fZKFIDp+ab5lDtE%EZ8}SGnHEnCo8q-JXxHtfcbx=+JoemY_gGwBUs`Q`
zW46lQS4)@HX>dhO{<7$D)I4pD?%w&&?tGb1x%cNvlh-NB1$a_le_vBI^OH!^h5EuK
z9zP+by4I*Ujqez5?W}&bx%}Pqcgve!d^KXWkgEB&XjzJ%5W~d>pSPE)I&)ko=D2e`
z^8=^D$rA2^p6Og)@)OKeFR@vknyrc)x;qV?>BlbaJfZIX%?Bjz>FVdQ&MBb@063t*
Ar~m)}

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/meta.json
new file mode 100644
index 00000000000..2fcf294bc98
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Energy Shotgun inhands made by Boaz1111 based on the energy shotgun icon sprite made by Papermaker48 for SS14",
+    "size": {
+        "x": 64,
+        "y": 64
+    },
+    "states": [
+        {
+            "name": "energy-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "energy-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..056e6026ac107802ca61d274e1be6aad0ecb67b8
GIT binary patch
literal 1132
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1qucHH@Avjv*CsZ|~mEo*gQ2;G??zt(~gNblrBV
z_4WL#m}t1+;=vewmi49KO(8EF1oYd=|1s`;A^%`$T!(^2PF47qZ9DGl;FSzrliZt|
zdtKLe>BVDezROjP&%11{c>0#f?EFi6ZhmKe_~*pw*`Mcpp7UKb+#To=EMP~=aXs0>
ztQVnI@7`5CniM!~vb|MRzDfIaJ=up}r>Oj?@n~Y)KS!=p`>yzAx6qs&b+NN|Tv+?)
z<Bm&9@3PLGxBS)4qDjfSuWZs0<!gU?ZJyJ@gzK+Prx<+-OYz<0{NCgIBlAxud+V*=
zy)?A3StBMU#@GA$Pqz4#v(neKulM%$hKkiCCp%9%xnyzi;~Qt)&PBYs^rPkOEn|E8
z{Of#SI@44p?oiX8(pA=f;{5CSkYiu(th_vx^TZlGYpI&eA^nlBt)ETLFxe%Y{^-I-
ze_!8~Cr_R{Rk|xT{ORe{@h9`Q-!@^~;-Rz3i+{?OXhX~2FW3C}@=yAa?Ei?a_!@<s
z^`D+eh1MLKa_d{zttm6Fyr0+D*yyz&J3D)7;o4u#%j~zzR%pKXZ<{~U-XGrIuRqOS
ze}2nmIaT?-xs$Jcm5tn0{CVT?b@Ms2PisH2eKzsRsoLYo<$v0$6#t%|H|6b}Wpg;b
z%`&=hTf02}yxqn8qi*MBvg|0z57cX`j+w}CKQHC!UGerea)R^Ee|PC#|MKUWdjjhM
z_Rjvlex14aRKKR|<G(}RF5W8p((u*BSBC7)@vAql-*fL;a$Z#0)X5JDH*Yt4%pPyG
z{>y!@z1^FBmWJCfRx$m3w!T0^WI}wN?7w^OGpZa<%kR#P?~QpJX4U!ic;2<8_kWgc
zRgIc8_p8{A()X5F(gJp&TMj?(R2Q@DGyUbU_p*#w{_dmqz8sc1{rtW-7whG9+qP~^
zJym0;KheWw)6F%R=0)e~cCQl8-&$f7+xb)Daqchv{y7`3Ed9v2`|F08GbK+xEm}6u
zYw3|qI>Ga!qYP7b&llb^zv`o(zyIu@<EzB&C3t3)DHWDH=idIL{qe`W#}|EbU_J8v
zUV6~3UlV)k{_Q;z+jn~YOWDtN?;Mg1p2q9;J9ak9&i&h#tbV_QWw(6q_5ZI+e|t@g
zp4oogLEi4}sTt8$JAb`Nu+{u|*4I+-&D6Jd;&#rOWBT}l`?}fO<*_@rYlt7VUFXxV
zsrgZDWqR1Y-P&@0Yv0a18Tr2O>9r&I9?I%1uU#&re|UX2p?qhU^2e~>3y&67zulBt
za?IRFGyna&e|{G-_RNZ__<N;V>xJjd{3O0t<-5yzzn{2oy!GJqeZtmfFN^78glmS_
a#QzMkK{F5CPWvbVlJ#`;b6Mw<&;$TNav+HS

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5933b2f698b070a7724cce6b2071f83ef4f2907
GIT binary patch
literal 1147
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1qucH3FV4jv*CsZ|~mEo*gQ2;G_D<ZF;%4wy51Q
zi}sD39dhi5oBC^ko*))SH+`0y35OCY7Eb@ixc7zpgSi!oO&c1o-mZMVZc(%6-U*7H
z(K@l0LY1<!jbg7qneq9V%2}_=C6nUwfBki^cwhYM+u7f9KF={fc~ubT6fD5(p+Ro6
zH1Ga}F?!Q;^6e*HT^gTLc)skRN$%m;y%kQbN`gzHFRLE>*umANzIMm0j~N<^Y;2Do
z`Cl{NLbmem)oW|2_4oMP_%>_XEW5c@>&%YZiM+q`{gZQ6M2+42pQjJr$=hzJ<+c2>
zQ2+7UpEL#d+Na)sZ$8mOM@;+v^VXH!ug;yfzq;rB$B%_uckH;a<<F~sZu=%)Ec*I?
z>o518zt;2Z3wZbc^2<pXUvdj~X4yBWsi~a_yx9A5_M{!x=dlV{Nr%bD?#oh|c=P7X
zPqpXHo?Urr$E*yKRg+FGv8maUT-Bv@eAB#FRe`oYPoFHkspYf5Y|~`T`1*>99We~q
z+1Y&Y4^*|^y_4Pa%cT8v{OYfBUI<>_x?aWp|4g5{zl;BT^K`lPSo_hNB9AQ9n-dyW
zOn3M&<&=GxkPPps#IQec>2doOxUu=465qJ{QRvb7_otsfIkWO$n}}nq{tE5~VO7EF
z=E!Y+H1){c<?GgWJNWP8TwV1s$0gO=Y{~7*`u#>n%bvey4|_Nx_}0C|;=BENO)+}u
zN)z+n>z`EJzdg~vao0uGg4?zWnihV3_2aj9>2IZwpI<Dr&h7m+?bDaq^xma%mrwOy
zt6G)q`f~P{Z#-S=;{I;V{rTPc>FfXVMFVG5Sg-w4RrU1iid(l%MJ4Z?8JquK-9fj?
zDSPd+OO{*DZI=G4eLzOe!~Wmb(=EK$Cv{n66!pK#V#ks`unH}h*!1w^r+vRe`*XMG
z|KFUEx=;7+lEC*<-+!%Ao$7V+!i9HwkA4^Kz8e<3Q+@y4Dc}CfzOYI=s=9aY-e(!%
zn?L2gOn9~TQ|auJDQlECSeU~8pE=WW^<8Q5zhx@#j^>6lEbXlSepb^{MJO!3^Z4V5
zFJEQ~+pd-TX;y0R)#1%uhDwz^zh_kEy;w5mcadY=-hX`-`t^D{^X;acDGQrtQ=>4i
zG48hCzoMeMF08Fe_4+1?-zR7Pes=rmiCMy~Vq#)a^YSmVZ7~tJ_s2f;ez5rA#b??|
zs(-m|xBdI~+LPOr_K9=9ul=$t#?n@;(*4}4=w5O4ZNi_|dhxrQvHjo^pJkQEUO4yr
zTc>*mFZ`UfbBj{^^32(fCf(2G?cn5J!oD~->=1kFp6r)PYWQ8%_rxC!f4zNo+1c$+
pMYo&(^owV8*Nw*r(F+<%{~0#~HXL$x+kF)z>*?y}vd$@?2>=$cCIbKf

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/heavylaser.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/heavylaser.png
new file mode 100644
index 0000000000000000000000000000000000000000..4db201c77cb1642fc0edc27a878319a164e6d7ed
GIT binary patch
literal 340
zcmV-a0jvIrP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<S21!IgRCt{2)=dtAFc1acl8~5q2E)dqxT|Y#pm*>H-l5#UHSA2d
zh#TS=Ok63Q(xws`I#bZi%!cxp_mu$CylEQo&&pG7-blID+eckLe+sa{+uf>w15&nB
z2pXWnU9b>E4-poEMW6s)_!qzyK#+)Nz#!ZPtA2Z;B2r#LCH6-%s!HV}Fck$DnLUKR
z4`(=^4G@^8FbS9n*QLi)MACm?j$!}<7{CAqFn|WAO6Y#B9bYeSY!Lvo)2^+$b)RXs
zDsZ_zrx&R0{q~w?JrG26y+5;iX7=dtXuy&c4G292Hzv#;1qdQck;2h{076j1Nq{i~
mHJl9a5pGPZq^}?)*wzO;*Qe?u`>1080000<MNUMnLSTZM&4vB|

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/meta.json
index f87ad790f69..19d8b15dcc2 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/meta.json
@@ -46,6 +46,9 @@
           0.05
         ]
       ]
+    },
+    {
+      "name": "heavylaser"
     }
   ]
 }
\ No newline at end of file

From 59bd7c1084c9b804b1bfe137c3d6f367480b6c9c Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Tue, 17 Dec 2024 12:09:32 -0400
Subject: [PATCH 183/366] remove energy shotgun objective

---
 .../Weapons/Guns/Battery/battery_guns.yml        |  2 +-
 .../Prototypes/Objectives/stealTargetGroups.yml  |  7 -------
 Resources/Prototypes/Objectives/traitor.yml      | 16 ----------------
 3 files changed, 1 insertion(+), 24 deletions(-)

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 312b2012244..70f8d0301b7 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -898,7 +898,7 @@
     tags:
     - HighRiskItem
   - type: StealTarget
-    stealGroup: WeaponEnergyShotgun
+    stealGroup: HoSAntiqueWeapon
   - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
   - type: Battery
     maxCharge: 1200
diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml
index c0c839a66cc..9ba05f14c32 100644
--- a/Resources/Prototypes/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml
@@ -91,13 +91,6 @@
     sprite: Objects/Weapons/Guns/Battery/pulse_pistol.rsi
     state: base
 
-- type: stealTargetGroup
-  id: WeaponEnergyShotgun
-  name: energy shotgun
-  sprite:
-    sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi
-    state: base
-
 # Thief Collection
 
 - type: stealTargetGroup
diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml
index 9b9cac1e61e..eecff55cd63 100644
--- a/Resources/Prototypes/Objectives/traitor.yml
+++ b/Resources/Prototypes/Objectives/traitor.yml
@@ -222,22 +222,6 @@
     stealGroup: HandTeleporter
     verifyMapExistence: true
 
-## hos
-
-- type: entity
-  categories: [HideSpawnMenu]
-  parent: BaseTraitorStealObjective
-  id: EnergyShotgunStealObjective
-  components:
-  - type: Objective
-    # HoS will have this on them a lot of the time so..
-    difficulty: 3
-  - type: NotJobRequirement
-    job: HeadOfSecurity
-  - type: StealCondition
-    stealGroup: WeaponEnergyShotgun
-    owner: job-name-hos
-
 ## ce
 
 - type: entity

From b985bc9cd05b3a6dd1cb75b6d1c80323ddf365ad Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Tue, 17 Dec 2024 12:10:36 -0400
Subject: [PATCH 184/366] remove whitelist fail message

---
 Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index a4e85ca822a..621d2a88ec1 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -188,7 +188,6 @@
           whitelist:
             tags:
               - MagazinePistolSubMachineGun
-          whitelistFailPopup: gun-magazine-whitelist-fail
         gun_chamber:
           name: Chamber
           startingItem: CartridgePistol

From 9133bf9d722826f2c8736cd8cf72d82550dd861e Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Tue, 17 Dec 2024 12:13:22 -0400
Subject: [PATCH 185/366] updates

---
 .../Weapons/Ranged/Systems/GunSystem.cs        | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
index b809bb85efc..34c59224982 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
@@ -93,7 +93,9 @@ private void OnUpdateClientAmmo(EntityUid uid, AmmoCounterComponent ammoComp, re
 
     private void OnMuzzleFlash(MuzzleFlashEvent args)
     {
-        CreateEffect(GetEntity(args.Uid), args);
+        var gunUid = GetEntity(args.Uid);
+
+        CreateEffect(gunUid, args, gunUid);
     }
 
     private void OnHitscan(HitscanEvent ev)
@@ -181,7 +183,7 @@ public override void Update(float frameTime)
         }
 
         // Define target coordinates relative to gun entity, so that network latency on moving grids doesn't fuck up the target location.
-        var coordinates = EntityCoordinates.FromMap(entity, mousePos, TransformSystem, EntityManager);
+        var coordinates = TransformSystem.ToCoordinates(entity, mousePos);
 
         NetEntity? target = null;
         if (_state.CurrentState is GameplayStateBase screen)
@@ -205,7 +207,7 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
         // Rather than splitting client / server for every ammo provider it's easier
         // to just delete the spawned entities. This is for programmer sanity despite the wasted perf.
         // This also means any ammo specific stuff can be grabbed as necessary.
-        var direction = fromCoordinates.ToMapPos(EntityManager, TransformSystem) - toCoordinates.ToMapPos(EntityManager, TransformSystem);
+        var direction = TransformSystem.ToMapCoordinates(fromCoordinates).Position - TransformSystem.ToMapCoordinates(toCoordinates).Position;
         var worldAngle = direction.ToAngle().Opposite();
 
         foreach (var (ent, shootable) in ammo)
@@ -276,7 +278,7 @@ protected override void Popup(string message, EntityUid? uid, EntityUid? user)
         PopupSystem.PopupEntity(message, uid.Value, user.Value);
     }
 
-    protected override void CreateEffect(EntityUid gunUid, MuzzleFlashEvent message, EntityUid? user = null)
+    protected override void CreateEffect(EntityUid gunUid, MuzzleFlashEvent message, EntityUid? tracked = null)
     {
         if (!Timing.IsFirstTimePredicted)
             return;
@@ -285,7 +287,7 @@ protected override void CreateEffect(EntityUid gunUid, MuzzleFlashEvent message,
         // TODO: Check to see why invalid entities are firing effects.
         if (gunUid == EntityUid.Invalid)
         {
-            Log.Debug($"Invalid Entity sent MuzzleFlashEvent (proto: {message.Prototype}, user: {user})");
+            Log.Debug($"Invalid Entity sent MuzzleFlashEvent (proto: {message.Prototype}, gun: {ToPrettyString(gunUid)})");
             return;
         }
 
@@ -309,10 +311,10 @@ protected override void CreateEffect(EntityUid gunUid, MuzzleFlashEvent message,
         var ent = Spawn(message.Prototype, coordinates);
         TransformSystem.SetWorldRotationNoLerp(ent, message.Angle);
 
-        if (user != null)
+        if (tracked != null)
         {
             var track = EnsureComp<TrackUserComponent>(ent);
-            track.User = user;
+            track.User = tracked;
             track.Offset = Vector2.UnitX / 2f;
         }
 
@@ -388,6 +390,6 @@ protected override void CreateEffect(EntityUid gunUid, MuzzleFlashEvent message,
         var uidPlayer = EnsureComp<AnimationPlayerComponent>(gunUid);
 
         _animPlayer.Stop(gunUid, uidPlayer, "muzzle-flash-light");
-        _animPlayer.Play((gunUid, uidPlayer), animTwo,"muzzle-flash-light");
+        _animPlayer.Play((gunUid, uidPlayer), animTwo, "muzzle-flash-light");
     }
 }

From 76df82d24180ea53b3f89fd9aa5adad5b413e3f5 Mon Sep 17 00:00:00 2001
From: Kara <lunarautomaton6@gmail.com>
Date: Sun, 12 May 2024 07:31:54 -0700
Subject: [PATCH 186/366] Resolve `'TransformComponent.MapPosition' is
 obsolete` in content (#27939)

* Resolve `'TransformComponent.MapPosition' is obsolete: 'Use TransformSystem.GetMapCoordinates'` in content

* build?
---
 .../UI/SpawnExplosion/SpawnExplosionWindow.xaml.cs     |  6 ++++--
 Content.Client/GPS/UI/HandheldGpsStatusControl.cs      |  5 ++++-
 Content.Client/MouseRotator/MouseRotatorSystem.cs      |  3 ++-
 .../Radiation/Overlays/RadiationPulseOverlay.cs        |  9 +++++++--
 Content.Client/Sprite/SpriteFadeSystem.cs              |  4 +++-
 Content.Client/Tabletop/TabletopSystem.cs              |  5 +++--
 .../UserInterface/Systems/Chat/ChatUIController.cs     |  5 +++--
 Content.Client/Verbs/VerbSystem.cs                     |  5 +++--
 Content.Client/Weapons/Melee/MeleeArcOverlay.cs        |  6 ++++--
 Content.Client/Weapons/Melee/MeleeSpreadCommand.cs     |  3 ++-
 Content.Client/Weapons/Melee/MeleeWeaponSystem.cs      |  2 +-
 Content.Client/Weapons/Ranged/GunSpreadOverlay.cs      |  6 ++++--
 Content.Client/Weapons/Ranged/Systems/GunSystem.cs     |  3 ++-
 Content.IntegrationTests/Tests/Doors/AirlockTest.cs    |  2 +-
 Content.IntegrationTests/Tests/Hands/HandTests.cs      |  4 +++-
 .../Tests/Interaction/InRangeUnobstructed.cs           |  4 +++-
 .../Administration/Commands/ExplosionCommand.cs        |  3 ++-
 .../Administration/Systems/AdminVerbSystem.Smites.cs   |  2 +-
 .../Anomaly/Effects/ElectricityAnomalySystem.cs        |  2 +-
 .../Anomaly/Effects/InjectionAnomalySystem.cs          |  4 +++-
 Content.Server/Beam/BeamSystem.cs                      |  6 ++++--
 .../Chemistry/ReactionEffects/AreaReactionEffect.cs    | 10 +++++++---
 .../ReactionEffects/CreateEntityReactionEffect.cs      |  2 +-
 .../Chemistry/ReactionEffects/EmpReactionEffect.cs     |  6 ++++--
 Content.Server/Cloning/CloningSystem.cs                |  1 -
 .../Construction/ConstructionSystem.Initial.cs         |  2 +-
 .../Thresholds/Behaviors/SpawnEntitiesBehavior.cs      |  7 +++++--
 Content.Server/Dragon/DragonSystem.cs                  |  2 +-
 Content.Server/Emp/EmpSystem.cs                        |  4 +++-
 .../Explosion/EntitySystems/SmokeOnTriggerSystem.cs    |  7 +++++--
 Content.Server/Fluids/EntitySystems/DrainSystem.cs     |  4 +++-
 .../GameTicking/Rules/DeathMatchRuleSystem.cs          |  4 +++-
 Content.Server/Gatherable/GatherableSystem.cs          |  1 +
 Content.Server/Guardian/GuardianSystem.cs              |  2 +-
 Content.Server/Kitchen/EntitySystems/SharpSystem.cs    |  4 +++-
 Content.Server/Lightning/LightningSystem.cs            |  8 +++-----
 Content.Server/Lightning/LightningTargetSystem.cs      |  4 +++-
 Content.Server/NPC/Systems/NPCSteeringSystem.cs        |  2 +-
 Content.Server/NPC/Systems/NPCUtilitySystem.cs         |  2 +-
 Content.Server/Nuke/NukeSystem.cs                      |  2 +-
 Content.Server/Nutrition/EntitySystems/FoodSystem.cs   |  4 +++-
 Content.Server/PDA/Ringer/RingerSystem.cs              |  3 ++-
 Content.Server/Payload/EntitySystems/PayloadSystem.cs  |  4 +++-
 .../Pointing/EntitySystems/PointingSystem.cs           |  2 +-
 Content.Server/Respawn/SpecialRespawnSystem.cs         |  2 +-
 .../Singularity/EntitySystems/EventHorizonSystem.cs    |  4 ++--
 .../XenoArtifacts/Effects/Systems/EmpArtifactSystem.cs |  6 ++++--
 .../Effects/Systems/SpawnArtifactSystem.cs             |  2 +-
 .../Effects/Systems/ThrowArtifactSystem.cs             |  4 +++-
 Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs |  3 ++-
 .../Hands/EntitySystems/SharedHandsSystem.Pickup.cs    |  4 ++--
 Content.Shared/Interaction/RotateToFaceSystem.cs       |  2 +-
 Content.Shared/Interaction/SharedInteractionSystem.cs  |  6 +++---
 .../Storage/EntitySystems/MagnetPickupSystem.cs        |  2 +-
 Content.Shared/Tabletop/SharedTabletopSystem.cs        |  6 +++---
 Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs   |  2 +-
 .../Ranged/Systems/SharedGunSystem.Ballistic.cs        |  4 ++--
 57 files changed, 142 insertions(+), 81 deletions(-)

diff --git a/Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionWindow.xaml.cs b/Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionWindow.xaml.cs
index 5f187cad794..b0d8a946ec5 100644
--- a/Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionWindow.xaml.cs
+++ b/Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionWindow.xaml.cs
@@ -3,6 +3,7 @@
 using JetBrains.Annotations;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Console;
+using Robust.Client.GameObjects;
 using Robust.Client.Player;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
@@ -22,7 +23,7 @@ public sealed partial class SpawnExplosionWindow : DefaultWindow
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IEntityManager _entMan = default!;
-
+    private readonly SharedTransformSystem _transform = default!;
 
     private readonly SpawnExplosionEui _eui;
     private List<MapId> _mapData = new();
@@ -37,6 +38,7 @@ public SpawnExplosionWindow(SpawnExplosionEui eui)
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
+        _transform = _entMan.System<TransformSystem>();
         _eui = eui;
 
         ExplosionOption.OnItemSelected += ExplosionSelected;
@@ -104,7 +106,7 @@ private void SetLocation()
 
         _pausePreview = true;
         MapOptions.Select(_mapData.IndexOf(transform.MapID));
-        (MapX.Value, MapY.Value) = transform.MapPosition.Position;
+        (MapX.Value, MapY.Value) = _transform.GetMapCoordinates(_playerManager.LocalEntity!.Value, xform: transform).Position;
         _pausePreview = false;
 
         UpdatePreview();
diff --git a/Content.Client/GPS/UI/HandheldGpsStatusControl.cs b/Content.Client/GPS/UI/HandheldGpsStatusControl.cs
index de6a1031bad..7dcf3f29c51 100644
--- a/Content.Client/GPS/UI/HandheldGpsStatusControl.cs
+++ b/Content.Client/GPS/UI/HandheldGpsStatusControl.cs
@@ -1,6 +1,7 @@
 using Content.Client.GPS.Components;
 using Content.Client.Message;
 using Content.Client.Stylesheets;
+using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Timing;
@@ -13,11 +14,13 @@ public sealed class HandheldGpsStatusControl : Control
     private readonly RichTextLabel _label;
     private float _updateDif;
     private readonly IEntityManager _entMan;
+    private readonly SharedTransformSystem _transform;
 
     public HandheldGpsStatusControl(Entity<HandheldGPSComponent> parent)
     {
         _parent = parent;
         _entMan = IoCManager.Resolve<IEntityManager>();
+        _transform = _entMan.System<TransformSystem>();
         _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
         AddChild(_label);
         UpdateGpsDetails();
@@ -41,7 +44,7 @@ private void UpdateGpsDetails()
         var posText = "Error";
         if (_entMan.TryGetComponent(_parent, out TransformComponent? transComp))
         {
-            var pos =  transComp.MapPosition;
+            var pos =  _transform.GetMapCoordinates(_parent.Owner, xform: transComp);
             var x = (int) pos.X;
             var y = (int) pos.Y;
             posText = $"({x}, {y})";
diff --git a/Content.Client/MouseRotator/MouseRotatorSystem.cs b/Content.Client/MouseRotator/MouseRotatorSystem.cs
index 363c8248c96..a60990301f6 100644
--- a/Content.Client/MouseRotator/MouseRotatorSystem.cs
+++ b/Content.Client/MouseRotator/MouseRotatorSystem.cs
@@ -2,6 +2,7 @@
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.Player;
+using Robust.Client.Replays.Loading;
 using Robust.Shared.Map;
 using Robust.Shared.Timing;
 
@@ -37,7 +38,7 @@ public override void Update(float frameTime)
         if (mapPos.MapId == MapId.Nullspace)
             return;
 
-        var angle = (mapPos.Position - xform.MapPosition.Position).ToWorldAngle();
+        var angle = (mapPos.Position - _transform.GetMapCoordinates(player.Value, xform: xform).Position).ToWorldAngle();
 
         var curRot = _transform.GetWorldRotation(xform);
 
diff --git a/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs b/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
index 9012767ef3f..8d5607af2d0 100644
--- a/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
+++ b/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
@@ -1,9 +1,11 @@
 using System.Numerics;
 using Content.Shared.Radiation.Components;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
 using Robust.Shared.Graphics;
 using Robust.Shared.Map;
+using Robust.Shared.Physics;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
@@ -14,6 +16,7 @@ public sealed class RadiationPulseOverlay : Overlay
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
+        private TransformSystem? _transform;
 
         private const float MaxDist = 15.0f;
 
@@ -72,6 +75,8 @@ protected override void Draw(in OverlayDrawArgs args)
         //Queries all pulses on the map and either adds or removes them from the list of rendered pulses based on whether they should be drawn (in range? on the same z-level/map? pulse entity still exists?)
         private void RadiationQuery(IEye? currentEye)
         {
+            _transform ??= _entityManager.System<TransformSystem>();
+
             if (currentEye == null)
             {
                 _pulses.Clear();
@@ -91,7 +96,7 @@ private void RadiationQuery(IEye? currentEye)
                             (
                                 _baseShader.Duplicate(),
                                 new RadiationShaderInstance(
-                                    _entityManager.GetComponent<TransformComponent>(pulseEntity).MapPosition,
+                                    _transform.GetMapCoordinates(pulseEntity),
                                     pulse.VisualRange,
                                     pulse.StartTime,
                                     pulse.VisualDuration
@@ -109,7 +114,7 @@ private void RadiationQuery(IEye? currentEye)
                     _entityManager.TryGetComponent(pulseEntity, out RadiationPulseComponent? pulse))
                 {
                     var shaderInstance = _pulses[pulseEntity];
-                    shaderInstance.instance.CurrentMapCoords = _entityManager.GetComponent<TransformComponent>(pulseEntity).MapPosition;
+                    shaderInstance.instance.CurrentMapCoords = _transform.GetMapCoordinates(pulseEntity);
                     shaderInstance.instance.Range = pulse.VisualRange;
                 } else {
                     _pulses[pulseEntity].shd.Dispose();
diff --git a/Content.Client/Sprite/SpriteFadeSystem.cs b/Content.Client/Sprite/SpriteFadeSystem.cs
index dda3a6c948e..d9584b60a65 100644
--- a/Content.Client/Sprite/SpriteFadeSystem.cs
+++ b/Content.Client/Sprite/SpriteFadeSystem.cs
@@ -3,6 +3,7 @@
 using Robust.Client.GameObjects;
 using Robust.Client.Player;
 using Robust.Client.State;
+using Robust.Shared.Physics;
 
 namespace Content.Client.Sprite;
 
@@ -15,6 +16,7 @@ public sealed class SpriteFadeSystem : EntitySystem
 
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IStateManager _stateManager = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
 
     private readonly HashSet<FadingSpriteComponent> _comps = new();
 
@@ -48,7 +50,7 @@ _stateManager.CurrentState is GameplayState state &&
             spriteQuery.TryGetComponent(player, out var playerSprite))
         {
             var fadeQuery = GetEntityQuery<SpriteFadeComponent>();
-            var mapPos = playerXform.MapPosition;
+            var mapPos = _transform.GetMapCoordinates(_playerManager.LocalEntity!.Value, xform: playerXform);
 
             // Also want to handle large entities even if they may not be clickable.
             foreach (var ent in state.GetClickableEntities(mapPos))
diff --git a/Content.Client/Tabletop/TabletopSystem.cs b/Content.Client/Tabletop/TabletopSystem.cs
index 696c1455e0c..0b55a1839c0 100644
--- a/Content.Client/Tabletop/TabletopSystem.cs
+++ b/Content.Client/Tabletop/TabletopSystem.cs
@@ -258,7 +258,7 @@ private void StopDragging(bool broadcast = true)
             // Set the dragging player on the component to noone
             if (broadcast && _draggedEntity != null && EntityManager.HasComponent<TabletopDraggableComponent>(_draggedEntity.Value))
             {
-                RaisePredictiveEvent(new TabletopMoveEvent(GetNetEntity(_draggedEntity.Value), Transform(_draggedEntity.Value).MapPosition, GetNetEntity(_table!.Value)));
+                RaisePredictiveEvent(new TabletopMoveEvent(GetNetEntity(_draggedEntity.Value), Transforms.GetMapCoordinates(_draggedEntity.Value), GetNetEntity(_table!.Value)));
                 RaisePredictiveEvent(new TabletopDraggingPlayerChangedEvent(GetNetEntity(_draggedEntity.Value), false));
             }
 
@@ -277,7 +277,8 @@ private static MapCoordinates ClampPositionToViewport(MapCoordinates coordinates
             if (coordinates == MapCoordinates.Nullspace) return MapCoordinates.Nullspace;
 
             var eye = viewport.Eye;
-            if (eye == null) return MapCoordinates.Nullspace;
+            if (eye == null)
+                return MapCoordinates.Nullspace;
 
             var size = (Vector2) viewport.ViewportSize / EyeManager.PixelsPerMeter; // Convert to tiles instead of pixels
             var eyePosition = eye.Position.Position;
diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
index b1d8b01050c..4bfea889a10 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -61,6 +61,7 @@ public sealed class ChatUIController : UIController
     [UISystemDependency] private readonly TypingIndicatorSystem? _typingIndicator = default;
     [UISystemDependency] private readonly ChatSystem? _chatSys = default;
     [UISystemDependency] private readonly PsionicChatUpdateSystem? _psionic = default!; //Nyano - Summary: makes the psionic chat available.
+    [UISystemDependency] private readonly TransformSystem? _transform = default;
 
     [ValidatePrototypeId<ColorPalettePrototype>]
     private const string ChatNamePalette = "ChatNames";
@@ -638,7 +639,7 @@ private void UpdateQueuedSpeechBubbles(FrameEventArgs delta)
         var predicate = static (EntityUid uid, (EntityUid compOwner, EntityUid? attachedEntity) data)
             => uid == data.compOwner || uid == data.attachedEntity;
         var playerPos = player != null
-            ? EntityManager.GetComponent<TransformComponent>(player.Value).MapPosition
+            ? _transform?.GetMapCoordinates(player.Value) ?? MapCoordinates.Nullspace
             : MapCoordinates.Nullspace;
 
         var occluded = player != null && _examine.IsOccluded(player.Value);
@@ -657,7 +658,7 @@ private void UpdateQueuedSpeechBubbles(FrameEventArgs delta)
                 continue;
             }
 
-            var otherPos = EntityManager.GetComponent<TransformComponent>(ent).MapPosition;
+            var otherPos = _transform?.GetMapCoordinates(ent) ?? MapCoordinates.Nullspace;
 
             if (occluded && !_examine.InRangeUnOccluded(
                     playerPos,
diff --git a/Content.Client/Verbs/VerbSystem.cs b/Content.Client/Verbs/VerbSystem.cs
index 49a3785eb28..2e6c5f58099 100644
--- a/Content.Client/Verbs/VerbSystem.cs
+++ b/Content.Client/Verbs/VerbSystem.cs
@@ -22,6 +22,7 @@ public sealed class VerbSystem : SharedVerbSystem
         [Dependency] private readonly PopupSystem _popupSystem = default!;
         [Dependency] private readonly ExamineSystem _examine = default!;
         [Dependency] private readonly TagSystem _tagSystem = default!;
+        [Dependency] private readonly SharedTransformSystem _transform = default!;
         [Dependency] private readonly IStateManager _stateManager = default!;
         [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
@@ -141,7 +142,7 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true
             if ((visibility & MenuVisibility.NoFov) == 0)
             {
                 var xformQuery = GetEntityQuery<TransformComponent>();
-                var playerPos = xformQuery.GetComponent(player.Value).MapPosition;
+                var playerPos = _transform.GetMapCoordinates(player.Value, xform: xformQuery.GetComponent(player.Value));
 
                 for (var i = entities.Count - 1; i >= 0; i--)
                 {
@@ -149,7 +150,7 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true
 
                     if (!_examine.InRangeUnOccluded(
                         playerPos,
-                        xformQuery.GetComponent(entity).MapPosition,
+                        _transform.GetMapCoordinates(entity, xform: xformQuery.GetComponent(entity)),
                         ExamineSystemShared.ExamineRange,
                         null))
                     {
diff --git a/Content.Client/Weapons/Melee/MeleeArcOverlay.cs b/Content.Client/Weapons/Melee/MeleeArcOverlay.cs
index dbd68c15e24..e7b6c8b0d60 100644
--- a/Content.Client/Weapons/Melee/MeleeArcOverlay.cs
+++ b/Content.Client/Weapons/Melee/MeleeArcOverlay.cs
@@ -20,10 +20,11 @@ public sealed class MeleeArcOverlay : Overlay
     private readonly IPlayerManager _playerManager;
     private readonly MeleeWeaponSystem _melee;
     private readonly SharedCombatModeSystem _combatMode;
+    private readonly SharedTransformSystem _transform = default!;
 
     public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowFOV;
 
-    public MeleeArcOverlay(IEntityManager entManager, IEyeManager eyeManager, IInputManager inputManager, IPlayerManager playerManager, MeleeWeaponSystem melee, SharedCombatModeSystem combatMode)
+    public MeleeArcOverlay(IEntityManager entManager, IEyeManager eyeManager, IInputManager inputManager, IPlayerManager playerManager, MeleeWeaponSystem melee, SharedCombatModeSystem combatMode, SharedTransformSystem transform)
     {
         _entManager = entManager;
         _eyeManager = eyeManager;
@@ -31,6 +32,7 @@ public MeleeArcOverlay(IEntityManager entManager, IEyeManager eyeManager, IInput
         _playerManager = playerManager;
         _melee = melee;
         _combatMode = combatMode;
+        _transform = transform;
     }
 
     protected override void Draw(in OverlayDrawArgs args)
@@ -52,7 +54,7 @@ protected override void Draw(in OverlayDrawArgs args)
         if (mapPos.MapId != args.MapId)
             return;
 
-        var playerPos = xform.MapPosition;
+        var playerPos = _transform.GetMapCoordinates(player.Value, xform: xform);
 
         if (mapPos.MapId != playerPos.MapId)
             return;
diff --git a/Content.Client/Weapons/Melee/MeleeSpreadCommand.cs b/Content.Client/Weapons/Melee/MeleeSpreadCommand.cs
index 6b259a7fd54..eda469deaf0 100644
--- a/Content.Client/Weapons/Melee/MeleeSpreadCommand.cs
+++ b/Content.Client/Weapons/Melee/MeleeSpreadCommand.cs
@@ -35,6 +35,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             collection.Resolve<IInputManager>(),
             collection.Resolve<IPlayerManager>(),
             sysManager.GetEntitySystem<MeleeWeaponSystem>(),
-            sysManager.GetEntitySystem<SharedCombatModeSystem>()));
+            sysManager.GetEntitySystem<SharedCombatModeSystem>(),
+            sysManager.GetEntitySystem<SharedTransformSystem>()));
     }
 }
diff --git a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
index 9f2ee5eb8f6..d86172de718 100644
--- a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
@@ -146,7 +146,7 @@ public override void Update(float frameTime)
         if (!weapon.DisableClick &&
             (!weapon.SwapKeys ? useDown : altDown))
         {
-            var attackerPos = Transform(entity).MapPosition;
+            var attackerPos = TransformSystem.GetMapCoordinates(entity);
 
             if (mousePos.MapId != attackerPos.MapId ||
                 (attackerPos.Position - mousePos.Position).Length() > weapon.Range)
diff --git a/Content.Client/Weapons/Ranged/GunSpreadOverlay.cs b/Content.Client/Weapons/Ranged/GunSpreadOverlay.cs
index 62df764ae50..63d21c84635 100644
--- a/Content.Client/Weapons/Ranged/GunSpreadOverlay.cs
+++ b/Content.Client/Weapons/Ranged/GunSpreadOverlay.cs
@@ -18,8 +18,9 @@ public sealed class GunSpreadOverlay : Overlay
     private readonly IInputManager _input;
     private readonly IPlayerManager _player;
     private readonly GunSystem _guns;
+    private readonly SharedTransformSystem _transform;
 
-    public GunSpreadOverlay(IEntityManager entManager, IEyeManager eyeManager, IGameTiming timing, IInputManager input, IPlayerManager player, GunSystem system)
+    public GunSpreadOverlay(IEntityManager entManager, IEyeManager eyeManager, IGameTiming timing, IInputManager input, IPlayerManager player, GunSystem system, SharedTransformSystem transform)
     {
         _entManager = entManager;
         _eye = eyeManager;
@@ -27,6 +28,7 @@ public GunSpreadOverlay(IEntityManager entManager, IEyeManager eyeManager, IGame
         _timing = timing;
         _player = player;
         _guns = system;
+        _transform = transform;
     }
 
     protected override void Draw(in OverlayDrawArgs args)
@@ -41,7 +43,7 @@ protected override void Draw(in OverlayDrawArgs args)
             return;
         }
 
-        var mapPos = xform.MapPosition;
+        var mapPos = _transform.GetMapCoordinates(player.Value, xform: xform);
 
         if (mapPos.MapId == MapId.Nullspace)
             return;
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
index 34c59224982..0ad22bf1d87 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
@@ -60,7 +60,8 @@ public bool SpreadOverlay
                     Timing,
                     _inputManager,
                     _player,
-                    this));
+                    this,
+                    TransformSystem));
             }
             else
             {
diff --git a/Content.IntegrationTests/Tests/Doors/AirlockTest.cs b/Content.IntegrationTests/Tests/Doors/AirlockTest.cs
index fb77bf18d83..e47c73611a4 100644
--- a/Content.IntegrationTests/Tests/Doors/AirlockTest.cs
+++ b/Content.IntegrationTests/Tests/Doors/AirlockTest.cs
@@ -171,7 +171,7 @@ await server.WaitPost(() =>
             // Sloth: Okay I'm sorry but I hate having to rewrite tests for every refactor
             // If you see this yell at me in discord so I can continue to pretend this didn't happen.
             // REMINDER THAT I STILL HAVE TO FIX THIS TEST EVERY OTHER PHYSICS PR
-            // Assert.That(AirlockPhysicsDummy.Transform.MapPosition.X, Is.GreaterThan(AirlockPhysicsDummyStartingX));
+            // _transform.GetMapCoordinates(UID HERE, xform: Assert.That(AirlockPhysicsDummy.Transform).X, Is.GreaterThan(AirlockPhysicsDummyStartingX));
 
             // Blocked by the airlock
             await server.WaitAssertion(() =>
diff --git a/Content.IntegrationTests/Tests/Hands/HandTests.cs b/Content.IntegrationTests/Tests/Hands/HandTests.cs
index fdcd7f9096f..9ecabbeebf6 100644
--- a/Content.IntegrationTests/Tests/Hands/HandTests.cs
+++ b/Content.IntegrationTests/Tests/Hands/HandTests.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
+using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
@@ -24,6 +25,7 @@ public async Task TestPickupDrop()
         var playerMan = server.ResolveDependency<IPlayerManager>();
         var mapMan = server.ResolveDependency<IMapManager>();
         var sys = entMan.System<SharedHandsSystem>();
+        var tSys = entMan.System<TransformSystem>();
 
         var data = await pair.CreateTestMap();
         await pair.RunTicksSync(5);
@@ -35,7 +37,7 @@ await server.WaitPost(() =>
         {
             player = playerMan.Sessions.First().AttachedEntity!.Value;
             var xform = entMan.GetComponent<TransformComponent>(player);
-            item = entMan.SpawnEntity("Crowbar", xform.MapPosition);
+            item = entMan.SpawnEntity("Crowbar", tSys.GetMapCoordinates(player, xform: xform));
             hands = entMan.GetComponent<HandsComponent>(player);
             sys.TryPickup(player, item, hands.ActiveHand!);
         });
diff --git a/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs b/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs
index e5ac0f785aa..801433ae72b 100644
--- a/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs
@@ -1,5 +1,6 @@
 using System.Numerics;
 using Content.Shared.Interaction;
+using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
@@ -32,6 +33,7 @@ public async Task EntityEntityTest()
             var sEntities = server.ResolveDependency<IEntityManager>();
             var mapManager = server.ResolveDependency<IMapManager>();
             var conSystem = sEntities.EntitySysManager.GetEntitySystem<SharedContainerSystem>();
+            var tSystem = sEntities.EntitySysManager.GetEntitySystem<TransformSystem>();
 
             EntityUid origin = default;
             EntityUid other = default;
@@ -46,7 +48,7 @@ await server.WaitAssertion(() =>
                 origin = sEntities.SpawnEntity(HumanId, coordinates);
                 other = sEntities.SpawnEntity(HumanId, coordinates);
                 conSystem.EnsureContainer<Container>(other, "InRangeUnobstructedTestOtherContainer");
-                mapCoordinates = sEntities.GetComponent<TransformComponent>(other).MapPosition;
+                mapCoordinates = tSystem.GetMapCoordinates(other);
             });
 
             await server.WaitIdleAsync();
diff --git a/Content.Server/Administration/Commands/ExplosionCommand.cs b/Content.Server/Administration/Commands/ExplosionCommand.cs
index 56ed78b2e2e..81daca59c48 100644
--- a/Content.Server/Administration/Commands/ExplosionCommand.cs
+++ b/Content.Server/Administration/Commands/ExplosionCommand.cs
@@ -8,6 +8,7 @@
 using Robust.Shared.Prototypes;
 using System.Linq;
 using System.Numerics;
+using Robust.Server.GameObjects;
 
 namespace Content.Server.Administration.Commands;
 
@@ -105,7 +106,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             if (args.Length > 4)
                 coords = new MapCoordinates(new Vector2(x, y), xform.MapID);
             else
-                coords = xform.MapPosition;
+                coords = entMan.System<TransformSystem>().GetMapCoordinates(shell.Player.AttachedEntity.Value, xform: xform);
         }
 
         ExplosionPrototype? type;
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
index 183607db1a1..2aaab767c6b 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
@@ -101,7 +101,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
             Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/smite.svg.192dpi.png")),
             Act = () =>
             {
-                var coords = Transform(args.Target).MapPosition;
+                var coords = _transformSystem.GetMapCoordinates(args.Target);
                 Timer.Spawn(_gameTiming.TickPeriod,
                     () => _explosionSystem.QueueExplosion(coords, ExplosionSystem.DefaultExplosionPrototypeId,
                         4, 1, 2, maxTileBreak: 0), // it gibs, damage doesn't need to be high.
diff --git a/Content.Server/Anomaly/Effects/ElectricityAnomalySystem.cs b/Content.Server/Anomaly/Effects/ElectricityAnomalySystem.cs
index f2a060d6295..bd4718e8e35 100644
--- a/Content.Server/Anomaly/Effects/ElectricityAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/ElectricityAnomalySystem.cs
@@ -61,7 +61,7 @@ public override void Update(float frameTime)
             var damage = (int) (elec.MaxElectrocuteDamage * anom.Severity);
             var duration = elec.MaxElectrocuteDuration * anom.Severity;
 
-            foreach (var (ent, comp) in _lookup.GetEntitiesInRange<StatusEffectsComponent>(xform.MapPosition, range))
+            foreach (var (ent, comp) in _lookup.GetEntitiesInRange<StatusEffectsComponent>(_transform.GetMapCoordinates(uid, xform), range))
             {
                 _electrocution.TryDoElectrocution(ent, uid, damage, duration, true, statusEffects: comp, ignoreInsulation: true);
             }
diff --git a/Content.Server/Anomaly/Effects/InjectionAnomalySystem.cs b/Content.Server/Anomaly/Effects/InjectionAnomalySystem.cs
index 731d853280c..1fa0c00bd34 100644
--- a/Content.Server/Anomaly/Effects/InjectionAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/InjectionAnomalySystem.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Anomaly.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using System.Linq;
+using Robust.Server.GameObjects;
 
 namespace Content.Server.Anomaly.Effects;
 /// <summary>
@@ -16,6 +17,7 @@ public sealed class InjectionAnomalySystem : EntitySystem
 {
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
 
     private EntityQuery<InjectableSolutionComponent> _injectableQuery;
 
@@ -45,7 +47,7 @@ private void PulseScalableEffect(Entity<InjectionAnomalyComponent> entity, float
         //We get all the entity in the radius into which the reagent will be injected.
         var xformQuery = GetEntityQuery<TransformComponent>();
         var xform = xformQuery.GetComponent(entity);
-        var allEnts = _lookup.GetEntitiesInRange<InjectableSolutionComponent>(xform.MapPosition, injectRadius)
+        var allEnts = _lookup.GetEntitiesInRange<InjectableSolutionComponent>(_transform.GetMapCoordinates(entity, xform: xform), injectRadius)
             .Select(x => x.Owner).ToList();
 
         //for each matching entity found
diff --git a/Content.Server/Beam/BeamSystem.cs b/Content.Server/Beam/BeamSystem.cs
index 33f2f252d90..ad67f983c27 100644
--- a/Content.Server/Beam/BeamSystem.cs
+++ b/Content.Server/Beam/BeamSystem.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Beam;
 using Content.Shared.Beam.Components;
 using Content.Shared.Physics;
+using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map;
@@ -16,6 +17,7 @@ namespace Content.Server.Beam;
 public sealed class BeamSystem : SharedBeamSystem
 {
     [Dependency] private readonly FixtureSystem _fixture = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedBroadphaseSystem _broadphase = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
@@ -144,8 +146,8 @@ public void TryCreateBeam(EntityUid user, EntityUid target, string bodyPrototype
         if (Deleted(user) || Deleted(target))
             return;
 
-        var userMapPos = Transform(user).MapPosition;
-        var targetMapPos = Transform(target).MapPosition;
+        var userMapPos = _transform.GetMapCoordinates(user);
+        var targetMapPos = _transform.GetMapCoordinates(target);
 
         //The distance between the target and the user.
         var calculatedDistance = targetMapPos.Position - userMapPos.Position;
diff --git a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
index 024558f8de3..ebbf4e0341b 100644
--- a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
+++ b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
@@ -6,6 +6,7 @@
 using Content.Shared.FixedPoint;
 using Content.Shared.Maps;
 using JetBrains.Annotations;
+using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map;
@@ -58,15 +59,18 @@ public override void Effect(ReagentEffectArgs args)
             var splitSolution = args.Source.SplitSolution(args.Source.Volume);
             var transform = args.EntityManager.GetComponent<TransformComponent>(args.SolutionEntity);
             var mapManager = IoCManager.Resolve<IMapManager>();
+            var mapSys = args.EntityManager.System<MapSystem>();
+            var sys = args.EntityManager.System<TransformSystem>();
+            var mapCoords = sys.GetMapCoordinates(args.SolutionEntity, xform: transform);
 
-            if (!mapManager.TryFindGridAt(transform.MapPosition, out _, out var grid) ||
-                !grid.TryGetTileRef(transform.Coordinates, out var tileRef) ||
+            if (!mapManager.TryFindGridAt(mapCoords, out var gridUid, out var grid) ||
+                !mapSys.TryGetTileRef(gridUid, grid, transform.Coordinates, out var tileRef) ||
                 tileRef.Tile.IsSpace())
             {
                 return;
             }
 
-            var coords = grid.MapToGrid(transform.MapPosition);
+            var coords = mapSys.MapToGrid(gridUid, mapCoords);
             var ent = args.EntityManager.SpawnEntity(_prototypeId, coords.SnapToGrid());
 
             var smoke = args.EntityManager.System<SmokeSystem>();
diff --git a/Content.Server/Chemistry/ReactionEffects/CreateEntityReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/CreateEntityReactionEffect.cs
index f8c0378452b..0d5acc17220 100644
--- a/Content.Server/Chemistry/ReactionEffects/CreateEntityReactionEffect.cs
+++ b/Content.Server/Chemistry/ReactionEffects/CreateEntityReactionEffect.cs
@@ -34,7 +34,7 @@ public override void Effect(ReagentEffectArgs args)
 
         for (var i = 0; i < quantity; i++)
         {
-            var uid = args.EntityManager.SpawnEntity(Entity, transform.MapPosition);
+            var uid = args.EntityManager.SpawnEntity(Entity, transformSystem.GetMapCoordinates(args.SolutionEntity, xform: transform));
             transformSystem.AttachToGridOrMap(uid);
 
             // TODO figure out how to properly spawn inside of containers
diff --git a/Content.Server/Chemistry/ReactionEffects/EmpReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/EmpReactionEffect.cs
index b6714ca28d0..9a320ffc398 100644
--- a/Content.Server/Chemistry/ReactionEffects/EmpReactionEffect.cs
+++ b/Content.Server/Chemistry/ReactionEffects/EmpReactionEffect.cs
@@ -1,5 +1,6 @@
 using Content.Server.Emp;
 using Content.Shared.Chemistry.Reagent;
+using Robust.Server.GameObjects;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Chemistry.ReactionEffects;
@@ -37,11 +38,12 @@ public sealed partial class EmpReactionEffect : ReagentEffect
 
     public override void Effect(ReagentEffectArgs args)
     {
+        var tSys = args.EntityManager.System<TransformSystem>();
         var transform = args.EntityManager.GetComponent<TransformComponent>(args.SolutionEntity);
         var range = MathF.Min((float) (args.Quantity*EmpRangePerUnit), EmpMaxRange);
 
-        args.EntityManager.System<EmpSystem>().EmpPulse(
-            transform.MapPosition,
+        args.EntityManager.System<EmpSystem>()
+            .EmpPulse(tSys.GetMapCoordinates(args.SolutionEntity, xform: transform),
             range,
             EnergyConsumption,
             DisableDuration);
diff --git a/Content.Server/Cloning/CloningSystem.cs b/Content.Server/Cloning/CloningSystem.cs
index 373696844f9..c107bbab7d4 100644
--- a/Content.Server/Cloning/CloningSystem.cs
+++ b/Content.Server/Cloning/CloningSystem.cs
@@ -216,7 +216,6 @@ public bool TryCloning(EntityUid uid, EntityUid bodyToClone, Entity<MindComponen
             return true;
 
         var mob = FetchAndSpawnMob(uid, clonePod, pref, speciesPrototype, humanoid, bodyToClone, geneticDamage);
-
         var ev = new CloningEvent(bodyToClone, mob);
         RaiseLocalEvent(bodyToClone, ref ev);
 
diff --git a/Content.Server/Construction/ConstructionSystem.Initial.cs b/Content.Server/Construction/ConstructionSystem.Initial.cs
index ede8d3064fa..17ed5c90f4d 100644
--- a/Content.Server/Construction/ConstructionSystem.Initial.cs
+++ b/Content.Server/Construction/ConstructionSystem.Initial.cs
@@ -79,7 +79,7 @@ private IEnumerable<EntityUid> EnumerateNearby(EntityUid user)
                 }
             }
 
-            var pos = Transform(user).MapPosition;
+            var pos = _transformSystem.GetMapCoordinates(user);
 
             foreach (var near in _lookupSystem.GetEntitiesInRange(pos, 2f, LookupFlags.Contained | LookupFlags.Dynamic | LookupFlags.Sundries | LookupFlags.Approximate))
             {
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
index 093f05fceee..4f3efde6612 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Destructible.Thresholds;
 using Content.Shared.Prototypes;
 using Content.Shared.Stacks;
+using Robust.Server.GameObjects;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
@@ -30,7 +31,8 @@ public sealed partial class SpawnEntitiesBehavior : IThresholdBehavior
 
         public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause = null)
         {
-            var position = system.EntityManager.GetComponent<TransformComponent>(owner).MapPosition;
+            var tSys = system.EntityManager.System<TransformSystem>();
+            var position = tSys.GetMapCoordinates(owner);
 
             var getRandomVector = () => new Vector2(system.Random.NextFloat(-Offset, Offset), system.Random.NextFloat(-Offset, Offset));
 
@@ -48,7 +50,8 @@ public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause
                         ? minMax.Min
                         : system.Random.Next(minMax.Min, minMax.Max + 1);
 
-                    if (count == 0) continue;
+                    if (count == 0)
+                        continue;
 
                     if (EntityPrototypeHelpers.HasComponent<StackComponent>(entityId, system.PrototypeManager, system.ComponentFactory))
                     {
diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs
index 26cdd876b88..6a7d2d840cb 100644
--- a/Content.Server/Dragon/DragonSystem.cs
+++ b/Content.Server/Dragon/DragonSystem.cs
@@ -166,7 +166,7 @@ private void OnSpawnRift(EntityUid uid, DragonComponent component, DragonSpawnRi
             return;
         }
 
-        var carpUid = Spawn(component.RiftPrototype, xform.MapPosition);
+        var carpUid = Spawn(component.RiftPrototype, _transform.GetMapCoordinates(uid, xform: xform));
         component.Rifts.Add(carpUid);
         Comp<DragonRiftComponent>(carpUid).Dragon = uid;
     }
diff --git a/Content.Server/Emp/EmpSystem.cs b/Content.Server/Emp/EmpSystem.cs
index 3a1d2d28196..d125c9b6fee 100644
--- a/Content.Server/Emp/EmpSystem.cs
+++ b/Content.Server/Emp/EmpSystem.cs
@@ -4,6 +4,7 @@
 using Content.Server.Radio;
 using Content.Shared.Emp;
 using Content.Shared.Examine;
+using Robust.Server.GameObjects;
 using Robust.Shared.Map;
 
 namespace Content.Server.Emp;
@@ -11,6 +12,7 @@ namespace Content.Server.Emp;
 public sealed class EmpSystem : SharedEmpSystem
 {
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
 
     public const string EmpPulseEffectPrototype = "EffectEmpPulse";
 
@@ -117,7 +119,7 @@ private void OnExamine(EntityUid uid, EmpDisabledComponent component, ExaminedEv
 
     private void HandleEmpTrigger(EntityUid uid, EmpOnTriggerComponent comp, TriggerEvent args)
     {
-        EmpPulse(Transform(uid).MapPosition, comp.Range, comp.EnergyConsumption, comp.DisableDuration);
+        EmpPulse(_transform.GetMapCoordinates(uid), comp.Range, comp.EnergyConsumption, comp.DisableDuration);
         args.Handled = true;
     }
 
diff --git a/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs b/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs
index 17ca9723569..f958373ac74 100644
--- a/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Coordinates.Helpers;
 using Content.Shared.Maps;
+using Robust.Server.GameObjects;
 using Robust.Shared.Map;
 
 namespace Content.Server.Explosion.EntitySystems;
@@ -15,6 +16,7 @@ public sealed class SmokeOnTriggerSystem : SharedSmokeOnTriggerSystem
 {
     [Dependency] private readonly IMapManager _mapMan = default!;
     [Dependency] private readonly SmokeSystem _smoke = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
 
     public override void Initialize()
     {
@@ -26,14 +28,15 @@ public override void Initialize()
     private void OnTrigger(EntityUid uid, SmokeOnTriggerComponent comp, TriggerEvent args)
     {
         var xform = Transform(uid);
-        if (!_mapMan.TryFindGridAt(xform.MapPosition, out _, out var grid) ||
+        var mapCoords = _transform.GetMapCoordinates(uid, xform);
+        if (!_mapMan.TryFindGridAt(mapCoords, out _, out var grid) ||
             !grid.TryGetTileRef(xform.Coordinates, out var tileRef) ||
             tileRef.Tile.IsSpace())
         {
             return;
         }
 
-        var coords = grid.MapToGrid(xform.MapPosition);
+        var coords = grid.MapToGrid(mapCoords);
         var ent = Spawn(comp.SmokePrototype, coords.SnapToGrid());
         if (!TryComp<SmokeComponent>(ent, out var smoke))
         {
diff --git a/Content.Server/Fluids/EntitySystems/DrainSystem.cs b/Content.Server/Fluids/EntitySystems/DrainSystem.cs
index 5fc406dca53..b79685d83b6 100644
--- a/Content.Server/Fluids/EntitySystems/DrainSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/DrainSystem.cs
@@ -13,6 +13,7 @@
 using Content.Shared.Interaction;
 using Content.Shared.Tag;
 using Content.Shared.Verbs;
+using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Collections;
 using Robust.Shared.Prototypes;
@@ -31,6 +32,7 @@ public sealed class DrainSystem : SharedDrainSystem
     [Dependency] private readonly TagSystem _tagSystem = default!;
     [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
     [Dependency] private readonly PuddleSystem _puddleSystem = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
@@ -161,7 +163,7 @@ public override void Update(float frameTime)
 
             puddles.Clear();
 
-            foreach (var entity in _lookup.GetEntitiesInRange(xform.MapPosition, drain.Range))
+            foreach (var entity in _lookup.GetEntitiesInRange(_transform.GetMapCoordinates(uid, xform), drain.Range))
             {
                 // No InRangeUnobstructed because there's no collision group that fits right now
                 // and these are placed by mappers and not buildable/movable so shouldnt really be a problem...
diff --git a/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs b/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
index d03d040261a..aa9140db893 100644
--- a/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
@@ -9,6 +9,7 @@
 using Content.Shared.GameTicking.Components;
 using Content.Shared.Points;
 using Content.Shared.Storage;
+using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Utility;
 
@@ -25,6 +26,7 @@ public sealed class DeathMatchRuleSystem : GameRuleSystem<DeathMatchRuleComponen
     [Dependency] private readonly RespawnRuleSystem _respawn = default!;
     [Dependency] private readonly RoundEndSystem _roundEnd = default!;
     [Dependency] private readonly StationSpawningSystem _stationSpawning = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
 
     public override void Initialize()
     {
@@ -97,7 +99,7 @@ private void OnKillReported(ref KillReportedEvent ev)
                 _point.AdjustPointValue(assist.PlayerId, 1, uid, point);
 
             var spawns = EntitySpawnCollection.GetSpawns(dm.RewardSpawns).Cast<string?>().ToList();
-            EntityManager.SpawnEntities(Transform(ev.Entity).MapPosition, spawns);
+            EntityManager.SpawnEntities(_transform.GetMapCoordinates(ev.Entity), spawns);
         }
     }
 
diff --git a/Content.Server/Gatherable/GatherableSystem.cs b/Content.Server/Gatherable/GatherableSystem.cs
index d438fb95e03..84d71cdac21 100644
--- a/Content.Server/Gatherable/GatherableSystem.cs
+++ b/Content.Server/Gatherable/GatherableSystem.cs
@@ -5,6 +5,7 @@
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.Whitelist;
 using Robust.Server.GameObjects;
+using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
diff --git a/Content.Server/Guardian/GuardianSystem.cs b/Content.Server/Guardian/GuardianSystem.cs
index 97d4eb06803..203882ed9ef 100644
--- a/Content.Server/Guardian/GuardianSystem.cs
+++ b/Content.Server/Guardian/GuardianSystem.cs
@@ -208,7 +208,7 @@ private void OnDoAfter(EntityUid uid, GuardianCreatorComponent component, DoAfte
             var hostXform = Transform(args.Args.Target.Value);
             var host = EnsureComp<GuardianHostComponent>(args.Args.Target.Value);
             // Use map position so it's not inadvertantly parented to the host + if it's in a container it spawns outside I guess.
-            var guardian = Spawn(component.GuardianProto, hostXform.MapPosition);
+            var guardian = Spawn(component.GuardianProto, _transform.GetMapCoordinates(args.Args.Target.Value, xform: hostXform));
 
             _container.Insert(guardian, host.GuardianContainer);
             host.HostedGuardian = guardian;
diff --git a/Content.Server/Kitchen/EntitySystems/SharpSystem.cs b/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
index 431e438fd8d..b7966877214 100644
--- a/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
@@ -15,6 +15,7 @@
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Robust.Server.Containers;
+using Robust.Server.GameObjects;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
@@ -28,6 +29,7 @@ public sealed class SharpSystem : EntitySystem
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly ContainerSystem _containerSystem = default!;
     [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
 
@@ -101,7 +103,7 @@ private void OnDoAfter(EntityUid uid, SharpComponent component, DoAfterEvent arg
         }
 
         var spawnEntities = EntitySpawnCollection.GetSpawns(butcher.SpawnedEntities, _robustRandom);
-        var coords = Transform(args.Args.Target.Value).MapPosition;
+        var coords = _transform.GetMapCoordinates(args.Args.Target.Value);
         EntityUid popupEnt = default!;
         foreach (var proto in spawnEntities)
         {
diff --git a/Content.Server/Lightning/LightningSystem.cs b/Content.Server/Lightning/LightningSystem.cs
index 3c0da8e9149..40e4302027f 100644
--- a/Content.Server/Lightning/LightningSystem.cs
+++ b/Content.Server/Lightning/LightningSystem.cs
@@ -3,6 +3,7 @@
 using Content.Server.Beam.Components;
 using Content.Server.Lightning.Components;
 using Content.Shared.Lightning;
+using Robust.Server.GameObjects;
 using Robust.Shared.Random;
 
 namespace Content.Server.Lightning;
@@ -74,11 +75,8 @@ public void ShootRandomLightnings(EntityUid user, float range, int boltCount, st
         //To Do: Remove Hardcode LightningTargetComponent (this should be a parameter of the SharedLightningComponent)
         //To Do: This is still pretty bad for perf but better than before and at least it doesn't re-allocate
         // several hashsets every time
-
-        var userCoords = _transform.GetMapCoordinates(user);
-        var targetEnts = _lookup.GetEntitiesInRange<LightningTargetComponent>(userCoords, range);
-        var targets = targetEnts.Select(x => x.Comp).ToList();
-
+        var mapCoords = _transform.GetMapCoordinates(user)
+        var targets = _lookup.GetComponentsInRange<LightningTargetComponent>(mapCoords, range).ToList();
         _random.Shuffle(targets);
         targets.Sort((x, y) => y.Priority.CompareTo(x.Priority));
 
diff --git a/Content.Server/Lightning/LightningTargetSystem.cs b/Content.Server/Lightning/LightningTargetSystem.cs
index ccaa74e9e26..bc99def9742 100644
--- a/Content.Server/Lightning/LightningTargetSystem.cs
+++ b/Content.Server/Lightning/LightningTargetSystem.cs
@@ -2,6 +2,7 @@
 using Content.Server.Lightning;
 using Content.Server.Lightning.Components;
 using Content.Shared.Damage;
+using Robust.Server.GameObjects;
 
 namespace Content.Server.Tesla.EntitySystems;
 
@@ -12,6 +13,7 @@ public sealed class LightningTargetSystem : EntitySystem
 {
     [Dependency] private readonly DamageableSystem _damageable = default!;
     [Dependency] private readonly ExplosionSystem _explosionSystem = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
 
     public override void Initialize()
     {
@@ -29,7 +31,7 @@ private void OnHitByLightning(Entity<LightningTargetComponent> uid, ref HitByLig
         if (uid.Comp.LightningExplode)
         {
             _explosionSystem.QueueExplosion(
-                Transform(uid).MapPosition,
+                _transform.GetMapCoordinates(uid),
                 uid.Comp.ExplosionPrototype,
                 uid.Comp.TotalIntensity, uid.Comp.Dropoff,
                 uid.Comp.MaxTileIntensity,
diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.cs
index 1be0a2f154c..dbe1d4d7ea5 100644
--- a/Content.Server/NPC/Systems/NPCSteeringSystem.cs
+++ b/Content.Server/NPC/Systems/NPCSteeringSystem.cs
@@ -455,7 +455,7 @@ private async void RequestPath(EntityUid uid, NPCSteeringComponent steering, Tra
         }
 
         var targetPos = steering.Coordinates.ToMap(EntityManager, _transform);
-        var ourPos = xform.MapPosition;
+        var ourPos = _transform.GetMapCoordinates(uid, xform: xform);
 
         PrunePath(uid, ourPos, targetPos.Position - ourPos.Position, result.Path);
         steering.CurrentPath = new Queue<PathPoly>(result.Path);
diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
index 4153262806a..eb111baea8a 100644
--- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs
+++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
@@ -374,7 +374,7 @@ private void Add(NPCBlackboard blackboard, HashSet<EntityUid> entities, UtilityQ
                 if (compQuery.Components.Count == 0)
                     return;
 
-                var mapPos = _xformQuery.GetComponent(owner).MapPosition;
+                var mapPos = _transform.GetMapCoordinates(owner, xform: _xformQuery.GetComponent(owner));
                 _compTypes.Clear();
                 var i = -1;
                 EntityPrototype.ComponentRegistryEntry compZero = default!;
diff --git a/Content.Server/Nuke/NukeSystem.cs b/Content.Server/Nuke/NukeSystem.cs
index 4bca7a1eac6..e60a7bde331 100644
--- a/Content.Server/Nuke/NukeSystem.cs
+++ b/Content.Server/Nuke/NukeSystem.cs
@@ -462,7 +462,7 @@ public void ArmBomb(EntityUid uid, NukeComponent? component = null)
             Color.Red,
             stationUid ?? uid,
             null,
-            ("time", (int) component.RemainingTime), ("position", FormattedMessage.RemoveMarkupPermissive(_navMap.GetNearestBeaconString((uid, nukeXform))))
+            ("time", (int) component.RemainingTime), ("location", FormattedMessage.RemoveMarkupPermissive(_navMap.GetNearestBeaconString((uid, nukeXform))))
         );
 
         _sound.PlayGlobalOnStation(uid, _audio.GetSound(component.ArmSound));
diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
index ecc67c8315d..9266221ecfc 100644
--- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
@@ -34,6 +34,7 @@
 using System.Linq;
 using Content.Shared.CCVar;
 using Robust.Shared.Configuration;
+using Robust.Server.GameObjects;
 
 namespace Content.Server.Nutrition.EntitySystems;
 
@@ -55,6 +56,7 @@ public sealed class FoodSystem : EntitySystem
     [Dependency] private readonly SharedHandsSystem _hands = default!;
     [Dependency] private readonly SharedInteractionSystem _interaction = default!;
     [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
     [Dependency] private readonly StackSystem _stack = default!;
     [Dependency] private readonly StomachSystem _stomach = default!;
     [Dependency] private readonly UtensilSystem _utensil = default!;
@@ -155,7 +157,7 @@ private void OnFeedFood(Entity<FoodComponent> entity, ref AfterInteractEvent arg
             return (false, true);
 
         // TODO make do-afters account for fixtures in the range check.
-        if (!Transform(user).MapPosition.InRange(Transform(target).MapPosition, MaxFeedDistance))
+        if (!_transform.GetMapCoordinates(user).InRange(_transform.GetMapCoordinates(target), MaxFeedDistance))
         {
             var message = Loc.GetString("interaction-system-user-interaction-cannot-reach");
             _popup.PopupEntity(message, user, user);
diff --git a/Content.Server/PDA/Ringer/RingerSystem.cs b/Content.Server/PDA/Ringer/RingerSystem.cs
index 2ea48510557..e15dcfaa2bc 100644
--- a/Content.Server/PDA/Ringer/RingerSystem.cs
+++ b/Content.Server/PDA/Ringer/RingerSystem.cs
@@ -26,6 +26,7 @@ public sealed class RingerSystem : SharedRingerSystem
         [Dependency] private readonly UserInterfaceSystem _ui = default!;
         [Dependency] private readonly AudioSystem _audio = default!;
         [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+        [Dependency] private readonly TransformSystem _transform = default!;
 
         private readonly Dictionary<NetUserId, TimeSpan> _lastSetRingtoneAt = new();
 
@@ -211,7 +212,7 @@ public bool ToggleRingerUI(EntityUid uid, EntityUid actor)
 
                 _audio.PlayEntity(
                     GetSound(ringer.Ringtone[ringer.NoteCount]),
-                    Filter.Empty().AddInRange(ringerXform.MapPosition, ringer.Range),
+                    Filter.Empty().AddInRange(_transform.GetMapCoordinates(uid, ringerXform), ringer.Range),
                     uid,
                     true,
                     AudioParams.Default.WithMaxDistance(ringer.Range).WithVolume(ringer.Volume)
diff --git a/Content.Server/Payload/EntitySystems/PayloadSystem.cs b/Content.Server/Payload/EntitySystems/PayloadSystem.cs
index 85cf303d5d7..15966956d4f 100644
--- a/Content.Server/Payload/EntitySystems/PayloadSystem.cs
+++ b/Content.Server/Payload/EntitySystems/PayloadSystem.cs
@@ -10,6 +10,7 @@
 using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Utility;
 using System.Linq;
+using Robust.Server.GameObjects;
 
 namespace Content.Server.Payload.EntitySystems;
 
@@ -17,6 +18,7 @@ public sealed class PayloadSystem : EntitySystem
 {
     [Dependency] private readonly TagSystem _tagSystem = default!;
     [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
     [Dependency] private readonly IComponentFactory _componentFactory = default!;
     [Dependency] private readonly ISerializationManager _serializationManager = default!;
@@ -158,7 +160,7 @@ private void HandleChemicalPayloadTrigger(Entity<ChemicalPayloadComponent> entit
         var solStringB = SolutionContainerSystem.ToPrettyString(solutionB);
 
         _adminLogger.Add(LogType.ChemicalReaction,
-            $"Chemical bomb payload {ToPrettyString(entity.Owner):payload} at {Transform(entity.Owner).MapPosition:location} is combining two solutions: {solStringA:solutionA} and {solStringB:solutionB}");
+            $"Chemical bomb payload {ToPrettyString(entity.Owner):payload} at {_transform.GetMapCoordinates(entity.Owner):location} is combining two solutions: {solStringA:solutionA} and {solStringB:solutionB}");
 
         solutionA.MaxVolume += solutionB.MaxVolume;
         _solutionContainerSystem.TryAddSolution(solnA.Value, solutionB);
diff --git a/Content.Server/Pointing/EntitySystems/PointingSystem.cs b/Content.Server/Pointing/EntitySystems/PointingSystem.cs
index c9e86772fb9..3acf5d26964 100644
--- a/Content.Server/Pointing/EntitySystems/PointingSystem.cs
+++ b/Content.Server/Pointing/EntitySystems/PointingSystem.cs
@@ -183,7 +183,7 @@ bool ViewerPredicate(ICommonSession playerSession)
                     (eyeComp.VisibilityMask & layer) == 0)
                     return false;
 
-                return Transform(ent).MapPosition.InRange(Transform(player).MapPosition, PointingRange);
+                return _transform.GetMapCoordinates(ent).InRange(_transform.GetMapCoordinates(player), PointingRange);
             }
 
             var viewers = Filter.Empty()
diff --git a/Content.Server/Respawn/SpecialRespawnSystem.cs b/Content.Server/Respawn/SpecialRespawnSystem.cs
index 2463bcd7402..6c7bb5c9234 100644
--- a/Content.Server/Respawn/SpecialRespawnSystem.cs
+++ b/Content.Server/Respawn/SpecialRespawnSystem.cs
@@ -95,7 +95,7 @@ private void OnTermination(EntityUid uid, SpecialRespawnComponent component, ref
         {
             var xform = Transform(entityGridUid.Value);
             var pos = xform.Coordinates;
-            var mapPos = xform.MapPosition;
+            var mapPos = _transform.GetMapCoordinates(entityGridUid.Value, xform: xform);
             var circle = new Circle(mapPos.Position, 2);
 
             var found = false;
diff --git a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
index 2aec9a45ad1..e57a59475f2 100644
--- a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
@@ -167,7 +167,7 @@ public void ConsumeEntitiesInRange(EntityUid uid, float range, TransformComponen
         var range2 = range * range;
         var xformQuery = EntityManager.GetEntityQuery<TransformComponent>();
         var epicenter = _xformSystem.GetWorldPosition(xform, xformQuery);
-        foreach (var entity in _lookup.GetEntitiesInRange(xform.MapPosition, range, flags: LookupFlags.Uncontained))
+        foreach (var entity in _lookup.GetEntitiesInRange(_xformSystem.GetMapCoordinates(uid, xform), range, flags: LookupFlags.Uncontained))
         {
             if (entity == uid)
                 continue;
@@ -297,7 +297,7 @@ public void ConsumeTilesInRange(EntityUid uid, float range, TransformComponent?
         if (!Resolve(uid, ref xform) || !Resolve(uid, ref eventHorizon))
             return;
 
-        var mapPos = xform.MapPosition;
+        var mapPos = _xformSystem.GetMapCoordinates(uid, xform: xform);
         var box = Box2.CenteredAround(mapPos.Position, new Vector2(range, range));
         var circle = new Circle(mapPos.Position, range);
         var grids = new List<Entity<MapGridComponent>>();
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/EmpArtifactSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/EmpArtifactSystem.cs
index d4ed8272aa3..970743f4848 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/EmpArtifactSystem.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/EmpArtifactSystem.cs
@@ -1,12 +1,14 @@
 using Content.Server.Emp;
 using Content.Server.Xenoarchaeology.XenoArtifacts.Effects.Components;
 using Content.Server.Xenoarchaeology.XenoArtifacts.Events;
+using Robust.Server.GameObjects;
 
 namespace Content.Server.Xenoarchaeology.XenoArtifacts.Effects.Systems;
 
 public sealed class EmpArtifactSystem : EntitySystem
 {
     [Dependency] private readonly EmpSystem _emp = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -16,6 +18,6 @@ public override void Initialize()
 
     private void OnActivate(EntityUid uid, EmpArtifactComponent component, ArtifactActivatedEvent args)
     {
-        _emp.EmpPulse(Transform(uid).MapPosition, component.Range, component.EnergyConsumption, component.DisableDuration);
+        _emp.EmpPulse(_transform.GetMapCoordinates(uid), component.Range, component.EnergyConsumption, component.DisableDuration);
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/SpawnArtifactSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/SpawnArtifactSystem.cs
index fcb33ae41fd..c2622837872 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/SpawnArtifactSystem.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/SpawnArtifactSystem.cs
@@ -32,7 +32,7 @@ private void OnActivate(EntityUid uid, SpawnArtifactComponent component, Artifac
         if (component.Spawns is not {} spawns)
             return;
 
-        var artifactCord = Transform(uid).MapPosition;
+        var artifactCord = _transform.GetMapCoordinates(uid);
         foreach (var spawn in EntitySpawnCollection.GetSpawns(spawns, _random))
         {
             var dx = _random.NextFloat(-component.Range, component.Range);
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ThrowArtifactSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ThrowArtifactSystem.cs
index 57a30a2fd9e..8708e0ff4e8 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ThrowArtifactSystem.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ThrowArtifactSystem.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Maps;
 using Content.Shared.Physics;
 using Content.Shared.Throwing;
+using Robust.Server.GameObjects;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Random;
@@ -16,6 +17,7 @@ public sealed class ThrowArtifactSystem : EntitySystem
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly ThrowingSystem _throwing = default!;
     [Dependency] private readonly TileSystem _tile = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -50,7 +52,7 @@ private void OnActivated(EntityUid uid, ThrowArtifactComponent component, Artifa
 
             var tempXform = Transform(ent);
 
-            var foo = tempXform.MapPosition.Position - xform.MapPosition.Position;
+            var foo = _transform.GetMapCoordinates(ent, xform: tempXform).Position - _transform.GetMapCoordinates(uid, xform: xform).Position;
             _throwing.TryThrow(ent, foo*2, component.ThrowStrength, uid, 0);
         }
     }
diff --git a/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs b/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs
index 83aa7085897..79a32268e80 100644
--- a/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs
+++ b/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs
@@ -13,6 +13,7 @@ public abstract class SharedDeviceLinkSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
 
     public const string InvokedPort = "link_port";
 
@@ -529,7 +530,7 @@ private bool CanLink(
     private bool InRange(EntityUid sourceUid, EntityUid sinkUid, float range)
     {
         // TODO: This should be using an existing method and also coordinates inrange instead.
-        return Transform(sourceUid).MapPosition.InRange(Transform(sinkUid).MapPosition, range);
+        return _transform.GetMapCoordinates(sourceUid).InRange(_transform.GetMapCoordinates(sinkUid), range);
     }
 
     private void SendNewLinkEvent(EntityUid? user, EntityUid sourceUid, string source, EntityUid sinkUid, string sink)
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
index 20e08b2767d..d1f41738e9d 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
@@ -108,10 +108,10 @@ public bool TryPickup(
             var xform = Transform(uid);
             var coordinateEntity = xform.ParentUid.IsValid() ? xform.ParentUid : uid;
             var itemXform = Transform(entity);
-            var itemPos = itemXform.MapPosition;
+            var itemPos = TransformSystem.GetMapCoordinates(entity, xform: itemXform);
 
             if (itemPos.MapId == xform.MapID
-                && (itemPos.Position - xform.MapPosition.Position).Length() <= MaxAnimationRange
+                && (itemPos.Position - TransformSystem.GetMapCoordinates(uid, xform: xform).Position).Length() <= MaxAnimationRange
                 && MetaData(entity).VisibilityMask == MetaData(uid).VisibilityMask) // Don't animate aghost pickups.
             {
                 var initialPosition = EntityCoordinates.FromMap(coordinateEntity, itemPos, TransformSystem, EntityManager);
diff --git a/Content.Shared/Interaction/RotateToFaceSystem.cs b/Content.Shared/Interaction/RotateToFaceSystem.cs
index fa213011ef1..6fe5582bb17 100644
--- a/Content.Shared/Interaction/RotateToFaceSystem.cs
+++ b/Content.Shared/Interaction/RotateToFaceSystem.cs
@@ -69,7 +69,7 @@ public bool TryFaceCoordinates(EntityUid user, Vector2 coordinates, TransformCom
             if (!Resolve(user, ref xform))
                 return false;
 
-            var diff = coordinates - xform.MapPosition.Position;
+            var diff = coordinates - _transform.GetMapCoordinates(user, xform: xform).Position;
             if (diff.LengthSquared() <= 0.01f)
                 return true;
 
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 759d59ae7fe..49c5e5735d7 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -778,8 +778,8 @@ public bool InRangeUnobstructed(
             // No fixtures, e.g. wallmounts.
             else
             {
-                originPos = _transform.GetMapCoordinates(origin, origin);
-                var otherParent = (other.Comp ?? Transform(other)).ParentUid;
+                originPos = _transform.GetMapCoordinates(origin);
+                var otherParent = Transform(other).ParentUid;
                 targetRot = otherParent.IsValid() ? Transform(otherParent).LocalRotation + otherAngle : otherAngle;
             }
 
@@ -926,7 +926,7 @@ public bool InRangeUnobstructed(
             bool popup = false)
         {
             Ignored combinedPredicate = e => e == origin || (predicate?.Invoke(e) ?? false);
-            var originPosition = Transform(origin).MapPosition;
+            var originPosition = _transform.GetMapCoordinates(origin);
             var inRange = InRangeUnobstructed(originPosition, other, range, collisionMask, combinedPredicate, ShouldCheckAccess(origin));
 
             if (!inRange && popup && _gameTiming.IsFirstTimePredicted)
diff --git a/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs b/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs
index bb1efba8692..7a8961485d6 100644
--- a/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs
@@ -80,7 +80,7 @@ public override void Update(float frameTime)
                 // the problem is that stack pickups delete the original entity, which is fine, but due to
                 // game state handling we can't show a lerp animation for it.
                 var nearXform = Transform(near);
-                var nearMap = nearXform.MapPosition;
+                var nearMap = _transform.GetMapCoordinates(near, xform: nearXform);
                 var nearCoords = EntityCoordinates.FromMap(moverCoords.EntityId, nearMap, _transform, EntityManager);
 
                 if (!_storage.Insert(uid, near, out var stacked, storageComp: storage, playSound: !playedSound))
diff --git a/Content.Shared/Tabletop/SharedTabletopSystem.cs b/Content.Shared/Tabletop/SharedTabletopSystem.cs
index 7bfd9d34572..afa77a643a0 100644
--- a/Content.Shared/Tabletop/SharedTabletopSystem.cs
+++ b/Content.Shared/Tabletop/SharedTabletopSystem.cs
@@ -16,7 +16,7 @@ public abstract class SharedTabletopSystem : EntitySystem
         [Dependency] protected readonly ActionBlockerSystem ActionBlockerSystem = default!;
         [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-        [Dependency] private readonly SharedTransformSystem _transforms = default!;
+        [Dependency] protected readonly SharedTransformSystem Transforms = default!;
         [Dependency] private readonly IMapManager _mapMan = default!;
 
         public override void Initialize()
@@ -41,8 +41,8 @@ protected virtual void OnTabletopMove(TabletopMoveEvent msg, EntitySessionEventA
 
             // Move the entity and dirty it (we use the map ID from the entity so noone can try to be funny and move the item to another map)
             var transform = EntityManager.GetComponent<TransformComponent>(moved);
-            _transforms.SetParent(moved, transform, _mapMan.GetMapEntityId(transform.MapID));
-            _transforms.SetLocalPositionNoLerp(transform, msg.Coordinates.Position);
+            Transforms.SetParent(moved, transform, _mapMan.GetMapEntityId(transform.MapID));
+            Transforms.SetLocalPositionNoLerp(transform, msg.Coordinates.Position);
         }
 
         private void OnDraggingPlayerChanged(TabletopDraggingPlayerChangedEvent msg, EntitySessionEventArgs args)
diff --git a/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs b/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs
index 21da0a3ca45..3d7f9df458e 100644
--- a/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs
+++ b/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs
@@ -223,7 +223,7 @@ protected virtual void StartTether(EntityUid gunUid, BaseForceGunComponent compo
         _blocker.UpdateCanMove(target);
 
         // Invisible tether entity
-        var tether = Spawn("TetherEntity", Transform(target).MapPosition);
+        var tether = Spawn("TetherEntity", TransformSystem.GetMapCoordinates(target));
         var tetherPhysics = Comp<PhysicsComponent>(tether);
         component.TetherEntity = tether;
         _physics.WakeBody(tether);
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
index 4998b11f082..7afc42639a6 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
@@ -35,7 +35,7 @@ private void OnBallisticUse(EntityUid uid, BallisticAmmoProviderComponent compon
         if (args.Handled)
             return;
 
-        ManualCycle(uid, component, Transform(uid).MapPosition, args.User);
+        ManualCycle(uid, component, TransformSystem.GetMapCoordinates(uid), args.User);
         args.Handled = true;
     }
 
@@ -164,7 +164,7 @@ private void OnBallisticVerb(EntityUid uid, BallisticAmmoProviderComponent compo
             {
                 Text = Loc.GetString("gun-ballistic-cycle"),
                 Disabled = GetBallisticShots(component) == 0,
-                Act = () => ManualCycle(uid, component, Transform(uid).MapPosition, args.User),
+                Act = () => ManualCycle(uid, component, TransformSystem.GetMapCoordinates(uid), args.User),
             });
 
         }

From c79a710c4d5d080d7336549a685e408a64ebade7 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Tue, 17 Dec 2024 12:22:59 -0400
Subject: [PATCH 187/366] fix lint errors, remove secret documents

---
 .../Prototypes/Catalog/Fills/Lockers/heads.yml  |  2 --
 .../Weapons/Guns/Projectiles/projectiles.yml    | 17 ++++++++++++++---
 .../Guidebook/Antagonist/Traitors.xml           |  4 ----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 229183c8d9b..6f87f69611c 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -283,7 +283,6 @@
       - id: JetpackSecurityFilled
       - id: BoxEncryptionKeySecurity
       - id: HoloprojectorSecurity
-      - id: BookSecretDocuments
       - id: BoxPDASecurity # Delta-V
       - id: HoSIDCard # Delta-V
       - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
@@ -311,7 +310,6 @@
       - id: SecurityTechFabCircuitboard
       - id: BoxEncryptionKeySecurity
       - id: HoloprojectorSecurity
-      - id: BookSecretDocuments
       - id: BoxPDASecurity # Delta-V
       - id: HoSIDCard # Delta-V
       - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index a46dc964ff4..c8b6b7af67f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -1089,14 +1089,25 @@
 - type: entity
   name: wide laser barrage
   id: BulletLaserSpread
-  noSpawn: true
   parent: BulletLaser
+  categories: [ HideSpawnMenu ]
   components:
   - type: ProjectileSpread
     proto: BulletLaser
     count: 5 #50 heat damage if you hit all your shots, but wide spread
     spread: 30 
 
+- type: entity
+  name: narrow laser barrage
+  id: BulletLaserSpreadNarrow
+  parent: BulletLaser
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: ProjectileSpread
+    proto: BulletLaser
+    count: 4 #52 heat damage if you hit all your shots, but narrower spread
+    spread: 10
+
 - type: entity
   name : heavy laser bolt
   id: BulletLaserHeavy
@@ -1111,8 +1122,8 @@
 - type: entity
   name: narrow laser barrage
   id: BulletLaserHeavySpread
-  noSpawn: true
   parent: BulletLaser
+  categories: [ HideSpawnMenu ]
   components:
   - type: ProjectileSpread
     proto: BulletLaser
@@ -1122,8 +1133,8 @@
 - type: entity
   name: disabling laser barrage
   id: BulletDisablerSmgSpread
-  noSpawn: true
   parent: BulletDisablerSmg
+  categories: [ HideSpawnMenu ]
   components:
   - type: ProjectileSpread
     proto: BulletDisablerSmg
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
index 255e4ca5109..bb4d0eb4432 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
@@ -48,10 +48,6 @@
   <Box>
     <GuideEntityEmbed Entity="HandTeleporter" Caption="Hand Teleporter"/>
   </Box>
-  - Steal the Head of Security's [color=#a4885c]Secret Documents[/color].
-  <Box>
-    <GuideEntityEmbed Entity="BookSecretDocuments" Caption="Secret Documents"/>
-  </Box>
   - Steal the Head of Security's [color=#a4885c]X-01 MultiPhase Energy Gun[/color].
   <Box>
     <GuideEntityEmbed Entity="WeaponEnergyGunMultiphase" Caption="Head of Security's personal Energy Gun"/>

From c4c003daa28ca91c6d4305d512d4016218aa4053 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Tue, 17 Dec 2024 12:54:15 -0400
Subject: [PATCH 188/366] fix error!

---
 Content.Shared/Interaction/SharedInteractionSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 49c5e5735d7..24bb1b2446d 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -778,7 +778,7 @@ public bool InRangeUnobstructed(
             // No fixtures, e.g. wallmounts.
             else
             {
-                originPos = _transform.GetMapCoordinates(origin);
+                originPos = _transform.GetMapCoordinates(origin, xform: origin.Comp);
                 var otherParent = Transform(other).ParentUid;
                 targetRot = otherParent.IsValid() ? Transform(otherParent).LocalRotation + otherAngle : otherAngle;
             }

From 5b660d4e47aca3217983eac0bedb37c35046b148 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Tue, 17 Dec 2024 13:05:49 -0400
Subject: [PATCH 189/366] lmao

---
 Content.Server/Lightning/LightningSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/Lightning/LightningSystem.cs b/Content.Server/Lightning/LightningSystem.cs
index 40e4302027f..6dda2fa981c 100644
--- a/Content.Server/Lightning/LightningSystem.cs
+++ b/Content.Server/Lightning/LightningSystem.cs
@@ -75,7 +75,7 @@ public void ShootRandomLightnings(EntityUid user, float range, int boltCount, st
         //To Do: Remove Hardcode LightningTargetComponent (this should be a parameter of the SharedLightningComponent)
         //To Do: This is still pretty bad for perf but better than before and at least it doesn't re-allocate
         // several hashsets every time
-        var mapCoords = _transform.GetMapCoordinates(user)
+        var mapCoords = _transform.GetMapCoordinates(user);
         var targets = _lookup.GetComponentsInRange<LightningTargetComponent>(mapCoords, range).ToList();
         _random.Shuffle(targets);
         targets.Sort((x, y) => y.Priority.CompareTo(x.Priority));

From ebc00faaefbd43f075f61aad901b29e65f273c89 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Tue, 17 Dec 2024 13:59:20 -0400
Subject: [PATCH 190/366] remove some obsolete code

---
 .../Nutrition/EntitySystems/FoodSystem.cs     | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
index 9266221ecfc..f99cecc8e7a 100644
--- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
@@ -1,6 +1,5 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
-using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Inventory;
 using Content.Server.Nutrition.Components;
 using Content.Shared.Nutrition.Components;
@@ -33,8 +32,9 @@
 using Robust.Shared.Utility;
 using System.Linq;
 using Content.Shared.CCVar;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Whitelist;
 using Robust.Shared.Configuration;
-using Robust.Server.GameObjects;
 
 namespace Content.Server.Nutrition.EntitySystems;
 
@@ -55,13 +55,13 @@ public sealed class FoodSystem : EntitySystem
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly SharedHandsSystem _hands = default!;
     [Dependency] private readonly SharedInteractionSystem _interaction = default!;
-    [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
-    [Dependency] private readonly TransformSystem _transform = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
     [Dependency] private readonly StackSystem _stack = default!;
     [Dependency] private readonly StomachSystem _stomach = default!;
     [Dependency] private readonly UtensilSystem _utensil = default!;
     [Dependency] private readonly IConfigurationManager _config = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
 
     public const float MaxFeedDistance = 1.0f;
 
@@ -71,7 +71,7 @@ public override void Initialize()
 
         // TODO add InteractNoHandEvent for entities like mice.
         // run after openable for wrapped/peelable foods
-        SubscribeLocalEvent<FoodComponent, UseInHandEvent>(OnUseFoodInHand, after: new[] { typeof(OpenableSystem), typeof(ServerInventorySystem) });
+        SubscribeLocalEvent<FoodComponent, UseInHandEvent>(OnUseFoodInHand, after: [ typeof(OpenableSystem), typeof(ServerInventorySystem), ]);
         SubscribeLocalEvent<FoodComponent, AfterInteractEvent>(OnFeedFood);
         SubscribeLocalEvent<FoodComponent, GetVerbsEvent<AlternativeVerb>>(AddEatVerb);
         SubscribeLocalEvent<FoodComponent, ConsumeDoAfterEvent>(OnDoAfter);
@@ -168,23 +168,26 @@ private void OnFeedFood(Entity<FoodComponent> entity, ref AfterInteractEvent arg
         if (forceFeed)
         {
             var userName = Identity.Entity(user, EntityManager);
-            _popup.PopupEntity(Loc.GetString("food-system-force-feed", ("user", userName)),
-                user, target);
+            _popup.PopupEntity(
+                Loc.GetString("food-system-force-feed", ("user", userName)),
+                user,
+                target);
 
             // logging
-            _adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(user):user} is forcing {ToPrettyString(target):target} to eat {ToPrettyString(food):food} {SolutionContainerSystem.ToPrettyString(foodSolution)}");
+            _adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(user):user} is forcing {ToPrettyString(target):target} to eat {ToPrettyString(food):food} {SharedSolutionContainerSystem.ToPrettyString(foodSolution)}");
         }
         else
         {
             // log voluntary eating
-            _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(target):target} is eating {ToPrettyString(food):food} {SolutionContainerSystem.ToPrettyString(foodSolution)}");
+            _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(target):target} is eating {ToPrettyString(food):food} {SharedSolutionContainerSystem.ToPrettyString(foodSolution)}");
         }
 
         var foodDelay = foodComp.Delay;
         if (TryComp<ConsumeDelayModifierComponent>(target, out var delayModifier))
             foodDelay *= delayModifier.FoodDelayMultiplier;
 
-        var doAfterArgs = new DoAfterArgs(EntityManager,
+        var doAfterArgs = new DoAfterArgs(
+            EntityManager,
             user,
             forceFeed ? foodComp.ForceFeedDelay : foodDelay,
             new ConsumeDoAfterEvent(foodComp.Solution, flavors),
@@ -198,7 +201,7 @@ private void OnFeedFood(Entity<FoodComponent> entity, ref AfterInteractEvent arg
             DistanceThreshold = MaxFeedDistance,
             // Mice and the like can eat without hands.
             // TODO maybe set this based on some CanEatWithoutHands event or component?
-            NeedHand = forceFeed,
+            NeedHand = forceFeed
         };
 
         _doAfter.TryStartDoAfter(doAfterArgs);
@@ -421,8 +424,9 @@ private bool IsDigestibleBy(EntityUid food, FoodComponent component, List<(Stoma
             if (comp.SpecialDigestible == null)
                 continue;
             // Check if the food is in the whitelist
-            if (comp.SpecialDigestible.IsValid(food, EntityManager))
+            if (_whitelist.IsWhitelistPass(comp.SpecialDigestible, food))
                 return true;
+
             // They can only eat whitelist food and the food isn't in the whitelist. It's not edible.
             return false;
         }
@@ -510,10 +514,11 @@ private void OnInventoryIngestAttempt(Entity<InventoryComponent> entity, ref Ing
     public bool IsMouthBlocked(EntityUid uid, EntityUid? popupUid = null)
     {
         var attempt = new IngestionAttemptEvent();
-        RaiseLocalEvent(uid, attempt, false);
+        RaiseLocalEvent(uid, attempt);
         if (attempt.Cancelled && attempt.Blocker != null && popupUid != null)
         {
-            _popup.PopupEntity(Loc.GetString("food-system-remove-mask", ("entity", attempt.Blocker.Value)),
+            _popup.PopupEntity(
+                Loc.GetString("food-system-remove-mask", ("entity", attempt.Blocker.Value)),
                 uid, popupUid.Value);
         }
 

From d70261a1b9761addd489abd77a5c715136574dad Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Tue, 17 Dec 2024 14:28:39 -0400
Subject: [PATCH 191/366] project zero... errors?

---
 Content.Server/Lightning/LightningSystem.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Content.Server/Lightning/LightningSystem.cs b/Content.Server/Lightning/LightningSystem.cs
index 6dda2fa981c..5a7b85d26ef 100644
--- a/Content.Server/Lightning/LightningSystem.cs
+++ b/Content.Server/Lightning/LightningSystem.cs
@@ -76,9 +76,9 @@ public void ShootRandomLightnings(EntityUid user, float range, int boltCount, st
         //To Do: This is still pretty bad for perf but better than before and at least it doesn't re-allocate
         // several hashsets every time
         var mapCoords = _transform.GetMapCoordinates(user);
-        var targets = _lookup.GetComponentsInRange<LightningTargetComponent>(mapCoords, range).ToList();
+        var targets = _lookup.GetEntitiesInRange<LightningTargetComponent>(mapCoords, range).ToList();
         _random.Shuffle(targets);
-        targets.Sort((x, y) => y.Priority.CompareTo(x.Priority));
+        targets.Sort((x, y) => y.Comp.Priority.CompareTo(x.Comp.Priority));
 
         int shotCount = 0;
         int count = -1;
@@ -91,13 +91,13 @@ public void ShootRandomLightnings(EntityUid user, float range, int boltCount, st
             var curTarget = targets[count];
 
             // Chance to ignore target
-            if (!_random.Prob(curTarget.HitProbability))
+            if (!_random.Prob(curTarget.Comp.HitProbability))
                 continue;
 
             ShootLightning(user, targets[count].Owner, lightningPrototype, triggerLightningEvents);
 
-            if (arcDepth - targets[count].LightningResistance > 0)
-                ShootRandomLightnings(targets[count].Owner, range, 1, lightningPrototype, arcDepth - targets[count].LightningResistance, triggerLightningEvents);
+            if (arcDepth - targets[count].Comp.LightningResistance > 0)
+                ShootRandomLightnings(targets[count].Owner, range, 1, lightningPrototype, arcDepth - targets[count].Comp.LightningResistance, triggerLightningEvents);
 
             shotCount++;
         }

From 936dd05ed1950cc6bfa715e7c47c6584fc4889cb Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 19 Dec 2024 07:56:52 -0400
Subject: [PATCH 192/366] Add ItemToggleComponent to translator

---
 Resources/Prototypes/Entities/Objects/Devices/translators.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Entities/Objects/Devices/translators.yml b/Resources/Prototypes/Entities/Objects/Devices/translators.yml
index 3a30afc4a7f..a1500ea6896 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/translators.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/translators.yml
@@ -36,6 +36,7 @@
   id: TranslatorPoweredBase
   parent: [ TranslatorUnpowered, PowerCellSlotMediumItem ]
   components:
+  - type: ItemToggle
   - type: PowerCellDraw
     drawRate: 1
   - type: ItemSlots

From 97fc912fbf1b2ee64dd54706c3ec3c21a4cc5618 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 19 Dec 2024 08:13:54 -0400
Subject: [PATCH 193/366] Fix ghost roles

---
 .../Entities/Markers/Spawners/ghost_roles.yml | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
index 05646a465c1..3cc6d1e35e6 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
@@ -1,3 +1,14 @@
+- type: entity
+  abstract: true
+  parent: MarkerBase
+  id: BaseAntagSpawner
+  name: ghost role spawn point
+  components:
+  - type: GhostRole
+    raffle:
+      settings: default
+  - type: GhostRoleAntagSpawner
+
 - type: entity
   id: SpawnPointGhostRatKing
   name: ghost role spawn point
@@ -62,16 +73,14 @@
         state: narsian
 
 - type: entity
-  categories: [ HideSpawnMenu ]
+  categories: [ HideSpawnMenu, Spawner ]
   id: SpawnPointGhostNukeOperative
   name: ghost role spawn point
   suffix: nukeops
-  parent: MarkerBase
+  parent: BaseAntagSpawner
   components:
   - type: GhostRole
     rules: ghost-role-information-nukeop-rules
-    raffle:
-      settings: default
   - type: GhostRoleMobSpawner
     prototype: MobHumanNukeOp
   - type: Sprite
@@ -82,25 +91,22 @@
         state: radiation
 
 - type: entity
-  categories: [ HideSpawnMenu ]
+  categories: [ HideSpawnMenu, Spawner ]
   id: SpawnPointLoneNukeOperative
   name: ghost role spawn point
   suffix: loneops
-  parent: MarkerBase
+  parent: BaseAntagSpawner
   components:
   - type: GhostRole
     name: ghost-role-information-loneop-name
     description: ghost-role-information-loneop-description
     rules: ghost-role-information-loneop-rules
-    raffle:
-      settings: default
     requirements:
     - !type:CharacterOverallTimeRequirement
       min: 172800 # DeltaV - 48 hours
     - !type:DepartmentTimeRequirement # DeltaV - Security dept time requirement
       department: Security
       time: 36000 # DeltaV - 10 hours
-  - type: GhostRoleAntagSpawner
   - type: Sprite
     sprite: Markers/jobs.rsi
     layers:
@@ -109,9 +115,9 @@
         state: radiation
 
 - type: entity
-  parent: MarkerBase
+  parent: BaseAntagSpawner
   id: SpawnPointGhostDragon
-  categories: [ HideSpawnMenu ]
+  categories: [ HideSpawnMenu, Spawner ]
   name: ghost role spawn point
   suffix: dragon
   components:
@@ -119,8 +125,6 @@
     name: ghost-role-information-space-dragon-name
     description: ghost-role-information-space-dragon-description
     rules: ghost-role-component-default-rules
-    raffle:
-      settings: default
   - type: GhostRoleMobSpawner
     prototype: MobDragon
   - type: Sprite
@@ -130,9 +134,9 @@
       state: alive
 
 - type: entity
-  parent: MarkerBase
+  parent: BaseAntagSpawner
   id: SpawnPointGhostSpaceNinja
-  categories: [ HideSpawnMenu ]
+  categories: [ HideSpawnMenu, Spawner ]
   name: ghost role spawn point
   suffix: space ninja
   components:
@@ -140,8 +144,6 @@
     name: ghost-role-information-space-ninja-name
     description: ghost-role-information-space-ninja-description
     rules: ghost-role-information-space-ninja-rules
-    raffle:
-      settings: default
   - type: Sprite
     sprite: Markers/jobs.rsi
     layers:

From a371d3efeedea74dba391ec9e3003331a37fadc0 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 19 Dec 2024 08:42:58 -0400
Subject: [PATCH 194/366] Remove debug

---
 Content.Shared/Chat/SharedSuicideSystem.cs | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/Content.Shared/Chat/SharedSuicideSystem.cs b/Content.Shared/Chat/SharedSuicideSystem.cs
index ebdbd40eeb8..15f75c526b1 100644
--- a/Content.Shared/Chat/SharedSuicideSystem.cs
+++ b/Content.Shared/Chat/SharedSuicideSystem.cs
@@ -10,16 +10,6 @@ public sealed class SharedSuicideSystem : EntitySystem
 {
     [Dependency] private readonly DamageableSystem _damageableSystem = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly ILogManager _logManager = default!;
-
-    private ISawmill _sawmill = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        _sawmill = _logManager.GetSawmill("sharedsuicidesystem");
-    }
 
     /// <summary>
     /// Applies lethal damage spread out across the damage types given.
@@ -44,10 +34,7 @@ public void ApplyLethalDamage(Entity<DamageableComponent> target, DamageSpecifie
 
         // Split the total amount of damage needed to kill the target by every damage type in the DamageSpecifier
         foreach (var (key, value) in appliedDamageSpecifier.DamageDict)
-        {
-            _sawmill.Info($"{key}: {(double) value}");
             appliedDamageSpecifier.DamageDict[key] = Math.Ceiling((double) (value * lethalAmountOfDamage / totalDamage));
-        }
 
         _damageableSystem.TryChangeDamage(target, appliedDamageSpecifier, true, origin: target);
     }

From da58e8d23bc69f360be50df0831ab033704c92da Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 19 Dec 2024 09:12:35 -0400
Subject: [PATCH 195/366] retest

---
 .../Tests/Commands/SuicideCommandTests.cs                     | 4 ++--
 Content.Shared/Mobs/Systems/MobThresholdSystem.cs             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
index 18e4c6b16e2..6b47636d0e2 100644
--- a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
+++ b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
@@ -301,7 +301,7 @@ await server.WaitAssertion(() =>
     [Test]
     public async Task TestSuicideByHeldItemSpreadDamage()
     {
-        await using var pair = await PoolManager.GetServerClient(new PoolSettings
+        await using var pair = await PoolManager.GetServerClient(new()
         {
             Connected = true,
             Dirty = true,
@@ -368,4 +368,4 @@ await server.WaitAssertion(() =>
 
         await pair.CleanReturnAsync();
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Mobs/Systems/MobThresholdSystem.cs b/Content.Shared/Mobs/Systems/MobThresholdSystem.cs
index b11de9eac56..a5307c4ba57 100644
--- a/Content.Shared/Mobs/Systems/MobThresholdSystem.cs
+++ b/Content.Shared/Mobs/Systems/MobThresholdSystem.cs
@@ -28,10 +28,10 @@ public override void Initialize()
     private void OnGetState(EntityUid uid, MobThresholdsComponent component, ref ComponentGetState args)
     {
         var thresholds = new Dictionary<FixedPoint2, MobState>();
+
         foreach (var (key, value) in component.Thresholds)
-        {
             thresholds.Add(key, value);
-        }
+
         args.State = new MobThresholdsComponentState(thresholds,
             component.TriggersAlerts,
             component.CurrentThresholdState,

From b7d3d7147796c3bad21efa33447937e45ab4e55e Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 19 Dec 2024 10:31:36 -0400
Subject: [PATCH 196/366] the tests are only running online so ill just push
 this here

---
 Content.Shared/Chat/SharedSuicideSystem.cs | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/Content.Shared/Chat/SharedSuicideSystem.cs b/Content.Shared/Chat/SharedSuicideSystem.cs
index 15f75c526b1..c00410f831b 100644
--- a/Content.Shared/Chat/SharedSuicideSystem.cs
+++ b/Content.Shared/Chat/SharedSuicideSystem.cs
@@ -10,6 +10,16 @@ public sealed class SharedSuicideSystem : EntitySystem
 {
     [Dependency] private readonly DamageableSystem _damageableSystem = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly ILogManager _logManager = default!;
+
+    private ISawmill _sawmill = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _sawmill = _logManager.GetSawmill("suicide");
+    }
 
     /// <summary>
     /// Applies lethal damage spread out across the damage types given.
@@ -19,14 +29,23 @@ public void ApplyLethalDamage(Entity<DamageableComponent> target, DamageSpecifie
         // Create a new damageSpecifier so that we don't make alterations to the original DamageSpecifier
         // Failing  to do this will permanently change a weapon's damage making it insta-kill people
         var appliedDamageSpecifier = new DamageSpecifier(damageSpecifier);
+        var damagesStr = "";
+
+        foreach (var damage in appliedDamageSpecifier.DamageDict)
+            damagesStr += damage.Key + ": " + damage.Value + "\n";
+
+        _sawmill.Info($"Applying lethal damage (specifier) 1: \nnum damage types: {appliedDamageSpecifier.DamageDict.Count}\ndamages:\n{damagesStr}");
         if (!TryComp<MobThresholdsComponent>(target, out var mobThresholds))
             return;
 
+        _sawmill.Info("Applying lethal damage (specifier) 2");
+
         // Mob thresholds are sorted from alive -> crit -> dead,
         // grabbing the last key will give us how much damage is needed to kill a target from zero
         // The exact lethal damage amount is adjusted based on their current damage taken
         var lethalAmountOfDamage = mobThresholds.Thresholds.Keys.Last() - target.Comp.TotalDamage;
         var totalDamage = appliedDamageSpecifier.GetTotal();
+        _sawmill.Info("Applying lethal damage (specifier) 3");
 
         // Removing structural because it causes issues against entities that cannot take structural damage,
         // then getting the total to use in calculations for spreading out damage.
@@ -36,6 +55,8 @@ public void ApplyLethalDamage(Entity<DamageableComponent> target, DamageSpecifie
         foreach (var (key, value) in appliedDamageSpecifier.DamageDict)
             appliedDamageSpecifier.DamageDict[key] = Math.Ceiling((double) (value * lethalAmountOfDamage / totalDamage));
 
+        _sawmill.Info("Applying lethal damage (specifier): " + appliedDamageSpecifier.GetTotal());
+
         _damageableSystem.TryChangeDamage(target, appliedDamageSpecifier, true, origin: target);
     }
 
@@ -44,13 +65,17 @@ public void ApplyLethalDamage(Entity<DamageableComponent> target, DamageSpecifie
     /// </summary>
     public void ApplyLethalDamage(Entity<DamageableComponent> target, ProtoId<DamageTypePrototype>? damageType)
     {
+        _sawmill.Info("Applying lethal damage (singular) 1");
         if (!TryComp<MobThresholdsComponent>(target, out var mobThresholds))
             return;
 
+        _sawmill.Info("Applying lethal damage (singular) 2");
+
         // Mob thresholds are sorted from alive -> crit -> dead,
         // grabbing the last key will give us how much damage is needed to kill a target from zero
         // The exact lethal damage amount is adjusted based on their current damage taken
         var lethalAmountOfDamage = mobThresholds.Thresholds.Keys.Last() - target.Comp.TotalDamage;
+        _sawmill.Info("Applying lethal damage (singular): " + lethalAmountOfDamage);
 
         // We don't want structural damage for the same reasons listed above
         if (!_prototypeManager.TryIndex(damageType, out var damagePrototype) || damagePrototype.ID == "Structural")
@@ -60,6 +85,7 @@ public void ApplyLethalDamage(Entity<DamageableComponent> target, ProtoId<Damage
         }
 
         var damage = new DamageSpecifier(damagePrototype, lethalAmountOfDamage);
+        _sawmill.Info("Applying lethal damage (singular): " + damage.GetTotal());
         _damageableSystem.TryChangeDamage(target, damage, true, origin: target);
     }
 }

From c83362263ff720c4f8819a8ba216c3efb94eceee Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 19 Dec 2024 13:11:29 -0400
Subject: [PATCH 197/366] Revert "the tests are only running online so ill just
 push this here"

This reverts commit b7d3d7147796c3bad21efa33447937e45ab4e55e.
---
 Content.Shared/Chat/SharedSuicideSystem.cs | 26 ----------------------
 1 file changed, 26 deletions(-)

diff --git a/Content.Shared/Chat/SharedSuicideSystem.cs b/Content.Shared/Chat/SharedSuicideSystem.cs
index c00410f831b..15f75c526b1 100644
--- a/Content.Shared/Chat/SharedSuicideSystem.cs
+++ b/Content.Shared/Chat/SharedSuicideSystem.cs
@@ -10,16 +10,6 @@ public sealed class SharedSuicideSystem : EntitySystem
 {
     [Dependency] private readonly DamageableSystem _damageableSystem = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly ILogManager _logManager = default!;
-
-    private ISawmill _sawmill = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        _sawmill = _logManager.GetSawmill("suicide");
-    }
 
     /// <summary>
     /// Applies lethal damage spread out across the damage types given.
@@ -29,23 +19,14 @@ public void ApplyLethalDamage(Entity<DamageableComponent> target, DamageSpecifie
         // Create a new damageSpecifier so that we don't make alterations to the original DamageSpecifier
         // Failing  to do this will permanently change a weapon's damage making it insta-kill people
         var appliedDamageSpecifier = new DamageSpecifier(damageSpecifier);
-        var damagesStr = "";
-
-        foreach (var damage in appliedDamageSpecifier.DamageDict)
-            damagesStr += damage.Key + ": " + damage.Value + "\n";
-
-        _sawmill.Info($"Applying lethal damage (specifier) 1: \nnum damage types: {appliedDamageSpecifier.DamageDict.Count}\ndamages:\n{damagesStr}");
         if (!TryComp<MobThresholdsComponent>(target, out var mobThresholds))
             return;
 
-        _sawmill.Info("Applying lethal damage (specifier) 2");
-
         // Mob thresholds are sorted from alive -> crit -> dead,
         // grabbing the last key will give us how much damage is needed to kill a target from zero
         // The exact lethal damage amount is adjusted based on their current damage taken
         var lethalAmountOfDamage = mobThresholds.Thresholds.Keys.Last() - target.Comp.TotalDamage;
         var totalDamage = appliedDamageSpecifier.GetTotal();
-        _sawmill.Info("Applying lethal damage (specifier) 3");
 
         // Removing structural because it causes issues against entities that cannot take structural damage,
         // then getting the total to use in calculations for spreading out damage.
@@ -55,8 +36,6 @@ public void ApplyLethalDamage(Entity<DamageableComponent> target, DamageSpecifie
         foreach (var (key, value) in appliedDamageSpecifier.DamageDict)
             appliedDamageSpecifier.DamageDict[key] = Math.Ceiling((double) (value * lethalAmountOfDamage / totalDamage));
 
-        _sawmill.Info("Applying lethal damage (specifier): " + appliedDamageSpecifier.GetTotal());
-
         _damageableSystem.TryChangeDamage(target, appliedDamageSpecifier, true, origin: target);
     }
 
@@ -65,17 +44,13 @@ public void ApplyLethalDamage(Entity<DamageableComponent> target, DamageSpecifie
     /// </summary>
     public void ApplyLethalDamage(Entity<DamageableComponent> target, ProtoId<DamageTypePrototype>? damageType)
     {
-        _sawmill.Info("Applying lethal damage (singular) 1");
         if (!TryComp<MobThresholdsComponent>(target, out var mobThresholds))
             return;
 
-        _sawmill.Info("Applying lethal damage (singular) 2");
-
         // Mob thresholds are sorted from alive -> crit -> dead,
         // grabbing the last key will give us how much damage is needed to kill a target from zero
         // The exact lethal damage amount is adjusted based on their current damage taken
         var lethalAmountOfDamage = mobThresholds.Thresholds.Keys.Last() - target.Comp.TotalDamage;
-        _sawmill.Info("Applying lethal damage (singular): " + lethalAmountOfDamage);
 
         // We don't want structural damage for the same reasons listed above
         if (!_prototypeManager.TryIndex(damageType, out var damagePrototype) || damagePrototype.ID == "Structural")
@@ -85,7 +60,6 @@ public void ApplyLethalDamage(Entity<DamageableComponent> target, ProtoId<Damage
         }
 
         var damage = new DamageSpecifier(damagePrototype, lethalAmountOfDamage);
-        _sawmill.Info("Applying lethal damage (singular): " + damage.GetTotal());
         _damageableSystem.TryChangeDamage(target, damage, true, origin: target);
     }
 }

From aacd5c95ce2ba00a29c6e202130a2dbacda976bb Mon Sep 17 00:00:00 2001
From: Plykiya <58439124+Plykiya@users.noreply.github.com>
Date: Mon, 3 Jun 2024 14:40:03 -0700
Subject: [PATCH 198/366] Replace obsolete EntityWhitelist IsValid usages part
 2 (#28506)

---
 Content.Client/Outline/TargetOutlineSystem.cs     |  3 ++-
 Content.Server/Chat/Systems/ChatSystem.Emote.cs   |  2 +-
 .../TileReactions/CreateEntityTileReaction.cs     |  5 +++--
 .../Construction/ConstructionSystem.Initial.cs    |  6 ++++--
 .../GameTicking/Rules/LoadMapRuleSystem.cs        |  4 +++-
 .../VariationPass/CutWireVariationPassSystem.cs   |  5 ++++-
 .../Holiday/Christmas/RandomGiftSystem.cs         |  6 ++++--
 .../Mech/Systems/MechEquipmentSystem.cs           |  4 +++-
 Content.Server/Mech/Systems/MechSystem.cs         |  4 +++-
 .../Ninja/Systems/StunProviderSystem.cs           |  1 +
 .../EntitySystems/AnimalHusbandrySystem.cs        |  4 ++--
 .../ObjectiveBlacklistRequirementSystem.cs        |  5 ++++-
 .../Objectives/Systems/RoleRequirementSystem.cs   |  4 +++-
 .../Polymorph/Systems/PolymorphSystem.Collide.cs  |  7 +++++--
 Content.Server/Sticky/Systems/StickySystem.cs     |  7 ++++---
 .../Storage/EntitySystems/ItemCounterSystem.cs    |  6 ++++--
 .../Store/Conditions/BuyerWhitelistCondition.cs   | 15 ++++-----------
 .../Store/Conditions/StoreWhitelistCondition.cs   | 15 ++++-----------
 .../Systems/SurveillanceCameraMicrophoneSystem.cs |  5 +++--
 Content.Server/Traits/TraitSystem.cs              |  1 +
 .../Equipment/Systems/ArtifactCrusherSystem.cs    |  4 +++-
 .../Effects/Systems/DamageNearbyArtifactSystem.cs |  6 ++++--
 .../Buckle/SharedBuckleSystem.Buckle.cs           |  4 ++--
 .../Conditions/EntityWhitelistCondition.cs        |  3 ++-
 Content.Shared/Inventory/InventorySystem.Equip.cs |  9 ++-------
 .../EntitySystems/SharedHandLabelerSystem.cs      |  6 ++++--
 .../Materials/SharedMaterialReclaimerSystem.cs    |  8 ++++----
 .../Mech/EntitySystems/SharedMechSystem.cs        |  4 +++-
 .../Systems/SpeedModifierContactsSystem.cs        |  4 +++-
 .../Ninja/Systems/EmagProviderSystem.cs           |  3 ++-
 Content.Shared/Placeable/ItemPlacerSystem.cs      |  6 ++++--
 Content.Shared/Random/RulesSystem.cs              |  5 +++--
 Content.Shared/Sound/SharedEmitSoundSystem.cs     |  4 +++-
 .../StepTrigger/Systems/StepTriggerSystem.cs      |  4 +++-
 Content.Shared/Storage/EntitySystems/BinSystem.cs |  6 ++++--
 .../EntitySystems/SharedItemMapperSystem.cs       |  6 ++++--
 .../Teleportation/Systems/SwapTeleporterSystem.cs |  6 ++++--
 .../UserInterface/ActivatableUISystem.cs          | 10 ++++++----
 .../Ranged/Systems/SharedGunSystem.Ballistic.cs   |  3 ++-
 .../Ranged/Systems/SharedGunSystem.Clothing.cs    |  2 +-
 40 files changed, 125 insertions(+), 87 deletions(-)

diff --git a/Content.Client/Outline/TargetOutlineSystem.cs b/Content.Client/Outline/TargetOutlineSystem.cs
index 2a6867f51f5..df57578b1f5 100644
--- a/Content.Client/Outline/TargetOutlineSystem.cs
+++ b/Content.Client/Outline/TargetOutlineSystem.cs
@@ -22,6 +22,7 @@ public sealed class TargetOutlineSystem : EntitySystem
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     private bool _enabled = false;
 
@@ -137,7 +138,7 @@ private void HighlightTargets()
 
             // check the entity whitelist
             if (valid && Whitelist != null)
-                valid = Whitelist.IsValid(entity);
+                valid = _whitelistSystem.IsWhitelistPass(Whitelist, entity);
 
             // and check the cancellable event
             if (valid && ValidationEvent != null)
diff --git a/Content.Server/Chat/Systems/ChatSystem.Emote.cs b/Content.Server/Chat/Systems/ChatSystem.Emote.cs
index 3ee94072ca2..5d944654179 100644
--- a/Content.Server/Chat/Systems/ChatSystem.Emote.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.Emote.cs
@@ -84,7 +84,7 @@ public void TryEmoteWithChat(
         bool ignoreActionBlocker = false
         )
     {
-        if (_whitelistSystem.IsWhitelistFailOrNull(emote.Whitelist, source) || _whitelistSystem.IsBlacklistPass(emote.Blacklist, source))
+        if (_whitelistSystem.IsWhitelistFail(emote.Whitelist, source) || _whitelistSystem.IsBlacklistPass(emote.Blacklist, source))
             return;
 
         if (!emote.Available &&
diff --git a/Content.Server/Chemistry/TileReactions/CreateEntityTileReaction.cs b/Content.Server/Chemistry/TileReactions/CreateEntityTileReaction.cs
index 9cb1ba201d5..3871fe81f0a 100644
--- a/Content.Server/Chemistry/TileReactions/CreateEntityTileReaction.cs
+++ b/Content.Server/Chemistry/TileReactions/CreateEntityTileReaction.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chemistry.Reaction;
+using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
 using Content.Shared.Maps;
@@ -47,7 +47,8 @@ public FixedPoint2 TileReact(TileRef tile, ReagentPrototype reagent, FixedPoint2
                 int acc = 0;
                 foreach (var ent in tile.GetEntitiesInTile())
                 {
-                    if (Whitelist.IsValid(ent))
+                    var whitelistSystem = entityManager.System<EntityWhitelistSystem>();
+                    if (whitelistSystem.IsWhitelistPass(Whitelist, ent))
                         acc += 1;
 
                     if (acc >= MaxOnTile)
diff --git a/Content.Server/Construction/ConstructionSystem.Initial.cs b/Content.Server/Construction/ConstructionSystem.Initial.cs
index 17ed5c90f4d..75a32ca3d8c 100644
--- a/Content.Server/Construction/ConstructionSystem.Initial.cs
+++ b/Content.Server/Construction/ConstructionSystem.Initial.cs
@@ -14,6 +14,7 @@
 using Content.Shared.Interaction;
 using Content.Shared.Inventory;
 using Content.Shared.Storage;
+using Content.Shared.Whitelist;
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
@@ -29,6 +30,7 @@ public sealed partial class ConstructionSystem
         [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
         [Dependency] private readonly EntityLookupSystem _lookupSystem = default!;
         [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
+        [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
         // --- WARNING! LEGACY CODE AHEAD! ---
         // This entire file contains the legacy code for initial construction.
@@ -329,7 +331,7 @@ public async Task<bool> TryStartItemConstruction(string prototype, EntityUid use
                 return false;
             }
 
-            if (constructionPrototype.EntityWhitelist != null && !constructionPrototype.EntityWhitelist.IsValid(user))
+            if (_whitelistSystem.IsWhitelistFail(constructionPrototype.EntityWhitelist, user))
             {
                 _popup.PopupEntity(Loc.GetString("construction-system-cannot-start"), user, user);
                 return false;
@@ -408,7 +410,7 @@ private async void HandleStartStructureConstruction(TryStartStructureConstructio
                 return;
             }
 
-            if (constructionPrototype.EntityWhitelist != null && !constructionPrototype.EntityWhitelist.IsValid(user))
+            if (_whitelistSystem.IsWhitelistFail(constructionPrototype.EntityWhitelist, user))
             {
                 _popup.PopupEntity(Loc.GetString("construction-system-cannot-start"), user, user);
                 return;
diff --git a/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs b/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs
index e655bd472c6..f2287219fbe 100644
--- a/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs
@@ -3,6 +3,7 @@
 using Content.Server.Spawners.Components;
 using Content.Server.GridPreloader;
 using Content.Shared.GameTicking.Components;
+using Content.Shared.Whitelist;
 using Robust.Server.GameObjects;
 using Robust.Server.Maps;
 using Robust.Shared.Map;
@@ -19,6 +20,7 @@ public sealed class LoadMapRuleSystem : GameRuleSystem<LoadMapRuleComponent>
     [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly TransformSystem _transform = default!;
     [Dependency] private readonly GridPreloaderSystem _gridPreloader = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -99,7 +101,7 @@ private void OnSelectLocation(Entity<LoadMapRuleComponent> ent, ref AntagSelectL
             if (xform.GridUid == null || !ent.Comp.MapGrids.Contains(xform.GridUid.Value))
                 continue;
 
-            if (ent.Comp.SpawnerWhitelist != null && !ent.Comp.SpawnerWhitelist.IsValid(uid, EntityManager))
+            if (_whitelistSystem.IsWhitelistFail(ent.Comp.SpawnerWhitelist, uid))
                 continue;
 
             args.Coordinates.Add(_transform.GetMapCoordinates(xform));
diff --git a/Content.Server/GameTicking/Rules/VariationPass/CutWireVariationPassSystem.cs b/Content.Server/GameTicking/Rules/VariationPass/CutWireVariationPassSystem.cs
index fd94c74ac8c..372de4bbb45 100644
--- a/Content.Server/GameTicking/Rules/VariationPass/CutWireVariationPassSystem.cs
+++ b/Content.Server/GameTicking/Rules/VariationPass/CutWireVariationPassSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.GameTicking.Rules.VariationPass.Components;
 using Content.Server.Wires;
+using Content.Shared.Whitelist;
 using Robust.Shared.Random;
 
 namespace Content.Server.GameTicking.Rules.VariationPass;
@@ -11,6 +12,8 @@ namespace Content.Server.GameTicking.Rules.VariationPass;
 /// </summary>
 public sealed class CutWireVariationPassSystem : VariationPassSystem<CutWireVariationPassComponent>
 {
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+
     protected override void ApplyVariation(Entity<CutWireVariationPassComponent> ent, ref StationVariationPassEvent args)
     {
         var wiresCut = 0;
@@ -22,7 +25,7 @@ protected override void ApplyVariation(Entity<CutWireVariationPassComponent> ent
                 continue;
 
             // Check against blacklist
-            if (ent.Comp.Blacklist.IsValid(uid))
+            if (_whitelistSystem.IsBlacklistPass(ent.Comp.Blacklist, uid))
                 continue;
 
             if (Random.Prob(ent.Comp.WireCutChance))
diff --git a/Content.Server/Holiday/Christmas/RandomGiftSystem.cs b/Content.Server/Holiday/Christmas/RandomGiftSystem.cs
index 48af65cb378..4603f45ed81 100644
--- a/Content.Server/Holiday/Christmas/RandomGiftSystem.cs
+++ b/Content.Server/Holiday/Christmas/RandomGiftSystem.cs
@@ -1,9 +1,10 @@
-using Content.Server.Administration.Logs;
+using Content.Server.Administration.Logs;
 using Content.Server.Hands.Systems;
 using Content.Shared.Database;
 using Content.Shared.Examine;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Item;
+using Content.Shared.Whitelist;
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
 using Robust.Shared.Map.Components;
@@ -24,6 +25,7 @@ public sealed class RandomGiftSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     private readonly List<string> _possibleGiftsSafe = new();
     private readonly List<string> _possibleGiftsUnsafe = new();
@@ -40,7 +42,7 @@ public override void Initialize()
 
     private void OnExamined(EntityUid uid, RandomGiftComponent component, ExaminedEvent args)
     {
-        if (!component.ContentsViewers.IsValid(args.Examiner, EntityManager) || component.SelectedEntity is null)
+        if (_whitelistSystem.IsWhitelistFail(component.ContentsViewers, args.Examiner) || component.SelectedEntity is null)
             return;
 
         var name = _prototype.Index<EntityPrototype>(component.SelectedEntity).Name;
diff --git a/Content.Server/Mech/Systems/MechEquipmentSystem.cs b/Content.Server/Mech/Systems/MechEquipmentSystem.cs
index f51c0444e69..f9fe5e46413 100644
--- a/Content.Server/Mech/Systems/MechEquipmentSystem.cs
+++ b/Content.Server/Mech/Systems/MechEquipmentSystem.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Interaction;
 using Content.Shared.Mech.Components;
 using Content.Shared.Mech.Equipment.Components;
+using Content.Shared.Whitelist;
 
 namespace Content.Server.Mech.Systems;
 
@@ -14,6 +15,7 @@ public sealed class MechEquipmentSystem : EntitySystem
     [Dependency] private readonly MechSystem _mech = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -40,7 +42,7 @@ private void OnUsed(EntityUid uid, MechEquipmentComponent component, AfterIntera
         if (mechComp.EquipmentContainer.ContainedEntities.Count >= mechComp.MaxEquipmentAmount)
             return;
 
-        if (mechComp.EquipmentWhitelist != null && !mechComp.EquipmentWhitelist.IsValid(args.Used))
+        if (_whitelistSystem.IsWhitelistFail(mechComp.EquipmentWhitelist, args.Used))
             return;
 
         _popup.PopupEntity(Loc.GetString("mech-equipment-begin-install", ("item", uid)), mech);
diff --git a/Content.Server/Mech/Systems/MechSystem.cs b/Content.Server/Mech/Systems/MechSystem.cs
index 68b973f5887..b738d28b467 100644
--- a/Content.Server/Mech/Systems/MechSystem.cs
+++ b/Content.Server/Mech/Systems/MechSystem.cs
@@ -22,6 +22,7 @@
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
+using Content.Shared.Whitelist;
 
 namespace Content.Server.Mech.Systems;
 
@@ -36,6 +37,7 @@ public sealed partial class MechSystem : SharedMechSystem
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
     [Dependency] private readonly SharedToolSystem _toolSystem = default!;
 
     /// <inheritdoc/>
@@ -224,7 +226,7 @@ private void OnMechEntry(EntityUid uid, MechComponent component, MechEntryEvent
         if (args.Cancelled || args.Handled)
             return;
 
-        if (component.PilotWhitelist != null && !component.PilotWhitelist.IsValid(args.User))
+        if (_whitelistSystem.IsWhitelistFail(component.PilotWhitelist, args.User))
         {
             _popup.PopupEntity(Loc.GetString("mech-no-enter", ("item", uid)), args.User);
             return;
diff --git a/Content.Server/Ninja/Systems/StunProviderSystem.cs b/Content.Server/Ninja/Systems/StunProviderSystem.cs
index 822486cff52..7061dd6e3b2 100644
--- a/Content.Server/Ninja/Systems/StunProviderSystem.cs
+++ b/Content.Server/Ninja/Systems/StunProviderSystem.cs
@@ -10,6 +10,7 @@
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Timing;
+using Content.Shared.Whitelist;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Ninja.Systems;
diff --git a/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs b/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs
index 054ad1b67d4..68d8258c6bb 100644
--- a/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration.Logs;
+using Content.Server.Administration.Logs;
 using Content.Server.Interaction.Components;
 using Content.Server.Popups;
 using Content.Shared.Database;
@@ -171,7 +171,7 @@ public bool IsValidPartner(EntityUid uid, EntityUid partner, ReproductiveCompone
         if (!CanReproduce(partner))
             return false;
 
-        return component.PartnerWhitelist.IsValid(partner);
+        return _whitelistSystem.IsWhitelistPass(component.PartnerWhitelist, partner);
     }
 
     /// <summary>
diff --git a/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs b/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs
index 56b245ce847..8fe7e7e2031 100644
--- a/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs
+++ b/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Objectives.Components;
 using Content.Shared.Objectives.Components;
+using Content.Shared.Whitelist;
 
 namespace Content.Server.Objectives.Systems;
 
@@ -8,6 +9,8 @@ namespace Content.Server.Objectives.Systems;
 /// </summary>
 public sealed class ObjectiveBlacklistRequirementSystem : EntitySystem
 {
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+
     public override void Initialize()
     {
         base.Initialize();
@@ -22,7 +25,7 @@ private void OnCheck(EntityUid uid, ObjectiveBlacklistRequirementComponent comp,
 
         foreach (var objective in args.Mind.AllObjectives)
         {
-            if (comp.Blacklist.IsValid(objective, EntityManager))
+            if (_whitelistSystem.IsBlacklistPass(comp.Blacklist, objective))
             {
                 args.Cancelled = true;
                 return;
diff --git a/Content.Server/Objectives/Systems/RoleRequirementSystem.cs b/Content.Server/Objectives/Systems/RoleRequirementSystem.cs
index 97aee218f06..8421987bae9 100644
--- a/Content.Server/Objectives/Systems/RoleRequirementSystem.cs
+++ b/Content.Server/Objectives/Systems/RoleRequirementSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Objectives.Components;
 using Content.Shared.Objectives.Components;
+using Content.Shared.Whitelist;
 
 namespace Content.Server.Objectives.Systems;
 
@@ -8,6 +9,7 @@ namespace Content.Server.Objectives.Systems;
 /// </summary>
 public sealed class RoleRequirementSystem : EntitySystem
 {
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
     public override void Initialize()
     {
         base.Initialize();
@@ -22,7 +24,7 @@ private void OnCheck(EntityUid uid, RoleRequirementComponent comp, ref Requireme
 
         // 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 (!comp.Roles.IsValid(args.MindId, EntityManager))
+        if (_whitelistSystem.IsWhitelistFail(comp.Roles, args.MindId))
             args.Cancelled = true;
     }
 }
diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.Collide.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.Collide.cs
index b4240d409ad..b29f46e09e9 100644
--- a/Content.Server/Polymorph/Systems/PolymorphSystem.Collide.cs
+++ b/Content.Server/Polymorph/Systems/PolymorphSystem.Collide.cs
@@ -1,6 +1,7 @@
 using Content.Server.Polymorph.Components;
 using Content.Shared.Polymorph;
 using Content.Shared.Projectiles;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Prototypes;
@@ -9,6 +10,8 @@ namespace Content.Server.Polymorph.Systems;
 
 public partial class PolymorphSystem
 {
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+
     /// <summary>
     /// Need to do this so we don't get a collection enumeration error in physics by polymorphing
     /// an entity we're colliding with
@@ -39,8 +42,8 @@ private void OnPolymorphCollide(EntityUid uid, PolymorphOnCollideComponent compo
             return;
 
         var other = args.OtherEntity;
-        if (!component.Whitelist.IsValid(other, EntityManager)
-            || component.Blacklist != null && component.Blacklist.IsValid(other, EntityManager))
+        if (_whitelistSystem.IsWhitelistFail(component.Whitelist, other) ||
+            _whitelistSystem.IsBlacklistPass(component.Blacklist, other))
             return;
 
         _queuedPolymorphUpdates.Enqueue(new (other, component.Sound, component.Polymorph));
diff --git a/Content.Server/Sticky/Systems/StickySystem.cs b/Content.Server/Sticky/Systems/StickySystem.cs
index effe1b72f71..21a7f4d0395 100644
--- a/Content.Server/Sticky/Systems/StickySystem.cs
+++ b/Content.Server/Sticky/Systems/StickySystem.cs
@@ -7,6 +7,7 @@
 using Content.Shared.Sticky;
 using Content.Shared.Sticky.Components;
 using Content.Shared.Verbs;
+using Content.Shared.Whitelist;
 using Robust.Shared.Containers;
 using Robust.Shared.Utility;
 
@@ -20,6 +21,7 @@ public sealed class StickySystem : EntitySystem
     [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
     [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     private const string StickerSlotId = "stickers_container";
 
@@ -67,9 +69,8 @@ private bool StartSticking(EntityUid uid, EntityUid user, EntityUid target, Stic
             return false;
 
         // check whitelist and blacklist
-        if (component.Whitelist != null && !component.Whitelist.IsValid(target))
-            return false;
-        if (component.Blacklist != null && component.Blacklist.IsValid(target))
+        if (_whitelistSystem.IsWhitelistFail(component.Whitelist, target) ||
+            _whitelistSystem.IsBlacklistPass(component.Blacklist, target))
             return false;
 
         var attemptEv = new AttemptEntityStickEvent(target, user);
diff --git a/Content.Server/Storage/EntitySystems/ItemCounterSystem.cs b/Content.Server/Storage/EntitySystems/ItemCounterSystem.cs
index 415e8d92467..43fcb32d1f0 100644
--- a/Content.Server/Storage/EntitySystems/ItemCounterSystem.cs
+++ b/Content.Server/Storage/EntitySystems/ItemCounterSystem.cs
@@ -1,6 +1,7 @@
-using Content.Shared.Storage;
+using Content.Shared.Storage;
 using Content.Shared.Storage.Components;
 using Content.Shared.Storage.EntitySystems;
+using Content.Shared.Whitelist;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
 
@@ -9,6 +10,7 @@ namespace Content.Server.Storage.EntitySystems
     [UsedImplicitly]
     public sealed class ItemCounterSystem : SharedItemCounterSystem
     {
+        [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
         protected override int? GetCount(ContainerModifiedMessage msg, ItemCounterComponent itemCounter)
         {
             if (!EntityManager.TryGetComponent(msg.Container.Owner, out StorageComponent? component))
@@ -19,7 +21,7 @@ public sealed class ItemCounterSystem : SharedItemCounterSystem
             var count = 0;
             foreach (var entity in component.Container.ContainedEntities)
             {
-                if (itemCounter.Count.IsValid(entity))
+                if (_whitelistSystem.IsWhitelistPass(itemCounter.Count, entity))
                     count++;
             }
 
diff --git a/Content.Server/Store/Conditions/BuyerWhitelistCondition.cs b/Content.Server/Store/Conditions/BuyerWhitelistCondition.cs
index 859703a72a7..ff4a9a19cdd 100644
--- a/Content.Server/Store/Conditions/BuyerWhitelistCondition.cs
+++ b/Content.Server/Store/Conditions/BuyerWhitelistCondition.cs
@@ -23,18 +23,11 @@ public sealed partial class BuyerWhitelistCondition : ListingCondition
     public override bool Condition(ListingConditionArgs args)
     {
         var ent = args.EntityManager;
+        var whitelistSystem = ent.System<EntityWhitelistSystem>();
 
-        if (Whitelist != null)
-        {
-            if (!Whitelist.IsValid(args.Buyer, ent))
-                return false;
-        }
-
-        if (Blacklist != null)
-        {
-            if (Blacklist.IsValid(args.Buyer, ent))
-                return false;
-        }
+        if (whitelistSystem.IsWhitelistFail(Whitelist, args.Buyer) ||
+            whitelistSystem.IsBlacklistPass(Blacklist, args.Buyer))
+            return false;
 
         return true;
     }
diff --git a/Content.Server/Store/Conditions/StoreWhitelistCondition.cs b/Content.Server/Store/Conditions/StoreWhitelistCondition.cs
index 20ec5cecce8..ced4dfa9c0b 100644
--- a/Content.Server/Store/Conditions/StoreWhitelistCondition.cs
+++ b/Content.Server/Store/Conditions/StoreWhitelistCondition.cs
@@ -26,18 +26,11 @@ public override bool Condition(ListingConditionArgs args)
             return false;
 
         var ent = args.EntityManager;
+        var whitelistSystem = ent.System<EntityWhitelistSystem>();
 
-        if (Whitelist != null)
-        {
-            if (!Whitelist.IsValid(args.StoreEntity.Value, ent))
-                return false;
-        }
-
-        if (Blacklist != null)
-        {
-            if (Blacklist.IsValid(args.StoreEntity.Value, ent))
-                return false;
-        }
+        if (whitelistSystem.IsWhitelistFail(Whitelist, args.StoreEntity.Value) ||
+            whitelistSystem.IsBlacklistPass(Blacklist, args.StoreEntity.Value))
+            return false;
 
         return true;
     }
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs
index f411001bd3a..a01f19c9090 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.Chat.Systems;
 using Content.Server.Speech;
 using Content.Server.Speech.Components;
+using Content.Shared.Whitelist;
 using Robust.Shared.Player;
 using static Content.Server.Chat.Systems.ChatSystem;
 
@@ -9,7 +10,7 @@ namespace Content.Server.SurveillanceCamera;
 public sealed class SurveillanceCameraMicrophoneSystem : EntitySystem
 {
     [Dependency] private readonly SharedTransformSystem _xforms = default!;
-
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
     public override void Initialize()
     {
         base.Initialize();
@@ -60,7 +61,7 @@ private void OnInit(EntityUid uid, SurveillanceCameraMicrophoneComponent compone
     public void CanListen(EntityUid uid, SurveillanceCameraMicrophoneComponent microphone, ListenAttemptEvent args)
     {
         // TODO maybe just make this a part of ActiveListenerComponent?
-        if (microphone.Blacklist.IsValid(args.Source))
+        if (_whitelistSystem.IsBlacklistPass(microphone.Blacklist, args.Source))
             args.Cancel();
     }
 
diff --git a/Content.Server/Traits/TraitSystem.cs b/Content.Server/Traits/TraitSystem.cs
index 75771a57432..ecf4b10cbac 100644
--- a/Content.Server/Traits/TraitSystem.cs
+++ b/Content.Server/Traits/TraitSystem.cs
@@ -6,6 +6,7 @@
 using Content.Shared.Roles;
 using Content.Shared.Traits;
 using Robust.Shared.Configuration;
+using Content.Shared.Whitelist;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Utility;
diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
index b4303f97d81..f841ea910e7 100644
--- a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
+++ b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
@@ -9,6 +9,7 @@
 using Content.Shared.Damage;
 using Content.Shared.Power;
 using Content.Shared.Verbs;
+using Content.Shared.Whitelist;
 using Content.Shared.Xenoarchaeology.Equipment;
 using Robust.Shared.Collections;
 using Robust.Shared.Random;
@@ -26,6 +27,7 @@ public sealed class ArtifactCrusherSystem : SharedArtifactCrusherSystem
     [Dependency] private readonly DamageableSystem _damageable = default!;
     [Dependency] private readonly StackSystem _stack = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -93,7 +95,7 @@ public void FinishCrushing(Entity<ArtifactCrusherComponent, EntityStorageCompone
         var coords = Transform(ent).Coordinates;
         foreach (var contained in contents)
         {
-            if (crusher.CrushingWhitelist.IsValid(contained, EntityManager))
+            if (_whitelistSystem.IsWhitelistPass(crusher.CrushingWhitelist, contained))
             {
                 var amount = _random.Next(crusher.MinFragments, crusher.MaxFragments);
                 var stacks = _stack.SpawnMultiple(crusher.FragmentStackProtoId, amount, coords);
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/DamageNearbyArtifactSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/DamageNearbyArtifactSystem.cs
index a2023a18d48..f231120ad5b 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/DamageNearbyArtifactSystem.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/DamageNearbyArtifactSystem.cs
@@ -1,6 +1,7 @@
-using Content.Server.Xenoarchaeology.XenoArtifacts.Effects.Components;
+using Content.Server.Xenoarchaeology.XenoArtifacts.Effects.Components;
 using Content.Server.Xenoarchaeology.XenoArtifacts.Events;
 using Content.Shared.Damage;
+using Content.Shared.Whitelist;
 using Robust.Shared.Random;
 
 namespace Content.Server.Xenoarchaeology.XenoArtifacts.Effects.Systems;
@@ -10,6 +11,7 @@ public sealed class BreakWindowArtifactSystem : EntitySystem
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -24,7 +26,7 @@ private void OnActivated(EntityUid uid, DamageNearbyArtifactComponent component,
             ents.Add(args.Activator.Value);
         foreach (var ent in ents)
         {
-            if (component.Whitelist != null && !component.Whitelist.IsValid(ent))
+            if (_whitelistSystem.IsWhitelistFail(component.Whitelist, ent))
                 continue;
 
             if (!_random.Prob(component.DamageChance))
diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
index 59241499a11..c323f3dfb72 100644
--- a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
+++ b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
@@ -220,8 +220,8 @@ private bool CanBuckle(EntityUid buckleUid,
             return false;
 
         // Does it pass the Whitelist
-        if (strapComp.Whitelist != null &&
-            !_whitelistSystem.IsValid(strapComp.Whitelist, buckleUid) || strapComp.Blacklist != null && _whitelistSystem.IsValid(strapComp.Blacklist, buckleUid))
+        if (_whitelistSystem.IsWhitelistFail(strapComp.Whitelist, buckleUid) ||
+            _whitelistSystem.IsBlacklistPass(strapComp.Blacklist, buckleUid))
         {
             if (popup)
                 _popup.PopupClient(Loc.GetString("buckle-component-cannot-fit-message"), user, PopupType.Medium);
diff --git a/Content.Shared/Construction/Conditions/EntityWhitelistCondition.cs b/Content.Shared/Construction/Conditions/EntityWhitelistCondition.cs
index 22d86b54fb7..b7b3c56ba4c 100644
--- a/Content.Shared/Construction/Conditions/EntityWhitelistCondition.cs
+++ b/Content.Shared/Construction/Conditions/EntityWhitelistCondition.cs
@@ -31,7 +31,8 @@ public sealed partial class EntityWhitelistCondition : IConstructionCondition
 
     public bool Condition(EntityUid user, EntityCoordinates location, Direction direction)
     {
-        return Whitelist.IsValid(user);
+        var whitelistSystem = IoCManager.Resolve<IEntityManager>().System<EntityWhitelistSystem>();
+        return whitelistSystem.IsWhitelistPass(Whitelist, user);
     }
 
     public ConstructionGuideEntry GenerateGuideEntry()
diff --git a/Content.Shared/Inventory/InventorySystem.Equip.cs b/Content.Shared/Inventory/InventorySystem.Equip.cs
index d3c0deeae87..f4567eeae18 100644
--- a/Content.Shared/Inventory/InventorySystem.Equip.cs
+++ b/Content.Shared/Inventory/InventorySystem.Equip.cs
@@ -271,13 +271,8 @@ public bool CanEquip(EntityUid actor, EntityUid target, EntityUid itemUid, strin
             return false;
         }
 
-        if (slotDefinition.Whitelist != null && !slotDefinition.Whitelist.IsValid(itemUid))
-        {
-            reason = "inventory-component-can-equip-does-not-fit";
-            return false;
-        }
-
-        if (slotDefinition.Blacklist != null && slotDefinition.Blacklist.IsValid(itemUid))
+        if (_whitelistSystem.IsWhitelistFail(slotDefinition.Whitelist, itemUid) ||
+            _whitelistSystem.IsBlacklistPass(slotDefinition.Blacklist, itemUid))
         {
             reason = "inventory-component-can-equip-does-not-fit";
             return false;
diff --git a/Content.Shared/Labels/EntitySystems/SharedHandLabelerSystem.cs b/Content.Shared/Labels/EntitySystems/SharedHandLabelerSystem.cs
index 7dbeee3e770..0763bb101ca 100644
--- a/Content.Shared/Labels/EntitySystems/SharedHandLabelerSystem.cs
+++ b/Content.Shared/Labels/EntitySystems/SharedHandLabelerSystem.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Labels.Components;
 using Content.Shared.Popups;
 using Content.Shared.Verbs;
+using Content.Shared.Whitelist;
 using Robust.Shared.GameStates;
 using Robust.Shared.Network;
 
@@ -16,6 +17,7 @@ public abstract class SharedHandLabelerSystem : EntitySystem
     [Dependency] private readonly SharedLabelSystem _labelSystem = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
     [Dependency] private readonly INetManager _netManager = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -77,7 +79,7 @@ private void AddLabelTo(EntityUid uid, HandLabelerComponent? handLabeler, Entity
 
     private void OnUtilityVerb(EntityUid uid, HandLabelerComponent handLabeler, GetVerbsEvent<UtilityVerb> args)
     {
-        if (args.Target is not { Valid: true } target || !handLabeler.Whitelist.IsValid(target) || !args.CanAccess)
+        if (args.Target is not { Valid: true } target || _whitelistSystem.IsWhitelistFail(handLabeler.Whitelist, target) || !args.CanAccess)
             return;
 
         var labelerText = handLabeler.AssignedLabel == string.Empty ? Loc.GetString("hand-labeler-remove-label-text") : Loc.GetString("hand-labeler-add-label-text");
@@ -96,7 +98,7 @@ private void OnUtilityVerb(EntityUid uid, HandLabelerComponent handLabeler, GetV
 
     private void AfterInteractOn(EntityUid uid, HandLabelerComponent handLabeler, AfterInteractEvent args)
     {
-        if (args.Target is not { Valid: true } target || !handLabeler.Whitelist.IsValid(target) || !args.CanReach)
+        if (args.Target is not { Valid: true } target || _whitelistSystem.IsWhitelistFail(handLabeler.Whitelist, target) || !args.CanReach)
             return;
 
         Labeling(uid, target, args.User, handLabeler);
diff --git a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
index d57eea7e3ed..b518bc875fd 100644
--- a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
+++ b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
@@ -10,6 +10,7 @@
 using Content.Shared.Examine;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Stacks;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
@@ -32,6 +33,7 @@ public abstract class SharedMaterialReclaimerSystem : EntitySystem
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] protected readonly SharedContainerSystem Container = default!;
     [Dependency] private readonly IConfigurationManager _config = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public const string ActiveReclaimerContainerId = "active-material-reclaimer-container";
 
@@ -94,10 +96,8 @@ public bool TryStartProcessItem(EntityUid uid, EntityUid item, MaterialReclaimer
         if (HasComp<MobStateComponent>(item) && !CanGib(uid, item, component)) // whitelist? We be gibbing, boy!
             return false;
 
-        if (component.Whitelist is {} whitelist && !whitelist.IsValid(item))
-            return false;
-
-        if (component.Blacklist is {} blacklist && blacklist.IsValid(item))
+        if (_whitelistSystem.IsWhitelistFail(component.Whitelist, item) ||
+            _whitelistSystem.IsBlacklistPass(component.Blacklist, item))
             return false;
 
         if (Container.TryGetContainingContainer((item, null, null), out _) && !Container.TryRemoveFromContainer(item))
diff --git a/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs b/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs
index 73b7c0847fc..2ec48085c47 100644
--- a/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs
+++ b/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs
@@ -15,6 +15,7 @@
 using Content.Shared.Movement.Systems;
 using Content.Shared.Popups;
 using Content.Shared.Weapons.Melee;
+using Content.Shared.Whitelist;
 using Robust.Shared.Containers;
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
@@ -37,6 +38,7 @@ public abstract class SharedMechSystem : EntitySystem
     [Dependency] private readonly SharedMoverController _mover = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -216,7 +218,7 @@ public void InsertEquipment(EntityUid uid, EntityUid toInsert, MechComponent? co
         if (component.EquipmentContainer.ContainedEntities.Count >= component.MaxEquipmentAmount)
             return;
 
-        if (component.EquipmentWhitelist != null && !component.EquipmentWhitelist.IsValid(toInsert))
+        if (_whitelistSystem.IsWhitelistFail(component.EquipmentWhitelist, toInsert))
             return;
 
         equipmentComponent.EquipmentOwner = uid;
diff --git a/Content.Shared/Movement/Systems/SpeedModifierContactsSystem.cs b/Content.Shared/Movement/Systems/SpeedModifierContactsSystem.cs
index 400a675cd25..6e1b3a29aec 100644
--- a/Content.Shared/Movement/Systems/SpeedModifierContactsSystem.cs
+++ b/Content.Shared/Movement/Systems/SpeedModifierContactsSystem.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Movement.Components;
+using Content.Shared.Whitelist;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Physics.Systems;
@@ -9,6 +10,7 @@ public sealed class SpeedModifierContactsSystem : EntitySystem
 {
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _speedModifierSystem = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     // TODO full-game-save
     // Either these need to be processed before a map is saved, or slowed/slowing entities need to update on init.
@@ -86,7 +88,7 @@ private void MovementSpeedCheck(EntityUid uid, SpeedModifiedByContactComponent c
             if (!TryComp<SpeedModifierContactsComponent>(ent, out var slowContactsComponent))
                 continue;
 
-            if (slowContactsComponent.IgnoreWhitelist != null && slowContactsComponent.IgnoreWhitelist.IsValid(uid))
+            if (_whitelistSystem.IsWhitelistPass(slowContactsComponent.IgnoreWhitelist, uid))
                 continue;
 
             walkSpeed += slowContactsComponent.WalkSpeedModifier;
diff --git a/Content.Shared/Ninja/Systems/EmagProviderSystem.cs b/Content.Shared/Ninja/Systems/EmagProviderSystem.cs
index ae0bacaf5f6..8718d7887b9 100644
--- a/Content.Shared/Ninja/Systems/EmagProviderSystem.cs
+++ b/Content.Shared/Ninja/Systems/EmagProviderSystem.cs
@@ -17,7 +17,8 @@ public sealed class EmagProviderSystem : EntitySystem
     [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
     [Dependency] private readonly SharedNinjaGlovesSystem _gloves = default!;
-    [Dependency] private readonly TagSystem _tag = default!;
+    [Dependency] private readonly TagSystem _tags = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
diff --git a/Content.Shared/Placeable/ItemPlacerSystem.cs b/Content.Shared/Placeable/ItemPlacerSystem.cs
index 9be6a4acd5a..d1ea88b82a0 100644
--- a/Content.Shared/Placeable/ItemPlacerSystem.cs
+++ b/Content.Shared/Placeable/ItemPlacerSystem.cs
@@ -1,4 +1,5 @@
-using Robust.Shared.Physics.Events;
+using Content.Shared.Whitelist;
+using Robust.Shared.Physics.Events;
 using Robust.Shared.Physics.Systems;
 
 namespace Content.Shared.Placeable;
@@ -11,6 +12,7 @@ public sealed class ItemPlacerSystem : EntitySystem
 {
     [Dependency] private readonly CollisionWakeSystem _wake = default!;
     [Dependency] private readonly PlaceableSurfaceSystem _placeableSurface = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -22,7 +24,7 @@ public override void Initialize()
 
     private void OnStartCollide(EntityUid uid, ItemPlacerComponent comp, ref StartCollideEvent args)
     {
-        if (comp.Whitelist != null && !comp.Whitelist.IsValid(args.OtherEntity))
+        if (_whitelistSystem.IsWhitelistFail(comp.Whitelist, args.OtherEntity))
             return;
 
         if (TryComp<CollisionWakeComponent>(args.OtherEntity, out var wakeComp))
diff --git a/Content.Shared/Random/RulesSystem.cs b/Content.Shared/Random/RulesSystem.cs
index f8711fb63e0..2e8c044c3ca 100644
--- a/Content.Shared/Random/RulesSystem.cs
+++ b/Content.Shared/Random/RulesSystem.cs
@@ -1,6 +1,7 @@
 using System.Numerics;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
+using Content.Shared.Whitelist;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
@@ -14,7 +15,7 @@ public sealed class RulesSystem : EntitySystem
     [Dependency] private readonly AccessReaderSystem _reader = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
-
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
     public bool IsTrue(EntityUid uid, RulesPrototype rules)
     {
         var inRange = new HashSet<Entity<IComponent>>();
@@ -158,7 +159,7 @@ public bool IsTrue(EntityUid uid, RulesPrototype rules)
 
                     foreach (var ent in _lookup.GetEntitiesInRange(xform.MapID, worldPos, entity.Range))
                     {
-                        if (!entity.Whitelist.IsValid(ent, EntityManager))
+                        if (_whitelistSystem.IsWhitelistFail(entity.Whitelist, ent))
                             continue;
 
                         count++;
diff --git a/Content.Shared/Sound/SharedEmitSoundSystem.cs b/Content.Shared/Sound/SharedEmitSoundSystem.cs
index a9a50698d7d..998a07d8f80 100644
--- a/Content.Shared/Sound/SharedEmitSoundSystem.cs
+++ b/Content.Shared/Sound/SharedEmitSoundSystem.cs
@@ -8,6 +8,7 @@
 using Content.Shared.Popups;
 using Content.Shared.Sound.Components;
 using Content.Shared.Throwing;
+using Content.Shared.Whitelist;
 using JetBrains.Annotations;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
@@ -34,6 +35,7 @@ public abstract class SharedEmitSoundSystem : EntitySystem
     [Dependency] private   readonly SharedAmbientSoundSystem _ambient = default!;
     [Dependency] private   readonly SharedAudioSystem _audioSystem = default!;
     [Dependency] protected readonly SharedPopupSystem Popup = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -123,7 +125,7 @@ private void OnEmitSoundOnDrop(EntityUid uid, EmitSoundOnDropComponent component
 
     private void OnEmitSoundOnInteractUsing(Entity<EmitSoundOnInteractUsingComponent> ent, ref InteractUsingEvent args)
     {
-        if (ent.Comp.Whitelist.IsValid(args.Used, EntityManager))
+        if (_whitelistSystem.IsWhitelistPass(ent.Comp.Whitelist, args.Used))
         {
             TryEmitSound(ent, ent.Comp, args.User);
         }
diff --git a/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs b/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
index d0cd5c4b4e2..5bb303cf517 100644
--- a/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
+++ b/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Gravity;
 using Content.Shared.StepTrigger.Components;
+using Content.Shared.Whitelist;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
@@ -12,6 +13,7 @@ public sealed class StepTriggerSystem : EntitySystem
     [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
     [Dependency] private readonly SharedGravitySystem _gravity = default!;
     [Dependency] private readonly SharedMapSystem _map = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -62,7 +64,7 @@ private bool Update(EntityUid uid, StepTriggerComponent component, TransformComp
                 if (ent == uid)
                     continue;
 
-                if (component.Blacklist.IsValid(ent.Value, EntityManager))
+                if (_whitelistSystem.IsBlacklistPass(component.Blacklist, ent.Value))
                     return false;
             }
         }
diff --git a/Content.Shared/Storage/EntitySystems/BinSystem.cs b/Content.Shared/Storage/EntitySystems/BinSystem.cs
index 1cc95337ea4..8c2cb4c4fcb 100644
--- a/Content.Shared/Storage/EntitySystems/BinSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/BinSystem.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 using Content.Shared.Examine;
@@ -7,6 +7,7 @@
 using Content.Shared.Item;
 using Content.Shared.Storage.Components;
 using Content.Shared.Verbs;
+using Content.Shared.Whitelist;
 using Robust.Shared.Containers;
 using Robust.Shared.Network;
 
@@ -21,6 +22,7 @@ public sealed class BinSystem : EntitySystem
     [Dependency] private readonly ISharedAdminLogManager _admin = default!;
     [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public const string BinContainerId = "bin-container";
 
@@ -130,7 +132,7 @@ public bool TryInsertIntoBin(EntityUid uid, EntityUid toInsert, BinComponent? co
         if (component.Items.Count >= component.MaxItems)
             return false;
 
-        if (component.Whitelist != null && !component.Whitelist.IsValid(toInsert))
+        if (_whitelistSystem.IsWhitelistFail(component.Whitelist, toInsert))
             return false;
 
         _container.Insert(toInsert, component.ItemContainer);
diff --git a/Content.Shared/Storage/EntitySystems/SharedItemMapperSystem.cs b/Content.Shared/Storage/EntitySystems/SharedItemMapperSystem.cs
index a5e151f4ea6..2557f8100c6 100644
--- a/Content.Shared/Storage/EntitySystems/SharedItemMapperSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedItemMapperSystem.cs
@@ -1,5 +1,6 @@
-using System.Linq;
+using System.Linq;
 using Content.Shared.Storage.Components;
+using Content.Shared.Whitelist;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
 
@@ -15,6 +16,7 @@ public abstract class SharedItemMapperSystem : EntitySystem
     {
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
         [Dependency] private readonly SharedContainerSystem _container = default!;
+        [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
         /// <inheritdoc />
         public override void Initialize()
@@ -93,7 +95,7 @@ private bool TryGetLayers(EntityUid uid,
             var list = new List<string>();
             foreach (var mapLayerData in itemMapper.MapLayers.Values)
             {
-                var count = containedLayers.Count(ent => mapLayerData.ServerWhitelist.IsValid(ent));
+                var count = containedLayers.Count(ent => _whitelistSystem.IsWhitelistPass(mapLayerData.ServerWhitelist, ent));
                 if (count >= mapLayerData.MinCount && count <= mapLayerData.MaxCount)
                 {
                     list.Add(mapLayerData.Layer);
diff --git a/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs b/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs
index bc73baa61ad..58c249fec54 100644
--- a/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs
+++ b/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Popups;
 using Content.Shared.Teleportation.Components;
 using Content.Shared.Verbs;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Map.Components;
@@ -24,6 +25,7 @@ public sealed class SwapTeleporterSystem : EntitySystem
     [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     private EntityQuery<TransformComponent> _xformQuery;
 
@@ -51,8 +53,8 @@ private void OnInteract(Entity<SwapTeleporterComponent> ent, ref AfterInteractEv
         if (!TryComp<SwapTeleporterComponent>(target, out var targetComp))
             return;
 
-        if (!comp.TeleporterWhitelist.IsValid(target, EntityManager) ||
-            !targetComp.TeleporterWhitelist.IsValid(uid, EntityManager))
+        if (_whitelistSystem.IsWhitelistFail(comp.TeleporterWhitelist, target) ||
+            _whitelistSystem.IsWhitelistFail(targetComp.TeleporterWhitelist, uid))
         {
             return;
         }
diff --git a/Content.Shared/UserInterface/ActivatableUISystem.cs b/Content.Shared/UserInterface/ActivatableUISystem.cs
index c620097961d..f32d6c98a89 100644
--- a/Content.Shared/UserInterface/ActivatableUISystem.cs
+++ b/Content.Shared/UserInterface/ActivatableUISystem.cs
@@ -8,6 +8,7 @@
 using Content.Shared.Interaction.Events;
 using Content.Shared.Popups;
 using Content.Shared.Verbs;
+using Content.Shared.Whitelist;
 using Robust.Shared.Utility;
 using Content.Shared.Whitelist;
 using Robust.Shared.Containers;
@@ -22,6 +23,7 @@ public sealed partial class ActivatableUISystem : EntitySystem
     [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -99,8 +101,8 @@ private bool ShouldAddVerb<T>(EntityUid uid, ActivatableUIComponent component, G
         if (!args.CanAccess)
             return false;
 
-        if (component.RequiredItems is not null && !_entityWhitelist.IsValid(component.RequiredItems, args.Using ?? default) ||
-            component.UserWhitelist is not null && !_entityWhitelist.IsValid(component.UserWhitelist, args.User))
+        if (_whitelistSystem.IsWhitelistFail(component.RequiredItems, args.Using ?? default)
+            || _whitelistSystem.IsWhitelistFail(component.UserWhitelist, args.User))
             return false;
 
         if (component.RequireHands)
@@ -157,8 +159,8 @@ private void OnInteractUsing(EntityUid uid, ActivatableUIComponent component, In
         if (component.VerbOnly)
             return;
 
-        if (component.RequiredItems is null || !_entityWhitelist.IsValid(component.RequiredItems, args.Used) ||
-            component.UserWhitelist is not null && !_entityWhitelist.IsValid(component.UserWhitelist, args.User))
+        if (_whitelistSystem.IsWhitelistFailOrNull(component.RequiredItems, args.Used) ||
+            !_whitelistSystem.IsWhitelistFail(component.UserWhitelist, args.User))
             return;
 
         args.Handled = InteractUI(args.User, uid, component);
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
index 7afc42639a6..639ae31d0e8 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
@@ -15,6 +15,7 @@ public abstract partial class SharedGunSystem
 {
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
 
+
     protected virtual void InitializeBallistic()
     {
         SubscribeLocalEvent<BallisticAmmoProviderComponent, ComponentInit>(OnBallisticInit);
@@ -125,7 +126,7 @@ void SimulateInsertAmmo(EntityUid ammo, EntityUid ammoProvider, EntityCoordinate
             if (ent == null)
                 continue;
 
-            if (!target.Whitelist.IsValid(ent.Value))
+            if (_whitelistSystem.IsWhitelistFail(target.Whitelist, ent.Value))
             {
                 Popup(
                     Loc.GetString("gun-ballistic-transfer-invalid",
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs
index 78386e89519..7ef57df5391 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs
@@ -42,7 +42,7 @@ private bool TryGetClothingSlotEntity(EntityUid uid, ClothingSlotAmmoProviderCom
 
         while (enumerator.NextItem(out var item))
         {
-            if (component.ProviderWhitelist == null || !component.ProviderWhitelist.IsValid(item, EntityManager))
+            if (_whitelistSystem.IsWhitelistFailOrNull(component.ProviderWhitelist, item))
                 continue;
 
             slotEntity = item;

From ba903487183297b090206b773608a87b6b02e30c Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 19 Dec 2024 14:17:21 -0400
Subject: [PATCH 199/366] Remove every usage of EntityWhitelist.IsValid

---
 Content.Server/Antag/AntagSelectionSystem.cs  | 16 +++-------
 .../TileReactions/CreateEntityTileReaction.cs |  2 +-
 Content.Server/Paint/PaintSystem.cs           | 32 ++++++++++---------
 .../InteractionVerbs/InteractionAction.cs     |  2 ++
 .../Requirements/AssortedRequirements.cs      |  8 ++---
 .../Ninja/Systems/EmagProviderSystem.cs       |  2 +-
 Content.Shared/Whitelist/EntityWhitelist.cs   | 10 ------
 7 files changed, 29 insertions(+), 43 deletions(-)

diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs
index b23afe23103..a0809e58829 100644
--- a/Content.Server/Antag/AntagSelectionSystem.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.cs
@@ -18,6 +18,7 @@
 using Content.Shared.Ghost;
 using Content.Shared.Humanoid;
 using Content.Shared.Players;
+using Content.Shared.Whitelist;
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
@@ -41,6 +42,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
     [Dependency] private readonly RoleSystem _role = default!;
     [Dependency] private readonly StationSpawningSystem _stationSpawning = default!;
     [Dependency] private readonly TransformSystem _transform = default!;
+    [Dependency] private readonly EntityWhitelistSystem _entityWhitelist = default!;
 
     // arbitrary random number to give late joining some mild interest.
     public const float LateJoinRandomChance = 0.5f;
@@ -405,17 +407,9 @@ public bool IsEntityValid(EntityUid? entity, AntagSelectionDefinition def)
         if (!def.AllowNonHumans && !HasComp<HumanoidAppearanceComponent>(entity))
             return false;
 
-        if (def.Whitelist != null)
-        {
-            if (!def.Whitelist.IsValid(entity.Value))
-                return false;
-        }
-
-        if (def.Blacklist != null)
-        {
-            if (def.Blacklist.IsValid(entity.Value))
-                return false;
-        }
+        if (_entityWhitelist.IsWhitelistFail(def.Whitelist, entity.Value)
+            || _entityWhitelist.IsBlacklistPass(def.Blacklist, entity.Value))
+            return false;
 
         return true;
     }
diff --git a/Content.Server/Chemistry/TileReactions/CreateEntityTileReaction.cs b/Content.Server/Chemistry/TileReactions/CreateEntityTileReaction.cs
index 3871fe81f0a..d3b57e76303 100644
--- a/Content.Server/Chemistry/TileReactions/CreateEntityTileReaction.cs
+++ b/Content.Server/Chemistry/TileReactions/CreateEntityTileReaction.cs
@@ -47,7 +47,7 @@ public FixedPoint2 TileReact(TileRef tile, ReagentPrototype reagent, FixedPoint2
                 int acc = 0;
                 foreach (var ent in tile.GetEntitiesInTile())
                 {
-                    var whitelistSystem = entityManager.System<EntityWhitelistSystem>();
+                    var whitelistSystem = entMan.System<EntityWhitelistSystem>();
                     if (whitelistSystem.IsWhitelistPass(Whitelist, ent))
                         acc += 1;
 
diff --git a/Content.Server/Paint/PaintSystem.cs b/Content.Server/Paint/PaintSystem.cs
index 9d7158baab0..89d39e9e49d 100644
--- a/Content.Server/Paint/PaintSystem.cs
+++ b/Content.Server/Paint/PaintSystem.cs
@@ -3,18 +3,15 @@
 using Content.Shared.Sprite;
 using Content.Shared.DoAfter;
 using Content.Shared.Interaction;
-using Content.Server.Chemistry.Containers.EntitySystems;
 using Robust.Shared.Audio.Systems;
 using Content.Shared.Humanoid;
 using Robust.Shared.Utility;
 using Content.Shared.Verbs;
 using Content.Shared.SubFloor;
-using Content.Server.Nutrition.Components;
 using Content.Shared.Inventory;
-using Content.Server.Nutrition.EntitySystems;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Whitelist;
-using Robust.Shared.Audio;
 
 namespace Content.Server.Paint;
 
@@ -25,11 +22,12 @@ public sealed class PaintSystem : SharedPaintSystem
 {
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
     [Dependency] private readonly InventorySystem _inventory = default!;
     [Dependency] private readonly OpenableSystem _openable = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
 
 
     public override void Initialize()
@@ -57,7 +55,6 @@ private void OnPaintVerb(EntityUid uid, PaintComponent component, GetVerbsEvent<
             return;
 
         var paintText = Loc.GetString("paint-verb");
-
         var verb = new UtilityVerb()
         {
             Act = () =>
@@ -68,12 +65,13 @@ private void OnPaintVerb(EntityUid uid, PaintComponent component, GetVerbsEvent<
             Text = paintText,
             Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/paint.svg.192dpi.png"))
         };
+
         args.Verbs.Add(verb);
     }
 
     private void PrepPaint(EntityUid uid, PaintComponent component, EntityUid target, EntityUid user) =>
         _doAfterSystem.TryStartDoAfter(
-            new DoAfterArgs(
+            new(
                 EntityManager,
                 user,
                 component.Delay,
@@ -110,8 +108,8 @@ public void Paint(Entity<PaintComponent> entity, EntityUid target, EntityUid use
             return;
         }
 
-        if (!entity.Comp.Whitelist?.IsValid(target, EntityManager) == true
-            || !entity.Comp.Blacklist?.IsValid(target, EntityManager) == false
+        if (_whitelist.IsWhitelistFail(entity.Comp.Whitelist, target)
+            || _whitelist.IsBlacklistPass(entity.Comp.Blacklist, target)
             || HasComp<HumanoidAppearanceComponent>(target) || HasComp<SubFloorHideComponent>(target))
         {
             _popup.PopupEntity(Loc.GetString("paint-failure", ("target", target)), user, user, PopupType.Medium);
@@ -130,12 +128,13 @@ public void Paint(Entity<PaintComponent> entity, EntityUid target, EntityUid use
             // Paint any clothing the target is wearing
             if (HasComp<InventoryComponent>(target)
                 && _inventory.TryGetSlots(target, out var slotDefinitions))
+            {
                 foreach (var slot in slotDefinitions)
                 {
                     if (!_inventory.TryGetSlotEntity(target, slot.Name, out var slotEnt)
                         || HasComp<PaintedComponent>(slotEnt.Value)
-                        || !entity.Comp.Whitelist?.IsValid(slotEnt.Value, EntityManager) != true
-                        || !entity.Comp.Blacklist?.IsValid(slotEnt.Value, EntityManager) != false
+                        || _whitelist.IsWhitelistFail(entity.Comp.Whitelist, slotEnt.Value)
+                        || _whitelist.IsBlacklistPass(entity.Comp.Blacklist, slotEnt.Value)
                         || HasComp<RandomSpriteComponent>(slotEnt.Value)
                         || HasComp<HumanoidAppearanceComponent>(slotEnt.Value))
                         continue;
@@ -146,6 +145,7 @@ public void Paint(Entity<PaintComponent> entity, EntityUid target, EntityUid use
                     _appearanceSystem.SetData(slotEnt.Value, PaintVisuals.Painted, true);
                     Dirty(slotEnt.Value, slotToPaint);
                 }
+            }
 
             _popup.PopupEntity(Loc.GetString("paint-success", ("target", target)), user, user, PopupType.Medium);
             _appearanceSystem.SetData(target, PaintVisuals.Painted, true);
@@ -159,8 +159,8 @@ public void Paint(Entity<PaintComponent> entity, EntityUid target, EntityUid use
 
     public void Paint(EntityWhitelist? whitelist, EntityWhitelist? blacklist, EntityUid target, Color color)
     {
-        if (!whitelist?.IsValid(target, EntityManager) != true
-            || !blacklist?.IsValid(target, EntityManager) != false)
+        if (_whitelist.IsWhitelistFail(whitelist, target)
+            || _whitelist.IsBlacklistPass(blacklist, target))
             return;
 
         EnsureComp<PaintedComponent>(target, out var paint);
@@ -171,11 +171,12 @@ public void Paint(EntityWhitelist? whitelist, EntityWhitelist? blacklist, Entity
 
         if (HasComp<InventoryComponent>(target)
             && _inventory.TryGetSlots(target, out var slotDefinitions))
+        {
             foreach (var slot in slotDefinitions)
             {
                 if (!_inventory.TryGetSlotEntity(target, slot.Name, out var slotEnt)
-                    || !whitelist?.IsValid(slotEnt.Value, EntityManager) != true
-                    || !blacklist?.IsValid(slotEnt.Value, EntityManager) != false)
+                    || _whitelist.IsWhitelistFail(whitelist, slotEnt.Value)
+                    || _whitelist.IsBlacklistPass(blacklist, slotEnt.Value))
                     continue;
 
                 EnsureComp<PaintedComponent>(slotEnt.Value, out var slotToPaint);
@@ -184,6 +185,7 @@ public void Paint(EntityWhitelist? whitelist, EntityWhitelist? blacklist, Entity
                 _appearanceSystem.SetData(slotEnt.Value, PaintVisuals.Painted, true);
                 Dirty(slotEnt.Value, slotToPaint);
             }
+        }
 
         _appearanceSystem.SetData(target, PaintVisuals.Painted, true);
         Dirty(target, paint);
diff --git a/Content.Shared/InteractionVerbs/InteractionAction.cs b/Content.Shared/InteractionVerbs/InteractionAction.cs
index 6c74b304c9f..0ffbc42b2b0 100644
--- a/Content.Shared/InteractionVerbs/InteractionAction.cs
+++ b/Content.Shared/InteractionVerbs/InteractionAction.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Whitelist;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization;
@@ -55,5 +56,6 @@ public sealed class VerbDependencies
         [Dependency] public readonly IRobustRandom Random = default!;
         [Dependency] public readonly IGameTiming Timing = default!;
         [Dependency] public readonly ISerializationManager Serialization = default!;
+        [Dependency] public readonly EntityWhitelistSystem WhitelistSystem = default!;
     }
 }
diff --git a/Content.Shared/InteractionVerbs/Requirements/AssortedRequirements.cs b/Content.Shared/InteractionVerbs/Requirements/AssortedRequirements.cs
index 9a4dd323360..1e7a09d2716 100644
--- a/Content.Shared/InteractionVerbs/Requirements/AssortedRequirements.cs
+++ b/Content.Shared/InteractionVerbs/Requirements/AssortedRequirements.cs
@@ -15,11 +15,9 @@ public sealed partial class EntityWhitelistRequirement : InteractionRequirement
 {
     [DataField] public EntityWhitelist? Whitelist, Blacklist;
 
-    public override bool IsMet(InteractionArgs args, InteractionVerbPrototype proto, InteractionAction.VerbDependencies deps)
-    {
-        return Whitelist?.IsValid(args.Target, deps.EntMan) != false
-               && Blacklist?.IsValid(args.Target, deps.EntMan) != true;
-    }
+    public override bool IsMet(InteractionArgs args, InteractionVerbPrototype proto, InteractionAction.VerbDependencies deps) =>
+        !deps.WhitelistSystem.IsWhitelistFail(Whitelist, args.Target)
+            && !deps.WhitelistSystem.IsBlacklistPass(Blacklist, args.Target);
 }
 
 /// <summary>
diff --git a/Content.Shared/Ninja/Systems/EmagProviderSystem.cs b/Content.Shared/Ninja/Systems/EmagProviderSystem.cs
index 8718d7887b9..aa6c975412f 100644
--- a/Content.Shared/Ninja/Systems/EmagProviderSystem.cs
+++ b/Content.Shared/Ninja/Systems/EmagProviderSystem.cs
@@ -17,7 +17,7 @@ public sealed class EmagProviderSystem : EntitySystem
     [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
     [Dependency] private readonly SharedNinjaGlovesSystem _gloves = default!;
-    [Dependency] private readonly TagSystem _tags = default!;
+    [Dependency] private readonly TagSystem _tag = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
diff --git a/Content.Shared/Whitelist/EntityWhitelist.cs b/Content.Shared/Whitelist/EntityWhitelist.cs
index 895759be958..3e4e2fecb2e 100644
--- a/Content.Shared/Whitelist/EntityWhitelist.cs
+++ b/Content.Shared/Whitelist/EntityWhitelist.cs
@@ -54,14 +54,4 @@ public sealed partial class EntityWhitelist
     /// </summary>
     [DataField]
     public bool RequireAll;
-
-    [Obsolete("Use WhitelistSystem")]
-    public bool IsValid(EntityUid uid, IEntityManager? man = null)
-    {
-        var sys = man?.System<EntityWhitelistSystem>() ??
-                  IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<EntityWhitelistSystem>();
-
-        return sys.IsValid(this, uid);
-
-    }
 }

From 1890369e428783a6c4fbac8336d4c7c91e318ec2 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 19 Dec 2024 14:31:56 -0400
Subject: [PATCH 200/366] Fix Whitelist not existing.

---
 Content.Shared/InteractionVerbs/SharedInteractionVerbsSystem.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Content.Shared/InteractionVerbs/SharedInteractionVerbsSystem.cs b/Content.Shared/InteractionVerbs/SharedInteractionVerbsSystem.cs
index f8100e71c39..4aa866ccf7d 100644
--- a/Content.Shared/InteractionVerbs/SharedInteractionVerbsSystem.cs
+++ b/Content.Shared/InteractionVerbs/SharedInteractionVerbsSystem.cs
@@ -8,6 +8,7 @@
 using Content.Shared.InteractionVerbs.Events;
 using Content.Shared.Popups;
 using Content.Shared.Verbs;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Network;
@@ -36,6 +37,7 @@ public abstract class SharedInteractionVerbsSystem : EntitySystem
     [Dependency] private readonly SharedPopupSystem _popups = default!;
     [Dependency] private readonly IPrototypeManager _protoMan = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
 
     public override void Initialize()
     {

From bbd11f9a178961cf7a0ddb9b494335fbf25feffb Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 19 Dec 2024 14:46:08 -0400
Subject: [PATCH 201/366] does naming matter?

---
 Content.Shared/InteractionVerbs/SharedInteractionVerbsSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/InteractionVerbs/SharedInteractionVerbsSystem.cs b/Content.Shared/InteractionVerbs/SharedInteractionVerbsSystem.cs
index 4aa866ccf7d..76106dc92a7 100644
--- a/Content.Shared/InteractionVerbs/SharedInteractionVerbsSystem.cs
+++ b/Content.Shared/InteractionVerbs/SharedInteractionVerbsSystem.cs
@@ -37,7 +37,7 @@ public abstract class SharedInteractionVerbsSystem : EntitySystem
     [Dependency] private readonly SharedPopupSystem _popups = default!;
     [Dependency] private readonly IPrototypeManager _protoMan = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {

From 27bdd7f74881be4b27099bad461612f9e5330424 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 19 Dec 2024 14:59:17 -0400
Subject: [PATCH 202/366] Add EntityWhitelistSystem to IoC

---
 Content.Shared/IoC/SharedContentIoC.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Content.Shared/IoC/SharedContentIoC.cs b/Content.Shared/IoC/SharedContentIoC.cs
index c20cdbc111e..8b6709b1dfe 100644
--- a/Content.Shared/IoC/SharedContentIoC.cs
+++ b/Content.Shared/IoC/SharedContentIoC.cs
@@ -1,14 +1,14 @@
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Localizations;
+using Content.Shared.Whitelist;
 
-namespace Content.Shared.IoC
+namespace Content.Shared.IoC;
+public static class SharedContentIoC
 {
-    public static class SharedContentIoC
+    public static void Register()
     {
-        public static void Register()
-        {
-            IoCManager.Register<MarkingManager, MarkingManager>();
-            IoCManager.Register<ContentLocalizationManager, ContentLocalizationManager>();
-        }
+        IoCManager.Register<MarkingManager, MarkingManager>();
+        IoCManager.Register<ContentLocalizationManager, ContentLocalizationManager>();
+        IoCManager.Register<EntityWhitelistSystem>();
     }
 }

From 6a369c83d55bac618c4bc8f168c0389d1151f136 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 19 Dec 2024 15:06:07 -0400
Subject: [PATCH 203/366] Add TagSystem to SharedContentIoC (dependency of
 EntityWhitelistSystem)

---
 Content.Shared/IoC/SharedContentIoC.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Content.Shared/IoC/SharedContentIoC.cs b/Content.Shared/IoC/SharedContentIoC.cs
index 8b6709b1dfe..873401eef66 100644
--- a/Content.Shared/IoC/SharedContentIoC.cs
+++ b/Content.Shared/IoC/SharedContentIoC.cs
@@ -1,14 +1,17 @@
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Localizations;
+using Content.Shared.Tag;
 using Content.Shared.Whitelist;
 
 namespace Content.Shared.IoC;
+
 public static class SharedContentIoC
 {
     public static void Register()
     {
         IoCManager.Register<MarkingManager, MarkingManager>();
         IoCManager.Register<ContentLocalizationManager, ContentLocalizationManager>();
+        IoCManager.Register<TagSystem>();
         IoCManager.Register<EntityWhitelistSystem>();
     }
 }

From 51899df428dd4be216ee127fce7f54eb6b39c0cf Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 19 Dec 2024 15:54:52 -0400
Subject: [PATCH 204/366] genuinely absurd that this is a bug. who wrote this?
 why did you write this? do you need help?

---
 Content.Client/IoC/ClientContentIoC.cs                   | 4 ++--
 Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Content.Client/IoC/ClientContentIoC.cs b/Content.Client/IoC/ClientContentIoC.cs
index 745509a56a0..3f74ab6646e 100644
--- a/Content.Client/IoC/ClientContentIoC.cs
+++ b/Content.Client/IoC/ClientContentIoC.cs
@@ -53,8 +53,8 @@ public static void Register()
             collection.Register<DocumentParsingManager>();
             collection.Register<ContentReplayPlaybackManager>();
             collection.Register<ISharedPlaytimeManager, JobRequirementsManager>();
-            IoCManager.Register<JoinQueueManager>();
-            IoCManager.Register<DiscordAuthManager>();
+            collection.Register<JoinQueueManager>();
+            collection.Register<DiscordAuthManager>();
             collection.Register<PlayerRateLimitManager>();
             collection.Register<SharedPlayerRateLimitManager, PlayerRateLimitManager>();
         }
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index 86255fdc3ef..37e6451f92d 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -511,7 +511,7 @@ protected void MuzzleFlash(EntityUid gun, AmmoComponent component, Angle worldAn
             return;
 
         var ev = new MuzzleFlashEvent(GetNetEntity(gun), sprite, worldAngle);
-        CreateEffect(gun, ev, gun);
+        CreateEffect(gun, ev, user);
     }
 
     public void CauseImpulse(EntityCoordinates fromCoordinates, EntityCoordinates toCoordinates, EntityUid user, PhysicsComponent userPhysics)

From a3ee923943a0483bde6c2c536f7ad85c5d5450b6 Mon Sep 17 00:00:00 2001
From: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com>
Date: Wed, 6 Nov 2024 15:27:10 +0100
Subject: [PATCH 205/366] Rework the Flare Gun & add a Security Shell Gun.
 (#32829)

* Rework flaregun and add security shell gun

* Make flare gun twice as likely to appear in emergency lockers

* Security shell gun can now fire lethal shells like the flare gun used to be able to.

* Rebalance the sec shell gun material cost to primarily be steel instead of plastic

* Define the ShellShotgunLight tag in tags.yml

* Leave the no lethal shells for normal flareguns to a different PR.

* Move a comment to re-run checks.

* Bye bye lethal shells from plastic guns.

* Fix weird whitespace issue.

* Make the sec shell gun inherit the normal flare gun.

* Remove the rack verb and update the sec shell gun description

* Remove the ability to fire lethals from flare guns, pending blowing up the gun

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
---
 .../ChamberMagazineAmmoProviderComponent.cs   |   6 ++
 .../SharedGunSystem.ChamberMagazine.cs        |   7 +-
 .../Prototypes/Catalog/Fills/Lockers/misc.yml |   2 +-
 .../Guns/Ammunition/Cartridges/shotgun.yml    |  20 ++++
 .../Objects/Weapons/Guns/flare_gun.yml        |  90 +++++++++++-------
 .../Prototypes/Recipes/Lathes/security.yml    |   9 ++
 Resources/Prototypes/tags.yml                 |   3 +
 .../flaregun.rsi/{icon.png => base.png}       | Bin
 .../Guns/Shotguns/flaregun.rsi/meta.json      |   2 +-
 .../Shotguns/flaregun_security.rsi/base.png   | Bin 0 -> 549 bytes
 .../flaregun_security.rsi/bolt-open.png       | Bin 0 -> 574 bytes
 .../flaregun_security.rsi/equipped-BELT.png   | Bin 0 -> 222 bytes
 .../equipped-SUITSTORAGE.png                  | Bin 0 -> 222 bytes
 .../flaregun_security.rsi/inhand-left.png     | Bin 0 -> 419 bytes
 .../flaregun_security.rsi/inhand-right.png    | Bin 0 -> 413 bytes
 .../Shotguns/flaregun_security.rsi/meta.json  |  33 +++++++
 16 files changed, 134 insertions(+), 38 deletions(-)
 rename Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/{icon.png => base.png} (100%)
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/base.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/bolt-open.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/equipped-BELT.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/equipped-SUITSTORAGE.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/meta.json

diff --git a/Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs
index e64ec0d68de..1c74cff7fae 100644
--- a/Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs
@@ -20,6 +20,12 @@ public sealed partial class ChamberMagazineAmmoProviderComponent : MagazineAmmoP
     [ViewVariables(VVAccess.ReadWrite), DataField("autoCycle"), AutoNetworkedField]
     public bool AutoCycle = true;
 
+    /// <summary>
+    /// Can the gun be racked, which opens and then instantly closes the bolt to cycle a round.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField("canRack"), AutoNetworkedField]
+    public bool CanRack = true;
+
     [ViewVariables(VVAccess.ReadWrite), DataField("soundBoltClosed"), AutoNetworkedField]
     public SoundSpecifier? BoltClosedSound = new SoundPathSpecifier("/Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg");
 
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
index adae26a223a..e39434fb4ee 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
@@ -67,7 +67,10 @@ private void OnChamberUse(EntityUid uid, ChamberMagazineAmmoProviderComponent co
             return;
 
         args.Handled = true;
-        UseChambered(uid, component, args.User);
+        if (component.CanRack)
+            UseChambered(uid, component, args.User);
+        else
+            ToggleBolt(uid, component, args.User);
     }
 
     /// <summary>
@@ -75,7 +78,7 @@ private void OnChamberUse(EntityUid uid, ChamberMagazineAmmoProviderComponent co
     /// </summary>
     private void OnChamberActivationVerb(EntityUid uid, ChamberMagazineAmmoProviderComponent component, GetVerbsEvent<ActivationVerb> args)
     {
-        if (!args.CanAccess || !args.CanInteract || component.BoltClosed == null)
+        if (!args.CanAccess || !args.CanInteract || component.BoltClosed == null || !component.CanRack)
             return;
 
         args.Verbs.Add(new ActivationVerb()
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
index 052ce95be2f..756f295d129 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -44,7 +44,7 @@
       prob: 0.2
     - !type:EntSelector
       id: WeaponFlareGun
-      prob: 0.05
+      prob: 0.1
     - !type:EntSelector
       id: BoxMRE
       prob: 0.1
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
index f5c79a858ef..116fa36e0da 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
@@ -24,6 +24,11 @@
   name: shell (.50 beanbag)
   parent: BaseShellShotgun
   components:
+  - type: Tag
+    tags:
+    - Cartridge
+    - ShellShotgun
+    - ShellShotgunLight
   - type: Sprite
     layers:
       - state: beanbag
@@ -52,6 +57,11 @@
   name: shell (.50 flare)
   parent: BaseShellShotgun
   components:
+  - type: Tag
+    tags:
+    - Cartridge
+    - ShellShotgun
+    - ShellShotgunLight
   - type: Sprite
     layers:
       - state: flare
@@ -106,6 +116,11 @@
   name: shell (.50 tranquilizer)
   parent: BaseShellShotgun
   components:
+  - type: Tag
+    tags:
+    - Cartridge
+    - ShellShotgun
+    - ShellShotgunLight
   - type: Sprite
     layers:
       - state: practice
@@ -130,6 +145,11 @@
   description: A homemade shotgun shell that shoots painful glass shrapnel. The spread is so wide that it couldn't hit the broad side of a barn.
   parent: BaseShellShotgun
   components:
+  - type: Tag
+    tags:
+    - Cartridge
+    - ShellShotgun
+    - ShellShotgunLight
   - type: Sprite
     layers:
       - state: improvised
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
index 53f92eef66b..b63036c58b2 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
@@ -1,53 +1,75 @@
 - type: entity
   name: flare gun
-  parent: BaseWeaponLauncher
+  parent: BaseItem
   id: WeaponFlareGun
-  description: A compact, single-shot pistol that fires shotgun shells.
+  description: A compact, single-shot pistol that fires shotgun shells. Comes with a safety feature that prevents the user from fitting lethal shells inside.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shotguns/flaregun.rsi
     layers:
-      - state: icon
+      - state: base
         map: ["enum.GunVisualLayers.Base"]
   - type: Item
     size: Small
     sprite: Objects/Weapons/Guns/Shotguns/flaregun.rsi
-  - type: Gun
-    fireRate: 8
-    selectedMode: SemiAuto
-    availableModes:
-      - SemiAuto
-    soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/flaregun.ogg
-  - type: BallisticAmmoProvider
-    whitelist:
-      tags:
-        - ShellShotgun
-    proto: ShellShotgunFlare
-    capacity: 1
-    soundInsert:
-      path: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg
+  - type: ItemSlots
+    slots:
+      gun_chamber:
+        name: Chamber
+        startingItem: ShellShotgunFlare
+        priority: 1
+        whitelist:
+          tags: ## TODO: Add a risk of the gun blowing up if using non-light shotgun shells, and then re-enable them.
+            ## - ShellShotgun
+            - ShellShotgunLight
   - type: ContainerContainer
     containers:
-      ballistic-ammo: !type:Container
-        ents: []
+      gun_chamber: !type:ContainerSlot
+  - type: ChamberMagazineAmmoProvider
+    autoCycle: false
+    boltClosed: true
+    canRack: false
+    soundBoltClosed: /Audio/Weapons/Guns/Cock/revolver_cock.ogg
+    soundBoltOpened: /Audio/Weapons/Guns/Cock/revolver_cock.ogg
+    soundRack: /Audio/Weapons/Guns/Cock/revolver_cock.ogg
   - type: Clothing
     sprite: Objects/Weapons/Guns/Shotguns/flaregun.rsi
     quickEquip: false
     slots:
     - Belt
     - suitStorage
-  - type: MeleeWeapon
-    attackRate: 1.2
-    damage:
-      types:
-        Blunt: 6.5
-    swapKeys: true
-    disableHeavy: true
-    animation: WeaponArcThrust
-    wideAnimationRotation: 135
-    soundHit:
-      collection: MetalThud
-  - type: DamageOtherOnHit
-    staminaCost: 4.5
-  - type: Execution
+  - type: Appearance
+  - type: Gun
+    fireRate: 8
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/flaregun.ogg
+
+
+- type: entity
+  name: security shell gun
+  parent: [WeaponFlareGun, BaseSecurityContraband]
+  id: WeaponFlareGunSecurity
+  description: A modified flare gun originally designed to be used by security to launch non-lethal shotgun shells, however it can also fire lethal shells without risk.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Shotguns/flaregun_security.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+  - type: Item
+    size: Small
+    sprite: Objects/Weapons/Guns/Shotguns/flaregun_security.rsi
+  - type: ItemSlots
+    slots:
+      gun_chamber:
+        name: Chamber
+        priority: 1
+        whitelist:
+          tags:
+            - ShellShotgun
+  - type: Tag
+    tags:
+    - Sidearm
diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
index 594e6fcdb6f..12f44c1def5 100644
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -724,6 +724,15 @@
     Plastic: 320
     Uranium: 240
 
+- type: latheRecipe
+  id: WeaponFlareGunSecurity
+  result: WeaponFlareGunSecurity
+  category: Weapons
+  completetime: 6
+  materials:
+    Plastic: 100
+    Steel: 400
+
 - type: latheRecipe
   id: WeaponDisabler
   result: WeaponDisabler
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 59c87c9e400..f0fab89f6a9 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -1173,6 +1173,9 @@
 - type: Tag
   id: ShellShotgun
 
+- type: Tag
+  id: ShellShotgunLight # shotgun shells that are compatible with the flare gun.
+
 - type: Tag
   id: Shiv
 
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/base.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/icon.png
rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/base.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/meta.json
index fc96d8d5194..43840761498 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/meta.json
@@ -8,7 +8,7 @@
   },
     "states": [
         {
-            "name": "icon"
+            "name": "base"
         },
         {
             "name": "bolt-open"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b39a08c9210d17ce106499ecd3386d7892122c1
GIT binary patch
literal 549
zcmV+=0^0qFP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0olnc
ze*gdg1ZP1_K>z@;j|==^1poj532;bRa{vGi!T<mc!T}X1N`L?W0lG;<K~z{r?Uk`h
z!$1_qUv&^#=+sVv4GoBkAc(kkD2}4|A1FBJ(!qa1h>JtP&A~y?Sv$BpD1x9Mq@+c0
zXem;tYwY)WPp)lfE?Nsheh}{Rn)LhLyLT6giHZ4FEUgrMH60sMYBa*K=4gFu``g53
zI{j-y2{jsl3c!Tt)v3^OIaX^lcm%m@R?Wh3T$i;Y82~UL;zi%5r~LzZJwBwpWRhbq
zoeqy-tW~S59cc*w#32m9`BaKyxEByJxdh`1T;=nuA}=FT%u5TaG<|(eJDCi}O_2(O
z8W<D?Qs&A`f@*KQ9+36ddjcRn7y}pWwwVEGyxqGSHetHPLV3Bs@4~F}+-p3Ykp@H@
zNayS84JwIl6;y^;2K^r7X1f*WRtaMy1NxQ&m_OX#(guC92?${;S@xpuxsUumCENC8
zdzlir3kJo3h$Fj`W>ZD~0EpwX!{{89c|?}TPCdftr(n?Uri?rXPR}mYY#4MgL~)@q
zQA;oMy%bdXkJdYv{-*+A^i=?2lV)fM^z0|WkO934Qhs#)I6l2W^cjE{E(q&J&~Q;c
nwNV(^SbElScE`lTj2EIWESu93D}=hn00000NkvXXu0mjfoQURt

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/bolt-open.png
new file mode 100644
index 0000000000000000000000000000000000000000..65052544c725d7079b4b8e33c10ca7fd2ed5ec2d
GIT binary patch
literal 574
zcmV-E0>S->P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0olnc
ze*gdg1ZP1_K>z@;j|==^1poj532;bRa{vGi!T<mc!T}X1N`L?W0n<rDK~z{r?Ulbv
z0$~`(pKA#eT+%5>(P#^TYH4V2u*NWIXlN>EXljVI{sSk6psk@T=Wu9iXea`QAUM$=
z8WagZr{ePa@ILZhcix?N1i^ja<^6F#zTfA^DMds?{417L3zk}j#*~@^k;%-_*3QAu
z#C9Svv7xaHG#YO_BNHdNoRv<ccs~h-ngavze8=Q<!Ln$xULW}mWaxWim)6%-cz=I>
zN;loE?f$V1AaV#V#N)ir)@q&xFdrt9R5c80wptDYflF|k%~}}8u^5ZL_Im2dXiy@E
z<9<BnhOYq;#!Dn>5ifuBc@BzO&-j)AHAnX!J>CV5T>1hfkPP5Cl%Zsr!Al_G;B01|
z%6(_Vc<E)k%|rGOM%MVihmi(E9G@Nr))k7e0Kkk$afZgiaEs6nR|C4Z@ci^ZMe1`W
zOSEC&FrbU??-lv%v-82?h)$w~5zsJeMkcq&KTHyRdNxHD%X!zP`;BK0TwPbx$_Y$B
z6hq9ZOVoUCanp)PFKh<fQm;p^j)ve&hB{)9f$DUyR<Id>SQwOE2Bro>Z9Q?6K#%?}
za2U|DAn8Xf!}#lU!<HsA6lQ$eg4AE{@-Xpyp&m85UM(XcB0_}d2V*?taDa&%d;kCd
M07*qoM6N<$f=k@^LjV8(

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/equipped-BELT.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb2854b6fe2cd775050e20417662e2ffef09ce36
GIT binary patch
literal 222
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBufiR<}hF1enu-MbZF{C2y?X8Wx4GIFR0VN`9b?zKJ#yjUg
z=*w7E=OSSNsYBH#pY9M__gEdMoFU`0T=h!P#|GD4oL%=@b8FI^>*e!`^A5b&6?<UX
zXCZfx5(b8bysD>yZU1HGnavJ}-=8Lwl%pmuQ0rmD$-r<n=oe$c0*T4nSJ*8CDfM*q
Kb6Mw<&;$VNLrGHr

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb2854b6fe2cd775050e20417662e2ffef09ce36
GIT binary patch
literal 222
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBufiR<}hF1enu-MbZF{C2y?X8Wx4GIFR0VN`9b?zKJ#yjUg
z=*w7E=OSSNsYBH#pY9M__gEdMoFU`0T=h!P#|GD4oL%=@b8FI^>*e!`^A5b&6?<UX
zXCZfx5(b8bysD>yZU1HGnavJ}-=8Lwl%pmuQ0rmD$-r<n=oe$c0*T4nSJ*8CDfM*q
Kb6Mw<&;$VNLrGHr

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..bff3d731c473a89dcdbfb35f415d6070e5fe25e2
GIT binary patch
literal 419
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBufiR<}hF1engN3JyV@O5Z+gpZS%#I?*K1K?%I9vTb!PVsY
zE-`bmbi|SkpO_x8uCeKfShBezVXBfs%14H68->E`W?od3IB{-IXVd?9<JlWdp8j37
z>1;GR&>9AYgqNS5toYhqf2}Y6?A@!S)f;!umpQcUkhai)n=kh4wX!HVe|o7mr{nY2
z#kUjW8fIOu`upoqU$t%d?|;`cTQ2N5)Sc=6(>d6+?7)xAM}D)H1%2L>$+56<ZvFo7
zpXH}b_3wxFyg0t9^8Y9AjCJ$QUb~jlcG#>%?9LhStGnK_fE@rL>MkyG4&WBs>eIe>
z=XsVA!L;6;&B2!$OfLG?sx9cguqW$i@Dq_`j5c4`k2*)>#+eqUunXiLeEImv=b|ZG
z50`7pXL+5ve=vppNUQ1j>r(9rsat;rco)3~1>}$TIlmd6znk#NT}VS1WS6I_pUXO@
GgeCy1`Ls>|

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..50297902ee82a02c050f424ddb17fa84479c2ce5
GIT binary patch
literal 413
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBufiR<}hF1engOR6;V@O5Z+glsG4m-#k|JcpZIxX+rG!d5e
zeeH|8^Di7ccv4)WmQh{aO=g#6NWrTB0Uo=CY-`S`_a`=I-&%6(o}>T1`A=sFRQ>!r
z>8(67&>9AY2fO#bS$}H&|7)H*^8$YCzPzpS)aNDMH@*sN7khAMzrI*n$u;Ba=7&?f
z1NxQ;nQ;|7l;1!7*`mvakJtNG+f5Z(mA^(VDVQ^x^~Xck*P($a+w+C1=Wy+Bc^;Nl
zd}Zo{sjEYI*tBE+82pd0*8deeHBe5@w0!;516qpn&rUi4b^wTISR8C#(xZ4RZtH#a
zKW%9RzLT#{*wX%u>+J$2lghiMb$ka~ug5Kv4LRWb-KL7OuHvoet@+#^(%)ac-nn;i
zgz6DK{p!7pb)4^_nfA8?ta`Y;c00(_H-~4)+s<hF;&iS+0mS!o^>bP0l+XkKwq2>%

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/meta.json
new file mode 100644
index 00000000000..04abe1a4e05
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/meta.json
@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/3f9ebb72931ff884427c3004a594ec61aaaa7041/icons/obj/guns/projectile/flaregun.dmi and edited",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
+}

From c79c8861a4a94bfc125b10376f1df16819851159 Mon Sep 17 00:00:00 2001
From: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com>
Date: Mon, 11 Nov 2024 04:22:03 +0100
Subject: [PATCH 206/366] HOTFIX: Fix Security Shell Gun being uncraftable.
 (#33247)

* Sec Shell Gun Craftability Hotfix

* Capital Fix
---
 Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 7d77168a10e..f3ae42f35fd 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -816,6 +816,7 @@
       - TargetHuman
       - TargetSyndicate
       - WeaponDisablerPractice
+      - WeaponFlareGunSecurity
       - WeaponLaserCarbinePractice
       - Zipties
       - ShockCollar

From f2499f98e8628ce894505d1b122cf164172fead6 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 19 Dec 2024 16:15:37 -0400
Subject: [PATCH 207/366] Remove obsolete

---
 .../Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
index e39434fb4ee..3060e2c1a93 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
@@ -111,7 +111,7 @@ private void UseChambered(EntityUid uid, ChamberMagazineAmmoProviderComponent co
             else
             {
                 // Similar to below just due to prediction.
-                TransformSystem.DetachParentToNull(chamberEnt.Value, Transform(chamberEnt.Value));
+                TransformSystem.DetachEntity(chamberEnt.Value, Transform(chamberEnt.Value));
             }
         }
 

From 802cb4d9414f625cbfcbb4ae5078a417cb71ed5d Mon Sep 17 00:00:00 2001
From: Doomsdrayk <robotdoughnut@comcast.net>
Date: Thu, 13 Jun 2024 00:30:39 -0600
Subject: [PATCH 208/366] Fix guns appearing to cycle bolt when wielded
 (#28756)

Adds a check during wielding to see if the code is running clientside, and if so skip the part responsible for creating the virtual items.

This is necessary because TrySpawnVirtualItem is blocked from running clientside, so trying to spawn the virtual items for wielding causes the client to always believe the wield has failed. This erroneous failure leads to the display of incorrect feedback until the server's successful wield attempt makes it to the client. The added check prevents wielding from failing in this way and therefore allows the client to behave as expected.
---
 Content.Shared/Wieldable/WieldableSystem.cs | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/Content.Shared/Wieldable/WieldableSystem.cs b/Content.Shared/Wieldable/WieldableSystem.cs
index 95fc69e0614..a2c845cb633 100644
--- a/Content.Shared/Wieldable/WieldableSystem.cs
+++ b/Content.Shared/Wieldable/WieldableSystem.cs
@@ -17,6 +17,7 @@
 using Content.Shared.Weapons.Ranged.Systems;
 using Content.Shared.Wieldable.Components;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Network;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Wieldable;
@@ -32,6 +33,7 @@ public sealed class WieldableSystem : EntitySystem
     [Dependency] private readonly UseDelaySystem _delay = default!;
     [Dependency] private readonly SharedGunSystem _gun = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly INetManager _netManager = default!;
 
     public override void Initialize()
     {
@@ -213,14 +215,19 @@ public bool TryWield(EntityUid used, WieldableComponent component, EntityUid use
         if (component.WieldSound != null)
             _audioSystem.PlayPredicted(component.WieldSound, used, user);
 
-        var virtuals = new List<EntityUid>();
-        for (var i = 0; i < component.FreeHandsRequired; i++)
+        //This section handles spawning the virtual item(s) to occupy the required additional hand(s).
+        //Since the client can't currently predict entity spawning, only do this if this is running serverside.
+        //Remove this check if TrySpawnVirtualItem in SharedVirtualItemSystem is allowed to complete clientside.
+        if (_netManager.IsServer)
         {
-            if (_virtualItemSystem.TrySpawnVirtualItemInHand(used, user, out var virtualItem, true))
+            var virtuals = new List<EntityUid>();
+            for (var i = 0; i < component.FreeHandsRequired; i++)
             {
-                virtuals.Add(virtualItem.Value);
-                continue;
-            }
+                if (_virtualItemSystem.TrySpawnVirtualItemInHand(used, user, out var virtualItem, true))
+                {
+                    virtuals.Add(virtualItem.Value);
+                    continue;
+                }
 
             foreach (var existingVirtual in virtuals)
                 QueueDel(existingVirtual);

From 51b0ad500caa98ee354e39019218fedb2945cd04 Mon Sep 17 00:00:00 2001
From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com>
Date: Wed, 24 Jul 2024 12:33:14 +0000
Subject: [PATCH 209/366] tweak(GunRequiresWield): State the requirement for
 gun wielding in the description. (#30301)

* https://en.wikipedia.org/wiki/List_of_LASD_deputy_gangs

* https://knock-la.com/tradition-of-violence-lasd-gang-history/

* https://coc.lacounty.gov/deputy-gangs/
---
 .../Ranged/Components/GunRequiresWieldComponent.cs     |  3 +++
 Content.Shared/Wieldable/WieldableSystem.cs            | 10 ++++++++++
 .../Locale/en-US/wieldable/wieldable-component.ftl     |  2 ++
 3 files changed, 15 insertions(+)

diff --git a/Content.Shared/Weapons/Ranged/Components/GunRequiresWieldComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunRequiresWieldComponent.cs
index fa3732209f5..2016459b9d5 100644
--- a/Content.Shared/Weapons/Ranged/Components/GunRequiresWieldComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/GunRequiresWieldComponent.cs
@@ -15,4 +15,7 @@ public sealed partial class GunRequiresWieldComponent : Component
 
     [DataField, AutoNetworkedField]
     public TimeSpan PopupCooldown = TimeSpan.FromSeconds(1);
+
+    [DataField]
+    public LocId? WieldRequiresExamineMessage  = "gunrequireswield-component-examine";
 }
diff --git a/Content.Shared/Wieldable/WieldableSystem.cs b/Content.Shared/Wieldable/WieldableSystem.cs
index a2c845cb633..d726393be37 100644
--- a/Content.Shared/Wieldable/WieldableSystem.cs
+++ b/Content.Shared/Wieldable/WieldableSystem.cs
@@ -47,6 +47,7 @@ public override void Initialize()
         SubscribeLocalEvent<WieldableComponent, HandDeselectedEvent>(OnDeselectWieldable);
 
         SubscribeLocalEvent<MeleeRequiresWieldComponent, AttemptMeleeEvent>(OnMeleeAttempt);
+        SubscribeLocalEvent<GunRequiresWieldComponent, ExaminedEvent>(OnExamineRequires);
         SubscribeLocalEvent<GunRequiresWieldComponent, ShotAttemptedEvent>(OnShootAttempt);
         SubscribeLocalEvent<GunWieldBonusComponent, ItemWieldedEvent>(OnGunWielded);
         SubscribeLocalEvent<GunWieldBonusComponent, ItemUnwieldedEvent>(OnGunUnwielded);
@@ -116,8 +117,17 @@ private void OnGunRefreshModifiers(Entity<GunWieldBonusComponent> bonus, ref Gun
         }
     }
 
+    private void OnExamineRequires(Entity<GunRequiresWieldComponent> entity, ref ExaminedEvent args)
+    {
+        if(entity.Comp.WieldRequiresExamineMessage != null)
+            args.PushText(Loc.GetString(entity.Comp.WieldRequiresExamineMessage));
+    }
+
     private void OnExamine(EntityUid uid, GunWieldBonusComponent component, ref ExaminedEvent args)
     {
+        if (HasComp<GunRequiresWieldComponent>(uid)) 
+            return;
+
         if (component.WieldBonusExamineMessage != null)
             args.PushText(Loc.GetString(component.WieldBonusExamineMessage));
     }
diff --git a/Resources/Locale/en-US/wieldable/wieldable-component.ftl b/Resources/Locale/en-US/wieldable/wieldable-component.ftl
index 84b58224a77..585d6110164 100644
--- a/Resources/Locale/en-US/wieldable/wieldable-component.ftl
+++ b/Resources/Locale/en-US/wieldable/wieldable-component.ftl
@@ -18,3 +18,5 @@ wieldable-component-not-in-hands = { CAPITALIZE(THE($item)) } isn't in your hand
 wieldable-component-requires = { CAPITALIZE(THE($item))} must be wielded!
 
 gunwieldbonus-component-examine = This weapon has improved accuracy when wielded.
+
+gunrequireswield-component-examine = This weapon can only be fired when wielded.

From dda66b6d3942a97b2dd708a34efedf3506dffec1 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 19 Dec 2024 16:54:28 -0400
Subject: [PATCH 210/366] Flare gun fix

---
 .../Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
index b63036c58b2..676937a5813 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
@@ -50,7 +50,7 @@
 
 - type: entity
   name: security shell gun
-  parent: [WeaponFlareGun, BaseSecurityContraband]
+  parent: WeaponFlareGun
   id: WeaponFlareGunSecurity
   description: A modified flare gun originally designed to be used by security to launch non-lethal shotgun shells, however it can also fire lethal shells without risk.
   components:

From 846f51a1fb437128395c703b6eab27046d0723e0 Mon Sep 17 00:00:00 2001
From: Plykiya <58439124+Plykiya@users.noreply.github.com>
Date: Sun, 3 Nov 2024 03:25:30 -0800
Subject: [PATCH 211/366] Bugfix: Wielding now uses identity system. (#33134)

Make wielding system use identity
---
 Content.Shared/Wieldable/WieldableSystem.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Content.Shared/Wieldable/WieldableSystem.cs b/Content.Shared/Wieldable/WieldableSystem.cs
index d726393be37..7c9551429b2 100644
--- a/Content.Shared/Wieldable/WieldableSystem.cs
+++ b/Content.Shared/Wieldable/WieldableSystem.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Inventory.VirtualItem;
 using Content.Shared.Item;
@@ -125,7 +126,7 @@ private void OnExamineRequires(Entity<GunRequiresWieldComponent> entity, ref Exa
 
     private void OnExamine(EntityUid uid, GunWieldBonusComponent component, ref ExaminedEvent args)
     {
-        if (HasComp<GunRequiresWieldComponent>(uid)) 
+        if (HasComp<GunRequiresWieldComponent>(uid))
             return;
 
         if (component.WieldBonusExamineMessage != null)
@@ -250,7 +251,7 @@ public bool TryWield(EntityUid used, WieldableComponent component, EntityUid use
             return false;
 
         var selfMessage = Loc.GetString("wieldable-component-successful-wield", ("item", used));
-        var othersMessage = Loc.GetString("wieldable-component-successful-wield-other", ("user", user), ("item", used));
+        var othersMessage = Loc.GetString("wieldable-component-successful-wield-other", ("user", Identity.Entity(user, EntityManager)), ("item", used));
         _popupSystem.PopupPredicted(selfMessage, othersMessage, user, user);
 
         var targEv = new ItemWieldedEvent();
@@ -295,7 +296,7 @@ private void OnItemUnwielded(EntityUid uid, WieldableComponent component, ItemUn
                 _audioSystem.PlayPredicted(component.UnwieldSound, uid, args.User);
 
             var selfMessage = Loc.GetString("wieldable-component-failed-wield", ("item", uid));
-            var othersMessage = Loc.GetString("wieldable-component-failed-wield-other", ("user", args.User.Value), ("item", uid));
+            var othersMessage = Loc.GetString("wieldable-component-failed-wield-other", ("user", Identity.Entity(args.User.Value, EntityManager)), ("item", uid));
             _popupSystem.PopupPredicted(selfMessage, othersMessage, args.User.Value, args.User.Value);
         }
 

From 737d1bb23550ff1847e253d0b2fb3f92072d7b0e Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 19 Dec 2024 17:00:16 -0400
Subject: [PATCH 212/366] silly.

---
 Content.Shared/Wieldable/WieldableSystem.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Content.Shared/Wieldable/WieldableSystem.cs b/Content.Shared/Wieldable/WieldableSystem.cs
index 7c9551429b2..490636dbcea 100644
--- a/Content.Shared/Wieldable/WieldableSystem.cs
+++ b/Content.Shared/Wieldable/WieldableSystem.cs
@@ -240,10 +240,11 @@ public bool TryWield(EntityUid used, WieldableComponent component, EntityUid use
                     continue;
                 }
 
-            foreach (var existingVirtual in virtuals)
-                QueueDel(existingVirtual);
+                foreach (var existingVirtual in virtuals)
+                    QueueDel(existingVirtual);
 
-            return false;
+                return false;
+            }
         }
 
         if (TryComp(used, out UseDelayComponent? useDelay)

From 4110c63dfad452bc98300c84dc81fa92684747bf Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 19 Dec 2024 20:29:33 -0400
Subject: [PATCH 213/366] Prevent round failing to start due to missing
 content.

---
 Content.Shared/CCVar/CCVars.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index ef63d89af96..17be4f1478b 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -1637,7 +1637,7 @@ public static readonly CVarDef<int>
         /// Whether the arrivals terminal should be on a planet map.
         /// </summary>
         public static readonly CVarDef<bool> ArrivalsPlanet =
-            CVarDef.Create("shuttle.arrivals_planet", true, CVar.SERVERONLY);
+            CVarDef.Create("shuttle.arrivals_planet", false, CVar.SERVERONLY);
 
         /// <summary>
         /// Whether the arrivals shuttle is enabled.

From ed37a67d1661feab7a9492ccabdc67eae36213fe Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 21 Dec 2024 15:27:25 -0400
Subject: [PATCH 214/366] No tag for v238, lmao.

---
 RobustToolbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RobustToolbox b/RobustToolbox
index 92b0e7f1a85..5e97db435c0 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 92b0e7f1a853979a1361ed24d2fb5ffc11f43f66
+Subproject commit 5e97db435c05b4c188184ef90e5d77b0500403d0

From ea0359eb6987fe02ad2101c1e7bc3a61bbc280cf Mon Sep 17 00:00:00 2001
From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Sun, 30 Jun 2024 05:43:43 +0200
Subject: [PATCH 215/366] Implement some field-level deltas (#28242)

* Update GasTileOverlayState

* Update DecalGridState

* Update NavMapState

* poke

* poke2

* poke3

* Implement field deltas for guns

* Content done

* Update

---------

Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
---
 .../Body/Systems/BloodstreamSystem.cs         |   2 +-
 .../Body/Systems/MetabolizerSystem.cs         |   3 +-
 .../Body/Systems/RespiratorSystem.cs          |   7 +-
 Content.Server/Botany/SeedPrototype.cs        |   4 +-
 .../ReactionEffects/AreaReactionEffect.cs     |  83 ----------
 .../ExplosionReactionEffect.cs                |  72 ---------
 .../SolutionTemperatureEffects.cs             | 121 ---------------
 .../BodyTemperature.cs                        |  36 -----
 .../MobStateCondition.cs                      |  30 ----
 .../ReagentEffectConditions/OrganType.cs      |  48 ------
 .../ReagentThreshold.cs                       |  51 -------
 .../SolutionTemperature.cs                    |  36 -----
 .../ReagentEffectConditions/TotalDamage.cs    |  35 -----
 .../ReagentEffectConditions/TotalHunger.cs    |  35 -----
 .../ReagentEffects/AddToSolutionReaction.cs   |  31 ----
 .../ReagentEffects/ChemCleanBloodstream.cs    |  33 ----
 .../ReagentEffects/ChemHealEyeDamage.cs       |  32 ----
 .../Chemistry/ReagentEffects/Electrocute.cs   |  31 ----
 .../ReagentEffects/ExtinguishReaction.cs      |  24 ---
 .../ReagentEffects/FlammableReaction.cs       |  34 -----
 .../Chemistry/ReagentEffects/Ignite.cs        |  25 ---
 .../ReagentEffects/ModifyBleedAmount.cs       |  31 ----
 .../ReagentEffects/ModifyBloodLevel.cs        |  32 ----
 .../Chemistry/ReagentEffects/ModifyLungGas.cs |  30 ----
 .../ReagentEffects/MovespeedModifier.cs       |  75 ---------
 .../Chemistry/ReagentEffects/Oxygenate.cs     |  25 ---
 .../PlantMetabolism/PlantAdjustAttribute.cs   |  45 ------
 .../PlantMetabolism/PlantAdjustHealth.cs      |  19 ---
 .../PlantAdjustMutationLevel.cs               |  15 --
 .../PlantMetabolism/PlantAdjustMutationMod.cs |  17 ---
 .../PlantMetabolism/PlantAdjustNutrition.cs   |  20 ---
 .../PlantMetabolism/PlantAdjustPests.cs       |  17 ---
 .../PlantMetabolism/PlantAdjustToxins.cs      |  17 ---
 .../PlantMetabolism/PlantAdjustWater.cs       |  20 ---
 .../PlantMetabolism/PlantAdjustWeeds.cs       |  17 ---
 .../PlantMetabolism/PlantAffectGrowth.cs      |  20 ---
 .../PlantMetabolism/PlantCryoxadone.cs        |  33 ----
 .../PlantMetabolism/PlantDiethylamine.cs      |  41 -----
 .../PlantMetabolism/PlantPhalanximine.cs      |  24 ---
 .../PlantMetabolism/RobustHarvest.cs          |  54 -------
 .../Chemistry/ReagentEffects/SatiateThirst.cs |  32 ----
 .../StatusEffects/GenericStatusEffect.cs      |  76 ---------
 .../ReagentEffects/StatusEffects/Jitter.cs    |  41 -----
 .../ReagentEffects/WashCreamPieReaction.cs    |  22 ---
 .../EffectConditions/BodyTemperature.cs       |  35 +++++
 .../EffectConditions}/HasTagCondition.cs      |  12 +-
 .../EffectConditions/JobCondition.cs          |  49 ++++++
 .../EffectConditions/MobStateCondition.cs     |  29 ++++
 .../EffectConditions/OrganType.cs             |  53 +++++++
 .../EffectConditions/ReagentThreshold.cs      |  57 +++++++
 .../EffectConditions/SolutionTemperature.cs   |  40 +++++
 .../EffectConditions/TotalDamage.cs           |  34 +++++
 .../EffectConditions/TotalHunger.cs           |  34 +++++
 .../Effects}/ActivateArtifact.cs              |  11 +-
 .../Effects/AddToSolutionReaction.cs          |  38 +++++
 .../Effects}/AdjustAlert.cs                   |  16 +-
 .../Effects}/AdjustReagent.cs                 |  56 ++++---
 .../Effects}/AdjustTemperature.cs             |  17 ++-
 .../Effects/AreaReactionEffect.cs             |  91 +++++++++++
 .../Effects}/CauseZombieInfection.cs          |  13 +-
 .../Effects}/ChemAddMoodlet.cs                |   0
 .../Effects/ChemCleanBloodstream.cs           |  40 +++++
 .../Effects/ChemHealEyeDamage.cs              |  31 ++++
 .../Effects}/ChemVomit.cs                     |  15 +-
 .../Effects}/CreateEntityReactionEffect.cs    |  17 ++-
 .../Effects}/CreateGas.cs                     |  21 ++-
 .../Effects}/CureZombieInfection.cs           |  17 +--
 .../Effects}/Drunk.cs                         |  15 +-
 .../EntityEffects/Effects/Electrocute.cs      |  38 +++++
 .../Effects}/Emote.cs                         |  12 +-
 .../Effects}/EmpReactionEffect.cs             |  21 ++-
 .../Effects/ExplosionReactionEffect.cs        |  77 ++++++++++
 .../Effects/ExtinguishReaction.cs             |  36 +++++
 .../Effects/FlammableReaction.cs              |  45 ++++++
 .../Effects}/HealthChange.cs                  |  23 +--
 .../EntityEffects/Effects/Ignite.cs           |  31 ++++
 .../Effects}/MakeSentient.cs                  |  10 +-
 .../Effects/ModifyBleedAmount.cs              |  35 +++++
 .../EntityEffects/Effects/ModifyBloodLevel.cs |  37 +++++
 .../EntityEffects/Effects/ModifyLungGas.cs    |  49 ++++++
 .../Effects/MovespeedModifier.cs              |  78 ++++++++++
 .../EntityEffects/Effects/Oxygenate.cs        |  32 ++++
 .../Effects}/Paralyze.cs                      |  14 +-
 .../PlantMetabolism/PlantAdjustAttribute.cs   |  61 ++++++++
 .../PlantMetabolism/PlantAdjustHealth.cs      |  21 +++
 .../PlantAdjustMutationLevel.cs               |  16 ++
 .../PlantMetabolism/PlantAdjustMutationMod.cs |  19 +++
 .../PlantMetabolism/PlantAdjustNutrition.cs   |  21 +++
 .../PlantMetabolism/PlantAdjustPests.cs       |  20 +++
 .../PlantMetabolism/PlantAdjustToxins.cs      |  20 +++
 .../PlantMetabolism/PlantAdjustWater.cs       |  22 +++
 .../PlantMetabolism/PlantAdjustWeeds.cs       |  19 +++
 .../PlantMetabolism/PlantAffectGrowth.cs      |  22 +++
 .../PlantMetabolism/PlantCryoxadone.cs        |  32 ++++
 .../PlantMetabolism/PlantDiethylamine.cs      |  41 +++++
 .../PlantMetabolism/PlantPhalanximine.cs      |  23 +++
 .../Effects/PlantMetabolism/RobustHarvest.cs  |  53 +++++++
 .../Effects}/Polymorph.cs                     |  11 +-
 .../Effects}/PopupMessage.cs                  |  29 ++--
 .../Effects}/PurifyEvil.cs                    |   0
 .../Effects}/ReduceRotting.cs                 |  16 +-
 .../Effects}/ResetNarcolepsy.cs               |  14 +-
 .../Effects}/SatiateHunger.cs                 |  23 ++-
 .../EntityEffects/Effects/SatiateThirst.cs    |  32 ++++
 .../Effects/SolutionTemperatureEffects.cs     | 144 ++++++++++++++++++
 .../StatusEffects/GenericStatusEffect.cs      |  77 ++++++++++
 .../Effects/StatusEffects/Jitter.cs           |  42 +++++
 .../Effects/WashCreamPieReaction.cs           |  22 +++
 .../Effects}/WearableReaction.cs              |  26 ++--
 .../Fluids/EntitySystems/SmokeSystem.cs       |   2 +-
 .../GuideGenerator/ChemistryJsonGenerator.cs  |   5 +-
 .../GuideGenerator/ReactionJsonGenerator.cs   |   4 +-
 Content.Server/GuideGenerator/ReagentEntry.cs |   3 +-
 .../Nutrition/EntitySystems/DrinkSystem.cs    |   3 +-
 Content.Server/Tiles/LavaComponent.cs         |  23 ---
 Content.Server/Tiles/LavaSystem.cs            |  38 -----
 .../Tiles/TileEntityEffectComponent.cs        |  19 +++
 .../Tiles/TileEntityEffectSystem.cs           |  32 ++++
 .../Reaction/ChemicalReactionSystem.cs        |   7 +-
 .../Chemistry/Reaction/ReactionPrototype.cs   |   3 +-
 .../Chemistry/Reaction/ReactiveComponent.cs   |   3 +-
 Content.Shared/Chemistry/ReactiveSystem.cs    | 137 +++++++++--------
 .../Chemistry/Reagent/ReagentEffect.cs        | 113 --------------
 .../Reagent/ReagentEffectCondition.cs         |  22 ---
 .../Chemistry/Reagent/ReagentPrototype.cs     |  13 +-
 Content.Shared/EntityEffects/EntityEffect.cs  | 132 ++++++++++++++++
 .../EntityEffects/EntityEffectCondition.cs    |  22 +++
 Resources/Prototypes/Entities/Tiles/lava.yml  |   6 +
 .../Entities/Tiles/liquid_plasma.yml          |   8 +-
 129 files changed, 2255 insertions(+), 1941 deletions(-)
 delete mode 100644 Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
 delete mode 100644 Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs
 delete mode 100644 Content.Server/Chemistry/ReactionEffects/SolutionTemperatureEffects.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffectConditions/BodyTemperature.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffectConditions/MobStateCondition.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffectConditions/OrganType.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffectConditions/ReagentThreshold.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffectConditions/SolutionTemperature.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffectConditions/TotalDamage.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffectConditions/TotalHunger.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/ChemCleanBloodstream.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/ChemHealEyeDamage.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/Electrocute.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/ExtinguishReaction.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/FlammableReaction.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/Ignite.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/ModifyBleedAmount.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/ModifyBloodLevel.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/ModifyLungGas.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/MovespeedModifier.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/Oxygenate.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustAttribute.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustHealth.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationLevel.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationMod.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustNutrition.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustPests.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustToxins.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWater.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWeeds.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAffectGrowth.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantCryoxadone.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantDiethylamine.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantPhalanximine.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/RobustHarvest.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/SatiateThirst.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/StatusEffects/GenericStatusEffect.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/StatusEffects/Jitter.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/WashCreamPieReaction.cs
 create mode 100644 Content.Server/EntityEffects/EffectConditions/BodyTemperature.cs
 rename Content.Server/{Chemistry/ReagentEffectConditions => EntityEffects/EffectConditions}/HasTagCondition.cs (68%)
 create mode 100644 Content.Server/EntityEffects/EffectConditions/JobCondition.cs
 create mode 100644 Content.Server/EntityEffects/EffectConditions/MobStateCondition.cs
 create mode 100644 Content.Server/EntityEffects/EffectConditions/OrganType.cs
 create mode 100644 Content.Server/EntityEffects/EffectConditions/ReagentThreshold.cs
 create mode 100644 Content.Server/EntityEffects/EffectConditions/SolutionTemperature.cs
 create mode 100644 Content.Server/EntityEffects/EffectConditions/TotalDamage.cs
 create mode 100644 Content.Server/EntityEffects/EffectConditions/TotalHunger.cs
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/ActivateArtifact.cs (56%)
 create mode 100644 Content.Server/EntityEffects/Effects/AddToSolutionReaction.cs
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/AdjustAlert.cs (76%)
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/AdjustReagent.cs (58%)
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/AdjustTemperature.cs (56%)
 create mode 100644 Content.Server/EntityEffects/Effects/AreaReactionEffect.cs
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/CauseZombieInfection.cs (64%)
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/ChemAddMoodlet.cs (100%)
 create mode 100644 Content.Server/EntityEffects/Effects/ChemCleanBloodstream.cs
 create mode 100644 Content.Server/EntityEffects/Effects/ChemHealEyeDamage.cs
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/ChemVomit.cs (65%)
 rename Content.Server/{Chemistry/ReactionEffects => EntityEffects/Effects}/CreateEntityReactionEffect.cs (80%)
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/CreateGas.cs (62%)
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/CureZombieInfection.cs (73%)
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/Drunk.cs (65%)
 create mode 100644 Content.Server/EntityEffects/Effects/Electrocute.cs
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/Emote.cs (70%)
 rename Content.Server/{Chemistry/ReactionEffects => EntityEffects/Effects}/EmpReactionEffect.cs (67%)
 create mode 100644 Content.Server/EntityEffects/Effects/ExplosionReactionEffect.cs
 create mode 100644 Content.Server/EntityEffects/Effects/ExtinguishReaction.cs
 create mode 100644 Content.Server/EntityEffects/Effects/FlammableReaction.cs
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/HealthChange.cs (85%)
 create mode 100644 Content.Server/EntityEffects/Effects/Ignite.cs
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/MakeSentient.cs (92%)
 create mode 100644 Content.Server/EntityEffects/Effects/ModifyBleedAmount.cs
 create mode 100644 Content.Server/EntityEffects/Effects/ModifyBloodLevel.cs
 create mode 100644 Content.Server/EntityEffects/Effects/ModifyLungGas.cs
 create mode 100644 Content.Server/EntityEffects/Effects/MovespeedModifier.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Oxygenate.cs
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/Paralyze.cs (57%)
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/Polymorph.cs (80%)
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/PopupMessage.cs (60%)
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/PurifyEvil.cs (100%)
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/ReduceRotting.cs (61%)
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/ResetNarcolepsy.cs (63%)
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/SatiateHunger.cs (53%)
 create mode 100644 Content.Server/EntityEffects/Effects/SatiateThirst.cs
 create mode 100644 Content.Server/EntityEffects/Effects/SolutionTemperatureEffects.cs
 create mode 100644 Content.Server/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs
 create mode 100644 Content.Server/EntityEffects/Effects/StatusEffects/Jitter.cs
 create mode 100644 Content.Server/EntityEffects/Effects/WashCreamPieReaction.cs
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/WearableReaction.cs (50%)
 delete mode 100644 Content.Server/Tiles/LavaComponent.cs
 delete mode 100644 Content.Server/Tiles/LavaSystem.cs
 create mode 100644 Content.Server/Tiles/TileEntityEffectComponent.cs
 create mode 100644 Content.Server/Tiles/TileEntityEffectSystem.cs
 delete mode 100644 Content.Shared/Chemistry/Reagent/ReagentEffect.cs
 delete mode 100644 Content.Shared/Chemistry/Reagent/ReagentEffectCondition.cs
 create mode 100644 Content.Shared/EntityEffects/EntityEffect.cs
 create mode 100644 Content.Shared/EntityEffects/EntityEffectCondition.cs

diff --git a/Content.Server/Body/Systems/BloodstreamSystem.cs b/Content.Server/Body/Systems/BloodstreamSystem.cs
index 54e51d7e35e..a40bafc8cff 100644
--- a/Content.Server/Body/Systems/BloodstreamSystem.cs
+++ b/Content.Server/Body/Systems/BloodstreamSystem.cs
@@ -1,7 +1,7 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Events;
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Chemistry.ReactionEffects;
+using Content.Server.EntityEffects.Effects;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Forensics;
 using Content.Server.Popups;
diff --git a/Content.Server/Body/Systems/MetabolizerSystem.cs b/Content.Server/Body/Systems/MetabolizerSystem.cs
index a7eec8e3c02..ff357b3e304 100644
--- a/Content.Server/Body/Systems/MetabolizerSystem.cs
+++ b/Content.Server/Body/Systems/MetabolizerSystem.cs
@@ -6,6 +6,7 @@
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
+using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
@@ -196,7 +197,7 @@ private void TryMetabolize(Entity<MetabolizerComponent, OrganComponent?, Solutio
                     var ev = new TryMetabolizeReagent(reagent, proto, quantity);
                     RaiseLocalEvent(actualEntity, ref ev);
 
-                    var args = new ReagentEffectArgs(actualEntity, ent, solution, proto, mostToRemove,
+                    var args = new EntityEffectReagentArgs(actualEntity, ent, solution, proto, mostToRemove,
                         EntityManager, null, scale * ev.Scale, ev.QuantityMultiplier);
 
                     // do all effects, if conditions apply
diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
index 53bb1ff80c7..a8af257292e 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -3,8 +3,8 @@
 using Content.Server.Body.Components;
 using Content.Server.Chat.Systems;
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Chemistry.ReagentEffectConditions;
-using Content.Server.Chemistry.ReagentEffects;
+using Content.Server.EntityEffects.EffectConditions;
+using Content.Server.EntityEffects.Effects;
 using Content.Server.Popups;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
@@ -15,6 +15,7 @@
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
 using Content.Shared.Database;
+using Content.Shared.EntityEffects;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Mood;
 using JetBrains.Annotations;
@@ -268,7 +269,7 @@ private float GetSaturation(Solution solution, Entity<MetabolizerComponent?> lun
         // TODO generalize condition checks
         // this is pretty janky, but I just want to bodge a method that checks if an entity can breathe a gas mixture
         // Applying actual reaction effects require a full ReagentEffectArgs struct.
-        bool CanMetabolize(ReagentEffect effect)
+        bool CanMetabolize(EntityEffect effect)
         {
             if (effect.Conditions == null)
                 return true;
diff --git a/Content.Server/Botany/SeedPrototype.cs b/Content.Server/Botany/SeedPrototype.cs
index e9cf34e6ba6..d08f5985215 100644
--- a/Content.Server/Botany/SeedPrototype.cs
+++ b/Content.Server/Botany/SeedPrototype.cs
@@ -1,7 +1,7 @@
 using Content.Server.Botany.Components;
 using Content.Server.Botany.Systems;
 using Content.Shared.Atmos;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
@@ -80,7 +80,7 @@ public partial struct SeedChemQuantity
 
 // TODO reduce the number of friends to a reasonable level. Requires ECS-ing things like plant holder component.
 [Virtual, DataDefinition]
-[Access(typeof(BotanySystem), typeof(PlantHolderSystem), typeof(SeedExtractorSystem), typeof(PlantHolderComponent), typeof(ReagentEffect), typeof(MutationSystem))]
+[Access(typeof(BotanySystem), typeof(PlantHolderSystem), typeof(SeedExtractorSystem), typeof(PlantHolderComponent), typeof(EntityEffect), typeof(MutationSystem))]
 public partial class SeedData
 {
     #region Tracking
diff --git a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
deleted file mode 100644
index ebbf4e0341b..00000000000
--- a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using Content.Server.Fluids.EntitySystems;
-using Content.Shared.Audio;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Coordinates.Helpers;
-using Content.Shared.Database;
-using Content.Shared.FixedPoint;
-using Content.Shared.Maps;
-using JetBrains.Annotations;
-using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.Chemistry.ReactionEffects
-{
-    /// <summary>
-    /// Basically smoke and foam reactions.
-    /// </summary>
-    [UsedImplicitly]
-    [DataDefinition]
-    public sealed partial class AreaReactionEffect : ReagentEffect
-    {
-        /// <summary>
-        /// How many seconds will the effect stay, counting after fully spreading.
-        /// </summary>
-        [DataField("duration")] private float _duration = 10;
-
-        /// <summary>
-        /// How many units of reaction for 1 smoke entity.
-        /// </summary>
-        [DataField] public FixedPoint2 OverflowThreshold = FixedPoint2.New(2.5);
-
-        /// <summary>
-        /// The entity prototype that will be spawned as the effect.
-        /// </summary>
-        [DataField("prototypeId", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
-        private string _prototypeId = default!;
-
-        /// <summary>
-        /// Sound that will get played when this reaction effect occurs.
-        /// </summary>
-        [DataField("sound", required: true)] private SoundSpecifier _sound = default!;
-
-        public override bool ShouldLog => true;
-
-        protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-missing");
-
-        public override LogImpact LogImpact => LogImpact.High;
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (args.Source == null)
-                return;
-
-            var spreadAmount = (int) Math.Max(0, Math.Ceiling((args.Quantity / OverflowThreshold).Float()));
-            var splitSolution = args.Source.SplitSolution(args.Source.Volume);
-            var transform = args.EntityManager.GetComponent<TransformComponent>(args.SolutionEntity);
-            var mapManager = IoCManager.Resolve<IMapManager>();
-            var mapSys = args.EntityManager.System<MapSystem>();
-            var sys = args.EntityManager.System<TransformSystem>();
-            var mapCoords = sys.GetMapCoordinates(args.SolutionEntity, xform: transform);
-
-            if (!mapManager.TryFindGridAt(mapCoords, out var gridUid, out var grid) ||
-                !mapSys.TryGetTileRef(gridUid, grid, transform.Coordinates, out var tileRef) ||
-                tileRef.Tile.IsSpace())
-            {
-                return;
-            }
-
-            var coords = mapSys.MapToGrid(gridUid, mapCoords);
-            var ent = args.EntityManager.SpawnEntity(_prototypeId, coords.SnapToGrid());
-
-            var smoke = args.EntityManager.System<SmokeSystem>();
-            smoke.StartSmoke(ent, splitSolution, _duration, spreadAmount);
-
-            var audio = args.EntityManager.System<SharedAudioSystem>();
-            audio.PlayPvs(_sound, args.SolutionEntity, AudioHelpers.WithVariation(0.125f));
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs
deleted file mode 100644
index 8a558a3ffdc..00000000000
--- a/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using Content.Server.Explosion.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Database;
-using Content.Shared.Explosion;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using System.Text.Json.Serialization;
-
-namespace Content.Server.Chemistry.ReactionEffects
-{
-    [DataDefinition]
-    public sealed partial class ExplosionReactionEffect : ReagentEffect
-    {
-        /// <summary>
-        ///     The type of explosion. Determines damage types and tile break chance scaling.
-        /// </summary>
-        [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<ExplosionPrototype>))]
-        [JsonIgnore]
-        public string ExplosionType = default!;
-
-        /// <summary>
-        ///     The max intensity the explosion can have at a given tile. Places an upper limit of damage and tile break
-        ///     chance.
-        /// </summary>
-        [DataField]
-        [JsonIgnore]
-        public float MaxIntensity = 5;
-
-        /// <summary>
-        ///     How quickly intensity drops off as you move away from the epicenter
-        /// </summary>
-        [DataField]
-        [JsonIgnore]
-        public float IntensitySlope = 1;
-
-        /// <summary>
-        ///     The maximum total intensity that this chemical reaction can achieve. Basically here to prevent people
-        ///     from creating a nuke by collecting enough potassium and water.
-        /// </summary>
-        /// <remarks>
-        ///     A slope of 1 and MaxTotalIntensity of 100 corresponds to a radius of around 4.5 tiles.
-        /// </remarks>
-        [DataField]
-        [JsonIgnore]
-        public float MaxTotalIntensity = 100;
-
-        /// <summary>
-        ///     The intensity of the explosion per unit reaction.
-        /// </summary>
-        [DataField]
-        [JsonIgnore]
-        public float IntensityPerUnit = 1;
-
-        public override bool ShouldLog => true;
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-explosion-reaction-effect", ("chance", Probability));
-        public override LogImpact LogImpact => LogImpact.High;
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            var intensity = MathF.Min((float) args.Quantity * IntensityPerUnit, MaxTotalIntensity);
-
-            EntitySystem.Get<ExplosionSystem>().QueueExplosion(
-                args.SolutionEntity,
-                ExplosionType,
-                intensity,
-                IntensitySlope,
-                MaxIntensity);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReactionEffects/SolutionTemperatureEffects.cs b/Content.Server/Chemistry/ReactionEffects/SolutionTemperatureEffects.cs
deleted file mode 100644
index ec58754883d..00000000000
--- a/Content.Server/Chemistry/ReactionEffects/SolutionTemperatureEffects.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReactionEffects
-{
-    /// <summary>
-    ///     Sets the temperature of the solution involved with the reaction to a new value.
-    /// </summary>
-    [DataDefinition]
-    public sealed partial class SetSolutionTemperatureEffect : ReagentEffect
-    {
-        /// <summary>
-        ///     The temperature to set the solution to.
-        /// </summary>
-        [DataField("temperature", required: true)] private float _temperature;
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-set-solution-temperature-effect",
-                ("chance", Probability), ("temperature", _temperature));
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            var solution = args.Source;
-            if (solution == null)
-                return;
-
-            solution.Temperature = _temperature;
-        }
-    }
-
-    /// <summary>
-    ///     Adjusts the temperature of the solution involved in the reaction.
-    /// </summary>
-    [DataDefinition]
-    public sealed partial class AdjustSolutionTemperatureEffect : ReagentEffect
-    {
-        /// <summary>
-        ///     The change in temperature.
-        /// </summary>
-        [DataField("delta", required: true)] private float _delta;
-
-        /// <summary>
-        ///     The minimum temperature this effect can reach.
-        /// </summary>
-        [DataField("minTemp")] private float _minTemp = 0.0f;
-
-        /// <summary>
-        ///     The maximum temperature this effect can reach.
-        /// </summary>
-        [DataField("maxTemp")] private float _maxTemp = float.PositiveInfinity;
-
-        /// <summary>
-        ///     If true, then scale ranges by intensity. If not, the ranges are the same regardless of reactant amount.
-        /// </summary>
-        [DataField("scaled")] private bool _scaled;
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-adjust-solution-temperature-effect",
-                ("chance", Probability), ("deltasign", MathF.Sign(_delta)), ("mintemp", _minTemp), ("maxtemp", _maxTemp));
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            var solution = args.Source;
-            if (solution == null || solution.Volume == 0)
-                return;
-
-            var deltaT = _scaled ? _delta * (float) args.Quantity : _delta;
-            solution.Temperature = Math.Clamp(solution.Temperature + deltaT, _minTemp, _maxTemp);
-        }
-    }
-
-    /// <summary>
-    ///     Adjusts the thermal energy of the solution involved in the reaction.
-    /// </summary>
-    public sealed partial class AdjustSolutionThermalEnergyEffect : ReagentEffect
-    {
-        /// <summary>
-        ///     The change in energy.
-        /// </summary>
-        [DataField("delta", required: true)] private float _delta;
-
-        /// <summary>
-        ///     The minimum temperature this effect can reach.
-        /// </summary>
-        [DataField("minTemp")] private float _minTemp = 0.0f;
-
-        /// <summary>
-        ///     The maximum temperature this effect can reach.
-        /// </summary>
-        [DataField("maxTemp")] private float _maxTemp = float.PositiveInfinity;
-
-        /// <summary>
-        ///     If true, then scale ranges by intensity. If not, the ranges are the same regardless of reactant amount.
-        /// </summary>
-        [DataField("scaled")] private bool _scaled;
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            var solution = args.Source;
-            if (solution == null || solution.Volume == 0)
-                return;
-
-            if (_delta > 0 && solution.Temperature >= _maxTemp)
-                return;
-            if (_delta < 0 && solution.Temperature <= _minTemp)
-                return;
-
-            var heatCap = solution.GetHeatCapacity(null);
-            var deltaT = _scaled
-                ? _delta / heatCap * (float) args.Quantity
-                : _delta / heatCap;
-
-            solution.Temperature = Math.Clamp(solution.Temperature + deltaT, _minTemp, _maxTemp);
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-adjust-solution-temperature-effect",
-                ("chance", Probability), ("deltasign", MathF.Sign(_delta)), ("mintemp", _minTemp), ("maxtemp", _maxTemp));
-    }
-
-}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/BodyTemperature.cs b/Content.Server/Chemistry/ReagentEffectConditions/BodyTemperature.cs
deleted file mode 100644
index 9c47bb58ab8..00000000000
--- a/Content.Server/Chemistry/ReagentEffectConditions/BodyTemperature.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Content.Server.Temperature.Components;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffectConditions
-{
-    /// <summary>
-    ///     Requires the solution entity to be above or below a certain temperature.
-    ///     Used for things like cryoxadone and pyroxadone.
-    /// </summary>
-    public sealed partial class Temperature : ReagentEffectCondition
-    {
-        [DataField]
-        public float Min = 0;
-
-        [DataField]
-        public float Max = float.PositiveInfinity;
-        public override bool Condition(ReagentEffectArgs args)
-        {
-            if (args.EntityManager.TryGetComponent(args.SolutionEntity, out TemperatureComponent? temp))
-            {
-                if (temp.CurrentTemperature > Min && temp.CurrentTemperature < Max)
-                    return true;
-            }
-
-            return false;
-        }
-
-        public override string GuidebookExplanation(IPrototypeManager prototype)
-        {
-            return Loc.GetString("reagent-effect-condition-guidebook-body-temperature",
-                ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
-                ("min", Min));
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/MobStateCondition.cs b/Content.Server/Chemistry/ReagentEffectConditions/MobStateCondition.cs
deleted file mode 100644
index 377eb7d9065..00000000000
--- a/Content.Server/Chemistry/ReagentEffectConditions/MobStateCondition.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffectConditions
-{
-    public sealed partial class MobStateCondition : ReagentEffectCondition
-    {
-        [DataField]
-        public MobState Mobstate = MobState.Alive;
-
-        public override bool Condition(ReagentEffectArgs args)
-        {
-            if (args.EntityManager.TryGetComponent(args.SolutionEntity, out MobStateComponent? mobState))
-            {
-                if (mobState.CurrentState == Mobstate)
-                    return true;
-            }
-
-            return false;
-        }
-
-        public override string GuidebookExplanation(IPrototypeManager prototype)
-        {
-            return Loc.GetString("reagent-effect-condition-guidebook-mob-state-condition", ("state", Mobstate));
-        }
-    }
-}
-
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/OrganType.cs b/Content.Server/Chemistry/ReagentEffectConditions/OrganType.cs
deleted file mode 100644
index 986c3d79c8d..00000000000
--- a/Content.Server/Chemistry/ReagentEffectConditions/OrganType.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Shared.Body.Prototypes;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.Chemistry.ReagentEffectConditions
-{
-    /// <summary>
-    ///     Requires that the metabolizing organ is or is not tagged with a certain MetabolizerType
-    /// </summary>
-    public sealed partial class OrganType : ReagentEffectCondition
-    {
-        [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<MetabolizerTypePrototype>))]
-        public string Type = default!;
-
-        /// <summary>
-        ///     Does this condition pass when the organ has the type, or when it doesn't have the type?
-        /// </summary>
-        [DataField]
-        public bool ShouldHave = true;
-
-        public override bool Condition(ReagentEffectArgs args)
-        {
-            if (args.OrganEntity == null)
-                return false;
-
-            return Condition(args.OrganEntity.Value, args.EntityManager);
-        }
-
-        public bool Condition(Entity<MetabolizerComponent?> metabolizer, IEntityManager entMan)
-        {
-            metabolizer.Comp ??= entMan.GetComponentOrNull<MetabolizerComponent>(metabolizer.Owner);
-            if (metabolizer.Comp != null
-                && metabolizer.Comp.MetabolizerTypes != null
-                && metabolizer.Comp.MetabolizerTypes.Contains(Type))
-                return ShouldHave;
-            return !ShouldHave;
-        }
-
-        public override string GuidebookExplanation(IPrototypeManager prototype)
-        {
-            return Loc.GetString("reagent-effect-condition-guidebook-organ-type",
-                ("name", prototype.Index<MetabolizerTypePrototype>(Type).LocalizedName),
-                ("shouldhave", ShouldHave));
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/ReagentThreshold.cs b/Content.Server/Chemistry/ReagentEffectConditions/ReagentThreshold.cs
deleted file mode 100644
index 061af2b3aef..00000000000
--- a/Content.Server/Chemistry/ReagentEffectConditions/ReagentThreshold.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffectConditions
-{
-    /// <summary>
-    ///     Used for implementing reagent effects that require a certain amount of reagent before it should be applied.
-    ///     For instance, overdoses.
-    ///
-    ///     This can also trigger on -other- reagents, not just the one metabolizing. By default, it uses the
-    ///     one being metabolized.
-    /// </summary>
-    public sealed partial class ReagentThreshold : ReagentEffectCondition
-    {
-        [DataField]
-        public FixedPoint2 Min = FixedPoint2.Zero;
-
-        [DataField]
-        public FixedPoint2 Max = FixedPoint2.MaxValue;
-
-        // TODO use ReagentId
-        [DataField]
-        public string? Reagent;
-
-        public override bool Condition(ReagentEffectArgs args)
-        {
-            var reagent = Reagent ?? args.Reagent?.ID;
-            if (reagent == null)
-                return true; // No condition to apply.
-
-            var quant = FixedPoint2.Zero;
-            if (args.Source != null)
-                quant = args.Source.GetTotalPrototypeQuantity(reagent) * args.QuantityMultiplier;
-
-            return quant >= Min && quant <= Max;
-        }
-
-        public override string GuidebookExplanation(IPrototypeManager prototype)
-        {
-            ReagentPrototype? reagentProto = null;
-            if (Reagent is not null)
-                prototype.TryIndex(Reagent, out reagentProto);
-
-            return Loc.GetString("reagent-effect-condition-guidebook-reagent-threshold",
-                ("reagent", reagentProto?.LocalizedName ?? Loc.GetString("reagent-effect-condition-guidebook-this-reagent")),
-                ("max", Max == FixedPoint2.MaxValue ? (float) int.MaxValue : Max.Float()),
-                ("min", Min.Float()));
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/SolutionTemperature.cs b/Content.Server/Chemistry/ReagentEffectConditions/SolutionTemperature.cs
deleted file mode 100644
index 4387f2ba93b..00000000000
--- a/Content.Server/Chemistry/ReagentEffectConditions/SolutionTemperature.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffectConditions
-{
-    /// <summary>
-    ///     Requires the solution to be above or below a certain temperature.
-    ///     Used for things like explosives.
-    /// </summary>
-    public sealed partial class SolutionTemperature : ReagentEffectCondition
-    {
-        [DataField]
-        public float Min = 0.0f;
-
-        [DataField]
-        public float Max = float.PositiveInfinity;
-        public override bool Condition(ReagentEffectArgs args)
-        {
-            if (args.Source == null)
-                return false;
-            if (args.Source.Temperature < Min)
-                return false;
-            if (args.Source.Temperature > Max)
-                return false;
-
-            return true;
-        }
-
-        public override string GuidebookExplanation(IPrototypeManager prototype)
-        {
-            return Loc.GetString("reagent-effect-condition-guidebook-solution-temperature",
-                ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
-                ("min", Min));
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/TotalDamage.cs b/Content.Server/Chemistry/ReagentEffectConditions/TotalDamage.cs
deleted file mode 100644
index 49630ef9ab0..00000000000
--- a/Content.Server/Chemistry/ReagentEffectConditions/TotalDamage.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Damage;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffectConditions
-{
-    public sealed partial class TotalDamage : ReagentEffectCondition
-    {
-        [DataField]
-        public FixedPoint2 Max = FixedPoint2.MaxValue;
-
-        [DataField]
-        public FixedPoint2 Min = FixedPoint2.Zero;
-
-        public override bool Condition(ReagentEffectArgs args)
-        {
-            if (args.EntityManager.TryGetComponent(args.SolutionEntity, out DamageableComponent? damage))
-            {
-                var total = damage.TotalDamage;
-                if (total > Min && total < Max)
-                    return true;
-            }
-
-            return false;
-        }
-
-        public override string GuidebookExplanation(IPrototypeManager prototype)
-        {
-            return Loc.GetString("reagent-effect-condition-guidebook-total-damage",
-                ("max", Max == FixedPoint2.MaxValue ? (float) int.MaxValue : Max.Float()),
-                ("min", Min.Float()));
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/TotalHunger.cs b/Content.Server/Chemistry/ReagentEffectConditions/TotalHunger.cs
deleted file mode 100644
index 1dd12e632a7..00000000000
--- a/Content.Server/Chemistry/ReagentEffectConditions/TotalHunger.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffectConditions
-{
-    public sealed partial class Hunger : ReagentEffectCondition
-    {
-        [DataField]
-        public float Max = float.PositiveInfinity;
-
-        [DataField]
-        public float Min = 0;
-
-        public override bool Condition(ReagentEffectArgs args)
-        {
-            if (args.EntityManager.TryGetComponent(args.SolutionEntity, out HungerComponent? hunger))
-            {
-                var total = hunger.CurrentHunger;
-                if (total > Min && total < Max)
-                    return true;
-            }
-
-            return false;
-        }
-
-        public override string GuidebookExplanation(IPrototypeManager prototype)
-        {
-            return Loc.GetString("reagent-effect-condition-guidebook-total-hunger",
-                ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
-                ("min", Min));
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs b/Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs
deleted file mode 100644
index 6a43739b0ee..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects
-{
-    [UsedImplicitly]
-    public sealed partial class AddToSolutionReaction : ReagentEffect
-    {
-        [DataField("solution")]
-        private string _solution = "reagents";
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (args.Reagent == null)
-                return;
-
-            // TODO see if this is correct
-            var solutionContainerSystem = args.EntityManager.System<SolutionContainerSystem>();
-            if (!solutionContainerSystem.TryGetSolution(args.SolutionEntity, _solution, out var solutionContainer))
-                return;
-
-            if (solutionContainerSystem.TryAddReagent(solutionContainer.Value, args.Reagent.ID, args.Quantity, out var accepted))
-                args.Source?.RemoveReagent(args.Reagent.ID, accepted);
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-            Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability));
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/ChemCleanBloodstream.cs b/Content.Server/Chemistry/ReagentEffects/ChemCleanBloodstream.cs
deleted file mode 100644
index 402b30a069b..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/ChemCleanBloodstream.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Content.Server.Body.Systems;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReactionEffects
-{
-    /// <summary>
-    /// Basically smoke and foam reactions.
-    /// </summary>
-    [UsedImplicitly]
-    public sealed partial class ChemCleanBloodstream : ReagentEffect
-    {
-        [DataField]
-        public float CleanseRate = 3.0f;
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-chem-clean-bloodstream", ("chance", Probability));
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (args.Source == null || args.Reagent == null)
-                return;
-
-            var cleanseRate = CleanseRate;
-
-            cleanseRate *= args.Scale;
-
-            var bloodstreamSys = EntitySystem.Get<BloodstreamSystem>();
-            bloodstreamSys.FlushChemicals(args.SolutionEntity, args.Reagent.ID, cleanseRate);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/ChemHealEyeDamage.cs b/Content.Server/Chemistry/ReagentEffects/ChemHealEyeDamage.cs
deleted file mode 100644
index 206b8ed04dc..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/ChemHealEyeDamage.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Eye.Blinding;
-using Content.Shared.Eye.Blinding.Systems;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects
-{
-    /// <summary>
-    /// Heal or apply eye damage
-    /// </summary>
-    [UsedImplicitly]
-    public sealed partial class ChemHealEyeDamage : ReagentEffect
-    {
-        /// <summary>
-        /// How much eye damage to add.
-        /// </summary>
-        [DataField]
-        public int Amount = -1;
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-cure-eye-damage", ("chance", Probability), ("deltasign", MathF.Sign(Amount)));
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (args.Scale != 1f) // huh?
-                return;
-
-            args.EntityManager.EntitySysManager.GetEntitySystem<BlindableSystem>().AdjustEyeDamage(args.SolutionEntity, Amount);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/Electrocute.cs b/Content.Server/Chemistry/ReagentEffects/Electrocute.cs
deleted file mode 100644
index 272a0fce42a..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/Electrocute.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Content.Server.Electrocution;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects;
-
-public sealed partial class Electrocute : ReagentEffect
-{
-    [DataField] public int ElectrocuteTime = 2;
-
-    [DataField] public int ElectrocuteDamageScale = 5;
-
-    /// <remarks>
-    ///     true - refresh electrocute time,  false - accumulate electrocute time
-    /// </remarks>
-    [DataField] public bool Refresh = true;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-electrocute", ("chance", Probability), ("time", ElectrocuteTime));
-
-    public override bool ShouldLog => true;
-
-    public override void Effect(ReagentEffectArgs args)
-    {
-        args.EntityManager.System<ElectrocutionSystem>().TryDoElectrocution(args.SolutionEntity, null,
-            Math.Max((args.Quantity * ElectrocuteDamageScale).Int(), 1), TimeSpan.FromSeconds(ElectrocuteTime), Refresh, ignoreInsulation: true);
-
-        if (args.Reagent != null)
-            args.Source?.RemoveReagent(args.Reagent.ID, args.Quantity);
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/ExtinguishReaction.cs b/Content.Server/Chemistry/ReagentEffects/ExtinguishReaction.cs
deleted file mode 100644
index e9029089988..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/ExtinguishReaction.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Content.Server.Atmos.Components;
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects
-{
-    [UsedImplicitly]
-    public sealed partial class ExtinguishReaction : ReagentEffect
-    {
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-extinguish-reaction", ("chance", Probability));
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out FlammableComponent? flammable)) return;
-
-            var flammableSystem = EntitySystem.Get<FlammableSystem>();
-            flammableSystem.Extinguish(args.SolutionEntity, flammable);
-            flammableSystem.AdjustFireStacks(args.SolutionEntity, -1.5f * (float) args.Quantity, flammable);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/FlammableReaction.cs b/Content.Server/Chemistry/ReagentEffects/FlammableReaction.cs
deleted file mode 100644
index 5b36967f6a8..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/FlammableReaction.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Content.Server.Atmos.Components;
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Database;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects
-{
-    [UsedImplicitly]
-    public sealed partial class FlammableReaction : ReagentEffect
-    {
-        [DataField]
-        public float Multiplier = 0.05f;
-
-        public override bool ShouldLog => true;
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-flammable-reaction", ("chance", Probability));
-
-        public override LogImpact LogImpact => LogImpact.Medium;
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out FlammableComponent? flammable))
-                return;
-
-            args.EntityManager.System<FlammableSystem>().AdjustFireStacks(args.SolutionEntity, args.Quantity.Float() * Multiplier, flammable);
-
-            if (args.Reagent != null)
-                args.Source?.RemoveReagent(args.Reagent.ID, args.Quantity);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/Ignite.cs b/Content.Server/Chemistry/ReagentEffects/Ignite.cs
deleted file mode 100644
index 1fc90f63e31..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/Ignite.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Database;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects;
-
-/// <summary>
-///     Ignites a mob.
-/// </summary>
-public sealed partial class Ignite : ReagentEffect
-{
-    public override bool ShouldLog => true;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-ignite", ("chance", Probability));
-
-    public override LogImpact LogImpact => LogImpact.Medium;
-
-    public override void Effect(ReagentEffectArgs args)
-    {
-        var flamSys = EntitySystem.Get<FlammableSystem>();
-        flamSys.Ignite(args.SolutionEntity, args.OrganEntity ?? args.SolutionEntity);
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/ModifyBleedAmount.cs b/Content.Server/Chemistry/ReagentEffects/ModifyBleedAmount.cs
deleted file mode 100644
index 7b966ea4788..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/ModifyBleedAmount.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects;
-
-public sealed partial class ModifyBleedAmount : ReagentEffect
-{
-    [DataField]
-    public bool Scaled = false;
-
-    [DataField]
-    public float Amount = -1.0f;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-modify-bleed-amount", ("chance", Probability),
-            ("deltasign", MathF.Sign(Amount)));
-
-    public override void Effect(ReagentEffectArgs args)
-    {
-        if (args.EntityManager.TryGetComponent<BloodstreamComponent>(args.SolutionEntity, out var blood))
-        {
-            var sys = EntitySystem.Get<BloodstreamSystem>();
-            var amt = Scaled ? Amount * args.Quantity.Float() : Amount;
-            amt *= args.Scale;
-
-            sys.TryModifyBleedAmount(args.SolutionEntity, amt, blood);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/ModifyBloodLevel.cs b/Content.Server/Chemistry/ReagentEffects/ModifyBloodLevel.cs
deleted file mode 100644
index 748aa71083e..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/ModifyBloodLevel.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects;
-
-public sealed partial class ModifyBloodLevel : ReagentEffect
-{
-    [DataField]
-    public bool Scaled = false;
-
-    [DataField]
-    public FixedPoint2 Amount = 1.0f;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-modify-blood-level", ("chance", Probability),
-            ("deltasign", MathF.Sign(Amount.Float())));
-
-    public override void Effect(ReagentEffectArgs args)
-    {
-        if (args.EntityManager.TryGetComponent<BloodstreamComponent>(args.SolutionEntity, out var blood))
-        {
-            var sys = EntitySystem.Get<BloodstreamSystem>();
-            var amt = Scaled ? Amount * args.Quantity : Amount;
-            amt *= args.Scale;
-
-            sys.TryModifyBloodLevel(args.SolutionEntity, amt, blood);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/ModifyLungGas.cs b/Content.Server/Chemistry/ReagentEffects/ModifyLungGas.cs
deleted file mode 100644
index e7466fbc85d..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/ModifyLungGas.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Shared.Atmos;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects;
-
-public sealed partial class ModifyLungGas : ReagentEffect
-{
-    [DataField("ratios", required: true)]
-    private Dictionary<Gas, float> _ratios = default!;
-
-    // JUSTIFICATION: This is internal magic that players never directly interact with.
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => null;
-
-    public override void Effect(ReagentEffectArgs args)
-    {
-        if (!args.EntityManager.TryGetComponent<LungComponent>(args.OrganEntity, out var lung))
-            return;
-
-        foreach (var (gas, ratio) in _ratios)
-        {
-            var quantity = ratio * args.Quantity.Float() / Atmospherics.BreathMolesToReagentMultiplier;
-            if (quantity < 0)
-                quantity = Math.Max(quantity, -lung.Air[(int)gas]);
-            lung.Air.AdjustMoles(gas, quantity);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/MovespeedModifier.cs b/Content.Server/Chemistry/ReagentEffects/MovespeedModifier.cs
deleted file mode 100644
index 0301742c5af..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/MovespeedModifier.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Movement.Systems;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-
-namespace Content.Server.Chemistry.ReagentEffects
-{
-    /// <summary>
-    /// Default metabolism for stimulants and tranqs. Attempts to find a MovementSpeedModifier on the target,
-    /// adding one if not there and to change the movespeed
-    /// </summary>
-    public sealed partial class MovespeedModifier : ReagentEffect
-    {
-        /// <summary>
-        /// How much the entities' walk speed is multiplied by.
-        /// </summary>
-        [DataField]
-        public float WalkSpeedModifier { get; set; } = 1;
-
-        /// <summary>
-        /// How much the entities' run speed is multiplied by.
-        /// </summary>
-        [DataField]
-        public float SprintSpeedModifier { get; set; } = 1;
-
-        /// <summary>
-        /// How long the modifier applies (in seconds) when metabolized.
-        /// </summary>
-        [DataField]
-        public float StatusLifetime = 2f;
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        {
-            return Loc.GetString("reagent-effect-guidebook-movespeed-modifier",
-                ("chance", Probability),
-                ("walkspeed", WalkSpeedModifier),
-                ("time", StatusLifetime));
-        }
-
-        /// <summary>
-        /// Remove reagent at set rate, changes the movespeed modifiers and adds a MovespeedModifierMetabolismComponent if not already there.
-        /// </summary>
-        public override void Effect(ReagentEffectArgs args)
-        {
-            var status = args.EntityManager.EnsureComponent<MovespeedModifierMetabolismComponent>(args.SolutionEntity);
-
-            // Only refresh movement if we need to.
-            var modified = !status.WalkSpeedModifier.Equals(WalkSpeedModifier) ||
-                           !status.SprintSpeedModifier.Equals(SprintSpeedModifier);
-
-            status.WalkSpeedModifier = WalkSpeedModifier;
-            status.SprintSpeedModifier = SprintSpeedModifier;
-
-            // only going to scale application time
-            var statusLifetime = StatusLifetime;
-            statusLifetime *= args.Scale;
-
-            IncreaseTimer(status, statusLifetime);
-
-            if (modified)
-                EntitySystem.Get<MovementSpeedModifierSystem>().RefreshMovementSpeedModifiers(args.SolutionEntity);
-
-        }
-        public void IncreaseTimer(MovespeedModifierMetabolismComponent status, float time)
-        {
-            var gameTiming = IoCManager.Resolve<IGameTiming>();
-
-            var offsetTime = Math.Max(status.ModifierTimer.TotalSeconds, gameTiming.CurTime.TotalSeconds);
-
-            status.ModifierTimer = TimeSpan.FromSeconds(offsetTime + time);
-            status.Dirty();
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/Oxygenate.cs b/Content.Server/Chemistry/ReagentEffects/Oxygenate.cs
deleted file mode 100644
index 34a2454139e..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/Oxygenate.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects;
-
-public sealed partial class Oxygenate : ReagentEffect
-{
-    [DataField]
-    public float Factor = 1f;
-
-    // JUSTIFICATION: This is internal magic that players never directly interact with.
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => null;
-
-    public override void Effect(ReagentEffectArgs args)
-    {
-        if (args.EntityManager.TryGetComponent<RespiratorComponent>(args.SolutionEntity, out var resp))
-        {
-            var respSys = EntitySystem.Get<RespiratorSystem>();
-            respSys.UpdateSaturation(args.SolutionEntity, args.Quantity.Float() * Factor, resp);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustAttribute.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustAttribute.cs
deleted file mode 100644
index f43b4828f93..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustAttribute.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using System.Diagnostics.CodeAnalysis;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [ImplicitDataDefinitionForInheritors]
-    public abstract partial class PlantAdjustAttribute : ReagentEffect
-    {
-        [DataField]
-        public float Amount { get; protected set; } = 1;
-
-        [DataField]
-        public float Prob { get; protected set; } = 1; // = (80);
-
-        /// <summary>
-        ///     Checks if the plant holder can metabolize the reagent or not. Checks if it has an alive plant by default.
-        /// </summary>
-        /// <param name="plantHolder">The entity holding the plant</param>
-        /// <param name="plantHolderComponent">The plant holder component</param>
-        /// <param name="entityManager">The entity manager</param>
-        /// <param name="mustHaveAlivePlant">Whether to check if it has an alive plant or not</param>
-        /// <returns></returns>
-        public bool CanMetabolize(EntityUid plantHolder, [NotNullWhen(true)] out PlantHolderComponent? plantHolderComponent,
-            IEntityManager entityManager,
-            bool mustHaveAlivePlant = true)
-        {
-            plantHolderComponent = null;
-
-            if (!entityManager.TryGetComponent(plantHolder, out plantHolderComponent)
-                                    || mustHaveAlivePlant && (plantHolderComponent.Seed == null || plantHolderComponent.Dead))
-                return false;
-
-            if (Prob >= 1f)
-                return true;
-
-            // Dependencies are never injected for reagents if you intend to do that for this.
-            return !(Prob <= 0f) && IoCManager.Resolve<IRobustRandom>().Prob(Prob);
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability));
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustHealth.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustHealth.cs
deleted file mode 100644
index f03464469eb..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustHealth.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Content.Server.Botany.Systems;
-using Content.Shared.Chemistry.Reagent;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    public sealed partial class PlantAdjustHealth : PlantAdjustAttribute
-    {
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
-                return;
-
-            var plantHolder = args.EntityManager.System<PlantHolderSystem>();
-
-            plantHolderComp.Health += Amount;
-            plantHolder.CheckHealth(args.SolutionEntity, plantHolderComp);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationLevel.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationLevel.cs
deleted file mode 100644
index 8c8d04765a2..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationLevel.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    public sealed partial class PlantAdjustMutationLevel : PlantAdjustAttribute
-    {
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
-                return;
-
-            plantHolderComp.MutationLevel += Amount * plantHolderComp.MutationMod;
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationMod.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationMod.cs
deleted file mode 100644
index af4a00a044e..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationMod.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    public sealed partial class PlantAdjustMutationMod : PlantAdjustAttribute
-    {
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
-                return;
-
-            plantHolderComp.MutationMod += Amount;
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustNutrition.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustNutrition.cs
deleted file mode 100644
index 900121412e8..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustNutrition.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Server.Botany.Systems;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    public sealed partial class PlantAdjustNutrition : PlantAdjustAttribute
-    {
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager, mustHaveAlivePlant: false))
-                return;
-
-            var plantHolder = args.EntityManager.System<PlantHolderSystem>();
-
-            plantHolder.AdjustNutrient(args.SolutionEntity, Amount, plantHolderComp);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustPests.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustPests.cs
deleted file mode 100644
index 27729b4b2ca..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustPests.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    public sealed partial class PlantAdjustPests : PlantAdjustAttribute
-    {
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
-                return;
-
-            plantHolderComp.PestLevel += Amount;
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustToxins.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustToxins.cs
deleted file mode 100644
index 35130238ad5..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustToxins.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    public sealed partial class PlantAdjustToxins : PlantAdjustAttribute
-    {
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
-                return;
-
-            plantHolderComp.Toxins += Amount;
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWater.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWater.cs
deleted file mode 100644
index 71b4670dc65..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWater.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Server.Botany.Systems;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    public sealed partial class PlantAdjustWater : PlantAdjustAttribute
-    {
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager, mustHaveAlivePlant: false))
-                return;
-
-            var plantHolder = args.EntityManager.System<PlantHolderSystem>();
-
-            plantHolder.AdjustWater(args.SolutionEntity, Amount, plantHolderComp);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWeeds.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWeeds.cs
deleted file mode 100644
index 6184b95adb8..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWeeds.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    public sealed partial class PlantAdjustWeeds : PlantAdjustAttribute
-    {
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
-                return;
-
-            plantHolderComp.WeedLevel += Amount;
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAffectGrowth.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAffectGrowth.cs
deleted file mode 100644
index 54ec628fdc9..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAffectGrowth.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Server.Botany.Systems;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    public sealed partial class PlantAffectGrowth : PlantAdjustAttribute
-    {
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
-                return;
-
-            var plantHolder = args.EntityManager.System<PlantHolderSystem>();
-
-            plantHolder.AffectGrowth(args.SolutionEntity, (int) Amount, plantHolderComp);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantCryoxadone.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantCryoxadone.cs
deleted file mode 100644
index 83a5f56e592..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantCryoxadone.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    [DataDefinition]
-    public sealed partial class PlantCryoxadone : ReagentEffect
-    {
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out PlantHolderComponent? plantHolderComp)
-            || plantHolderComp.Seed == null || plantHolderComp.Dead)
-                return;
-
-            var deviation = 0;
-            var seed = plantHolderComp.Seed;
-            var random = IoCManager.Resolve<IRobustRandom>();
-            if (plantHolderComp.Age > seed.Maturation)
-                deviation = (int) Math.Max(seed.Maturation - 1, plantHolderComp.Age - random.Next(7, 10));
-            else
-                deviation = (int) (seed.Maturation / seed.GrowthStages);
-            plantHolderComp.Age -= deviation;
-            plantHolderComp.SkipAging++;
-            plantHolderComp.ForceUpdate = true;
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability));
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantDiethylamine.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantDiethylamine.cs
deleted file mode 100644
index 23cb436d2f1..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantDiethylamine.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Server.Botany.Systems;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    [DataDefinition]
-    public sealed partial class PlantDiethylamine : ReagentEffect
-    {
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out PlantHolderComponent? plantHolderComp)
-                                    || plantHolderComp.Seed == null || plantHolderComp.Dead ||
-                                    plantHolderComp.Seed.Immutable)
-                return;
-
-
-            var plantHolder = args.EntityManager.System<PlantHolderSystem>();
-
-            var random = IoCManager.Resolve<IRobustRandom>();
-
-            if (random.Prob(0.1f))
-            {
-                plantHolder.EnsureUniqueSeed(args.SolutionEntity, plantHolderComp);
-                plantHolderComp.Seed.Lifespan++;
-            }
-
-            if (random.Prob(0.1f))
-            {
-                plantHolder.EnsureUniqueSeed(args.SolutionEntity, plantHolderComp);
-                plantHolderComp.Seed.Endurance++;
-            }
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability));
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantPhalanximine.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantPhalanximine.cs
deleted file mode 100644
index c0640d7fc04..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantPhalanximine.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    [DataDefinition]
-    public sealed partial class PlantPhalanximine : ReagentEffect
-    {
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out PlantHolderComponent? plantHolderComp)
-                                    || plantHolderComp.Seed == null || plantHolderComp.Dead ||
-                                    plantHolderComp.Seed.Immutable)
-                return;
-
-            plantHolderComp.Seed.Viable = true;
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability));
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/RobustHarvest.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/RobustHarvest.cs
deleted file mode 100644
index 990a5a5003f..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/RobustHarvest.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Server.Botany.Systems;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    [DataDefinition]
-    public sealed partial class RobustHarvest : ReagentEffect
-    {
-        [DataField]
-        public int PotencyLimit = 50;
-
-        [DataField]
-        public int PotencyIncrease = 3;
-
-        [DataField]
-        public int PotencySeedlessThreshold = 30;
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out PlantHolderComponent? plantHolderComp)
-                                    || plantHolderComp.Seed == null || plantHolderComp.Dead ||
-                                    plantHolderComp.Seed.Immutable)
-                return;
-
-
-            var plantHolder = args.EntityManager.System<PlantHolderSystem>();
-            var random = IoCManager.Resolve<IRobustRandom>();
-
-            if (plantHolderComp.Seed.Potency < PotencyLimit)
-            {
-                plantHolder.EnsureUniqueSeed(args.SolutionEntity, plantHolderComp);
-                plantHolderComp.Seed.Potency = Math.Min(plantHolderComp.Seed.Potency + PotencyIncrease, PotencyLimit);
-
-                if (plantHolderComp.Seed.Potency > PotencySeedlessThreshold)
-                {
-                    plantHolderComp.Seed.Seedless = true;
-                }
-            }
-            else if (plantHolderComp.Seed.Yield > 1 && random.Prob(0.1f))
-            {
-                // Too much of a good thing reduces yield
-                plantHolder.EnsureUniqueSeed(args.SolutionEntity, plantHolderComp);
-                plantHolderComp.Seed.Yield--;
-            }
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability));
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/SatiateThirst.cs b/Content.Server/Chemistry/ReagentEffects/SatiateThirst.cs
deleted file mode 100644
index 1208e74367b..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/SatiateThirst.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.Nutrition.EntitySystems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects
-{
-    /// <summary>
-    /// Default metabolism for drink reagents. Attempts to find a ThirstComponent on the target,
-    /// and to update it's thirst values.
-    /// </summary>
-    public sealed partial class SatiateThirst : ReagentEffect
-    {
-        private const float DefaultHydrationFactor = 3.0f;
-
-        /// How much thirst is satiated each metabolism tick. Not currently tied to
-        /// rate or anything.
-        [DataField("factor")]
-        public float HydrationFactor { get; set; } = DefaultHydrationFactor;
-
-        /// Satiate thirst if a ThirstComponent can be found
-        public override void Effect(ReagentEffectArgs args)
-        {
-            var uid = args.SolutionEntity;
-            if (args.EntityManager.TryGetComponent(uid, out ThirstComponent? thirst))
-                EntitySystem.Get<ThirstSystem>().ModifyThirst(uid, thirst, HydrationFactor);
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-satiate-thirst", ("chance", Probability), ("relative",  HydrationFactor / DefaultHydrationFactor));
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/StatusEffects/GenericStatusEffect.cs b/Content.Server/Chemistry/ReagentEffects/StatusEffects/GenericStatusEffect.cs
deleted file mode 100644
index 66454b25fd6..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/StatusEffects/GenericStatusEffect.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.StatusEffect;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects.StatusEffects
-{
-    /// <summary>
-    ///     Adds a generic status effect to the entity,
-    ///     not worrying about things like how to affect the time it lasts for
-    ///     or component fields or anything. Just adds a component to an entity
-    ///     for a given time. Easy.
-    /// </summary>
-    /// <remarks>
-    ///     Can be used for things like adding accents or something. I don't know. Go wild.
-    /// </remarks>
-    [UsedImplicitly]
-    public sealed partial class GenericStatusEffect : ReagentEffect
-    {
-        [DataField(required: true)]
-        public string Key = default!;
-
-        [DataField]
-        public string Component = String.Empty;
-
-        [DataField]
-        public float Time = 2.0f;
-
-        /// <remarks>
-        ///     true - refresh status effect time,  false - accumulate status effect time
-        /// </remarks>
-        [DataField]
-        public bool Refresh = true;
-
-        /// <summary>
-        ///     Should this effect add the status effect, remove time from it, or set its cooldown?
-        /// </summary>
-        [DataField]
-        public StatusEffectMetabolismType Type = StatusEffectMetabolismType.Add;
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            var statusSys = args.EntityManager.EntitySysManager.GetEntitySystem<StatusEffectsSystem>();
-
-            var time = Time;
-            time *= args.Scale;
-
-            if (Type == StatusEffectMetabolismType.Add && Component != String.Empty)
-            {
-                statusSys.TryAddStatusEffect(args.SolutionEntity, Key, TimeSpan.FromSeconds(time), Refresh, Component);
-            }
-            else if (Type == StatusEffectMetabolismType.Remove)
-            {
-                statusSys.TryRemoveTime(args.SolutionEntity, Key, TimeSpan.FromSeconds(time));
-            }
-            else if (Type == StatusEffectMetabolismType.Set)
-            {
-                statusSys.TrySetTime(args.SolutionEntity, Key, TimeSpan.FromSeconds(time));
-            }
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString(
-            "reagent-effect-guidebook-status-effect",
-            ("chance", Probability),
-            ("type", Type),
-            ("time", Time),
-            ("key", $"reagent-effect-status-effect-{Key}"));
-    }
-
-    public enum StatusEffectMetabolismType
-    {
-        Add,
-        Remove,
-        Set
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/StatusEffects/Jitter.cs b/Content.Server/Chemistry/ReagentEffects/StatusEffects/Jitter.cs
deleted file mode 100644
index 7ee70957b7a..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/StatusEffects/Jitter.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Jittering;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects.StatusEffects
-{
-    /// <summary>
-    ///     Adds the jitter status effect to a mob.
-    ///     This doesn't use generic status effects because it needs to
-    ///     take in some parameters that JitterSystem needs.
-    /// </summary>
-    public sealed partial class Jitter : ReagentEffect
-    {
-        [DataField]
-        public float Amplitude = 10.0f;
-
-        [DataField]
-        public float Frequency = 4.0f;
-
-        [DataField]
-        public float Time = 2.0f;
-
-        /// <remarks>
-        ///     true - refresh jitter time,  false - accumulate jitter time
-        /// </remarks>
-        [DataField]
-        public bool Refresh = true;
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            var time = Time;
-            time *= args.Scale;
-
-            args.EntityManager.EntitySysManager.GetEntitySystem<SharedJitteringSystem>()
-                .DoJitter(args.SolutionEntity, TimeSpan.FromSeconds(time), Refresh, Amplitude, Frequency);
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-            Loc.GetString("reagent-effect-guidebook-jittering", ("chance", Probability));
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/WashCreamPieReaction.cs b/Content.Server/Chemistry/ReagentEffects/WashCreamPieReaction.cs
deleted file mode 100644
index 9bf6792eca2..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/WashCreamPieReaction.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Content.Server.Nutrition.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Nutrition.Components;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects
-{
-    [UsedImplicitly]
-    public sealed partial class WashCreamPieReaction : ReagentEffect
-    {
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-wash-cream-pie-reaction", ("chance", Probability));
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out CreamPiedComponent? creamPied)) return;
-
-            EntitySystem.Get<CreamPieSystem>().SetCreamPied(args.SolutionEntity, creamPied, false);
-        }
-    }
-}
diff --git a/Content.Server/EntityEffects/EffectConditions/BodyTemperature.cs b/Content.Server/EntityEffects/EffectConditions/BodyTemperature.cs
new file mode 100644
index 00000000000..9f68bec9182
--- /dev/null
+++ b/Content.Server/EntityEffects/EffectConditions/BodyTemperature.cs
@@ -0,0 +1,35 @@
+using Content.Server.Temperature.Components;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.EffectConditions;
+
+/// <summary>
+///     Requires the target entity to be above or below a certain temperature.
+///     Used for things like cryoxadone and pyroxadone.
+/// </summary>
+public sealed partial class Temperature : EntityEffectCondition
+{
+    [DataField]
+    public float Min = 0;
+
+    [DataField]
+    public float Max = float.PositiveInfinity;
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (args.EntityManager.TryGetComponent(args.TargetEntity, out TemperatureComponent? temp))
+        {
+            if (temp.CurrentTemperature > Min && temp.CurrentTemperature < Max)
+                return true;
+        }
+
+        return false;
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        return Loc.GetString("reagent-effect-condition-guidebook-body-temperature",
+            ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
+            ("min", Min));
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/HasTagCondition.cs b/Content.Server/EntityEffects/EffectConditions/HasTagCondition.cs
similarity index 68%
rename from Content.Server/Chemistry/ReagentEffectConditions/HasTagCondition.cs
rename to Content.Server/EntityEffects/EffectConditions/HasTagCondition.cs
index 52d4d00eb3f..b0428b41bfc 100644
--- a/Content.Server/Chemistry/ReagentEffectConditions/HasTagCondition.cs
+++ b/Content.Server/EntityEffects/EffectConditions/HasTagCondition.cs
@@ -1,13 +1,13 @@
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Content.Shared.Tag;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.Chemistry.ReagentEffectConditions;
+namespace Content.Server.EntityEffects.EffectConditions;
 
 [UsedImplicitly]
-public sealed partial class HasTag : ReagentEffectCondition
+public sealed partial class HasTag : EntityEffectCondition
 {
     [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<TagPrototype>))]
     public string Tag = default!;
@@ -15,10 +15,10 @@ public sealed partial class HasTag : ReagentEffectCondition
     [DataField]
     public bool Invert = false;
 
-    public override bool Condition(ReagentEffectArgs args)
+    public override bool Condition(EntityEffectBaseArgs args)
     {
-        if (args.EntityManager.TryGetComponent<TagComponent>(args.SolutionEntity, out var tag))
-            return EntitySystem.Get<TagSystem>().HasTag(tag, Tag) ^ Invert;
+        if (args.EntityManager.TryGetComponent<TagComponent>(args.TargetEntity, out var tag))
+            return args.EntityManager.System<TagSystem>().HasTag(tag, Tag) ^ Invert;
 
         return false;
     }
diff --git a/Content.Server/EntityEffects/EffectConditions/JobCondition.cs b/Content.Server/EntityEffects/EffectConditions/JobCondition.cs
new file mode 100644
index 00000000000..20d67d6de0c
--- /dev/null
+++ b/Content.Server/EntityEffects/EffectConditions/JobCondition.cs
@@ -0,0 +1,49 @@
+using System.Linq;
+using Content.Shared.EntityEffects;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Localizations;
+using Robust.Shared.Prototypes;
+using Content.Shared.Mind;
+using Content.Shared.Mind.Components;
+using Content.Shared.Roles;
+using Content.Shared.Roles.Jobs;
+using Content.Shared.Station;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.IoC;
+
+namespace Content.Server.EntityEffects.EffectConditions;
+
+public sealed partial class JobCondition : EntityEffectCondition
+{
+    [DataField(required: true)] public List<ProtoId<JobPrototype>> Job;
+                
+    public override bool Condition(EntityEffectBaseArgs args)
+    {   
+        args.EntityManager.TryGetComponent<MindContainerComponent>(args.TargetEntity, out var mindContainer);
+        if (mindContainer != null && mindContainer.Mind != null)
+        {
+            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;
+                    }
+                }
+            }
+        }
+            
+        return false;
+    }
+        
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        var localizedNames = Job.Select(jobId => prototype.Index(jobId).LocalizedName).ToList();
+        return Loc.GetString("reagent-effect-condition-guidebook-job-condition", ("job", ContentLocalizationManager.FormatListToOr(localizedNames)));
+    }
+}
+
+
diff --git a/Content.Server/EntityEffects/EffectConditions/MobStateCondition.cs b/Content.Server/EntityEffects/EffectConditions/MobStateCondition.cs
new file mode 100644
index 00000000000..d676b29bf9e
--- /dev/null
+++ b/Content.Server/EntityEffects/EffectConditions/MobStateCondition.cs
@@ -0,0 +1,29 @@
+using Content.Shared.EntityEffects;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.EffectConditions;
+
+public sealed partial class MobStateCondition : EntityEffectCondition
+{
+    [DataField]
+    public MobState Mobstate = MobState.Alive;
+
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (args.EntityManager.TryGetComponent(args.TargetEntity, out MobStateComponent? mobState))
+        {
+            if (mobState.CurrentState == Mobstate)
+                return true;
+        }
+
+        return false;
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        return Loc.GetString("reagent-effect-condition-guidebook-mob-state-condition", ("state", Mobstate));
+    }
+}
+
diff --git a/Content.Server/EntityEffects/EffectConditions/OrganType.cs b/Content.Server/EntityEffects/EffectConditions/OrganType.cs
new file mode 100644
index 00000000000..fc52608fab2
--- /dev/null
+++ b/Content.Server/EntityEffects/EffectConditions/OrganType.cs
@@ -0,0 +1,53 @@
+using Content.Server.Body.Components;
+using Content.Shared.Body.Prototypes;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Server.EntityEffects.EffectConditions;
+
+/// <summary>
+///     Requires that the metabolizing organ is or is not tagged with a certain MetabolizerType
+/// </summary>
+public sealed partial class OrganType : EntityEffectCondition
+{
+    [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<MetabolizerTypePrototype>))]
+    public string Type = default!;
+
+    /// <summary>
+    ///     Does this condition pass when the organ has the type, or when it doesn't have the type?
+    /// </summary>
+    [DataField]
+    public bool ShouldHave = true;
+
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            if (reagentArgs.OrganEntity == null)
+                return false;
+
+            return Condition(reagentArgs.OrganEntity.Value, reagentArgs.EntityManager);
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+
+    public bool Condition(Entity<MetabolizerComponent?> metabolizer, IEntityManager entMan)
+    {
+        metabolizer.Comp ??= entMan.GetComponentOrNull<MetabolizerComponent>(metabolizer.Owner);
+        if (metabolizer.Comp != null
+            && metabolizer.Comp.MetabolizerTypes != null
+            && metabolizer.Comp.MetabolizerTypes.Contains(Type))
+            return ShouldHave;
+        return !ShouldHave;
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        return Loc.GetString("reagent-effect-condition-guidebook-organ-type",
+            ("name", prototype.Index<MetabolizerTypePrototype>(Type).LocalizedName),
+            ("shouldhave", ShouldHave));
+    }
+}
diff --git a/Content.Server/EntityEffects/EffectConditions/ReagentThreshold.cs b/Content.Server/EntityEffects/EffectConditions/ReagentThreshold.cs
new file mode 100644
index 00000000000..6cbd7b4ea57
--- /dev/null
+++ b/Content.Server/EntityEffects/EffectConditions/ReagentThreshold.cs
@@ -0,0 +1,57 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.EffectConditions;
+
+/// <summary>
+///     Used for implementing reagent effects that require a certain amount of reagent before it should be applied.
+///     For instance, overdoses.
+///
+///     This can also trigger on -other- reagents, not just the one metabolizing. By default, it uses the
+///     one being metabolized.
+/// </summary>
+public sealed partial class ReagentThreshold : EntityEffectCondition
+{
+    [DataField]
+    public FixedPoint2 Min = FixedPoint2.Zero;
+
+    [DataField]
+    public FixedPoint2 Max = FixedPoint2.MaxValue;
+
+    // TODO use ReagentId
+    [DataField]
+    public string? Reagent;
+
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            var reagent = Reagent ?? reagentArgs.Reagent?.ID;
+            if (reagent == null)
+                return true; // No condition to apply.
+
+            var quant = FixedPoint2.Zero;
+            if (reagentArgs.Source != null)
+                quant = reagentArgs.Source.GetTotalPrototypeQuantity(reagent);
+
+            return quant >= Min && quant <= Max;
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        ReagentPrototype? reagentProto = null;
+        if (Reagent is not null)
+            prototype.TryIndex(Reagent, out reagentProto);
+
+        return Loc.GetString("reagent-effect-condition-guidebook-reagent-threshold",
+            ("reagent", reagentProto?.LocalizedName ?? Loc.GetString("reagent-effect-condition-guidebook-this-reagent")),
+            ("max", Max == FixedPoint2.MaxValue ? (float) int.MaxValue : Max.Float()),
+            ("min", Min.Float()));
+    }
+}
diff --git a/Content.Server/EntityEffects/EffectConditions/SolutionTemperature.cs b/Content.Server/EntityEffects/EffectConditions/SolutionTemperature.cs
new file mode 100644
index 00000000000..b964435db52
--- /dev/null
+++ b/Content.Server/EntityEffects/EffectConditions/SolutionTemperature.cs
@@ -0,0 +1,40 @@
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.EffectConditions;
+
+/// <summary>
+///     Requires the solution to be above or below a certain temperature.
+///     Used for things like explosives.
+/// </summary>
+public sealed partial class SolutionTemperature : EntityEffectCondition
+{
+    [DataField]
+    public float Min = 0.0f;
+
+    [DataField]
+    public float Max = float.PositiveInfinity;
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            if (reagentArgs.Source == null)
+                return false;
+            if (reagentArgs.Source.Temperature < Min)
+                return false;
+            if (reagentArgs.Source.Temperature > Max)
+                return false;
+            return true;
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        return Loc.GetString("reagent-effect-condition-guidebook-solution-temperature",
+            ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
+            ("min", Min));
+    }
+}
diff --git a/Content.Server/EntityEffects/EffectConditions/TotalDamage.cs b/Content.Server/EntityEffects/EffectConditions/TotalDamage.cs
new file mode 100644
index 00000000000..2d039a1ac8f
--- /dev/null
+++ b/Content.Server/EntityEffects/EffectConditions/TotalDamage.cs
@@ -0,0 +1,34 @@
+using Content.Shared.EntityEffects;
+using Content.Shared.Damage;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.EffectConditions;
+
+public sealed partial class TotalDamage : EntityEffectCondition
+{
+    [DataField]
+    public FixedPoint2 Max = FixedPoint2.MaxValue;
+
+    [DataField]
+    public FixedPoint2 Min = FixedPoint2.Zero;
+
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (args.EntityManager.TryGetComponent(args.TargetEntity, out DamageableComponent? damage))
+        {
+            var total = damage.TotalDamage;
+            if (total > Min && total < Max)
+                return true;
+        }
+
+        return false;
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        return Loc.GetString("reagent-effect-condition-guidebook-total-damage",
+            ("max", Max == FixedPoint2.MaxValue ? (float) int.MaxValue : Max.Float()),
+            ("min", Min.Float()));
+    }
+}
diff --git a/Content.Server/EntityEffects/EffectConditions/TotalHunger.cs b/Content.Server/EntityEffects/EffectConditions/TotalHunger.cs
new file mode 100644
index 00000000000..84ad4c22403
--- /dev/null
+++ b/Content.Server/EntityEffects/EffectConditions/TotalHunger.cs
@@ -0,0 +1,34 @@
+using Content.Shared.EntityEffects;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.EffectConditions;
+
+public sealed partial class Hunger : EntityEffectCondition
+{
+    [DataField]
+    public float Max = float.PositiveInfinity;
+
+    [DataField]
+    public float Min = 0;
+
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (args.EntityManager.TryGetComponent(args.TargetEntity, out HungerComponent? hunger))
+        {
+            var total = hunger.CurrentHunger;
+            if (total > Min && total < Max)
+                return true;
+        }
+
+        return false;
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        return Loc.GetString("reagent-effect-condition-guidebook-total-hunger",
+            ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
+            ("min", Min));
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/ActivateArtifact.cs b/Content.Server/EntityEffects/Effects/ActivateArtifact.cs
similarity index 56%
rename from Content.Server/Chemistry/ReagentEffects/ActivateArtifact.cs
rename to Content.Server/EntityEffects/Effects/ActivateArtifact.cs
index 41af90f60a1..3e973884995 100644
--- a/Content.Server/Chemistry/ReagentEffects/ActivateArtifact.cs
+++ b/Content.Server/EntityEffects/Effects/ActivateArtifact.cs
@@ -1,15 +1,16 @@
-using Content.Server.Xenoarchaeology.XenoArtifacts;
+using Content.Server.Xenoarchaeology.XenoArtifacts;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.Prototypes;
+using Content.Shared.EntityEffects;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class ActivateArtifact : ReagentEffect
+public sealed partial class ActivateArtifact : EntityEffect
 {
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var artifact = args.EntityManager.EntitySysManager.GetEntitySystem<ArtifactSystem>();
-        artifact.TryActivateArtifact(args.SolutionEntity);
+        artifact.TryActivateArtifact(args.TargetEntity);
     }
 
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
diff --git a/Content.Server/EntityEffects/Effects/AddToSolutionReaction.cs b/Content.Server/EntityEffects/Effects/AddToSolutionReaction.cs
new file mode 100644
index 00000000000..10fb667ca48
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/AddToSolutionReaction.cs
@@ -0,0 +1,38 @@
+using Content.Server.Chemistry.Containers.EntitySystems;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects
+{
+    [UsedImplicitly]
+    public sealed partial class AddToSolutionReaction : EntityEffect
+    {
+        [DataField("solution")]
+        private string _solution = "reagents";
+
+        public override void Effect(EntityEffectBaseArgs args)
+        {
+            if (args is EntityEffectReagentArgs reagentArgs) {
+                if (reagentArgs.Reagent == null)
+                    return;
+
+                // TODO see if this is correct
+                var solutionContainerSystem = reagentArgs.EntityManager.System<SolutionContainerSystem>();
+                if (!solutionContainerSystem.TryGetSolution(reagentArgs.TargetEntity, _solution, out var solutionContainer))
+                    return;
+
+                if (solutionContainerSystem.TryAddReagent(solutionContainer.Value, reagentArgs.Reagent.ID, reagentArgs.Quantity, out var accepted))
+                    reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, accepted);
+
+                return;
+            }
+
+            // TODO: Someone needs to figure out how to do this for non-reagent effects.
+            throw new NotImplementedException();
+        }
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+            Loc.GetString("reagent-effect-guidebook-add-to-solution-reaction", ("chance", Probability));
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/AdjustAlert.cs b/Content.Server/EntityEffects/Effects/AdjustAlert.cs
similarity index 76%
rename from Content.Server/Chemistry/ReagentEffects/AdjustAlert.cs
rename to Content.Server/EntityEffects/Effects/AdjustAlert.cs
index 40858176bd1..3bf57b309d1 100644
--- a/Content.Server/Chemistry/ReagentEffects/AdjustAlert.cs
+++ b/Content.Server/EntityEffects/Effects/AdjustAlert.cs
@@ -1,11 +1,11 @@
-using Content.Shared.Alert;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Alert;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class AdjustAlert : ReagentEffect
+public sealed partial class AdjustAlert : EntityEffect
 {
     /// <summary>
     /// The specific Alert that will be adjusted
@@ -34,15 +34,15 @@ public sealed partial class AdjustAlert : ReagentEffect
     //JUSTIFICATION: This just changes some visuals, doesn't need to be documented.
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => null;
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var alertSys = args.EntityManager.EntitySysManager.GetEntitySystem<AlertsSystem>();
-        if (!args.EntityManager.HasComponent<AlertsComponent>(args.SolutionEntity))
+        if (!args.EntityManager.HasComponent<AlertsComponent>(args.TargetEntity))
             return;
 
         if (Clear && Time <= 0)
         {
-                alertSys.ClearAlert(args.SolutionEntity, AlertType);
+            alertSys.ClearAlert(args.TargetEntity, AlertType);
         }
         else
         {
@@ -52,7 +52,7 @@ public override void Effect(ReagentEffectArgs args)
             if ((ShowCooldown || Clear) && Time > 0)
                 cooldown = (timing.CurTime, timing.CurTime + TimeSpan.FromSeconds(Time));
 
-            alertSys.ShowAlert(args.SolutionEntity, AlertType, cooldown: cooldown, autoRemove: Clear, showCooldown: ShowCooldown);
+            alertSys.ShowAlert(args.TargetEntity, AlertType, cooldown: cooldown, autoRemove: Clear, showCooldown: ShowCooldown);
         }
 
     }
diff --git a/Content.Server/Chemistry/ReagentEffects/AdjustReagent.cs b/Content.Server/EntityEffects/Effects/AdjustReagent.cs
similarity index 58%
rename from Content.Server/Chemistry/ReagentEffects/AdjustReagent.cs
rename to Content.Server/EntityEffects/Effects/AdjustReagent.cs
index 16d69edd9aa..71117d6ec53 100644
--- a/Content.Server/Chemistry/ReagentEffects/AdjustReagent.cs
+++ b/Content.Server/EntityEffects/Effects/AdjustReagent.cs
@@ -1,14 +1,15 @@
 using Content.Shared.Body.Prototypes;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.Chemistry.ReagentEffects
+namespace Content.Server.EntityEffects.Effects
 {
     [UsedImplicitly]
-    public sealed partial class AdjustReagent : ReagentEffect
+    public sealed partial class AdjustReagent : EntityEffect
     {
         /// <summary>
         ///     The reagent ID to remove. Only one of this and <see cref="Group"/> should be active.
@@ -27,36 +28,43 @@ public sealed partial class AdjustReagent : ReagentEffect
         [DataField(required: true)]
         public FixedPoint2 Amount = default!;
 
-        public override void Effect(ReagentEffectArgs args)
+        public override void Effect(EntityEffectBaseArgs args)
         {
-            if (args.Source == null)
-                return;
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                if (reagentArgs.Source == null)
+                    return;
 
-            var amount = Amount;
-            amount *= args.Scale;
+                var amount = Amount;
+                amount *= reagentArgs.Scale;
 
-            if (Reagent != null)
-            {
-                if (amount < 0 && args.Source.ContainsPrototype(Reagent))
-                    args.Source.RemoveReagent(Reagent, -amount);
-                if (amount > 0)
-                    args.Source.AddReagent(Reagent, amount);
-            }
-            else if (Group != null)
-            {
-                var prototypeMan = IoCManager.Resolve<IPrototypeManager>();
-                foreach (var quant in args.Source.Contents.ToArray())
+                if (Reagent != null)
                 {
-                    var proto = prototypeMan.Index<ReagentPrototype>(quant.Reagent.Prototype);
-                    if (proto.Metabolisms != null && proto.Metabolisms.ContainsKey(Group))
+                    if (amount < 0 && reagentArgs.Source.ContainsPrototype(Reagent))
+                        reagentArgs.Source.RemoveReagent(Reagent, -amount);
+                    if (amount > 0)
+                        reagentArgs.Source.AddReagent(Reagent, amount);
+                }
+                else if (Group != null)
+                {
+                    var prototypeMan = IoCManager.Resolve<IPrototypeManager>();
+                    foreach (var quant in reagentArgs.Source.Contents.ToArray())
                     {
-                        if (amount < 0)
-                            args.Source.RemoveReagent(quant.Reagent, amount);
-                        if (amount > 0)
-                            args.Source.AddReagent(quant.Reagent, amount);
+                        var proto = prototypeMan.Index<ReagentPrototype>(quant.Reagent.Prototype);
+                        if (proto.Metabolisms != null && proto.Metabolisms.ContainsKey(Group))
+                        {
+                            if (amount < 0)
+                                reagentArgs.Source.RemoveReagent(quant.Reagent, amount);
+                            if (amount > 0)
+                                reagentArgs.Source.AddReagent(quant.Reagent, amount);
+                        }
                     }
                 }
+                return;
             }
+
+            // TODO: Someone needs to figure out how to do this for non-reagent effects.
+            throw new NotImplementedException();
         }
 
         protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
diff --git a/Content.Server/Chemistry/ReagentEffects/AdjustTemperature.cs b/Content.Server/EntityEffects/Effects/AdjustTemperature.cs
similarity index 56%
rename from Content.Server/Chemistry/ReagentEffects/AdjustTemperature.cs
rename to Content.Server/EntityEffects/Effects/AdjustTemperature.cs
index 9b975720678..3c5c77c309d 100644
--- a/Content.Server/Chemistry/ReagentEffects/AdjustTemperature.cs
+++ b/Content.Server/EntityEffects/Effects/AdjustTemperature.cs
@@ -1,11 +1,11 @@
 using Content.Server.Temperature.Components;
 using Content.Server.Temperature.Systems;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects
+namespace Content.Server.EntityEffects.Effects
 {
-    public sealed partial class AdjustTemperature : ReagentEffect
+    public sealed partial class AdjustTemperature : EntityEffect
     {
         [DataField]
         public float Amount;
@@ -16,16 +16,19 @@ public sealed partial class AdjustTemperature : ReagentEffect
                 ("deltasign", MathF.Sign(Amount)),
                 ("amount", MathF.Abs(Amount)));
 
-        public override void Effect(ReagentEffectArgs args)
+        public override void Effect(EntityEffectBaseArgs args)
         {
-            if (args.EntityManager.TryGetComponent(args.SolutionEntity, out TemperatureComponent? temp))
+            if (args.EntityManager.TryGetComponent(args.TargetEntity, out TemperatureComponent? temp))
             {
                 var sys = args.EntityManager.EntitySysManager.GetEntitySystem<TemperatureSystem>();
                 var amount = Amount;
 
-                amount *= args.Scale;
+                if (args is EntityEffectReagentArgs reagentArgs)
+                {
+                    amount *= reagentArgs.Scale.Float();
+                }
 
-                sys.ChangeHeat(args.SolutionEntity, amount, true, temp);
+                sys.ChangeHeat(args.TargetEntity, amount, true, temp);
             }
         }
     }
diff --git a/Content.Server/EntityEffects/Effects/AreaReactionEffect.cs b/Content.Server/EntityEffects/Effects/AreaReactionEffect.cs
new file mode 100644
index 00000000000..481f1fc27c5
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/AreaReactionEffect.cs
@@ -0,0 +1,91 @@
+using Content.Server.Fluids.EntitySystems;
+using Content.Shared.Audio;
+using Content.Shared.Coordinates.Helpers;
+using Content.Shared.Database;
+using Content.Shared.EntityEffects;
+using Content.Shared.FixedPoint;
+using Content.Shared.Maps;
+using JetBrains.Annotations;
+using Robust.Server.GameObjects;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Server.EntityEffects.Effects;
+
+/// <summary>
+/// Basically smoke and foam reactions.
+/// </summary>
+[UsedImplicitly]
+[DataDefinition]
+public sealed partial class AreaReactionEffect : EntityEffect
+{
+    /// <summary>
+    /// How many seconds will the effect stay, counting after fully spreading.
+    /// </summary>
+    [DataField("duration")] private float _duration = 10;
+
+    /// <summary>
+    /// How many units of reaction for 1 smoke entity.
+    /// </summary>
+    [DataField] public FixedPoint2 OverflowThreshold = FixedPoint2.New(2.5);
+
+    /// <summary>
+    /// The entity prototype that will be spawned as the effect.
+    /// </summary>
+    [DataField("prototypeId", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
+    private string _prototypeId = default!;
+
+    /// <summary>
+    /// Sound that will get played when this reaction effect occurs.
+    /// </summary>
+    [DataField("sound", required: true)] private SoundSpecifier _sound = default!;
+
+    public override bool ShouldLog => true;
+
+    protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+            => Loc.GetString("reagent-effect-guidebook-area-reaction",
+                    ("duration", _duration)
+                );
+
+    public override LogImpact LogImpact => LogImpact.High;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            if (reagentArgs.Source == null)
+                return;
+
+            var spreadAmount = (int) Math.Max(0, Math.Ceiling((reagentArgs.Quantity / OverflowThreshold).Float()));
+            var splitSolution = reagentArgs.Source.SplitSolution(reagentArgs.Source.Volume);
+            var transform = reagentArgs.EntityManager.GetComponent<TransformComponent>(reagentArgs.TargetEntity);
+            var mapManager = IoCManager.Resolve<IMapManager>();
+            var mapSys = reagentArgs.EntityManager.System<MapSystem>();
+            var sys = reagentArgs.EntityManager.System<TransformSystem>();
+            var mapCoords = sys.GetMapCoordinates(reagentArgs.TargetEntity, xform: transform);
+
+            if (!mapManager.TryFindGridAt(mapCoords, out var gridUid, out var grid) ||
+                !mapSys.TryGetTileRef(gridUid, grid, transform.Coordinates, out var tileRef) ||
+                tileRef.Tile.IsSpace())
+            {
+                return;
+            }
+
+            var coords = mapSys.MapToGrid(gridUid, mapCoords);
+            var ent = reagentArgs.EntityManager.SpawnEntity(_prototypeId, coords.SnapToGrid());
+
+            var smoke = reagentArgs.EntityManager.System<SmokeSystem>();
+            smoke.StartSmoke(ent, splitSolution, _duration, spreadAmount);
+
+            var audio = reagentArgs.EntityManager.System<SharedAudioSystem>();
+            audio.PlayPvs(_sound, reagentArgs.TargetEntity, AudioHelpers.WithVariation(0.125f));
+            return;
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/CauseZombieInfection.cs b/Content.Server/EntityEffects/Effects/CauseZombieInfection.cs
similarity index 64%
rename from Content.Server/Chemistry/ReagentEffects/CauseZombieInfection.cs
rename to Content.Server/EntityEffects/Effects/CauseZombieInfection.cs
index 029b1495002..dcbc676fe77 100644
--- a/Content.Server/Chemistry/ReagentEffects/CauseZombieInfection.cs
+++ b/Content.Server/EntityEffects/Effects/CauseZombieInfection.cs
@@ -1,21 +1,20 @@
 using Content.Server.Zombies;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Configuration;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class CauseZombieInfection : ReagentEffect
+public sealed partial class CauseZombieInfection : EntityEffect
 {
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
         => Loc.GetString("reagent-effect-guidebook-cause-zombie-infection", ("chance", Probability));
 
     // Adds the Zombie Infection Components
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var entityManager = args.EntityManager;
-        entityManager.EnsureComponent<ZombifyOnDeathComponent>(args.SolutionEntity);
-        entityManager.EnsureComponent<PendingZombieComponent>(args.SolutionEntity);
+        entityManager.EnsureComponent<ZombifyOnDeathComponent>(args.TargetEntity);
+        entityManager.EnsureComponent<PendingZombieComponent>(args.TargetEntity);
     }
 }
 
diff --git a/Content.Server/Chemistry/ReagentEffects/ChemAddMoodlet.cs b/Content.Server/EntityEffects/Effects/ChemAddMoodlet.cs
similarity index 100%
rename from Content.Server/Chemistry/ReagentEffects/ChemAddMoodlet.cs
rename to Content.Server/EntityEffects/Effects/ChemAddMoodlet.cs
diff --git a/Content.Server/EntityEffects/Effects/ChemCleanBloodstream.cs b/Content.Server/EntityEffects/Effects/ChemCleanBloodstream.cs
new file mode 100644
index 00000000000..b7f6f0dc885
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/ChemCleanBloodstream.cs
@@ -0,0 +1,40 @@
+using Content.Server.Body.Systems;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects;
+
+/// <summary>
+/// Basically smoke and foam reactions.
+/// </summary>
+[UsedImplicitly]
+public sealed partial class ChemCleanBloodstream : EntityEffect
+{
+    [DataField]
+    public float CleanseRate = 3.0f;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-chem-clean-bloodstream", ("chance", Probability));
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        
+        var cleanseRate = CleanseRate;
+
+        var bloodstreamSys = args.EntityManager.System<BloodstreamSystem>();
+
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            if (reagentArgs.Source == null || reagentArgs.Reagent == null)
+                return;
+
+            cleanseRate *= reagentArgs.Scale.Float();
+            bloodstreamSys.FlushChemicals(args.TargetEntity, reagentArgs.Reagent.ID, cleanseRate);
+        }
+        else
+        {
+            bloodstreamSys.FlushChemicals(args.TargetEntity, "", cleanseRate);
+        }
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/ChemHealEyeDamage.cs b/Content.Server/EntityEffects/Effects/ChemHealEyeDamage.cs
new file mode 100644
index 00000000000..42fc9ffa9fb
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/ChemHealEyeDamage.cs
@@ -0,0 +1,31 @@
+using Content.Shared.EntityEffects;
+using Content.Shared.Eye.Blinding.Systems;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects;
+
+/// <summary>
+/// Heal or apply eye damage
+/// </summary>
+[UsedImplicitly]
+public sealed partial class ChemHealEyeDamage : EntityEffect
+{
+    /// <summary>
+    /// How much eye damage to add.
+    /// </summary>
+    [DataField]
+    public int Amount = -1;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-cure-eye-damage", ("chance", Probability), ("deltasign", MathF.Sign(Amount)));
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+            if (reagentArgs.Scale != 1f) // huh?
+                return;
+
+        args.EntityManager.EntitySysManager.GetEntitySystem<BlindableSystem>().AdjustEyeDamage(args.TargetEntity, Amount);
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/ChemVomit.cs b/Content.Server/EntityEffects/Effects/ChemVomit.cs
similarity index 65%
rename from Content.Server/Chemistry/ReagentEffects/ChemVomit.cs
rename to Content.Server/EntityEffects/Effects/ChemVomit.cs
index 851c0adf5f2..0d1bac87d1c 100644
--- a/Content.Server/Chemistry/ReagentEffects/ChemVomit.cs
+++ b/Content.Server/EntityEffects/Effects/ChemVomit.cs
@@ -1,15 +1,15 @@
 using Content.Server.Medical;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects
+namespace Content.Server.EntityEffects.Effects
 {
     /// <summary>
     /// Forces you to vomit.
     /// </summary>
     [UsedImplicitly]
-    public sealed partial class ChemVomit : ReagentEffect
+    public sealed partial class ChemVomit : EntityEffect
     {
         /// How many units of thirst to add each time we vomit
         [DataField]
@@ -21,14 +21,15 @@ public sealed partial class ChemVomit : ReagentEffect
         protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
             => Loc.GetString("reagent-effect-guidebook-chem-vomit", ("chance", Probability));
 
-        public override void Effect(ReagentEffectArgs args)
+        public override void Effect(EntityEffectBaseArgs args)
         {
-            if (args.Scale != 1f)
-                return;
+            if (args is EntityEffectReagentArgs reagentArgs)
+                if (reagentArgs.Scale != 1f)
+                    return;
 
             var vomitSys = args.EntityManager.EntitySysManager.GetEntitySystem<VomitSystem>();
 
-            vomitSys.Vomit(args.SolutionEntity, ThirstAmount, HungerAmount);
+            vomitSys.Vomit(args.TargetEntity, ThirstAmount, HungerAmount);
         }
     }
 }
diff --git a/Content.Server/Chemistry/ReactionEffects/CreateEntityReactionEffect.cs b/Content.Server/EntityEffects/Effects/CreateEntityReactionEffect.cs
similarity index 80%
rename from Content.Server/Chemistry/ReactionEffects/CreateEntityReactionEffect.cs
rename to Content.Server/EntityEffects/Effects/CreateEntityReactionEffect.cs
index 0d5acc17220..5288cb587da 100644
--- a/Content.Server/Chemistry/ReactionEffects/CreateEntityReactionEffect.cs
+++ b/Content.Server/EntityEffects/Effects/CreateEntityReactionEffect.cs
@@ -1,12 +1,11 @@
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.GameObjects;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.Chemistry.ReactionEffects;
+namespace Content.Server.EntityEffects.Effects;
 
 [DataDefinition]
-public sealed partial class CreateEntityReactionEffect : ReagentEffect
+public sealed partial class CreateEntityReactionEffect : EntityEffect
 {
     /// <summary>
     ///     What entity to create.
@@ -26,15 +25,17 @@ public sealed partial class CreateEntityReactionEffect : ReagentEffect
             ("entname", IoCManager.Resolve<IPrototypeManager>().Index<EntityPrototype>(Entity).Name),
             ("amount", Number));
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
-        var transform = args.EntityManager.GetComponent<TransformComponent>(args.SolutionEntity);
+        var transform = args.EntityManager.GetComponent<TransformComponent>(args.TargetEntity);
         var transformSystem = args.EntityManager.System<SharedTransformSystem>();
-        var quantity = Number * args.Quantity.Int();
+        var quantity = (int)Number;
+        if (args is EntityEffectReagentArgs reagentArgs)
+            quantity *= reagentArgs.Quantity.Int();
 
         for (var i = 0; i < quantity; i++)
         {
-            var uid = args.EntityManager.SpawnEntity(Entity, transformSystem.GetMapCoordinates(args.SolutionEntity, xform: transform));
+            var uid = args.EntityManager.SpawnEntity(Entity, transformSystem.GetMapCoordinates(args.TargetEntity, xform: transform));
             transformSystem.AttachToGridOrMap(uid);
 
             // TODO figure out how to properly spawn inside of containers
diff --git a/Content.Server/Chemistry/ReagentEffects/CreateGas.cs b/Content.Server/EntityEffects/Effects/CreateGas.cs
similarity index 62%
rename from Content.Server/Chemistry/ReagentEffects/CreateGas.cs
rename to Content.Server/EntityEffects/Effects/CreateGas.cs
index c1da3c48db3..fb57a43c48d 100644
--- a/Content.Server/Chemistry/ReagentEffects/CreateGas.cs
+++ b/Content.Server/EntityEffects/Effects/CreateGas.cs
@@ -1,12 +1,12 @@
-using Content.Server.Atmos.EntitySystems;
+using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Atmos;
-using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class CreateGas : ReagentEffect
+public sealed partial class CreateGas : EntityEffect
 {
     [DataField(required: true)]
     public Gas Gas = default!;
@@ -31,15 +31,22 @@ public sealed partial class CreateGas : ReagentEffect
 
     public override LogImpact LogImpact => LogImpact.High;
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var atmosSys = args.EntityManager.EntitySysManager.GetEntitySystem<AtmosphereSystem>();
 
-        var tileMix = atmosSys.GetContainingMixture(args.SolutionEntity, false, true);
+        var tileMix = atmosSys.GetContainingMixture(args.TargetEntity, false, true);
 
         if (tileMix != null)
         {
-            tileMix.AdjustMoles(Gas, args.Quantity.Float() * Multiplier);
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                tileMix.AdjustMoles(Gas, reagentArgs.Quantity.Float() * Multiplier);
+            }
+            else
+            {
+                tileMix.AdjustMoles(Gas, Multiplier);
+            }
         }
     }
 }
diff --git a/Content.Server/Chemistry/ReagentEffects/CureZombieInfection.cs b/Content.Server/EntityEffects/Effects/CureZombieInfection.cs
similarity index 73%
rename from Content.Server/Chemistry/ReagentEffects/CureZombieInfection.cs
rename to Content.Server/EntityEffects/Effects/CureZombieInfection.cs
index d56fc115310..066fa872489 100644
--- a/Content.Server/Chemistry/ReagentEffects/CureZombieInfection.cs
+++ b/Content.Server/EntityEffects/Effects/CureZombieInfection.cs
@@ -1,11 +1,10 @@
 using Content.Server.Zombies;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Configuration;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class CureZombieInfection : ReagentEffect
+public sealed partial class CureZombieInfection : EntityEffect
 {
     [DataField]
     public bool Innoculate;
@@ -19,18 +18,18 @@ public sealed partial class CureZombieInfection : ReagentEffect
     }
 
     // Removes the Zombie Infection Components
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var entityManager = args.EntityManager;
-        if (entityManager.HasComponent<IncurableZombieComponent>(args.SolutionEntity))
+        if (entityManager.HasComponent<IncurableZombieComponent>(args.TargetEntity))
             return;
 
-        entityManager.RemoveComponent<ZombifyOnDeathComponent>(args.SolutionEntity);
-        entityManager.RemoveComponent<PendingZombieComponent>(args.SolutionEntity);
+        entityManager.RemoveComponent<ZombifyOnDeathComponent>(args.TargetEntity);
+        entityManager.RemoveComponent<PendingZombieComponent>(args.TargetEntity);
 
         if (Innoculate)
         {
-            entityManager.EnsureComponent<ZombieImmuneComponent>(args.SolutionEntity);
+            entityManager.EnsureComponent<ZombieImmuneComponent>(args.TargetEntity);
         }
     }
 }
diff --git a/Content.Server/Chemistry/ReagentEffects/Drunk.cs b/Content.Server/EntityEffects/Effects/Drunk.cs
similarity index 65%
rename from Content.Server/Chemistry/ReagentEffects/Drunk.cs
rename to Content.Server/EntityEffects/Effects/Drunk.cs
index 6088db5787c..c41c349aaa1 100644
--- a/Content.Server/Chemistry/ReagentEffects/Drunk.cs
+++ b/Content.Server/EntityEffects/Effects/Drunk.cs
@@ -1,10 +1,10 @@
-using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Drunk;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class Drunk : ReagentEffect
+public sealed partial class Drunk : EntityEffect
 {
     /// <summary>
     ///     BoozePower is how long each metabolism cycle will make the drunk effect last for.
@@ -21,13 +21,14 @@ public sealed partial class Drunk : ReagentEffect
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
         => Loc.GetString("reagent-effect-guidebook-drunk", ("chance", Probability));
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var boozePower = BoozePower;
 
-        boozePower *= Math.Max(args.Scale, 1);
-
+        if (args is EntityEffectReagentArgs reagentArgs)
+            boozePower *= reagentArgs.Scale.Float();
+        
         var drunkSys = args.EntityManager.EntitySysManager.GetEntitySystem<SharedDrunkSystem>();
-        drunkSys.TryApplyDrunkenness(args.SolutionEntity, boozePower, SlurSpeech);
+        drunkSys.TryApplyDrunkenness(args.TargetEntity, boozePower, SlurSpeech);
     }
 }
diff --git a/Content.Server/EntityEffects/Effects/Electrocute.cs b/Content.Server/EntityEffects/Effects/Electrocute.cs
new file mode 100644
index 00000000000..f6a5f1a2da7
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Electrocute.cs
@@ -0,0 +1,38 @@
+using Content.Server.Electrocution;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects;
+
+public sealed partial class Electrocute : EntityEffect
+{
+    [DataField] public int ElectrocuteTime = 2;
+
+    [DataField] public int ElectrocuteDamageScale = 5;
+
+    /// <remarks>
+    ///     true - refresh electrocute time,  false - accumulate electrocute time
+    /// </remarks>
+    [DataField] public bool Refresh = true;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-electrocute", ("chance", Probability), ("time", ElectrocuteTime));
+
+    public override bool ShouldLog => true;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            reagentArgs.EntityManager.System<ElectrocutionSystem>().TryDoElectrocution(reagentArgs.TargetEntity, null,
+                Math.Max((reagentArgs.Quantity * ElectrocuteDamageScale).Int(), 1), TimeSpan.FromSeconds(ElectrocuteTime), Refresh, ignoreInsulation: true);
+
+            if (reagentArgs.Reagent != null)
+                reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, reagentArgs.Quantity);
+        } else
+        {
+            args.EntityManager.System<ElectrocutionSystem>().TryDoElectrocution(args.TargetEntity, null,
+                Math.Max(ElectrocuteDamageScale, 1), TimeSpan.FromSeconds(ElectrocuteTime), Refresh, ignoreInsulation: true);
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/Emote.cs b/Content.Server/EntityEffects/Effects/Emote.cs
similarity index 70%
rename from Content.Server/Chemistry/ReagentEffects/Emote.cs
rename to Content.Server/EntityEffects/Effects/Emote.cs
index 729f0671217..baf5967f310 100644
--- a/Content.Server/Chemistry/ReagentEffects/Emote.cs
+++ b/Content.Server/EntityEffects/Effects/Emote.cs
@@ -1,18 +1,18 @@
 using Content.Server.Chat.Systems;
 using Content.Shared.Chat;
 using Content.Shared.Chat.Prototypes;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
 /// <summary>
 ///     Tries to force someone to emote (scream, laugh, etc).
 /// </summary>
 [UsedImplicitly]
-public sealed partial class Emote : ReagentEffect
+public sealed partial class Emote : EntityEffect
 {
     [DataField("emote", customTypeSerializer: typeof(PrototypeIdSerializer<EmotePrototype>))]
     public string? EmoteId;
@@ -24,16 +24,16 @@ public sealed partial class Emote : ReagentEffect
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
         => null;
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         if (EmoteId == null)
             return;
 
         var chatSys = args.EntityManager.System<ChatSystem>();
         if (ShowInChat)
-            chatSys.TryEmoteWithChat(args.SolutionEntity, EmoteId, ChatTransmitRange.GhostRangeLimit);
+            chatSys.TryEmoteWithChat(args.TargetEntity, EmoteId, ChatTransmitRange.GhostRangeLimit, forceEmote: Force);
         else
-            chatSys.TryEmoteWithoutChat(args.SolutionEntity, EmoteId);
+            chatSys.TryEmoteWithoutChat(args.TargetEntity, EmoteId);
 
     }
 }
diff --git a/Content.Server/Chemistry/ReactionEffects/EmpReactionEffect.cs b/Content.Server/EntityEffects/Effects/EmpReactionEffect.cs
similarity index 67%
rename from Content.Server/Chemistry/ReactionEffects/EmpReactionEffect.cs
rename to Content.Server/EntityEffects/Effects/EmpReactionEffect.cs
index 9a320ffc398..ec7801f0832 100644
--- a/Content.Server/Chemistry/ReactionEffects/EmpReactionEffect.cs
+++ b/Content.Server/EntityEffects/Effects/EmpReactionEffect.cs
@@ -1,16 +1,17 @@
 using Content.Server.Emp;
+using Content.Shared.EntityEffects;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Server.GameObjects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReactionEffects;
+namespace Content.Server.EntityEffects.Effects;
 
 
 [DataDefinition]
-public sealed partial class EmpReactionEffect : ReagentEffect
+public sealed partial class EmpReactionEffect : EntityEffect
 {
     /// <summary>
-    ///     Impulse range per unit of reagent
+    ///     Impulse range per unit of quantity
     /// </summary>
     [DataField("rangePerUnit")]
     public float EmpRangePerUnit = 0.5f;
@@ -36,14 +37,20 @@ public sealed partial class EmpReactionEffect : ReagentEffect
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
             => Loc.GetString("reagent-effect-guidebook-emp-reaction-effect", ("chance", Probability));
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var tSys = args.EntityManager.System<TransformSystem>();
-        var transform = args.EntityManager.GetComponent<TransformComponent>(args.SolutionEntity);
-        var range = MathF.Min((float) (args.Quantity*EmpRangePerUnit), EmpMaxRange);
+        var transform = args.EntityManager.GetComponent<TransformComponent>(args.TargetEntity);
+
+        var range = EmpRangePerUnit;
+
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            range = MathF.Min((float) (reagentArgs.Quantity * EmpRangePerUnit), EmpMaxRange);
+        }
 
         args.EntityManager.System<EmpSystem>()
-            .EmpPulse(tSys.GetMapCoordinates(args.SolutionEntity, xform: transform),
+            .EmpPulse(tSys.GetMapCoordinates(args.TargetEntity, xform: transform),
             range,
             EnergyConsumption,
             DisableDuration);
diff --git a/Content.Server/EntityEffects/Effects/ExplosionReactionEffect.cs b/Content.Server/EntityEffects/Effects/ExplosionReactionEffect.cs
new file mode 100644
index 00000000000..689757d0440
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/ExplosionReactionEffect.cs
@@ -0,0 +1,77 @@
+using Content.Server.Explosion.EntitySystems;
+using Content.Shared.Database;
+using Content.Shared.EntityEffects;
+using Content.Shared.Explosion;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using System.Text.Json.Serialization;
+
+namespace Content.Server.EntityEffects.Effects;
+
+[DataDefinition]
+public sealed partial class ExplosionReactionEffect : EntityEffect
+{
+    /// <summary>
+    ///     The type of explosion. Determines damage types and tile break chance scaling.
+    /// </summary>
+    [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<ExplosionPrototype>))]
+    [JsonIgnore]
+    public string ExplosionType = default!;
+
+    /// <summary>
+    ///     The max intensity the explosion can have at a given tile. Places an upper limit of damage and tile break
+    ///     chance.
+    /// </summary>
+    [DataField]
+    [JsonIgnore]
+    public float MaxIntensity = 5;
+
+    /// <summary>
+    ///     How quickly intensity drops off as you move away from the epicenter
+    /// </summary>
+    [DataField]
+    [JsonIgnore]
+    public float IntensitySlope = 1;
+
+    /// <summary>
+    ///     The maximum total intensity that this chemical reaction can achieve. Basically here to prevent people
+    ///     from creating a nuke by collecting enough potassium and water.
+    /// </summary>
+    /// <remarks>
+    ///     A slope of 1 and MaxTotalIntensity of 100 corresponds to a radius of around 4.5 tiles.
+    /// </remarks>
+    [DataField]
+    [JsonIgnore]
+    public float MaxTotalIntensity = 100;
+
+    /// <summary>
+    ///     The intensity of the explosion per unit reaction.
+    /// </summary>
+    [DataField]
+    [JsonIgnore]
+    public float IntensityPerUnit = 1;
+
+    public override bool ShouldLog => true;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-explosion-reaction-effect", ("chance", Probability));
+    public override LogImpact LogImpact => LogImpact.High;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var intensity = IntensityPerUnit;
+
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            intensity = MathF.Min((float) reagentArgs.Quantity * IntensityPerUnit, MaxTotalIntensity);
+        }
+
+        args.EntityManager.System<ExplosionSystem>()
+            .QueueExplosion(
+            args.TargetEntity,
+            ExplosionType,
+            intensity,
+            IntensitySlope,
+            MaxIntensity);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/ExtinguishReaction.cs b/Content.Server/EntityEffects/Effects/ExtinguishReaction.cs
new file mode 100644
index 00000000000..6d7e7c2fcd8
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/ExtinguishReaction.cs
@@ -0,0 +1,36 @@
+using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects
+{
+    [UsedImplicitly]
+    public sealed partial class ExtinguishReaction : EntityEffect
+    {
+        /// <summary>
+        ///     Amount of firestacks reduced.
+        /// </summary>
+        [DataField]
+        public float FireStacksAdjustment = -1.5f;
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+            => Loc.GetString("reagent-effect-guidebook-extinguish-reaction", ("chance", Probability));
+
+        public override void Effect(EntityEffectBaseArgs args)
+        {
+            if (!args.EntityManager.TryGetComponent(args.TargetEntity, out FlammableComponent? flammable)) return;
+
+            var flammableSystem = args.EntityManager.System<FlammableSystem>();
+            flammableSystem.Extinguish(args.TargetEntity, flammable);
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                flammableSystem.AdjustFireStacks(reagentArgs.TargetEntity, FireStacksAdjustment * (float) reagentArgs.Quantity, flammable);
+            } else
+            {
+                flammableSystem.AdjustFireStacks(args.TargetEntity, FireStacksAdjustment, flammable);
+            }
+        }
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/FlammableReaction.cs b/Content.Server/EntityEffects/Effects/FlammableReaction.cs
new file mode 100644
index 00000000000..edd499ab4a5
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/FlammableReaction.cs
@@ -0,0 +1,45 @@
+using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Database;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects
+{
+    [UsedImplicitly]
+    public sealed partial class FlammableReaction : EntityEffect
+    {
+        [DataField]
+        public float Multiplier = 0.05f;
+
+        [DataField]
+        public float MultiplierOnExisting = 1f;
+
+        public override bool ShouldLog => true;
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+            => Loc.GetString("reagent-effect-guidebook-flammable-reaction", ("chance", Probability));
+
+        public override LogImpact LogImpact => LogImpact.Medium;
+
+        public override void Effect(EntityEffectBaseArgs args)
+        {
+            if (!args.EntityManager.TryGetComponent(args.TargetEntity, out FlammableComponent? flammable))
+                return;
+
+            var multiplier = flammable.FireStacks == 0f ? Multiplier : MultiplierOnExisting;
+            var quantity = 1f;
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                quantity = reagentArgs.Quantity.Float();
+                reagentArgs.EntityManager.System<FlammableSystem>().AdjustFireStacks(args.TargetEntity, quantity * multiplier, flammable);
+                if (reagentArgs.Reagent != null)
+                    reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, reagentArgs.Quantity);
+            } else
+            {
+                args.EntityManager.System<FlammableSystem>().AdjustFireStacks(args.TargetEntity, multiplier, flammable);
+            }
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/HealthChange.cs b/Content.Server/EntityEffects/Effects/HealthChange.cs
similarity index 85%
rename from Content.Server/Chemistry/ReagentEffects/HealthChange.cs
rename to Content.Server/EntityEffects/Effects/HealthChange.cs
index 53933072b6d..7c359b1c59e 100644
--- a/Content.Server/Chemistry/ReagentEffects/HealthChange.cs
+++ b/Content.Server/EntityEffects/Effects/HealthChange.cs
@@ -1,6 +1,6 @@
-using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
+using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Content.Shared.Localizations;
 using Content.Shared.Targeting; // Shitmed
@@ -9,16 +9,16 @@
 using System.Linq;
 using System.Text.Json.Serialization;
 
-namespace Content.Server.Chemistry.ReagentEffects
+namespace Content.Server.EntityEffects.Effects
 {
     /// <summary>
-    /// Default metabolism for medicine reagents.
+    /// Default metabolism used for medicine reagents.
     /// </summary>
     [UsedImplicitly]
-    public sealed partial class HealthChange : ReagentEffect
+    public sealed partial class HealthChange : EntityEffect
     {
         /// <summary>
-        /// Damage to apply every metabolism cycle. Damage Ignores resistances.
+        /// Damage to apply every cycle. Damage Ignores resistances.
         /// </summary>
         [DataField(required: true)]
         [JsonPropertyName("damage")]
@@ -27,6 +27,7 @@ public sealed partial class HealthChange : ReagentEffect
         /// <summary>
         ///     Should this effect scale the damage by the amount of chemical in the solution?
         ///     Useful for touch reactions, like styptic powder or acid.
+        ///     Only usable if the EntityEffectBaseArgs is an EntityEffectReagentArgs.
         /// </summary>
         [DataField]
         [JsonPropertyName("scaleByQuantity")]
@@ -111,13 +112,17 @@ protected override string ReagentEffectGuidebookText(IPrototypeManager prototype
                 ("healsordeals", healsordeals));
         }
 
-        public override void Effect(ReagentEffectArgs args)
+        public override void Effect(EntityEffectBaseArgs args)
         {
-            var scale = ScaleByQuantity ? args.Quantity : FixedPoint2.New(1);
-            scale *= args.Scale;
+            var scale = FixedPoint2.New(1);
+
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                scale = ScaleByQuantity ? reagentArgs.Quantity * reagentArgs.Scale : reagentArgs.Scale;
+            }
 
             args.EntityManager.System<DamageableSystem>().TryChangeDamage(
-                args.SolutionEntity,
+                args.TargetEntity,
                 Damage * scale,
                 IgnoreResistances,
                 interruptsDoAfters: false,
diff --git a/Content.Server/EntityEffects/Effects/Ignite.cs b/Content.Server/EntityEffects/Effects/Ignite.cs
new file mode 100644
index 00000000000..cca2a301fdf
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Ignite.cs
@@ -0,0 +1,31 @@
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Database;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects;
+
+/// <summary>
+///     Ignites a mob.
+/// </summary>
+public sealed partial class Ignite : EntityEffect
+{
+    public override bool ShouldLog => true;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-ignite", ("chance", Probability));
+
+    public override LogImpact LogImpact => LogImpact.Medium;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var flamSys = args.EntityManager.System<FlammableSystem>();
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            flamSys.Ignite(reagentArgs.TargetEntity, reagentArgs.OrganEntity ?? reagentArgs.TargetEntity);
+        } else
+        {
+            flamSys.Ignite(args.TargetEntity, args.TargetEntity);
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/MakeSentient.cs b/Content.Server/EntityEffects/Effects/MakeSentient.cs
similarity index 92%
rename from Content.Server/Chemistry/ReagentEffects/MakeSentient.cs
rename to Content.Server/EntityEffects/Effects/MakeSentient.cs
index 21bfe239232..65da9e72219 100644
--- a/Content.Server/Chemistry/ReagentEffects/MakeSentient.cs
+++ b/Content.Server/EntityEffects/Effects/MakeSentient.cs
@@ -2,7 +2,7 @@
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.Language;
 using Content.Server.Speech.Components;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Content.Shared.Language;
 using Content.Shared.Language.Systems;
 using Content.Shared.Mind.Components;
@@ -11,17 +11,17 @@
 using Content.Shared.Language.Components; //Delta-V - Banning humanoids from becoming ghost roles.
 using Content.Shared.Language.Events;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class MakeSentient : ReagentEffect
+public sealed partial class MakeSentient : EntityEffect
 {
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
         => Loc.GetString("reagent-effect-guidebook-make-sentient", ("chance", Probability));
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var entityManager = args.EntityManager;
-        var uid = args.SolutionEntity;
+        var uid = args.TargetEntity;
 
         // Let affected entities speak normally to make this effect different from, say, the "random sentience" event
         // This also works on entities that already have a mind
diff --git a/Content.Server/EntityEffects/Effects/ModifyBleedAmount.cs b/Content.Server/EntityEffects/Effects/ModifyBleedAmount.cs
new file mode 100644
index 00000000000..58bc304f5ea
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/ModifyBleedAmount.cs
@@ -0,0 +1,35 @@
+using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects;
+
+public sealed partial class ModifyBleedAmount : EntityEffect
+{
+    [DataField]
+    public bool Scaled = false;
+
+    [DataField]
+    public float Amount = -1.0f;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-modify-bleed-amount", ("chance", Probability),
+            ("deltasign", MathF.Sign(Amount)));
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args.EntityManager.TryGetComponent<BloodstreamComponent>(args.TargetEntity, out var blood))
+        {
+            var sys = args.EntityManager.System<BloodstreamSystem>();
+            var amt = Amount;
+            if (args is EntityEffectReagentArgs reagentArgs) {
+                if (Scaled)
+                    amt *= reagentArgs.Quantity.Float();
+                amt *= reagentArgs.Scale.Float();
+            }
+
+            sys.TryModifyBleedAmount(args.TargetEntity, amt, blood);
+        }
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/ModifyBloodLevel.cs b/Content.Server/EntityEffects/Effects/ModifyBloodLevel.cs
new file mode 100644
index 00000000000..d8aca7d2842
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/ModifyBloodLevel.cs
@@ -0,0 +1,37 @@
+using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
+using Content.Shared.EntityEffects;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects;
+
+public sealed partial class ModifyBloodLevel : EntityEffect
+{
+    [DataField]
+    public bool Scaled = false;
+
+    [DataField]
+    public FixedPoint2 Amount = 1.0f;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-modify-blood-level", ("chance", Probability),
+            ("deltasign", MathF.Sign(Amount.Float())));
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args.EntityManager.TryGetComponent<BloodstreamComponent>(args.TargetEntity, out var blood))
+        {
+            var sys = args.EntityManager.System<BloodstreamSystem>();
+            var amt = Amount;
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                if (Scaled)
+                    amt *= reagentArgs.Quantity;
+                amt *= reagentArgs.Scale;
+            }
+
+            sys.TryModifyBloodLevel(args.TargetEntity, amt, blood);
+        }
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/ModifyLungGas.cs b/Content.Server/EntityEffects/Effects/ModifyLungGas.cs
new file mode 100644
index 00000000000..b4f35e3d56b
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/ModifyLungGas.cs
@@ -0,0 +1,49 @@
+using Content.Server.Body.Components;
+using Content.Shared.Atmos;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+using Content.Shared.EntityEffects;
+
+namespace Content.Server.EntityEffects.Effects;
+
+public sealed partial class ModifyLungGas : EntityEffect
+{
+    [DataField("ratios", required: true)]
+    private Dictionary<Gas, float> _ratios = default!;
+
+    // JUSTIFICATION: This is internal magic that players never directly interact with.
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => null;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+
+        LungComponent? lung;
+        float amount = 1f;
+
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            if (!args.EntityManager.TryGetComponent<LungComponent>(reagentArgs.OrganEntity, out var organLung))
+                return;
+            lung = organLung;
+            amount = reagentArgs.Quantity.Float();
+        }
+        else
+        {
+            if (!args.EntityManager.TryGetComponent<LungComponent>(args.TargetEntity, out var organLung)) //Likely needs to be modified to ensure it works correctly
+                return;
+            lung = organLung;
+        }
+
+        if (lung != null)
+        {
+            foreach (var (gas, ratio) in _ratios)
+            {
+                var quantity = ratio * amount / Atmospherics.BreathMolesToReagentMultiplier;
+                if (quantity < 0)
+                    quantity = Math.Max(quantity, -lung.Air[(int) gas]);
+                lung.Air.AdjustMoles(gas, quantity);
+            }
+        }
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/MovespeedModifier.cs b/Content.Server/EntityEffects/Effects/MovespeedModifier.cs
new file mode 100644
index 00000000000..ac1f143e9fb
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/MovespeedModifier.cs
@@ -0,0 +1,78 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.Movement.Systems;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Server.EntityEffects.Effects;
+
+/// <summary>
+/// Default metabolism for stimulants and tranqs. Attempts to find a MovementSpeedModifier on the target,
+/// adding one if not there and to change the movespeed
+/// </summary>
+public sealed partial class MovespeedModifier : EntityEffect
+{
+    /// <summary>
+    /// How much the entities' walk speed is multiplied by.
+    /// </summary>
+    [DataField]
+    public float WalkSpeedModifier { get; set; } = 1;
+
+    /// <summary>
+    /// How much the entities' run speed is multiplied by.
+    /// </summary>
+    [DataField]
+    public float SprintSpeedModifier { get; set; } = 1;
+
+    /// <summary>
+    /// How long the modifier applies (in seconds).
+    /// Is scaled by reagent amount if used with an EntityEffectReagentArgs.
+    /// </summary>
+    [DataField]
+    public float StatusLifetime = 2f;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        return Loc.GetString("reagent-effect-guidebook-movespeed-modifier",
+            ("chance", Probability),
+            ("walkspeed", WalkSpeedModifier),
+            ("time", StatusLifetime));
+    }
+
+    /// <summary>
+    /// Remove reagent at set rate, changes the movespeed modifiers and adds a MovespeedModifierMetabolismComponent if not already there.
+    /// </summary>
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var status = args.EntityManager.EnsureComponent<MovespeedModifierMetabolismComponent>(args.TargetEntity);
+
+        // Only refresh movement if we need to.
+        var modified = !status.WalkSpeedModifier.Equals(WalkSpeedModifier) ||
+                       !status.SprintSpeedModifier.Equals(SprintSpeedModifier);
+
+        status.WalkSpeedModifier = WalkSpeedModifier;
+        status.SprintSpeedModifier = SprintSpeedModifier;
+
+        // only going to scale application time
+        var statusLifetime = StatusLifetime;
+
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            statusLifetime *= reagentArgs.Scale.Float();
+        }
+
+        IncreaseTimer(status, statusLifetime);
+
+        if (modified)
+            args.EntityManager.System<MovementSpeedModifierSystem>().RefreshMovementSpeedModifiers(args.TargetEntity);
+    }
+    public void IncreaseTimer(MovespeedModifierMetabolismComponent status, float time)
+    {
+        var gameTiming = IoCManager.Resolve<IGameTiming>();
+
+        var offsetTime = Math.Max(status.ModifierTimer.TotalSeconds, gameTiming.CurTime.TotalSeconds);
+
+        status.ModifierTimer = TimeSpan.FromSeconds(offsetTime + time);
+        status.Dirty();
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Oxygenate.cs b/Content.Server/EntityEffects/Effects/Oxygenate.cs
new file mode 100644
index 00000000000..60383188c9f
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Oxygenate.cs
@@ -0,0 +1,32 @@
+using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects;
+
+public sealed partial class Oxygenate : EntityEffect
+{
+    [DataField]
+    public float Factor = 1f;
+
+    // JUSTIFICATION: This is internal magic that players never directly interact with.
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => null;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+
+        var multiplier = 1f;
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            multiplier = reagentArgs.Quantity.Float();
+        }
+
+        if (args.EntityManager.TryGetComponent<RespiratorComponent>(args.TargetEntity, out var resp))
+        {
+            var respSys = args.EntityManager.System<RespiratorSystem>();
+            respSys.UpdateSaturation(args.TargetEntity, multiplier * Factor, resp);
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/Paralyze.cs b/Content.Server/EntityEffects/Effects/Paralyze.cs
similarity index 57%
rename from Content.Server/Chemistry/ReagentEffects/Paralyze.cs
rename to Content.Server/EntityEffects/Effects/Paralyze.cs
index 077d1abf2c2..7dd2fdc1057 100644
--- a/Content.Server/Chemistry/ReagentEffects/Paralyze.cs
+++ b/Content.Server/EntityEffects/Effects/Paralyze.cs
@@ -1,10 +1,10 @@
 using Content.Server.Stunnable;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class Paralyze : ReagentEffect
+public sealed partial class Paralyze : EntityEffect
 {
     [DataField] public double ParalyzeTime = 2;
 
@@ -18,12 +18,14 @@ public sealed partial class Paralyze : ReagentEffect
             ("chance", Probability),
             ("time", ParalyzeTime));
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var paralyzeTime = ParalyzeTime;
-        paralyzeTime *= args.Scale;
 
-        EntitySystem.Get<StunSystem>().TryParalyze(args.SolutionEntity, TimeSpan.FromSeconds(paralyzeTime), Refresh);
+        if (args is EntityEffectReagentArgs reagentArgs)
+            paralyzeTime *= (double)reagentArgs.Scale;
+
+        args.EntityManager.System<StunSystem>().TryParalyze(args.TargetEntity, TimeSpan.FromSeconds(paralyzeTime), Refresh);
     }
 }
 
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs
new file mode 100644
index 00000000000..5133fe502ff
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs
@@ -0,0 +1,61 @@
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[ImplicitDataDefinitionForInheritors]
+public abstract partial class PlantAdjustAttribute : EntityEffect
+{
+    [DataField]
+    public float Amount { get; protected set; } = 1;
+
+    /// <summary>
+    /// Localisation key for the name of the adjusted attribute. Used for guidebook descriptions.
+    /// </summary>
+    [DataField]
+    public abstract string GuidebookAttributeName { get; set; }
+
+    /// <summary>
+    /// Whether the attribute in question is a good thing. Used for guidebook descriptions to determine the color of the number.
+    /// </summary>
+    [DataField]
+    public virtual bool GuidebookIsAttributePositive { get; protected set; } = true;
+
+    /// <summary>
+    ///     Checks if the plant holder can metabolize the reagent or not. Checks if it has an alive plant by default.
+    /// </summary>
+    /// <param name="plantHolder">The entity holding the plant</param>
+    /// <param name="plantHolderComponent">The plant holder component</param>
+    /// <param name="entityManager">The entity manager</param>
+    /// <param name="mustHaveAlivePlant">Whether to check if it has an alive plant or not</param>
+    /// <returns></returns>
+    public bool CanMetabolize(EntityUid plantHolder, [NotNullWhen(true)] out PlantHolderComponent? plantHolderComponent,
+        IEntityManager entityManager,
+        bool mustHaveAlivePlant = true)
+    {
+        plantHolderComponent = null;
+
+        if (!entityManager.TryGetComponent(plantHolder, out plantHolderComponent)
+                                || mustHaveAlivePlant && (plantHolderComponent.Seed == null || plantHolderComponent.Dead))
+            return false;
+
+        return true;
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        string color;
+        if (GuidebookIsAttributePositive ^ Amount < 0.0)
+        {
+            color = "green";
+        }
+        else
+        {
+            color = "red";
+        }
+        return Loc.GetString("reagent-effect-guidebook-plant-attribute", ("attribute", Loc.GetString(GuidebookAttributeName)), ("amount", Amount.ToString("0.00")), ("colorName", color), ("chance", Probability));
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs
new file mode 100644
index 00000000000..774f6ec48c6
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs
@@ -0,0 +1,21 @@
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+public sealed partial class PlantAdjustHealth : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-health";
+    
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
+            return;
+
+        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+
+        plantHolderComp.Health += Amount;
+        plantHolder.CheckHealth(args.TargetEntity, plantHolderComp);
+    }
+}
+
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs
new file mode 100644
index 00000000000..bf41a21bcb0
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs
@@ -0,0 +1,16 @@
+using Content.Shared.EntityEffects;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+public sealed partial class PlantAdjustMutationLevel : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-mutation-level";
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
+            return;
+
+        plantHolderComp.MutationLevel += Amount * plantHolderComp.MutationMod;
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs
new file mode 100644
index 00000000000..6ed793e6143
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs
@@ -0,0 +1,19 @@
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+public sealed partial class PlantAdjustMutationMod : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-mutation-mod";
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
+            return;
+
+        plantHolderComp.MutationMod += Amount;
+    }
+}
+
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs
new file mode 100644
index 00000000000..b9389afacdf
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs
@@ -0,0 +1,21 @@
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+public sealed partial class PlantAdjustNutrition : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-nutrition";
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager, mustHaveAlivePlant: false))
+            return;
+
+        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+
+        plantHolder.AdjustNutrient(args.TargetEntity, Amount, plantHolderComp);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs
new file mode 100644
index 00000000000..219529bfc4c
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs
@@ -0,0 +1,20 @@
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+public sealed partial class PlantAdjustPests : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-pests";
+    public override bool GuidebookIsAttributePositive { get; protected set; } = false;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
+            return;
+
+        plantHolderComp.PestLevel += Amount;
+    }
+}
+
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs
new file mode 100644
index 00000000000..ab1baa42850
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs
@@ -0,0 +1,20 @@
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+public sealed partial class PlantAdjustToxins : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-toxins";
+    public override bool GuidebookIsAttributePositive { get; protected set; } = false;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
+            return;
+
+        plantHolderComp.Toxins += Amount;
+    }
+}
+
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs
new file mode 100644
index 00000000000..41774977d54
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs
@@ -0,0 +1,22 @@
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+public sealed partial class PlantAdjustWater : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-water";
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager, mustHaveAlivePlant: false))
+            return;
+
+        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+
+        plantHolder.AdjustWater(args.TargetEntity, Amount, plantHolderComp);
+    }
+}
+
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs
new file mode 100644
index 00000000000..421e31998db
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs
@@ -0,0 +1,19 @@
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+public sealed partial class PlantAdjustWeeds : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-weeds";
+    public override bool GuidebookIsAttributePositive { get; protected set; } = false;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
+            return;
+
+        plantHolderComp.WeedLevel += Amount;
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs
new file mode 100644
index 00000000000..397eace399a
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs
@@ -0,0 +1,22 @@
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+public sealed partial class PlantAffectGrowth : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-growth";
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
+            return;
+
+        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+
+        plantHolder.AffectGrowth(args.TargetEntity, (int) Amount, plantHolderComp);
+    }
+}
+
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs
new file mode 100644
index 00000000000..7fe4b7a1707
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs
@@ -0,0 +1,32 @@
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+[DataDefinition]
+public sealed partial class PlantCryoxadone : EntityEffect
+{
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!args.EntityManager.TryGetComponent(args.TargetEntity, out PlantHolderComponent? plantHolderComp)
+        || plantHolderComp.Seed == null || plantHolderComp.Dead)
+            return;
+
+        var deviation = 0;
+        var seed = plantHolderComp.Seed;
+        var random = IoCManager.Resolve<IRobustRandom>();
+        if (plantHolderComp.Age > seed.Maturation)
+            deviation = (int) Math.Max(seed.Maturation - 1, plantHolderComp.Age - random.Next(7, 10));
+        else
+            deviation = (int) (seed.Maturation / seed.GrowthStages);
+        plantHolderComp.Age -= deviation;
+        plantHolderComp.SkipAging++;
+        plantHolderComp.ForceUpdate = true;
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-cryoxadone", ("chance", Probability));
+}
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs
new file mode 100644
index 00000000000..36b6a833423
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs
@@ -0,0 +1,41 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+[DataDefinition]
+public sealed partial class PlantDiethylamine : EntityEffect
+{
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!args.EntityManager.TryGetComponent(args.TargetEntity, out PlantHolderComponent? plantHolderComp)
+                                || plantHolderComp.Seed == null || plantHolderComp.Dead ||
+                                plantHolderComp.Seed.Immutable)
+            return;
+
+
+        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+
+        var random = IoCManager.Resolve<IRobustRandom>();
+
+        if (random.Prob(0.1f))
+        {
+            plantHolder.EnsureUniqueSeed(args.TargetEntity, plantHolderComp);
+            plantHolderComp.Seed.Lifespan++;
+        }
+
+        if (random.Prob(0.1f))
+        {
+            plantHolder.EnsureUniqueSeed(args.TargetEntity, plantHolderComp);
+            plantHolderComp.Seed.Endurance++;
+        }
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-diethylamine", ("chance", Probability));
+}
+
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs
new file mode 100644
index 00000000000..96d98bfbf2e
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs
@@ -0,0 +1,23 @@
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+[DataDefinition]
+public sealed partial class PlantPhalanximine : EntityEffect
+{
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!args.EntityManager.TryGetComponent(args.TargetEntity, out PlantHolderComponent? plantHolderComp)
+                                || plantHolderComp.Seed == null || plantHolderComp.Dead ||
+                                plantHolderComp.Seed.Immutable)
+            return;
+
+        plantHolderComp.Seed.Viable = true;
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-phalanximine", ("chance", Probability));
+}
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs
new file mode 100644
index 00000000000..695cb96675c
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs
@@ -0,0 +1,53 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+[DataDefinition]
+public sealed partial class RobustHarvest : EntityEffect
+{
+    [DataField]
+    public int PotencyLimit = 50;
+
+    [DataField]
+    public int PotencyIncrease = 3;
+
+    [DataField]
+    public int PotencySeedlessThreshold = 30;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!args.EntityManager.TryGetComponent(args.TargetEntity, out PlantHolderComponent? plantHolderComp)
+                                || plantHolderComp.Seed == null || plantHolderComp.Dead ||
+                                plantHolderComp.Seed.Immutable)
+            return;
+
+
+        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+        var random = IoCManager.Resolve<IRobustRandom>();
+
+        if (plantHolderComp.Seed.Potency < PotencyLimit)
+        {
+            plantHolder.EnsureUniqueSeed(args.TargetEntity, plantHolderComp);
+            plantHolderComp.Seed.Potency = Math.Min(plantHolderComp.Seed.Potency + PotencyIncrease, PotencyLimit);
+
+            if (plantHolderComp.Seed.Potency > PotencySeedlessThreshold)
+            {
+                plantHolderComp.Seed.Seedless = true;
+            }
+        }
+        else if (plantHolderComp.Seed.Yield > 1 && random.Prob(0.1f))
+        {
+            // Too much of a good thing reduces yield
+            plantHolder.EnsureUniqueSeed(args.TargetEntity, plantHolderComp);
+            plantHolderComp.Seed.Yield--;
+        }
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-robust-harvest", ("seedlesstreshold", PotencySeedlessThreshold), ("limit", PotencyLimit), ("increase", PotencyIncrease), ("chance", Probability));
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/Polymorph.cs b/Content.Server/EntityEffects/Effects/Polymorph.cs
similarity index 80%
rename from Content.Server/Chemistry/ReagentEffects/Polymorph.cs
rename to Content.Server/EntityEffects/Effects/Polymorph.cs
index fea372125ee..00a5c6613d0 100644
--- a/Content.Server/Chemistry/ReagentEffects/Polymorph.cs
+++ b/Content.Server/EntityEffects/Effects/Polymorph.cs
@@ -1,13 +1,14 @@
 using Content.Server.Polymorph.Components;
 using Content.Server.Polymorph.Systems;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Content.Shared.Polymorph;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Content.Shared.EntityEffects;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class Polymorph : ReagentEffect
+public sealed partial class Polymorph : EntityEffect
 {
     /// <summary>
     ///     What polymorph prototype is used on effect
@@ -20,10 +21,10 @@ public sealed partial class Polymorph : ReagentEffect
             ("chance", Probability), ("entityname",
                 prototype.Index<EntityPrototype>(prototype.Index<PolymorphPrototype>(PolymorphPrototype).Configuration.Entity).Name));
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var entityManager = args.EntityManager;
-        var uid = args.SolutionEntity;
+        var uid = args.TargetEntity;
         var polySystem = entityManager.System<PolymorphSystem>();
 
         // Make it into a prototype
diff --git a/Content.Server/Chemistry/ReagentEffects/PopupMessage.cs b/Content.Server/EntityEffects/Effects/PopupMessage.cs
similarity index 60%
rename from Content.Server/Chemistry/ReagentEffects/PopupMessage.cs
rename to Content.Server/EntityEffects/Effects/PopupMessage.cs
index 8278e95c1da..ac22b13051b 100644
--- a/Content.Server/Chemistry/ReagentEffects/PopupMessage.cs
+++ b/Content.Server/EntityEffects/Effects/PopupMessage.cs
@@ -1,12 +1,11 @@
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Content.Shared.Popups;
-using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
-namespace Content.Server.Chemistry.ReagentEffects
+namespace Content.Server.EntityEffects.Effects
 {
-    public sealed partial class PopupMessage : ReagentEffect
+    public sealed partial class PopupMessage : EntityEffect
     {
         [DataField(required: true)]
         public string[] Messages = default!;
@@ -21,20 +20,30 @@ public sealed partial class PopupMessage : ReagentEffect
         protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
             => null;
 
-        public override void Effect(ReagentEffectArgs args)
+        public override void Effect(EntityEffectBaseArgs args)
         {
             var popupSys = args.EntityManager.EntitySysManager.GetEntitySystem<SharedPopupSystem>();
             var random = IoCManager.Resolve<IRobustRandom>();
 
             var msg = random.Pick(Messages);
-            var msgArgs = new (string, object)[] {
-                ("entity", args.SolutionEntity),
-                ("organ", args.OrganEntity.GetValueOrDefault()),
+            var msgArgs = new (string, object)[]
+            {
+                ("entity", args.TargetEntity),
             };
+
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                msgArgs = new (string, object)[]
+                {
+                    ("entity", reagentArgs.TargetEntity),
+                    ("organ", reagentArgs.OrganEntity.GetValueOrDefault()),
+                };
+            }
+
             if (Type == PopupRecipients.Local)
-                popupSys.PopupEntity(Loc.GetString(msg, msgArgs), args.SolutionEntity, args.SolutionEntity, VisualType);
+                popupSys.PopupEntity(Loc.GetString(msg, msgArgs), args.TargetEntity, args.TargetEntity, VisualType);
             else if (Type == PopupRecipients.Pvs)
-                popupSys.PopupEntity(Loc.GetString(msg, msgArgs), args.SolutionEntity, VisualType);
+                popupSys.PopupEntity(Loc.GetString(msg, msgArgs), args.TargetEntity, VisualType);
         }
     }
 
diff --git a/Content.Server/Chemistry/ReagentEffects/PurifyEvil.cs b/Content.Server/EntityEffects/Effects/PurifyEvil.cs
similarity index 100%
rename from Content.Server/Chemistry/ReagentEffects/PurifyEvil.cs
rename to Content.Server/EntityEffects/Effects/PurifyEvil.cs
diff --git a/Content.Server/Chemistry/ReagentEffects/ReduceRotting.cs b/Content.Server/EntityEffects/Effects/ReduceRotting.cs
similarity index 61%
rename from Content.Server/Chemistry/ReagentEffects/ReduceRotting.cs
rename to Content.Server/EntityEffects/Effects/ReduceRotting.cs
index cea4f853321..5c00492744d 100644
--- a/Content.Server/Chemistry/ReagentEffects/ReduceRotting.cs
+++ b/Content.Server/EntityEffects/Effects/ReduceRotting.cs
@@ -1,15 +1,16 @@
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Content.Server.Atmos.Rotting;
 
-namespace Content.Server.Chemistry.ReagentEffects
+namespace Content.Server.EntityEffects.Effects
 {
     /// <summary>
     /// Reduces the rotting accumulator on the patient, making them revivable.
     /// </summary>
     [UsedImplicitly]
-    public sealed partial class ReduceRotting : ReagentEffect
+    public sealed partial class ReduceRotting : EntityEffect
     {
         [DataField("seconds")]
         public double RottingAmount = 10;
@@ -18,14 +19,17 @@ public sealed partial class ReduceRotting : ReagentEffect
             => Loc.GetString("reagent-effect-guidebook-reduce-rotting",
                 ("chance", Probability),
                 ("time", RottingAmount));
-        public override void Effect(ReagentEffectArgs args)
+        public override void Effect(EntityEffectBaseArgs args)
         {
-            if (args.Scale != 1f)
-                return;
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                if (reagentArgs.Scale != 1f)
+                    return;
+            }
 
             var rottingSys = args.EntityManager.EntitySysManager.GetEntitySystem<RottingSystem>();
 
-            rottingSys.ReduceAccumulator(args.SolutionEntity, TimeSpan.FromSeconds(RottingAmount));
+            rottingSys.ReduceAccumulator(args.TargetEntity, TimeSpan.FromSeconds(RottingAmount));
         }
     }
 }
diff --git a/Content.Server/Chemistry/ReagentEffects/ResetNarcolepsy.cs b/Content.Server/EntityEffects/Effects/ResetNarcolepsy.cs
similarity index 63%
rename from Content.Server/Chemistry/ReagentEffects/ResetNarcolepsy.cs
rename to Content.Server/EntityEffects/Effects/ResetNarcolepsy.cs
index 2893505fc85..40a9c982515 100644
--- a/Content.Server/Chemistry/ReagentEffects/ResetNarcolepsy.cs
+++ b/Content.Server/EntityEffects/Effects/ResetNarcolepsy.cs
@@ -1,15 +1,16 @@
 using Content.Server.Traits.Assorted;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
 /// <summary>
 /// Reset narcolepsy timer
 /// </summary>
 [UsedImplicitly]
-public sealed partial class ResetNarcolepsy : ReagentEffect
+public sealed partial class ResetNarcolepsy : EntityEffect
 {
     /// <summary>
     /// The # of seconds the effect resets the narcolepsy timer to
@@ -20,11 +21,12 @@ public sealed partial class ResetNarcolepsy : ReagentEffect
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
         => Loc.GetString("reagent-effect-guidebook-reset-narcolepsy", ("chance", Probability));
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
-        if (args.Scale != 1f)
-            return;
+        if (args is EntityEffectReagentArgs reagentArgs)
+            if (reagentArgs.Scale != 1f)
+                return;
 
-        args.EntityManager.EntitySysManager.GetEntitySystem<NarcolepsySystem>().AdjustNarcolepsyTimer(args.SolutionEntity, TimerReset);
+        args.EntityManager.EntitySysManager.GetEntitySystem<NarcolepsySystem>().AdjustNarcolepsyTimer(args.TargetEntity, TimerReset);
     }
 }
diff --git a/Content.Server/Chemistry/ReagentEffects/SatiateHunger.cs b/Content.Server/EntityEffects/Effects/SatiateHunger.cs
similarity index 53%
rename from Content.Server/Chemistry/ReagentEffects/SatiateHunger.cs
rename to Content.Server/EntityEffects/Effects/SatiateHunger.cs
index be772022556..dd58654dffc 100644
--- a/Content.Server/Chemistry/ReagentEffects/SatiateHunger.cs
+++ b/Content.Server/EntityEffects/Effects/SatiateHunger.cs
@@ -1,31 +1,40 @@
-using Content.Server.Nutrition.Components;
+using Content.Server.Nutrition.Components;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects
+namespace Content.Server.EntityEffects.Effects
 {
     /// <summary>
     /// Attempts to find a HungerComponent on the target,
     /// and to update it's hunger values.
     /// </summary>
-    public sealed partial class SatiateHunger : ReagentEffect
+    public sealed partial class SatiateHunger : EntityEffect
     {
         private const float DefaultNutritionFactor = 3.0f;
 
         /// <summary>
-        ///     How much hunger is satiated when 1u of the reagent is metabolized
+        ///     How much hunger is satiated.
+        ///     Is multiplied by quantity if used with EntityEffectReagentArgs.
         /// </summary>
         [DataField("factor")] public float NutritionFactor { get; set; } = DefaultNutritionFactor;
 
         //Remove reagent at set rate, satiate hunger if a HungerComponent can be found
-        public override void Effect(ReagentEffectArgs args)
+        public override void Effect(EntityEffectBaseArgs args)
         {
             var entman = args.EntityManager;
-            if (!entman.TryGetComponent(args.SolutionEntity, out HungerComponent? hunger))
+            if (!entman.TryGetComponent(args.TargetEntity, out HungerComponent? hunger))
                 return;
-            entman.System<HungerSystem>().ModifyHunger(args.SolutionEntity, NutritionFactor * (float) args.Quantity, hunger);
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                entman.System<HungerSystem>().ModifyHunger(reagentArgs.TargetEntity, NutritionFactor * (float) reagentArgs.Quantity, hunger);
+            }
+            else
+            {
+                entman.System<HungerSystem>().ModifyHunger(args.TargetEntity, NutritionFactor, hunger);
+            }
         }
 
         protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
diff --git a/Content.Server/EntityEffects/Effects/SatiateThirst.cs b/Content.Server/EntityEffects/Effects/SatiateThirst.cs
new file mode 100644
index 00000000000..d0dbe4371b9
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/SatiateThirst.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects;
+
+/// <summary>
+/// Default metabolism for drink reagents. Attempts to find a ThirstComponent on the target,
+/// and to update it's thirst values.
+/// </summary>
+public sealed partial class SatiateThirst : EntityEffect
+{
+    private const float DefaultHydrationFactor = 3.0f;
+
+    /// How much thirst is satiated each tick. Not currently tied to
+    /// rate or anything.
+    [DataField("factor")]
+    public float HydrationFactor { get; set; } = DefaultHydrationFactor;
+
+    /// Satiate thirst if a ThirstComponent can be found
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var uid = args.TargetEntity;
+        if (args.EntityManager.TryGetComponent(uid, out ThirstComponent? thirst))
+            args.EntityManager.System<ThirstSystem>().ModifyThirst(uid, thirst, HydrationFactor);
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-satiate-thirst", ("chance", Probability), ("relative",  HydrationFactor / DefaultHydrationFactor));
+}
diff --git a/Content.Server/EntityEffects/Effects/SolutionTemperatureEffects.cs b/Content.Server/EntityEffects/Effects/SolutionTemperatureEffects.cs
new file mode 100644
index 00000000000..85c20dbcd11
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/SolutionTemperatureEffects.cs
@@ -0,0 +1,144 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects;
+
+/// <summary>
+///     Sets the temperature of the solution involved with the reaction to a new value.
+/// </summary>
+[DataDefinition]
+public sealed partial class SetSolutionTemperatureEffect : EntityEffect
+{
+    /// <summary>
+    ///     The temperature to set the solution to.
+    /// </summary>
+    [DataField("temperature", required: true)] private float _temperature;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-set-solution-temperature-effect",
+            ("chance", Probability), ("temperature", _temperature));
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            var solution = reagentArgs.Source;
+            if (solution == null)
+                return;
+
+            solution.Temperature = _temperature;
+
+            return;
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+}
+
+/// <summary>
+///     Adjusts the temperature of the solution involved in the reaction.
+/// </summary>
+[DataDefinition]
+public sealed partial class AdjustSolutionTemperatureEffect : EntityEffect
+{
+    /// <summary>
+    ///     The change in temperature.
+    /// </summary>
+    [DataField("delta", required: true)] private float _delta;
+
+    /// <summary>
+    ///     The minimum temperature this effect can reach.
+    /// </summary>
+    [DataField("minTemp")] private float _minTemp = 0.0f;
+
+    /// <summary>
+    ///     The maximum temperature this effect can reach.
+    /// </summary>
+    [DataField("maxTemp")] private float _maxTemp = float.PositiveInfinity;
+
+    /// <summary>
+    ///     If true, then scale ranges by intensity. If not, the ranges are the same regardless of reactant amount.
+    /// </summary>
+    [DataField("scaled")] private bool _scaled;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-adjust-solution-temperature-effect",
+            ("chance", Probability), ("deltasign", MathF.Sign(_delta)), ("mintemp", _minTemp), ("maxtemp", _maxTemp));
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            var solution = reagentArgs.Source;
+            if (solution == null || solution.Volume == 0)
+                return;
+
+            var deltaT = _scaled ? _delta * (float) reagentArgs.Quantity : _delta;
+            solution.Temperature = Math.Clamp(solution.Temperature + deltaT, _minTemp, _maxTemp);
+
+            return;
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+}
+
+/// <summary>
+///     Adjusts the thermal energy of the solution involved in the reaction.
+/// </summary>
+public sealed partial class AdjustSolutionThermalEnergyEffect : EntityEffect
+{
+    /// <summary>
+    ///     The change in energy.
+    /// </summary>
+    [DataField("delta", required: true)] private float _delta;
+
+    /// <summary>
+    ///     The minimum temperature this effect can reach.
+    /// </summary>
+    [DataField("minTemp")] private float _minTemp = 0.0f;
+
+    /// <summary>
+    ///     The maximum temperature this effect can reach.
+    /// </summary>
+    [DataField("maxTemp")] private float _maxTemp = float.PositiveInfinity;
+
+    /// <summary>
+    ///     If true, then scale ranges by intensity. If not, the ranges are the same regardless of reactant amount.
+    /// </summary>
+    [DataField("scaled")] private bool _scaled;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            var solution = reagentArgs.Source;
+            if (solution == null || solution.Volume == 0)
+                return;
+
+            if (_delta > 0 && solution.Temperature >= _maxTemp)
+                return;
+            if (_delta < 0 && solution.Temperature <= _minTemp)
+                return;
+
+            var heatCap = solution.GetHeatCapacity(null);
+            var deltaT = _scaled
+                ? _delta / heatCap * (float) reagentArgs.Quantity
+                : _delta / heatCap;
+
+            solution.Temperature = Math.Clamp(solution.Temperature + deltaT, _minTemp, _maxTemp);
+
+            return;
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-adjust-solution-temperature-effect",
+            ("chance", Probability), ("deltasign", MathF.Sign(_delta)), ("mintemp", _minTemp), ("maxtemp", _maxTemp));
+}
diff --git a/Content.Server/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs b/Content.Server/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs
new file mode 100644
index 00000000000..bb9bbf34469
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs
@@ -0,0 +1,77 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
+using Content.Shared.StatusEffect;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects.StatusEffects;
+
+/// <summary>
+///     Adds a generic status effect to the entity,
+///     not worrying about things like how to affect the time it lasts for
+///     or component fields or anything. Just adds a component to an entity
+///     for a given time. Easy.
+/// </summary>
+/// <remarks>
+///     Can be used for things like adding accents or something. I don't know. Go wild.
+/// </remarks>
+[UsedImplicitly]
+public sealed partial class GenericStatusEffect : EntityEffect
+{
+    [DataField(required: true)]
+    public string Key = default!;
+
+    [DataField]
+    public string Component = String.Empty;
+
+    [DataField]
+    public float Time = 2.0f;
+
+    /// <remarks>
+    ///     true - refresh status effect time,  false - accumulate status effect time
+    /// </remarks>
+    [DataField]
+    public bool Refresh = true;
+
+    /// <summary>
+    ///     Should this effect add the status effect, remove time from it, or set its cooldown?
+    /// </summary>
+    [DataField]
+    public StatusEffectMetabolismType Type = StatusEffectMetabolismType.Add;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var statusSys = args.EntityManager.EntitySysManager.GetEntitySystem<StatusEffectsSystem>();
+
+        var time = Time;
+        if (args is EntityEffectReagentArgs reagentArgs)
+            time *= reagentArgs.Scale.Float();
+
+        if (Type == StatusEffectMetabolismType.Add && Component != String.Empty)
+        {
+            statusSys.TryAddStatusEffect(args.TargetEntity, Key, TimeSpan.FromSeconds(time), Refresh, Component);
+        }
+        else if (Type == StatusEffectMetabolismType.Remove)
+        {
+            statusSys.TryRemoveTime(args.TargetEntity, Key, TimeSpan.FromSeconds(time));
+        }
+        else if (Type == StatusEffectMetabolismType.Set)
+        {
+            statusSys.TrySetTime(args.TargetEntity, Key, TimeSpan.FromSeconds(time));
+        }
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString(
+        "reagent-effect-guidebook-status-effect",
+        ("chance", Probability),
+        ("type", Type),
+        ("time", Time),
+        ("key", $"reagent-effect-status-effect-{Key}"));
+}
+
+public enum StatusEffectMetabolismType
+{
+    Add,
+    Remove,
+    Set
+}
diff --git a/Content.Server/EntityEffects/Effects/StatusEffects/Jitter.cs b/Content.Server/EntityEffects/Effects/StatusEffects/Jitter.cs
new file mode 100644
index 00000000000..dbca4fad588
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/StatusEffects/Jitter.cs
@@ -0,0 +1,42 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
+using Content.Shared.Jittering;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects.StatusEffects;
+
+/// <summary>
+///     Adds the jitter status effect to a mob.
+///     This doesn't use generic status effects because it needs to
+///     take in some parameters that JitterSystem needs.
+/// </summary>
+public sealed partial class Jitter : EntityEffect
+{
+    [DataField]
+    public float Amplitude = 10.0f;
+
+    [DataField]
+    public float Frequency = 4.0f;
+
+    [DataField]
+    public float Time = 2.0f;
+
+    /// <remarks>
+    ///     true - refresh jitter time,  false - accumulate jitter time
+    /// </remarks>
+    [DataField]
+    public bool Refresh = true;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var time = Time;
+        if (args is EntityEffectReagentArgs reagentArgs)
+            time *= reagentArgs.Scale.Float();
+
+        args.EntityManager.EntitySysManager.GetEntitySystem<SharedJitteringSystem>()
+            .DoJitter(args.TargetEntity, TimeSpan.FromSeconds(time), Refresh, Amplitude, Frequency);
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("reagent-effect-guidebook-jittering", ("chance", Probability));
+}
diff --git a/Content.Server/EntityEffects/Effects/WashCreamPieReaction.cs b/Content.Server/EntityEffects/Effects/WashCreamPieReaction.cs
new file mode 100644
index 00000000000..67bfac6335d
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/WashCreamPieReaction.cs
@@ -0,0 +1,22 @@
+using Content.Server.Nutrition.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
+using Content.Shared.Nutrition.Components;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects;
+
+[UsedImplicitly]
+public sealed partial class WashCreamPieReaction : EntityEffect
+{
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-wash-cream-pie-reaction", ("chance", Probability));
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!args.EntityManager.TryGetComponent(args.TargetEntity, out CreamPiedComponent? creamPied)) return;
+
+        args.EntityManager.System<CreamPieSystem>().SetCreamPied(args.TargetEntity, creamPied, false);
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/WearableReaction.cs b/Content.Server/EntityEffects/Effects/WearableReaction.cs
similarity index 50%
rename from Content.Server/Chemistry/ReagentEffects/WearableReaction.cs
rename to Content.Server/EntityEffects/Effects/WearableReaction.cs
index d9f8414995d..9655bbc073f 100644
--- a/Content.Server/Chemistry/ReagentEffects/WearableReaction.cs
+++ b/Content.Server/EntityEffects/Effects/WearableReaction.cs
@@ -1,17 +1,19 @@
 using Content.Shared.Inventory;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects.Effects;
 
 /// <summary>
-/// A reaction effect that consumes the required amount of reagent and spawns PrototypeID in the
-/// entity's Slot. Used to implement the water droplet effect for arachnids.
+/// A reaction effect that spawns a PrototypeID in the entity's Slot, and attempts to consume the reagent if EntityEffectReagentArgs.
+/// Used to implement the water droplet effect for arachnids.
 /// </summary>
-public sealed partial class WearableReaction : ReagentEffect
+public sealed partial class WearableReaction : EntityEffect
 {
     /// <summary>
     /// Minimum quantity of reagent required to trigger this effect.
+    /// Only used with EntityEffectReagentArgs.
     /// </summary>
     [DataField]
     public float AmountThreshold = 1f;
@@ -30,13 +32,17 @@ public sealed partial class WearableReaction : ReagentEffect
 
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => null;
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
-        if (args.Reagent == null || args.Quantity < AmountThreshold)
-            return;
-
         // SpawnItemInSlot returns false if slot is already occupied
-        if (args.EntityManager.System<InventorySystem>().SpawnItemInSlot(args.SolutionEntity, Slot, PrototypeID))
-            args.Source?.RemoveReagent(args.Reagent.ID, AmountThreshold);
+        if (args.EntityManager.System<InventorySystem>().SpawnItemInSlot(args.TargetEntity, Slot, PrototypeID))
+        {
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                if (reagentArgs.Reagent == null || reagentArgs.Quantity < AmountThreshold)
+                    return;
+                reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, AmountThreshold);
+            }
+        }
     }
 }
diff --git a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
index ae170842a0c..62d04db492f 100644
--- a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
@@ -2,7 +2,7 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Chemistry.ReactionEffects;
+using Content.Server.EntityEffects.Effects;
 using Content.Server.Spreader;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
diff --git a/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs b/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs
index 7e107ce1a5a..8fd088408c0 100644
--- a/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs
+++ b/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs
@@ -5,6 +5,7 @@
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
+using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Prototypes;
 
@@ -40,8 +41,8 @@ public static void PublishJson(StreamWriter file)
             WriteIndented = true,
             Converters =
             {
-                new UniversalJsonConverter<ReagentEffect>(),
-                new UniversalJsonConverter<ReagentEffectCondition>(),
+                new UniversalJsonConverter<EntityEffect>(),
+                new UniversalJsonConverter<EntityEffectCondition>(),
                 new UniversalJsonConverter<ReagentEffectsEntry>(),
                 new UniversalJsonConverter<DamageSpecifier>(),
                 new FixedPointJsonConverter()
diff --git a/Content.Server/GuideGenerator/ReactionJsonGenerator.cs b/Content.Server/GuideGenerator/ReactionJsonGenerator.cs
index 123dd5f8eb3..06c230d6071 100644
--- a/Content.Server/GuideGenerator/ReactionJsonGenerator.cs
+++ b/Content.Server/GuideGenerator/ReactionJsonGenerator.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Text.Json;
 using Content.Shared.Chemistry.Reaction;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.GuideGenerator;
@@ -24,7 +24,7 @@ public static void PublishJson(StreamWriter file)
             WriteIndented = true,
             Converters =
             {
-                new UniversalJsonConverter<ReagentEffect>(),
+                new UniversalJsonConverter<EntityEffect>(),
             }
         };
 
diff --git a/Content.Server/GuideGenerator/ReagentEntry.cs b/Content.Server/GuideGenerator/ReagentEntry.cs
index ab9e7582060..8b597ad61bc 100644
--- a/Content.Server/GuideGenerator/ReagentEntry.cs
+++ b/Content.Server/GuideGenerator/ReagentEntry.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Body.Prototypes;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.GuideGenerator;
@@ -61,7 +62,7 @@ public sealed class ReactionEntry
     public Dictionary<string, float> Products { get; }
 
     [JsonPropertyName("effects")]
-    public List<ReagentEffect> Effects { get; }
+    public List<EntityEffect> Effects { get; }
 
     public ReactionEntry(ReactionPrototype proto)
     {
diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
index 6781d07956b..3b4afc2d6ad 100644
--- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
@@ -1,7 +1,7 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Chemistry.ReagentEffects;
+using Content.Server.EntityEffects.Effects;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Forensics;
 using Content.Server.Inventory;
@@ -17,6 +17,7 @@
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
+using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
diff --git a/Content.Server/Tiles/LavaComponent.cs b/Content.Server/Tiles/LavaComponent.cs
deleted file mode 100644
index 1f36e8ffb05..00000000000
--- a/Content.Server/Tiles/LavaComponent.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Robust.Shared.Audio;
-using Robust.Shared.GameStates;
-
-namespace Content.Server.Tiles;
-
-/// <summary>
-/// Applies flammable and damage while vaulting.
-/// </summary>
-[RegisterComponent, Access(typeof(LavaSystem))]
-public sealed partial class LavaComponent : Component
-{
-    /// <summary>
-    /// Sound played if something disintegrates in lava.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("soundDisintegration")]
-    public SoundSpecifier DisintegrationSound = new SoundPathSpecifier("/Audio/Effects/lightburn.ogg");
-
-    /// <summary>
-    /// How many fire stacks are applied per second.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("fireStacks")]
-    public float FireStacks = 1.25f;
-}
diff --git a/Content.Server/Tiles/LavaSystem.cs b/Content.Server/Tiles/LavaSystem.cs
deleted file mode 100644
index 51bd6f8475f..00000000000
--- a/Content.Server/Tiles/LavaSystem.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Content.Server.Atmos.Components;
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.StepTrigger.Systems;
-
-namespace Content.Server.Tiles;
-
-public sealed class LavaSystem : EntitySystem
-{
-    [Dependency] private readonly FlammableSystem _flammable = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<LavaComponent, StepTriggeredOffEvent>(OnLavaStepTriggered);
-        SubscribeLocalEvent<LavaComponent, StepTriggerAttemptEvent>(OnLavaStepTriggerAttempt);
-    }
-
-    private void OnLavaStepTriggerAttempt(EntityUid uid, LavaComponent component, ref StepTriggerAttemptEvent args)
-    {
-        if (!HasComp<FlammableComponent>(args.Tripper))
-            return;
-
-        args.Continue = true;
-    }
-
-    private void OnLavaStepTriggered(EntityUid uid, LavaComponent component, ref StepTriggeredOffEvent args)
-    {
-        var otherUid = args.Tripper;
-
-        if (TryComp<FlammableComponent>(otherUid, out var flammable))
-        {
-            // Apply the fury of a thousand suns
-            var multiplier = flammable.FireStacks == 0f ? 5f : 1f;
-            _flammable.AdjustFireStacks(otherUid, component.FireStacks * multiplier, flammable);
-            _flammable.Ignite(otherUid, uid, flammable);
-        }
-    }
-}
diff --git a/Content.Server/Tiles/TileEntityEffectComponent.cs b/Content.Server/Tiles/TileEntityEffectComponent.cs
new file mode 100644
index 00000000000..4201af47f9e
--- /dev/null
+++ b/Content.Server/Tiles/TileEntityEffectComponent.cs
@@ -0,0 +1,19 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Server.Tiles;
+
+/// <summary>
+/// Applies effects upon stepping onto a tile.
+/// </summary>
+[RegisterComponent, Access(typeof(TileEntityEffectSystem))]
+public sealed partial class TileEntityEffectComponent : Component
+{
+    /// <summary>
+    /// List of effects that should be applied.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField]
+    public List<EntityEffect> Effects = default!;
+}
diff --git a/Content.Server/Tiles/TileEntityEffectSystem.cs b/Content.Server/Tiles/TileEntityEffectSystem.cs
new file mode 100644
index 00000000000..7149f16e1ad
--- /dev/null
+++ b/Content.Server/Tiles/TileEntityEffectSystem.cs
@@ -0,0 +1,32 @@
+using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.StepTrigger.Systems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
+
+namespace Content.Server.Tiles;
+
+public sealed class TileEntityEffectSystem : EntitySystem
+{
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<TileEntityEffectComponent, StepTriggeredOffEvent>(OnTileStepTriggered);
+        SubscribeLocalEvent<TileEntityEffectComponent, StepTriggerAttemptEvent>(OnTileStepTriggerAttempt);
+    }
+    private void OnTileStepTriggerAttempt(Entity<TileEntityEffectComponent> ent, ref StepTriggerAttemptEvent args)
+    {
+        args.Continue = true;
+    }
+
+    private void OnTileStepTriggered(Entity<TileEntityEffectComponent> ent, ref StepTriggeredOffEvent args)
+    {
+        var otherUid = args.Tripper;
+
+        foreach (var effect in ent.Comp.Effects)
+        {
+            effect.Effect(new EntityEffectBaseArgs(otherUid, EntityManager));
+        }
+    }
+}
diff --git a/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs b/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
index f2b13d34881..f9dfa9b2734 100644
--- a/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
+++ b/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
+using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Prototypes;
@@ -197,9 +198,7 @@ private List<string> PerformReaction(Entity<SolutionComponent> soln, ReactionPro
 
         private void OnReaction(Entity<SolutionComponent> soln, ReactionPrototype reaction, ReagentPrototype? reagent, FixedPoint2 unitReactions)
         {
-            var args = new ReagentEffectArgs(soln, null, soln.Comp.Solution,
-                reagent,
-                unitReactions, EntityManager, null, 1f);
+            var args = new EntityEffectReagentArgs(soln, EntityManager, null, soln.Comp.Solution, unitReactions, reagent, null, 1f);
 
             var posFound = _transformSystem.TryGetMapOrGridCoordinates(soln, out var gridPos);
 
@@ -213,7 +212,7 @@ private void OnReaction(Entity<SolutionComponent> soln, ReactionPrototype reacti
 
                 if (effect.ShouldLog)
                 {
-                    var entity = args.SolutionEntity;
+                    var entity = args.TargetEntity;
                     _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
                         $"Reaction effect {effect.GetType().Name:effect} of reaction {reaction.ID:reaction} applied on entity {ToPrettyString(entity):entity} at Pos:{(posFound ? $"{gridPos:coordinates}" : "[Grid or Map not Found")}");
                 }
diff --git a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
index f4e9619b172..351aa50b0f3 100644
--- a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
+++ b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
+using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
@@ -59,7 +60,7 @@ public sealed partial class ReactionPrototype : IPrototype, IComparable<Reaction
         /// <summary>
         /// Effects to be triggered when the reaction occurs.
         /// </summary>
-        [DataField("effects", serverOnly: true)] public List<ReagentEffect> Effects = new();
+        [DataField("effects", serverOnly: true)] public List<EntityEffect> Effects = new();
 
         /// <summary>
         /// How dangerous is this effect? Stuff like bicaridine should be low, while things like methamphetamine
diff --git a/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs b/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs
index 310129c6fc7..cabdee93c1a 100644
--- a/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs
+++ b/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
 
@@ -33,7 +34,7 @@ public sealed partial class ReactiveReagentEffectEntry
     public HashSet<string>? Reagents = null;
 
     [DataField("effects", required: true)]
-    public List<ReagentEffect> Effects = default!;
+    public List<EntityEffect> Effects = default!;
 
     [DataField("groups", readOnly: true, serverOnly: true,
         customTypeSerializer:typeof(PrototypeIdDictionarySerializer<HashSet<ReactionMethod>, ReactiveGroupPrototype>))]
diff --git a/Content.Shared/Chemistry/ReactiveSystem.cs b/Content.Shared/Chemistry/ReactiveSystem.cs
index 57b008de0c7..edd75bb0b4c 100644
--- a/Content.Shared/Chemistry/ReactiveSystem.cs
+++ b/Content.Shared/Chemistry/ReactiveSystem.cs
@@ -3,102 +3,107 @@
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
+using Content.Shared.EntityEffects;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
-namespace Content.Shared.Chemistry
+namespace Content.Shared.Chemistry;
+
+[UsedImplicitly]
+public sealed class ReactiveSystem : EntitySystem
 {
-    [UsedImplicitly]
-    public sealed class ReactiveSystem : EntitySystem
-    {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly IRobustRandom _robustRandom = default!;
-        [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IRobustRandom _robustRandom = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
 
-        public void DoEntityReaction(EntityUid uid, Solution solution, ReactionMethod method)
+    public void DoEntityReaction(EntityUid uid, Solution solution, ReactionMethod method)
+    {
+        foreach (var reagent in solution.Contents.ToArray())
         {
-            foreach (var reagent in solution.Contents.ToArray())
-            {
-                ReactionEntity(uid, method, reagent, solution);
-            }
+            ReactionEntity(uid, method, reagent, solution);
         }
+    }
 
-        public void ReactionEntity(EntityUid uid, ReactionMethod method, ReagentQuantity reagentQuantity, Solution? source)
-        {
-            // We throw if the reagent specified doesn't exist.
-            var proto = _prototypeManager.Index<ReagentPrototype>(reagentQuantity.Reagent.Prototype);
-            ReactionEntity(uid, method, proto, reagentQuantity, source);
-        }
+    public void ReactionEntity(EntityUid uid, ReactionMethod method, ReagentQuantity reagentQuantity, Solution? source)
+    {
+        // We throw if the reagent specified doesn't exist.
+        var proto = _prototypeManager.Index<ReagentPrototype>(reagentQuantity.Reagent.Prototype);
+        ReactionEntity(uid, method, proto, reagentQuantity, source);
+    }
 
-        public void ReactionEntity(EntityUid uid, ReactionMethod method, ReagentPrototype proto,
-            ReagentQuantity reagentQuantity, Solution? source)
-        {
-            if (!TryComp(uid, out ReactiveComponent? reactive))
-                return;
+    public void ReactionEntity(EntityUid uid, ReactionMethod method, ReagentPrototype proto,
+        ReagentQuantity reagentQuantity, Solution? source)
+    {
+        if (!TryComp(uid, out ReactiveComponent? reactive))
+            return;
 
-            // If we have a source solution, use the reagent quantity we have left. Otherwise, use the reaction volume specified.
-            var args = new ReagentEffectArgs(uid, null, source, proto,
-                source?.GetReagentQuantity(reagentQuantity.Reagent) ?? reagentQuantity.Quantity, EntityManager, method, 1f);
+        // If we have a source solution, use the reagent quantity we have left. Otherwise, use the reaction volume specified.
+        var args = new EntityEffectReagentArgs(uid, EntityManager, null, source, source?.GetReagentQuantity(reagentQuantity.Reagent) ?? reagentQuantity.Quantity, proto, method, 1f);
 
-            // First, check if the reagent wants to apply any effects.
-            if (proto.ReactiveEffects != null && reactive.ReactiveGroups != null)
+        // First, check if the reagent wants to apply any effects.
+        if (proto.ReactiveEffects != null && reactive.ReactiveGroups != null)
+        {
+            foreach (var (key, val) in proto.ReactiveEffects)
             {
-                foreach (var (key, val) in proto.ReactiveEffects)
-                {
-                    if (!val.Methods.Contains(method))
-                        continue;
+                if (!val.Methods.Contains(method))
+                    continue;
 
-                    if (!reactive.ReactiveGroups.ContainsKey(key))
-                        continue;
+                if (!reactive.ReactiveGroups.ContainsKey(key))
+                    continue;
 
-                    if (!reactive.ReactiveGroups[key].Contains(method))
+                if (!reactive.ReactiveGroups[key].Contains(method))
+                    continue;
+
+                foreach (var effect in val.Effects)
+                {
+                    if (!effect.ShouldApply(args, _robustRandom))
                         continue;
 
-                    foreach (var effect in val.Effects)
+                    if (effect.ShouldLog)
                     {
-                        if (!effect.ShouldApply(args, _robustRandom))
-                            continue;
-
-                        if (effect.ShouldLog)
-                        {
-                            var entity = args.SolutionEntity;
-                            _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
-                                $"Reactive effect {effect.GetType().Name:effect} of reagent {proto.ID:reagent} with method {method} applied on entity {ToPrettyString(entity):entity} at {Transform(entity).Coordinates:coordinates}");
-                        }
-
-                        effect.Effect(args);
+                        var entity = args.TargetEntity;
+                        _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
+                            $"Reactive effect {effect.GetType().Name:effect} of reagent {proto.ID:reagent} with method {method} applied on entity {ToPrettyString(entity):entity} at {Transform(entity).Coordinates:coordinates}");
                     }
+
+                    effect.Effect(args);
                 }
             }
+        }
 
-            // Then, check if the prototype has any effects it can apply as well.
-            if (reactive.Reactions != null)
+        // Then, check if the prototype has any effects it can apply as well.
+        if (reactive.Reactions != null)
+        {
+            foreach (var entry in reactive.Reactions)
             {
-                foreach (var entry in reactive.Reactions)
-                {
-                    if (!entry.Methods.Contains(method))
-                        continue;
+                if (!entry.Methods.Contains(method))
+                    continue;
+
+                if (entry.Reagents != null && !entry.Reagents.Contains(proto.ID))
+                    continue;
 
-                    if (entry.Reagents != null && !entry.Reagents.Contains(proto.ID))
+                foreach (var effect in entry.Effects)
+                {
+                    if (!effect.ShouldApply(args, _robustRandom))
                         continue;
 
-                    foreach (var effect in entry.Effects)
+                    if (effect.ShouldLog)
                     {
-                        if (!effect.ShouldApply(args, _robustRandom))
-                            continue;
-
-                        if (effect.ShouldLog)
-                        {
-                            var entity = args.SolutionEntity;
-                            _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
-                                $"Reactive effect {effect.GetType().Name:effect} of {ToPrettyString(entity):entity} using reagent {proto.ID:reagent} with method {method} at {Transform(entity).Coordinates:coordinates}");
-                        }
-
-                        effect.Effect(args);
+                        var entity = args.TargetEntity;
+                        _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
+                            $"Reactive effect {effect.GetType().Name:effect} of {ToPrettyString(entity):entity} using reagent {proto.ID:reagent} with method {method} at {Transform(entity).Coordinates:coordinates}");
                     }
+
+                    effect.Effect(args);
                 }
             }
         }
     }
 }
+public enum ReactionMethod
+{
+Touch,
+Injection,
+Ingestion,
+}
diff --git a/Content.Shared/Chemistry/Reagent/ReagentEffect.cs b/Content.Shared/Chemistry/Reagent/ReagentEffect.cs
deleted file mode 100644
index 41eea55cca4..00000000000
--- a/Content.Shared/Chemistry/Reagent/ReagentEffect.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-using System.Linq;
-using System.Text.Json.Serialization;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Database;
-using Content.Shared.FixedPoint;
-using Content.Shared.Localizations;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Shared.Chemistry.Reagent
-{
-    /// <summary>
-    ///     Reagent effects describe behavior that occurs when a reagent is ingested and metabolized by some
-    ///     organ. They only trigger when all of <see cref="Conditions"/> are satisfied.
-    /// </summary>
-    [ImplicitDataDefinitionForInheritors]
-    [MeansImplicitUse]
-    public abstract partial class ReagentEffect
-    {
-        [JsonPropertyName("id")] private protected string _id => this.GetType().Name;
-        /// <summary>
-        ///     The list of conditions required for the effect to activate. Not required.
-        /// </summary>
-        [JsonPropertyName("conditions")]
-        [DataField("conditions")]
-        public ReagentEffectCondition[]? Conditions;
-
-        public virtual string ReagentEffectFormat => "guidebook-reagent-effect-description";
-
-        protected abstract string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys); // => Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability));
-
-        /// <summary>
-        ///     What's the chance, from 0 to 1, that this effect will occur?
-        /// </summary>
-        [JsonPropertyName("probability")]
-        [DataField("probability")]
-        public float Probability = 1.0f;
-
-        [JsonIgnore]
-        [DataField("logImpact")]
-        public virtual LogImpact LogImpact { get; private set; } = LogImpact.Low;
-
-        /// <summary>
-        ///     Should this reagent effect log at all?
-        /// </summary>
-        [JsonIgnore]
-        [DataField("shouldLog")]
-        public virtual bool ShouldLog { get; private set; } = false;
-
-        public abstract void Effect(ReagentEffectArgs args);
-
-        /// <summary>
-        /// Produces a localized, bbcode'd guidebook description for this effect.
-        /// </summary>
-        /// <returns></returns>
-        public string? GuidebookEffectDescription(IPrototypeManager prototype, IEntitySystemManager entSys)
-        {
-            var effect = ReagentEffectGuidebookText(prototype, entSys);
-            if (effect is null)
-                return null;
-
-            return Loc.GetString(ReagentEffectFormat, ("effect", effect), ("chance", Probability),
-                ("conditionCount", Conditions?.Length ?? 0),
-                ("conditions",
-                    ContentLocalizationManager.FormatList(Conditions?.Select(x => x.GuidebookExplanation(prototype)).ToList() ??
-                                                          new List<string>())));
-        }
-    }
-
-    public static class ReagentEffectExt
-    {
-        public static bool ShouldApply(this ReagentEffect effect, ReagentEffectArgs args,
-            IRobustRandom? random = null)
-        {
-            if (random == null)
-                random = IoCManager.Resolve<IRobustRandom>();
-
-            if (effect.Probability < 1.0f && !random.Prob(effect.Probability))
-                return false;
-
-            if (effect.Conditions != null)
-            {
-                foreach (var cond in effect.Conditions)
-                {
-                    if (!cond.Condition(args))
-                        return false;
-                }
-            }
-
-            return true;
-        }
-    }
-
-    public enum ReactionMethod
-    {
-        Touch,
-        Injection,
-        Ingestion,
-    }
-
-    public readonly record struct ReagentEffectArgs(
-        EntityUid SolutionEntity,
-        EntityUid? OrganEntity,
-        Solution? Source,
-        ReagentPrototype? Reagent,
-        FixedPoint2 Quantity,
-        IEntityManager EntityManager,
-        ReactionMethod? Method,
-        float Scale = 1f,
-        float QuantityMultiplier = 1f
-    );
-}
diff --git a/Content.Shared/Chemistry/Reagent/ReagentEffectCondition.cs b/Content.Shared/Chemistry/Reagent/ReagentEffectCondition.cs
deleted file mode 100644
index a32b4fa8e3a..00000000000
--- a/Content.Shared/Chemistry/Reagent/ReagentEffectCondition.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Text.Json.Serialization;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Chemistry.Reagent
-{
-    [ImplicitDataDefinitionForInheritors]
-    [MeansImplicitUse]
-    public abstract partial class ReagentEffectCondition
-    {
-        [JsonPropertyName("id")] private protected string _id => this.GetType().Name;
-
-        public abstract bool Condition(ReagentEffectArgs args);
-
-        /// <summary>
-        /// Effect explanations are of the form "[chance to] [action] when [condition] and [condition]"
-        /// </summary>
-        /// <param name="prototype"></param>
-        /// <returns></returns>
-        public abstract string GuidebookExplanation(IPrototypeManager prototype);
-    }
-}
diff --git a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
index df1b1aa20b4..08bee30a0f1 100644
--- a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
+++ b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
@@ -1,10 +1,11 @@
-using System.Collections.Frozen;
+using System.Collections.Frozen;
 using System.Linq;
 using System.Text.Json.Serialization;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Body.Prototypes;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reaction;
+using Content.Shared.EntityEffects;
 using Content.Shared.Database;
 using Content.Shared.FixedPoint;
 using Content.Shared.Nutrition;
@@ -134,7 +135,7 @@ public sealed partial class ReagentPrototype : IPrototype, IInheritingPrototype
         public List<ITileReaction> TileReactions = new(0);
 
         [DataField("plantMetabolism", serverOnly: true)]
-        public List<ReagentEffect> PlantMetabolisms = new(0);
+        public List<EntityEffect> PlantMetabolisms = new(0);
 
         [DataField]
         public float PricePerUnit;
@@ -170,7 +171,7 @@ public void ReactionPlant(EntityUid? plantHolder, ReagentQuantity amount, Soluti
 
             var entMan = IoCManager.Resolve<IEntityManager>();
             var random = IoCManager.Resolve<IRobustRandom>();
-            var args = new ReagentEffectArgs(plantHolder.Value, null, solution, this, amount.Quantity, entMan, null, 1f);
+            var args = new EntityEffectReagentArgs(plantHolder.Value, entMan, null, solution, amount.Quantity, this, null, 1f);
             foreach (var plantMetabolizable in PlantMetabolisms)
             {
                 if (!plantMetabolizable.ShouldApply(args, random))
@@ -178,7 +179,7 @@ public void ReactionPlant(EntityUid? plantHolder, ReagentQuantity amount, Soluti
 
                 if (plantMetabolizable.ShouldLog)
                 {
-                    var entity = args.SolutionEntity;
+                    var entity = args.TargetEntity;
                     entMan.System<SharedAdminLogSystem>().Add(LogType.ReagentEffect, plantMetabolizable.LogImpact,
                         $"Plant metabolism effect {plantMetabolizable.GetType().Name:effect} of reagent {ID:reagent} applied on entity {entMan.ToPrettyString(entity):entity} at {entMan.GetComponent<TransformComponent>(entity).Coordinates:coordinates}");
                 }
@@ -220,7 +221,7 @@ public sealed partial class ReagentEffectsEntry
         /// </summary>
         [JsonPropertyName("effects")]
         [DataField("effects", required: true)]
-        public ReagentEffect[] Effects = default!;
+        public EntityEffect[] Effects = default!;
 
         public ReagentEffectsGuideEntry MakeGuideEntry(IPrototypeManager prototype, IEntitySystemManager entSys)
         {
@@ -254,6 +255,6 @@ public sealed partial class ReactiveReagentEffectEntry
         public HashSet<ReactionMethod> Methods = default!;
 
         [DataField("effects", required: true)]
-        public ReagentEffect[] Effects = default!;
+        public EntityEffect[] Effects = default!;
     }
 }
diff --git a/Content.Shared/EntityEffects/EntityEffect.cs b/Content.Shared/EntityEffects/EntityEffect.cs
new file mode 100644
index 00000000000..21e79f224de
--- /dev/null
+++ b/Content.Shared/EntityEffects/EntityEffect.cs
@@ -0,0 +1,132 @@
+using System.Linq;
+using System.Text.Json.Serialization;
+using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Database;
+using Content.Shared.FixedPoint;
+using Content.Shared.Localizations;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Toolshed.TypeParsers;
+
+namespace Content.Shared.EntityEffects;
+
+/// <summary>
+///     Entity effects describe behavior that occurs on different kinds of triggers, e.g. when a reagent is ingested and metabolized by some
+///     organ. They only trigger when all of <see cref="Conditions"/> are satisfied.
+/// </summary>
+[ImplicitDataDefinitionForInheritors]
+[MeansImplicitUse]
+public abstract partial class EntityEffect
+{
+    private protected string _id => this.GetType().Name;
+    /// <summary>
+    ///     The list of conditions required for the effect to activate. Not required.
+    /// </summary>
+    [DataField("conditions")]
+    public EntityEffectCondition[]? Conditions;
+
+    public virtual string ReagentEffectFormat => "guidebook-reagent-effect-description";
+
+    protected abstract string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys);
+
+    /// <summary>
+    ///     What's the chance, from 0 to 1, that this effect will occur?
+    /// </summary>
+    [DataField("probability")]
+    public float Probability = 1.0f;
+
+    public virtual LogImpact LogImpact { get; private set; } = LogImpact.Low;
+
+    /// <summary>
+    ///     Should this entity effect log at all?
+    /// </summary>
+    public virtual bool ShouldLog { get; private set; } = false;
+
+    public abstract void Effect(EntityEffectBaseArgs args);
+
+    /// <summary>
+    /// Produces a localized, bbcode'd guidebook description for this effect.
+    /// </summary>
+    /// <returns></returns>
+    public string? GuidebookEffectDescription(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        var effect = ReagentEffectGuidebookText(prototype, entSys);
+        if (effect is null)
+            return null;
+
+        return Loc.GetString(ReagentEffectFormat, ("effect", effect), ("chance", Probability),
+            ("conditionCount", Conditions?.Length ?? 0),
+            ("conditions",
+                ContentLocalizationManager.FormatList(Conditions?.Select(x => x.GuidebookExplanation(prototype)).ToList() ??
+                                                        new List<string>())));
+    }
+}
+
+public static class EntityEffectExt
+{
+    public static bool ShouldApply(this EntityEffect effect, EntityEffectBaseArgs args,
+        IRobustRandom? random = null)
+    {
+        if (random == null)
+            random = IoCManager.Resolve<IRobustRandom>();
+
+        if (effect.Probability < 1.0f && !random.Prob(effect.Probability))
+            return false;
+
+        if (effect.Conditions != null)
+        {
+            foreach (var cond in effect.Conditions)
+            {
+                if (!cond.Condition(args))
+                    return false;
+            }
+        }
+
+        return true;
+    }
+}
+
+/// <summary>
+///     EntityEffectBaseArgs only contains the target of an effect.
+///     If a trigger wants to include more info (e.g. the quantity of the chemical triggering the effect), it can be extended (see EntityEffectReagentArgs).
+/// </summary>
+public record class EntityEffectBaseArgs
+{
+    public EntityUid TargetEntity;
+
+    public IEntityManager EntityManager = default!;
+
+    public EntityEffectBaseArgs(EntityUid targetEntity, IEntityManager entityManager)
+    {
+        TargetEntity = targetEntity;
+        EntityManager = entityManager;
+    }
+}
+
+public record class EntityEffectReagentArgs : EntityEffectBaseArgs
+{
+    public EntityUid? OrganEntity;
+
+    public Solution? Source;
+
+    public FixedPoint2 Quantity;
+
+    public ReagentPrototype? Reagent;
+
+    public ReactionMethod? Method;
+
+    public FixedPoint2 Scale;
+
+    public EntityEffectReagentArgs(EntityUid targetEntity, IEntityManager entityManager, EntityUid? organEntity, Solution? source, FixedPoint2 quantity, ReagentPrototype? reagent, ReactionMethod? method, FixedPoint2 scale) : base(targetEntity, entityManager)
+    {
+        OrganEntity = organEntity;
+        Source = source;
+        Quantity = quantity;
+        Reagent = reagent;
+        Method = method;
+        Scale = scale;
+    }
+}
diff --git a/Content.Shared/EntityEffects/EntityEffectCondition.cs b/Content.Shared/EntityEffects/EntityEffectCondition.cs
new file mode 100644
index 00000000000..d6028b9f2c4
--- /dev/null
+++ b/Content.Shared/EntityEffects/EntityEffectCondition.cs
@@ -0,0 +1,22 @@
+using System.Text.Json.Serialization;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects;
+
+[ImplicitDataDefinitionForInheritors]
+[MeansImplicitUse]
+public abstract partial class EntityEffectCondition
+{
+    [JsonPropertyName("id")] private protected string _id => this.GetType().Name;
+
+    public abstract bool Condition(EntityEffectBaseArgs args);
+
+    /// <summary>
+    /// Effect explanations are of the form "[chance to] [action] when [condition] and [condition]"
+    /// </summary>
+    /// <param name="prototype"></param>
+    /// <returns></returns>
+    public abstract string GuidebookExplanation(IPrototypeManager prototype);
+}
+
diff --git a/Resources/Prototypes/Entities/Tiles/lava.yml b/Resources/Prototypes/Entities/Tiles/lava.yml
index 9d61304af9d..29a5cd885c3 100644
--- a/Resources/Prototypes/Entities/Tiles/lava.yml
+++ b/Resources/Prototypes/Entities/Tiles/lava.yml
@@ -18,6 +18,12 @@
         - Lava
   - type: Lava
     fireStacks: 0.75
+  - type: TileEntityEffect
+    effects:
+    - !type:FlammableReaction
+      multiplier: 3.75
+      multiplierOnExisting: 0.75
+    - !type:Ignite
   - type: Transform
     anchored: true
   - type: SyncSprite
diff --git a/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml b/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
index 500286ead31..ed38f86ff42 100644
--- a/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
+++ b/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: FloorLiquidPlasmaEntity
   name: liquid plasma
   description: Sweet, expensive nectar. Don't consume.
@@ -18,6 +18,12 @@
       - Lava
   - type: Lava
     fireStacks: 0.75
+  - type: TileEntityEffect
+    effects:
+    - !type:FlammableReaction
+      multiplier: 3.75
+      multiplierOnExisting: 0.75
+    - !type:Ignite
   - type: Transform
     anchored: true
   - type: SyncSprite

From b9129171ee27c749c50ff6350ef7590acbbeb801 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 21 Dec 2024 15:50:47 -0400
Subject: [PATCH 216/366] Use EntityEffect

---
 Content.Server/Body/Systems/MetabolizerSystem.cs    |  3 +--
 .../EntityEffects/Effects/ChemAddMoodlet.cs         | 13 ++++++++-----
 Content.Server/EntityEffects/Effects/PurifyEvil.cs  | 13 +++++++------
 .../ChangeGlimmerReactionEffect.cs                  | 12 ++++++++----
 .../Kitchen/Components/DeepFryerComponent.cs        |  3 ++-
 5 files changed, 26 insertions(+), 18 deletions(-)
 rename Content.Server/Nyanotrasen/Chemistry/{ReactionEffects => EntityEffects}/ChangeGlimmerReactionEffect.cs (61%)

diff --git a/Content.Server/Body/Systems/MetabolizerSystem.cs b/Content.Server/Body/Systems/MetabolizerSystem.cs
index ff357b3e304..8b0f0ac6f8d 100644
--- a/Content.Server/Body/Systems/MetabolizerSystem.cs
+++ b/Content.Server/Body/Systems/MetabolizerSystem.cs
@@ -197,8 +197,7 @@ private void TryMetabolize(Entity<MetabolizerComponent, OrganComponent?, Solutio
                     var ev = new TryMetabolizeReagent(reagent, proto, quantity);
                     RaiseLocalEvent(actualEntity, ref ev);
 
-                    var args = new EntityEffectReagentArgs(actualEntity, ent, solution, proto, mostToRemove,
-                        EntityManager, null, scale * ev.Scale, ev.QuantityMultiplier);
+                    var args = new EntityEffectReagentArgs(actualEntity, EntityManager, ent, solution, mostToRemove, proto, null, scale);
 
                     // do all effects, if conditions apply
                     foreach (var effect in entry.Effects)
diff --git a/Content.Server/EntityEffects/Effects/ChemAddMoodlet.cs b/Content.Server/EntityEffects/Effects/ChemAddMoodlet.cs
index f5bb6292996..bfb61b368ab 100644
--- a/Content.Server/EntityEffects/Effects/ChemAddMoodlet.cs
+++ b/Content.Server/EntityEffects/Effects/ChemAddMoodlet.cs
@@ -1,15 +1,15 @@
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Content.Shared.Mood;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
 /// <summary>
 ///     Adds a moodlet to an entity.
 /// </summary>
 [UsedImplicitly]
-public sealed partial class ChemAddMoodlet : ReagentEffect
+public sealed partial class ChemAddMoodlet : EntityEffect
 {
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
     {
@@ -25,10 +25,13 @@ public sealed partial class ChemAddMoodlet : ReagentEffect
     [DataField(required: true)]
     public ProtoId<MoodEffectPrototype> MoodPrototype = default!;
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
+        if (args is not EntityEffectReagentArgs _)
+            return;
+
         var entityManager = IoCManager.Resolve<EntityManager>();
         var ev = new MoodEffectEvent(MoodPrototype);
-        entityManager.EventBus.RaiseLocalEvent(args.SolutionEntity, ev);
+        entityManager.EventBus.RaiseLocalEvent(args.TargetEntity, ev);
     }
 }
diff --git a/Content.Server/EntityEffects/Effects/PurifyEvil.cs b/Content.Server/EntityEffects/Effects/PurifyEvil.cs
index 896ecf2eac5..d28104d1db0 100644
--- a/Content.Server/EntityEffects/Effects/PurifyEvil.cs
+++ b/Content.Server/EntityEffects/Effects/PurifyEvil.cs
@@ -1,5 +1,5 @@
 using System.Threading;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Content.Shared.Jittering;
 using Content.Shared.WhiteDream.BloodCult.BloodCultist;
 using JetBrains.Annotations;
@@ -8,7 +8,7 @@
 namespace Content.Server.Chemistry.ReagentEffects;
 
 [UsedImplicitly]
-public sealed partial class PurifyEvil : ReagentEffect
+public sealed partial class PurifyEvil : EntityEffect
 {
     [DataField]
     public float Amplitude = 10.0f;
@@ -24,15 +24,16 @@ protected override string ReagentEffectGuidebookText(IPrototypeManager prototype
         return Loc.GetString("reagent-effect-guidebook-purify-evil");
     }
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
+        if (args is not EntityEffectReagentArgs e)
+            return;
+
         var entityManager = args.EntityManager;
-        var uid = args.SolutionEntity;
+        var uid = args.TargetEntity;
         if (!entityManager.TryGetComponent(uid, out BloodCultistComponent? bloodCultist) ||
             bloodCultist.DeconvertToken is not null)
-        {
             return;
-        }
 
         entityManager.System<SharedJitteringSystem>().DoJitter(uid, Time, true, Amplitude, Frequency);
 
diff --git a/Content.Server/Nyanotrasen/Chemistry/ReactionEffects/ChangeGlimmerReactionEffect.cs b/Content.Server/Nyanotrasen/Chemistry/EntityEffects/ChangeGlimmerReactionEffect.cs
similarity index 61%
rename from Content.Server/Nyanotrasen/Chemistry/ReactionEffects/ChangeGlimmerReactionEffect.cs
rename to Content.Server/Nyanotrasen/Chemistry/EntityEffects/ChangeGlimmerReactionEffect.cs
index 65aaf350cba..36c9e62b9d3 100644
--- a/Content.Server/Nyanotrasen/Chemistry/ReactionEffects/ChangeGlimmerReactionEffect.cs
+++ b/Content.Server/Nyanotrasen/Chemistry/EntityEffects/ChangeGlimmerReactionEffect.cs
@@ -1,11 +1,12 @@
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Content.Shared.Psionics.Glimmer;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Chemistry.ReactionEffects;
 
 [DataDefinition]
-public sealed partial class ChangeGlimmerReactionEffect : ReagentEffect
+public sealed partial class ChangeGlimmerReactionEffect : EntityEffect
 {
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
         => Loc.GetString("reagent-effect-guidebook-change-glimmer-reaction-effect", ("chance", Probability),
@@ -17,10 +18,13 @@ public sealed partial class ChangeGlimmerReactionEffect : ReagentEffect
     [DataField("count")]
     public int Count = 1;
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
-        var glimmersys = args.EntityManager.EntitySysManager.GetEntitySystem<GlimmerSystem>();
+        if (args is not EntityEffectReagentArgs _)
+            return;
 
-        glimmersys.Glimmer += Count;
+        var glimmerSystem = args.EntityManager.EntitySysManager.GetEntitySystem<GlimmerSystem>();
+
+        glimmerSystem.Glimmer += Count;
     }
 }
diff --git a/Content.Server/Nyanotrasen/Kitchen/Components/DeepFryerComponent.cs b/Content.Server/Nyanotrasen/Kitchen/Components/DeepFryerComponent.cs
index 72c3297feb6..c06bc7cfd89 100644
--- a/Content.Server/Nyanotrasen/Kitchen/Components/DeepFryerComponent.cs
+++ b/Content.Server/Nyanotrasen/Kitchen/Components/DeepFryerComponent.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Construction.Prototypes;
+using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Content.Shared.Nutrition;
 using Content.Shared.Nyanotrasen.Kitchen;
@@ -187,7 +188,7 @@ public sealed partial class DeepFryerComponent : SharedDeepFryerComponent
 
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField("unsafeOilVolumeEffects")]
-        public List<ReagentEffect> UnsafeOilVolumeEffects = new();
+        public List<EntityEffect> UnsafeOilVolumeEffects = new();
 
         /// <summary>
         /// What is the temperature of the vat when the deep fryer is powered?

From 67ed4c377bcaebf82ffab7d5b2d4f454faa23726 Mon Sep 17 00:00:00 2001
From: metalgearsloth <comedian_vs_clown@hotmail.com>
Date: Sat, 21 Dec 2024 16:09:07 +1100
Subject: [PATCH 217/366] Implement field-deltas for melee

---
 .../Weapons/Melee/MeleeWeaponComponent.cs     |  4 +-
 .../Weapons/Melee/SharedMeleeWeaponSystem.cs  | 41 +++++++++++++------
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
index b33b2cbc4f6..851699c9815 100644
--- a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
+++ b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
@@ -11,7 +11,7 @@ namespace Content.Shared.Weapons.Melee;
 /// <summary>
 /// When given to a mob lets them do unarmed attacks, or when given to an item lets someone wield it to do attacks.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(fieldDeltas: true), AutoGenerateComponentPause]
 public sealed partial class MeleeWeaponComponent : Component
 {
     // TODO: This is becoming bloated as shit.
@@ -96,7 +96,7 @@ public sealed partial class MeleeWeaponComponent : Component
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
     public bool ResistanceBypass = false;
-    
+
     /// <summary>
     /// Base damage for this weapon. Can be modified via heavy damage or other means.
     /// </summary>
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index 7a3e7ee503a..6cad299587c 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -104,7 +104,7 @@ private void OnMeleeShot(EntityUid uid, MeleeWeaponComponent component, ref GunS
         if (gun.NextFire > component.NextAttack)
         {
             component.NextAttack = gun.NextFire;
-            Dirty(uid, component);
+            DirtyField(uid, component, nameof(MeleeWeaponComponent.NextAttack));
         }
     }
 
@@ -128,7 +128,7 @@ private void OnMeleeSelected(EntityUid uid, MeleeWeaponComponent component, Hand
             return;
 
         component.NextAttack = minimum;
-        Dirty(uid, component);
+        DirtyField(uid, component, nameof(MeleeWeaponComponent.NextAttack));
     }
 
     private void OnGetBonusMeleeDamage(EntityUid uid, BonusMeleeDamageComponent component, ref GetMeleeDamageEvent args)
@@ -168,7 +168,7 @@ private void OnStopAttack(StopAttackEvent msg, EntitySessionEventArgs args)
             return;
 
         weapon.Attacking = false;
-        Dirty(weaponUid, weapon);
+        DirtyField(weaponUid, weapon, nameof(MeleeWeaponComponent.Attacking));
     }
 
     private void OnLightAttack(LightAttackEvent msg, EntitySessionEventArgs args)
@@ -392,7 +392,7 @@ private bool AttemptAttack(EntityUid user, EntityUid weaponUid, MeleeWeaponCompo
             swings++;
         }
 
-        Dirty(weaponUid, weapon);
+        DirtyField(weaponUid, weapon, nameof(MeleeWeaponComponent.NextAttack));
 
         // Do this AFTER attack so it doesn't spam every tick
         var ev = new AttemptMeleeEvent();
@@ -832,6 +832,7 @@ private void OnItemToggle(EntityUid uid, ItemToggleMeleeWeaponComponent itemTogg
                 //Setting deactivated damage to the weapon's regular value before changing it.
                 itemToggleMelee.DeactivatedDamage ??= meleeWeapon.Damage;
                 meleeWeapon.Damage = itemToggleMelee.ActivatedDamage;
+                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.Damage));
             }
 
             meleeWeapon.SoundHit = itemToggleMelee.ActivatedSoundOnHit;
@@ -839,37 +840,51 @@ private void OnItemToggle(EntityUid uid, ItemToggleMeleeWeaponComponent itemTogg
             if (itemToggleMelee.ActivatedSoundOnHitNoDamage != null)
             {
                 //Setting the deactivated sound on no damage hit to the weapon's regular value before changing it.
-                itemToggleMelee.DeactivatedSoundOnHitNoDamage ??= meleeWeapon.SoundNoDamage;
-                meleeWeapon.SoundNoDamage = itemToggleMelee.ActivatedSoundOnHitNoDamage;
+                itemToggleMelee.DeactivatedSoundOnHitNoDamage ??= meleeWeapon.NoDamageSound;
+                meleeWeapon.NoDamageSound = itemToggleMelee.ActivatedSoundOnHitNoDamage;
+                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.NoDamageSound));
             }
 
             if (itemToggleMelee.ActivatedSoundOnSwing != null)
             {
                 //Setting the deactivated sound on no damage hit to the weapon's regular value before changing it.
-                itemToggleMelee.DeactivatedSoundOnSwing ??= meleeWeapon.SoundSwing;
-                meleeWeapon.SoundSwing = itemToggleMelee.ActivatedSoundOnSwing;
+                itemToggleMelee.DeactivatedSoundOnSwing ??= meleeWeapon.SwingSound;
+                meleeWeapon.SwingSound = itemToggleMelee.ActivatedSoundOnSwing;
+                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.SwingSound));
             }
 
             if (itemToggleMelee.DeactivatedSecret)
+            {
                 meleeWeapon.Hidden = false;
+            }
         }
         else
         {
             if (itemToggleMelee.DeactivatedDamage != null)
+            {
                 meleeWeapon.Damage = itemToggleMelee.DeactivatedDamage;
+                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.Damage));
+            }
 
-            meleeWeapon.SoundHit = itemToggleMelee.DeactivatedSoundOnHit;
+            meleeWeapon.HitSound = itemToggleMelee.DeactivatedSoundOnHit;
+            DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.HitSound));
 
             if (itemToggleMelee.DeactivatedSoundOnHitNoDamage != null)
-                meleeWeapon.SoundNoDamage = itemToggleMelee.DeactivatedSoundOnHitNoDamage;
+            {
+                meleeWeapon.NoDamageSound = itemToggleMelee.DeactivatedSoundOnHitNoDamage;
+                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.NoDamageSound));
+            }
 
             if (itemToggleMelee.DeactivatedSoundOnSwing != null)
-                meleeWeapon.SoundSwing = itemToggleMelee.DeactivatedSoundOnSwing;
+            {
+                meleeWeapon.SwingSound = itemToggleMelee.DeactivatedSoundOnSwing;
+                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.SwingSound));
+            }
 
             if (itemToggleMelee.DeactivatedSecret)
+            {
                 meleeWeapon.Hidden = true;
+            }
         }
-
-        Dirty(uid, meleeWeapon);
     }
 }

From bf23534b919fb440f312b2089d3ee4c9d028bce3 Mon Sep 17 00:00:00 2001
From: Verm <32827189+Vermidia@users.noreply.github.com>
Date: Mon, 3 Jun 2024 18:45:00 -0500
Subject: [PATCH 218/366] Humans can no longer honk on command (#28566)

* Humans can no longer honk on command

* Undo change it emote file

* I hate tabs

* Some comments
---
 .../Chat/Systems/ChatSystem.Emote.cs          | 48 ++++++++++++++-----
 Content.Server/EntityEffects/Effects/Emote.cs |  5 +-
 Resources/Prototypes/Reagents/fun.yml         |  1 +
 Resources/Prototypes/Reagents/toxins.yml      |  1 +
 4 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/Content.Server/Chat/Systems/ChatSystem.Emote.cs b/Content.Server/Chat/Systems/ChatSystem.Emote.cs
index 5d944654179..67bb7befca7 100644
--- a/Content.Server/Chat/Systems/ChatSystem.Emote.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.Emote.cs
@@ -51,19 +51,21 @@ private void CacheEmotes()
     /// <param name="emoteId">The id of emote prototype. Should has valid <see cref="EmotePrototype.ChatMessages"/></param>
     /// <param name="hideLog">Whether or not this message should appear in the adminlog window</param>
     /// <param name="range">Conceptual range of transmission, if it shows in the chat window, if it shows to far-away ghosts or ghosts at all...</param>
-    /// <param name="nameOverride">The name to use for the speaking entity. Usually this should just be modified via <see cref="TransformSpeakerSpeechEvent"/>. If this is set, the event will not get raised.</param>
+    /// <param name="nameOverride">The name to use for the speaking entity. Usually this should just be modified via <see cref="TransformSpeakerNameEvent"/>. If this is set, the event will not get raised.</param>
+    /// <param name="forceEmote">Bypasses whitelist/blacklist/availibility checks for if the entity can use this emote</param>
     public void TryEmoteWithChat(
         EntityUid source,
         string emoteId,
         ChatTransmitRange range = ChatTransmitRange.Normal,
         bool hideLog = false,
         string? nameOverride = null,
-        bool ignoreActionBlocker = false
+        bool ignoreActionBlocker = false,
+        bool forceEmote = false
         )
     {
         if (!_prototypeManager.TryIndex<EmotePrototype>(emoteId, out var proto))
             return;
-        TryEmoteWithChat(source, proto, range, hideLog: hideLog, nameOverride, ignoreActionBlocker: ignoreActionBlocker);
+        TryEmoteWithChat(source, proto, range, hideLog: hideLog, nameOverride, ignoreActionBlocker: ignoreActionBlocker, forceEmote: forceEmote);
     }
 
     /// <summary>
@@ -74,22 +76,19 @@ public void TryEmoteWithChat(
     /// <param name="hideLog">Whether or not this message should appear in the adminlog window</param>
     /// <param name="hideChat">Whether or not this message should appear in the chat window</param>
     /// <param name="range">Conceptual range of transmission, if it shows in the chat window, if it shows to far-away ghosts or ghosts at all...</param>
-    /// <param name="nameOverride">The name to use for the speaking entity. Usually this should just be modified via <see cref="TransformSpeakerSpeechEvent"/>. If this is set, the event will not get raised.</param>
+    /// <param name="nameOverride">The name to use for the speaking entity. Usually this should just be modified via <see cref="TransformSpeakerNameEvent"/>. If this is set, the event will not get raised.</param>
+    /// <param name="forceEmote">Bypasses whitelist/blacklist/availibility checks for if the entity can use this emote</param>
     public void TryEmoteWithChat(
         EntityUid source,
         EmotePrototype emote,
         ChatTransmitRange range = ChatTransmitRange.Normal,
         bool hideLog = false,
         string? nameOverride = null,
-        bool ignoreActionBlocker = false
+        bool ignoreActionBlocker = false,
+        bool forceEmote = false
         )
     {
-        if (_whitelistSystem.IsWhitelistFail(emote.Whitelist, source) || _whitelistSystem.IsBlacklistPass(emote.Blacklist, source))
-            return;
-
-        if (!emote.Available &&
-            TryComp<SpeechComponent>(source, out var speech) &&
-            !speech.AllowedEmotes.Contains(emote.ID))
+        if (!forceEmote && !AllowedToUseEmote(source, emote))
             return;
 
         // check if proto has valid message for chat
@@ -159,7 +158,11 @@ public bool TryPlayEmoteSound(EntityUid uid, EmoteSoundsPrototype? proto, string
         _audio.PlayPvs(sound, uid, param);
         return true;
     }
-
+    /// <summary>
+    /// Checks if a valid emote was typed, to play sounds and etc and invokes an event.
+    /// </summary>
+    /// <param name="uid"></param>
+    /// <param name="textInput"></param>
     private void TryEmoteChatInput(EntityUid uid, string textInput)
     {
         var actionLower = textInput.ToLower();
@@ -170,8 +173,29 @@ private void TryEmoteChatInput(EntityUid uid, string textInput)
         if (!_wordEmoteDict.TryGetValue(actionLower, out var emote))
             return;
 
+        if (!AllowedToUseEmote(uid, emote))
+            return;
+
         InvokeEmoteEvent(uid, emote);
     }
+    /// <summary>
+    /// Checks if we can use this emote based on the emotes whitelist, blacklist, and availibility to the entity.
+    /// </summary>
+    /// <param name="source">The entity that is speaking</param>
+    /// <param name="emote">The emote being used</param>
+    /// <returns></returns>
+    private bool AllowedToUseEmote(EntityUid source, EmotePrototype emote)
+    {
+        if ((_whitelistSystem.IsWhitelistFail(emote.Whitelist, source) || _whitelistSystem.IsBlacklistPass(emote.Blacklist, source)))
+            return false;
+
+        if (!emote.Available &&
+            TryComp<SpeechComponent>(source, out var speech) &&
+            !speech.AllowedEmotes.Contains(emote.ID))
+            return false;
+
+        return true;
+    }
 
     private void InvokeEmoteEvent(EntityUid uid, EmotePrototype proto)
     {
diff --git a/Content.Server/EntityEffects/Effects/Emote.cs b/Content.Server/EntityEffects/Effects/Emote.cs
index baf5967f310..1d8e27ab0f8 100644
--- a/Content.Server/EntityEffects/Effects/Emote.cs
+++ b/Content.Server/EntityEffects/Effects/Emote.cs
@@ -9,7 +9,7 @@
 namespace Content.Server.EntityEffects.Effects;
 
 /// <summary>
-///     Tries to force someone to emote (scream, laugh, etc).
+///     Tries to force someone to emote (scream, laugh, etc). Still respects whitelists/blacklists and other limits of the specified emote unless forced.
 /// </summary>
 [UsedImplicitly]
 public sealed partial class Emote : EntityEffect
@@ -20,6 +20,9 @@ public sealed partial class Emote : EntityEffect
     [DataField]
     public bool ShowInChat;
 
+    [DataField]
+    public bool Force = false;
+
     // JUSTIFICATION: Emoting is flavor, so same reason popup messages are not in here.
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
         => null;
diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml
index befa8d82968..1df2636c8ce 100644
--- a/Resources/Prototypes/Reagents/fun.yml
+++ b/Resources/Prototypes/Reagents/fun.yml
@@ -333,6 +333,7 @@
       - !type:Emote
         emote: Weh
         showInChat: true
+        force: true
         probability: 0.5
       - !type:Polymorph
         prototype: ArtifactLizard # Does the same thing as the original YML I made for this reagent.
diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
index 1c529b4dd9b..199c8ae109a 100644
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -572,6 +572,7 @@
       - !type:Emote
         emote: Honk
         showInChat: true
+        force: true
         probability: 0.2
       - !type:HealthChange
         conditions:

From d49e8f6fc0081d1d73c21feacd3439840bfd7fdd Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 21 Dec 2024 16:02:33 -0400
Subject: [PATCH 219/366] SyndieBorgs can laugh again.

---
 Content.Server/Chat/Systems/ChatSystem.Emote.cs    | 14 ++++++++++----
 .../Entities/Mobs/Cyborgs/base_borg_chassis.yml    |  2 ++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Content.Server/Chat/Systems/ChatSystem.Emote.cs b/Content.Server/Chat/Systems/ChatSystem.Emote.cs
index 67bb7befca7..7e8ec4cf89f 100644
--- a/Content.Server/Chat/Systems/ChatSystem.Emote.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.Emote.cs
@@ -186,12 +186,18 @@ private void TryEmoteChatInput(EntityUid uid, string textInput)
     /// <returns></returns>
     private bool AllowedToUseEmote(EntityUid source, EmotePrototype emote)
     {
-        if ((_whitelistSystem.IsWhitelistFail(emote.Whitelist, source) || _whitelistSystem.IsBlacklistPass(emote.Blacklist, source)))
+        // If emote is in AllowedEmotes, it will bypass whitelist and blacklist
+        if (TryComp<SpeechComponent>(source, out var speech) &&
+            speech.AllowedEmotes.Contains(emote.ID))
+            return true;
+
+        // Check the whitelist and blacklist
+        if (_whitelistSystem.IsWhitelistFail(emote.Whitelist, source) ||
+            _whitelistSystem.IsBlacklistPass(emote.Blacklist, source))
             return false;
 
-        if (!emote.Available &&
-            TryComp<SpeechComponent>(source, out var speech) &&
-            !speech.AllowedEmotes.Contains(emote.ID))
+        // Check if the emote is available for all
+        if (!emote.Available)
             return false;
 
         return true;
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index c24ca2c1dec..b1344d825c9 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -309,6 +309,8 @@
   - type: MovementAlwaysTouching
   - type: Speech
     speechSounds: SyndieBorg
+    allowedEmotes:
+    - Laugh
   - type: Vocal
     sounds:
       Unsexed: UnisexSiliconSyndicate

From 490ab084067ce42e5074eab214957d1525fd3ea5 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 21 Dec 2024 16:04:30 -0400
Subject: [PATCH 220/366] fix conflict?

---
 RobustToolbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RobustToolbox b/RobustToolbox
index 5e97db435c0..acb1d37b99f 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 5e97db435c05b4c188184ef90e5d77b0500403d0
+Subproject commit acb1d37b99f52ed9e372860ee946fa0f897665b9

From 4d2e51e4f25a212e725b440c6518039b67f5293d Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 21 Dec 2024 16:05:56 -0400
Subject: [PATCH 221/366] v238.0.0

---
 RobustToolbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RobustToolbox b/RobustToolbox
index acb1d37b99f..5e97db435c0 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit acb1d37b99f52ed9e372860ee946fa0f897665b9
+Subproject commit 5e97db435c05b4c188184ef90e5d77b0500403d0

From 50426cc9b345dce449e3775e1b842904f62dec98 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Tue, 20 Feb 2024 10:13:31 +0100
Subject: [PATCH 222/366] Fix admin notes and database time nonsense. (#25280)

God bloody christ. There's like three layers of shit here.

So firstly, apparently we were still using Npgsql.EnableLegacyTimestampBehavior. This means that time values (which are stored UTC in the database) were converted to local time when read out. This meant they were passed around as kind Local to clients (instead of UTC in the case of SQLite). That's easy enough to fix just turn off the flag and fix the couple spots we're passing a local DateTime ez.

Oh but it turns out there's a DIFFERENT problem with SQLite: See SQLite we definitely store the DateTimes as UTC, but when Microsoft.Data.Sqlite reads them it reads them as Kind Unspecified instead of Utc.

Why are these so bad? Because the admin notes system passes DateTime instances from EF Core straight to the rest of the game code. And that means it's a PAIN IN THE ASS to run the necessary conversions to fix the DateTime instances. GOD DAMNIT now I have to make a whole new set of "Record" entities so we avoid leaking the EF Core model entities. WAAAAAAA.

Fixes #19897
---
 Content.Server.Database/Model.cs              | 33 ++----------
 .../Administration/Notes/AdminMessageEui.cs   | 17 +++----
 Content.Server/Database/ServerDbBase.cs       | 50 ++++++++++++-------
 Content.Server/Database/ServerDbManager.cs    | 43 ++++++++--------
 Content.Server/Database/ServerDbPostgres.cs   |  4 +-
 Content.Server/Database/ServerDbSqlite.cs     |  4 +-
 6 files changed, 66 insertions(+), 85 deletions(-)

diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index 3245264e9da..b6effc5e801 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -909,35 +909,8 @@ public sealed class UploadedResourceLog
         public byte[] Data { get; set; } = default!;
     }
 
-    // Note: this interface isn't used by the game, but it *is* used by SS14.Admin.
-    // Don't remove! Or face the consequences!
-    public interface IAdminRemarksCommon
-    {
-        public int Id { get; }
-
-        public int? RoundId { get; }
-        public Round? Round { get; }
-
-        public Guid? PlayerUserId { get; }
-        public Player? Player { get; }
-        public TimeSpan PlaytimeAtNote { get; }
-
-        public string Message { get; }
-
-        public Player? CreatedBy { get; }
-
-        public DateTime CreatedAt { get; }
-
-        public Player? LastEditedBy { get; }
-
-        public DateTime? LastEditedAt { get; }
-        public DateTime? ExpirationTime { get; }
-
-        public bool Deleted { get; }
-    }
-
     [Index(nameof(PlayerUserId))]
-    public class AdminNote : IAdminRemarksCommon
+    public class AdminNote
     {
         [Required, Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)] public int Id { get; set; }
 
@@ -971,7 +944,7 @@ public class AdminNote : IAdminRemarksCommon
     }
 
     [Index(nameof(PlayerUserId))]
-    public class AdminWatchlist : IAdminRemarksCommon
+    public class AdminWatchlist
     {
         [Required, Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)] public int Id { get; set; }
 
@@ -1002,7 +975,7 @@ public class AdminWatchlist : IAdminRemarksCommon
     }
 
     [Index(nameof(PlayerUserId))]
-    public class AdminMessage : IAdminRemarksCommon
+    public class AdminMessage
     {
         [Required, Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)] public int Id { get; set; }
 
diff --git a/Content.Server/Administration/Notes/AdminMessageEui.cs b/Content.Server/Administration/Notes/AdminMessageEui.cs
index e53394ab47d..94523634635 100644
--- a/Content.Server/Administration/Notes/AdminMessageEui.cs
+++ b/Content.Server/Administration/Notes/AdminMessageEui.cs
@@ -14,11 +14,9 @@ public sealed class AdminMessageEui : BaseEui
 {
     [Dependency] private readonly IAdminNotesManager _notesMan = default!;
     [Dependency] private readonly IConfigurationManager _cfg = default!;
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
-
-    private readonly TimeSpan _closeWait;
-    private readonly TimeSpan _endTime;
-    private readonly AdminMessageRecord[] _messages;
+    private readonly float _closeWait;
+    private AdminMessageRecord? _message;
+    private DateTime _startTime;
 
     public AdminMessageEui(AdminMessageRecord[] messages)
     {
@@ -28,7 +26,7 @@ public AdminMessageEui(AdminMessageRecord[] messages)
         _messages = messages;
     }
 
-    public override void Opened()
+    public void SetMessage(AdminMessageRecord message)
     {
         StateDirty();
     }
@@ -37,10 +35,9 @@ public override EuiStateBase GetNewState()
     {
         return new AdminMessageEuiState(
             _closeWait,
-            _messages.Select(x => new AdminMessageEuiState.Message(
-                x.Message,
-                x.CreatedBy?.LastSeenUserName ?? Loc.GetString("admin-notes-fallback-admin-name"),
-                x.CreatedAt.UtcDateTime)).ToArray()
+            _message.Message,
+            _message.CreatedBy?.LastSeenUserName ?? "[System]",
+            _message.CreatedAt.UtcDateTime
         );
     }
 
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index ee6a8631c97..d7db054209a 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -1001,6 +1001,30 @@ public async Task RemoveFromWhitelistAsync(NetUserId player)
             await db.DbContext.SaveChangesAsync();
         }
 
+        public async Task<DateTimeOffset?> GetLastReadRules(NetUserId player)
+        {
+            await using var db = await GetDb();
+
+            return NormalizeDatabaseTime(await db.DbContext.Player
+                .Where(dbPlayer => dbPlayer.UserId == player)
+                .Select(dbPlayer => dbPlayer.LastReadRules)
+                .SingleOrDefaultAsync());
+        }
+
+        public async Task SetLastReadRules(NetUserId player, DateTimeOffset date)
+        {
+            await using var db = await GetDb();
+
+            var dbPlayer = await db.DbContext.Player.Where(dbPlayer => dbPlayer.UserId == player).SingleOrDefaultAsync();
+            if (dbPlayer == null)
+            {
+                return;
+            }
+
+            dbPlayer.LastReadRules = date.UtcDateTime;
+            await db.DbContext.SaveChangesAsync();
+        }
+
         #endregion
 
         #region Uploaded Resources Logs
@@ -1217,7 +1241,7 @@ ban.Unban is null
                 ban.LastEditedAt,
                 ban.ExpirationTime,
                 ban.Hidden,
-                new[] { ban.RoleId.Replace(BanManager.JobPrefix, null) },
+                new [] { ban.RoleId.Replace(BanManager.JobPrefix, null) },
                 MakePlayerRecord(unbanningAdmin),
                 ban.Unban?.UnbanTime);
         }
@@ -1381,10 +1405,10 @@ public async Task<List<AdminWatchlistRecord>> GetActiveWatchlists(Guid player)
         protected async Task<List<AdminWatchlistRecord>> GetActiveWatchlistsImpl(DbGuard db, Guid player)
         {
             var entities = await (from watchlist in db.DbContext.AdminWatchlists
-                                  where watchlist.PlayerUserId == player &&
-                                        !watchlist.Deleted &&
-                                        (watchlist.ExpirationTime == null || DateTime.UtcNow < watchlist.ExpirationTime)
-                                  select watchlist)
+                          where watchlist.PlayerUserId == player &&
+                                !watchlist.Deleted &&
+                                (watchlist.ExpirationTime == null || DateTime.UtcNow < watchlist.ExpirationTime)
+                          select watchlist)
                 .Include(note => note.Round)
                 .ThenInclude(r => r!.Server)
                 .Include(note => note.CreatedBy)
@@ -1409,9 +1433,9 @@ public async Task<List<AdminMessageRecord>> GetMessages(Guid player)
         protected async Task<List<AdminMessageRecord>> GetMessagesImpl(DbGuard db, Guid player)
         {
             var entities = await (from message in db.DbContext.AdminMessages
-                                  where message.PlayerUserId == player && !message.Deleted &&
-                                        (message.ExpirationTime == null || DateTime.UtcNow < message.ExpirationTime)
-                                  select message).Include(note => note.Round)
+                        where message.PlayerUserId == player && !message.Deleted &&
+                              (message.ExpirationTime == null || DateTime.UtcNow < message.ExpirationTime)
+                        select message).Include(note => note.Round)
                     .ThenInclude(r => r!.Server)
                     .Include(note => note.CreatedBy)
                     .Include(note => note.LastEditedBy)
@@ -1537,15 +1561,7 @@ protected async Task<List<ServerRoleBanNoteRecord>> GetGroupedServerRoleBansAsNo
             return time != null ? NormalizeDatabaseTime(time.Value) : time;
         }
 
-        public async Task<bool> HasPendingModelChanges()
-        {
-            await using var db = await GetDb();
-            return db.DbContext.Database.HasPendingModelChanges();
-        }
-
-        protected abstract Task<DbGuard> GetDb(
-            CancellationToken cancel = default,
-            [CallerMemberName] string? name = null);
+        protected abstract Task<DbGuard> GetDb([CallerMemberName] string? name = null);
 
         protected void LogDbOp(string? name)
         {
diff --git a/Content.Server/Database/ServerDbManager.cs b/Content.Server/Database/ServerDbManager.cs
index dee6248cc39..6bbb5778fdb 100644
--- a/Content.Server/Database/ServerDbManager.cs
+++ b/Content.Server/Database/ServerDbManager.cs
@@ -252,6 +252,13 @@ Task<int> AddConnectionLogAsync(
 
         #endregion
 
+        #region Rules
+
+        Task<DateTimeOffset?> GetLastReadRules(NetUserId player);
+        Task SetLastReadRules(NetUserId player, DateTimeOffset time);
+
+        #endregion
+
         #region Admin Notes
 
         Task<int> AddAdminNote(int? roundId, Guid player, TimeSpan playtimeAtNote, string message, NoteSeverity severity, bool secret, Guid createdBy, DateTimeOffset createdAt, DateTimeOffset? expiryTime);
@@ -274,27 +281,7 @@ Task<int> AddConnectionLogAsync(
         Task DeleteAdminMessage(int id, Guid deletedBy, DateTimeOffset deletedAt);
         Task HideServerBanFromNotes(int id, Guid deletedBy, DateTimeOffset deletedAt);
         Task HideServerRoleBanFromNotes(int id, Guid deletedBy, DateTimeOffset deletedAt);
-
-        /// <summary>
-        /// Mark an admin message as being seen by the target player.
-        /// </summary>
-        /// <param name="id">The database ID of the admin message.</param>
-        /// <param name="dismissedToo">
-        /// If true, the message is "permanently dismissed" and will not be shown to the player again when they join.
-        /// </param>
-        Task MarkMessageAsSeen(int id, bool dismissedToo);
-
-        #endregion
-
-        #region Job Whitelists
-
-        Task AddJobWhitelist(Guid player, ProtoId<JobPrototype> job);
-
-
-        Task<List<string>> GetJobWhitelists(Guid player, CancellationToken cancel = default);
-        Task<bool> IsJobWhitelisted(Guid player, ProtoId<JobPrototype> job);
-
-        Task<bool> RemoveJobWhitelist(Guid player, ProtoId<JobPrototype> job);
+        Task MarkMessageAsSeen(int id);
 
         #endregion
     }
@@ -700,6 +687,18 @@ public Task PurgeUploadedResourceLogAsync(int days)
             return RunDbCommand(() => _db.PurgeUploadedResourceLogAsync(days));
         }
 
+        public Task<DateTimeOffset?> GetLastReadRules(NetUserId player)
+        {
+            DbReadOpsMetric.Inc();
+            return RunDbCommand(() => _db.GetLastReadRules(player));
+        }
+
+        public Task SetLastReadRules(NetUserId player, DateTimeOffset time)
+        {
+            DbWriteOpsMetric.Inc();
+            return RunDbCommand(() => _db.SetLastReadRules(player, time));
+        }
+
         public Task<int> AddAdminNote(int? roundId, Guid player, TimeSpan playtimeAtNote, string message, NoteSeverity severity, bool secret, Guid createdBy, DateTimeOffset createdAt, DateTimeOffset? expiryTime)
         {
             DbWriteOpsMetric.Inc();
@@ -787,7 +786,7 @@ public Task<int> AddAdminMessage(int? roundId, Guid player, TimeSpan playtimeAtN
             return RunDbCommand(() => _db.GetServerRoleBanAsNoteAsync(id));
         }
 
-        public Task<List<IAdminRemarksRecord>> GetAllAdminRemarks(Guid player)
+    public Task<List<IAdminRemarksRecord>> GetAllAdminRemarks(Guid player)
         {
             DbReadOpsMetric.Inc();
             return RunDbCommand(() => _db.GetAllAdminRemarks(player));
diff --git a/Content.Server/Database/ServerDbPostgres.cs b/Content.Server/Database/ServerDbPostgres.cs
index fd4699fff4e..2afb5a51a49 100644
--- a/Content.Server/Database/ServerDbPostgres.cs
+++ b/Content.Server/Database/ServerDbPostgres.cs
@@ -527,9 +527,7 @@ protected override DateTime NormalizeDatabaseTime(DateTime time)
             return time;
         }
 
-        private async Task<DbGuardImpl> GetDbImpl(
-            CancellationToken cancel = default,
-            [CallerMemberName] string? name = null)
+        private async Task<DbGuardImpl> GetDbImpl([CallerMemberName] string? name = null)
         {
             LogDbOp(name);
 
diff --git a/Content.Server/Database/ServerDbSqlite.cs b/Content.Server/Database/ServerDbSqlite.cs
index ffec90bb43d..520bf81be51 100644
--- a/Content.Server/Database/ServerDbSqlite.cs
+++ b/Content.Server/Database/ServerDbSqlite.cs
@@ -514,9 +514,7 @@ protected override DateTime NormalizeDatabaseTime(DateTime time)
             return DateTime.SpecifyKind(time, DateTimeKind.Utc);
         }
 
-        private async Task<DbGuardImpl> GetDbImpl(
-            CancellationToken cancel = default,
-            [CallerMemberName] string? name = null)
+        private async Task<DbGuardImpl> GetDbImpl([CallerMemberName] string? name = null)
         {
             LogDbOp(name);
             await _dbReadyTask;

From 8478f830cf4ae91143a637065a3c97b852ee33e7 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Date: Fri, 1 Mar 2024 20:10:49 -0800
Subject: [PATCH 223/366] Add test to check that there are no pending database
 model changes (#25762)

---
 Content.Server/Database/ServerDbBase.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index d7db054209a..74593ed641f 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -1561,6 +1561,12 @@ protected async Task<List<ServerRoleBanNoteRecord>> GetGroupedServerRoleBansAsNo
             return time != null ? NormalizeDatabaseTime(time.Value) : time;
         }
 
+        public async Task<bool> HasPendingModelChanges()
+        {
+            await using var db = await GetDb();
+            return db.DbContext.Database.HasPendingModelChanges();
+        }
+
         protected abstract Task<DbGuard> GetDb([CallerMemberName] string? name = null);
 
         protected void LogDbOp(string? name)

From 9b2067bb42036589c31a1804954462d87d6d2975 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Tue, 7 May 2024 06:21:03 +0200
Subject: [PATCH 224/366] Fix preference loading bugs (#27742)

First bug: if an error occured during pref loading code, it would fail. If the person then readied up, it would likely cause the round to fail to start.

Why could they ready up? The code only checks that the prefs finished loading, not that they finished loading *successfully*. Whoops.

Anyways, now people get kicked if their prefs fail to load. And I improved the error handling.

Second bug: if a user disconnected while their prefs were loading, it would cause an exception. This exception would go unobserved on lobby servers or raise through gameticker on non-lobby servers.

This happened even on a live server once and then triggered the first bug, but idk how.

Fixed this by properly plumbing through cancellation into the preferences loading code. The stuff is now cancelled properly.

Third bug: if somebody has a loadout item with a playtime requirement active, load-time sanitization of player prefs could run into a race condition because the sanitization can happen *before* play time was loaded.

Fixed by moving pref sanitizations to a later stage in the load process.
---
 Content.Server/Database/ServerDbBase.cs       |  4 +++-
 Content.Server/Database/ServerDbPostgres.cs   |  4 +++-
 Content.Server/Database/ServerDbSqlite.cs     |  4 +++-
 Content.Server/Database/UserDbDataManager.cs  | 21 +++++++------------
 .../GameTicking/GameTicker.Player.cs          |  5 ++++-
 .../Managers/IServerPreferencesManager.cs     |  1 +
 .../Managers/ServerPreferencesManager.cs      | 12 +++++++++++
 7 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index 74593ed641f..732fd9ff70d 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -1567,7 +1567,9 @@ public async Task<bool> HasPendingModelChanges()
             return db.DbContext.Database.HasPendingModelChanges();
         }
 
-        protected abstract Task<DbGuard> GetDb([CallerMemberName] string? name = null);
+        protected abstract Task<DbGuard> GetDb(
+            CancellationToken cancel = default,
+            [CallerMemberName] string? name = null);
 
         protected void LogDbOp(string? name)
         {
diff --git a/Content.Server/Database/ServerDbPostgres.cs b/Content.Server/Database/ServerDbPostgres.cs
index 2afb5a51a49..fd4699fff4e 100644
--- a/Content.Server/Database/ServerDbPostgres.cs
+++ b/Content.Server/Database/ServerDbPostgres.cs
@@ -527,7 +527,9 @@ protected override DateTime NormalizeDatabaseTime(DateTime time)
             return time;
         }
 
-        private async Task<DbGuardImpl> GetDbImpl([CallerMemberName] string? name = null)
+        private async Task<DbGuardImpl> GetDbImpl(
+            CancellationToken cancel = default,
+            [CallerMemberName] string? name = null)
         {
             LogDbOp(name);
 
diff --git a/Content.Server/Database/ServerDbSqlite.cs b/Content.Server/Database/ServerDbSqlite.cs
index 520bf81be51..ffec90bb43d 100644
--- a/Content.Server/Database/ServerDbSqlite.cs
+++ b/Content.Server/Database/ServerDbSqlite.cs
@@ -514,7 +514,9 @@ protected override DateTime NormalizeDatabaseTime(DateTime time)
             return DateTime.SpecifyKind(time, DateTimeKind.Utc);
         }
 
-        private async Task<DbGuardImpl> GetDbImpl([CallerMemberName] string? name = null)
+        private async Task<DbGuardImpl> GetDbImpl(
+            CancellationToken cancel = default,
+            [CallerMemberName] string? name = null)
         {
             LogDbOp(name);
             await _dbReadyTask;
diff --git a/Content.Server/Database/UserDbDataManager.cs b/Content.Server/Database/UserDbDataManager.cs
index fde610a6fdd..700b75846ae 100644
--- a/Content.Server/Database/UserDbDataManager.cs
+++ b/Content.Server/Database/UserDbDataManager.cs
@@ -1,6 +1,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Content.Server.Preferences.Managers;
+using Robust.Server.Player;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;
@@ -17,12 +18,11 @@ namespace Content.Server.Database;
 /// </remarks>
 public sealed class UserDbDataManager : IPostInjectInit
 {
+    [Dependency] private readonly IServerPreferencesManager _prefs = default!;
     [Dependency] private readonly ILogManager _logManager = default!;
+    [Dependency] private readonly PlayTimeTrackingManager _playTimeTracking = default!;
 
     private readonly Dictionary<NetUserId, UserData> _users = new();
-    private readonly List<OnLoadPlayer> _onLoadPlayer = [];
-    private readonly List<OnFinishLoad> _onFinishLoad = [];
-    private readonly List<OnPlayerDisconnect> _onPlayerDisconnect = [];
 
     private ISawmill _sawmill = default!;
 
@@ -63,19 +63,12 @@ private async Task Load(ICommonSession session, CancellationToken cancel)
         // As such, this task must NOT throw a non-cancellation error!
         try
         {
-            var tasks = new List<Task>();
-            foreach (var action in _onLoadPlayer)
-            {
-                tasks.Add(action(session, cancel));
-            }
-
-            await Task.WhenAll(tasks);
+            await Task.WhenAll(
+                _prefs.LoadData(session, cancel),
+                _playTimeTracking.LoadData(session, cancel));
 
             cancel.ThrowIfCancellationRequested();
-            foreach (var action in _onFinishLoad)
-            {
-                action(session);
-            }
+            _prefs.SanitizeData(session);
 
             _sawmill.Verbose($"Load complete for user {session}");
         }
diff --git a/Content.Server/GameTicking/GameTicker.Player.cs b/Content.Server/GameTicking/GameTicker.Player.cs
index debe8e2f1f8..a7f7a7fa718 100644
--- a/Content.Server/GameTicking/GameTicker.Player.cs
+++ b/Content.Server/GameTicking/GameTicker.Player.cs
@@ -139,13 +139,16 @@ private async void PlayerStatusChanged(object? sender, SessionStatusEventArgs ar
             async void SpawnWaitDb()
             {
                 try
-                {await _userDb.WaitLoadComplete(session);}
+                {
+                    await _userDb.WaitLoadComplete(session);
+                }
                 catch (OperationCanceledException)
                 {
                     // Bail, user must've disconnected or something.
                     Log.Debug($"Database load cancelled while waiting to spawn {session}");
                     return;
                 }
+
                 SpawnPlayer(session, EntityUid.Invalid);
             }
 
diff --git a/Content.Server/Preferences/Managers/IServerPreferencesManager.cs b/Content.Server/Preferences/Managers/IServerPreferencesManager.cs
index cdb53bb4be7..d9b864e9816 100644
--- a/Content.Server/Preferences/Managers/IServerPreferencesManager.cs
+++ b/Content.Server/Preferences/Managers/IServerPreferencesManager.cs
@@ -12,6 +12,7 @@ public interface IServerPreferencesManager
         void Init();
 
         Task LoadData(ICommonSession session, CancellationToken cancel);
+        void SanitizeData(ICommonSession session);
         void FinishLoad(ICommonSession session);
         void OnClientDisconnected(ICommonSession session);
 
diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
index df7bac72e90..e12359fb729 100644
--- a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
+++ b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
@@ -9,6 +9,7 @@
 using Robust.Shared.Configuration;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 
@@ -27,6 +28,7 @@ public sealed class ServerPreferencesManager : IServerPreferencesManager, IPostI
         [Dependency] private readonly IDependencyCollection _dependencies = default!;
         [Dependency] private readonly ILogManager _log = default!;
         [Dependency] private readonly UserDbDataManager _userDb = default!;
+        [Dependency] private readonly IPrototypeManager _protos = default!;
 
         // Cache player prefs on the server so we don't need as much async hell related to them.
         private readonly Dictionary<NetUserId, PlayerPrefData> _cachedPlayerPrefs =
@@ -221,6 +223,16 @@ public void FinishLoad(ICommonSession session)
             _netManager.ServerSendMessage(msg, session.Channel);
         }
 
+        public void SanitizeData(ICommonSession session)
+        {
+            // This is a separate step from the actual database load.
+            // Sanitizing preferences requires play time info due to loadouts.
+            // And play time info is loaded concurrently from the DB with preferences.
+            var data = _cachedPlayerPrefs[session.UserId];
+            DebugTools.Assert(data.Prefs != null);
+            data.Prefs = SanitizePreferences(session, data.Prefs, _dependencies);
+        }
+
         public void OnClientDisconnected(ICommonSession session)
         {
             _cachedPlayerPrefs.Remove(session.UserId);

From f776bee333e06467fbd38065c21d7f718091a172 Mon Sep 17 00:00:00 2001
From: Julian Giebel <juliangiebel@live.de>
Date: Tue, 20 Aug 2024 23:31:33 +0200
Subject: [PATCH 225/366] Kick on ban for entire server group (#28649)

* Start work on PostgresNotificationManager
Implement initial version of init and listening code

* Finish implementing PostgresNotificationManager
Implement ban insert trigger

* Implement ignoring notifications if the ban was from the same server

* Address reviews

* Fixes and refactorings

Fix typo in migration SQL

Pull new code in BanManager out into its own partial file.

Unify logic to kick somebody with that when a new ban is placed directly on the server.

New bans are now checked against all parameters (IP, HWID) instead of just user ID.

Extracted SQLite ban matching code into a new class so that it can mostly be re-used by the ban notification code. No copy-paste here.

Database notifications are now not implicitly sent to the main thread, this means basic checks will happen in the thread pool beforehand.

Bans without user ID are now sent to servers. Bans are rate limited to avoid undue work from mass ban imports, beyond the rate limit they are dropped.

Improved error handling and logging for the whole system.

Matching bans against connected players requires knowing their ban exemption flags. These are now cached when the player connects.

ServerBanDef now has exemption flags, again to allow matching full ban details for ban notifications.

Made database notifications a proper struct type to reduce copy pasting a tuple.

Remove copy pasted connection string building code by just... passing the string into the constructor.

Add lock around _notificationHandlers just in case.

Fixed postgres connection wait not being called in a loop and therefore spamming LISTEN commands for every received notification.

Added more error handling and logging to notification listener.

Removed some copy pasting from SQLite database layer too while I was at it because god forbid we expect anybody else to do all the work in this project.

Sorry Julian

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
---
 ...40606121555_ban_notify_trigger.Designer.cs | 1913 +++++++++++++++++
 .../20240606121555_ban_notify_trigger.cs      |   44 +
 Content.Server.Database/Model.cs              |   13 +
 .../Managers/BanManager.Notification.cs       |  123 ++
 .../Administration/Managers/BanManager.cs     |   75 +-
 Content.Server/Database/BanMatcher.cs         |   90 +
 Content.Server/Database/ServerBanDef.cs       |    8 +-
 Content.Server/Database/ServerDbBase.cs       |   20 +-
 Content.Server/Database/ServerDbManager.cs    |   85 +-
 .../ServerDbPostgres.Notifications.cs         |  121 ++
 Content.Server/Database/ServerDbPostgres.cs   |   19 +-
 Content.Server/Database/ServerDbSqlite.cs     |   62 +-
 Resources/Locale/en-US/info/ban.ftl           |    3 +
 13 files changed, 2510 insertions(+), 66 deletions(-)
 create mode 100644 Content.Server.Database/Migrations/Postgres/20240606121555_ban_notify_trigger.Designer.cs
 create mode 100644 Content.Server.Database/Migrations/Postgres/20240606121555_ban_notify_trigger.cs
 create mode 100644 Content.Server/Administration/Managers/BanManager.Notification.cs
 create mode 100644 Content.Server/Database/BanMatcher.cs
 create mode 100644 Content.Server/Database/ServerDbPostgres.Notifications.cs

diff --git a/Content.Server.Database/Migrations/Postgres/20240606121555_ban_notify_trigger.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240606121555_ban_notify_trigger.Designer.cs
new file mode 100644
index 00000000000..2f06e5ff984
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20240606121555_ban_notify_trigger.Designer.cs
@@ -0,0 +1,1913 @@
+// <auto-generated />
+using System;
+using System.Net;
+using System.Text.Json;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using NpgsqlTypes;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    [DbContext(typeof(PostgresServerDbContext))]
+    [Migration("20240606121555_ban_notify_trigger")]
+    partial class ban_notify_trigger
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.0")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("boolean")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<short>("Impact")
+                        .HasColumnType("smallint")
+                        .HasColumnName("impact");
+
+                    b.Property<JsonDocument>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Message")
+                        .HasAnnotation("Npgsql:TsVectorConfig", "english");
+
+                    NpgsqlIndexBuilderExtensions.HasMethod(b.HasIndex("Message"), "GIN");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("integer")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_messages_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dismissed");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("boolean")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_notes_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("boolean")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_watchlists_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("antag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("assigned_user_id_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<IPAddress>("Address")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("smallint")
+                        .HasColumnName("denied");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("time");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("job_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("play_time_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("interval")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("player_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<IPAddress>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<byte[]>("LastSeenHWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("last_seen_hwid");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", null, t =>
+                        {
+                            t.HasCheckConstraint("LastSeenAddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= last_seen_address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("integer")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Age")
+                        .HasColumnType("integer")
+                        .HasColumnName("age");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_name");
+
+                    b.Property<JsonDocument>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("integer")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("integer")
+                        .HasColumnName("slot");
+
+                    b.Property<int>("SpawnPriority")
+                        .HasColumnType("integer")
+                        .HasColumnName("spawn_priority");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<int>("ProfileLoadoutGroupId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout");
+
+                    b.HasIndex("ProfileLoadoutGroupId");
+
+                    b.ToTable("profile_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("group_name");
+
+                    b.Property<int>("ProfileRoleLoadoutId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout_group");
+
+                    b.HasIndex("ProfileRoleLoadoutId");
+
+                    b.ToTable("profile_loadout_group", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("RoleName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_role_loadout");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("profile_role_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.HasKey("PlayerUserId", "RoleId")
+                        .HasName("PK_role_whitelists");
+
+                    b.ToTable("role_whitelists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<NpgsqlInet?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("boolean")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("integer")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("integer")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_hit_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_role_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<NpgsqlInet?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("role_unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("trait_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("integer")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileLoadoutGroup", "ProfileLoadoutGroup")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileLoadoutGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_profile_loadout_group_profile_loadout_group~");
+
+                    b.Navigation("ProfileLoadoutGroup");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileRoleLoadout", "ProfileRoleLoadout")
+                        .WithMany("Groups")
+                        .HasForeignKey("ProfileRoleLoadoutId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_group_profile_role_loadout_profile_role_loa~");
+
+                    b.Navigation("ProfileRoleLoadout");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_role_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("JobWhitelists")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_role_whitelists_player_player_user_id");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+
+                    b.Navigation("JobWhitelists");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Loadouts");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Navigation("Loadouts");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Navigation("Groups");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/20240606121555_ban_notify_trigger.cs b/Content.Server.Database/Migrations/Postgres/20240606121555_ban_notify_trigger.cs
new file mode 100644
index 00000000000..b84d230b455
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20240606121555_ban_notify_trigger.cs
@@ -0,0 +1,44 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    /// <inheritdoc />
+    public partial class ban_notify_trigger : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql("""
+                create or replace function send_server_ban_notification()
+                    returns trigger as $$
+                    declare
+                        x_server_id integer;
+                    begin
+                        select round.server_id into x_server_id from round where round.round_id = NEW.round_id;
+
+                        perform pg_notify('ban_notification', json_build_object('ban_id', NEW.server_ban_id, 'server_id', x_server_id)::text);
+                        return NEW;
+                    end;
+                    $$ LANGUAGE plpgsql;
+                """);
+
+            migrationBuilder.Sql("""
+                    create or replace trigger notify_on_server_ban_insert
+                        after insert on server_ban
+                        for each row
+                        execute function send_server_ban_notification();
+                """);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql("""
+                drop trigger notify_on_server_ban_insert on server_ban;
+                drop function send_server_ban_notification;
+            """);
+        }
+    }
+}
diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index b6effc5e801..a8174197838 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -627,6 +627,19 @@ public enum ServerBanExemptFlags
         /// Intended use is for users with shared connections. This should not be used as an alternative to <see cref="Datacenter"/>.
         /// </remarks>
         IP = 1 << 1,
+
+        /// <summary>
+        /// Ban is an IP range that is only applied for first time joins.
+        /// </summary>
+        /// <remarks>
+        /// Intended for use with residential IP ranges that are often used maliciously.
+        /// </remarks>
+        BlacklistedRange = 1 << 2,
+
+        /// <summary>
+        /// Represents having all possible exemption flags.
+        /// </summary>
+        All = int.MaxValue,
         // @formatter:on
     }
 
diff --git a/Content.Server/Administration/Managers/BanManager.Notification.cs b/Content.Server/Administration/Managers/BanManager.Notification.cs
new file mode 100644
index 00000000000..e9bfa628841
--- /dev/null
+++ b/Content.Server/Administration/Managers/BanManager.Notification.cs
@@ -0,0 +1,123 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Content.Server.Database;
+
+namespace Content.Server.Administration.Managers;
+
+public sealed partial class BanManager
+{
+    // Responsible for ban notification handling.
+    // Ban notifications are sent through the database to notify the entire server group that a new ban has been added,
+    // so that people will get kicked if they are banned on a different server than the one that placed the ban.
+    //
+    // Ban notifications are currently sent by a trigger in the database, automatically.
+
+    /// <summary>
+    /// The notification channel used to broadcast information about new bans.
+    /// </summary>
+    public const string BanNotificationChannel = "ban_notification";
+
+    // Rate limit to avoid undue load from mass-ban imports.
+    // Only process 10 bans per 30 second interval.
+    //
+    // I had the idea of maybe binning this by postgres transaction ID,
+    // to avoid any possibility of dropping a normal ban by coincidence.
+    // Didn't bother implementing this though.
+    private static readonly TimeSpan BanNotificationRateLimitTime = TimeSpan.FromSeconds(30);
+    private const int BanNotificationRateLimitCount = 10;
+
+    private readonly object _banNotificationRateLimitStateLock = new();
+    private TimeSpan _banNotificationRateLimitStart;
+    private int _banNotificationRateLimitCount;
+
+    private void OnDatabaseNotification(DatabaseNotification notification)
+    {
+        if (notification.Channel != BanNotificationChannel)
+            return;
+
+        if (notification.Payload == null)
+        {
+            _sawmill.Error("Got ban notification with null payload!");
+            return;
+        }
+
+        BanNotificationData data;
+        try
+        {
+            data = JsonSerializer.Deserialize<BanNotificationData>(notification.Payload)
+                   ?? throw new JsonException("Content is null");
+        }
+        catch (JsonException e)
+        {
+            _sawmill.Error($"Got invalid JSON in ban notification: {e}");
+            return;
+        }
+
+        if (!CheckBanRateLimit())
+        {
+            _sawmill.Verbose("Not processing ban notification due to rate limit");
+            return;
+        }
+
+        _taskManager.RunOnMainThread(() => ProcessBanNotification(data));
+    }
+
+    private async void ProcessBanNotification(BanNotificationData data)
+    {
+        if ((await _entryManager.ServerEntity).Id == data.ServerId)
+        {
+            _sawmill.Verbose("Not processing ban notification: came from this server");
+            return;
+        }
+
+        _sawmill.Verbose($"Processing ban notification for ban {data.BanId}");
+        var ban = await _db.GetServerBanAsync(data.BanId);
+        if (ban == null)
+        {
+            _sawmill.Warning($"Ban in notification ({data.BanId}) didn't exist?");
+            return;
+        }
+
+        KickMatchingConnectedPlayers(ban, "ban notification");
+    }
+
+    private bool CheckBanRateLimit()
+    {
+        lock (_banNotificationRateLimitStateLock)
+        {
+            var now = _gameTiming.RealTime;
+            if (_banNotificationRateLimitStart + BanNotificationRateLimitTime < now)
+            {
+                // Rate limit period expired, restart it.
+                _banNotificationRateLimitCount = 1;
+                _banNotificationRateLimitStart = now;
+                return true;
+            }
+
+            _banNotificationRateLimitCount += 1;
+            return _banNotificationRateLimitCount <= BanNotificationRateLimitCount;
+        }
+    }
+
+    /// <summary>
+    /// Data sent along the notification channel for a single ban notification.
+    /// </summary>
+    private sealed class BanNotificationData
+    {
+        /// <summary>
+        /// The ID of the new ban object in the database to check.
+        /// </summary>
+        [JsonRequired, JsonPropertyName("ban_id")]
+        public int BanId { get; init; }
+
+        /// <summary>
+        /// The id of the server the ban was made on.
+        /// This is used to avoid double work checking the ban on the originating server.
+        /// </summary>
+        /// <remarks>
+        /// This is optional in case the ban was made outside a server (SS14.Admin)
+        /// </remarks>
+        [JsonPropertyName("server_id")]
+        public int? ServerId { get; init; }
+    }
+}
diff --git a/Content.Server/Administration/Managers/BanManager.cs b/Content.Server/Administration/Managers/BanManager.cs
index 68bd8170265..946770d6aaf 100644
--- a/Content.Server/Administration/Managers/BanManager.cs
+++ b/Content.Server/Administration/Managers/BanManager.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Net;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using Content.Server.Chat.Managers;
 using Content.Server.Database;
@@ -12,16 +13,18 @@
 using Content.Shared.Players.PlayTimeTracking;
 using Content.Shared.Roles;
 using Robust.Server.Player;
+using Robust.Shared.Asynchronous;
 using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Administration.Managers;
 
-public sealed class BanManager : IBanManager, IPostInjectInit
+public sealed partial class BanManager : IBanManager, IPostInjectInit
 {
     [Dependency] private readonly IServerDbManager _db = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
@@ -29,9 +32,13 @@ public sealed class BanManager : IBanManager, IPostInjectInit
     [Dependency] private readonly IEntitySystemManager _systems = default!;
     [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly ILocalizationManager _localizationManager = default!;
+    [Dependency] private readonly ServerDbEntryManager _entryManager = default!;
     [Dependency] private readonly IChatManager _chat = default!;
     [Dependency] private readonly INetManager _netManager = default!;
     [Dependency] private readonly ILogManager _logManager = default!;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly ITaskManager _taskManager = default!;
+    [Dependency] private readonly UserDbDataManager _userDbData = default!;
 
     private ISawmill _sawmill = default!;
 
@@ -39,12 +46,34 @@ public sealed class BanManager : IBanManager, IPostInjectInit
     public const string JobPrefix = "Job:";
 
     private readonly Dictionary<NetUserId, HashSet<ServerRoleBanDef>> _cachedRoleBans = new();
+    // Cached ban exemption flags are used to handle
+    private readonly Dictionary<ICommonSession, ServerBanExemptFlags> _cachedBanExemptions = new();
 
     public void Initialize()
     {
         _playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
 
         _netManager.RegisterNetMessage<MsgRoleBans>();
+
+        _db.SubscribeToNotifications(OnDatabaseNotification);
+
+        _userDbData.AddOnLoadPlayer(CachePlayerData);
+        _userDbData.AddOnPlayerDisconnect(ClearPlayerData);
+    }
+
+    private async Task CachePlayerData(ICommonSession player, CancellationToken cancel)
+    {
+        // Yeah so role ban loading code isn't integrated with exempt flag loading code.
+        // Have you seen how garbage role ban code code is? I don't feel like refactoring it right now.
+
+        var flags = await _db.GetBanExemption(player.UserId, cancel);
+        cancel.ThrowIfCancellationRequested();
+        _cachedBanExemptions[player] = flags;
+    }
+
+    private void ClearPlayerData(ICommonSession player)
+    {
+        _cachedBanExemptions.Remove(player);
     }
 
     private async void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs e)
@@ -168,17 +197,43 @@ public async void CreateServerBan(NetUserId? target, string? targetUsername, Net
         _sawmill.Info(logMessage);
         _chat.SendAdminAlert(logMessage);
 
-        // If we're not banning a player we don't care about disconnecting people
-        if (target == null)
-            return;
+        KickMatchingConnectedPlayers(banDef, "newly placed ban");
+    }
 
-        // Is the player connected?
-        if (!_playerManager.TryGetSessionById(target.Value, out var targetPlayer))
-            return;
-        // If they are, kick them
-        var message = banDef.FormatBanMessage(_cfg, _localizationManager);
-        targetPlayer.Channel.Disconnect(message);
+    private void KickMatchingConnectedPlayers(ServerBanDef def, string source)
+    {
+        foreach (var player in _playerManager.Sessions)
+        {
+            if (BanMatchesPlayer(player, def))
+            {
+                KickForBanDef(player, def);
+                _sawmill.Info($"Kicked player {player.Name} ({player.UserId}) through {source}");
+            }
+        }
     }
+
+    private bool BanMatchesPlayer(ICommonSession player, ServerBanDef ban)
+    {
+        var playerInfo = new BanMatcher.PlayerInfo
+        {
+            UserId = player.UserId,
+            Address = player.Channel.RemoteEndPoint.Address,
+            HWId = player.Channel.UserData.HWId,
+            // It's possible for the player to not have cached data loading yet due to coincidental timing.
+            // If this is the case, we assume they have all flags to avoid false-positives.
+            ExemptFlags = _cachedBanExemptions.GetValueOrDefault(player, ServerBanExemptFlags.All),
+            IsNewPlayer = false,
+        };
+
+        return BanMatcher.BanMatches(ban, playerInfo);
+    }
+
+    private void KickForBanDef(ICommonSession player, ServerBanDef def)
+    {
+        var message = def.FormatBanMessage(_cfg, _localizationManager);
+        player.Channel.Disconnect(message);
+    }
+
     #endregion
 
     #region Job Bans
diff --git a/Content.Server/Database/BanMatcher.cs b/Content.Server/Database/BanMatcher.cs
new file mode 100644
index 00000000000..e58e5b0b5f6
--- /dev/null
+++ b/Content.Server/Database/BanMatcher.cs
@@ -0,0 +1,90 @@
+using System.Collections.Immutable;
+using System.Net;
+using Content.Server.IP;
+using Robust.Shared.Network;
+
+namespace Content.Server.Database;
+
+/// <summary>
+/// Implements logic to match a <see cref="ServerBanDef"/> against a player query.
+/// </summary>
+/// <remarks>
+/// <para>
+/// This implementation is used by in-game ban matching code, and partially by the SQLite database layer.
+/// Some logic is duplicated into both the SQLite and PostgreSQL database layers to provide more optimal SQL queries.
+/// Both should be kept in sync, please!
+/// </para>
+/// </remarks>
+public static class BanMatcher
+{
+    /// <summary>
+    /// Check whether a ban matches the specified player info.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// This function does not check whether the ban itself is expired or manually unbanned.
+    /// </para>
+    /// </remarks>
+    /// <param name="ban">The ban information.</param>
+    /// <param name="player">Information about the player to match against.</param>
+    /// <returns>True if the ban matches the provided player info.</returns>
+    public static bool BanMatches(ServerBanDef ban, in PlayerInfo player)
+    {
+        var exemptFlags = player.ExemptFlags;
+        // Any flag to bypass BlacklistedRange bans.
+        if (exemptFlags != ServerBanExemptFlags.None)
+            exemptFlags |= ServerBanExemptFlags.BlacklistedRange;
+
+        if ((ban.ExemptFlags & exemptFlags) != 0)
+            return false;
+
+        if (!player.ExemptFlags.HasFlag(ServerBanExemptFlags.IP)
+            && player.Address != null
+            && ban.Address is not null
+            && player.Address.IsInSubnet(ban.Address.Value)
+            && (!ban.ExemptFlags.HasFlag(ServerBanExemptFlags.BlacklistedRange) || player.IsNewPlayer))
+        {
+            return true;
+        }
+
+        if (player.UserId is { } id && ban.UserId == id.UserId)
+        {
+            return true;
+        }
+
+        return player.HWId is { Length: > 0 } hwIdVar
+               && ban.HWId != null
+               && hwIdVar.AsSpan().SequenceEqual(ban.HWId.Value.AsSpan());
+    }
+
+    /// <summary>
+    /// A simple struct containing player info used to match bans against.
+    /// </summary>
+    public struct PlayerInfo
+    {
+        /// <summary>
+        /// The user ID of the player.
+        /// </summary>
+        public NetUserId? UserId;
+
+        /// <summary>
+        /// The IP address of the player.
+        /// </summary>
+        public IPAddress? Address;
+
+        /// <summary>
+        /// The hardware ID of the player.
+        /// </summary>
+        public ImmutableArray<byte>? HWId;
+
+        /// <summary>
+        /// Exemption flags the player has been granted.
+        /// </summary>
+        public ServerBanExemptFlags ExemptFlags;
+
+        /// <summary>
+        /// True if this player is new and is thus eligible for more bans.
+        /// </summary>
+        public bool IsNewPlayer;
+    }
+}
diff --git a/Content.Server/Database/ServerBanDef.cs b/Content.Server/Database/ServerBanDef.cs
index 9d67537bd22..09a960e9a6c 100644
--- a/Content.Server/Database/ServerBanDef.cs
+++ b/Content.Server/Database/ServerBanDef.cs
@@ -23,9 +23,9 @@ public sealed class ServerBanDef
         public NoteSeverity Severity { get; set; }
         public NetUserId? BanningAdmin { get; }
         public ServerUnbanDef? Unban { get; }
+        public ServerBanExemptFlags ExemptFlags { get; }
 
-        public ServerBanDef(
-            int? id,
+        public ServerBanDef(int? id,
             NetUserId? userId,
             (IPAddress, int)? address,
             ImmutableArray<byte>? hwId,
@@ -36,7 +36,8 @@ public ServerBanDef(
             string reason,
             NoteSeverity severity,
             NetUserId? banningAdmin,
-            ServerUnbanDef? unban)
+            ServerUnbanDef? unban,
+            ServerBanExemptFlags exemptFlags = default)
         {
             if (userId == null && address == null && hwId ==  null)
             {
@@ -62,6 +63,7 @@ public ServerBanDef(
             Severity = severity;
             BanningAdmin = banningAdmin;
             Unban = unban;
+            ExemptFlags = exemptFlags;
         }
 
         public string FormatBanMessage(IConfigurationManager cfg, ILocalizationManager loc)
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index 732fd9ff70d..02d8e03440d 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -27,6 +27,8 @@ public abstract class ServerDbBase
     {
         private readonly ISawmill _opsLog;
 
+        public event Action<DatabaseNotification>? OnNotificationReceived;
+
         /// <param name="opsLog">Sawmill to trace log database operations to.</param>
         public ServerDbBase(ISawmill opsLog)
         {
@@ -394,13 +396,16 @@ public async Task EditServerBan(int id, string reason, NoteSeverity severity, Da
             await db.DbContext.SaveChangesAsync();
         }
 
-        protected static async Task<ServerBanExemptFlags?> GetBanExemptionCore(DbGuard db, NetUserId? userId)
+        protected static async Task<ServerBanExemptFlags?> GetBanExemptionCore(
+            DbGuard db,
+            NetUserId? userId,
+            CancellationToken cancel = default)
         {
             if (userId == null)
                 return null;
 
             var exemption = await db.DbContext.BanExemption
-                .SingleOrDefaultAsync(e => e.UserId == userId.Value.UserId);
+                .SingleOrDefaultAsync(e => e.UserId == userId.Value.UserId, cancellationToken: cancel);
 
             return exemption?.Flags;
         }
@@ -431,11 +436,11 @@ public async Task UpdateBanExemption(NetUserId userId, ServerBanExemptFlags flag
             await db.DbContext.SaveChangesAsync();
         }
 
-        public async Task<ServerBanExemptFlags> GetBanExemption(NetUserId userId)
+        public async Task<ServerBanExemptFlags> GetBanExemption(NetUserId userId, CancellationToken cancel)
         {
-            await using var db = await GetDb();
+            await using var db = await GetDb(cancel);
 
-            var flags = await GetBanExemptionCore(db, userId);
+            var flags = await GetBanExemptionCore(db, userId, cancel);
             return flags ?? ServerBanExemptFlags.None;
         }
 
@@ -1641,5 +1646,10 @@ public async Task<bool> RemoveJobWhitelist(Guid player, ProtoId<JobPrototype> jo
         }
 
         #endregion
+
+        protected void NotificationReceived(DatabaseNotification notification) =>
+            OnNotificationReceived?.Invoke(notification);
+
+        public virtual void Shutdown() { }
     }
 }
diff --git a/Content.Server/Database/ServerDbManager.cs b/Content.Server/Database/ServerDbManager.cs
index 6bbb5778fdb..54701da76e1 100644
--- a/Content.Server/Database/ServerDbManager.cs
+++ b/Content.Server/Database/ServerDbManager.cs
@@ -116,7 +116,7 @@ public Task EditServerBan(
         /// Get current ban exemption flags for a user
         /// </summary>
         /// <returns><see cref="ServerBanExemptFlags.None"/> if the user is not exempt from any bans.</returns>
-        Task<ServerBanExemptFlags> GetBanExemption(NetUserId userId);
+        Task<ServerBanExemptFlags> GetBanExemption(NetUserId userId, CancellationToken cancel = default);
 
         #endregion
 
@@ -284,6 +284,43 @@ Task<int> AddConnectionLogAsync(
         Task MarkMessageAsSeen(int id);
 
         #endregion
+
+        #region DB Notifications
+
+        void SubscribeToNotifications(Action<DatabaseNotification> handler);
+
+        /// <summary>
+        /// Inject a notification as if it was created by the database. This is intended for testing.
+        /// </summary>
+        /// <param name="notification">The notification to trigger</param>
+        void InjectTestNotification(DatabaseNotification notification);
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Represents a notification sent between servers via the database layer.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// Database notifications are a simple system to broadcast messages to an entire server group
+    /// backed by the same database. For example, this is used to notify all servers of new ban records.
+    /// </para>
+    /// <para>
+    /// They are currently implemented  by the PostgreSQL <c>NOTIFY</c> and <c>LISTEN</c> commands.
+    /// </para>
+    /// </remarks>
+    public struct DatabaseNotification
+    {
+        /// <summary>
+        /// The channel for the notification. This can be used to differentiate notifications for different purposes.
+        /// </summary>
+        public required string Channel { get; set; }
+
+        /// <summary>
+        /// The actual contents of the notification. Optional.
+        /// </summary>
+        public string? Payload { get; set; }
     }
 
     public sealed class ServerDbManager : IServerDbManager
@@ -313,6 +350,8 @@ public sealed class ServerDbManager : IServerDbManager
         // This is that connection, close it when we shut down.
         private SqliteConnection? _sqliteInMemoryConnection;
 
+        private readonly List<Action<DatabaseNotification>> _notificationHandlers = [];
+
         public void Init()
         {
             _msLogProvider = new LoggingProvider(_logMgr);
@@ -325,6 +364,7 @@ public void Init()
 
             var engine = _cfg.GetCVar(CCVars.DatabaseEngine).ToLower();
             var opsLog = _logMgr.GetSawmill("db.op");
+            var notifyLog = _logMgr.GetSawmill("db.notify");
             switch (engine)
             {
                 case "sqlite":
@@ -332,17 +372,22 @@ public void Init()
                     _db = new ServerDbSqlite(contextFunc, inMemory, _cfg, _synchronous, opsLog);
                     break;
                 case "postgres":
-                    var pgOptions = CreatePostgresOptions();
-                    _db = new ServerDbPostgres(pgOptions, _cfg, opsLog);
+                    var (pgOptions, conString) = CreatePostgresOptions();
+                    _db = new ServerDbPostgres(pgOptions, conString, _cfg, opsLog, notifyLog);
                     break;
                 default:
                     throw new InvalidDataException($"Unknown database engine {engine}.");
             }
+
+            _db.OnNotificationReceived += HandleDatabaseNotification;
         }
 
         public void Shutdown()
         {
+            _db.OnNotificationReceived -= HandleDatabaseNotification;
+
             _sqliteInMemoryConnection?.Dispose();
+            _db.Shutdown();
         }
 
         public Task<PlayerPreferences> InitPrefsAsync(
@@ -445,10 +490,10 @@ public Task UpdateBanExemption(NetUserId userId, ServerBanExemptFlags flags)
             return RunDbCommand(() => _db.UpdateBanExemption(userId, flags));
         }
 
-        public Task<ServerBanExemptFlags> GetBanExemption(NetUserId userId)
+        public Task<ServerBanExemptFlags> GetBanExemption(NetUserId userId, CancellationToken cancel = default)
         {
             DbReadOpsMetric.Inc();
-            return RunDbCommand(() => _db.GetBanExemption(userId));
+            return RunDbCommand(() => _db.GetBanExemption(userId, cancel));
         }
 
         #region Role Ban
@@ -786,7 +831,7 @@ public Task<int> AddAdminMessage(int? roundId, Guid player, TimeSpan playtimeAtN
             return RunDbCommand(() => _db.GetServerRoleBanAsNoteAsync(id));
         }
 
-    public Task<List<IAdminRemarksRecord>> GetAllAdminRemarks(Guid player)
+        public Task<List<IAdminRemarksRecord>> GetAllAdminRemarks(Guid player)
         {
             DbReadOpsMetric.Inc();
             return RunDbCommand(() => _db.GetAllAdminRemarks(player));
@@ -887,6 +932,30 @@ public Task<bool> RemoveJobWhitelist(Guid player, ProtoId<JobPrototype> job)
             return RunDbCommand(() => _db.RemoveJobWhitelist(player, job));
         }
 
+        public void SubscribeToNotifications(Action<DatabaseNotification> handler)
+        {
+            lock (_notificationHandlers)
+            {
+                _notificationHandlers.Add(handler);
+            }
+        }
+
+        public void InjectTestNotification(DatabaseNotification notification)
+        {
+            HandleDatabaseNotification(notification);
+        }
+
+        private async void HandleDatabaseNotification(DatabaseNotification notification)
+        {
+            lock (_notificationHandlers)
+            {
+                foreach (var handler in _notificationHandlers)
+                {
+                    handler(notification);
+                }
+            }
+        }
+
         // Wrapper functions to run DB commands from the thread pool.
         // This will avoid SynchronizationContext capturing and avoid running CPU work on the main thread.
         // For SQLite, this will also enable read parallelization (within limits).
@@ -942,7 +1011,7 @@ private IAsyncEnumerable<T> RunDbCommand<T>(Func<IAsyncEnumerable<T>> command)
             return enumerable;
         }
 
-        private DbContextOptions<PostgresServerDbContext> CreatePostgresOptions()
+        private (DbContextOptions<PostgresServerDbContext> options, string connectionString) CreatePostgresOptions()
         {
             var host = _cfg.GetCVar(CCVars.DatabasePgHost);
             var port = _cfg.GetCVar(CCVars.DatabasePgPort);
@@ -964,7 +1033,7 @@ private DbContextOptions<PostgresServerDbContext> CreatePostgresOptions()
 
             builder.UseNpgsql(connectionString);
             SetupLogging(builder);
-            return builder.Options;
+            return (builder.Options, connectionString);
         }
 
         private void SetupSqlite(out Func<DbContextOptions<SqliteServerDbContext>> contextFunc, out bool inMemory)
diff --git a/Content.Server/Database/ServerDbPostgres.Notifications.cs b/Content.Server/Database/ServerDbPostgres.Notifications.cs
new file mode 100644
index 00000000000..fe358923bf0
--- /dev/null
+++ b/Content.Server/Database/ServerDbPostgres.Notifications.cs
@@ -0,0 +1,121 @@
+using System.Data;
+using System.Threading;
+using System.Threading.Tasks;
+using Content.Server.Administration.Managers;
+using Npgsql;
+
+namespace Content.Server.Database;
+
+/// Listens for ban_notification containing the player id and the banning server id using postgres listen/notify.
+/// Players a ban_notification got received for get banned, except when the current server id and the one in the notification payload match.
+
+public sealed partial class ServerDbPostgres
+{
+    /// <summary>
+    /// The list of notify channels to subscribe to.
+    /// </summary>
+    private static readonly string[] NotificationChannels =
+    [
+        BanManager.BanNotificationChannel,
+    ];
+
+    private static readonly TimeSpan ReconnectWaitIncrease = TimeSpan.FromSeconds(10);
+
+    private readonly CancellationTokenSource _notificationTokenSource = new();
+
+    private NpgsqlConnection? _notificationConnection;
+    private TimeSpan _reconnectWaitTime = TimeSpan.Zero;
+
+    /// <summary>
+    /// Sets up the database connection and the notification handler
+    /// </summary>
+    private void InitNotificationListener(string connectionString)
+    {
+        _notificationConnection = new NpgsqlConnection(connectionString);
+        _notificationConnection.Notification += OnNotification;
+
+        var cancellationToken = _notificationTokenSource.Token;
+        Task.Run(() => NotificationListener(cancellationToken), cancellationToken);
+    }
+
+    /// <summary>
+    /// Listens to the notification channel with basic error handling and reopens the connection if it got closed
+    /// </summary>
+    private async Task NotificationListener(CancellationToken cancellationToken)
+    {
+        if (_notificationConnection == null)
+            return;
+
+        _notifyLog.Verbose("Starting notification listener");
+
+        while (!cancellationToken.IsCancellationRequested)
+        {
+            try
+            {
+                if (_notificationConnection.State == ConnectionState.Broken)
+                {
+                    _notifyLog.Debug("Notification listener entered broken state, closing...");
+                    await _notificationConnection.CloseAsync();
+                }
+
+                if (_notificationConnection.State == ConnectionState.Closed)
+                {
+                    _notifyLog.Debug("Opening notification listener connection...");
+                    if (_reconnectWaitTime != TimeSpan.Zero)
+                    {
+                        _notifyLog.Verbose($"_reconnectWaitTime is {_reconnectWaitTime}");
+                        await Task.Delay(_reconnectWaitTime, cancellationToken);
+                    }
+
+                    await _notificationConnection.OpenAsync(cancellationToken);
+                    _reconnectWaitTime = TimeSpan.Zero;
+                    _notifyLog.Verbose($"Notification connection opened...");
+                }
+
+                foreach (var channel in NotificationChannels)
+                {
+                    _notifyLog.Verbose($"Listening on channel {channel}");
+                    await using var cmd = new NpgsqlCommand($"LISTEN {channel}", _notificationConnection);
+                    await cmd.ExecuteNonQueryAsync(cancellationToken);
+                }
+
+                while (!cancellationToken.IsCancellationRequested)
+                {
+                    _notifyLog.Verbose("Waiting on notifications...");
+                    await _notificationConnection.WaitAsync(cancellationToken);
+                }
+            }
+            catch (OperationCanceledException)
+            {
+                // Abort loop on cancel.
+                _notifyLog.Verbose($"Shutting down notification listener due to cancellation");
+                return;
+            }
+            catch (Exception e)
+            {
+                _reconnectWaitTime += ReconnectWaitIncrease;
+                _notifyLog.Error($"Error in notification listener: {e}");
+            }
+        }
+    }
+
+    private void OnNotification(object _, NpgsqlNotificationEventArgs notification)
+    {
+        _notifyLog.Verbose($"Received notification on channel {notification.Channel}");
+        NotificationReceived(new DatabaseNotification
+        {
+            Channel = notification.Channel,
+            Payload = notification.Payload,
+        });
+    }
+
+    public override void Shutdown()
+    {
+        _notificationTokenSource.Cancel();
+        if (_notificationConnection == null)
+            return;
+
+        _notificationConnection.Notification -= OnNotification;
+        _notificationConnection.Dispose();
+    }
+}
diff --git a/Content.Server/Database/ServerDbPostgres.cs b/Content.Server/Database/ServerDbPostgres.cs
index fd4699fff4e..6b55852ea1d 100644
--- a/Content.Server/Database/ServerDbPostgres.cs
+++ b/Content.Server/Database/ServerDbPostgres.cs
@@ -16,23 +16,26 @@
 
 namespace Content.Server.Database
 {
-    public sealed class ServerDbPostgres : ServerDbBase
+    public sealed partial class ServerDbPostgres : ServerDbBase
     {
         private readonly DbContextOptions<PostgresServerDbContext> _options;
+        private readonly ISawmill _notifyLog;
         private readonly SemaphoreSlim _prefsSemaphore;
         private readonly Task _dbReadyTask;
 
         private int _msLag;
 
-        public ServerDbPostgres(
-            DbContextOptions<PostgresServerDbContext> options,
+        public ServerDbPostgres(DbContextOptions<PostgresServerDbContext> options,
+            string connectionString,
             IConfigurationManager cfg,
-            ISawmill opsLog)
+            ISawmill opsLog,
+            ISawmill notifyLog)
             : base(opsLog)
         {
             var concurrency = cfg.GetCVar(CCVars.DatabasePgConcurrency);
 
             _options = options;
+            _notifyLog = notifyLog;
             _prefsSemaphore = new SemaphoreSlim(concurrency, concurrency);
 
             _dbReadyTask = Task.Run(async () =>
@@ -49,6 +52,8 @@ public ServerDbPostgres(
             });
 
             cfg.OnValueChanged(CCVars.DatabasePgFakeLag, v => _msLag = v, true);
+
+            InitNotificationListener(connectionString);
         }
 
         #region Ban
@@ -206,7 +211,8 @@ private static IQueryable<ServerBan> MakeBanLookupQuery(
                 ban.Reason,
                 ban.Severity,
                 aUid,
-                unbanDef);
+                unbanDef,
+                ban.ExemptFlags);
         }
 
         private static ServerUnbanDef? ConvertUnban(ServerUnban? unban)
@@ -243,7 +249,8 @@ public override async Task AddServerBanAsync(ServerBanDef serverBan)
                 ExpirationTime = serverBan.ExpirationTime?.UtcDateTime,
                 RoundId = serverBan.RoundId,
                 PlaytimeAtNote = serverBan.PlaytimeAtNote,
-                PlayerUserId = serverBan.UserId?.UserId
+                PlayerUserId = serverBan.UserId?.UserId,
+                ExemptFlags = serverBan.ExemptFlags
             });
 
             await db.PgDbContext.SaveChangesAsync();
diff --git a/Content.Server/Database/ServerDbSqlite.cs b/Content.Server/Database/ServerDbSqlite.cs
index ffec90bb43d..b9af2dddfcf 100644
--- a/Content.Server/Database/ServerDbSqlite.cs
+++ b/Content.Server/Database/ServerDbSqlite.cs
@@ -84,33 +84,45 @@ public ServerDbSqlite(
         {
             await using var db = await GetDbImpl();
 
-            var exempt = await GetBanExemptionCore(db, userId);
-
-            // SQLite can't do the net masking stuff we need to match IP address ranges.
-            // So just pull down the whole list into memory.
-            var bans = await GetAllBans(db.SqliteDbContext, includeUnbanned: false, exempt);
-
-            return bans.FirstOrDefault(b => BanMatches(b, address, userId, hwId, exempt)) is { } foundBan
-                ? ConvertBan(foundBan)
-                : null;
+            return (await GetServerBanQueryAsync(db, address, userId, hwId, includeUnbanned: false)).FirstOrDefault();
         }
 
-        public override async Task<List<ServerBanDef>> GetServerBansAsync(IPAddress? address,
+        public override async Task<List<ServerBanDef>> GetServerBansAsync(
+            IPAddress? address,
             NetUserId? userId,
-            ImmutableArray<byte>? hwId, bool includeUnbanned)
+            ImmutableArray<byte>? hwId,
+            bool includeUnbanned)
         {
             await using var db = await GetDbImpl();
 
+            return (await GetServerBanQueryAsync(db, address, userId, hwId, includeUnbanned)).ToList();
+        }
+
+        private async Task<IEnumerable<ServerBanDef>> GetServerBanQueryAsync(
+            DbGuardImpl db,
+            IPAddress? address,
+            NetUserId? userId,
+            ImmutableArray<byte>? hwId,
+            bool includeUnbanned)
+        {
             var exempt = await GetBanExemptionCore(db, userId);
 
             // SQLite can't do the net masking stuff we need to match IP address ranges.
             // So just pull down the whole list into memory.
             var queryBans = await GetAllBans(db.SqliteDbContext, includeUnbanned, exempt);
 
+            var playerInfo = new BanMatcher.PlayerInfo
+            {
+                Address = address,
+                UserId = userId,
+                ExemptFlags = exempt ?? default,
+                HWId = hwId,
+                IsNewPlayer = newPlayer,
+            };
+
             return queryBans
-                .Where(b => BanMatches(b, address, userId, hwId, exempt))
                 .Select(ConvertBan)
-                .ToList()!;
+                .Where(b => BanMatcher.BanMatches(b!, playerInfo))!;
         }
 
         private static async Task<List<ServerBan>> GetAllBans(
@@ -133,26 +145,6 @@ private static async Task<List<ServerBan>> GetAllBans(
             return await query.ToListAsync();
         }
 
-        private static bool BanMatches(ServerBan ban,
-            IPAddress? address,
-            NetUserId? userId,
-            ImmutableArray<byte>? hwId,
-            ServerBanExemptFlags? exemptFlags)
-        {
-            if (!exemptFlags.GetValueOrDefault(ServerBanExemptFlags.None).HasFlag(ServerBanExemptFlags.IP)
-                && address != null && ban.Address is not null && address.IsInSubnet(ban.Address.ToTuple().Value))
-            {
-                return true;
-            }
-
-            if (userId is { } id && ban.PlayerUserId == id.UserId)
-            {
-                return true;
-            }
-
-            return hwId is { Length: > 0 } hwIdVar && hwIdVar.AsSpan().SequenceEqual(ban.HWId);
-        }
-
         public override async Task AddServerBanAsync(ServerBanDef serverBan)
         {
             await using var db = await GetDbImpl();
@@ -168,7 +160,8 @@ public override async Task AddServerBanAsync(ServerBanDef serverBan)
                 ExpirationTime = serverBan.ExpirationTime?.UtcDateTime,
                 RoundId = serverBan.RoundId,
                 PlaytimeAtNote = serverBan.PlaytimeAtNote,
-                PlayerUserId = serverBan.UserId?.UserId
+                PlayerUserId = serverBan.UserId?.UserId,
+                ExemptFlags = serverBan.ExemptFlags
             });
 
             await db.SqliteDbContext.SaveChangesAsync();
@@ -351,6 +344,7 @@ public override async Task AddServerRoleUnbanAsync(ServerRoleUnbanDef serverUnba
         }
         #endregion
 
+        [return: NotNullIfNotNull(nameof(ban))]
         private static ServerBanDef? ConvertBan(ServerBan? ban)
         {
             if (ban == null)
diff --git a/Resources/Locale/en-US/info/ban.ftl b/Resources/Locale/en-US/info/ban.ftl
index 463dd1f5669..cc3a34c28b7 100644
--- a/Resources/Locale/en-US/info/ban.ftl
+++ b/Resources/Locale/en-US/info/ban.ftl
@@ -82,3 +82,6 @@ ban-panel-erase = Erase chat messages and player from round
 server-ban-string = {$admin} created a {$severity} severity server ban that expires {$expires} for [{$name}, {$ip}, {$hwid}], with reason: {$reason}
 server-ban-string-no-pii = {$admin} created a {$severity} severity server ban that expires {$expires} for {$name} with reason: {$reason}
 server-ban-string-never = never
+
+# Kick on ban
+ban-kick-reason = You have been banned

From ac9d75c14ac6479c01e301f7597cdd0f6146af67 Mon Sep 17 00:00:00 2001
From: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Date: Fri, 21 Jun 2024 12:06:07 +0000
Subject: [PATCH 226/366] Implement BlacklistedRange exempt flag (#29258)

* Implement a new kind of ip range ban that only applies to new players

* Put determining whether a player record exists to its own function

* Make BlacklistedRange bans get bypassed by any ban exemption

* Stop trying to get another DbGuard while already having one

This does break with convention on the functions in that area but
considering the use of this function it's probably fine?
I could alternatively just move the place it's called from.

Also I was suppossed to wait for tests to finish locally just to be
sure, but nah. I am pushing this now
---
 Content.Server/Database/ServerDbBase.cs     |  5 +++++
 Content.Server/Database/ServerDbPostgres.cs | 16 ++++++++++++----
 Content.Server/Database/ServerDbSqlite.cs   |  2 ++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index 02d8e03440d..c78e6a0728b 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -599,6 +599,11 @@ public async Task UpdatePlayerRecord(
             return record == null ? null : MakePlayerRecord(record);
         }
 
+        protected async Task<bool> PlayerRecordExists(DbGuard db, NetUserId userId)
+        {
+            return await db.DbContext.Player.AnyAsync(p => p.UserId == userId);
+        }
+
         [return: NotNullIfNotNull(nameof(player))]
         protected PlayerRecord? MakePlayerRecord(Player? player)
         {
diff --git a/Content.Server/Database/ServerDbPostgres.cs b/Content.Server/Database/ServerDbPostgres.cs
index 6b55852ea1d..7d131f70dc3 100644
--- a/Content.Server/Database/ServerDbPostgres.cs
+++ b/Content.Server/Database/ServerDbPostgres.cs
@@ -83,7 +83,8 @@ public ServerDbPostgres(DbContextOptions<PostgresServerDbContext> options,
             await using var db = await GetDbImpl();
 
             var exempt = await GetBanExemptionCore(db, userId);
-            var query = MakeBanLookupQuery(address, userId, hwId, db, includeUnbanned: false, exempt)
+            var newPlayer = userId == null || !await PlayerRecordExists(db, userId.Value);
+            var query = MakeBanLookupQuery(address, userId, hwId, db, includeUnbanned: false, exempt, newPlayer)
                 .OrderByDescending(b => b.BanTime);
 
             var ban = await query.FirstOrDefaultAsync();
@@ -103,7 +104,8 @@ public override async Task<List<ServerBanDef>> GetServerBansAsync(IPAddress? add
             await using var db = await GetDbImpl();
 
             var exempt = await GetBanExemptionCore(db, userId);
-            var query = MakeBanLookupQuery(address, userId, hwId, db, includeUnbanned, exempt);
+            var newPlayer = !await db.PgDbContext.Player.AnyAsync(p => p.UserId == userId);
+            var query = MakeBanLookupQuery(address, userId, hwId, db, includeUnbanned, exempt, newPlayer);
 
             var queryBans = await query.ToArrayAsync();
             var bans = new List<ServerBanDef>(queryBans.Length);
@@ -127,7 +129,8 @@ private static IQueryable<ServerBan> MakeBanLookupQuery(
             ImmutableArray<byte>? hwId,
             DbGuardImpl db,
             bool includeUnbanned,
-            ServerBanExemptFlags? exemptFlags)
+            ServerBanExemptFlags? exemptFlags,
+            bool newPlayer)
         {
             DebugTools.Assert(!(address == null && userId == null && hwId == null));
 
@@ -146,7 +149,9 @@ private static IQueryable<ServerBan> MakeBanLookupQuery(
             {
                 var newQ = db.PgDbContext.Ban
                     .Include(p => p.Unban)
-                    .Where(b => b.Address != null && EF.Functions.ContainsOrEqual(b.Address.Value, address));
+                    .Where(b => b.Address != null
+                                && EF.Functions.ContainsOrEqual(b.Address.Value, address)
+                                && !(b.ExemptFlags.HasFlag(ServerBanExemptFlags.BlacklistedRange) && !newPlayer));
 
                 query = query == null ? newQ : query.Union(newQ);
             }
@@ -172,6 +177,9 @@ private static IQueryable<ServerBan> MakeBanLookupQuery(
 
             if (exemptFlags is { } exempt)
             {
+                if (exempt != ServerBanExemptFlags.None)
+                    exempt |= ServerBanExemptFlags.BlacklistedRange; // Any kind of exemption should bypass BlacklistedRange
+
                 query = query.Where(b => (b.ExemptFlags & exempt) == 0);
             }
 
diff --git a/Content.Server/Database/ServerDbSqlite.cs b/Content.Server/Database/ServerDbSqlite.cs
index b9af2dddfcf..58d21acb63b 100644
--- a/Content.Server/Database/ServerDbSqlite.cs
+++ b/Content.Server/Database/ServerDbSqlite.cs
@@ -107,6 +107,8 @@ private async Task<IEnumerable<ServerBanDef>> GetServerBanQueryAsync(
         {
             var exempt = await GetBanExemptionCore(db, userId);
 
+            var newPlayer = !await db.SqliteDbContext.Player.AnyAsync(p => p.UserId == userId);
+
             // SQLite can't do the net masking stuff we need to match IP address ranges.
             // So just pull down the whole list into memory.
             var queryBans = await GetAllBans(db.SqliteDbContext, includeUnbanned, exempt);

From 6b009d44a8cd5c31812ba18f99041fb0f480e59a Mon Sep 17 00:00:00 2001
From: Repo <47093363+Titian3@users.noreply.github.com>
Date: Thu, 6 Jun 2024 18:41:11 +1200
Subject: [PATCH 227/366] Fix Admin Object tab sorting and search (#28609)

---
 .../UI/Tabs/ObjectsTab/ObjectsTab.xaml        |  16 ++-
 .../UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs     | 117 ++++++++++++++----
 .../UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml   |   8 +-
 .../Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs   |   6 +-
 .../UI/Tabs/ObjectsTab/ObjectsTabHeader.xaml  |  21 ++++
 .../Tabs/ObjectsTab/ObjectsTabHeader.xaml.cs  |  86 +++++++++++++
 .../UI/Tabs/PlayerTab/PlayerTab.xaml.cs       |   5 +-
 .../Systems/Admin/AdminUIController.cs        |   7 +-
 .../administration/ui/tabs/object-tab.ftl     |   2 +
 9 files changed, 229 insertions(+), 39 deletions(-)
 create mode 100644 Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabHeader.xaml
 create mode 100644 Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabHeader.xaml.cs
 create mode 100644 Resources/Locale/en-US/administration/ui/tabs/object-tab.ftl

diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml
index fb68e6c7908..ea89916ba8c 100644
--- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml
@@ -1,15 +1,21 @@
 <Control xmlns="https://spacestation14.io"
-         xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls">
+         xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
+         xmlns:ot="clr-namespace:Content.Client.Administration.UI.Tabs.ObjectsTab"
+         xmlns:co="clr-namespace:Content.Client.UserInterface.Controls">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
             <Label HorizontalExpand="True" SizeFlagsStretchRatio="0.50"
                    Text="{Loc Object type:}" />
+            <LineEdit Name="SearchLineEdit" PlaceHolder="{Loc Search...}" HorizontalExpand="True" SizeFlagsStretchRatio="1"/>
             <OptionButton Name="ObjectTypeOptions" HorizontalExpand="True" SizeFlagsStretchRatio="0.25"/>
         </BoxContainer>
+        <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+        </BoxContainer>
         <cc:HSeparator/>
-        <ScrollContainer HorizontalExpand="True" VerticalExpand="True">
-            <BoxContainer Orientation="Vertical" Name="ObjectList">
-            </BoxContainer>
-        </ScrollContainer>
+        <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
+            <ot:ObjectsTabHeader Name="ListHeader"/>
+            <cc:HSeparator/>
+            <co:SearchListContainer Name="SearchList" Access="Public" VerticalExpand="True"/>
+        </BoxContainer>
     </BoxContainer>
 </Control>
diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
index a5c30084365..90559707f92 100644
--- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
@@ -1,5 +1,7 @@
 using Content.Client.Station;
+using Content.Client.UserInterface.Controls;
 using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Map.Components;
@@ -10,20 +12,20 @@ namespace Content.Client.Administration.UI.Tabs.ObjectsTab;
 [GenerateTypedNameReferences]
 public sealed partial class ObjectsTab : Control
 {
-    [Dependency] private readonly EntityManager _entityManager = default!;
+    [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
 
     private readonly List<ObjectsTabEntry> _objects = new();
-    private List<ObjectsTabSelection> _selections = new();
+    private readonly List<ObjectsTabSelection> _selections = new();
+    private bool _ascending = false;  // Set to false for descending order by default
+    private ObjectsTabHeader.Header _headerClicked = ObjectsTabHeader.Header.ObjectName;
+    private readonly Color _altColor = Color.FromHex("#292B38");
+    private readonly Color _defaultColor = Color.FromHex("#2F2F3B");
 
-    public event Action<ObjectsTabEntry, GUIBoundKeyEventArgs>? OnEntryKeyBindDown;
+    public event Action<GUIBoundKeyEventArgs, ListData>? OnEntryKeyBindDown;
 
-    // Listen I could either have like 4 different event subscribers (for map / grid / station changes) and manage their lifetimes in AdminUIController
-    // OR
-    // I can do this.
-    private TimeSpan _updateFrequency = TimeSpan.FromSeconds(2);
-
-    private TimeSpan _nextUpdate = TimeSpan.FromSeconds(2);
+    private readonly TimeSpan _updateFrequency = TimeSpan.FromSeconds(2);
+    private TimeSpan _nextUpdate;
 
     public ObjectsTab()
     {
@@ -42,6 +44,30 @@ public ObjectsTab()
             ObjectTypeOptions.AddItem(Enum.GetName((ObjectsTabSelection)type)!);
         }
 
+        ListHeader.OnHeaderClicked += HeaderClicked;
+        SearchList.SearchBar = SearchLineEdit;
+        SearchList.GenerateItem += GenerateButton;
+        SearchList.DataFilterCondition += DataFilterCondition;
+
+        RefreshObjectList();
+        // Set initial selection and refresh the list to apply the initial sort order
+        var defaultSelection = ObjectsTabSelection.Grids;
+        ObjectTypeOptions.SelectId((int)defaultSelection); // Set the default selection
+        RefreshObjectList(defaultSelection); // Refresh the list with the default selection
+
+        // Initialize the next update time
+        _nextUpdate = TimeSpan.Zero;
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+
+        if (_timing.CurTime < _nextUpdate)
+            return;
+
+        _nextUpdate = _timing.CurTime + _updateFrequency;
+
         RefreshObjectList();
     }
 
@@ -81,32 +107,72 @@ private void RefreshObjectList(ObjectsTabSelection selection)
                 throw new ArgumentOutOfRangeException(nameof(selection), selection, null);
         }
 
-        foreach (var control in _objects)
+        entities.Sort((a, b) =>
         {
-            ObjectList.RemoveChild(control);
-        }
+            var valueA = GetComparableValue(a, _headerClicked);
+            var valueB = GetComparableValue(b, _headerClicked);
+            return _ascending ? Comparer<object>.Default.Compare(valueA, valueB) : Comparer<object>.Default.Compare(valueB, valueA);
+        });
 
-        _objects.Clear();
-
-        foreach (var (name, nent) in entities)
+        var listData = new List<ObjectsListData>();
+        for (int index = 0; index < entities.Count; index++)
         {
-            var ctrl = new ObjectsTabEntry(name, nent);
-            _objects.Add(ctrl);
-            ObjectList.AddChild(ctrl);
-            ctrl.OnKeyBindDown += args => OnEntryKeyBindDown?.Invoke(ctrl, args);
+            var info = entities[index];
+            listData.Add(new ObjectsListData(info, $"{info.Name} {info.Entity}", index % 2 == 0 ? _altColor : _defaultColor));
         }
+
+        SearchList.PopulateList(listData);
     }
 
-    protected override void FrameUpdate(FrameEventArgs args)
+    private void GenerateButton(ListData data, ListContainerButton button)
     {
-        base.FrameUpdate(args);
-
-        if (_timing.CurTime < _nextUpdate)
+        if (data is not ObjectsListData { Info: var info, BackgroundColor: var backgroundColor })
             return;
 
-        // I do not care for precision.
-        _nextUpdate = _timing.CurTime + _updateFrequency;
+        var entry = new ObjectsTabEntry(info.Name, info.Entity, new StyleBoxFlat { BackgroundColor = backgroundColor });
+        button.ToolTip = $"{info.Name}, {info.Entity}";
+
+        // Add key binding event handler
+        entry.OnKeyBindDown += args => OnEntryKeyBindDown?.Invoke(args, data);
+
+        button.AddChild(entry);
+    }
+
+    private bool DataFilterCondition(string filter, ListData listData)
+    {
+        if (listData is not ObjectsListData { FilteringString: var filteringString })
+            return false;
+
+        // If the filter is empty, do not filter out any entries
+        if (string.IsNullOrEmpty(filter))
+            return true;
+
+        return filteringString.Contains(filter, StringComparison.CurrentCultureIgnoreCase);
+    }
+
+    private object GetComparableValue((string Name, NetEntity Entity) entity, ObjectsTabHeader.Header header)
+    {
+        return header switch
+        {
+            ObjectsTabHeader.Header.ObjectName => entity.Name,
+            ObjectsTabHeader.Header.EntityID => entity.Entity.ToString(),
+            _ => entity.Name
+        };
+    }
+
+    private void HeaderClicked(ObjectsTabHeader.Header header)
+    {
+        if (_headerClicked == header)
+        {
+            _ascending = !_ascending;
+        }
+        else
+        {
+            _headerClicked = header;
+            _ascending = true;
+        }
 
+        ListHeader.UpdateHeaderSymbols(_headerClicked, _ascending);
         RefreshObjectList();
     }
 
@@ -118,3 +184,4 @@ private enum ObjectsTabSelection
     }
 }
 
+public record ObjectsListData((string Name, NetEntity Entity) Info, string FilteringString, Color BackgroundColor) : ListData;
diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml
index 0f6975e3656..83c4cc5697f 100644
--- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml
+++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml
@@ -1,6 +1,6 @@
-<ContainerButton xmlns="https://spacestation14.io"
-                 xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls">
-    <PanelContainer Name="BackgroundColorPanel"/>
+<PanelContainer xmlns="https://spacestation14.io"
+                xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+                Name="BackgroundColorPanel">
     <BoxContainer Orientation="Horizontal"
                   HorizontalExpand="True"
                   SeparationOverride="4">
@@ -14,4 +14,4 @@
                HorizontalExpand="True"
                ClipText="True"/>
     </BoxContainer>
-</ContainerButton>
+</PanelContainer>
diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs
index c9b2cd8b572..aab06c6ccd0 100644
--- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs
@@ -1,19 +1,21 @@
 using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
 namespace Content.Client.Administration.UI.Tabs.ObjectsTab;
 
 [GenerateTypedNameReferences]
-public sealed partial class ObjectsTabEntry : ContainerButton
+public sealed partial class ObjectsTabEntry : PanelContainer
 {
     public NetEntity AssocEntity;
 
-    public ObjectsTabEntry(string name, NetEntity nent)
+    public ObjectsTabEntry(string name, NetEntity nent, StyleBox styleBox)
     {
         RobustXamlLoader.Load(this);
         AssocEntity = nent;
         EIDLabel.Text = nent.ToString();
         NameLabel.Text = name;
+        BackgroundColorPanel.PanelOverride = styleBox;
     }
 }
diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabHeader.xaml b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabHeader.xaml
new file mode 100644
index 00000000000..71a1f5c7bc6
--- /dev/null
+++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabHeader.xaml
@@ -0,0 +1,21 @@
+<Control xmlns="https://spacestation14.io"
+         xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls">
+    <PanelContainer Name="BackgroundColorPanel" Access="Public"/>
+    <BoxContainer Orientation="Horizontal"
+                  HorizontalExpand="True"
+                  SeparationOverride="4">
+        <Label Name="ObjectNameLabel"
+               SizeFlagsStretchRatio="3"
+               HorizontalExpand="True"
+               ClipText="True"
+               Text="{Loc object-tab-object-name}"
+               MouseFilter="Pass"/>
+        <cc:VSeparator/>
+        <Label Name="EntityIDLabel"
+               SizeFlagsStretchRatio="3"
+               HorizontalExpand="True"
+               ClipText="True"
+               Text="{Loc object-tab-entity-id}"
+               MouseFilter="Pass"/>
+    </BoxContainer>
+</Control>
diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabHeader.xaml.cs b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabHeader.xaml.cs
new file mode 100644
index 00000000000..3a91b5b9483
--- /dev/null
+++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabHeader.xaml.cs
@@ -0,0 +1,86 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Input;
+
+namespace Content.Client.Administration.UI.Tabs.ObjectsTab
+{
+    [GenerateTypedNameReferences]
+    public sealed partial class ObjectsTabHeader : Control
+    {
+        public event Action<Header>? OnHeaderClicked;
+
+        private const string ArrowUp = "↑";
+        private const string ArrowDown = "↓";
+
+        public ObjectsTabHeader()
+        {
+            RobustXamlLoader.Load(this);
+
+            ObjectNameLabel.OnKeyBindDown += ObjectNameClicked;
+            EntityIDLabel.OnKeyBindDown += EntityIDClicked;
+        }
+
+        public Label GetHeader(Header header)
+        {
+            return header switch
+            {
+                Header.ObjectName => ObjectNameLabel,
+                Header.EntityID => EntityIDLabel,
+                _ => throw new ArgumentOutOfRangeException(nameof(header), header, null)
+            };
+        }
+
+        public void ResetHeaderText()
+        {
+            ObjectNameLabel.Text = Loc.GetString("object-tab-object-name");
+            EntityIDLabel.Text = Loc.GetString("object-tab-entity-id");
+        }
+
+        public void UpdateHeaderSymbols(Header headerClicked, bool ascending)
+        {
+            ResetHeaderText();
+            var arrow = ascending ? ArrowUp : ArrowDown;
+            GetHeader(headerClicked).Text += $" {arrow}";
+        }
+
+        private void HeaderClicked(GUIBoundKeyEventArgs args, Header header)
+        {
+            if (args.Function != EngineKeyFunctions.UIClick)
+            {
+                return;
+            }
+
+            OnHeaderClicked?.Invoke(header);
+            args.Handle();
+        }
+
+        private void ObjectNameClicked(GUIBoundKeyEventArgs args)
+        {
+            HeaderClicked(args, Header.ObjectName);
+        }
+
+        private void EntityIDClicked(GUIBoundKeyEventArgs args)
+        {
+            HeaderClicked(args, Header.EntityID);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+
+            if (disposing)
+            {
+                ObjectNameLabel.OnKeyBindDown -= ObjectNameClicked;
+                EntityIDLabel.OnKeyBindDown -= EntityIDClicked;
+            }
+        }
+
+        public enum Header
+        {
+            ObjectName,
+            EntityID
+        }
+    }
+}
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
index a8bfaddecf4..826945e7cc0 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
@@ -53,6 +53,7 @@ public PlayerTab()
             SearchList.ItemKeyBindDown += (args, data) => OnEntryKeyBindDown?.Invoke(args, data);
 
             RefreshPlayerList(_adminSystem.PlayerList);
+
         }
 
         #region Antag Overlay
@@ -110,7 +111,9 @@ private void RefreshPlayerList(IReadOnlyList<PlayerInfo> players)
             _players = players;
             PlayerCount.Text = $"Players: {_playerMan.PlayerCount}";
 
-            var sortedPlayers = new List<PlayerInfo>(players);
+            var filteredPlayers = players.Where(info => _showDisconnected || info.Connected).ToList();
+
+            var sortedPlayers = new List<PlayerInfo>(filteredPlayers);
             sortedPlayers.Sort(Compare);
 
             UpdateHeaderSymbols();
diff --git a/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs b/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
index a7397aff38d..3d8235591ad 100644
--- a/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
+++ b/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
@@ -198,9 +198,12 @@ private void PlayerTabEntryKeyBindDown(GUIBoundKeyEventArgs args, ListData? data
         args.Handle();
     }
 
-    private void ObjectsTabEntryKeyBindDown(ObjectsTabEntry entry, GUIBoundKeyEventArgs args)
+    private void ObjectsTabEntryKeyBindDown(GUIBoundKeyEventArgs args, ListData? data)
     {
-        var uid = entry.AssocEntity;
+        if (data is not ObjectsListData { Info: var info })
+            return;
+
+        var uid = info.Entity;
         var function = args.Function;
 
         if (function == EngineKeyFunctions.UIClick)
diff --git a/Resources/Locale/en-US/administration/ui/tabs/object-tab.ftl b/Resources/Locale/en-US/administration/ui/tabs/object-tab.ftl
new file mode 100644
index 00000000000..0288efcaa44
--- /dev/null
+++ b/Resources/Locale/en-US/administration/ui/tabs/object-tab.ftl
@@ -0,0 +1,2 @@
+object-tab-entity-id = Entity ID
+object-tab-object-name = Object name

From a6bdab4ff21520cfc6ae20c4b2fea2e5f2effbee Mon Sep 17 00:00:00 2001
From: Repo <47093363+Titian3@users.noreply.github.com>
Date: Fri, 28 Jun 2024 15:32:57 +1200
Subject: [PATCH 228/366] Fix Admin Object tab sorting and search - Part 2
 (#28681)

* admin Object tab sorting and searchable

* Fix for showing disconnected players on player admin tab

* Fix namespace and search bar location.

* Change linq to loop.

* No more Linq to sort

* Fix item click vv menu

* Added refresh button and refresh on opening tab.

* Clear spaces.

* Move tab magic numbers to enums

* Get rid of old unused xaml

* Fix code style issues and button event type.

* Merge in baby jail

* More style cleanup and move cast around.

* Make the localization a little more easy to read, same loc var names.

* Missed Loc for label

* Fix class field order

* Over zelous delete.

* Small updates.

* Min syntax issues fix
---
 .../Administration/UI/AdminMenuWindow.xaml.cs | 73 ++++++++++++------
 .../UI/Tabs/ObjectsTab/ObjectsTab.xaml        | 19 +++--
 .../UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs     | 77 +++++++++----------
 .../Systems/Admin/AdminUIController.cs        |  2 +-
 .../administration/ui/tabs/object-tab.ftl     |  8 ++
 5 files changed, 104 insertions(+), 75 deletions(-)

diff --git a/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs b/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
index c3ea67a3edb..d5c43e2a500 100644
--- a/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
+++ b/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
@@ -3,34 +3,57 @@
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.Administration.UI
+namespace Content.Client.Administration.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class AdminMenuWindow : DefaultWindow
 {
-    [GenerateTypedNameReferences]
-    public sealed partial class AdminMenuWindow : DefaultWindow
+    public event Action? OnDisposed;
+
+    public AdminMenuWindow()
+    {
+        MinSize = new Vector2(650, 250);
+        Title = Loc.GetString("admin-menu-title");
+        RobustXamlLoader.Load(this);
+        MasterTabContainer.SetTabTitle((int) TabIndex.Admin, Loc.GetString("admin-menu-admin-tab"));
+        MasterTabContainer.SetTabTitle((int) TabIndex.Adminbus, Loc.GetString("admin-menu-adminbus-tab"));
+        MasterTabContainer.SetTabTitle((int) TabIndex.Atmos, Loc.GetString("admin-menu-atmos-tab"));
+        MasterTabContainer.SetTabTitle((int) TabIndex.Round, Loc.GetString("admin-menu-round-tab"));
+        MasterTabContainer.SetTabTitle((int) TabIndex.Server, Loc.GetString("admin-menu-server-tab"));
+        MasterTabContainer.SetTabTitle((int) TabIndex.PanicBunker, Loc.GetString("admin-menu-panic-bunker-tab"));
+        /*
+         * TODO: Remove baby jail code once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future.
+         */
+        MasterTabContainer.SetTabTitle((int) TabIndex.BabyJail, Loc.GetString("admin-menu-baby-jail-tab"));
+        MasterTabContainer.SetTabTitle((int) TabIndex.Players, Loc.GetString("admin-menu-players-tab"));
+        MasterTabContainer.SetTabTitle((int) TabIndex.Objects, Loc.GetString("admin-menu-objects-tab"));
+        MasterTabContainer.OnTabChanged += OnTabChanged;
+    }
+
+    private void OnTabChanged(int tabIndex)
     {
-        public event Action? OnDisposed;
+        var tabEnum = (TabIndex)tabIndex;
+        if (tabEnum == TabIndex.Objects)
+            ObjectsTabControl.RefreshObjectList();
+    }
 
-        public AdminMenuWindow()
-        {
-            MinSize = new Vector2(650, 250);
-            Title = Loc.GetString("admin-menu-title");
-            RobustXamlLoader.Load(this);
-            MasterTabContainer.SetTabTitle(0, Loc.GetString("admin-menu-admin-tab"));
-            MasterTabContainer.SetTabTitle(1, Loc.GetString("admin-menu-adminbus-tab"));
-            MasterTabContainer.SetTabTitle(2, Loc.GetString("admin-menu-atmos-tab"));
-            MasterTabContainer.SetTabTitle(3, Loc.GetString("admin-menu-round-tab"));
-            MasterTabContainer.SetTabTitle(4, Loc.GetString("admin-menu-server-tab"));
-            MasterTabContainer.SetTabTitle(5, Loc.GetString("admin-menu-panic-bunker-tab"));
-            MasterTabContainer.SetTabTitle(6, Loc.GetString("admin-menu-players-tab"));
-            MasterTabContainer.SetTabTitle(7, Loc.GetString("admin-menu-objects-tab"));
-        }
+    protected override void Dispose(bool disposing)
+    {
+        OnDisposed?.Invoke();
+        base.Dispose(disposing);
+        OnDisposed = null;
+    }
 
-        protected override void Dispose(bool disposing)
-        {
-            OnDisposed?.Invoke();
-            base.Dispose(disposing);
-            OnDisposed = null;
-        }
+    private enum TabIndex
+    {
+        Admin = 0,
+        Adminbus,
+        Atmos,
+        Round,
+        Server,
+        PanicBunker,
+        BabyJail,
+        Players,
+        Objects,
     }
 }
-
diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml
index ea89916ba8c..f4298bbc00f 100644
--- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml
@@ -4,18 +4,17 @@
          xmlns:co="clr-namespace:Content.Client.UserInterface.Controls">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
-            <Label HorizontalExpand="True" SizeFlagsStretchRatio="0.50"
-                   Text="{Loc Object type:}" />
-            <LineEdit Name="SearchLineEdit" PlaceHolder="{Loc Search...}" HorizontalExpand="True" SizeFlagsStretchRatio="1"/>
-            <OptionButton Name="ObjectTypeOptions" HorizontalExpand="True" SizeFlagsStretchRatio="0.25"/>
+            <Label Text="{Loc object-tab-object-type}" />
+            <OptionButton Name="ObjectTypeOptions" HorizontalAlignment="Left" />
+            <LineEdit Name="SearchLineEdit" PlaceHolder="{Loc object-tab-object-search}" HorizontalExpand="True"
+                      SizeFlagsStretchRatio="1" />
+            <Button Name="RefreshListButton" Text="{Loc object-tab-refresh-button}" ToggleMode="False" />
         </BoxContainer>
-        <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-        </BoxContainer>
-        <cc:HSeparator/>
+        <cc:HSeparator />
         <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
-            <ot:ObjectsTabHeader Name="ListHeader"/>
-            <cc:HSeparator/>
-            <co:SearchListContainer Name="SearchList" Access="Public" VerticalExpand="True"/>
+            <ot:ObjectsTabHeader Name="ListHeader" />
+            <cc:HSeparator />
+            <co:SearchListContainer Name="SearchList" Access="Public" VerticalExpand="True" />
         </BoxContainer>
     </BoxContainer>
 </Control>
diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
index 90559707f92..78eefa34628 100644
--- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
@@ -3,6 +3,7 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Timing;
@@ -15,17 +16,14 @@ public sealed partial class ObjectsTab : Control
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
 
-    private readonly List<ObjectsTabEntry> _objects = new();
-    private readonly List<ObjectsTabSelection> _selections = new();
-    private bool _ascending = false;  // Set to false for descending order by default
-    private ObjectsTabHeader.Header _headerClicked = ObjectsTabHeader.Header.ObjectName;
     private readonly Color _altColor = Color.FromHex("#292B38");
     private readonly Color _defaultColor = Color.FromHex("#2F2F3B");
 
-    public event Action<GUIBoundKeyEventArgs, ListData>? OnEntryKeyBindDown;
+    private bool _ascending;
+    private ObjectsTabHeader.Header _headerClicked = ObjectsTabHeader.Header.ObjectName;
 
-    private readonly TimeSpan _updateFrequency = TimeSpan.FromSeconds(2);
-    private TimeSpan _nextUpdate;
+    private readonly List<ObjectsTabSelection> _selections = [];
+    public event Action<GUIBoundKeyEventArgs, ListData>? OnEntryKeyBindDown;
 
     public ObjectsTab()
     {
@@ -38,40 +36,25 @@ public ObjectsTab()
             RefreshObjectList(_selections[ev.Id]);
         };
 
-        foreach (var type in Enum.GetValues(typeof(ObjectsTabSelection)))
+        foreach (var type in Enum.GetValues<ObjectsTabSelection>())
         {
-            _selections.Add((ObjectsTabSelection)type!);
-            ObjectTypeOptions.AddItem(Enum.GetName((ObjectsTabSelection)type)!);
+            _selections.Add(type);
+            ObjectTypeOptions.AddItem(GetLocalizedEnumValue(type));
         }
 
         ListHeader.OnHeaderClicked += HeaderClicked;
         SearchList.SearchBar = SearchLineEdit;
         SearchList.GenerateItem += GenerateButton;
         SearchList.DataFilterCondition += DataFilterCondition;
+        SearchList.ItemKeyBindDown += (args, data) => OnEntryKeyBindDown?.Invoke(args, data);
+        RefreshListButton.OnPressed += _ => RefreshObjectList();
 
-        RefreshObjectList();
-        // Set initial selection and refresh the list to apply the initial sort order
         var defaultSelection = ObjectsTabSelection.Grids;
-        ObjectTypeOptions.SelectId((int)defaultSelection); // Set the default selection
-        RefreshObjectList(defaultSelection); // Refresh the list with the default selection
-
-        // Initialize the next update time
-        _nextUpdate = TimeSpan.Zero;
+        ObjectTypeOptions.SelectId((int) defaultSelection);
+        RefreshObjectList(defaultSelection);
     }
 
-    protected override void FrameUpdate(FrameEventArgs args)
-    {
-        base.FrameUpdate(args);
-
-        if (_timing.CurTime < _nextUpdate)
-            return;
-
-        _nextUpdate = _timing.CurTime + _updateFrequency;
-
-        RefreshObjectList();
-    }
-
-    private void RefreshObjectList()
+    public void RefreshObjectList()
     {
         RefreshObjectList(_selections[ObjectTypeOptions.SelectedId]);
     }
@@ -101,6 +84,7 @@ private void RefreshObjectList(ObjectsTabSelection selection)
                 {
                     entities.Add((metadata.EntityName, _entityManager.GetNetEntity(uid)));
                 }
+
                 break;
             }
             default:
@@ -111,14 +95,18 @@ private void RefreshObjectList(ObjectsTabSelection selection)
         {
             var valueA = GetComparableValue(a, _headerClicked);
             var valueB = GetComparableValue(b, _headerClicked);
-            return _ascending ? Comparer<object>.Default.Compare(valueA, valueB) : Comparer<object>.Default.Compare(valueB, valueA);
+            return _ascending
+                ? Comparer<object>.Default.Compare(valueA, valueB)
+                : Comparer<object>.Default.Compare(valueB, valueA);
         });
 
         var listData = new List<ObjectsListData>();
-        for (int index = 0; index < entities.Count; index++)
+        for (var index = 0; index < entities.Count; index++)
         {
             var info = entities[index];
-            listData.Add(new ObjectsListData(info, $"{info.Name} {info.Entity}", index % 2 == 0 ? _altColor : _defaultColor));
+            listData.Add(new ObjectsListData(info,
+                $"{info.Name} {info.Entity}",
+                index % 2 == 0 ? _altColor : _defaultColor));
         }
 
         SearchList.PopulateList(listData);
@@ -129,12 +117,11 @@ private void GenerateButton(ListData data, ListContainerButton button)
         if (data is not ObjectsListData { Info: var info, BackgroundColor: var backgroundColor })
             return;
 
-        var entry = new ObjectsTabEntry(info.Name, info.Entity, new StyleBoxFlat { BackgroundColor = backgroundColor });
+        var entry = new ObjectsTabEntry(info.Name,
+            info.Entity,
+            new StyleBoxFlat { BackgroundColor = backgroundColor });
         button.ToolTip = $"{info.Name}, {info.Entity}";
 
-        // Add key binding event handler
-        entry.OnKeyBindDown += args => OnEntryKeyBindDown?.Invoke(args, data);
-
         button.AddChild(entry);
     }
 
@@ -156,7 +143,7 @@ private object GetComparableValue((string Name, NetEntity Entity) entity, Object
         {
             ObjectsTabHeader.Header.ObjectName => entity.Name,
             ObjectsTabHeader.Header.EntityID => entity.Entity.ToString(),
-            _ => entity.Name
+            _ => entity.Name,
         };
     }
 
@@ -176,6 +163,17 @@ private void HeaderClicked(ObjectsTabHeader.Header header)
         RefreshObjectList();
     }
 
+    private string GetLocalizedEnumValue(ObjectsTabSelection selection)
+    {
+        return selection switch
+        {
+            ObjectsTabSelection.Grids => Loc.GetString("object-tab-object-type-grids"),
+            ObjectsTabSelection.Maps => Loc.GetString("object-tab-object-type-maps"),
+            ObjectsTabSelection.Stations => Loc.GetString("object-tab-object-type-stations"),
+            _ => throw new ArgumentOutOfRangeException(nameof(selection), selection, null),
+        };
+    }
+
     private enum ObjectsTabSelection
     {
         Grids,
@@ -184,4 +182,5 @@ private enum ObjectsTabSelection
     }
 }
 
-public record ObjectsListData((string Name, NetEntity Entity) Info, string FilteringString, Color BackgroundColor) : ListData;
+public record ObjectsListData((string Name, NetEntity Entity) Info, string FilteringString, Color BackgroundColor)
+    : ListData;
diff --git a/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs b/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
index 3d8235591ad..392a1a96de2 100644
--- a/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
+++ b/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
@@ -208,7 +208,7 @@ private void ObjectsTabEntryKeyBindDown(GUIBoundKeyEventArgs args, ListData? dat
 
         if (function == EngineKeyFunctions.UIClick)
             _conHost.ExecuteCommand($"vv {uid}");
-        else if (function == EngineKeyFunctions.UseSecondary)
+        else if (function == EngineKeyFunctions.UIRightClick)
             _verb.OpenVerbMenu(uid, true);
         else
             return;
diff --git a/Resources/Locale/en-US/administration/ui/tabs/object-tab.ftl b/Resources/Locale/en-US/administration/ui/tabs/object-tab.ftl
index 0288efcaa44..da84ea4f163 100644
--- a/Resources/Locale/en-US/administration/ui/tabs/object-tab.ftl
+++ b/Resources/Locale/en-US/administration/ui/tabs/object-tab.ftl
@@ -1,2 +1,10 @@
 object-tab-entity-id = Entity ID
 object-tab-object-name = Object name
+
+object-tab-object-type = Object type:
+object-tab-object-search = Search...
+
+object-tab-object-type-grids = Grids
+object-tab-object-type-maps = Maps
+object-tab-object-type-stations = Stations
+object-tab-refresh-button = Refresh

From 7ea580080bbf3128ea7d48cebb627b963f4d2d4e Mon Sep 17 00:00:00 2001
From: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
Date: Thu, 11 Jul 2024 00:14:01 -0500
Subject: [PATCH 229/366] Fix baby jail (#29896)

* Revert "Revert Baby Jail (#29891)"

This reverts commit 24a2866747e6de37ab2c4395bee9ea44c9211c6f.

* the fix
---
 .../Administration/UI/AdminMenuWindow.xaml    |   4 +-
 .../BabyJailTab/BabyJailStatusWindow.xaml     |   6 +
 .../BabyJailTab/BabyJailStatusWindow.xaml.cs  |  21 +++
 .../UI/Tabs/BabyJailTab/BabyJailTab.xaml      |  26 ++++
 .../UI/Tabs/BabyJailTab/BabyJailTab.xaml.cs   |  75 ++++++++++
 .../Systems/Admin/AdminUIController.cs        |  22 +++
 Content.Server.Database/Model.cs              |   4 +
 .../Commands/BabyJailCommand.cs               | 139 ++++++++++++++++++
 .../Administration/Systems/AdminSystem.cs     |  51 +++++++
 .../Connection/ConnectionManager.cs           |  74 +++++++++-
 .../GameTicking/GameTicker.StatusShell.cs     |   6 +
 .../Events/BabyJailChangedEvent.cs            |  22 +++
 Content.Shared/CCVar/CCVars.cs                |  42 ++++++
 .../administration/commands/babyjail.ftl      |  19 +++
 .../administration/ui/admin-menu-window.ftl   |   1 +
 .../administration/ui/tabs/babyjail-tab.ftl   |  16 ++
 .../Locale/en-US/connection-messages.ftl      |   8 +-
 17 files changed, 530 insertions(+), 6 deletions(-)
 create mode 100644 Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailStatusWindow.xaml
 create mode 100644 Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailStatusWindow.xaml.cs
 create mode 100644 Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailTab.xaml
 create mode 100644 Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailTab.xaml.cs
 create mode 100644 Content.Server/Administration/Commands/BabyJailCommand.cs
 create mode 100644 Content.Shared/Administration/Events/BabyJailChangedEvent.cs
 create mode 100644 Resources/Locale/en-US/administration/commands/babyjail.ftl
 create mode 100644 Resources/Locale/en-US/administration/ui/tabs/babyjail-tab.ftl

diff --git a/Content.Client/Administration/UI/AdminMenuWindow.xaml b/Content.Client/Administration/UI/AdminMenuWindow.xaml
index 311d67b826c..d3d3df02d93 100644
--- a/Content.Client/Administration/UI/AdminMenuWindow.xaml
+++ b/Content.Client/Administration/UI/AdminMenuWindow.xaml
@@ -6,7 +6,8 @@
     xmlns:tabs="clr-namespace:Content.Client.Administration.UI.Tabs"
     xmlns:playerTab="clr-namespace:Content.Client.Administration.UI.Tabs.PlayerTab"
     xmlns:objectsTab="clr-namespace:Content.Client.Administration.UI.Tabs.ObjectsTab"
-    xmlns:panic="clr-namespace:Content.Client.Administration.UI.Tabs.PanicBunkerTab">
+    xmlns:panic="clr-namespace:Content.Client.Administration.UI.Tabs.PanicBunkerTab"
+    xmlns:baby="clr-namespace:Content.Client.Administration.UI.Tabs.BabyJailTab">
     <TabContainer Name="MasterTabContainer">
         <adminTab:AdminTab />
         <adminbusTab:AdminbusTab />
@@ -14,6 +15,7 @@
         <tabs:RoundTab />
         <tabs:ServerTab />
         <panic:PanicBunkerTab Name="PanicBunkerControl" Access="Public" />
+        <baby:BabyJailTab Name="BabyJailControl" Access="Public" />
         <playerTab:PlayerTab Name="PlayerTabControl" Access="Public" />
         <objectsTab:ObjectsTab Name="ObjectsTabControl" Access="Public" />
     </TabContainer>
diff --git a/Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailStatusWindow.xaml b/Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailStatusWindow.xaml
new file mode 100644
index 00000000000..b8034faf52a
--- /dev/null
+++ b/Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailStatusWindow.xaml
@@ -0,0 +1,6 @@
+<controls:BabyJailStatusWindow
+    xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.Administration.UI.Tabs.BabyJailTab"
+    Title="{Loc admin-ui-baby-jail-window-title}">
+    <RichTextLabel Name="MessageLabel" Access="Public" />
+</controls:BabyJailStatusWindow>
diff --git a/Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailStatusWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailStatusWindow.xaml.cs
new file mode 100644
index 00000000000..9e1d53818f2
--- /dev/null
+++ b/Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailStatusWindow.xaml.cs
@@ -0,0 +1,21 @@
+using Content.Client.Message;
+using Content.Client.UserInterface.Controls;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Administration.UI.Tabs.BabyJailTab;
+
+/*
+ * TODO: Remove me once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future.
+ */
+
+[GenerateTypedNameReferences]
+public sealed partial class BabyJailStatusWindow : FancyWindow
+{
+    public BabyJailStatusWindow()
+    {
+        RobustXamlLoader.Load(this);
+        MessageLabel.SetMarkup(Loc.GetString("admin-ui-baby-jail-is-enabled"));
+    }
+}
diff --git a/Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailTab.xaml b/Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailTab.xaml
new file mode 100644
index 00000000000..dd770c2be53
--- /dev/null
+++ b/Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailTab.xaml
@@ -0,0 +1,26 @@
+<controls:BabyJailTab
+    xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.Administration.UI.Tabs.BabyJailTab"
+    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    Margin="4">
+    <BoxContainer Orientation="Vertical">
+        <cc:CommandButton Name="EnabledButton" Command="babyjail" ToggleMode="True"
+                          Text="{Loc admin-ui-baby-jail-disabled}"
+                          ToolTip="{Loc admin-ui-baby-jail-tooltip}" />
+        <cc:CommandButton Name="ShowReasonButton" Command="babyjail_show_reason"
+                          ToggleMode="True" Text="{Loc admin-ui-baby-jail-show-reason}"
+                          ToolTip="{Loc admin-ui-baby-jail-show-reason-tooltip}" />
+        <BoxContainer Orientation="Vertical" Margin="0 10 0 0">
+            <BoxContainer Orientation="Horizontal" Margin="2">
+                <Label Text="{Loc admin-ui-baby-jail-max-account-age}" MinWidth="175" />
+                <LineEdit Name="MaxAccountAge" MinWidth="50" Margin="0 0 5 0" />
+                <Label Text="{Loc generic-minutes}" />
+            </BoxContainer>
+            <BoxContainer Orientation="Horizontal" Margin="2">
+                <Label Text="{Loc admin-ui-baby-jail-max-overall-minutes}" MinWidth="175" />
+                <LineEdit Name="MaxOverallMinutes" MinWidth="50" Margin="0 0 5 0" />
+                <Label Text="{Loc generic-minutes}" />
+            </BoxContainer>
+        </BoxContainer>
+    </BoxContainer>
+</controls:BabyJailTab>
diff --git a/Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailTab.xaml.cs b/Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailTab.xaml.cs
new file mode 100644
index 00000000000..aa9d6ced951
--- /dev/null
+++ b/Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailTab.xaml.cs
@@ -0,0 +1,75 @@
+using Content.Shared.Administration.Events;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Console;
+
+/*
+ * TODO: Remove me once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future.
+ */
+
+namespace Content.Client.Administration.UI.Tabs.BabyJailTab;
+
+[GenerateTypedNameReferences]
+public sealed partial class BabyJailTab : Control
+{
+    [Dependency] private readonly IConsoleHost _console = default!;
+
+    private string _maxAccountAge;
+    private string _maxOverallMinutes;
+
+    public BabyJailTab()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        MaxAccountAge.OnTextEntered += args => SendMaxAccountAge(args.Text);
+        MaxAccountAge.OnFocusExit += args => SendMaxAccountAge(args.Text);
+        _maxAccountAge = MaxAccountAge.Text;
+
+        MaxOverallMinutes.OnTextEntered += args => SendMaxOverallMinutes(args.Text);
+        MaxOverallMinutes.OnFocusExit += args => SendMaxOverallMinutes(args.Text);
+        _maxOverallMinutes = MaxOverallMinutes.Text;
+    }
+
+    private void SendMaxAccountAge(string text)
+    {
+        if (string.IsNullOrWhiteSpace(text) ||
+            text == _maxAccountAge ||
+            !int.TryParse(text, out var minutes))
+        {
+            return;
+        }
+
+        _console.ExecuteCommand($"babyjail_max_account_age {minutes}");
+    }
+
+    private void SendMaxOverallMinutes(string text)
+    {
+        if (string.IsNullOrWhiteSpace(text) ||
+            text == _maxOverallMinutes ||
+            !int.TryParse(text, out var minutes))
+        {
+            return;
+        }
+
+        _console.ExecuteCommand($"babyjail_max_overall_minutes {minutes}");
+    }
+
+    public void UpdateStatus(BabyJailStatus status)
+    {
+        EnabledButton.Pressed = status.Enabled;
+        EnabledButton.Text = Loc.GetString(status.Enabled
+            ? "admin-ui-baby-jail-enabled"
+            : "admin-ui-baby-jail-disabled"
+        );
+        EnabledButton.ModulateSelfOverride = status.Enabled ? Color.Red : null;
+        ShowReasonButton.Pressed = status.ShowReason;
+
+        MaxAccountAge.Text = status.MaxAccountAgeMinutes.ToString();
+        _maxAccountAge = MaxAccountAge.Text;
+
+        MaxOverallMinutes.Text = status.MaxOverallMinutes.ToString();
+        _maxOverallMinutes = MaxOverallMinutes.Text;
+    }
+}
diff --git a/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs b/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
index 392a1a96de2..d36a91c3733 100644
--- a/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
+++ b/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
@@ -3,6 +3,7 @@
 using Content.Client.Administration.UI;
 using Content.Client.Administration.UI.Tabs.ObjectsTab;
 using Content.Client.Administration.UI.Tabs.PanicBunkerTab;
+using Content.Client.Administration.UI.Tabs.BabyJailTab;
 using Content.Client.Administration.UI.Tabs.PlayerTab;
 using Content.Client.Gameplay;
 using Content.Client.Lobby;
@@ -37,11 +38,13 @@ public sealed class AdminUIController : UIController,
     private AdminMenuWindow? _window;
     private MenuButton? AdminButton => UIManager.GetActiveUIWidgetOrNull<MenuBar.Widgets.GameTopMenuBar>()?.AdminButton;
     private PanicBunkerStatus? _panicBunker;
+    private BabyJailStatus? _babyJail;
 
     public override void Initialize()
     {
         base.Initialize();
         SubscribeNetworkEvent<PanicBunkerChangedEvent>(OnPanicBunkerUpdated);
+        SubscribeNetworkEvent<BabyJailChangedEvent>(OnBabyJailUpdated);
     }
 
     private void OnPanicBunkerUpdated(PanicBunkerChangedEvent msg, EntitySessionEventArgs args)
@@ -56,6 +59,18 @@ private void OnPanicBunkerUpdated(PanicBunkerChangedEvent msg, EntitySessionEven
         }
     }
 
+    private void OnBabyJailUpdated(BabyJailChangedEvent msg, EntitySessionEventArgs args)
+    {
+        var showDialog = _babyJail == null && msg.Status.Enabled;
+        _babyJail = msg.Status;
+        _window?.BabyJailControl.UpdateStatus(msg.Status);
+
+        if (showDialog)
+        {
+            UIManager.CreateWindow<BabyJailStatusWindow>().OpenCentered();
+        }
+    }
+
     public void OnStateEntered(GameplayState state)
     {
         EnsureWindow();
@@ -101,6 +116,13 @@ private void EnsureWindow()
         if (_panicBunker != null)
             _window.PanicBunkerControl.UpdateStatus(_panicBunker);
 
+        /*
+         * TODO: Remove baby jail code once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future.
+         */
+
+        if (_babyJail != null)
+            _window.BabyJailControl.UpdateStatus(_babyJail);
+
         _window.PlayerTabControl.OnEntryKeyBindDown += PlayerTabEntryKeyBindDown;
         _window.ObjectsTabControl.OnEntryKeyBindDown += ObjectsTabEntryKeyBindDown;
         _window.OnOpen += OnWindowOpen;
diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index a8174197838..a06ff6e1b3a 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -836,6 +836,10 @@ public enum ConnectionDenyReason : byte
         Whitelist = 1,
         Full = 2,
         Panic = 3,
+        /*
+         * TODO: Remove baby jail code once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future.
+         */
+        BabyJail = 4,
     }
 
     public class ServerBanHit
diff --git a/Content.Server/Administration/Commands/BabyJailCommand.cs b/Content.Server/Administration/Commands/BabyJailCommand.cs
new file mode 100644
index 00000000000..058b67ca528
--- /dev/null
+++ b/Content.Server/Administration/Commands/BabyJailCommand.cs
@@ -0,0 +1,139 @@
+using Content.Shared.Administration;
+using Content.Shared.CCVar;
+using Robust.Shared.Configuration;
+using Robust.Shared.Console;
+
+/*
+ * TODO: Remove baby jail code once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future.
+ */
+
+namespace Content.Server.Administration.Commands;
+
+[AdminCommand(AdminFlags.Server)]
+public sealed class BabyJailCommand : LocalizedCommands
+{
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+
+    public override string Command => "babyjail";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        var toggle = Toggle(CCVars.BabyJailEnabled, shell, args, _cfg);
+        if (toggle == null)
+            return;
+
+        shell.WriteLine(Loc.GetString(toggle.Value ? "babyjail-command-enabled" : "babyjail-command-disabled"));
+    }
+
+    public static bool? Toggle(CVarDef<bool> cvar, IConsoleShell shell, string[] args, IConfigurationManager config)
+    {
+        if (args.Length > 1)
+        {
+            shell.WriteError(Loc.GetString("shell-need-between-arguments",("lower", 0), ("upper", 1)));
+            return null;
+        }
+
+        var enabled = config.GetCVar(cvar);
+
+        switch (args.Length)
+        {
+            case 0:
+                enabled = !enabled;
+                break;
+            case 1 when !bool.TryParse(args[0], out enabled):
+                shell.WriteError(Loc.GetString("shell-argument-must-be-boolean"));
+                return null;
+        }
+
+        config.SetCVar(cvar, enabled);
+
+        return enabled;
+    }
+}
+
+
+[AdminCommand(AdminFlags.Server)]
+public sealed class BabyJailShowReasonCommand : LocalizedCommands
+{
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+
+    public override string Command => "babyjail_show_reason";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        var toggle = BabyJailCommand.Toggle(CCVars.BabyJailShowReason, shell, args, _cfg);
+        if (toggle == null)
+            return;
+
+        shell.WriteLine(Loc.GetString(toggle.Value
+            ? "babyjail-command-show-reason-enabled"
+            : "babyjail-command-show-reason-disabled"
+        ));
+    }
+}
+
+[AdminCommand(AdminFlags.Server)]
+public sealed class BabyJailMinAccountAgeCommand : LocalizedCommands
+{
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+
+    public override string Command => "babyjail_max_account_age";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        switch (args.Length)
+        {
+            case 0:
+            {
+                var current = _cfg.GetCVar(CCVars.BabyJailMaxAccountAge);
+                shell.WriteLine(Loc.GetString("babyjail-command-max-account-age-is", ("minutes", current)));
+                break;
+            }
+            case > 1:
+                shell.WriteError(Loc.GetString("shell-need-between-arguments",("lower", 0), ("upper", 1)));
+                return;
+        }
+
+        if (!int.TryParse(args[0], out var minutes))
+        {
+            shell.WriteError(Loc.GetString("shell-argument-must-be-number"));
+            return;
+        }
+
+        _cfg.SetCVar(CCVars.BabyJailMaxAccountAge, minutes);
+        shell.WriteLine(Loc.GetString("babyjail-command-max-account-age-set", ("minutes", minutes)));
+    }
+}
+
+[AdminCommand(AdminFlags.Server)]
+public sealed class BabyJailMinOverallHoursCommand : LocalizedCommands
+{
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+
+    public override string Command => "babyjail_max_overall_minutes";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        switch (args.Length)
+        {
+            case 0:
+            {
+                var current = _cfg.GetCVar(CCVars.BabyJailMaxOverallMinutes);
+                shell.WriteLine(Loc.GetString("babyjail-command-max-overall-minutes-is", ("minutes", current)));
+                break;
+            }
+            case > 1:
+                shell.WriteError(Loc.GetString("shell-need-between-arguments",("lower", 0), ("upper", 1)));
+                return;
+        }
+
+        if (!int.TryParse(args[0], out var hours))
+        {
+            shell.WriteError(Loc.GetString("shell-argument-must-be-number"));
+            return;
+        }
+
+        _cfg.SetCVar(CCVars.BabyJailMaxOverallMinutes, hours);
+        shell.WriteLine(Loc.GetString("babyjail-command-overall-minutes-set", ("hours", hours)));
+    }
+}
diff --git a/Content.Server/Administration/Systems/AdminSystem.cs b/Content.Server/Administration/Systems/AdminSystem.cs
index 82bbe6e266b..08056936e87 100644
--- a/Content.Server/Administration/Systems/AdminSystem.cs
+++ b/Content.Server/Administration/Systems/AdminSystem.cs
@@ -62,6 +62,7 @@ public sealed class AdminSystem : EntitySystem
 
         private readonly HashSet<NetUserId> _roundActivePlayers = new();
         public readonly PanicBunkerStatus PanicBunker = new();
+        public readonly BabyJailStatus BabyJail = new();
 
         public override void Initialize()
         {
@@ -70,12 +71,24 @@ public override void Initialize()
             _playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
             _adminManager.OnPermsChanged += OnAdminPermsChanged;
 
+            // Panic Bunker Settings
             Subs.CVar(_config, CCVars.PanicBunkerEnabled, OnPanicBunkerChanged, true);
             Subs.CVar(_config, CCVars.PanicBunkerDisableWithAdmins, OnPanicBunkerDisableWithAdminsChanged, true);
             Subs.CVar(_config, CCVars.PanicBunkerEnableWithoutAdmins, OnPanicBunkerEnableWithoutAdminsChanged, true);
             Subs.CVar(_config, CCVars.PanicBunkerCountDeadminnedAdmins, OnPanicBunkerCountDeadminnedAdminsChanged, true);
             Subs.CVar(_config, CCVars.PanicBunkerShowReason, OnShowReasonChanged, true);
             Subs.CVar(_config, CCVars.PanicBunkerMinAccountAge, OnPanicBunkerMinAccountAgeChanged, true);
+            Subs.CVar(_config, CCVars.PanicBunkerMinOverallMinutes, OnPanicBunkerMinOverallMinutesChanged, true);
+
+            /*
+             * TODO: Remove baby jail code once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future.
+             */
+
+            // Baby Jail Settings
+            Subs.CVar(_config, CCVars.BabyJailEnabled, OnBabyJailChanged, true);
+            Subs.CVar(_config, CCVars.BabyJailShowReason, OnBabyJailShowReasonChanged, true);
+            Subs.CVar(_config, CCVars.BabyJailMaxAccountAge, OnBabyJailMaxAccountAgeChanged, true);
+            Subs.CVar(_config, CCVars.BabyJailMaxOverallMinutes, OnBabyJailMaxOverallMinutesChanged, true);
             Subs.CVar(_config, CCVars.PanicBunkerMinOverallHours, OnPanicBunkerMinOverallHoursChanged, true);
 
             SubscribeLocalEvent<IdentityChangedEvent>(OnIdentityChanged);
@@ -249,6 +262,17 @@ private void OnPanicBunkerChanged(bool enabled)
             SendPanicBunkerStatusAll();
         }
 
+        private void OnBabyJailChanged(bool enabled)
+        {
+            BabyJail.Enabled = enabled;
+            _chat.SendAdminAlert(Loc.GetString(enabled
+                ? "admin-ui-baby-jail-enabled-admin-alert"
+                : "admin-ui-baby-jail-disabled-admin-alert"
+            ));
+
+            SendBabyJailStatusAll();
+        }
+
         private void OnPanicBunkerDisableWithAdminsChanged(bool enabled)
         {
             PanicBunker.DisableWithAdmins = enabled;
@@ -273,18 +297,36 @@ private void OnShowReasonChanged(bool enabled)
             SendPanicBunkerStatusAll();
         }
 
+        private void OnBabyJailShowReasonChanged(bool enabled)
+        {
+            BabyJail.ShowReason = enabled;
+            SendBabyJailStatusAll();
+        }
+
         private void OnPanicBunkerMinAccountAgeChanged(int minutes)
         {
             PanicBunker.MinAccountAgeHours = minutes / 60;
             SendPanicBunkerStatusAll();
         }
 
+        private void OnBabyJailMaxAccountAgeChanged(int minutes)
+        {
+            BabyJail.MaxAccountAgeMinutes = minutes;
+            SendBabyJailStatusAll();
+        }
+
         private void OnPanicBunkerMinOverallHoursChanged(int hours)
         {
             PanicBunker.MinOverallHours = hours;
             SendPanicBunkerStatusAll();
         }
 
+        private void OnBabyJailMaxOverallMinutesChanged(int minutes)
+        {
+            BabyJail.MaxOverallMinutes = minutes;
+            SendBabyJailStatusAll();
+        }
+
         private void UpdatePanicBunker()
         {
             var admins = PanicBunker.CountDeadminnedAdmins
@@ -313,6 +355,15 @@ private void SendPanicBunkerStatusAll()
             }
         }
 
+        private void SendBabyJailStatusAll()
+        {
+            var ev = new BabyJailChangedEvent(BabyJail);
+            foreach (var admin in _adminManager.AllAdmins)
+            {
+                RaiseNetworkEvent(ev, admin);
+            }
+        }
+
         /// <summary>
         ///     Erases a player from the round.
         ///     This removes them and any trace of them from the round, deleting their
diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
index 64e93c5af19..b5f6b68b3b9 100644
--- a/Content.Server/Connection/ConnectionManager.cs
+++ b/Content.Server/Connection/ConnectionManager.cs
@@ -13,6 +13,9 @@
 using Robust.Shared.Network;
 using Robust.Shared.Timing;
 
+/*
+ * TODO: Remove baby jail code once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future.
+ */
 
 namespace Content.Server.Connection
 {
@@ -204,16 +207,24 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
                 }
             }
 
+            if (_cfg.GetCVar(CCVars.BabyJailEnabled) && adminData == null)
+            {
+                var result = await IsInvalidConnectionDueToBabyJail(userId, e);
 
-            var isPrivileged = await HasPrivilegedJoin(userId);
-            var isQueueEnabled = _cfg.GetCVar(CCVars.QueueEnabled);
+                if (result.IsInvalid)
+                    return (ConnectionDenyReason.BabyJail, result.Reason, null);
+            }
 
-            if (_plyMgr.PlayerCount >= _cfg.GetCVar(CCVars.SoftMaxPlayers) && !isPrivileged && !isQueueEnabled)
+            var wasInGame = EntitySystem.TryGet<GameTicker>(out var ticker) &&
+                            ticker.PlayerGameStatuses.TryGetValue(userId, out var status) &&
+                            status == PlayerGameStatus.JoinedGame;
+            var adminBypass = _cfg.GetCVar(CCVars.AdminBypassMaxPlayers) && adminData != null;
+            if ((_plyMgr.PlayerCount >= _cfg.GetCVar(CCVars.SoftMaxPlayers) && !adminBypass) && !wasInGame)
                 return (ConnectionDenyReason.Full, Loc.GetString("soft-player-cap-full"), null);
 
 
             // DeltaV - Replace existing softwhitelist implementation
-            if (false) //_cfg.GetCVar(CCVars.WhitelistEnabled))
+            if (_cfg.GetCVar(CCVars.WhitelistEnabled)) //_cfg.GetCVar(CCVars.WhitelistEnabled))
             {
                 var min = _cfg.GetCVar(CCVars.WhitelistMinPlayers);
                 var max = _cfg.GetCVar(CCVars.WhitelistMaxPlayers);
@@ -255,6 +266,61 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
             return null;
         }
 
+        private async Task<(bool IsInvalid, string Reason)> IsInvalidConnectionDueToBabyJail(NetUserId userId, NetConnectingArgs e)
+        {
+            // If you're whitelisted then bypass this whole thing
+            if (await _db.GetWhitelistStatusAsync(userId))
+                return (false, "");
+
+            // Initial cvar retrieval
+            var showReason = _cfg.GetCVar(CCVars.BabyJailShowReason);
+            var reason = _cfg.GetCVar(CCVars.BabyJailCustomReason);
+            var maxAccountAgeMinutes = _cfg.GetCVar(CCVars.BabyJailMaxAccountAge);
+            var maxPlaytimeMinutes = _cfg.GetCVar(CCVars.BabyJailMaxOverallMinutes);
+
+            // Wait some time to lookup data
+            var record = await _dbManager.GetPlayerRecordByUserId(userId);
+
+            // No player record = new account or the DB is having a skill issue
+            if (record == null)
+                return (false, "");
+
+            var isAccountAgeInvalid = record.FirstSeenTime.CompareTo(DateTimeOffset.Now - TimeSpan.FromMinutes(maxAccountAgeMinutes)) <= 0;
+            if (isAccountAgeInvalid && showReason)
+            {
+                var locAccountReason = reason != string.Empty
+                    ? reason
+                    : Loc.GetString("baby-jail-account-denied-reason",
+                        ("reason",
+                            Loc.GetString(
+                                "baby-jail-account-reason-account",
+                                ("minutes", maxAccountAgeMinutes))));
+
+                return (true, locAccountReason);
+            }
+
+            var overallTime = ( await _db.GetPlayTimes(e.UserId)).Find(p => p.Tracker == PlayTimeTrackingShared.TrackerOverall);
+            var isTotalPlaytimeInvalid = overallTime == null || overallTime.TimeSpent.TotalMinutes >= maxPlaytimeMinutes;
+
+            if (isTotalPlaytimeInvalid && showReason)
+            {
+                var locPlaytimeReason = reason != string.Empty
+                    ? reason
+                    : Loc.GetString("baby-jail-account-denied-reason",
+                        ("reason",
+                            Loc.GetString(
+                                "baby-jail-account-reason-overall",
+                                ("minutes", maxPlaytimeMinutes))));
+
+                return (true, locPlaytimeReason);
+            }
+
+            if (!showReason && isTotalPlaytimeInvalid || isAccountAgeInvalid)
+                return (true, Loc.GetString("baby-jail-account-denied"));
+
+            return (false, "");
+        }
+
         private bool HasTemporaryBypass(NetUserId user)
         {
             return _temporaryBypasses.TryGetValue(user, out var time) && time > _gameTiming.RealTime;
diff --git a/Content.Server/GameTicking/GameTicker.StatusShell.cs b/Content.Server/GameTicking/GameTicker.StatusShell.cs
index 53c94345995..c64a06eabbe 100644
--- a/Content.Server/GameTicking/GameTicker.StatusShell.cs
+++ b/Content.Server/GameTicking/GameTicker.StatusShell.cs
@@ -49,6 +49,12 @@ private void GetStatusResponse(JsonNode jObject)
                 jObject["players"] = _joinQueue.ActualPlayersCount;
                 jObject["soft_max_players"] = _cfg.GetCVar(CCVars.SoftMaxPlayers);
                 jObject["panic_bunker"] = _cfg.GetCVar(CCVars.PanicBunkerEnabled);
+
+                /*
+                 * TODO: Remove baby jail code once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future.
+                 */
+
+                jObject["baby_jail"] = _cfg.GetCVar(CCVars.BabyJailEnabled);
                 jObject["run_level"] = (int) _runLevel;
                 if (preset != null)
                     jObject["preset"] = Loc.GetString(preset.ModeTitle);
diff --git a/Content.Shared/Administration/Events/BabyJailChangedEvent.cs b/Content.Shared/Administration/Events/BabyJailChangedEvent.cs
new file mode 100644
index 00000000000..56d5ce51626
--- /dev/null
+++ b/Content.Shared/Administration/Events/BabyJailChangedEvent.cs
@@ -0,0 +1,22 @@
+using Robust.Shared.Serialization;
+
+/*
+ * TODO: Remove baby jail code once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future.
+ */
+
+namespace Content.Shared.Administration.Events;
+
+[Serializable, NetSerializable]
+public sealed class BabyJailStatus
+{
+    public bool Enabled;
+    public bool ShowReason;
+    public int MaxAccountAgeMinutes;
+    public int MaxOverallMinutes;
+}
+
+[Serializable, NetSerializable]
+public sealed class BabyJailChangedEvent(BabyJailStatus status) : EntityEventArgs
+{
+    public BabyJailStatus Status = status;
+}
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 17be4f1478b..d3f8cac7c57 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -338,6 +338,48 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<bool> BypassBunkerWhitelist =
             CVarDef.Create("game.panic_bunker.whitelisted_can_bypass", true, CVar.SERVERONLY);
 
+        /*
+         * TODO: Remove baby jail code once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future.
+         */
+
+        /// <summary>
+        /// Whether the baby jail is currently enabled.
+        /// </summary>
+        public static readonly CVarDef<bool> BabyJailEnabled  =
+            CVarDef.Create("game.baby_jail.enabled", false, CVar.NOTIFY | CVar.REPLICATED | CVar.SERVER);
+
+        /// <summary>
+        /// Show reason of disconnect for user or not.
+        /// </summary>
+        public static readonly CVarDef<bool> BabyJailShowReason =
+            CVarDef.Create("game.baby_jail.show_reason", false, CVar.SERVERONLY);
+
+        /// <summary>
+        /// Maximum age of the account (from server's PoV, so from first-seen date) in minutes that can access baby
+        /// jailed servers.
+        /// </summary>
+        public static readonly CVarDef<int> BabyJailMaxAccountAge =
+            CVarDef.Create("game.baby_jail.max_account_age", 1440, CVar.SERVERONLY);
+
+        /// <summary>
+        /// Maximum overall played time allowed to access baby jailed servers.
+        /// </summary>
+        public static readonly CVarDef<int> BabyJailMaxOverallMinutes =
+            CVarDef.Create("game.baby_jail.max_overall_minutes", 120, CVar.SERVERONLY);
+
+        /// <summary>
+        /// A custom message that will be used for connections denied due to the baby jail.
+        /// If not empty, then will overwrite <see cref="BabyJailShowReason"/>
+        /// </summary>
+        public static readonly CVarDef<string> BabyJailCustomReason =
+            CVarDef.Create("game.baby_jail.custom_reason", string.Empty, CVar.SERVERONLY);
+
+        /// <summary>
+        /// Allow bypassing the baby jail if the user is whitelisted.
+        /// </summary>
+        public static readonly CVarDef<bool> BypassBabyJailWhitelist =
+            CVarDef.Create("game.baby_jail.whitelisted_can_bypass", true, CVar.SERVERONLY);
+
         /// <summary>
         /// Make people bonk when trying to climb certain objects like tables.
         /// </summary>
diff --git a/Resources/Locale/en-US/administration/commands/babyjail.ftl b/Resources/Locale/en-US/administration/commands/babyjail.ftl
new file mode 100644
index 00000000000..5a9d9490517
--- /dev/null
+++ b/Resources/Locale/en-US/administration/commands/babyjail.ftl
@@ -0,0 +1,19 @@
+cmd-babyjail-desc = Toggles the baby jail, which enables stricter restrictions on who's allowed to join the server.
+cmd-babyjail-help = Usage: babyjail
+babyjail-command-enabled = Baby jail has been enabled.
+babyjail-command-disabled = Baby jail has been disabled.
+
+cmd-babyjail_show_reason-desc = Toggles whether or not to show connecting clients the reason why the baby jail blocked them from joining.
+cmd-babyjail_show_reason-help = Usage: babyjail_show_reason
+babyjail-command-show-reason-enabled = The baby jail will now show a reason to users it blocks from connecting.
+babyjail-command-show-reason-disabled = The baby jail will no longer show a reason to users it blocks from connecting.
+
+cmd-babyjail_max_account_age-desc = Gets or sets the maximum account age in minutes that an account can have to be allowed to connect with the baby jail enabled.
+cmd-babyjail_max_account_age-help = Usage: babyjail_max_account_age <minutes>
+babyjail-command-max-account-age-is = The maximum account age for the baby jail is {$minutes} minutes.
+babyjail-command-max-account-age-set = Set the maximum account age for the baby jail to {$minutes} minutes.
+
+cmd-babyjail_max_overall_minutes-desc = Gets or sets the maximum overall playtime in minutes that an account can have to be allowed to connect with the baby jail enabled.
+cmd-babyjail_max_overall_minutes-help = Usage: babyjail_max_overall_minutes <minutes>
+babyjail-command-max-overall-minutes-is = The maximum overall playtime for the baby jail is {$minutes} minutes.
+babyjail-command-max-overall-minutes-set = Set the maximum overall playtime for the baby jail to {$minutes} minutes.
diff --git a/Resources/Locale/en-US/administration/ui/admin-menu-window.ftl b/Resources/Locale/en-US/administration/ui/admin-menu-window.ftl
index c759e4c2cb1..03b2046a9e1 100644
--- a/Resources/Locale/en-US/administration/ui/admin-menu-window.ftl
+++ b/Resources/Locale/en-US/administration/ui/admin-menu-window.ftl
@@ -7,5 +7,6 @@ admin-menu-atmos-tab = Atmos
 admin-menu-round-tab = Round
 admin-menu-server-tab = Server
 admin-menu-panic-bunker-tab = Panic Bunker
+admin-menu-baby-jail-tab = Baby Jail
 admin-menu-players-tab = Players
 admin-menu-objects-tab = Objects
diff --git a/Resources/Locale/en-US/administration/ui/tabs/babyjail-tab.ftl b/Resources/Locale/en-US/administration/ui/tabs/babyjail-tab.ftl
new file mode 100644
index 00000000000..46dce54c1fc
--- /dev/null
+++ b/Resources/Locale/en-US/administration/ui/tabs/babyjail-tab.ftl
@@ -0,0 +1,16 @@
+admin-ui-baby-jail-window-title = Baby Jail
+
+admin-ui-baby-jail-enabled = Baby Jail Enabled
+admin-ui-baby-jail-disabled = Baby Jail Disabled
+admin-ui-baby-jail-tooltip = The baby jail restricts players from joining if their account is too old or they do have too much overall playtime on this server.
+
+admin-ui-baby-jail-show-reason = Show Reason
+admin-ui-baby-jail-show-reason-tooltip = Show the user why they were blocked from connecting by the baby jail.
+
+admin-ui-baby-jail-max-account-age = Max. Account Age
+admin-ui-baby-jail-max-overall-minutes = Max. Overall Playtime
+
+admin-ui-baby-jail-is-enabled = [font size=20][bold]The baby jail is currently enabled.[/bold][/font]
+
+admin-ui-baby-jail-enabled-admin-alert = The baby jail has been enabled.
+admin-ui-baby-jail-disabled-admin-alert = The baby jail has been disabled.
diff --git a/Resources/Locale/en-US/connection-messages.ftl b/Resources/Locale/en-US/connection-messages.ftl
index 7f4afce8b96..f1596d90152 100644
--- a/Resources/Locale/en-US/connection-messages.ftl
+++ b/Resources/Locale/en-US/connection-messages.ftl
@@ -38,4 +38,10 @@ soft-player-cap-full = The server is full!
 panic-bunker-account-denied = This server is in panic bunker mode, often enabled as a precaution against raids. New connections by accounts not meeting certain requirements are temporarily not accepted. Try again later
 panic-bunker-account-denied-reason = This server is in panic bunker mode, often enabled as a precaution against raids. New connections by accounts not meeting certain requirements are temporarily not accepted. Try again later. Reason: "{$reason}"
 panic-bunker-account-reason-account = Your Space Station 14 account is too new. It must be older than {$minutes} minutes
-panic-bunker-account-reason-overall = Your overall playtime on the server must be greater than {$hours} hours
+panic-bunker-account-reason-overall = Your overall playtime on the server must be greater than {$minutes} $minutes
+
+baby-jail-account-denied = This server is a newbie server, intended for new players and those who want to help them. New connections by accounts that are too old or are not on a whitelist are not accepted. Check out some other servers and see everything Space Station 14 has to offer. Have fun!
+baby-jail-account-denied-reason = This server is a newbie server, intended for new players and those who want to help them. New connections by accounts that are too old or are not on a whitelist are not accepted. Check out some other servers and see everything Space Station 14 has to offer. Have fun! Reason: "{$reason}"
+baby-jail-account-reason-account = Your Space Station 14 account is too old. It must be younger than {$minutes} minutes
+baby-jail-account-reason-overall = Your overall playtime on the server must be younger than {$minutes} $minutes
+

From c8fca5a1a58c44b6bff0c2407460d2808cd29c62 Mon Sep 17 00:00:00 2001
From: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Date: Fri, 9 Aug 2024 08:33:25 +0300
Subject: [PATCH 230/366] Implement a playerpanel (#30238)

* Basic structure for the player panel ui

* Ensure basic functionality

Player panel now receives and displays basic info

* Make whitelistcommands accept user ids

* Make PlayerPanel use GUIDs where possible

* Add functionality to most playerpanel buttons

* Implement remaining playerpanel features

* Localize everything

* Finish up

* Put command arguments in quotes

I am not sure if it's even possible to have something like a space in
them considering they are guids and usernames but sure why not

* Make playerpanel a verb

* Add Logs button to player panel

* Change Notesbutton text and make whitelistbutton a confirmtion button

* Add freeze button that does not mute the player

* Add sharedconnections counter to playerpanel

* Make the playetime format clearer

* Allow for copying of the a player's username

* Do minor cleanup

* Rearrange buttons

* Fix unfreeze button not updating

* Fix wrong localisation text

* "Fix" the same role ban counting multiple times

The way rolebans are stored is horrible.
As such if you ban someone from a departmenrt or something
role bans are individually placed for every role.
The only way I found to distinguish them is the bantime.
This is horrible but I do not want to rewrite how all the bans are
stored right now.

* Add Delete and Rejuvenate buttons to player panel

By popular demand

* Marginally improve ui

* Add logs

* review update

* Fix verb

* Fix double notes

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
---
 .../UI/PlayerPanel/PlayerPanel.xaml           |  36 +++
 .../UI/PlayerPanel/PlayerPanel.xaml.cs        | 132 +++++++++++
 .../UI/PlayerPanel/PlayerPanelEui.cs          |  72 ++++++
 .../Commands/PlayerPanelCommand.cs            |  56 +++++
 .../Administration/PlayerPanelEui.cs          | 210 ++++++++++++++++++
 .../Administration/Systems/AdminVerbSystem.cs |   9 +
 Content.Server/Whitelist/WhitelistCommands.cs |   4 +-
 .../Administration/PlayerPanelEuiState.cs     |  54 +++++
 .../en-US/administration/ui/actions.ftl       |   1 +
 .../en-US/administration/ui/player-panel.ftl  |  22 ++
 .../Locale/en-US/connection-messages.ftl      |   4 +-
 Resources/Locale/en-US/info/playerpanel.ftl   |   7 +
 12 files changed, 603 insertions(+), 4 deletions(-)
 create mode 100644 Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml
 create mode 100644 Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml.cs
 create mode 100644 Content.Client/Administration/UI/PlayerPanel/PlayerPanelEui.cs
 create mode 100644 Content.Server/Administration/Commands/PlayerPanelCommand.cs
 create mode 100644 Content.Server/Administration/PlayerPanelEui.cs
 create mode 100644 Content.Shared/Administration/PlayerPanelEuiState.cs
 create mode 100644 Resources/Locale/en-US/info/playerpanel.ftl

diff --git a/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml b/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml
new file mode 100644
index 00000000000..8feec273b47
--- /dev/null
+++ b/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml
@@ -0,0 +1,36 @@
+<ui:FancyWindow
+    xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
+    Title="{Loc ban-panel-title}" MinSize="300 300">
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Horizontal">
+        <Label Name="PlayerName"/>
+        <Button Name="UsernameCopyButton" Text="{Loc player-panel-copy-username}"/>
+        </BoxContainer>
+       <BoxContainer Orientation="Horizontal">
+           <Label Name="Whitelisted"/>
+           <controls:ConfirmButton Name="WhitelistToggle" Text="{Loc 'player-panel-false'}" Visible="False"></controls:ConfirmButton>
+       </BoxContainer>
+       <Label Name="Playtime"/>
+       <Label Name="Notes"/>
+       <Label Name="Bans"/>
+       <Label Name="RoleBans"/>
+       <Label Name="SharedConnections"/>
+
+       <BoxContainer Align="Center">
+           <GridContainer Rows="5">
+            <Button Name="NotesButton" Text="{Loc player-panel-show-notes}" SetWidth="136" Disabled="True"/>
+            <Button Name="AhelpButton" Text="{Loc player-panel-help}" Disabled="True"/>
+            <Button Name="FreezeButton" Text = "{Loc player-panel-freeze}" Disabled="True"/>
+            <controls:ConfirmButton Name="KickButton" Text="{Loc player-panel-kick}" Disabled="True"/>
+            <controls:ConfirmButton Name="DeleteButton" Text="{Loc player-panel-delete}" Disabled="True"/>
+            <Button Name="ShowBansButton" Text="{Loc player-panel-show-bans}" SetWidth="136" Disabled="True"/>
+            <Button Name="LogsButton" Text="{Loc player-panel-logs}" Disabled="True"/>
+            <Button Name="FreezeAndMuteToggleButton" Text="{Loc player-panel-freeze-and-mute}" Disabled="True"/>
+            <Button Name="BanButton" Text="{Loc player-panel-ban}" Disabled="True"/>
+            <controls:ConfirmButton Name="RejuvenateButton" Text="{Loc player-panel-rejuvenate}" Disabled="True"/>
+           </GridContainer>
+       </BoxContainer>
+    </BoxContainer>
+</ui:FancyWindow>
diff --git a/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml.cs b/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml.cs
new file mode 100644
index 00000000000..824d9eb6c77
--- /dev/null
+++ b/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml.cs
@@ -0,0 +1,132 @@
+using Content.Client.Administration.Managers;
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Administration;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Network;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Administration.UI.PlayerPanel;
+
+[GenerateTypedNameReferences]
+public sealed partial class PlayerPanel : FancyWindow
+{
+    private readonly IClientAdminManager _adminManager;
+
+    public event Action<string>? OnUsernameCopy;
+    public event Action<NetUserId?>? OnOpenNotes;
+    public event Action<NetUserId?>? OnOpenBans;
+    public event Action<NetUserId?>? OnAhelp;
+    public event Action<string?>? OnKick;
+    public event Action<NetUserId?>? OnOpenBanPanel;
+    public event Action<NetUserId?, bool>? OnWhitelistToggle;
+    public event Action? OnFreezeAndMuteToggle;
+    public event Action? OnFreeze;
+    public event Action? OnLogs;
+    public event Action? OnDelete;
+    public event Action? OnRejuvenate;
+
+    public NetUserId? TargetPlayer;
+    public string? TargetUsername;
+    private bool _isWhitelisted;
+
+    public PlayerPanel(IClientAdminManager adminManager)
+    {
+            RobustXamlLoader.Load(this);
+            _adminManager = adminManager;
+
+            UsernameCopyButton.OnPressed += _ => OnUsernameCopy?.Invoke(PlayerName.Text ?? "");
+            BanButton.OnPressed += _ => OnOpenBanPanel?.Invoke(TargetPlayer);
+            KickButton.OnPressed += _ => OnKick?.Invoke(TargetUsername);
+            NotesButton.OnPressed += _ => OnOpenNotes?.Invoke(TargetPlayer);
+            ShowBansButton.OnPressed += _ => OnOpenBans?.Invoke(TargetPlayer);
+            AhelpButton.OnPressed += _ => OnAhelp?.Invoke(TargetPlayer);
+            WhitelistToggle.OnPressed += _ =>
+            {
+                OnWhitelistToggle?.Invoke(TargetPlayer, _isWhitelisted);
+                SetWhitelisted(!_isWhitelisted);
+            };
+            FreezeButton.OnPressed += _ => OnFreeze?.Invoke();
+            FreezeAndMuteToggleButton.OnPressed += _ => OnFreezeAndMuteToggle?.Invoke();
+            LogsButton.OnPressed += _ => OnLogs?.Invoke();
+            DeleteButton.OnPressed += _ => OnDelete?.Invoke();
+            RejuvenateButton.OnPressed += _ => OnRejuvenate?.Invoke();
+    }
+
+    public void SetUsername(string player)
+    {
+        Title = Loc.GetString("player-panel-title", ("player", player));
+        PlayerName.Text = Loc.GetString("player-panel-username", ("player", player));
+    }
+
+    public void SetWhitelisted(bool? whitelisted)
+    {
+        if (whitelisted == null)
+        {
+            Whitelisted.Text = null;
+            WhitelistToggle.Visible = false;
+        }
+        else
+        {
+            Whitelisted.Text = Loc.GetString("player-panel-whitelisted");
+            WhitelistToggle.Text = whitelisted.Value.ToString();
+            WhitelistToggle.Visible = true;
+            _isWhitelisted = whitelisted.Value;
+        }
+    }
+
+    public void SetBans(int? totalBans, int? totalRoleBans)
+    {
+        // If one value exists then so should the other.
+        DebugTools.Assert(totalBans.HasValue && totalRoleBans.HasValue || totalBans == null && totalRoleBans == null);
+
+        Bans.Text = totalBans != null ? Loc.GetString("player-panel-bans", ("totalBans", totalBans)) : null;
+
+        RoleBans.Text = totalRoleBans != null ? Loc.GetString("player-panel-rolebans", ("totalRoleBans", totalRoleBans)) : null;
+    }
+
+    public void SetNotes(int? totalNotes)
+    {
+        Notes.Text = totalNotes != null ? Loc.GetString("player-panel-notes", ("totalNotes", totalNotes)) : null;
+    }
+
+    public void SetSharedConnections(int sharedConnections)
+    {
+        SharedConnections.Text = Loc.GetString("player-panel-shared-connections", ("sharedConnections", sharedConnections));
+    }
+
+    public void SetPlaytime(TimeSpan playtime)
+    {
+        Playtime.Text = Loc.GetString("player-panel-playtime",
+            ("days", playtime.Days),
+            ("hours", playtime.Hours % 24),
+            ("minutes", playtime.Minutes % (24 * 60)));
+    }
+
+    public void SetFrozen(bool canFreeze, bool frozen)
+    {
+        FreezeAndMuteToggleButton.Disabled = !canFreeze;
+        FreezeButton.Disabled = !canFreeze || frozen;
+
+        FreezeAndMuteToggleButton.Text = Loc.GetString(!frozen ? "player-panel-freeze-and-mute" : "player-panel-unfreeze");
+    }
+
+    public void SetAhelp(bool canAhelp)
+    {
+        AhelpButton.Disabled = !canAhelp;
+    }
+
+    public void SetButtons()
+    {
+        BanButton.Disabled = !_adminManager.CanCommand("banpanel");
+        KickButton.Disabled = !_adminManager.CanCommand("kick");
+        NotesButton.Disabled = !_adminManager.CanCommand("adminnotes");
+        ShowBansButton.Disabled = !_adminManager.CanCommand("banlist");
+        WhitelistToggle.Disabled =
+            !(_adminManager.CanCommand("addwhitelist") && _adminManager.CanCommand("removewhitelist"));
+        LogsButton.Disabled = !_adminManager.CanCommand("adminlogs");
+        RejuvenateButton.Disabled = !_adminManager.HasFlag(AdminFlags.Debug);
+        DeleteButton.Disabled = !_adminManager.HasFlag(AdminFlags.Debug);
+    }
+}
diff --git a/Content.Client/Administration/UI/PlayerPanel/PlayerPanelEui.cs b/Content.Client/Administration/UI/PlayerPanel/PlayerPanelEui.cs
new file mode 100644
index 00000000000..87ce7560463
--- /dev/null
+++ b/Content.Client/Administration/UI/PlayerPanel/PlayerPanelEui.cs
@@ -0,0 +1,72 @@
+using Content.Client.Administration.Managers;
+using Content.Client.Eui;
+using Content.Shared.Administration;
+using Content.Shared.Eui;
+using JetBrains.Annotations;
+using Robust.Client.Console;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.Administration.UI.PlayerPanel;
+
+[UsedImplicitly]
+public sealed class PlayerPanelEui : BaseEui
+{
+    [Dependency] private readonly IClientConsoleHost _console = default!;
+    [Dependency] private readonly IClientAdminManager _admin = default!;
+    [Dependency] private readonly IClipboardManager _clipboard = default!;
+
+    private PlayerPanel PlayerPanel { get;  }
+
+    public PlayerPanelEui()
+    {
+        PlayerPanel = new PlayerPanel(_admin);
+
+        PlayerPanel.OnUsernameCopy += username => _clipboard.SetText(username);
+        PlayerPanel.OnOpenNotes += id => _console.ExecuteCommand($"adminnotes \"{id}\"");
+        // Kick command does not support GUIDs
+        PlayerPanel.OnKick += username => _console.ExecuteCommand($"kick \"{username}\"");
+        PlayerPanel.OnOpenBanPanel += id => _console.ExecuteCommand($"banpanel \"{id}\"");
+        PlayerPanel.OnOpenBans += id => _console.ExecuteCommand($"banlist \"{id}\"");
+        PlayerPanel.OnAhelp += id => _console.ExecuteCommand($"openahelp \"{id}\"");
+        PlayerPanel.OnWhitelistToggle += (id, whitelisted) =>
+        {
+            _console.ExecuteCommand(whitelisted ? $"whitelistremove \"{id}\"" : $"whitelistadd \"{id}\"");
+        };
+
+        PlayerPanel.OnFreezeAndMuteToggle += () => SendMessage(new PlayerPanelFreezeMessage(true));
+        PlayerPanel.OnFreeze += () => SendMessage(new PlayerPanelFreezeMessage());
+        PlayerPanel.OnLogs += () => SendMessage(new PlayerPanelLogsMessage());
+        PlayerPanel.OnRejuvenate += () => SendMessage(new PlayerPanelRejuvenationMessage());
+        PlayerPanel.OnDelete+= () => SendMessage(new PlayerPanelDeleteMessage());
+
+        PlayerPanel.OnClose += () => SendMessage(new CloseEuiMessage());
+    }
+
+    public override void Opened()
+    {
+        PlayerPanel.OpenCentered();
+    }
+
+    public override void Closed()
+    {
+        PlayerPanel.Close();
+    }
+
+    public override void HandleState(EuiStateBase state)
+    {
+        if (state is not PlayerPanelEuiState s)
+            return;
+
+        PlayerPanel.TargetPlayer = s.Guid;
+        PlayerPanel.TargetUsername = s.Username;
+        PlayerPanel.SetUsername(s.Username);
+        PlayerPanel.SetPlaytime(s.Playtime);
+        PlayerPanel.SetBans(s.TotalBans, s.TotalRoleBans);
+        PlayerPanel.SetNotes(s.TotalNotes);
+        PlayerPanel.SetWhitelisted(s.Whitelisted);
+        PlayerPanel.SetSharedConnections(s.SharedConnections);
+        PlayerPanel.SetFrozen(s.CanFreeze, s.Frozen);
+        PlayerPanel.SetAhelp(s.CanAhelp);
+        PlayerPanel.SetButtons();
+    }
+}
diff --git a/Content.Server/Administration/Commands/PlayerPanelCommand.cs b/Content.Server/Administration/Commands/PlayerPanelCommand.cs
new file mode 100644
index 00000000000..4a065bd58a0
--- /dev/null
+++ b/Content.Server/Administration/Commands/PlayerPanelCommand.cs
@@ -0,0 +1,56 @@
+using System.Linq;
+using Content.Server.EUI;
+using Content.Shared.Administration;
+using Robust.Server.Player;
+using Robust.Shared.Console;
+
+namespace Content.Server.Administration.Commands;
+
+[AdminCommand(AdminFlags.Admin)]
+public sealed class PlayerPanelCommand : LocalizedCommands
+{
+    [Dependency] private readonly IPlayerLocator _locator = default!;
+    [Dependency] private readonly EuiManager _euis = default!;
+    [Dependency] private readonly IPlayerManager _players = default!;
+
+    public override string Command => "playerpanel";
+
+    public override async void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (shell.Player is not { } admin)
+        {
+            shell.WriteError(Loc.GetString("cmd-playerpanel-server"));
+            return;
+        }
+
+        if (args.Length != 1)
+        {
+            shell.WriteError(Loc.GetString("cmd-playerpanel-invalid-arguments"));
+            return;
+        }
+
+        var queriedPlayer = await _locator.LookupIdByNameOrIdAsync(args[0]);
+
+        if (queriedPlayer == null)
+        {
+            shell.WriteError(Loc.GetString("cmd-playerpanel-invalid-player"));
+            return;
+        }
+
+        var ui = new PlayerPanelEui(queriedPlayer);
+        _euis.OpenEui(ui, admin);
+        ui.SetPlayerState();
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length == 1)
+        {
+            var options = _players.Sessions.OrderBy(c => c.Name).Select(c => c.Name).ToArray();
+
+            return CompletionResult.FromHintOptions(options, LocalizationManager.GetString("cmd-playerpanel-completion"));
+        }
+
+        return CompletionResult.Empty;
+    }
+}
diff --git a/Content.Server/Administration/PlayerPanelEui.cs b/Content.Server/Administration/PlayerPanelEui.cs
new file mode 100644
index 00000000000..4c0df806012
--- /dev/null
+++ b/Content.Server/Administration/PlayerPanelEui.cs
@@ -0,0 +1,210 @@
+using System.Linq;
+using Content.Server.Administration.Logs;
+using Content.Server.Administration.Managers;
+using Content.Server.Administration.Notes;
+using Content.Server.Administration.Systems;
+using Content.Server.Database;
+using Content.Server.EUI;
+using Content.Shared.Administration;
+using Content.Shared.Database;
+using Content.Shared.Eui;
+using Robust.Server.Player;
+using Robust.Shared.Player;
+
+namespace Content.Server.Administration;
+
+public sealed class PlayerPanelEui : BaseEui
+{
+    [Dependency] private readonly IAdminManager _admins = default!;
+    [Dependency] private readonly IServerDbManager _db = default!;
+    [Dependency] private readonly IAdminNotesManager _notesMan = default!;
+    [Dependency] private readonly IEntityManager _entity = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly EuiManager _eui = default!;
+    [Dependency] private readonly IAdminLogManager _adminLog = default!;
+
+    private readonly LocatedPlayerData _targetPlayer;
+    private int? _notes;
+    private int? _bans;
+    private int? _roleBans;
+    private int _sharedConnections;
+    private bool? _whitelisted;
+    private TimeSpan _playtime;
+    private bool _frozen;
+    private bool _canFreeze;
+    private bool _canAhelp;
+
+    public PlayerPanelEui(LocatedPlayerData player)
+    {
+        IoCManager.InjectDependencies(this);
+        _targetPlayer = player;
+    }
+
+    public override void Opened()
+    {
+        base.Opened();
+        _admins.OnPermsChanged += OnPermsChanged;
+    }
+
+    public override void Closed()
+    {
+        base.Closed();
+        _admins.OnPermsChanged -= OnPermsChanged;
+    }
+
+    public override EuiStateBase GetNewState()
+    {
+        return new PlayerPanelEuiState(_targetPlayer.UserId,
+            _targetPlayer.Username,
+            _playtime,
+            _notes,
+            _bans,
+            _roleBans,
+            _sharedConnections,
+            _whitelisted,
+            _canFreeze,
+            _frozen,
+            _canAhelp);
+    }
+
+    private void OnPermsChanged(AdminPermsChangedEventArgs args)
+    {
+        if (args.Player != Player)
+            return;
+
+        SetPlayerState();
+    }
+
+    public override void HandleMessage(EuiMessageBase msg)
+    {
+        base.HandleMessage(msg);
+
+        ICommonSession? session;
+
+        switch (msg)
+        {
+            case PlayerPanelFreezeMessage freezeMsg:
+                if (!_admins.IsAdmin(Player) ||
+                    !_entity.TrySystem<AdminFrozenSystem>(out var frozenSystem) ||
+                    !_player.TryGetSessionById(_targetPlayer.UserId, out session) ||
+                    session.AttachedEntity == null)
+                    return;
+
+                if (_entity.HasComponent<AdminFrozenComponent>(session.AttachedEntity))
+                {
+                    _adminLog.Add(LogType.Action,$"{Player:actor} unfroze {_entity.ToPrettyString(session.AttachedEntity):subject}");
+                    _entity.RemoveComponent<AdminFrozenComponent>(session.AttachedEntity.Value);
+                    SetPlayerState();
+                    return;
+                }
+
+                if (freezeMsg.Mute)
+                {
+                    _adminLog.Add(LogType.Action,$"{Player:actor} froze and muted {_entity.ToPrettyString(session.AttachedEntity):subject}");
+                    frozenSystem.FreezeAndMute(session.AttachedEntity.Value);
+                }
+                else
+                {
+                    _adminLog.Add(LogType.Action,$"{Player:actor} froze {_entity.ToPrettyString(session.AttachedEntity):subject}");
+                    _entity.EnsureComponent<AdminFrozenComponent>(session.AttachedEntity.Value);
+                }
+                SetPlayerState();
+                break;
+
+            case PlayerPanelLogsMessage:
+                if (!_admins.HasAdminFlag(Player, AdminFlags.Logs))
+                    return;
+
+                _adminLog.Add(LogType.Action, $"{Player:actor} opened logs on {_targetPlayer.Username:subject}");
+                var ui = new AdminLogsEui();
+                _eui.OpenEui(ui, Player);
+                ui.SetLogFilter(search: _targetPlayer.Username);
+                break;
+            case PlayerPanelDeleteMessage:
+            case PlayerPanelRejuvenationMessage:
+                if (!_admins.HasAdminFlag(Player, AdminFlags.Debug) ||
+                    !_player.TryGetSessionById(_targetPlayer.UserId, out session) ||
+                    session.AttachedEntity == null)
+                    return;
+
+                if (msg is PlayerPanelRejuvenationMessage)
+                {
+                    _adminLog.Add(LogType.Action,$"{Player:actor} rejuvenated {_entity.ToPrettyString(session.AttachedEntity):subject}");
+                    if (!_entity.TrySystem<RejuvenateSystem>(out var rejuvenate))
+                        return;
+
+                    rejuvenate.PerformRejuvenate(session.AttachedEntity.Value);
+                }
+                else
+                {
+                    _adminLog.Add(LogType.Action,$"{Player:actor} deleted {_entity.ToPrettyString(session.AttachedEntity):subject}");
+                    _entity.DeleteEntity(session.AttachedEntity);
+                }
+                break;
+        }
+    }
+
+    public async void SetPlayerState()
+    {
+        if (!_admins.IsAdmin(Player))
+        {
+            Close();
+            return;
+        }
+
+        _playtime = (await _db.GetPlayTimes(_targetPlayer.UserId))
+            .Where(p => p.Tracker == "Overall")
+            .Select(p => p.TimeSpent)
+            .FirstOrDefault();
+
+        if (_notesMan.CanView(Player))
+        {
+            _notes = (await _notesMan.GetAllAdminRemarks(_targetPlayer.UserId)).Count;
+        }
+        else
+        {
+            _notes = null;
+        }
+
+        _sharedConnections = _player.Sessions.Count(s => s.Channel.RemoteEndPoint.Address.Equals(_targetPlayer.LastAddress) && s.UserId != _targetPlayer.UserId);
+
+    // Apparently the Bans flag is also used for whitelists
+    if (_admins.HasAdminFlag(Player, AdminFlags.Ban))
+        {
+            _whitelisted = await _db.GetWhitelistStatusAsync(_targetPlayer.UserId);
+            // This won't get associated ip or hwid bans but they were not placed on this account anyways
+            _bans = (await _db.GetServerBansAsync(null, _targetPlayer.UserId, null)).Count;
+            // Unfortunately role bans for departments and stuff are issued individually. This means that a single role ban can have many individual role bans internally
+            // The only way to distinguish whether a role ban is the same is to compare the ban time.
+            // This is horrible and I would love to just erase the database and start from scratch instead but that's what I can do for now.
+            _roleBans = (await _db.GetServerRoleBansAsync(null, _targetPlayer.UserId, null)).DistinctBy(rb => rb.BanTime).Count();
+        }
+        else
+        {
+            _whitelisted = null;
+            _bans = null;
+            _roleBans = null;
+        }
+
+        if (_player.TryGetSessionById(_targetPlayer.UserId, out var session))
+        {
+            _canFreeze = session.AttachedEntity != null;
+            _frozen = _entity.HasComponent<AdminFrozenComponent>(session.AttachedEntity);
+        }
+        else
+        {
+            _canFreeze = false;
+        }
+
+        if (_admins.HasAdminFlag(Player, AdminFlags.Adminhelp))
+        {
+            _canAhelp = true;
+        }
+        else
+        {
+            _canAhelp = false;
+        }
+
+        StateDirty();
+    }
+}
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.cs b/Content.Server/Administration/Systems/AdminVerbSystem.cs
index 32e349a9024..1f593d2f4d9 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs
@@ -233,6 +233,15 @@ private void AddAdminVerbs(GetVerbsEvent<Verb> args)
                         ConfirmationPopup = true,
                         Impact = LogImpact.High,
                     });
+
+                    // PlayerPanel
+                    args.Verbs.Add(new Verb
+                    {
+                        Text = Loc.GetString("admin-player-actions-player-panel"),
+                        Category = VerbCategory.Admin,
+                        Act = () => _console.ExecuteCommand(player, $"playerpanel \"{targetActor.PlayerSession.UserId}\""),
+                        Impact = LogImpact.Low
+                    });
                 }
 
                 // Admin Logs
diff --git a/Content.Server/Whitelist/WhitelistCommands.cs b/Content.Server/Whitelist/WhitelistCommands.cs
index 6a9050f57b2..6912c061629 100644
--- a/Content.Server/Whitelist/WhitelistCommands.cs
+++ b/Content.Server/Whitelist/WhitelistCommands.cs
@@ -31,7 +31,7 @@ public override async void Execute(IConsoleShell shell, string argStr, string[]
         var playtime = IoCManager.Resolve<PlayTimeTrackingManager>();
 
         var name = string.Join(' ', args).Trim();
-        var data = await loc.LookupIdByNameAsync(name);
+        var data = await loc.LookupIdByNameOrIdAsync(name);
 
         if (data != null)
         {
@@ -91,7 +91,7 @@ public override async void Execute(IConsoleShell shell, string argStr, string[]
         var playtime = IoCManager.Resolve<PlayTimeTrackingManager>();
 
         var name = string.Join(' ', args).Trim();
-        var data = await loc.LookupIdByNameAsync(name);
+        var data = await loc.LookupIdByNameOrIdAsync(name);
 
         if (data != null)
         {
diff --git a/Content.Shared/Administration/PlayerPanelEuiState.cs b/Content.Shared/Administration/PlayerPanelEuiState.cs
new file mode 100644
index 00000000000..186b992e4ef
--- /dev/null
+++ b/Content.Shared/Administration/PlayerPanelEuiState.cs
@@ -0,0 +1,54 @@
+using Content.Shared.Eui;
+using Robust.Shared.Network;
+using Robust.Shared.Serialization;
+using YamlDotNet.Serialization.Callbacks;
+
+namespace Content.Shared.Administration;
+
+[Serializable, NetSerializable]
+public sealed class PlayerPanelEuiState(NetUserId guid,
+    string username,
+    TimeSpan playtime,
+    int? totalNotes,
+    int? totalBans,
+    int? totalRoleBans,
+    int sharedConnections,
+    bool? whitelisted,
+    bool canFreeze,
+    bool frozen,
+    bool canAhelp)
+    : EuiStateBase
+{
+    public readonly NetUserId Guid = guid;
+    public readonly string Username = username;
+    public readonly TimeSpan Playtime = playtime;
+    public readonly int? TotalNotes = totalNotes;
+    public readonly int? TotalBans = totalBans;
+    public readonly int? TotalRoleBans = totalRoleBans;
+    public readonly int SharedConnections = sharedConnections;
+    public readonly bool? Whitelisted = whitelisted;
+    public readonly bool CanFreeze = canFreeze;
+    public readonly bool Frozen = frozen;
+    public readonly bool CanAhelp = canAhelp;
+}
+
+
+[Serializable, NetSerializable]
+public sealed class PlayerPanelFreezeMessage : EuiMessageBase
+{
+    public readonly bool Mute;
+
+    public PlayerPanelFreezeMessage(bool mute = false)
+    {
+        Mute = mute;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class PlayerPanelLogsMessage : EuiMessageBase;
+
+[Serializable, NetSerializable]
+public sealed class PlayerPanelDeleteMessage : EuiMessageBase;
+
+[Serializable, NetSerializable]
+public sealed class PlayerPanelRejuvenationMessage: EuiMessageBase;
diff --git a/Resources/Locale/en-US/administration/ui/actions.ftl b/Resources/Locale/en-US/administration/ui/actions.ftl
index b067774d0ae..498835b46c9 100644
--- a/Resources/Locale/en-US/administration/ui/actions.ftl
+++ b/Resources/Locale/en-US/administration/ui/actions.ftl
@@ -6,6 +6,7 @@ admin-player-actions-ahelp = AHelp
 admin-player-actions-respawn = Respawn
 admin-player-actions-spawn = Spawn here
 admin-player-spawn-failed = Failed to find valid coordinates
+admin-player-actions-player-panel = Open Player Panel
 
 admin-player-actions-clone = Clone
 admin-player-actions-follow = Follow
diff --git a/Resources/Locale/en-US/administration/ui/player-panel.ftl b/Resources/Locale/en-US/administration/ui/player-panel.ftl
index 208268d5898..2c9d5086c0a 100644
--- a/Resources/Locale/en-US/administration/ui/player-panel.ftl
+++ b/Resources/Locale/en-US/administration/ui/player-panel.ftl
@@ -1 +1,23 @@
 player-panel-job-whitelists = Job Whitelists
+player-panel-title = information for {$player}
+player-panel-username = Username: {$player}
+player-panel-whitelisted = Whitelisted:
+player-panel-bans = Total Bans: {$totalBans}
+player-panel-rolebans = Total Role Bans: {$totalRoleBans}
+player-panel-notes = Total Notes: {$totalNotes}
+player-panel-playtime = Total Playtime: {$days}d:{$hours}h:{$minutes}m
+player-panel-shared-connections = Shared Connections: {$sharedConnections}
+
+player-panel-copy-username = Copy
+player-panel-show-notes = Notes
+player-panel-show-bans = Show Bans
+player-panel-help = Ahelp
+player-panel-freeze-and-mute = Freeze & Mute
+player-panel-freeze = Freeze
+player-panel-unfreeze = Unfreeze
+player-panel-kick = Kick
+player-panel-ban = Ban
+player-panel-logs = Logs
+player-panel-delete = Delete
+player-panel-rejuvenate = Rejuvenate
+player-panel-false = False
diff --git a/Resources/Locale/en-US/connection-messages.ftl b/Resources/Locale/en-US/connection-messages.ftl
index f1596d90152..309e8fc2f83 100644
--- a/Resources/Locale/en-US/connection-messages.ftl
+++ b/Resources/Locale/en-US/connection-messages.ftl
@@ -11,14 +11,14 @@ whitelist-playercount-invalid = {$min ->
 whitelist-not-whitelisted-rp = You are not whitelisted. To become whitelisted, visit our Discord (which can be found at https://spacestation14.io) and check the #rp-whitelist channel.
 
 cmd-whitelistadd-desc = Adds the player with the given username to the server whitelist.
-cmd-whitelistadd-help = Usage: whitelistadd <username>
+cmd-whitelistadd-help = Usage: whitelistadd <username or User ID>
 cmd-whitelistadd-existing = {$username} is already on the whitelist!
 cmd-whitelistadd-added = {$username} added to the whitelist
 cmd-whitelistadd-not-found = Unable to find '{$username}'
 cmd-whitelistadd-arg-player = [player]
 
 cmd-whitelistremove-desc = Removes the player with the given username from the server whitelist.
-cmd-whitelistremove-help = Usage: whitelistremove <username>
+cmd-whitelistremove-help = Usage: whitelistremove <username or User ID>
 cmd-whitelistremove-existing = {$username} is not on the whitelist!
 cmd-whitelistremove-removed = {$username} removed from the whitelist
 cmd-whitelistremove-not-found = Unable to find '{$username}'
diff --git a/Resources/Locale/en-US/info/playerpanel.ftl b/Resources/Locale/en-US/info/playerpanel.ftl
new file mode 100644
index 00000000000..138939c48c9
--- /dev/null
+++ b/Resources/Locale/en-US/info/playerpanel.ftl
@@ -0,0 +1,7 @@
+cmd-playerpanel-desc = Displays general information and actions for a player
+cmd-playerpanel-help = Usage: playerpanel <name or user ID>
+
+cmd-playerpanel-server = This command cannot be run from the server
+cmd-playerpanel-invalid-arguments = Invalid amount of arguments
+cmd-playerpanel-invalid-player = Player not found
+cmd-playerpanel-completion = <PlayerIndex>

From 1d068e3c4c22b5d1e1b9f80107a9c0d2c4ab243b Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Tue, 12 Nov 2024 01:51:23 +0100
Subject: [PATCH 231/366] Integrate Modern HWID into content

This should be the primary changes for the future-proof "Modern HWID" system implemented into Robust and the auth server.

HWIDs in the database have been given an additional column representing their version, legacy or modern. This is implemented via an EF Core owned entity. By manually setting the column name of the main value column, we can keep DB compatibility and the migration is just adding some type columns.

This new HWID type has to be plumbed through everywhere, resulting in some breaking changes for the DB layer and such.

New bans and player records are placed with the new modern HWID. Old bans are still checked against legacy HWIDs.

Modern HWIDs are presented with a "V2-" prefix to admins, to allow distinguishing them. This is also integrated into the parsing logic for placing new bans.

There's also some code cleanup to reduce copy pasting around the place from my changes.

Requires latest engine to support ImmutableArray<byte> in NetSerializer.
---
 .../UI/BanPanel/BanPanel.xaml.cs              |   11 +-
 .../Tests/Commands/PardonCommand.cs           |   24 +-
 .../20241111170112_ModernHwid.Designer.cs     | 2072 ++++++++++++++++
 .../Postgres/20241111170112_ModernHwid.cs     |   62 +
 ...20241111193608_ConnectionTrust.Designer.cs | 2076 +++++++++++++++++
 .../20241111193608_ConnectionTrust.cs         |   29 +
 .../PostgresServerDbContextModelSnapshot.cs   |  162 +-
 .../20241111170107_ModernHwid.Designer.cs     | 1995 ++++++++++++++++
 .../Sqlite/20241111170107_ModernHwid.cs       |   62 +
 ...20241111193602_ConnectionTrust.Designer.cs | 1999 ++++++++++++++++
 .../Sqlite/20241111193602_ConnectionTrust.cs  |   29 +
 .../SqliteServerDbContextModelSnapshot.cs     |  162 +-
 Content.Server.Database/Model.cs              |   88 +-
 .../Administration/BanList/BanListEui.cs      |    8 +-
 Content.Server/Administration/BanPanelEui.cs  |   10 +-
 .../Administration/Commands/BanListCommand.cs |    2 +-
 .../Commands/RoleBanListCommand.cs            |    2 +-
 .../Administration/Managers/BanManager.cs     |   21 +-
 .../Administration/Managers/IBanManager.cs    |    4 +-
 .../Administration/PlayerLocator.cs           |   99 +-
 .../Administration/PlayerPanelEui.cs          |    4 +-
 .../Administration/Systems/BwoinkSystem.cs    |    2 +-
 .../Connection/ConnectionManager.cs           |   13 +-
 Content.Server/Connection/UserDataExt.cs      |   24 +
 Content.Server/Database/BanMatcher.cs         |   33 +-
 Content.Server/Database/DatabaseRecords.cs    |    3 +-
 Content.Server/Database/ServerBanDef.cs       |    5 +-
 Content.Server/Database/ServerDbBase.cs       |   24 +-
 Content.Server/Database/ServerDbManager.cs    |   39 +-
 Content.Server/Database/ServerDbPostgres.cs   |  124 +-
 Content.Server/Database/ServerDbSqlite.cs     |   55 +-
 Content.Server/Database/ServerRoleBanDef.cs   |    5 +-
 Content.Shared.Database/TypedHwid.cs          |   62 +
 .../Administration/BanPanelEuiState.cs        |    4 +-
 34 files changed, 9097 insertions(+), 217 deletions(-)
 create mode 100644 Content.Server.Database/Migrations/Postgres/20241111170112_ModernHwid.Designer.cs
 create mode 100644 Content.Server.Database/Migrations/Postgres/20241111170112_ModernHwid.cs
 create mode 100644 Content.Server.Database/Migrations/Postgres/20241111193608_ConnectionTrust.Designer.cs
 create mode 100644 Content.Server.Database/Migrations/Postgres/20241111193608_ConnectionTrust.cs
 create mode 100644 Content.Server.Database/Migrations/Sqlite/20241111170107_ModernHwid.Designer.cs
 create mode 100644 Content.Server.Database/Migrations/Sqlite/20241111170107_ModernHwid.cs
 create mode 100644 Content.Server.Database/Migrations/Sqlite/20241111193602_ConnectionTrust.Designer.cs
 create mode 100644 Content.Server.Database/Migrations/Sqlite/20241111193602_ConnectionTrust.cs
 create mode 100644 Content.Server/Connection/UserDataExt.cs
 create mode 100644 Content.Shared.Database/TypedHwid.cs

diff --git a/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs b/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
index dc263d6055c..a034f503b4b 100644
--- a/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
+++ b/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
@@ -22,11 +22,11 @@ namespace Content.Client.Administration.UI.BanPanel;
 [GenerateTypedNameReferences]
 public sealed partial class BanPanel : DefaultWindow
 {
-    public event Action<string?, (IPAddress, int)?, bool, byte[]?, bool, uint, string, NoteSeverity, string[]?, bool>? BanSubmitted;
+    public event Action<string?, (IPAddress, int)?, bool, ImmutableTypedHwid?, bool, uint, string, NoteSeverity, string[]?, bool>? BanSubmitted;
     public event Action<string>? PlayerChanged;
     private string? PlayerUsername { get; set; }
     private (IPAddress, int)? IpAddress { get; set; }
-    private byte[]? Hwid { get; set; }
+    private ImmutableTypedHwid? Hwid { get; set; }
     private double TimeEntered { get; set; }
     private uint Multiplier { get; set; }
     private bool HasBanFlag { get; set; }
@@ -371,9 +371,8 @@ private void OnIpChanged()
     private void OnHwidChanged()
     {
         var hwidString = HwidLine.Text;
-        var length = 3 * (hwidString.Length / 4) - hwidString.TakeLast(2).Count(c => c == '=');
-        Hwid = new byte[length];
-        if (HwidCheckbox.Pressed && !(string.IsNullOrEmpty(hwidString) && LastConnCheckbox.Pressed) && !Convert.TryFromBase64String(hwidString, Hwid, out _))
+        ImmutableTypedHwid? hwid = null;
+        if (HwidCheckbox.Pressed && !(string.IsNullOrEmpty(hwidString) && LastConnCheckbox.Pressed) && !ImmutableTypedHwid.TryParse(hwidString, out hwid))
         {
             ErrorLevel |= ErrorLevelEnum.Hwid;
             HwidLine.ModulateSelfOverride = Color.Red;
@@ -390,7 +389,7 @@ private void OnHwidChanged()
             Hwid = null;
             return;
         }
-        Hwid = Convert.FromHexString(hwidString);
+        Hwid = hwid;
     }
 
     private void OnTypeChanged()
diff --git a/Content.IntegrationTests/Tests/Commands/PardonCommand.cs b/Content.IntegrationTests/Tests/Commands/PardonCommand.cs
index 4db9eabf5c6..9e57cd4b0e6 100644
--- a/Content.IntegrationTests/Tests/Commands/PardonCommand.cs
+++ b/Content.IntegrationTests/Tests/Commands/PardonCommand.cs
@@ -32,9 +32,9 @@ public async Task PardonTest()
             // No bans on record
             Assert.Multiple(async () =>
             {
-                Assert.That(await sDatabase.GetServerBanAsync(null, clientId, null), Is.Null);
+                Assert.That(await sDatabase.GetServerBanAsync(null, clientId, null, null), Is.Null);
                 Assert.That(await sDatabase.GetServerBanAsync(1), Is.Null);
-                Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null), Is.Empty);
+                Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null, null), Is.Empty);
             });
 
             // Try to pardon a ban that does not exist
@@ -43,9 +43,9 @@ public async Task PardonTest()
             // Still no bans on record
             Assert.Multiple(async () =>
             {
-                Assert.That(await sDatabase.GetServerBanAsync(null, clientId, null), Is.Null);
+                Assert.That(await sDatabase.GetServerBanAsync(null, clientId, null, null), Is.Null);
                 Assert.That(await sDatabase.GetServerBanAsync(1), Is.Null);
-                Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null), Is.Empty);
+                Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null, null), Is.Empty);
             });
 
             var banReason = "test";
@@ -57,9 +57,9 @@ public async Task PardonTest()
             // Should have one ban on record now
             Assert.Multiple(async () =>
             {
-                Assert.That(await sDatabase.GetServerBanAsync(null, clientId, null), Is.Not.Null);
+                Assert.That(await sDatabase.GetServerBanAsync(null, clientId, null, null), Is.Not.Null);
                 Assert.That(await sDatabase.GetServerBanAsync(1), Is.Not.Null);
-                Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null), Has.Count.EqualTo(1));
+                Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null, null), Has.Count.EqualTo(1));
             });
 
             await pair.RunTicksSync(5);
@@ -70,13 +70,13 @@ public async Task PardonTest()
             await server.WaitPost(() => sConsole.ExecuteCommand("pardon 2"));
 
             // The existing ban is unaffected
-            Assert.That(await sDatabase.GetServerBanAsync(null, clientId, null), Is.Not.Null);
+            Assert.That(await sDatabase.GetServerBanAsync(null, clientId, null, null), Is.Not.Null);
 
             var ban = await sDatabase.GetServerBanAsync(1);
             Assert.Multiple(async () =>
             {
                 Assert.That(ban, Is.Not.Null);
-                Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null), Has.Count.EqualTo(1));
+                Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null, null), Has.Count.EqualTo(1));
 
                 // Check that it matches
                 Assert.That(ban.Id, Is.EqualTo(1));
@@ -95,7 +95,7 @@ public async Task PardonTest()
             await server.WaitPost(() => sConsole.ExecuteCommand("pardon 1"));
 
             // No bans should be returned
-            Assert.That(await sDatabase.GetServerBanAsync(null, clientId, null), Is.Null);
+            Assert.That(await sDatabase.GetServerBanAsync(null, clientId, null, null), Is.Null);
 
             // Direct id lookup returns a pardoned ban
             var pardonedBan = await sDatabase.GetServerBanAsync(1);
@@ -105,7 +105,7 @@ public async Task PardonTest()
                 Assert.That(pardonedBan, Is.Not.Null);
 
                 // The list is still returned since that ignores pardons
-                Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null), Has.Count.EqualTo(1));
+                Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null, null), Has.Count.EqualTo(1));
 
                 Assert.That(pardonedBan.Id, Is.EqualTo(1));
                 Assert.That(pardonedBan.UserId, Is.EqualTo(clientId));
@@ -133,13 +133,13 @@ public async Task PardonTest()
             Assert.Multiple(async () =>
             {
                 // No bans should be returned
-                Assert.That(await sDatabase.GetServerBanAsync(null, clientId, null), Is.Null);
+                Assert.That(await sDatabase.GetServerBanAsync(null, clientId, null, null), Is.Null);
 
                 // Direct id lookup returns a pardoned ban
                 Assert.That(await sDatabase.GetServerBanAsync(1), Is.Not.Null);
 
                 // The list is still returned since that ignores pardons
-                Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null), Has.Count.EqualTo(1));
+                Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null, null), Has.Count.EqualTo(1));
             });
 
             // Reconnect client. Slightly faster than dirtying the pair.
diff --git a/Content.Server.Database/Migrations/Postgres/20241111170112_ModernHwid.Designer.cs b/Content.Server.Database/Migrations/Postgres/20241111170112_ModernHwid.Designer.cs
new file mode 100644
index 00000000000..155d6a163fd
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20241111170112_ModernHwid.Designer.cs
@@ -0,0 +1,2072 @@
+// <auto-generated />
+using System;
+using System.Net;
+using System.Text.Json;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using NpgsqlTypes;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    [DbContext(typeof(PostgresServerDbContext))]
+    [Migration("20241111170112_ModernHwid")]
+    partial class ModernHwid
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.0")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("boolean")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<short>("Impact")
+                        .HasColumnType("smallint")
+                        .HasColumnName("impact");
+
+                    b.Property<JsonDocument>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Message")
+                        .HasAnnotation("Npgsql:TsVectorConfig", "english");
+
+                    NpgsqlIndexBuilderExtensions.HasMethod(b.HasIndex("Message"), "GIN");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("integer")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_messages_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dismissed");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("boolean")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_notes_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("boolean")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_watchlists_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("antag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("assigned_user_id_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanTemplate", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_template_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("boolean")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("integer")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<TimeSpan>("Length")
+                        .HasColumnType("interval")
+                        .HasColumnName("length");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("title");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ban_template");
+
+                    b.ToTable("ban_template", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Blacklist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_blacklist");
+
+                    b.ToTable("blacklist", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<IPAddress>("Address")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("smallint")
+                        .HasColumnName("denied");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("time");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("Time");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("job_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("play_time_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("interval")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("player_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<IPAddress>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", null, t =>
+                        {
+                            t.HasCheckConstraint("LastSeenAddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= last_seen_address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("integer")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Age")
+                        .HasColumnType("integer")
+                        .HasColumnName("age");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_name");
+
+                    b.Property<JsonDocument>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("integer")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("integer")
+                        .HasColumnName("slot");
+
+                    b.Property<int>("SpawnPriority")
+                        .HasColumnType("integer")
+                        .HasColumnName("spawn_priority");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<int>("ProfileLoadoutGroupId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout");
+
+                    b.HasIndex("ProfileLoadoutGroupId");
+
+                    b.ToTable("profile_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("group_name");
+
+                    b.Property<int>("ProfileRoleLoadoutId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout_group");
+
+                    b.HasIndex("ProfileRoleLoadoutId");
+
+                    b.ToTable("profile_loadout_group", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("RoleName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_role_loadout");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("profile_role_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.HasKey("PlayerUserId", "RoleId")
+                        .HasName("PK_role_whitelists");
+
+                    b.ToTable("role_whitelists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<NpgsqlInet?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("boolean")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("integer")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("integer")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_hit_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_role_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<NpgsqlInet?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("role_unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("trait_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("integer")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ConnectionLogId")
+                                .HasColumnType("integer")
+                                .HasColumnName("connection_log_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ConnectionLogId");
+
+                            b1.ToTable("connection_log");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ConnectionLogId")
+                                .HasConstraintName("FK_connection_log_connection_log_connection_log_id");
+                        });
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "LastSeenHWId", b1 =>
+                        {
+                            b1.Property<int>("PlayerId")
+                                .HasColumnType("integer")
+                                .HasColumnName("player_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("last_seen_hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("last_seen_hwid_type");
+
+                            b1.HasKey("PlayerId");
+
+                            b1.ToTable("player");
+
+                            b1.WithOwner()
+                                .HasForeignKey("PlayerId")
+                                .HasConstraintName("FK_player_player_player_id");
+                        });
+
+                    b.Navigation("LastSeenHWId");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileLoadoutGroup", "ProfileLoadoutGroup")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileLoadoutGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_profile_loadout_group_profile_loadout_group~");
+
+                    b.Navigation("ProfileLoadoutGroup");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileRoleLoadout", "ProfileRoleLoadout")
+                        .WithMany("Groups")
+                        .HasForeignKey("ProfileRoleLoadoutId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_group_profile_role_loadout_profile_role_loa~");
+
+                    b.Navigation("ProfileRoleLoadout");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_role_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("JobWhitelists")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_role_whitelists_player_player_user_id");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerBanId")
+                                .HasColumnType("integer")
+                                .HasColumnName("server_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ServerBanId");
+
+                            b1.ToTable("server_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerBanId")
+                                .HasConstraintName("FK_server_ban_server_ban_server_ban_id");
+                        });
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerRoleBanId")
+                                .HasColumnType("integer")
+                                .HasColumnName("server_role_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ServerRoleBanId");
+
+                            b1.ToTable("server_role_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerRoleBanId")
+                                .HasConstraintName("FK_server_role_ban_server_role_ban_server_role_ban_id");
+                        });
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+
+                    b.Navigation("JobWhitelists");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Loadouts");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Navigation("Loadouts");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Navigation("Groups");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/20241111170112_ModernHwid.cs b/Content.Server.Database/Migrations/Postgres/20241111170112_ModernHwid.cs
new file mode 100644
index 00000000000..c70a5ffaa58
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20241111170112_ModernHwid.cs
@@ -0,0 +1,62 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    /// <inheritdoc />
+    public partial class ModernHwid : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "hwid_type",
+                table: "server_role_ban",
+                type: "integer",
+                nullable: true,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "hwid_type",
+                table: "server_ban",
+                type: "integer",
+                nullable: true,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "last_seen_hwid_type",
+                table: "player",
+                type: "integer",
+                nullable: true,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "hwid_type",
+                table: "connection_log",
+                type: "integer",
+                nullable: true,
+                defaultValue: 0);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "hwid_type",
+                table: "server_role_ban");
+
+            migrationBuilder.DropColumn(
+                name: "hwid_type",
+                table: "server_ban");
+
+            migrationBuilder.DropColumn(
+                name: "last_seen_hwid_type",
+                table: "player");
+
+            migrationBuilder.DropColumn(
+                name: "hwid_type",
+                table: "connection_log");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/20241111193608_ConnectionTrust.Designer.cs b/Content.Server.Database/Migrations/Postgres/20241111193608_ConnectionTrust.Designer.cs
new file mode 100644
index 00000000000..dc1b4a0eeb7
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20241111193608_ConnectionTrust.Designer.cs
@@ -0,0 +1,2076 @@
+// <auto-generated />
+using System;
+using System.Net;
+using System.Text.Json;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using NpgsqlTypes;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    [DbContext(typeof(PostgresServerDbContext))]
+    [Migration("20241111193608_ConnectionTrust")]
+    partial class ConnectionTrust
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.0")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("boolean")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<short>("Impact")
+                        .HasColumnType("smallint")
+                        .HasColumnName("impact");
+
+                    b.Property<JsonDocument>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Message")
+                        .HasAnnotation("Npgsql:TsVectorConfig", "english");
+
+                    NpgsqlIndexBuilderExtensions.HasMethod(b.HasIndex("Message"), "GIN");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("integer")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_messages_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dismissed");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("boolean")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_notes_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("boolean")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_watchlists_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("antag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("assigned_user_id_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanTemplate", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_template_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("boolean")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("integer")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<TimeSpan>("Length")
+                        .HasColumnType("interval")
+                        .HasColumnName("length");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("title");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ban_template");
+
+                    b.ToTable("ban_template", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Blacklist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_blacklist");
+
+                    b.ToTable("blacklist", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<IPAddress>("Address")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("smallint")
+                        .HasColumnName("denied");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("time");
+
+                    b.Property<float>("Trust")
+                        .HasColumnType("real")
+                        .HasColumnName("trust");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("Time");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("job_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("play_time_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("interval")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("player_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<IPAddress>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", null, t =>
+                        {
+                            t.HasCheckConstraint("LastSeenAddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= last_seen_address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("integer")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Age")
+                        .HasColumnType("integer")
+                        .HasColumnName("age");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_name");
+
+                    b.Property<JsonDocument>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("integer")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("integer")
+                        .HasColumnName("slot");
+
+                    b.Property<int>("SpawnPriority")
+                        .HasColumnType("integer")
+                        .HasColumnName("spawn_priority");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<int>("ProfileLoadoutGroupId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout");
+
+                    b.HasIndex("ProfileLoadoutGroupId");
+
+                    b.ToTable("profile_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("group_name");
+
+                    b.Property<int>("ProfileRoleLoadoutId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout_group");
+
+                    b.HasIndex("ProfileRoleLoadoutId");
+
+                    b.ToTable("profile_loadout_group", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("RoleName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_role_loadout");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("profile_role_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.HasKey("PlayerUserId", "RoleId")
+                        .HasName("PK_role_whitelists");
+
+                    b.ToTable("role_whitelists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<NpgsqlInet?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("boolean")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("integer")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("integer")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_hit_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_role_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<NpgsqlInet?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("role_unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("trait_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("integer")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ConnectionLogId")
+                                .HasColumnType("integer")
+                                .HasColumnName("connection_log_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ConnectionLogId");
+
+                            b1.ToTable("connection_log");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ConnectionLogId")
+                                .HasConstraintName("FK_connection_log_connection_log_connection_log_id");
+                        });
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "LastSeenHWId", b1 =>
+                        {
+                            b1.Property<int>("PlayerId")
+                                .HasColumnType("integer")
+                                .HasColumnName("player_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("last_seen_hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("last_seen_hwid_type");
+
+                            b1.HasKey("PlayerId");
+
+                            b1.ToTable("player");
+
+                            b1.WithOwner()
+                                .HasForeignKey("PlayerId")
+                                .HasConstraintName("FK_player_player_player_id");
+                        });
+
+                    b.Navigation("LastSeenHWId");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileLoadoutGroup", "ProfileLoadoutGroup")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileLoadoutGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_profile_loadout_group_profile_loadout_group~");
+
+                    b.Navigation("ProfileLoadoutGroup");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileRoleLoadout", "ProfileRoleLoadout")
+                        .WithMany("Groups")
+                        .HasForeignKey("ProfileRoleLoadoutId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_group_profile_role_loadout_profile_role_loa~");
+
+                    b.Navigation("ProfileRoleLoadout");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_role_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("JobWhitelists")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_role_whitelists_player_player_user_id");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerBanId")
+                                .HasColumnType("integer")
+                                .HasColumnName("server_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ServerBanId");
+
+                            b1.ToTable("server_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerBanId")
+                                .HasConstraintName("FK_server_ban_server_ban_server_ban_id");
+                        });
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerRoleBanId")
+                                .HasColumnType("integer")
+                                .HasColumnName("server_role_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ServerRoleBanId");
+
+                            b1.ToTable("server_role_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerRoleBanId")
+                                .HasConstraintName("FK_server_role_ban_server_role_ban_server_role_ban_id");
+                        });
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+
+                    b.Navigation("JobWhitelists");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Loadouts");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Navigation("Loadouts");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Navigation("Groups");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/20241111193608_ConnectionTrust.cs b/Content.Server.Database/Migrations/Postgres/20241111193608_ConnectionTrust.cs
new file mode 100644
index 00000000000..debb36aaccb
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20241111193608_ConnectionTrust.cs
@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    /// <inheritdoc />
+    public partial class ConnectionTrust : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<float>(
+                name: "trust",
+                table: "connection_log",
+                type: "real",
+                nullable: false,
+                defaultValue: 0f);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "trust",
+                table: "connection_log");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
index 5d6971a7a6c..79eebfe78a2 100644
--- a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
@@ -557,6 +557,19 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("ban_template", (string)null);
                 });
 
+            modelBuilder.Entity("Content.Server.Database.Blacklist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_blacklist");
+
+                    b.ToTable("blacklist", (string)null);
+                });
+
             modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
                 {
                     b.Property<int>("Id")
@@ -575,10 +588,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("smallint")
                         .HasColumnName("denied");
 
-                    b.Property<byte[]>("HWId")
-                        .HasColumnType("bytea")
-                        .HasColumnName("hwid");
-
                     b.Property<int>("ServerId")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("integer")
@@ -589,6 +598,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("time");
 
+                    b.Property<float>("Trust")
+                        .HasColumnType("real")
+                        .HasColumnName("trust");
+
                     b.Property<Guid>("UserId")
                         .HasColumnType("uuid")
                         .HasColumnName("user_id");
@@ -741,10 +754,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("inet")
                         .HasColumnName("last_seen_address");
 
-                    b.Property<byte[]>("LastSeenHWId")
-                        .HasColumnType("bytea")
-                        .HasColumnName("last_seen_hwid");
-
                     b.Property<DateTime>("LastSeenTime")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("last_seen_time");
@@ -1026,10 +1035,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("expiration_time");
 
-                    b.Property<byte[]>("HWId")
-                        .HasColumnType("bytea")
-                        .HasColumnName("hwid");
-
                     b.Property<bool>("Hidden")
                         .HasColumnType("boolean")
                         .HasColumnName("hidden");
@@ -1160,10 +1165,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("expiration_time");
 
-                    b.Property<byte[]>("HWId")
-                        .HasColumnType("bytea")
-                        .HasColumnName("hwid");
-
                     b.Property<bool>("Hidden")
                         .HasColumnType("boolean")
                         .HasColumnName("hidden");
@@ -1605,6 +1606,34 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasConstraintName("FK_connection_log_server_server_id");
 
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ConnectionLogId")
+                                .HasColumnType("integer")
+                                .HasColumnName("connection_log_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ConnectionLogId");
+
+                            b1.ToTable("connection_log");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ConnectionLogId")
+                                .HasConstraintName("FK_connection_log_connection_log_connection_log_id");
+                        });
+
+                    b.Navigation("HWId");
+
                     b.Navigation("Server");
                 });
 
@@ -1620,7 +1649,50 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("Profile");
                 });
 
-            modelBuilder.Entity("Content.Server.Database.Loadout", b =>
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "LastSeenHWId", b1 =>
+                        {
+                            b1.Property<int>("PlayerId")
+                                .HasColumnType("integer")
+                                .HasColumnName("player_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("last_seen_hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("last_seen_hwid_type");
+
+                            b1.HasKey("PlayerId");
+
+                            b1.ToTable("player");
+
+                            b1.WithOwner()
+                                .HasForeignKey("PlayerId")
+                                .HasConstraintName("FK_player_player_player_id");
+                        });
+
+                    b.Navigation("LastSeenHWId");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
                 {
                     b.HasOne("Content.Server.Database.Profile", "Profile")
                         .WithMany("Loadouts")
@@ -1690,8 +1762,36 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasForeignKey("RoundId")
                         .HasConstraintName("FK_server_ban_round_round_id");
 
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerBanId")
+                                .HasColumnType("integer")
+                                .HasColumnName("server_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ServerBanId");
+
+                            b1.ToTable("server_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerBanId")
+                                .HasConstraintName("FK_server_ban_server_ban_server_ban_id");
+                        });
+
                     b.Navigation("CreatedBy");
 
+                    b.Navigation("HWId");
+
                     b.Navigation("LastEditedBy");
 
                     b.Navigation("Round");
@@ -1739,8 +1839,36 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasForeignKey("RoundId")
                         .HasConstraintName("FK_server_role_ban_round_round_id");
 
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerRoleBanId")
+                                .HasColumnType("integer")
+                                .HasColumnName("server_role_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ServerRoleBanId");
+
+                            b1.ToTable("server_role_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerRoleBanId")
+                                .HasConstraintName("FK_server_role_ban_server_role_ban_server_role_ban_id");
+                        });
+
                     b.Navigation("CreatedBy");
 
+                    b.Navigation("HWId");
+
                     b.Navigation("LastEditedBy");
 
                     b.Navigation("Round");
diff --git a/Content.Server.Database/Migrations/Sqlite/20241111170107_ModernHwid.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20241111170107_ModernHwid.Designer.cs
new file mode 100644
index 00000000000..56a9fe0a059
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20241111170107_ModernHwid.Designer.cs
@@ -0,0 +1,1995 @@
+// <auto-generated />
+using System;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    [DbContext(typeof(SqliteServerDbContext))]
+    [Migration("20241111170107_ModernHwid")]
+    partial class ModernHwid
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.0");
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_flag_id");
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<sbyte>("Impact")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("impact");
+
+                    b.Property<string>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_messages_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("dismissed");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_notes_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_watchlists_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("antag_id");
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("assigned_user_id_id");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanTemplate", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_template_id");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<TimeSpan>("Length")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("length");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("title");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ban_template");
+
+                    b.ToTable("ban_template", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Blacklist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_blacklist");
+
+                    b.ToTable("blacklist", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_log_id");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("denied");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("Time");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("job_id");
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("play_time_id");
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("player_id");
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<string>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<int>("Age")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("age");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_name");
+
+                    b.Property<byte[]>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("slot");
+
+                    b.Property<int>("SpawnPriority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("spawn_priority");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_id");
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<int>("ProfileLoadoutGroupId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout");
+
+                    b.HasIndex("ProfileLoadoutGroupId");
+
+                    b.ToTable("profile_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("group_name");
+
+                    b.Property<int>("ProfileRoleLoadoutId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout_group");
+
+                    b.HasIndex("ProfileRoleLoadoutId");
+
+                    b.ToTable("profile_loadout_group", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("RoleName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_role_loadout");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("profile_role_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.HasKey("PlayerUserId", "RoleId")
+                        .HasName("PK_role_whitelists");
+
+                    b.ToTable("role_whitelists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_hit_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_role_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("role_unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("trait_id");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("BLOB")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ConnectionLogId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("connection_log_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ConnectionLogId");
+
+                            b1.ToTable("connection_log");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ConnectionLogId")
+                                .HasConstraintName("FK_connection_log_connection_log_connection_log_id");
+                        });
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "LastSeenHWId", b1 =>
+                        {
+                            b1.Property<int>("PlayerId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("player_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("last_seen_hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("last_seen_hwid_type");
+
+                            b1.HasKey("PlayerId");
+
+                            b1.ToTable("player");
+
+                            b1.WithOwner()
+                                .HasForeignKey("PlayerId")
+                                .HasConstraintName("FK_player_player_player_id");
+                        });
+
+                    b.Navigation("LastSeenHWId");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileLoadoutGroup", "ProfileLoadoutGroup")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileLoadoutGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_profile_loadout_group_profile_loadout_group_id");
+
+                    b.Navigation("ProfileLoadoutGroup");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileRoleLoadout", "ProfileRoleLoadout")
+                        .WithMany("Groups")
+                        .HasForeignKey("ProfileRoleLoadoutId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_group_profile_role_loadout_profile_role_loadout_id");
+
+                    b.Navigation("ProfileRoleLoadout");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_role_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("JobWhitelists")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_role_whitelists_player_player_user_id");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerBanId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("server_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ServerBanId");
+
+                            b1.ToTable("server_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerBanId")
+                                .HasConstraintName("FK_server_ban_server_ban_server_ban_id");
+                        });
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerRoleBanId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("server_role_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ServerRoleBanId");
+
+                            b1.ToTable("server_role_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerRoleBanId")
+                                .HasConstraintName("FK_server_role_ban_server_role_ban_server_role_ban_id");
+                        });
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+
+                    b.Navigation("JobWhitelists");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Loadouts");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Navigation("Loadouts");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Navigation("Groups");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/20241111170107_ModernHwid.cs b/Content.Server.Database/Migrations/Sqlite/20241111170107_ModernHwid.cs
new file mode 100644
index 00000000000..97b5dafd03f
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20241111170107_ModernHwid.cs
@@ -0,0 +1,62 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    /// <inheritdoc />
+    public partial class ModernHwid : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "hwid_type",
+                table: "server_role_ban",
+                type: "INTEGER",
+                nullable: true,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "hwid_type",
+                table: "server_ban",
+                type: "INTEGER",
+                nullable: true,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "last_seen_hwid_type",
+                table: "player",
+                type: "INTEGER",
+                nullable: true,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "hwid_type",
+                table: "connection_log",
+                type: "INTEGER",
+                nullable: true,
+                defaultValue: 0);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "hwid_type",
+                table: "server_role_ban");
+
+            migrationBuilder.DropColumn(
+                name: "hwid_type",
+                table: "server_ban");
+
+            migrationBuilder.DropColumn(
+                name: "last_seen_hwid_type",
+                table: "player");
+
+            migrationBuilder.DropColumn(
+                name: "hwid_type",
+                table: "connection_log");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/20241111193602_ConnectionTrust.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20241111193602_ConnectionTrust.Designer.cs
new file mode 100644
index 00000000000..bd4e20a464b
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20241111193602_ConnectionTrust.Designer.cs
@@ -0,0 +1,1999 @@
+// <auto-generated />
+using System;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    [DbContext(typeof(SqliteServerDbContext))]
+    [Migration("20241111193602_ConnectionTrust")]
+    partial class ConnectionTrust
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.0");
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_flag_id");
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<sbyte>("Impact")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("impact");
+
+                    b.Property<string>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_messages_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("dismissed");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_notes_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_watchlists_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("antag_id");
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("assigned_user_id_id");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanTemplate", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_template_id");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<TimeSpan>("Length")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("length");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("title");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ban_template");
+
+                    b.ToTable("ban_template", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Blacklist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_blacklist");
+
+                    b.ToTable("blacklist", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_log_id");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("denied");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time");
+
+                    b.Property<float>("Trust")
+                        .HasColumnType("REAL")
+                        .HasColumnName("trust");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("Time");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("job_id");
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("play_time_id");
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("player_id");
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<string>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<int>("Age")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("age");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_name");
+
+                    b.Property<byte[]>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("slot");
+
+                    b.Property<int>("SpawnPriority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("spawn_priority");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_id");
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<int>("ProfileLoadoutGroupId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout");
+
+                    b.HasIndex("ProfileLoadoutGroupId");
+
+                    b.ToTable("profile_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("group_name");
+
+                    b.Property<int>("ProfileRoleLoadoutId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout_group");
+
+                    b.HasIndex("ProfileRoleLoadoutId");
+
+                    b.ToTable("profile_loadout_group", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("RoleName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_role_loadout");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("profile_role_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.HasKey("PlayerUserId", "RoleId")
+                        .HasName("PK_role_whitelists");
+
+                    b.ToTable("role_whitelists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_hit_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_role_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("role_unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("trait_id");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("BLOB")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ConnectionLogId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("connection_log_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ConnectionLogId");
+
+                            b1.ToTable("connection_log");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ConnectionLogId")
+                                .HasConstraintName("FK_connection_log_connection_log_connection_log_id");
+                        });
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "LastSeenHWId", b1 =>
+                        {
+                            b1.Property<int>("PlayerId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("player_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("last_seen_hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("last_seen_hwid_type");
+
+                            b1.HasKey("PlayerId");
+
+                            b1.ToTable("player");
+
+                            b1.WithOwner()
+                                .HasForeignKey("PlayerId")
+                                .HasConstraintName("FK_player_player_player_id");
+                        });
+
+                    b.Navigation("LastSeenHWId");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileLoadoutGroup", "ProfileLoadoutGroup")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileLoadoutGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_profile_loadout_group_profile_loadout_group_id");
+
+                    b.Navigation("ProfileLoadoutGroup");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileRoleLoadout", "ProfileRoleLoadout")
+                        .WithMany("Groups")
+                        .HasForeignKey("ProfileRoleLoadoutId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_group_profile_role_loadout_profile_role_loadout_id");
+
+                    b.Navigation("ProfileRoleLoadout");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_role_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("JobWhitelists")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_role_whitelists_player_player_user_id");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerBanId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("server_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ServerBanId");
+
+                            b1.ToTable("server_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerBanId")
+                                .HasConstraintName("FK_server_ban_server_ban_server_ban_id");
+                        });
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerRoleBanId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("server_role_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ServerRoleBanId");
+
+                            b1.ToTable("server_role_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerRoleBanId")
+                                .HasConstraintName("FK_server_role_ban_server_role_ban_server_role_ban_id");
+                        });
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+
+                    b.Navigation("JobWhitelists");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Loadouts");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Navigation("Loadouts");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Navigation("Groups");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/20241111193602_ConnectionTrust.cs b/Content.Server.Database/Migrations/Sqlite/20241111193602_ConnectionTrust.cs
new file mode 100644
index 00000000000..3a7fd784e16
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20241111193602_ConnectionTrust.cs
@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    /// <inheritdoc />
+    public partial class ConnectionTrust : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<float>(
+                name: "trust",
+                table: "connection_log",
+                type: "REAL",
+                nullable: false,
+                defaultValue: 0f);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "trust",
+                table: "connection_log");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
index 88be39c2de2..ba7f92e60df 100644
--- a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
@@ -526,6 +526,19 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("ban_template", (string)null);
                 });
 
+            modelBuilder.Entity("Content.Server.Database.Blacklist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_blacklist");
+
+                    b.ToTable("blacklist", (string)null);
+                });
+
             modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
                 {
                     b.Property<int>("Id")
@@ -542,10 +555,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("INTEGER")
                         .HasColumnName("denied");
 
-                    b.Property<byte[]>("HWId")
-                        .HasColumnType("BLOB")
-                        .HasColumnName("hwid");
-
                     b.Property<int>("ServerId")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("INTEGER")
@@ -556,6 +565,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("TEXT")
                         .HasColumnName("time");
 
+                    b.Property<float>("Trust")
+                        .HasColumnType("REAL")
+                        .HasColumnName("trust");
+
                     b.Property<Guid>("UserId")
                         .HasColumnType("TEXT")
                         .HasColumnName("user_id");
@@ -697,10 +710,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("TEXT")
                         .HasColumnName("last_seen_address");
 
-                    b.Property<byte[]>("LastSeenHWId")
-                        .HasColumnType("BLOB")
-                        .HasColumnName("last_seen_hwid");
-
                     b.Property<DateTime>("LastSeenTime")
                         .HasColumnType("TEXT")
                         .HasColumnName("last_seen_time");
@@ -969,10 +978,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("TEXT")
                         .HasColumnName("expiration_time");
 
-                    b.Property<byte[]>("HWId")
-                        .HasColumnType("BLOB")
-                        .HasColumnName("hwid");
-
                     b.Property<bool>("Hidden")
                         .HasColumnType("INTEGER")
                         .HasColumnName("hidden");
@@ -1097,10 +1102,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("TEXT")
                         .HasColumnName("expiration_time");
 
-                    b.Property<byte[]>("HWId")
-                        .HasColumnType("BLOB")
-                        .HasColumnName("hwid");
-
                     b.Property<bool>("Hidden")
                         .HasColumnType("INTEGER")
                         .HasColumnName("hidden");
@@ -1532,6 +1533,34 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasConstraintName("FK_connection_log_server_server_id");
 
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ConnectionLogId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("connection_log_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ConnectionLogId");
+
+                            b1.ToTable("connection_log");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ConnectionLogId")
+                                .HasConstraintName("FK_connection_log_connection_log_connection_log_id");
+                        });
+
+                    b.Navigation("HWId");
+
                     b.Navigation("Server");
                 });
 
@@ -1547,7 +1576,50 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("Profile");
                 });
 
-            modelBuilder.Entity("Content.Server.Database.Loadout", b =>
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "LastSeenHWId", b1 =>
+                        {
+                            b1.Property<int>("PlayerId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("player_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("last_seen_hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("last_seen_hwid_type");
+
+                            b1.HasKey("PlayerId");
+
+                            b1.ToTable("player");
+
+                            b1.WithOwner()
+                                .HasForeignKey("PlayerId")
+                                .HasConstraintName("FK_player_player_player_id");
+                        });
+
+                    b.Navigation("LastSeenHWId");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
                 {
                     b.HasOne("Content.Server.Database.Profile", "Profile")
                         .WithMany("Loadouts")
@@ -1617,8 +1689,36 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasForeignKey("RoundId")
                         .HasConstraintName("FK_server_ban_round_round_id");
 
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerBanId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("server_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ServerBanId");
+
+                            b1.ToTable("server_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerBanId")
+                                .HasConstraintName("FK_server_ban_server_ban_server_ban_id");
+                        });
+
                     b.Navigation("CreatedBy");
 
+                    b.Navigation("HWId");
+
                     b.Navigation("LastEditedBy");
 
                     b.Navigation("Round");
@@ -1666,8 +1766,36 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasForeignKey("RoundId")
                         .HasConstraintName("FK_server_role_ban_round_round_id");
 
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerRoleBanId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("server_role_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ServerRoleBanId");
+
+                            b1.ToTable("server_role_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerRoleBanId")
+                                .HasConstraintName("FK_server_role_ban_server_role_ban_server_role_ban_id");
+                        });
+
                     b.Navigation("CreatedBy");
 
+                    b.Navigation("HWId");
+
                     b.Navigation("LastEditedBy");
 
                     b.Navigation("Round");
diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index a06ff6e1b3a..029cd3513c6 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Net;
 using System.Text.Json;
@@ -311,6 +313,47 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .HasForeignKey(w => w.PlayerUserId)
                 .HasPrincipalKey(p => p.UserId)
                 .OnDelete(DeleteBehavior.Cascade);
+
+            // Changes for modern HWID integration
+            modelBuilder.Entity<Player>()
+                .OwnsOne(p => p.LastSeenHWId)
+                .Property(p => p.Hwid)
+                .HasColumnName("last_seen_hwid");
+
+            modelBuilder.Entity<Player>()
+                .OwnsOne(p => p.LastSeenHWId)
+                .Property(p => p.Type)
+                .HasDefaultValue(HwidType.Legacy);
+
+            modelBuilder.Entity<ServerBan>()
+                .OwnsOne(p => p.HWId)
+                .Property(p => p.Hwid)
+                .HasColumnName("hwid");
+
+            modelBuilder.Entity<ServerBan>()
+                .OwnsOne(p => p.HWId)
+                .Property(p => p.Type)
+                .HasDefaultValue(HwidType.Legacy);
+
+            modelBuilder.Entity<ServerRoleBan>()
+                .OwnsOne(p => p.HWId)
+                .Property(p => p.Hwid)
+                .HasColumnName("hwid");
+
+            modelBuilder.Entity<ServerRoleBan>()
+                .OwnsOne(p => p.HWId)
+                .Property(p => p.Type)
+                .HasDefaultValue(HwidType.Legacy);
+
+            modelBuilder.Entity<ConnectionLog>()
+                .OwnsOne(p => p.HWId)
+                .Property(p => p.Hwid)
+                .HasColumnName("hwid");
+
+            modelBuilder.Entity<ConnectionLog>()
+                .OwnsOne(p => p.HWId)
+                .Property(p => p.Type)
+                .HasDefaultValue(HwidType.Legacy);
         }
 
         public virtual IQueryable<AdminLog> SearchLogs(IQueryable<AdminLog> query, string searchText)
@@ -450,7 +493,7 @@ public class Player
         public string LastSeenUserName { get; set; } = null!;
         public DateTime LastSeenTime { get; set; }
         public IPAddress LastSeenAddress { get; set; } = null!;
-        public byte[]? LastSeenHWId { get; set; }
+        public TypedHwid? LastSeenHWId { get; set; }
 
         // Data that changes with each round
         public List<Round> Rounds { get; set; } = null!;
@@ -588,7 +631,7 @@ public interface IBanCommon<TUnban> where TUnban : IUnbanCommon
         int Id { get; set; }
         Guid? PlayerUserId { get; set; }
         NpgsqlInet? Address { get; set; }
-        byte[]? HWId { get; set; }
+        TypedHwid? HWId { get; set; }
         DateTime BanTime { get; set; }
         DateTime? ExpirationTime { get; set; }
         string Reason { get; set; }
@@ -673,7 +716,7 @@ public class ServerBan : IBanCommon<ServerUnban>
         /// <summary>
         /// Hardware ID of the banned player.
         /// </summary>
-        public byte[]? HWId { get; set; }
+        public TypedHwid? HWId { get; set; }
 
         /// <summary>
         /// The time when the ban was applied by an administrator.
@@ -811,7 +854,7 @@ public class ConnectionLog
         public DateTime Time { get; set; }
 
         public IPAddress Address { get; set; } = null!;
-        public byte[]? HWId { get; set; }
+        public TypedHwid? HWId { get; set; }
 
         public ConnectionDenyReason? Denied { get; set; }
 
@@ -828,6 +871,8 @@ public class ConnectionLog
 
         public List<ServerBanHit> BanHits { get; set; } = null!;
         public Server Server { get; set; } = null!;
+
+        public float Trust { get; set; }
     }
 
     public enum ConnectionDenyReason : byte
@@ -862,7 +907,7 @@ public sealed class ServerRoleBan : IBanCommon<ServerRoleUnban>
         public Guid? PlayerUserId { get; set; }
         [Required] public TimeSpan PlaytimeAtNote { get; set; }
         public NpgsqlInet? Address { get; set; }
-        public byte[]? HWId { get; set; }
+        public TypedHwid? HWId { get; set; }
 
         public DateTime BanTime { get; set; }
 
@@ -1096,4 +1141,37 @@ public sealed class BanTemplate
         /// <seealso cref="ServerBan.Hidden"/>
         public bool Hidden { get; set; }
     }
+
+    /// <summary>
+    /// A hardware ID value together with its <see cref="HwidType"/>.
+    /// </summary>
+    /// <seealso cref="ImmutableTypedHwid"/>
+    [Owned]
+    public sealed class TypedHwid
+    {
+        public byte[] Hwid { get; set; } = default!;
+        public HwidType Type { get; set; }
+
+        [return: NotNullIfNotNull(nameof(immutable))]
+        public static implicit operator TypedHwid?(ImmutableTypedHwid? immutable)
+        {
+            if (immutable == null)
+                return null;
+
+            return new TypedHwid
+            {
+                Hwid = immutable.Hwid.ToArray(),
+                Type = immutable.Type,
+            };
+        }
+
+        [return: NotNullIfNotNull(nameof(hwid))]
+        public static implicit operator ImmutableTypedHwid?(TypedHwid? hwid)
+        {
+            if (hwid == null)
+                return null;
+
+            return new ImmutableTypedHwid(hwid.Hwid.ToImmutableArray(), hwid.Type);
+        }
+    }
 }
diff --git a/Content.Server/Administration/BanList/BanListEui.cs b/Content.Server/Administration/BanList/BanListEui.cs
index 8ddc7459d7b..2ca126bf164 100644
--- a/Content.Server/Administration/BanList/BanListEui.cs
+++ b/Content.Server/Administration/BanList/BanListEui.cs
@@ -54,7 +54,7 @@ private void OnPermsChanged(AdminPermsChangedEventArgs args)
 
     private async Task LoadBans(NetUserId userId)
     {
-        foreach (var ban in await _db.GetServerBansAsync(null, userId, null))
+        foreach (var ban in await _db.GetServerBansAsync(null, userId, null, null))
         {
             SharedServerUnban? unban = null;
             if (ban.Unban is { } unbanDef)
@@ -74,7 +74,7 @@ private async Task LoadBans(NetUserId userId)
                     ? (address.address.ToString(), address.cidrMask)
                     : null;
 
-                hwid = ban.HWId == null ? null : Convert.ToBase64String(ban.HWId.Value.AsSpan());
+                hwid = ban.HWId?.ToString();
             }
 
             Bans.Add(new SharedServerBan(
@@ -95,7 +95,7 @@ private async Task LoadBans(NetUserId userId)
 
     private async Task LoadRoleBans(NetUserId userId)
     {
-        foreach (var ban in await _db.GetServerRoleBansAsync(null, userId, null))
+        foreach (var ban in await _db.GetServerRoleBansAsync(null, userId, null, null))
         {
             SharedServerUnban? unban = null;
             if (ban.Unban is { } unbanDef)
@@ -115,7 +115,7 @@ private async Task LoadRoleBans(NetUserId userId)
                     ? (address.address.ToString(), address.cidrMask)
                     : null;
 
-                hwid = ban.HWId == null ? null : Convert.ToBase64String(ban.HWId.Value.AsSpan());
+                hwid = ban.HWId?.ToString();
             }
             RoleBans.Add(new SharedServerRoleBan(
                 ban.Id,
diff --git a/Content.Server/Administration/BanPanelEui.cs b/Content.Server/Administration/BanPanelEui.cs
index aa6bd8d4bfa..ebe20afa5f7 100644
--- a/Content.Server/Administration/BanPanelEui.cs
+++ b/Content.Server/Administration/BanPanelEui.cs
@@ -1,4 +1,3 @@
-using System.Collections.Immutable;
 using System.Net;
 using System.Net.Sockets;
 using Content.Server.Administration.Managers;
@@ -8,7 +7,6 @@
 using Content.Shared.Administration;
 using Content.Shared.Database;
 using Content.Shared.Eui;
-using Robust.Server.Player;
 using Robust.Shared.Network;
 
 namespace Content.Server.Administration;
@@ -28,7 +26,7 @@ public sealed class BanPanelEui : BaseEui
     private NetUserId? PlayerId { get; set; }
     private string PlayerName { get; set; } = string.Empty;
     private IPAddress? LastAddress { get; set; }
-    private ImmutableArray<byte>? LastHwid { get; set; }
+    private ImmutableTypedHwid? LastHwid { get; set; }
     private const int Ipv4_CIDR = 32;
     private const int Ipv6_CIDR = 64;
 
@@ -52,7 +50,7 @@ public override void HandleMessage(EuiMessageBase msg)
         switch (msg)
         {
             case BanPanelEuiStateMsg.CreateBanRequest r:
-                BanPlayer(r.Player, r.IpAddress, r.UseLastIp, r.Hwid?.ToImmutableArray(), r.UseLastHwid, r.Minutes, r.Severity, r.Reason, r.Roles, r.Erase);
+                BanPlayer(r.Player, r.IpAddress, r.UseLastIp, r.Hwid, r.UseLastHwid, r.Minutes, r.Severity, r.Reason, r.Roles, r.Erase);
                 break;
             case BanPanelEuiStateMsg.GetPlayerInfoRequest r:
                 ChangePlayer(r.PlayerUsername);
@@ -60,7 +58,7 @@ public override void HandleMessage(EuiMessageBase msg)
         }
     }
 
-    private async void BanPlayer(string? target, string? ipAddressString, bool useLastIp, ImmutableArray<byte>? hwid, bool useLastHwid, uint minutes, NoteSeverity severity, string reason, IReadOnlyCollection<string>? roles, bool erase)
+    private async void BanPlayer(string? target, string? ipAddressString, bool useLastIp, ImmutableTypedHwid? hwid, bool useLastHwid, uint minutes, NoteSeverity severity, string reason, IReadOnlyCollection<string>? roles, bool erase)
     {
         if (!_admins.HasAdminFlag(Player, AdminFlags.Ban))
         {
@@ -157,7 +155,7 @@ public async void ChangePlayer(string playerNameOrId)
         ChangePlayer(located?.UserId, located?.Username ?? string.Empty, located?.LastAddress, located?.LastHWId);
     }
 
-    public void ChangePlayer(NetUserId? playerId, string playerName, IPAddress? lastAddress, ImmutableArray<byte>? lastHwid)
+    public void ChangePlayer(NetUserId? playerId, string playerName, IPAddress? lastAddress, ImmutableTypedHwid? lastHwid)
     {
         PlayerId = playerId;
         PlayerName = playerName;
diff --git a/Content.Server/Administration/Commands/BanListCommand.cs b/Content.Server/Administration/Commands/BanListCommand.cs
index a5bc97dce3e..2f7093ae1d8 100644
--- a/Content.Server/Administration/Commands/BanListCommand.cs
+++ b/Content.Server/Administration/Commands/BanListCommand.cs
@@ -38,7 +38,7 @@ public override async void Execute(IConsoleShell shell, string argStr, string[]
 
         if (shell.Player is not { } player)
         {
-            var bans = await _dbManager.GetServerBansAsync(data.LastAddress, data.UserId, data.LastHWId, false);
+            var bans = await _dbManager.GetServerBansAsync(data.LastAddress, data.UserId, data.LastLegacyHWId, data.LastModernHWIds, false);
 
             if (bans.Count == 0)
             {
diff --git a/Content.Server/Administration/Commands/RoleBanListCommand.cs b/Content.Server/Administration/Commands/RoleBanListCommand.cs
index a5904723390..6af17e6bc3d 100644
--- a/Content.Server/Administration/Commands/RoleBanListCommand.cs
+++ b/Content.Server/Administration/Commands/RoleBanListCommand.cs
@@ -45,7 +45,7 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
         var targetHWid = located.LastHWId;
         var targetAddress = located.LastAddress;
 
-        var bans = await dbMan.GetServerRoleBansAsync(targetAddress, targetUid, targetHWid, includeUnbanned);
+            var bans = await _dbManager.GetServerRoleBansAsync(data.LastAddress, data.UserId, data.LastLegacyHWId, data.LastModernHWIds, includeUnbanned);
 
         if (bans.Count == 0)
         {
diff --git a/Content.Server/Administration/Managers/BanManager.cs b/Content.Server/Administration/Managers/BanManager.cs
index 946770d6aaf..7cc4b3579e6 100644
--- a/Content.Server/Administration/Managers/BanManager.cs
+++ b/Content.Server/Administration/Managers/BanManager.cs
@@ -67,6 +67,18 @@ private async Task CachePlayerData(ICommonSession player, CancellationToken canc
         // Have you seen how garbage role ban code code is? I don't feel like refactoring it right now.
 
         var flags = await _db.GetBanExemption(player.UserId, cancel);
+
+        var netChannel = player.Channel;
+        ImmutableArray<byte>? hwId = netChannel.UserData.HWId.Length == 0 ? null : netChannel.UserData.HWId;
+        var modernHwids = netChannel.UserData.ModernHWIds;
+        var roleBans = await _db.GetServerRoleBansAsync(netChannel.RemoteEndPoint.Address, player.UserId, hwId, modernHwids, false);
+
+        var userRoleBans = new List<ServerRoleBanDef>();
+        foreach (var ban in roleBans)
+        {
+            userRoleBans.Add(ban);
+        }
+
         cancel.ThrowIfCancellationRequested();
         _cachedBanExemptions[player] = flags;
     }
@@ -143,7 +155,7 @@ public void Restart()
     }
 
     #region Server Bans
-    public async void CreateServerBan(NetUserId? target, string? targetUsername, NetUserId? banningAdmin, (IPAddress, int)? addressRange, ImmutableArray<byte>? hwid, uint? minutes, NoteSeverity severity, string reason)
+    public async void CreateServerBan(NetUserId? target, string? targetUsername, NetUserId? banningAdmin, (IPAddress, int)? addressRange, ImmutableTypedHwid? hwid, uint? minutes, NoteSeverity severity, string reason)
     {
         DateTimeOffset? expires = null;
         if (minutes > 0)
@@ -177,9 +189,7 @@ public async void CreateServerBan(NetUserId? target, string? targetUsername, Net
         var addressRangeString = addressRange != null
             ? $"{addressRange.Value.Item1}/{addressRange.Value.Item2}"
             : "null";
-        var hwidString = hwid != null
-            ? string.Concat(hwid.Value.Select(x => x.ToString("x2")))
-            : "null";
+        var hwidString = hwid?.ToString() ?? "null";
         var expiresString = expires == null ? Loc.GetString("server-ban-string-never") : $"{expires}";
 
         var key = _cfg.GetCVar(CCVars.AdminShowPIIOnBan) ? "server-ban-string" : "server-ban-string-no-pii";
@@ -219,6 +229,7 @@ private bool BanMatchesPlayer(ICommonSession player, ServerBanDef ban)
             UserId = player.UserId,
             Address = player.Channel.RemoteEndPoint.Address,
             HWId = player.Channel.UserData.HWId,
+            ModernHWIds = player.Channel.UserData.ModernHWIds,
             // It's possible for the player to not have cached data loading yet due to coincidental timing.
             // If this is the case, we assume they have all flags to avoid false-positives.
             ExemptFlags = _cachedBanExemptions.GetValueOrDefault(player, ServerBanExemptFlags.All),
@@ -239,7 +250,7 @@ private void KickForBanDef(ICommonSession player, ServerBanDef def)
     #region Job Bans
     // If you are trying to remove timeOfBan, please don't. It's there because the note system groups role bans by time, reason and banning admin.
     // Removing it will clutter the note list. Please also make sure that department bans are applied to roles with the same DateTimeOffset.
-    public async void CreateRoleBan(NetUserId? target, string? targetUsername, NetUserId? banningAdmin, (IPAddress, int)? addressRange, ImmutableArray<byte>? hwid, string role, uint? minutes, NoteSeverity severity, string reason, DateTimeOffset timeOfBan)
+    public async void CreateRoleBan(NetUserId? target, string? targetUsername, NetUserId? banningAdmin, (IPAddress, int)? addressRange, ImmutableTypedHwid? hwid, string role, uint? minutes, NoteSeverity severity, string reason, DateTimeOffset timeOfBan)
     {
         if (!_prototypeManager.TryIndex(role, out JobPrototype? _))
         {
diff --git a/Content.Server/Administration/Managers/IBanManager.cs b/Content.Server/Administration/Managers/IBanManager.cs
index b60e0a25351..6653bd9c9f4 100644
--- a/Content.Server/Administration/Managers/IBanManager.cs
+++ b/Content.Server/Administration/Managers/IBanManager.cs
@@ -24,7 +24,7 @@ public interface IBanManager
     /// <param name="minutes">Number of minutes to ban for. 0 and null mean permanent</param>
     /// <param name="severity">Severity of the resulting ban note</param>
     /// <param name="reason">Reason for the ban</param>
-    public void CreateServerBan(NetUserId? target, string? targetUsername, NetUserId? banningAdmin, (IPAddress, int)? addressRange, ImmutableArray<byte>? hwid, uint? minutes, NoteSeverity severity, string reason);
+    public void CreateServerBan(NetUserId? target, string? targetUsername, NetUserId? banningAdmin, (IPAddress, int)? addressRange, ImmutableTypedHwid? hwid, uint? minutes, NoteSeverity severity, string reason);
     public HashSet<string>? GetRoleBans(NetUserId playerUserId);
     public HashSet<ProtoId<JobPrototype>>? GetJobBans(NetUserId playerUserId);
 
@@ -37,7 +37,7 @@ public interface IBanManager
     /// <param name="reason">Reason for the ban</param>
     /// <param name="minutes">Number of minutes to ban for. 0 and null mean permanent</param>
     /// <param name="timeOfBan">Time when the ban was applied, used for grouping role bans</param>
-    public void CreateRoleBan(NetUserId? target, string? targetUsername, NetUserId? banningAdmin, (IPAddress, int)? addressRange, ImmutableArray<byte>? hwid, string role, uint? minutes, NoteSeverity severity, string reason, DateTimeOffset timeOfBan);
+    public void CreateRoleBan(NetUserId? target, string? targetUsername, NetUserId? banningAdmin, (IPAddress, int)? addressRange, ImmutableTypedHwid? hwid, string role, uint? minutes, NoteSeverity severity, string reason, DateTimeOffset timeOfBan);
 
     /// <summary>
     /// Pardons a role ban for the specified target, username or GUID
diff --git a/Content.Server/Administration/PlayerLocator.cs b/Content.Server/Administration/PlayerLocator.cs
index 64a85f19ad0..25cc7714686 100644
--- a/Content.Server/Administration/PlayerLocator.cs
+++ b/Content.Server/Administration/PlayerLocator.cs
@@ -5,16 +5,42 @@
 using System.Net.Http.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using Content.Server.Connection;
 using Content.Server.Database;
+using Content.Shared.Database;
 using JetBrains.Annotations;
 using Robust.Server.Player;
 using Robust.Shared;
 using Robust.Shared.Configuration;
 using Robust.Shared.Network;
+using Robust.Shared.Player;
 
 namespace Content.Server.Administration
 {
-    public sealed record LocatedPlayerData(NetUserId UserId, IPAddress? LastAddress, ImmutableArray<byte>? LastHWId, string Username);
+    /// <summary>
+    /// Contains data resolved via <see cref="IPlayerLocator"/>.
+    /// </summary>
+    /// <param name="UserId">The ID of the located user.</param>
+    /// <param name="LastAddress">The last known IP address that the user connected with.</param>
+    /// <param name="LastHWId">
+    /// The last known HWID that the user connected with.
+    /// This should be used for placing new records involving HWIDs, such as bans.
+    /// For looking up data based on HWID, use combined <see cref="LastLegacyHWId"/> and <see cref="LastModernHWIds"/>.
+    /// </param>
+    /// <param name="Username">The last known username for the user connected with.</param>
+    /// <param name="LastLegacyHWId">
+    /// The last known legacy HWID value this user connected with. Only use for old lookups!
+    /// </param>
+    /// <param name="LastModernHWIds">
+    /// The set of last known modern HWIDs the user connected with.
+    /// </param>
+    public sealed record LocatedPlayerData(
+        NetUserId UserId,
+        IPAddress? LastAddress,
+        ImmutableTypedHwid? LastHWId,
+        string Username,
+        ImmutableArray<byte>? LastLegacyHWId,
+        ImmutableArray<ImmutableArray<byte>> LastModernHWIds);
 
     /// <summary>
     ///     Utilities for finding user IDs that extend to more than the server database.
@@ -67,63 +93,42 @@ public PlayerLocator()
         {
             // Check people currently on the server, the easiest case.
             if (_playerManager.TryGetSessionByUsername(playerName, out var session))
-            {
-                var userId = session.UserId;
-                var address = session.Channel.RemoteEndPoint.Address;
-                var hwId = session.Channel.UserData.HWId;
-                return new LocatedPlayerData(userId, address, hwId, session.Name);
-            }
+                return ReturnForSession(session);
 
             // Check database for past players.
             var record = await _db.GetPlayerRecordByUserName(playerName, cancel);
             if (record != null)
-                return new LocatedPlayerData(record.UserId, record.LastSeenAddress, record.HWId, record.LastSeenUserName);
+                return ReturnForPlayerRecord(record);
 
             // If all else fails, ask the auth server.
             var authServer = _configurationManager.GetCVar(CVars.AuthServer);
             var requestUri = $"{authServer}api/query/name?name={WebUtility.UrlEncode(playerName)}";
             using var resp = await _httpClient.GetAsync(requestUri, cancel);
 
-            if (resp.StatusCode == HttpStatusCode.NotFound)
-                return null;
-
-            if (!resp.IsSuccessStatusCode)
-            {
-                _sawmill.Error("Auth server returned bad response {StatusCode}!", resp.StatusCode);
-                return null;
-            }
-
-            var responseData = await resp.Content.ReadFromJsonAsync<UserDataResponse>(cancellationToken: cancel);
-
-            if (responseData == null)
-            {
-                _sawmill.Error("Auth server returned null response!");
-                return null;
-            }
-
-            return new LocatedPlayerData(new NetUserId(responseData.UserId), null, null, responseData.UserName);
+            return await HandleAuthServerResponse(resp, cancel);
         }
 
         public async Task<LocatedPlayerData?> LookupIdAsync(NetUserId userId, CancellationToken cancel = default)
         {
             // Check people currently on the server, the easiest case.
             if (_playerManager.TryGetSessionById(userId, out var session))
-            {
-                var address = session.Channel.RemoteEndPoint.Address;
-                var hwId = session.Channel.UserData.HWId;
-                return new LocatedPlayerData(userId, address, hwId, session.Name);
-            }
+                return ReturnForSession(session);
 
             // Check database for past players.
             var record = await _db.GetPlayerRecordByUserId(userId, cancel);
             if (record != null)
-                return new LocatedPlayerData(record.UserId, record.LastSeenAddress, record.HWId, record.LastSeenUserName);
+                return ReturnForPlayerRecord(record);
 
             // If all else fails, ask the auth server.
             var authServer = _configurationManager.GetCVar(CVars.AuthServer);
             var requestUri = $"{authServer}api/query/userid?userid={WebUtility.UrlEncode(userId.UserId.ToString())}";
             using var resp = await _httpClient.GetAsync(requestUri, cancel);
 
+            return await HandleAuthServerResponse(resp, cancel);
+        }
+
+        private async Task<LocatedPlayerData?> HandleAuthServerResponse(HttpResponseMessage resp, CancellationToken cancel)
+        {
             if (resp.StatusCode == HttpStatusCode.NotFound)
                 return null;
 
@@ -134,14 +139,40 @@ public PlayerLocator()
             }
 
             var responseData = await resp.Content.ReadFromJsonAsync<UserDataResponse>(cancellationToken: cancel);
-
             if (responseData == null)
             {
                 _sawmill.Error("Auth server returned null response!");
                 return null;
             }
 
-            return new LocatedPlayerData(new NetUserId(responseData.UserId), null, null, responseData.UserName);
+            return new LocatedPlayerData(new NetUserId(responseData.UserId), null, null, responseData.UserName, null, []);
+        }
+
+        private static LocatedPlayerData ReturnForSession(ICommonSession session)
+        {
+            var userId = session.UserId;
+            var address = session.Channel.RemoteEndPoint.Address;
+            var hwId = session.Channel.UserData.GetModernHwid();
+            return new LocatedPlayerData(
+                userId,
+                address,
+                hwId,
+                session.Name,
+                session.Channel.UserData.HWId,
+                session.Channel.UserData.ModernHWIds);
+        }
+
+        private static LocatedPlayerData ReturnForPlayerRecord(PlayerRecord record)
+        {
+            var hwid = record.HWId;
+
+            return new LocatedPlayerData(
+                record.UserId,
+                record.LastSeenAddress,
+                hwid,
+                record.LastSeenUserName,
+                hwid is { Type: HwidType.Legacy } ? hwid.Hwid : null,
+                hwid is { Type: HwidType.Modern } ? [hwid.Hwid] : []);
         }
 
         public async Task<LocatedPlayerData?> LookupIdByNameOrIdAsync(string playerName, CancellationToken cancel = default)
diff --git a/Content.Server/Administration/PlayerPanelEui.cs b/Content.Server/Administration/PlayerPanelEui.cs
index 4c0df806012..6c304888866 100644
--- a/Content.Server/Administration/PlayerPanelEui.cs
+++ b/Content.Server/Administration/PlayerPanelEui.cs
@@ -173,11 +173,11 @@ public async void SetPlayerState()
         {
             _whitelisted = await _db.GetWhitelistStatusAsync(_targetPlayer.UserId);
             // This won't get associated ip or hwid bans but they were not placed on this account anyways
-            _bans = (await _db.GetServerBansAsync(null, _targetPlayer.UserId, null)).Count;
+            _bans = (await _db.GetServerBansAsync(null, _targetPlayer.UserId, null, null)).Count;
             // Unfortunately role bans for departments and stuff are issued individually. This means that a single role ban can have many individual role bans internally
             // The only way to distinguish whether a role ban is the same is to compare the ban time.
             // This is horrible and I would love to just erase the database and start from scratch instead but that's what I can do for now.
-            _roleBans = (await _db.GetServerRoleBansAsync(null, _targetPlayer.UserId, null)).DistinctBy(rb => rb.BanTime).Count();
+            _roleBans = (await _db.GetServerRoleBansAsync(null, _targetPlayer.UserId, null, null)).DistinctBy(rb => rb.BanTime).Count();
         }
         else
         {
diff --git a/Content.Server/Administration/Systems/BwoinkSystem.cs b/Content.Server/Administration/Systems/BwoinkSystem.cs
index 21b5f6d3016..220e79f3f32 100644
--- a/Content.Server/Administration/Systems/BwoinkSystem.cs
+++ b/Content.Server/Administration/Systems/BwoinkSystem.cs
@@ -173,7 +173,7 @@ private async void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs
                 }
 
                 // Check if the user has been banned
-                var ban = await _dbManager.GetServerBanAsync(null, e.Session.UserId, null);
+                var ban = await _dbManager.GetServerBanAsync(null, e.Session.UserId, null, null);
                 if (ban != null)
                 {
                     var banMessage = Loc.GetString("bwoink-system-player-banned", ("banReason", ban.Reason));
diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
index b5f6b68b3b9..ef636a029f5 100644
--- a/Content.Server/Connection/ConnectionManager.cs
+++ b/Content.Server/Connection/ConnectionManager.cs
@@ -109,11 +109,14 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
 
             var serverId = (await _serverDbEntry.ServerEntity).Id;
 
+            var hwid = e.UserData.GetModernHwid();
+            var trust = e.UserData.Trust;
+
             if (deny != null)
             {
                 var (reason, msg, banHits) = deny.Value;
 
-                var id = await _db.AddConnectionLogAsync(userId, e.UserName, addr, e.UserData.HWId, reason, serverId);
+                var id = await _db.AddConnectionLogAsync(userId, e.UserName, addr, hwid, trust, reason, serverId);
                 if (banHits is { Count: > 0 })
                     await _db.AddServerBanHitsAsync(id, banHits);
 
@@ -121,12 +124,12 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
             }
             else
             {
-                await _db.AddConnectionLogAsync(userId, e.UserName, addr, e.UserData.HWId, null, serverId);
+                await _db.AddConnectionLogAsync(userId, e.UserName, addr, hwid, trust, null, serverId);
 
                 if (!ServerPreferencesManager.ShouldStorePrefs(e.AuthType))
                     return;
 
-                await _db.UpdatePlayerRecordAsync(userId, e.UserName, addr, e.UserData.HWId);
+                await _db.UpdatePlayerRecordAsync(userId, e.UserName, addr, hwid);
             }
         }
 
@@ -144,7 +147,9 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
                 hwId = null;
             }
 
-            var bans = await _db.GetServerBansAsync(addr, userId, hwId, includeUnbanned: false);
+            var modernHwid = e.UserData.ModernHWIds;
+
+            var bans = await _db.GetServerBansAsync(addr, userId, hwId, modernHwid, includeUnbanned: false);
             if (bans.Count > 0)
             {
                 var firstBan = bans[0];
diff --git a/Content.Server/Connection/UserDataExt.cs b/Content.Server/Connection/UserDataExt.cs
new file mode 100644
index 00000000000..a409f79a75d
--- /dev/null
+++ b/Content.Server/Connection/UserDataExt.cs
@@ -0,0 +1,24 @@
+using Content.Shared.Database;
+using Robust.Shared.Network;
+
+namespace Content.Server.Connection;
+
+/// <summary>
+/// Helper functions for working with <see cref="NetUserData"/>.
+/// </summary>
+public static class UserDataExt
+{
+    /// <summary>
+    /// Get the preferred HWID that should be used for new records related to a player.
+    /// </summary>
+    /// <remarks>
+    /// Players can have zero or more HWIDs, but for logging things like connection logs we generally
+    /// only want a single one. This method returns a nullable method.
+    /// </remarks>
+    public static ImmutableTypedHwid? GetModernHwid(this NetUserData userData)
+    {
+        return userData.ModernHWIds.Length == 0
+            ? null
+            : new ImmutableTypedHwid(userData.ModernHWIds[0], HwidType.Modern);
+    }
+}
diff --git a/Content.Server/Database/BanMatcher.cs b/Content.Server/Database/BanMatcher.cs
index e58e5b0b5f6..f477ccd822a 100644
--- a/Content.Server/Database/BanMatcher.cs
+++ b/Content.Server/Database/BanMatcher.cs
@@ -1,6 +1,7 @@
 using System.Collections.Immutable;
 using System.Net;
 using Content.Server.IP;
+using Content.Shared.Database;
 using Robust.Shared.Network;
 
 namespace Content.Server.Database;
@@ -52,9 +53,28 @@ public static bool BanMatches(ServerBanDef ban, in PlayerInfo player)
             return true;
         }
 
-        return player.HWId is { Length: > 0 } hwIdVar
-               && ban.HWId != null
-               && hwIdVar.AsSpan().SequenceEqual(ban.HWId.Value.AsSpan());
+        switch (ban.HWId?.Type)
+        {
+            case HwidType.Legacy:
+                if (player.HWId is { Length: > 0 } hwIdVar
+                    && hwIdVar.AsSpan().SequenceEqual(ban.HWId.Hwid.AsSpan()))
+                {
+                    return true;
+                }
+                break;
+            case HwidType.Modern:
+                if (player.ModernHWIds is { Length: > 0 } modernHwIdVar)
+                {
+                    foreach (var hwid in modernHwIdVar)
+                    {
+                        if (hwid.AsSpan().SequenceEqual(ban.HWId.Hwid.AsSpan()))
+                            return true;
+                    }
+                }
+                break;
+        }
+
+        return false;
     }
 
     /// <summary>
@@ -73,10 +93,15 @@ public struct PlayerInfo
         public IPAddress? Address;
 
         /// <summary>
-        /// The hardware ID of the player.
+        /// The LEGACY hardware ID of the player. Corresponds with <see cref="NetUserData.HWId"/>.
         /// </summary>
         public ImmutableArray<byte>? HWId;
 
+        /// <summary>
+        /// The modern hardware IDs of the player. Corresponds with <see cref="NetUserData.ModernHWIds"/>.
+        /// </summary>
+        public ImmutableArray<ImmutableArray<byte>>? ModernHWIds;
+
         /// <summary>
         /// Exemption flags the player has been granted.
         /// </summary>
diff --git a/Content.Server/Database/DatabaseRecords.cs b/Content.Server/Database/DatabaseRecords.cs
index c0d81147bb4..30fba3434b8 100644
--- a/Content.Server/Database/DatabaseRecords.cs
+++ b/Content.Server/Database/DatabaseRecords.cs
@@ -1,4 +1,3 @@
-using System.Collections.Immutable;
 using System.Net;
 using Content.Shared.Database;
 using Robust.Shared.Network;
@@ -121,7 +120,7 @@ public sealed record PlayerRecord(
     string LastSeenUserName,
     DateTimeOffset LastSeenTime,
     IPAddress LastSeenAddress,
-    ImmutableArray<byte>? HWId);
+    ImmutableTypedHwid? HWId);
 
 public sealed record RoundRecord(int Id, DateTimeOffset? StartDate, ServerRecord Server);
 
diff --git a/Content.Server/Database/ServerBanDef.cs b/Content.Server/Database/ServerBanDef.cs
index 09a960e9a6c..a09f9e959c6 100644
--- a/Content.Server/Database/ServerBanDef.cs
+++ b/Content.Server/Database/ServerBanDef.cs
@@ -1,4 +1,3 @@
-using System.Collections.Immutable;
 using System.Net;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
@@ -13,7 +12,7 @@ public sealed class ServerBanDef
         public int? Id { get; }
         public NetUserId? UserId { get; }
         public (IPAddress address, int cidrMask)? Address { get; }
-        public ImmutableArray<byte>? HWId { get; }
+        public ImmutableTypedHwid? HWId { get; }
 
         public DateTimeOffset BanTime { get; }
         public DateTimeOffset? ExpirationTime { get; }
@@ -28,7 +27,7 @@ public sealed class ServerBanDef
         public ServerBanDef(int? id,
             NetUserId? userId,
             (IPAddress, int)? address,
-            ImmutableArray<byte>? hwId,
+            TypedHwid? hwId,
             DateTimeOffset banTime,
             DateTimeOffset? expirationTime,
             int? roundId,
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index c78e6a0728b..b636411ff5e 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -355,12 +355,14 @@ public async Task AssignUserIdAsync(string name, NetUserId netUserId)
         /// </summary>
         /// <param name="address">The ip address of the user.</param>
         /// <param name="userId">The id of the user.</param>
-        /// <param name="hwId">The HWId of the user.</param>
+        /// <param name="hwId">The legacy HWId of the user.</param>
+        /// <param name="modernHWIds">The modern HWIDs of the user.</param>
         /// <returns>The user's latest received un-pardoned ban, or null if none exist.</returns>
         public abstract Task<ServerBanDef?> GetServerBanAsync(
             IPAddress? address,
             NetUserId? userId,
-            ImmutableArray<byte>? hwId);
+            ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds);
 
         /// <summary>
         ///     Looks up an user's ban history.
@@ -369,13 +371,15 @@ public async Task AssignUserIdAsync(string name, NetUserId netUserId)
         /// </summary>
         /// <param name="address">The ip address of the user.</param>
         /// <param name="userId">The id of the user.</param>
-        /// <param name="hwId">The HWId of the user.</param>
+        /// <param name="hwId">The legacy HWId of the user.</param>
+        /// <param name="modernHWIds">The modern HWIDs of the user.</param>
         /// <param name="includeUnbanned">Include pardoned and expired bans.</param>
         /// <returns>The user's ban history.</returns>
         public abstract Task<List<ServerBanDef>> GetServerBansAsync(
             IPAddress? address,
             NetUserId? userId,
             ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
             bool includeUnbanned);
 
         public abstract Task AddServerBanAsync(ServerBanDef serverBan);
@@ -466,11 +470,13 @@ public async Task<ServerBanExemptFlags> GetBanExemption(NetUserId userId, Cancel
         /// <param name="address">The IP address of the user.</param>
         /// <param name="userId">The NetUserId of the user.</param>
         /// <param name="hwId">The Hardware Id of the user.</param>
+        /// <param name="modernHWIds">The modern HWIDs of the user.</param>
         /// <param name="includeUnbanned">Whether expired and pardoned bans are included.</param>
         /// <returns>The user's role ban history.</returns>
         public abstract Task<List<ServerRoleBanDef>> GetServerRoleBansAsync(IPAddress? address,
             NetUserId? userId,
             ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
             bool includeUnbanned);
 
         public abstract Task<ServerRoleBanDef> AddServerRoleBanAsync(ServerRoleBanDef serverRoleBan);
@@ -553,7 +559,7 @@ public async Task UpdatePlayerRecord(
             NetUserId userId,
             string userName,
             IPAddress address,
-            ImmutableArray<byte> hwId)
+            ImmutableTypedHwid? hwId)
         {
             await using var db = await GetDb();
 
@@ -570,7 +576,7 @@ public async Task UpdatePlayerRecord(
             record.LastSeenTime = DateTime.UtcNow;
             record.LastSeenAddress = address;
             record.LastSeenUserName = userName;
-            record.LastSeenHWId = hwId.ToArray();
+            record.LastSeenHWId = hwId;
 
             await db.DbContext.SaveChangesAsync();
         }
@@ -616,7 +622,7 @@ protected async Task<bool> PlayerRecordExists(DbGuard db, NetUserId userId)
                 player.LastSeenUserName,
                 new DateTimeOffset(NormalizeDatabaseTime(player.LastSeenTime)),
                 player.LastSeenAddress,
-                player.LastSeenHWId?.ToImmutableArray());
+                player.LastSeenHWId);
         }
 
         #endregion
@@ -625,11 +631,11 @@ protected async Task<bool> PlayerRecordExists(DbGuard db, NetUserId userId)
         /*
          * CONNECTION LOG
          */
-        public abstract Task<int> AddConnectionLogAsync(
-            NetUserId userId,
+        public abstract Task<int> AddConnectionLogAsync(NetUserId userId,
             string userName,
             IPAddress address,
-            ImmutableArray<byte> hwId,
+            ImmutableTypedHwid? hwId,
+            float trust,
             ConnectionDenyReason? denied,
             int serverId);
 
diff --git a/Content.Server/Database/ServerDbManager.cs b/Content.Server/Database/ServerDbManager.cs
index 54701da76e1..9f24c07e6a2 100644
--- a/Content.Server/Database/ServerDbManager.cs
+++ b/Content.Server/Database/ServerDbManager.cs
@@ -69,12 +69,14 @@ Task<PlayerPreferences> InitPrefsAsync(
         /// </summary>
         /// <param name="address">The ip address of the user.</param>
         /// <param name="userId">The id of the user.</param>
-        /// <param name="hwId">The hardware ID of the user.</param>
+        /// <param name="hwId">The legacy HWID of the user.</param>
+        /// <param name="modernHWIds">The modern HWIDs of the user.</param>
         /// <returns>The user's latest received un-pardoned ban, or null if none exist.</returns>
         Task<ServerBanDef?> GetServerBanAsync(
             IPAddress? address,
             NetUserId? userId,
-            ImmutableArray<byte>? hwId);
+            ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds);
 
         /// <summary>
         ///     Looks up an user's ban history.
@@ -82,14 +84,16 @@ Task<PlayerPreferences> InitPrefsAsync(
         /// </summary>
         /// <param name="address">The ip address of the user.</param>
         /// <param name="userId">The id of the user.</param>
-        /// <param name="hwId">The HWId of the user.</param>
+        /// <param name="hwId">The legacy HWId of the user.</param>
+        /// <param name="modernHWIds">The modern HWIDs of the user.</param>
         /// <param name="includeUnbanned">If true, bans that have been expired or pardoned are also included.</param>
         /// <returns>The user's ban history.</returns>
         Task<List<ServerBanDef>> GetServerBansAsync(
             IPAddress? address,
             NetUserId? userId,
             ImmutableArray<byte>? hwId,
-            bool includeUnbanned = true);
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
+            bool includeUnbanned=true);
 
         Task AddServerBanAsync(ServerBanDef serverBan);
         Task AddServerUnbanAsync(ServerUnbanDef serverBan);
@@ -137,12 +141,14 @@ public Task EditServerBan(
         /// <param name="address">The IP address of the user.</param>
         /// <param name="userId">The NetUserId of the user.</param>
         /// <param name="hwId">The Hardware Id of the user.</param>
+        /// <param name="modernHWIds">The modern HWIDs of the user.</param>
         /// <param name="includeUnbanned">Whether expired and pardoned bans are included.</param>
         /// <returns>The user's role ban history.</returns>
         Task<List<ServerRoleBanDef>> GetServerRoleBansAsync(
             IPAddress? address,
             NetUserId? userId,
             ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
             bool includeUnbanned = true);
 
         Task<ServerRoleBanDef> AddServerRoleBanAsync(ServerRoleBanDef serverBan);
@@ -180,7 +186,7 @@ Task UpdatePlayerRecordAsync(
             NetUserId userId,
             string userName,
             IPAddress address,
-            ImmutableArray<byte> hwId);
+            ImmutableTypedHwid? hwId);
         Task<PlayerRecord?> GetPlayerRecordByUserName(string userName, CancellationToken cancel = default);
         Task<PlayerRecord?> GetPlayerRecordByUserId(NetUserId userId, CancellationToken cancel = default);
         #endregion
@@ -191,7 +197,8 @@ Task<int> AddConnectionLogAsync(
             NetUserId userId,
             string userName,
             IPAddress address,
-            ImmutableArray<byte> hwId,
+            ImmutableTypedHwid? hwId,
+            float trust,
             ConnectionDenyReason? denied,
             int serverId);
 
@@ -450,20 +457,22 @@ public Task AssignUserIdAsync(string name, NetUserId userId)
         public Task<ServerBanDef?> GetServerBanAsync(
             IPAddress? address,
             NetUserId? userId,
-            ImmutableArray<byte>? hwId)
+            ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds)
         {
             DbReadOpsMetric.Inc();
-            return RunDbCommand(() => _db.GetServerBanAsync(address, userId, hwId));
+            return RunDbCommand(() => _db.GetServerBanAsync(address, userId, hwId, modernHWIds));
         }
 
         public Task<List<ServerBanDef>> GetServerBansAsync(
             IPAddress? address,
             NetUserId? userId,
             ImmutableArray<byte>? hwId,
-            bool includeUnbanned = true)
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
+            bool includeUnbanned=true)
         {
             DbReadOpsMetric.Inc();
-            return RunDbCommand(() => _db.GetServerBansAsync(address, userId, hwId, includeUnbanned));
+            return RunDbCommand(() => _db.GetServerBansAsync(address, userId, hwId, modernHWIds, includeUnbanned));
         }
 
         public Task AddServerBanAsync(ServerBanDef serverBan)
@@ -507,10 +516,11 @@ public Task<List<ServerRoleBanDef>> GetServerRoleBansAsync(
             IPAddress? address,
             NetUserId? userId,
             ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
             bool includeUnbanned = true)
         {
             DbReadOpsMetric.Inc();
-            return RunDbCommand(() => _db.GetServerRoleBansAsync(address, userId, hwId, includeUnbanned));
+            return RunDbCommand(() => _db.GetServerRoleBansAsync(address, userId, hwId, modernHWIds, includeUnbanned));
         }
 
         public Task<ServerRoleBanDef> AddServerRoleBanAsync(ServerRoleBanDef serverRoleBan)
@@ -552,7 +562,7 @@ public Task UpdatePlayerRecordAsync(
             NetUserId userId,
             string userName,
             IPAddress address,
-            ImmutableArray<byte> hwId)
+            ImmutableTypedHwid? hwId)
         {
             DbWriteOpsMetric.Inc();
             return RunDbCommand(() => _db.UpdatePlayerRecord(userId, userName, address, hwId));
@@ -574,12 +584,13 @@ public Task<int> AddConnectionLogAsync(
             NetUserId userId,
             string userName,
             IPAddress address,
-            ImmutableArray<byte> hwId,
+            ImmutableTypedHwid? hwId,
+            float trust,
             ConnectionDenyReason? denied,
             int serverId)
         {
             DbWriteOpsMetric.Inc();
-            return RunDbCommand(() => _db.AddConnectionLogAsync(userId, userName, address, hwId, denied, serverId));
+            return RunDbCommand(() => _db.AddConnectionLogAsync(userId, userName, address, hwId, trust, denied, serverId));
         }
 
         public Task AddServerBanHitsAsync(int connection, IEnumerable<ServerBanDef> bans)
diff --git a/Content.Server/Database/ServerDbPostgres.cs b/Content.Server/Database/ServerDbPostgres.cs
index 7d131f70dc3..c0346708377 100644
--- a/Content.Server/Database/ServerDbPostgres.cs
+++ b/Content.Server/Database/ServerDbPostgres.cs
@@ -9,6 +9,7 @@
 using Content.Server.Administration.Logs;
 using Content.Server.IP;
 using Content.Shared.CCVar;
+using Content.Shared.Database;
 using Microsoft.EntityFrameworkCore;
 using Robust.Shared.Configuration;
 using Robust.Shared.Network;
@@ -73,7 +74,8 @@ public ServerDbPostgres(DbContextOptions<PostgresServerDbContext> options,
         public override async Task<ServerBanDef?> GetServerBanAsync(
             IPAddress? address,
             NetUserId? userId,
-            ImmutableArray<byte>? hwId)
+            ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds)
         {
             if (address == null && userId == null && hwId == null)
             {
@@ -84,7 +86,7 @@ public ServerDbPostgres(DbContextOptions<PostgresServerDbContext> options,
 
             var exempt = await GetBanExemptionCore(db, userId);
             var newPlayer = userId == null || !await PlayerRecordExists(db, userId.Value);
-            var query = MakeBanLookupQuery(address, userId, hwId, db, includeUnbanned: false, exempt, newPlayer)
+            var query = MakeBanLookupQuery(address, userId, hwId, modernHWIds, db, includeUnbanned: false, exempt, newPlayer)
                 .OrderByDescending(b => b.BanTime);
 
             var ban = await query.FirstOrDefaultAsync();
@@ -94,7 +96,9 @@ public ServerDbPostgres(DbContextOptions<PostgresServerDbContext> options,
 
         public override async Task<List<ServerBanDef>> GetServerBansAsync(IPAddress? address,
             NetUserId? userId,
-            ImmutableArray<byte>? hwId, bool includeUnbanned)
+            ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
+            bool includeUnbanned)
         {
             if (address == null && userId == null && hwId == null)
             {
@@ -105,7 +109,7 @@ public override async Task<List<ServerBanDef>> GetServerBansAsync(IPAddress? add
 
             var exempt = await GetBanExemptionCore(db, userId);
             var newPlayer = !await db.PgDbContext.Player.AnyAsync(p => p.UserId == userId);
-            var query = MakeBanLookupQuery(address, userId, hwId, db, includeUnbanned, exempt, newPlayer);
+            var query = MakeBanLookupQuery(address, userId, hwId, modernHWIds, db, includeUnbanned, exempt, newPlayer);
 
             var queryBans = await query.ToArrayAsync();
             var bans = new List<ServerBanDef>(queryBans.Length);
@@ -127,6 +131,7 @@ private static IQueryable<ServerBan> MakeBanLookupQuery(
             IPAddress? address,
             NetUserId? userId,
             ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
             DbGuardImpl db,
             bool includeUnbanned,
             ServerBanExemptFlags? exemptFlags,
@@ -134,16 +139,11 @@ private static IQueryable<ServerBan> MakeBanLookupQuery(
         {
             DebugTools.Assert(!(address == null && userId == null && hwId == null));
 
-            IQueryable<ServerBan>? query = null;
-
-            if (userId is { } uid)
-            {
-                var newQ = db.PgDbContext.Ban
-                    .Include(p => p.Unban)
-                    .Where(b => b.PlayerUserId == uid.UserId);
-
-                query = query == null ? newQ : query.Union(newQ);
-            }
+            var query = MakeBanLookupQualityShared<ServerBan, ServerUnban>(
+                userId,
+                hwId,
+                modernHWIds,
+                db.PgDbContext.Ban);
 
             if (address != null && !exemptFlags.GetValueOrDefault(ServerBanExemptFlags.None).HasFlag(ServerBanExemptFlags.IP))
             {
@@ -156,15 +156,6 @@ private static IQueryable<ServerBan> MakeBanLookupQuery(
                 query = query == null ? newQ : query.Union(newQ);
             }
 
-            if (hwId != null && hwId.Value.Length > 0)
-            {
-                var newQ = db.PgDbContext.Ban
-                    .Include(p => p.Unban)
-                    .Where(b => b.HWId!.SequenceEqual(hwId.Value.ToArray()));
-
-                query = query == null ? newQ : query.Union(newQ);
-            }
-
             DebugTools.Assert(
                 query != null,
                 "At least one filter item (IP/UserID/HWID) must have been given to make query not null.");
@@ -186,6 +177,49 @@ private static IQueryable<ServerBan> MakeBanLookupQuery(
             return query.Distinct();
         }
 
+        private static IQueryable<TBan>? MakeBanLookupQualityShared<TBan, TUnban>(
+            NetUserId? userId,
+            ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
+            DbSet<TBan> set)
+            where TBan : class, IBanCommon<TUnban>
+            where TUnban : class, IUnbanCommon
+        {
+            IQueryable<TBan>? query = null;
+
+            if (userId is { } uid)
+            {
+                var newQ = set
+                    .Include(p => p.Unban)
+                    .Where(b => b.PlayerUserId == uid.UserId);
+
+                query = query == null ? newQ : query.Union(newQ);
+            }
+
+            if (hwId != null && hwId.Value.Length > 0)
+            {
+                var newQ = set
+                    .Include(p => p.Unban)
+                    .Where(b => b.HWId!.Type == HwidType.Legacy && b.HWId!.Hwid.SequenceEqual(hwId.Value.ToArray()));
+
+                query = query == null ? newQ : query.Union(newQ);
+            }
+
+            if (modernHWIds != null)
+            {
+                foreach (var modernHwid in modernHWIds)
+                {
+                    var newQ = set
+                        .Include(p => p.Unban)
+                        .Where(b => b.HWId!.Type == HwidType.Modern && b.HWId!.Hwid.SequenceEqual(modernHwid.ToArray()));
+
+                    query = query == null ? newQ : query.Union(newQ);
+                }
+            }
+
+            return query;
+        }
+
         private static ServerBanDef? ConvertBan(ServerBan? ban)
         {
             if (ban == null)
@@ -211,7 +245,7 @@ private static IQueryable<ServerBan> MakeBanLookupQuery(
                 ban.Id,
                 uid,
                 ban.Address.ToTuple(),
-                ban.HWId == null ? null : ImmutableArray.Create(ban.HWId),
+                ban.HWId,
                 ban.BanTime,
                 ban.ExpirationTime,
                 ban.RoundId,
@@ -249,7 +283,7 @@ public override async Task AddServerBanAsync(ServerBanDef serverBan)
             db.PgDbContext.Ban.Add(new ServerBan
             {
                 Address = serverBan.Address.ToNpgsqlInet(),
-                HWId = serverBan.HWId?.ToArray(),
+                HWId = serverBan.HWId,
                 Reason = serverBan.Reason,
                 Severity = serverBan.Severity,
                 BanningAdmin = serverBan.BanningAdmin?.UserId,
@@ -297,6 +331,7 @@ public override async Task AddServerUnbanAsync(ServerUnbanDef serverUnban)
         public override async Task<List<ServerRoleBanDef>> GetServerRoleBansAsync(IPAddress? address,
             NetUserId? userId,
             ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
             bool includeUnbanned)
         {
             if (address == null && userId == null && hwId == null)
@@ -306,7 +341,7 @@ public override async Task<List<ServerRoleBanDef>> GetServerRoleBansAsync(IPAddr
 
             await using var db = await GetDbImpl();
 
-            var query = MakeRoleBanLookupQuery(address, userId, hwId, db, includeUnbanned)
+            var query = MakeRoleBanLookupQuery(address, userId, hwId, modernHWIds, db, includeUnbanned)
                 .OrderByDescending(b => b.BanTime);
 
             return await QueryRoleBans(query);
@@ -334,19 +369,15 @@ private static IQueryable<ServerRoleBan> MakeRoleBanLookupQuery(
             IPAddress? address,
             NetUserId? userId,
             ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
             DbGuardImpl db,
             bool includeUnbanned)
         {
-            IQueryable<ServerRoleBan>? query = null;
-
-            if (userId is { } uid)
-            {
-                var newQ = db.PgDbContext.RoleBan
-                    .Include(p => p.Unban)
-                    .Where(b => b.PlayerUserId == uid.UserId);
-
-                query = query == null ? newQ : query.Union(newQ);
-            }
+            var query = MakeBanLookupQualityShared<ServerRoleBan, ServerRoleUnban>(
+                userId,
+                hwId,
+                modernHWIds,
+                db.PgDbContext.RoleBan);
 
             if (address != null)
             {
@@ -357,15 +388,6 @@ private static IQueryable<ServerRoleBan> MakeRoleBanLookupQuery(
                 query = query == null ? newQ : query.Union(newQ);
             }
 
-            if (hwId != null && hwId.Value.Length > 0)
-            {
-                var newQ = db.PgDbContext.RoleBan
-                    .Include(p => p.Unban)
-                    .Where(b => b.HWId!.SequenceEqual(hwId.Value.ToArray()));
-
-                query = query == null ? newQ : query.Union(newQ);
-            }
-
             if (!includeUnbanned)
             {
                 query = query?.Where(p =>
@@ -402,7 +424,7 @@ private static IQueryable<ServerRoleBan> MakeRoleBanLookupQuery(
                 ban.Id,
                 uid,
                 ban.Address.ToTuple(),
-                ban.HWId == null ? null : ImmutableArray.Create(ban.HWId),
+                ban.HWId,
                 ban.BanTime,
                 ban.ExpirationTime,
                 ban.RoundId,
@@ -440,7 +462,7 @@ public override async Task<ServerRoleBanDef> AddServerRoleBanAsync(ServerRoleBan
             var ban = new ServerRoleBan
             {
                 Address = serverRoleBan.Address.ToNpgsqlInet(),
-                HWId = serverRoleBan.HWId?.ToArray(),
+                HWId = serverRoleBan.HWId,
                 Reason = serverRoleBan.Reason,
                 Severity = serverRoleBan.Severity,
                 BanningAdmin = serverRoleBan.BanningAdmin?.UserId,
@@ -476,7 +498,8 @@ public override async Task<int> AddConnectionLogAsync(
             NetUserId userId,
             string userName,
             IPAddress address,
-            ImmutableArray<byte> hwId,
+            ImmutableTypedHwid? hwId,
+            float trust,
             ConnectionDenyReason? denied,
             int serverId)
         {
@@ -488,9 +511,10 @@ public override async Task<int> AddConnectionLogAsync(
                 Time = DateTime.UtcNow,
                 UserId = userId.UserId,
                 UserName = userName,
-                HWId = hwId.ToArray(),
+                HWId = hwId,
                 Denied = denied,
-                ServerId = serverId
+                ServerId = serverId,
+                Trust = trust,
             };
 
             db.PgDbContext.ConnectionLog.Add(connectionLog);
diff --git a/Content.Server/Database/ServerDbSqlite.cs b/Content.Server/Database/ServerDbSqlite.cs
index 58d21acb63b..623b979f4b9 100644
--- a/Content.Server/Database/ServerDbSqlite.cs
+++ b/Content.Server/Database/ServerDbSqlite.cs
@@ -9,6 +9,7 @@
 using Content.Server.IP;
 using Content.Server.Preferences.Managers;
 using Content.Shared.CCVar;
+using Content.Shared.Database;
 using Microsoft.EntityFrameworkCore;
 using Robust.Shared.Configuration;
 using Robust.Shared.Network;
@@ -80,22 +81,24 @@ public ServerDbSqlite(
         public override async Task<ServerBanDef?> GetServerBanAsync(
             IPAddress? address,
             NetUserId? userId,
-            ImmutableArray<byte>? hwId)
+            ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds)
         {
             await using var db = await GetDbImpl();
 
-            return (await GetServerBanQueryAsync(db, address, userId, hwId, includeUnbanned: false)).FirstOrDefault();
+            return (await GetServerBanQueryAsync(db, address, userId, hwId, modernHWIds, includeUnbanned: false)).FirstOrDefault();
         }
 
         public override async Task<List<ServerBanDef>> GetServerBansAsync(
             IPAddress? address,
             NetUserId? userId,
             ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
             bool includeUnbanned)
         {
             await using var db = await GetDbImpl();
 
-            return (await GetServerBanQueryAsync(db, address, userId, hwId, includeUnbanned)).ToList();
+            return (await GetServerBanQueryAsync(db, address, userId, hwId, modernHWIds, includeUnbanned)).ToList();
         }
 
         private async Task<IEnumerable<ServerBanDef>> GetServerBanQueryAsync(
@@ -103,6 +106,7 @@ private async Task<IEnumerable<ServerBanDef>> GetServerBanQueryAsync(
             IPAddress? address,
             NetUserId? userId,
             ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
             bool includeUnbanned)
         {
             var exempt = await GetBanExemptionCore(db, userId);
@@ -119,6 +123,7 @@ private async Task<IEnumerable<ServerBanDef>> GetServerBanQueryAsync(
                 UserId = userId,
                 ExemptFlags = exempt ?? default,
                 HWId = hwId,
+                ModernHWIds = modernHWIds,
                 IsNewPlayer = newPlayer,
             };
 
@@ -157,7 +162,7 @@ public override async Task AddServerBanAsync(ServerBanDef serverBan)
                 Reason = serverBan.Reason,
                 Severity = serverBan.Severity,
                 BanningAdmin = serverBan.BanningAdmin?.UserId,
-                HWId = serverBan.HWId?.ToArray(),
+                HWId = serverBan.HWId,
                 BanTime = serverBan.BanTime.UtcDateTime,
                 ExpirationTime = serverBan.ExpirationTime?.UtcDateTime,
                 RoundId = serverBan.RoundId,
@@ -201,6 +206,7 @@ public override async Task<List<ServerRoleBanDef>> GetServerRoleBansAsync(
             IPAddress? address,
             NetUserId? userId,
             ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
             bool includeUnbanned)
         {
             await using var db = await GetDbImpl();
@@ -210,7 +216,7 @@ public override async Task<List<ServerRoleBanDef>> GetServerRoleBansAsync(
             var queryBans = await GetAllRoleBans(db.SqliteDbContext, includeUnbanned);
 
             return queryBans
-                .Where(b => RoleBanMatches(b, address, userId, hwId))
+                .Where(b => RoleBanMatches(b, address, userId, hwId, modernHWIds))
                 .Select(ConvertRoleBan)
                 .ToList()!;
         }
@@ -233,7 +239,8 @@ private static bool RoleBanMatches(
             ServerRoleBan ban,
             IPAddress? address,
             NetUserId? userId,
-            ImmutableArray<byte>? hwId)
+            ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds)
         {
             if (address != null && ban.Address is not null && address.IsInSubnet(ban.Address.ToTuple().Value))
             {
@@ -245,7 +252,27 @@ private static bool RoleBanMatches(
                 return true;
             }
 
-            return hwId is { Length: > 0 } hwIdVar && hwIdVar.AsSpan().SequenceEqual(ban.HWId);
+            switch (ban.HWId?.Type)
+            {
+                case HwidType.Legacy:
+                    if (hwId is { Length: > 0 } hwIdVar && hwIdVar.AsSpan().SequenceEqual(ban.HWId.Hwid))
+                        return true;
+                    break;
+
+                case HwidType.Modern:
+                    if (modernHWIds != null)
+                    {
+                        foreach (var modernHWId in modernHWIds)
+                        {
+                            if (modernHWId.AsSpan().SequenceEqual(ban.HWId.Hwid))
+                                return true;
+                        }
+                    }
+
+                    break;
+            }
+
+            return false;
         }
 
         public override async Task<ServerRoleBanDef> AddServerRoleBanAsync(ServerRoleBanDef serverBan)
@@ -258,7 +285,7 @@ public override async Task<ServerRoleBanDef> AddServerRoleBanAsync(ServerRoleBan
                 Reason = serverBan.Reason,
                 Severity = serverBan.Severity,
                 BanningAdmin = serverBan.BanningAdmin?.UserId,
-                HWId = serverBan.HWId?.ToArray(),
+                HWId = serverBan.HWId,
                 BanTime = serverBan.BanTime.UtcDateTime,
                 ExpirationTime = serverBan.ExpirationTime?.UtcDateTime,
                 RoundId = serverBan.RoundId,
@@ -312,7 +339,7 @@ public override async Task AddServerRoleUnbanAsync(ServerRoleUnbanDef serverUnba
                 ban.Id,
                 uid,
                 ban.Address.ToTuple(),
-                ban.HWId == null ? null : ImmutableArray.Create(ban.HWId),
+                ban.HWId,
                 // SQLite apparently always reads DateTime as unspecified, but we always write as UTC.
                 DateTime.SpecifyKind(ban.BanTime, DateTimeKind.Utc),
                 ban.ExpirationTime == null ? null : DateTime.SpecifyKind(ban.ExpirationTime.Value, DateTimeKind.Utc),
@@ -372,7 +399,7 @@ public override async Task AddServerRoleUnbanAsync(ServerRoleUnbanDef serverUnba
                 ban.Id,
                 uid,
                 ban.Address.ToTuple(),
-                ban.HWId == null ? null : ImmutableArray.Create(ban.HWId),
+                ban.HWId,
                 // SQLite apparently always reads DateTime as unspecified, but we always write as UTC.
                 DateTime.SpecifyKind(ban.BanTime, DateTimeKind.Utc),
                 ban.ExpirationTime == null ? null : DateTime.SpecifyKind(ban.ExpirationTime.Value, DateTimeKind.Utc),
@@ -408,7 +435,8 @@ public override async Task<int> AddConnectionLogAsync(
             NetUserId userId,
             string userName,
             IPAddress address,
-            ImmutableArray<byte> hwId,
+            ImmutableTypedHwid? hwId,
+            float trust,
             ConnectionDenyReason? denied,
             int serverId)
         {
@@ -420,9 +448,10 @@ public override async Task<int> AddConnectionLogAsync(
                 Time = DateTime.UtcNow,
                 UserId = userId.UserId,
                 UserName = userName,
-                HWId = hwId.ToArray(),
+                HWId = hwId,
                 Denied = denied,
-                ServerId = serverId
+                ServerId = serverId,
+                Trust = trust,
             };
 
             db.SqliteDbContext.ConnectionLog.Add(connectionLog);
diff --git a/Content.Server/Database/ServerRoleBanDef.cs b/Content.Server/Database/ServerRoleBanDef.cs
index f615d5da4d1..dda3a822378 100644
--- a/Content.Server/Database/ServerRoleBanDef.cs
+++ b/Content.Server/Database/ServerRoleBanDef.cs
@@ -1,4 +1,3 @@
-using System.Collections.Immutable;
 using System.Net;
 using Content.Shared.Database;
 using Robust.Shared.Network;
@@ -10,7 +9,7 @@ public sealed class ServerRoleBanDef
     public int? Id { get; }
     public NetUserId? UserId { get; }
     public (IPAddress address, int cidrMask)? Address { get; }
-    public ImmutableArray<byte>? HWId { get; }
+    public ImmutableTypedHwid? HWId { get; }
 
     public DateTimeOffset BanTime { get; }
     public DateTimeOffset? ExpirationTime { get; }
@@ -26,7 +25,7 @@ public ServerRoleBanDef(
         int? id,
         NetUserId? userId,
         (IPAddress, int)? address,
-        ImmutableArray<byte>? hwId,
+        ImmutableTypedHwid? hwId,
         DateTimeOffset banTime,
         DateTimeOffset? expirationTime,
         int? roundId,
diff --git a/Content.Shared.Database/TypedHwid.cs b/Content.Shared.Database/TypedHwid.cs
new file mode 100644
index 00000000000..6e4a7763b3a
--- /dev/null
+++ b/Content.Shared.Database/TypedHwid.cs
@@ -0,0 +1,62 @@
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Content.Shared.Database;
+
+/// <summary>
+/// Represents a raw HWID value together with its type.
+/// </summary>
+[Serializable]
+public sealed class ImmutableTypedHwid(ImmutableArray<byte> hwid, HwidType type)
+{
+    public readonly ImmutableArray<byte> Hwid = hwid;
+    public readonly HwidType Type = type;
+
+    public override string ToString()
+    {
+        var b64 = Convert.ToBase64String(Hwid.AsSpan());
+        return Type == HwidType.Modern ? $"V2-{b64}" : b64;
+    }
+
+    public static bool TryParse(string value, [NotNullWhen(true)] out ImmutableTypedHwid? hwid)
+    {
+        var type = HwidType.Legacy;
+        if (value.StartsWith("V2-", StringComparison.Ordinal))
+        {
+            value = value["V2-".Length..];
+            type = HwidType.Modern;
+        }
+
+        var array = new byte[GetBase64ByteLength(value)];
+        if (!Convert.TryFromBase64String(value, array, out _))
+        {
+            hwid = null;
+            return false;
+        }
+
+        hwid = new ImmutableTypedHwid([..array], type);
+        return true;
+    }
+
+    private static int GetBase64ByteLength(string value)
+    {
+        // Why is .NET like this man wtf.
+        return 3 * (value.Length / 4) - value.TakeLast(2).Count(c => c == '=');
+    }
+}
+
+/// <summary>
+/// Represents different types of HWIDs as exposed by the engine.
+/// </summary>
+public enum HwidType
+{
+    /// <summary>
+    /// The legacy HWID system. Should only be used for checking old existing database bans.
+    /// </summary>
+    Legacy = 0,
+
+    /// <summary>
+    /// The modern HWID system.
+    /// </summary>
+    Modern = 1,
+}
diff --git a/Content.Shared/Administration/BanPanelEuiState.cs b/Content.Shared/Administration/BanPanelEuiState.cs
index dd10068e5da..74c340566b5 100644
--- a/Content.Shared/Administration/BanPanelEuiState.cs
+++ b/Content.Shared/Administration/BanPanelEuiState.cs
@@ -25,7 +25,7 @@ public sealed class CreateBanRequest : EuiMessageBase
     {
         public string? Player { get; set; }
         public string? IpAddress { get; set; }
-        public byte[]? Hwid { get; set; }
+        public ImmutableTypedHwid? Hwid { get; set; }
         public uint Minutes { get; set; }
         public string Reason { get; set; }
         public NoteSeverity Severity { get; set; }
@@ -34,7 +34,7 @@ public sealed class CreateBanRequest : EuiMessageBase
         public bool UseLastHwid { get; set; }
         public bool Erase { get; set; }
 
-        public CreateBanRequest(string? player, (IPAddress, int)? ipAddress, bool useLastIp, byte[]? hwid, bool useLastHwid, uint minutes, string reason, NoteSeverity severity, string[]? roles, bool erase)
+        public CreateBanRequest(string? player, (IPAddress, int)? ipAddress, bool useLastIp, ImmutableTypedHwid? hwid, bool useLastHwid, uint minutes, string reason, NoteSeverity severity, string[]? roles, bool erase)
         {
             Player = player;
             IpAddress = ipAddress == null ? null : $"{ipAddress.Value.Item1}/{ipAddress.Value.Item2}";

From 463c90a60a6e1c359f4841d25ac326a0d65aa609 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Fri, 22 Nov 2024 18:14:46 +0100
Subject: [PATCH 232/366] Fix sandbox error with new HWID code. (#33461)

Oops
---
 Content.Shared.Database/TypedHwid.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Content.Shared.Database/TypedHwid.cs b/Content.Shared.Database/TypedHwid.cs
index 6e4a7763b3a..253375e9dbc 100644
--- a/Content.Shared.Database/TypedHwid.cs
+++ b/Content.Shared.Database/TypedHwid.cs
@@ -34,7 +34,9 @@ public static bool TryParse(string value, [NotNullWhen(true)] out ImmutableTyped
             return false;
         }
 
-        hwid = new ImmutableTypedHwid([..array], type);
+        // ReSharper disable once UseCollectionExpression
+        // Do not use collection expression, C# compiler is weird and it fails sandbox.
+        hwid = new ImmutableTypedHwid(ImmutableArray.Create(array), type);
         return true;
     }
 

From 4f5fb40dcc8fb3b92d4f1fe5ca6bce60aaf046d4 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Wed, 17 Apr 2024 00:19:36 +0200
Subject: [PATCH 233/366] Re-add IAdminRemarksCommon to DB model for SS14.Admin
 (#27028)

This was removed in #25280 as the relevant DB entities didn't go outside the DB layer anymore. SS14.Admin however still uses them directly (as it only supports Postgres), so the interface is still useful there.
---
 Content.Server.Database/Model.cs | 33 +++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index 029cd3513c6..a72287894df 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -971,8 +971,35 @@ public sealed class UploadedResourceLog
         public byte[] Data { get; set; } = default!;
     }
 
+    // Note: this interface isn't used by the game, but it *is* used by SS14.Admin.
+    // Don't remove! Or face the consequences!
+    public interface IAdminRemarksCommon
+    {
+        public int Id { get; }
+
+        public int? RoundId { get; }
+        public Round? Round { get; }
+
+        public Guid? PlayerUserId { get; }
+        public Player? Player { get; }
+        public TimeSpan PlaytimeAtNote { get; }
+
+        public string Message { get; }
+
+        public Player? CreatedBy { get; }
+
+        public DateTime CreatedAt { get; }
+
+        public Player? LastEditedBy { get; }
+
+        public DateTime? LastEditedAt { get; }
+        public DateTime? ExpirationTime { get; }
+
+        public bool Deleted { get; }
+    }
+
     [Index(nameof(PlayerUserId))]
-    public class AdminNote
+    public class AdminNote : IAdminRemarksCommon
     {
         [Required, Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)] public int Id { get; set; }
 
@@ -1006,7 +1033,7 @@ public class AdminNote
     }
 
     [Index(nameof(PlayerUserId))]
-    public class AdminWatchlist
+    public class AdminWatchlist : IAdminRemarksCommon
     {
         [Required, Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)] public int Id { get; set; }
 
@@ -1037,7 +1064,7 @@ public class AdminWatchlist
     }
 
     [Index(nameof(PlayerUserId))]
-    public class AdminMessage
+    public class AdminMessage : IAdminRemarksCommon
     {
         [Required, Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)] public int Id { get; set; }
 

From 76ba115a1bdc9bd91a8cfd6714171b91fd75e0b7 Mon Sep 17 00:00:00 2001
From: icekot8 <93311212+icekot8@users.noreply.github.com>
Date: Sun, 16 Jun 2024 00:36:25 +0300
Subject: [PATCH 234/366] =?UTF-8?q?add=20=F0=9F=91=B7=20JobCondition=20sys?=
 =?UTF-8?q?tem=20for=20reagents=20(#29023)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* hell :skull:

* you're right

i'm dumb

* use the beautiful protoid and or in localization :cut_of_meat:

* :pray:
---
 .../Localizations/ContentLocalizationManager.cs  | 16 +++++++++++++++-
 .../en-US/guidebook/chemistry/conditions.ftl     |  3 +++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/Content.Shared/Localizations/ContentLocalizationManager.cs b/Content.Shared/Localizations/ContentLocalizationManager.cs
index 7d40182f6cc..ad8890ae0fd 100644
--- a/Content.Shared/Localizations/ContentLocalizationManager.cs
+++ b/Content.Shared/Localizations/ContentLocalizationManager.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using System.Linq;
 using System.Text.RegularExpressions;
 using Robust.Shared.Utility;
@@ -119,6 +119,20 @@ public static string FormatList(List<string> list)
             };
         }
 
+        /// <summary>
+        /// Formats a list as per english grammar rules, but uses or instead of and.
+        /// </summary>
+        public static string FormatListToOr(List<string> list)
+        {
+            return list.Count switch
+            {
+                <= 0 => string.Empty,
+                1 => list[0],
+                2 => $"{list[0]} or {list[1]}",
+                _ => $"{string.Join(" or ", list)}"
+            };
+        }
+
         /// <summary>
         /// Formats a direction struct as a human-readable string.
         /// </summary>
diff --git a/Resources/Locale/en-US/guidebook/chemistry/conditions.ftl b/Resources/Locale/en-US/guidebook/chemistry/conditions.ftl
index 6cbfc13a797..95aaf9126d7 100644
--- a/Resources/Locale/en-US/guidebook/chemistry/conditions.ftl
+++ b/Resources/Locale/en-US/guidebook/chemistry/conditions.ftl
@@ -28,6 +28,9 @@ reagent-effect-condition-guidebook-reagent-threshold =
 reagent-effect-condition-guidebook-mob-state-condition =
     the mob is { $state }
 
+reagent-effect-condition-guidebook-job-condition =
+    the target's job is { $job }
+
 reagent-effect-condition-guidebook-solution-temperature =
     the solution's temperature is { $max ->
             [2147483648] at least {NATURALFIXED($min, 2)}k

From a91f66a803875c929ed002d99822287a046e77e7 Mon Sep 17 00:00:00 2001
From: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Date: Fri, 7 Jun 2024 15:53:20 -0400
Subject: [PATCH 235/366] Fixes client having authority over rules popup cvars
 (#28655)

* Fixes client having authority over rules popup cvars

* Delete duplicate migration

* Pre-update

* Post-update
---
 .../Systems/Info/InfoUIController.cs          |   31 +-
 ...0606175154_ReturnLastReadRules.Designer.cs | 1913 +++++++++++++++++
 .../20240606175154_ReturnLastReadRules.cs     |   29 +
 .../PostgresServerDbContextModelSnapshot.cs   |    4 +
 ...0606175141_ReturnLastReadRules.Designer.cs | 1838 ++++++++++++++++
 .../20240606175141_ReturnLastReadRules.cs     |   29 +
 .../SqliteServerDbContextModelSnapshot.cs     |    4 +
 Content.Server.Database/Model.cs              |    2 +
 .../Administration/Managers/AdminManager.cs   |    1 -
 Content.Server/Entry/EntryPoint.cs            |    2 +
 Content.Server/Info/RulesManager.cs           |   44 +
 Content.Server/IoC/ServerContentIoC.cs        |    2 +
 Content.Shared/CCVar/CCVars.cs                |    8 +-
 Content.Shared/Info/RulesMessages.cs          |   16 +
 14 files changed, 3887 insertions(+), 36 deletions(-)
 create mode 100644 Content.Server.Database/Migrations/Postgres/20240606175154_ReturnLastReadRules.Designer.cs
 create mode 100644 Content.Server.Database/Migrations/Postgres/20240606175154_ReturnLastReadRules.cs
 create mode 100644 Content.Server.Database/Migrations/Sqlite/20240606175141_ReturnLastReadRules.Designer.cs
 create mode 100644 Content.Server.Database/Migrations/Sqlite/20240606175141_ReturnLastReadRules.cs
 create mode 100644 Content.Server/Info/RulesManager.cs

diff --git a/Content.Client/UserInterface/Systems/Info/InfoUIController.cs b/Content.Client/UserInterface/Systems/Info/InfoUIController.cs
index 6d398ec6aa5..6edecebb16c 100644
--- a/Content.Client/UserInterface/Systems/Info/InfoUIController.cs
+++ b/Content.Client/UserInterface/Systems/Info/InfoUIController.cs
@@ -1,13 +1,9 @@
-using System.Globalization;
 using Content.Client.Gameplay;
 using Content.Client.Guidebook;
 using Content.Client.Info;
-using Content.Shared.Administration.Managers;
 using Content.Shared.CCVar;
 using Content.Shared.Info;
-using Robust.Client;
 using Robust.Client.Console;
-using Robust.Client.Player;
 using Robust.Client.UserInterface.Controllers;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Configuration;
@@ -18,24 +14,20 @@ namespace Content.Client.UserInterface.Systems.Info;
 
 public sealed class InfoUIController : UIController, IOnStateExited<GameplayState>
 {
-    [Dependency] private readonly IBaseClient _client = default!;
     [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
     [Dependency] private readonly INetManager _netManager = default!;
-    [Dependency] private readonly ISharedAdminManager _adminManager = default!;
-    [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
 
     private RulesPopup? _rulesPopup;
     private RulesAndInfoWindow? _infoWindow;
 
-    private static DateTime NextRulesReadTime => DateTime.UtcNow + TimeSpan.FromDays(60);
-
     public override void Initialize()
     {
         base.Initialize();
 
-        _client.PlayerJoinedServer += OnJoinedServer;
+
+        _netManager.RegisterNetMessage<RulesAcceptedMessage>();
         _netManager.RegisterNetMessage<ShowRulesPopupMessage>(OnShowRulesPopupMessage);
 
         _consoleHost.RegisterCommand("fuckrules",
@@ -47,22 +39,6 @@ public override void Initialize()
         });
     }
 
-    private void OnJoinedServer(object? sender, PlayerEventArgs args)
-    {
-        if (_playerManager.LocalSession is not { } localSession)
-            return;
-
-        if (_adminManager.IsAdmin(localSession) && _cfg.GetCVar(CCVars.RulesExemptLocal))
-            return;
-
-        var nextReadTarget = DateTime.Parse(_cfg.GetCVar(CCVars.RulesNextPopupTime));
-        if (nextReadTarget >= DateTime.UtcNow)
-            return;
-
-        var time = _cfg.GetCVar(CCVars.RulesWaitTime);
-        ShowRules(time);
-    }
-
     private void OnShowRulesPopupMessage(ShowRulesPopupMessage message)
     {
         ShowRules(message.PopupTime);
@@ -100,8 +76,7 @@ private void OnQuitPressed()
 
     private void OnAcceptPressed()
     {
-        _cfg.SetCVar(CCVars.RulesNextPopupTime, NextRulesReadTime.ToString(CultureInfo.InvariantCulture));
-        _cfg.SaveToFile();
+        _netManager.ClientSendMessage(new RulesAcceptedMessage());
 
         _rulesPopup?.Orphan();
         _rulesPopup = null;
diff --git a/Content.Server.Database/Migrations/Postgres/20240606175154_ReturnLastReadRules.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240606175154_ReturnLastReadRules.Designer.cs
new file mode 100644
index 00000000000..e82e58bf5ce
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20240606175154_ReturnLastReadRules.Designer.cs
@@ -0,0 +1,1913 @@
+// <auto-generated />
+using System;
+using System.Net;
+using System.Text.Json;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using NpgsqlTypes;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    [DbContext(typeof(PostgresServerDbContext))]
+    [Migration("20240606175154_ReturnLastReadRules")]
+    partial class ReturnLastReadRules
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.0")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("boolean")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<short>("Impact")
+                        .HasColumnType("smallint")
+                        .HasColumnName("impact");
+
+                    b.Property<JsonDocument>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Message")
+                        .HasAnnotation("Npgsql:TsVectorConfig", "english");
+
+                    NpgsqlIndexBuilderExtensions.HasMethod(b.HasIndex("Message"), "GIN");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("integer")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_messages_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dismissed");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("boolean")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_notes_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("boolean")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_watchlists_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("antag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("assigned_user_id_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<IPAddress>("Address")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("smallint")
+                        .HasColumnName("denied");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("time");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("job_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("play_time_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("interval")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("player_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<IPAddress>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<byte[]>("LastSeenHWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("last_seen_hwid");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", null, t =>
+                        {
+                            t.HasCheckConstraint("LastSeenAddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= last_seen_address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("integer")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Age")
+                        .HasColumnType("integer")
+                        .HasColumnName("age");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_name");
+
+                    b.Property<JsonDocument>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("integer")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("integer")
+                        .HasColumnName("slot");
+
+                    b.Property<int>("SpawnPriority")
+                        .HasColumnType("integer")
+                        .HasColumnName("spawn_priority");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<int>("ProfileLoadoutGroupId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout");
+
+                    b.HasIndex("ProfileLoadoutGroupId");
+
+                    b.ToTable("profile_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("group_name");
+
+                    b.Property<int>("ProfileRoleLoadoutId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout_group");
+
+                    b.HasIndex("ProfileRoleLoadoutId");
+
+                    b.ToTable("profile_loadout_group", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("RoleName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_role_loadout");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("profile_role_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.HasKey("PlayerUserId", "RoleId")
+                        .HasName("PK_role_whitelists");
+
+                    b.ToTable("role_whitelists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<NpgsqlInet?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("boolean")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("integer")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("integer")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_hit_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_role_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<NpgsqlInet?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("role_unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("trait_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("integer")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileLoadoutGroup", "ProfileLoadoutGroup")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileLoadoutGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_profile_loadout_group_profile_loadout_group~");
+
+                    b.Navigation("ProfileLoadoutGroup");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileRoleLoadout", "ProfileRoleLoadout")
+                        .WithMany("Groups")
+                        .HasForeignKey("ProfileRoleLoadoutId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_group_profile_role_loadout_profile_role_loa~");
+
+                    b.Navigation("ProfileRoleLoadout");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_role_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("JobWhitelists")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_role_whitelists_player_player_user_id");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+
+                    b.Navigation("JobWhitelists");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Loadouts");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Navigation("Loadouts");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Navigation("Groups");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/20240606175154_ReturnLastReadRules.cs b/Content.Server.Database/Migrations/Postgres/20240606175154_ReturnLastReadRules.cs
new file mode 100644
index 00000000000..af4e5ad4c40
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20240606175154_ReturnLastReadRules.cs
@@ -0,0 +1,29 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    /// <inheritdoc />
+    public partial class ReturnLastReadRules : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "last_read_rules",
+                table: "player",
+                type: "timestamp with time zone",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "last_read_rules",
+                table: "player");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
index 79eebfe78a2..d9bde5e94ef 100644
--- a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
@@ -749,6 +749,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("first_seen_time");
 
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_read_rules");
+
                     b.Property<IPAddress>("LastSeenAddress")
                         .IsRequired()
                         .HasColumnType("inet")
diff --git a/Content.Server.Database/Migrations/Sqlite/20240606175141_ReturnLastReadRules.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240606175141_ReturnLastReadRules.Designer.cs
new file mode 100644
index 00000000000..043230b02b2
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240606175141_ReturnLastReadRules.Designer.cs
@@ -0,0 +1,1838 @@
+// <auto-generated />
+using System;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    [DbContext(typeof(SqliteServerDbContext))]
+    [Migration("20240606175141_ReturnLastReadRules")]
+    partial class ReturnLastReadRules
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.0");
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_flag_id");
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<sbyte>("Impact")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("impact");
+
+                    b.Property<string>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_messages_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("dismissed");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_notes_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_watchlists_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("antag_id");
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("assigned_user_id_id");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_log_id");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("denied");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("job_id");
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("play_time_id");
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("player_id");
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<string>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<byte[]>("LastSeenHWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("last_seen_hwid");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<int>("Age")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("age");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_name");
+
+                    b.Property<byte[]>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("slot");
+
+                    b.Property<int>("SpawnPriority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("spawn_priority");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_id");
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<int>("ProfileLoadoutGroupId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout");
+
+                    b.HasIndex("ProfileLoadoutGroupId");
+
+                    b.ToTable("profile_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("group_name");
+
+                    b.Property<int>("ProfileRoleLoadoutId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout_group");
+
+                    b.HasIndex("ProfileRoleLoadoutId");
+
+                    b.ToTable("profile_loadout_group", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("RoleName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_role_loadout");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("profile_role_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.HasKey("PlayerUserId", "RoleId")
+                        .HasName("PK_role_whitelists");
+
+                    b.ToTable("role_whitelists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_hit_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_role_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("role_unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("trait_id");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("BLOB")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileLoadoutGroup", "ProfileLoadoutGroup")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileLoadoutGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_profile_loadout_group_profile_loadout_group_id");
+
+                    b.Navigation("ProfileLoadoutGroup");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileRoleLoadout", "ProfileRoleLoadout")
+                        .WithMany("Groups")
+                        .HasForeignKey("ProfileRoleLoadoutId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_group_profile_role_loadout_profile_role_loadout_id");
+
+                    b.Navigation("ProfileRoleLoadout");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_role_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("JobWhitelists")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_role_whitelists_player_player_user_id");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+
+                    b.Navigation("JobWhitelists");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Loadouts");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Navigation("Loadouts");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Navigation("Groups");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/20240606175141_ReturnLastReadRules.cs b/Content.Server.Database/Migrations/Sqlite/20240606175141_ReturnLastReadRules.cs
new file mode 100644
index 00000000000..0b0fd8725c0
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240606175141_ReturnLastReadRules.cs
@@ -0,0 +1,29 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    /// <inheritdoc />
+    public partial class ReturnLastReadRules : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "last_read_rules",
+                table: "player",
+                type: "TEXT",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "last_read_rules",
+                table: "player");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
index ba7f92e60df..cc2c9a9ad3f 100644
--- a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
@@ -705,6 +705,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("TEXT")
                         .HasColumnName("first_seen_time");
 
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_read_rules");
+
                     b.Property<string>("LastSeenAddress")
                         .IsRequired()
                         .HasColumnType("TEXT")
diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index a72287894df..e3e4f3669b9 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -499,6 +499,8 @@ public class Player
         public List<Round> Rounds { get; set; } = null!;
         public List<AdminLogPlayer> AdminLogs { get; set; } = null!;
 
+        public DateTime? LastReadRules { get; set; }
+
         public List<AdminNote> AdminNotesReceived { get; set; } = null!;
         public List<AdminNote> AdminNotesCreated { get; set; } = null!;
         public List<AdminNote> AdminNotesLastEdited { get; set; } = null!;
diff --git a/Content.Server/Administration/Managers/AdminManager.cs b/Content.Server/Administration/Managers/AdminManager.cs
index 2b74a6d5ac5..088cbfeaf4c 100644
--- a/Content.Server/Administration/Managers/AdminManager.cs
+++ b/Content.Server/Administration/Managers/AdminManager.cs
@@ -234,7 +234,6 @@ public void Initialize()
             _sawmill = _logManager.GetSawmill("admin");
 
             _netMgr.RegisterNetMessage<MsgUpdateAdminStatus>();
-            _netMgr.RegisterNetMessage<ShowRulesPopupMessage>();
 
             // Cache permissions for loaded console commands with the requisite attributes.
             foreach (var (cmdName, cmd) in _consoleHost.AvailableCommands)
diff --git a/Content.Server/Entry/EntryPoint.cs b/Content.Server/Entry/EntryPoint.cs
index c62dece48fc..97a9ba2535e 100644
--- a/Content.Server/Entry/EntryPoint.cs
+++ b/Content.Server/Entry/EntryPoint.cs
@@ -12,6 +12,7 @@
 using Content.Server.GameTicking;
 using Content.Server.GhostKick;
 using Content.Server.GuideGenerator;
+using Content.Server.Info;
 using Content.Server.IoC;
 using Content.Server.Players.JobWhitelist;
 using Content.Server.Maps;
@@ -144,6 +145,7 @@ public override void PostInit()
                 IoCManager.Resolve<RecipeManager>().Initialize();
                 IoCManager.Resolve<IAdminManager>().Initialize();
                 IoCManager.Resolve<IAfkManager>().Initialize();
+                IoCManager.Resolve<RulesManager>().Initialize();
                 _euiManager.Initialize();
 
                 IoCManager.Resolve<IGameMapManager>().Initialize();
diff --git a/Content.Server/Info/RulesManager.cs b/Content.Server/Info/RulesManager.cs
new file mode 100644
index 00000000000..168e5846b96
--- /dev/null
+++ b/Content.Server/Info/RulesManager.cs
@@ -0,0 +1,44 @@
+using System.Net;
+using Content.Server.Database;
+using Content.Shared.CCVar;
+using Content.Shared.Info;
+using Robust.Shared.Configuration;
+using Robust.Shared.Network;
+
+namespace Content.Server.Info;
+
+public sealed class RulesManager
+{
+    [Dependency] private readonly IServerDbManager _dbManager = default!;
+    [Dependency] private readonly INetManager _netManager = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+
+    private static DateTime LastValidReadTime => DateTime.UtcNow - TimeSpan.FromDays(60);
+
+    public void Initialize()
+    {
+        _netManager.Connected += OnConnected;
+        _netManager.RegisterNetMessage<ShowRulesPopupMessage>();
+        _netManager.RegisterNetMessage<RulesAcceptedMessage>(OnRulesAccepted);
+    }
+
+    private async void OnConnected(object? sender, NetChannelArgs e)
+    {
+        if (IPAddress.IsLoopback(e.Channel.RemoteEndPoint.Address) && _cfg.GetCVar(CCVars.RulesExemptLocal))
+            return;
+
+        var lastRead = await _dbManager.GetLastReadRules(e.Channel.UserId);
+        if (lastRead > LastValidReadTime)
+            return;
+
+        var message = new ShowRulesPopupMessage();
+        message.PopupTime = _cfg.GetCVar(CCVars.RulesWaitTime);
+        _netManager.ServerSendMessage(message, e.Channel);
+    }
+
+    private async void OnRulesAccepted(RulesAcceptedMessage message)
+    {
+        var date = DateTime.UtcNow;
+        await _dbManager.SetLastReadRules(message.MsgChannel.UserId, date);
+    }
+}
diff --git a/Content.Server/IoC/ServerContentIoC.cs b/Content.Server/IoC/ServerContentIoC.cs
index 914c8589916..f8dc6436c3a 100644
--- a/Content.Server/IoC/ServerContentIoC.cs
+++ b/Content.Server/IoC/ServerContentIoC.cs
@@ -11,6 +11,7 @@
 using Content.Server.DiscordAuth;
 using Content.Server.EUI;
 using Content.Server.GhostKick;
+using Content.Server.Info;
 using Content.Server.Maps;
 using Content.Server.Players.JobWhitelist;
 using Content.Server.MoMMI;
@@ -54,6 +55,7 @@ public static void Register()
             IoCManager.Register<IPlayerLocator, PlayerLocator>();
             IoCManager.Register<IAfkManager, AfkManager>();
             IoCManager.Register<IGameMapManager, GameMapManager>();
+            IoCManager.Register<RulesManager, RulesManager>();
             IoCManager.Register<IBanManager, BanManager>();
             IoCManager.Register<ContentNetworkResourceManager>();
             IoCManager.Register<IAdminNotesManager, AdminNotesManager>();
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index d3f8cac7c57..9d3265ef220 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -2205,13 +2205,7 @@ public static readonly CVarDef<string>
         ///     Don't show rules to localhost/loopback interface.
         /// </summary>
         public static readonly CVarDef<bool> RulesExemptLocal =
-            CVarDef.Create("rules.exempt_local", true, CVar.CLIENT);
-
-        /// <summary>
-        /// The next time the rules will popup for this client, expressed in minutes
-        /// </summary>
-        public static readonly CVarDef<string> RulesNextPopupTime =
-            CVarDef.Create("rules.next_popup_time", "Jan 1, 1997", CVar.CLIENTONLY | CVar.ARCHIVE);
+            CVarDef.Create("rules.exempt_local", false, CVar.SERVERONLY);
 
 
         /*
diff --git a/Content.Shared/Info/RulesMessages.cs b/Content.Shared/Info/RulesMessages.cs
index 9cb73c9aa86..ac7400238f0 100644
--- a/Content.Shared/Info/RulesMessages.cs
+++ b/Content.Shared/Info/RulesMessages.cs
@@ -23,3 +23,19 @@ public override void WriteToBuffer(NetOutgoingMessage buffer, IRobustSerializer
         buffer.Write(PopupTime);
     }
 }
+
+/// <summary>
+///     Sent by the client when it has accepted the rules.
+/// </summary>
+public sealed class RulesAcceptedMessage : NetMessage
+{
+    public override MsgGroups MsgGroup => MsgGroups.Command;
+
+    public override void ReadFromBuffer(NetIncomingMessage buffer, IRobustSerializer serializer)
+    {
+    }
+
+    public override void WriteToBuffer(NetOutgoingMessage buffer, IRobustSerializer serializer)
+    {
+    }
+}

From 061fb26b945d38b15da2384712a9c5ff56e88159 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 21 Dec 2024 17:05:20 -0400
Subject: [PATCH 236/366] this class is awful

---
 .../EffectConditions/JobCondition.cs           | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/Content.Server/EntityEffects/EffectConditions/JobCondition.cs b/Content.Server/EntityEffects/EffectConditions/JobCondition.cs
index 20d67d6de0c..c62cb60a22d 100644
--- a/Content.Server/EntityEffects/EffectConditions/JobCondition.cs
+++ b/Content.Server/EntityEffects/EffectConditions/JobCondition.cs
@@ -1,25 +1,19 @@
 using System.Linq;
 using Content.Shared.EntityEffects;
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
 using Content.Shared.Localizations;
 using Robust.Shared.Prototypes;
-using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Roles;
 using Content.Shared.Roles.Jobs;
-using Content.Shared.Station;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.IoC;
 
 namespace Content.Server.EntityEffects.EffectConditions;
 
 public sealed partial class JobCondition : EntityEffectCondition
 {
     [DataField(required: true)] public List<ProtoId<JobPrototype>> Job;
-                
+
     public override bool Condition(EntityEffectBaseArgs args)
-    {   
+    {
         args.EntityManager.TryGetComponent<MindContainerComponent>(args.TargetEntity, out var mindContainer);
         if (mindContainer != null && mindContainer.Mind != null)
         {
@@ -27,18 +21,14 @@ public override bool Condition(EntityEffectBaseArgs args)
             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;
-                    }
-                }
             }
         }
-            
+
         return false;
     }
-        
+
     public override string GuidebookExplanation(IPrototypeManager prototype)
     {
         var localizedNames = Job.Select(jobId => prototype.Index(jobId).LocalizedName).ToList();

From 948728f569db37f242c36c7254aa5d85aa73f805 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Mon, 14 Oct 2024 05:30:31 +0200
Subject: [PATCH 237/366] Fix role ban loading bugs (#32725)

This code was a mess. Now it's less of a mess and user UserDbDataManager now.

Fixes the following bugs:

* If you connect to a server, restart your client, connect again in the same round, you role bans would not be visible in the client.
* If you role ban somebody who is not connected to the server, then they connect within the round, they will only have the recently-applied ban.

Likely fixes #24781, #27282
---
 .../JobRequirementsManager.cs                 |  5 +-
 .../Administration/Managers/BanManager.cs     | 87 +++++++------------
 .../Administration/Managers/IBanManager.cs    |  6 --
 .../GameTicking/GameTicker.RoundFlow.cs       |  9 +-
 4 files changed, 32 insertions(+), 75 deletions(-)

diff --git a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
index 286358b85e4..9929267aee8 100644
--- a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
+++ b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
@@ -47,6 +47,8 @@ private void ClientOnRunLevelChanged(object? sender, RunLevelChangedEventArgs e)
         {
             // Reset on disconnect, just in case.
             _roles.Clear();
+            _jobWhitelists.Clear();
+            _roleBans.Clear();
         }
     }
 
@@ -54,9 +56,6 @@ private void RxRoleBans(MsgRoleBans message)
     {
         _sawmill.Debug($"Received roleban info containing {message.Bans.Count} entries.");
 
-        if (_roleBans.Equals(message.Bans))
-            return;
-
         _roleBans.Clear();
         _roleBans.AddRange(message.Bans);
         Updated?.Invoke();
diff --git a/Content.Server/Administration/Managers/BanManager.cs b/Content.Server/Administration/Managers/BanManager.cs
index 7cc4b3579e6..d36bcd29d03 100644
--- a/Content.Server/Administration/Managers/BanManager.cs
+++ b/Content.Server/Administration/Managers/BanManager.cs
@@ -14,13 +14,13 @@
 using Content.Shared.Roles;
 using Robust.Server.Player;
 using Robust.Shared.Asynchronous;
+using Robust.Shared.Collections;
 using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
-using Robust.Shared.Utility;
 
 namespace Content.Server.Administration.Managers;
 
@@ -45,14 +45,12 @@ public sealed partial class BanManager : IBanManager, IPostInjectInit
     public const string SawmillId = "admin.bans";
     public const string JobPrefix = "Job:";
 
-    private readonly Dictionary<NetUserId, HashSet<ServerRoleBanDef>> _cachedRoleBans = new();
+    private readonly Dictionary<ICommonSession, List<ServerRoleBanDef>> _cachedRoleBans = new();
     // Cached ban exemption flags are used to handle
     private readonly Dictionary<ICommonSession, ServerBanExemptFlags> _cachedBanExemptions = new();
 
     public void Initialize()
     {
-        _playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
-
         _netManager.RegisterNetMessage<MsgRoleBans>();
 
         _db.SubscribeToNotifications(OnDatabaseNotification);
@@ -63,9 +61,6 @@ public void Initialize()
 
     private async Task CachePlayerData(ICommonSession player, CancellationToken cancel)
     {
-        // Yeah so role ban loading code isn't integrated with exempt flag loading code.
-        // Have you seen how garbage role ban code code is? I don't feel like refactoring it right now.
-
         var flags = await _db.GetBanExemption(player.UserId, cancel);
 
         var netChannel = player.Channel;
@@ -75,12 +70,12 @@ private async Task CachePlayerData(ICommonSession player, CancellationToken canc
 
         var userRoleBans = new List<ServerRoleBanDef>();
         foreach (var ban in roleBans)
-        {
             userRoleBans.Add(ban);
-        }
-
         cancel.ThrowIfCancellationRequested();
         _cachedBanExemptions[player] = flags;
+        _cachedRoleBans[player] = userRoleBans;
+
+        SendRoleBans(player);
     }
 
     private void ClearPlayerData(ICommonSession player)
@@ -88,25 +83,15 @@ private void ClearPlayerData(ICommonSession player)
         _cachedBanExemptions.Remove(player);
     }
 
-    private async void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs e)
-    {
-        if (e.NewStatus != SessionStatus.Connected || _cachedRoleBans.ContainsKey(e.Session.UserId))
-            return;
-
-        var netChannel = e.Session.Channel;
-        ImmutableArray<byte>? hwId = netChannel.UserData.HWId.Length == 0 ? null : netChannel.UserData.HWId;
-        await CacheDbRoleBans(e.Session.UserId, netChannel.RemoteEndPoint.Address, hwId);
-
-        SendRoleBans(e.Session);
-    }
-
     private async Task<bool> AddRoleBan(ServerRoleBanDef banDef)
     {
         banDef = await _db.AddServerRoleBanAsync(banDef);
 
-        if (banDef.UserId != null)
+        if (banDef.UserId != null
+            && _playerManager.TryGetSessionById(banDef.UserId, out var player)
+            && _cachedRoleBans.TryGetValue(player, out var cachedBans))
         {
-            _cachedRoleBans.GetOrNew(banDef.UserId.Value).Add(banDef);
+            cachedBans.Add(banDef);
         }
 
         return true;
@@ -114,31 +99,21 @@ private async Task<bool> AddRoleBan(ServerRoleBanDef banDef)
 
     public HashSet<string>? GetRoleBans(NetUserId playerUserId)
     {
-        return _cachedRoleBans.TryGetValue(playerUserId, out var roleBans)
+        if (!_playerManager.TryGetSessionById(playerUserId, out var session))
+            return null;
+
+        return _cachedRoleBans.TryGetValue(session, out var roleBans)
             ? roleBans.Select(banDef => banDef.Role).ToHashSet()
             : null;
     }
 
-    private async Task CacheDbRoleBans(NetUserId userId, IPAddress? address = null, ImmutableArray<byte>? hwId = null)
-    {
-        var roleBans = await _db.GetServerRoleBansAsync(address, userId, hwId, false);
-
-        var userRoleBans = new HashSet<ServerRoleBanDef>();
-        foreach (var ban in roleBans)
-        {
-            userRoleBans.Add(ban);
-        }
-
-        _cachedRoleBans[userId] = userRoleBans;
-    }
-
     public void Restart()
     {
         // Clear out players that have disconnected.
-        var toRemove = new List<NetUserId>();
+        var toRemove = new ValueList<ICommonSession>();
         foreach (var player in _cachedRoleBans.Keys)
         {
-            if (!_playerManager.TryGetSessionById(player, out _))
+            if (player.Status == SessionStatus.Disconnected)
                 toRemove.Add(player);
         }
 
@@ -150,7 +125,7 @@ public void Restart()
         // Check for expired bans
         foreach (var roleBans in _cachedRoleBans.Values)
         {
-            roleBans.RemoveWhere(ban => DateTimeOffset.Now > ban.ExpirationTime);
+            roleBans.RemoveAll(ban => DateTimeOffset.Now > ban.ExpirationTime);
         }
     }
 
@@ -292,9 +267,9 @@ public async void CreateRoleBan(NetUserId? target, string? targetUsername, NetUs
         var length = expires == null ? Loc.GetString("cmd-roleban-inf") : Loc.GetString("cmd-roleban-until", ("expires", expires));
         _chat.SendAdminAlert(Loc.GetString("cmd-roleban-success", ("target", targetUsername ?? "null"), ("role", role), ("reason", reason), ("length", length)));
 
-        if (target != null)
+        if (target != null && _playerManager.TryGetSessionById(target.Value, out var session))
         {
-            SendRoleBans(target.Value);
+            SendRoleBans(session);
         }
     }
 
@@ -322,10 +297,12 @@ public async Task<string> PardonRoleBan(int banId, NetUserId? unbanningAdmin, Da
 
         await _db.AddServerRoleUnbanAsync(new ServerRoleUnbanDef(banId, unbanningAdmin, DateTimeOffset.Now));
 
-        if (ban.UserId is { } player && _cachedRoleBans.TryGetValue(player, out var roleBans))
+        if (ban.UserId is { } player
+            && _playerManager.TryGetSessionById(player, out var session)
+            && _cachedRoleBans.TryGetValue(session, out var roleBans))
         {
-            roleBans.RemoveWhere(roleBan => roleBan.Id == ban.Id);
-            SendRoleBans(player);
+            roleBans.RemoveAll(roleBan => roleBan.Id == ban.Id);
+            SendRoleBans(session);
         }
 
         return $"Pardoned ban with id {banId}";
@@ -333,8 +310,12 @@ public async Task<string> PardonRoleBan(int banId, NetUserId? unbanningAdmin, Da
 
     public HashSet<ProtoId<JobPrototype>>? GetJobBans(NetUserId playerUserId)
     {
-        if (!_cachedRoleBans.TryGetValue(playerUserId, out var roleBans))
+        if (!_playerManager.TryGetSessionById(playerUserId, out var session))
+            return null;
+
+        if (!_cachedRoleBans.TryGetValue(session, out var roleBans))
             return null;
+
         return roleBans
             .Where(ban => ban.Role.StartsWith(JobPrefix, StringComparison.Ordinal))
             .Select(ban => new ProtoId<JobPrototype>(ban.Role[JobPrefix.Length..]))
@@ -342,19 +323,9 @@ public async Task<string> PardonRoleBan(int banId, NetUserId? unbanningAdmin, Da
     }
     #endregion
 
-    public void SendRoleBans(NetUserId userId)
-    {
-        if (!_playerManager.TryGetSessionById(userId, out var player))
-        {
-            return;
-        }
-
-        SendRoleBans(player);
-    }
-
     public void SendRoleBans(ICommonSession pSession)
     {
-        var roleBans = _cachedRoleBans.GetValueOrDefault(pSession.UserId) ?? new HashSet<ServerRoleBanDef>();
+        var roleBans = _cachedRoleBans.GetValueOrDefault(pSession) ?? new List<ServerRoleBanDef>();
         var bans = new MsgRoleBans()
         {
             Bans = roleBans.Select(o => o.Role).ToList()
diff --git a/Content.Server/Administration/Managers/IBanManager.cs b/Content.Server/Administration/Managers/IBanManager.cs
index 6653bd9c9f4..fc192cc3066 100644
--- a/Content.Server/Administration/Managers/IBanManager.cs
+++ b/Content.Server/Administration/Managers/IBanManager.cs
@@ -47,12 +47,6 @@ public interface IBanManager
     /// <param name="unbanTime">The time at which this role ban was pardoned.</param>
     public Task<string> PardonRoleBan(int banId, NetUserId? unbanningAdmin, DateTimeOffset unbanTime);
 
-    /// <summary>
-    /// Sends role bans to the target
-    /// </summary>
-    /// <param name="pSession">Player's user ID</param>
-    public void SendRoleBans(NetUserId userId);
-
     /// <summary>
     /// Sends role bans to the target
     /// </summary>
diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index 889a8a5a2b6..eecbe3e6e38 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -186,9 +186,6 @@ public int ReadyPlayerCount()
                 if (!_playerManager.TryGetSessionById(userId, out _))
                     continue;
 
-                if (_banManager.GetRoleBans(userId) == null)
-                    continue;
-
                 total++;
             }
 
@@ -232,11 +229,7 @@ public void StartRound(bool force = false)
 #if DEBUG
                 DebugTools.Assert(_userDb.IsLoadComplete(session), $"Player was readied up but didn't have user DB data loaded yet??");
 #endif
-                if (_banManager.GetRoleBans(userId) == null)
-                {
-                    Logger.ErrorS("RoleBans", $"Role bans for player {session} {userId} have not been loaded yet.");
-                    continue;
-                }
+
                 readyPlayers.Add(session);
                 HumanoidCharacterProfile profile;
                 if (_prefsManager.TryGetCachedPreferences(userId, out var preferences))

From fff3cb0a297cdd1d716b680584b640c2e77b1a43 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Sat, 21 Dec 2024 17:45:48 +1100
Subject: [PATCH 238/366] Toolshed refactor (#33598)

* Content changes for engine toolshed PR

* add contains command

* more permissive commands
---
 .../Tests/Toolshed/AdminTest.cs               |  20 ++-
 .../Tests/Toolshed/LocTest.cs                 |  23 ++-
 .../Tests/Toolshed/ToolshedTest.cs            |  27 +++-
 Content.Server/Access/AddAccessLogCommand.cs  |  17 +--
 .../Administration/Toolshed/MarkedCommand.cs  |   2 +-
 .../Toolshed/RejuvenateCommand.cs             |   2 +-
 .../Toolshed/SolutionCommand.cs               |  34 ++---
 .../Administration/Toolshed/TagCommand.cs     |  64 +++------
 .../V2/Commands/DeleteChatMessageCommand.cs   |   2 +-
 .../V2/Commands/NukeChatMessagesCommand.cs    |   2 +-
 Content.Server/Mind/Toolshed/MindCommand.cs   |  11 +-
 .../Polymorph/Toolshed/PolymorphCommand.cs    |   4 +-
 .../Station/Commands/JobsCommand.cs           |  50 ++-----
 .../Station/Commands/StationCommand.cs        |  33 ++---
 .../BasicStationEventSchedulerSystem.cs       |   6 +-
 .../Commands/AdminDebug/ACmdCommand.cs        |   8 +-
 .../Commands/Verbs/RunVerbAsCommand.cs        |  19 ++-
 .../Toolshed/Commands/VisualizeCommand.cs     |   2 +-
 Resources/toolshedEngineCommandPerms.yml      | 131 +++++++++---------
 19 files changed, 203 insertions(+), 254 deletions(-)

diff --git a/Content.IntegrationTests/Tests/Toolshed/AdminTest.cs b/Content.IntegrationTests/Tests/Toolshed/AdminTest.cs
index 040b09beecc..ecb11fc1ba4 100644
--- a/Content.IntegrationTests/Tests/Toolshed/AdminTest.cs
+++ b/Content.IntegrationTests/Tests/Toolshed/AdminTest.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
-using System.Linq;
+using System.Reflection;
+using Content.Server.Administration.Managers;
 using Robust.Shared.Toolshed;
 
 namespace Content.IntegrationTests.Tests.Toolshed;
@@ -10,10 +11,23 @@ public sealed class AdminTest : ToolshedTest
     [Test]
     public async Task AllCommandsHavePermissions()
     {
+        var toolMan = Server.ResolveDependency<ToolshedManager>();
+        var admin = Server.ResolveDependency<IAdminManager>();
+        var ignored = new HashSet<Assembly>()
+            {typeof(LocTest).Assembly, typeof(Robust.UnitTesting.Shared.Toolshed.LocTest).Assembly};
+
         await Server.WaitAssertion(() =>
         {
-            Assert.That(InvokeCommand("cmd:list where { acmd:perms isnull }", out var res));
-            Assert.That((IEnumerable<CommandSpec>) res, Is.Empty, "All commands must have admin permissions set up.");
+            Assert.Multiple(() =>
+            {
+                foreach (var cmd in toolMan.DefaultEnvironment.AllCommands())
+                {
+                    if (ignored.Contains(cmd.Cmd.GetType().Assembly))
+                        continue;
+
+                    Assert.That(admin.TryGetCommandFlags(cmd, out _), $"Command does not have admin permissions set up: {cmd.FullName()}");
+                }
+            });
         });
     }
 }
diff --git a/Content.IntegrationTests/Tests/Toolshed/LocTest.cs b/Content.IntegrationTests/Tests/Toolshed/LocTest.cs
index 2b5553ad7dd..fb210eba505 100644
--- a/Content.IntegrationTests/Tests/Toolshed/LocTest.cs
+++ b/Content.IntegrationTests/Tests/Toolshed/LocTest.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Globalization;
-using Robust.Shared.IoC;
+using System.Reflection;
 using Robust.Shared.Localization;
 using Robust.Shared.Toolshed;
 
@@ -14,10 +14,27 @@ public sealed class LocTest : ToolshedTest
     [Test]
     public async Task AllCommandsHaveDescriptions()
     {
+        var locMan = Server.ResolveDependency<ILocalizationManager>();
+        var toolMan = Server.ResolveDependency<ToolshedManager>();
+        var locStrings = new HashSet<string>();
+
+        var ignored = new HashSet<Assembly>()
+            {typeof(LocTest).Assembly, typeof(Robust.UnitTesting.Shared.Toolshed.LocTest).Assembly};
+
         await Server.WaitAssertion(() =>
         {
-            Assert.That(InvokeCommand("cmd:list where { cmd:descloc loc:tryloc isnull }", out var res));
-            Assert.That((IEnumerable<CommandSpec>)res!, Is.Empty, "All commands must have localized descriptions.");
+            Assert.Multiple(() =>
+            {
+                foreach (var cmd in toolMan.DefaultEnvironment.AllCommands())
+                {
+                    if (ignored.Contains(cmd.Cmd.GetType().Assembly))
+                        continue;
+
+                    var descLoc = cmd.DescLocStr();
+                    Assert.That(locStrings.Add(descLoc), $"Duplicate command description key: {descLoc}");
+                    Assert.That(locMan.TryGetString(descLoc, out _), $"Failed to get command description for command {cmd.FullName()}");
+                }
+            });
         });
     }
 }
diff --git a/Content.IntegrationTests/Tests/Toolshed/ToolshedTest.cs b/Content.IntegrationTests/Tests/Toolshed/ToolshedTest.cs
index 7de81fb3dc2..6fc27e168cf 100644
--- a/Content.IntegrationTests/Tests/Toolshed/ToolshedTest.cs
+++ b/Content.IntegrationTests/Tests/Toolshed/ToolshedTest.cs
@@ -74,15 +74,15 @@ protected T InvokeCommand<T>(string command)
         return (T) res!;
     }
 
-    protected void ParseCommand(string command, Type? inputType = null, Type? expectedType = null, bool once = false)
+    protected void ParseCommand(string command, Type? inputType = null, Type? expectedType = null)
     {
         var parser = new ParserContext(command, Toolshed);
-        var success = CommandRun.TryParse(false, parser, inputType, expectedType, once, out _, out _, out var error);
+        var success = CommandRun.TryParse(parser, inputType, expectedType, out _);
 
-        if (error is not null)
-            ReportError(error);
+        if (parser.Error is not null)
+            ReportError(parser.Error);
 
-        if (error is null)
+        if (parser.Error is null)
             Assert.That(success, $"Parse failed despite no error being reported. Parsed {command}");
     }
 
@@ -153,11 +153,28 @@ public IEnumerable<IConError> GetErrors()
         return _errors;
     }
 
+    public bool HasErrors => _errors.Count > 0;
+
     public void ClearErrors()
     {
         _errors.Clear();
     }
 
+    public object? ReadVar(string name)
+    {
+        return Variables.GetValueOrDefault(name);
+    }
+
+    public void WriteVar(string name, object? value)
+    {
+        Variables[name] = value;
+    }
+
+    public IEnumerable<string> GetVars()
+    {
+        return Variables.Keys;
+    }
+
     public Dictionary<string, object?> Variables { get; } = new();
 
     protected void ExpectError(Type err)
diff --git a/Content.Server/Access/AddAccessLogCommand.cs b/Content.Server/Access/AddAccessLogCommand.cs
index 8b3aebb16b4..f55a9b8f1eb 100644
--- a/Content.Server/Access/AddAccessLogCommand.cs
+++ b/Content.Server/Access/AddAccessLogCommand.cs
@@ -10,11 +10,7 @@ namespace Content.Server.Access;
 public sealed class AddAccessLogCommand : ToolshedCommand
 {
     [CommandImplementation]
-    public void AddAccessLog(
-        [CommandInvocationContext] IInvocationContext ctx,
-        [CommandArgument] EntityUid input,
-        [CommandArgument] float seconds,
-        [CommandArgument] ValueRef<string> accessor)
+    public void AddAccessLog(IInvocationContext ctx, EntityUid input, float seconds, string accessor)
     {
         var accessReader = EnsureComp<AccessReaderComponent>(input);
 
@@ -23,19 +19,14 @@ public void AddAccessLog(
             ctx.WriteLine($"WARNING: Surpassing the limit of the log by {accessLogCount - accessReader.AccessLogLimit+1} entries!");
 
         var accessTime = TimeSpan.FromSeconds(seconds);
-        var accessName = accessor.Evaluate(ctx)!;
-        accessReader.AccessLog.Enqueue(new AccessRecord(accessTime, accessName));
+        accessReader.AccessLog.Enqueue(new AccessRecord(accessTime, accessor));
         ctx.WriteLine($"Successfully added access log to {input} with this information inside:\n " +
                       $"Time of access: {accessTime}\n " +
-                      $"Accessed by: {accessName}");
+                      $"Accessed by: {accessor}");
     }
 
     [CommandImplementation]
-    public void AddAccessLogPiped(
-        [CommandInvocationContext] IInvocationContext ctx,
-        [PipedArgument] EntityUid input,
-        [CommandArgument] float seconds,
-        [CommandArgument] ValueRef<string> accessor)
+    public void AddAccessLogPiped(IInvocationContext ctx, [PipedArgument] EntityUid input, float seconds, string accessor)
     {
         AddAccessLog(ctx, input, seconds, accessor);
     }
diff --git a/Content.Server/Administration/Toolshed/MarkedCommand.cs b/Content.Server/Administration/Toolshed/MarkedCommand.cs
index b9e39cb82da..54d45a352de 100644
--- a/Content.Server/Administration/Toolshed/MarkedCommand.cs
+++ b/Content.Server/Administration/Toolshed/MarkedCommand.cs
@@ -7,7 +7,7 @@ namespace Content.Server.Administration.Toolshed;
 public sealed class MarkedCommand : ToolshedCommand
 {
     [CommandImplementation]
-    public IEnumerable<EntityUid> Marked([CommandInvocationContext] IInvocationContext ctx)
+    public IEnumerable<EntityUid> Marked(IInvocationContext ctx)
     {
         var res = (IEnumerable<EntityUid>?)ctx.ReadVar("marked");
         res ??= Array.Empty<EntityUid>();
diff --git a/Content.Server/Administration/Toolshed/RejuvenateCommand.cs b/Content.Server/Administration/Toolshed/RejuvenateCommand.cs
index 61b0d6213aa..3925badc589 100644
--- a/Content.Server/Administration/Toolshed/RejuvenateCommand.cs
+++ b/Content.Server/Administration/Toolshed/RejuvenateCommand.cs
@@ -23,7 +23,7 @@ public IEnumerable<EntityUid> Rejuvenate([PipedArgument] IEnumerable<EntityUid>
     }
 
     [CommandImplementation]
-    public void Rejuvenate([CommandInvocationContext] IInvocationContext ctx)
+    public void Rejuvenate(IInvocationContext ctx)
     {
         _rejuvenate ??= GetSys<RejuvenateSystem>();
         if (ExecutingEntity(ctx) is not { } ent)
diff --git a/Content.Server/Administration/Toolshed/SolutionCommand.cs b/Content.Server/Administration/Toolshed/SolutionCommand.cs
index e81e9aa3235..9ffadaa4ef1 100644
--- a/Content.Server/Administration/Toolshed/SolutionCommand.cs
+++ b/Content.Server/Administration/Toolshed/SolutionCommand.cs
@@ -7,6 +7,7 @@
 using Robust.Shared.Toolshed.Syntax;
 using Robust.Shared.Toolshed.TypeParsers;
 using System.Linq;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Administration.Toolshed;
 
@@ -16,48 +17,38 @@ public sealed class SolutionCommand : ToolshedCommand
     private SolutionContainerSystem? _solutionContainer;
 
     [CommandImplementation("get")]
-    public SolutionRef? Get(
-            [CommandInvocationContext] IInvocationContext ctx,
-            [PipedArgument] EntityUid input,
-            [CommandArgument] ValueRef<string> name
-        )
+    public SolutionRef? Get([PipedArgument] EntityUid input, string name)
     {
         _solutionContainer ??= GetSys<SolutionContainerSystem>();
 
-        if (_solutionContainer.TryGetSolution(input, name.Evaluate(ctx)!, out var solution))
+        if (_solutionContainer.TryGetSolution(input, name, out var solution))
             return new SolutionRef(solution.Value);
 
         return null;
     }
 
     [CommandImplementation("get")]
-    public IEnumerable<SolutionRef> Get(
-        [CommandInvocationContext] IInvocationContext ctx,
-        [PipedArgument] IEnumerable<EntityUid> input,
-        [CommandArgument] ValueRef<string> name
-    )
+    public IEnumerable<SolutionRef> Get([PipedArgument] IEnumerable<EntityUid> input, string name)
     {
-        return input.Select(x => Get(ctx, x, name)).Where(x => x is not null).Cast<SolutionRef>();
+        return input.Select(x => Get(x, name)).Where(x => x is not null).Cast<SolutionRef>();
     }
 
     [CommandImplementation("adjreagent")]
     public SolutionRef AdjReagent(
-            [CommandInvocationContext] IInvocationContext ctx,
             [PipedArgument] SolutionRef input,
-            [CommandArgument] Prototype<ReagentPrototype> name,
-            [CommandArgument] ValueRef<FixedPoint2> amountRef
+            ProtoId<ReagentPrototype> proto,
+            FixedPoint2 amount
         )
     {
         _solutionContainer ??= GetSys<SolutionContainerSystem>();
 
-        var amount = amountRef.Evaluate(ctx);
         if (amount > 0)
         {
-            _solutionContainer.TryAddReagent(input.Solution, name.Value.ID, amount, out _);
+            _solutionContainer.TryAddReagent(input.Solution, proto, amount, out _);
         }
         else if (amount < 0)
         {
-            _solutionContainer.RemoveReagent(input.Solution, name.Value.ID, -amount);
+            _solutionContainer.RemoveReagent(input.Solution, proto, -amount);
         }
 
         return input;
@@ -65,12 +56,11 @@ [CommandArgument] ValueRef<FixedPoint2> amountRef
 
     [CommandImplementation("adjreagent")]
     public IEnumerable<SolutionRef> AdjReagent(
-            [CommandInvocationContext] IInvocationContext ctx,
             [PipedArgument] IEnumerable<SolutionRef> input,
-            [CommandArgument] Prototype<ReagentPrototype> name,
-            [CommandArgument] ValueRef<FixedPoint2> amountRef
+            ProtoId<ReagentPrototype> name,
+            FixedPoint2 amount
         )
-        => input.Select(x => AdjReagent(ctx, x, name, amountRef));
+        => input.Select(x => AdjReagent(x, name, amount));
 }
 
 public readonly record struct SolutionRef(Entity<SolutionComponent> Solution)
diff --git a/Content.Server/Administration/Toolshed/TagCommand.cs b/Content.Server/Administration/Toolshed/TagCommand.cs
index 1af27797660..18cbb7f8fa8 100644
--- a/Content.Server/Administration/Toolshed/TagCommand.cs
+++ b/Content.Server/Administration/Toolshed/TagCommand.cs
@@ -25,82 +25,50 @@ public IEnumerable<string> List([PipedArgument] IEnumerable<EntityUid> ent)
     }
 
     [CommandImplementation("add")]
-    public EntityUid Add(
-            [CommandInvocationContext] IInvocationContext ctx,
-            [PipedArgument] EntityUid input,
-            [CommandArgument] ValueRef<string, Prototype<TagPrototype>> @ref
-        )
+    public EntityUid Add([PipedArgument] EntityUid input, ProtoId<TagPrototype> tag)
     {
         _tag ??= GetSys<TagSystem>();
-        _tag.AddTag(input, @ref.Evaluate(ctx)!);
+        _tag.AddTag(input, tag);
         return input;
     }
 
     [CommandImplementation("add")]
-    public IEnumerable<EntityUid> Add(
-            [CommandInvocationContext] IInvocationContext ctx,
-            [PipedArgument] IEnumerable<EntityUid> input,
-            [CommandArgument] ValueRef<string, Prototype<TagPrototype>> @ref
-        )
-        => input.Select(x => Add(ctx, x, @ref));
+    public IEnumerable<EntityUid> Add([PipedArgument] IEnumerable<EntityUid> input, ProtoId<TagPrototype> tag)
+        => input.Select(x => Add(x, tag));
 
     [CommandImplementation("rm")]
-    public EntityUid Rm(
-        [CommandInvocationContext] IInvocationContext ctx,
-        [PipedArgument] EntityUid input,
-        [CommandArgument] ValueRef<string, Prototype<TagPrototype>> @ref
-    )
+    public EntityUid Rm([PipedArgument] EntityUid input, ProtoId<TagPrototype> tag)
     {
         _tag ??= GetSys<TagSystem>();
-        _tag.RemoveTag(input, @ref.Evaluate(ctx)!);
+        _tag.RemoveTag(input, tag);
         return input;
     }
 
     [CommandImplementation("rm")]
-    public IEnumerable<EntityUid> Rm(
-            [CommandInvocationContext] IInvocationContext ctx,
-            [PipedArgument] IEnumerable<EntityUid> input,
-            [CommandArgument] ValueRef<string, Prototype<TagPrototype>> @ref
-        )
-        => input.Select(x => Rm(ctx, x, @ref));
+    public IEnumerable<EntityUid> Rm([PipedArgument] IEnumerable<EntityUid> input, ProtoId<TagPrototype> tag)
+        => input.Select(x => Rm(x, tag));
 
     [CommandImplementation("addmany")]
-    public EntityUid AddMany(
-        [CommandInvocationContext] IInvocationContext ctx,
-        [PipedArgument] EntityUid input,
-        [CommandArgument] ValueRef<IEnumerable<string>, IEnumerable<string>> @ref
-    )
+    public EntityUid AddMany([PipedArgument] EntityUid input, IEnumerable<ProtoId<TagPrototype>> tags)
     {
         _tag ??= GetSys<TagSystem>();
-        _tag.AddTags(input, @ref.Evaluate(ctx)!);
+        _tag.AddTags(input, tags);
         return input;
     }
 
     [CommandImplementation("addmany")]
-    public IEnumerable<EntityUid> AddMany(
-            [CommandInvocationContext] IInvocationContext ctx,
-            [PipedArgument] IEnumerable<EntityUid> input,
-            [CommandArgument] ValueRef<IEnumerable<string>, IEnumerable<string>> @ref
-        )
-        => input.Select(x => AddMany(ctx, x, @ref));
+    public IEnumerable<EntityUid> AddMany([PipedArgument] IEnumerable<EntityUid> input, IEnumerable<ProtoId<TagPrototype>> tags)
+        => input.Select(x => AddMany(x, tags.ToArray()));
 
     [CommandImplementation("rmmany")]
-    public EntityUid RmMany(
-        [CommandInvocationContext] IInvocationContext ctx,
-        [PipedArgument] EntityUid input,
-        [CommandArgument] ValueRef<IEnumerable<string>, IEnumerable<string>> @ref
-    )
+    public EntityUid RmMany([PipedArgument] EntityUid input, IEnumerable<ProtoId<TagPrototype>> tags)
     {
         _tag ??= GetSys<TagSystem>();
-        _tag.RemoveTags(input, @ref.Evaluate(ctx)!);
+        _tag.RemoveTags(input, tags);
         return input;
     }
 
     [CommandImplementation("rmmany")]
-    public IEnumerable<EntityUid> RmMany(
-            [CommandInvocationContext] IInvocationContext ctx,
-            [PipedArgument] IEnumerable<EntityUid> input,
-            [CommandArgument] ValueRef<IEnumerable<string>, IEnumerable<string>> @ref
-        )
-        => input.Select(x => RmMany(ctx, x, @ref));
+    public IEnumerable<EntityUid> RmMany([PipedArgument] IEnumerable<EntityUid> input, IEnumerable<ProtoId<TagPrototype>> tags)
+        => input.Select(x => RmMany(x, tags.ToArray()));
 }
diff --git a/Content.Server/Chat/V2/Commands/DeleteChatMessageCommand.cs b/Content.Server/Chat/V2/Commands/DeleteChatMessageCommand.cs
index 1f9203d299f..2aeb8998292 100644
--- a/Content.Server/Chat/V2/Commands/DeleteChatMessageCommand.cs
+++ b/Content.Server/Chat/V2/Commands/DeleteChatMessageCommand.cs
@@ -14,7 +14,7 @@ public sealed class DeleteChatMessageCommand : ToolshedCommand
     [Dependency] private readonly IEntitySystemManager _manager = default!;
 
     [CommandImplementation("id")]
-    public void DeleteChatMessage([CommandInvocationContext] IInvocationContext ctx, [CommandArgument] uint messageId)
+    public void DeleteChatMessage(IInvocationContext ctx, uint messageId)
     {
         if (!_manager.GetEntitySystem<ChatRepositorySystem>().Delete(messageId))
         {
diff --git a/Content.Server/Chat/V2/Commands/NukeChatMessagesCommand.cs b/Content.Server/Chat/V2/Commands/NukeChatMessagesCommand.cs
index 3d8b69dd765..07b4cd97968 100644
--- a/Content.Server/Chat/V2/Commands/NukeChatMessagesCommand.cs
+++ b/Content.Server/Chat/V2/Commands/NukeChatMessagesCommand.cs
@@ -14,7 +14,7 @@ public sealed class NukeChatMessagesCommand : ToolshedCommand
     [Dependency] private readonly IEntitySystemManager _manager = default!;
 
     [CommandImplementation("usernames")]
-    public void Command([CommandInvocationContext] IInvocationContext ctx, [CommandArgument] string usernamesCsv)
+    public void Command(IInvocationContext ctx, string usernamesCsv)
     {
         var usernames = usernamesCsv.Split(',');
 
diff --git a/Content.Server/Mind/Toolshed/MindCommand.cs b/Content.Server/Mind/Toolshed/MindCommand.cs
index 917e6fb7f1a..5f82029dc0b 100644
--- a/Content.Server/Mind/Toolshed/MindCommand.cs
+++ b/Content.Server/Mind/Toolshed/MindCommand.cs
@@ -29,19 +29,10 @@ public sealed class MindCommand : ToolshedCommand
     }
 
     [CommandImplementation("control")]
-    public EntityUid Control(
-            [CommandInvocationContext] IInvocationContext ctx,
-            [PipedArgument] EntityUid target,
-            [CommandArgument] ValueRef<ICommonSession> playerRef)
+    public EntityUid Control(IInvocationContext ctx, [PipedArgument] EntityUid target, ICommonSession player)
     {
         _mind ??= GetSys<SharedMindSystem>();
 
-        var player = playerRef.Evaluate(ctx);
-        if (player is null)
-        {
-            ctx.ReportError(new NotForServerConsoleError());
-            return target;
-        }
 
         if (!_mind.TryGetMind(player, out var mindId, out var mind))
         {
diff --git a/Content.Server/Polymorph/Toolshed/PolymorphCommand.cs b/Content.Server/Polymorph/Toolshed/PolymorphCommand.cs
index 5654c84722f..db1e1faad6b 100644
--- a/Content.Server/Polymorph/Toolshed/PolymorphCommand.cs
+++ b/Content.Server/Polymorph/Toolshed/PolymorphCommand.cs
@@ -20,7 +20,7 @@ public sealed class PolymorphCommand : ToolshedCommand
     [CommandImplementation]
     public EntityUid? Polymorph(
             [PipedArgument] EntityUid input,
-            [CommandArgument] ProtoId<PolymorphPrototype> protoId
+            ProtoId<PolymorphPrototype> protoId
         )
     {
         _system ??= GetSys<PolymorphSystem>();
@@ -34,7 +34,7 @@ [CommandArgument] ProtoId<PolymorphPrototype> protoId
     [CommandImplementation]
     public IEnumerable<EntityUid> Polymorph(
             [PipedArgument] IEnumerable<EntityUid> input,
-            [CommandArgument] ProtoId<PolymorphPrototype> protoId
+            ProtoId<PolymorphPrototype> protoId
         )
         => input.Select(x => Polymorph(x, protoId)).Where(x => x is not null).Select(x => (EntityUid)x!);
 }
diff --git a/Content.Server/Station/Commands/JobsCommand.cs b/Content.Server/Station/Commands/JobsCommand.cs
index 1d023c4a844..599a87aac6c 100644
--- a/Content.Server/Station/Commands/JobsCommand.cs
+++ b/Content.Server/Station/Commands/JobsCommand.cs
@@ -30,7 +30,7 @@ public IEnumerable<JobSlotRef> Jobs([PipedArgument] IEnumerable<EntityUid> stati
         => stations.SelectMany(Jobs);
 
     [CommandImplementation("job")]
-    public JobSlotRef Job([PipedArgument] EntityUid station, [CommandArgument] Prototype<JobPrototype> job)
+    public JobSlotRef Job([PipedArgument] EntityUid station, Prototype<JobPrototype> job)
     {
         _jobs ??= GetSys<StationJobsSystem>();
 
@@ -38,7 +38,7 @@ public JobSlotRef Job([PipedArgument] EntityUid station, [CommandArgument] Proto
     }
 
     [CommandImplementation("job")]
-    public IEnumerable<JobSlotRef> Job([PipedArgument] IEnumerable<EntityUid> stations, [CommandArgument] Prototype<JobPrototype> job)
+    public IEnumerable<JobSlotRef> Job([PipedArgument] IEnumerable<EntityUid> stations, Prototype<JobPrototype> job)
         => stations.Select(x => Job(x, job));
 
     [CommandImplementation("isinfinite")]
@@ -50,63 +50,41 @@ public IEnumerable<bool> IsInfinite([PipedArgument] IEnumerable<JobSlotRef> jobs
         => jobs.Select(x => IsInfinite(x, inverted));
 
     [CommandImplementation("adjust")]
-    public JobSlotRef Adjust(
-        [CommandInvocationContext] IInvocationContext ctx,
-        [PipedArgument] JobSlotRef @ref,
-        [CommandArgument] ValueRef<int> by
-        )
+    public JobSlotRef Adjust([PipedArgument] JobSlotRef @ref, int by)
     {
         _jobs ??= GetSys<StationJobsSystem>();
-        _jobs.TryAdjustJobSlot(@ref.Station, @ref.Job, by.Evaluate(ctx), true, true);
+        _jobs.TryAdjustJobSlot(@ref.Station, @ref.Job, by, true, true);
         return @ref;
     }
 
     [CommandImplementation("adjust")]
-    public IEnumerable<JobSlotRef> Adjust(
-        [CommandInvocationContext] IInvocationContext ctx,
-        [PipedArgument] IEnumerable<JobSlotRef> @ref,
-        [CommandArgument] ValueRef<int> by
-    )
-        => @ref.Select(x => Adjust(ctx, x, by));
+    public IEnumerable<JobSlotRef> Adjust([PipedArgument] IEnumerable<JobSlotRef> @ref, int by)
+        => @ref.Select(x => Adjust(x, by));
 
 
     [CommandImplementation("set")]
-    public JobSlotRef Set(
-        [CommandInvocationContext] IInvocationContext ctx,
-        [PipedArgument] JobSlotRef @ref,
-        [CommandArgument] ValueRef<int> by
-    )
+    public JobSlotRef Set([PipedArgument] JobSlotRef @ref, int by)
     {
         _jobs ??= GetSys<StationJobsSystem>();
-        _jobs.TrySetJobSlot(@ref.Station, @ref.Job, by.Evaluate(ctx), true);
+        _jobs.TrySetJobSlot(@ref.Station, @ref.Job, by, true);
         return @ref;
     }
 
     [CommandImplementation("set")]
-    public IEnumerable<JobSlotRef> Set(
-        [CommandInvocationContext] IInvocationContext ctx,
-        [PipedArgument] IEnumerable<JobSlotRef> @ref,
-        [CommandArgument] ValueRef<int> by
-    )
-        => @ref.Select(x => Set(ctx, x, by));
+    public IEnumerable<JobSlotRef> Set([PipedArgument] IEnumerable<JobSlotRef> @ref, int by)
+        => @ref.Select(x => Set(x, by));
 
     [CommandImplementation("amount")]
-    public int Amount(
-        [CommandInvocationContext] IInvocationContext ctx,
-        [PipedArgument] JobSlotRef @ref
-    )
+    public int Amount([PipedArgument] JobSlotRef @ref)
     {
         _jobs ??= GetSys<StationJobsSystem>();
         _jobs.TryGetJobSlot(@ref.Station, @ref.Job, out var slots);
-        return (int)(slots ?? 0);
+        return slots ?? 0;
     }
 
     [CommandImplementation("amount")]
-    public IEnumerable<int> Amount(
-        [CommandInvocationContext] IInvocationContext ctx,
-        [PipedArgument] IEnumerable<JobSlotRef> @ref
-    )
-        => @ref.Select(x => Amount(ctx, x));
+    public IEnumerable<int> Amount([PipedArgument] IEnumerable<JobSlotRef> @ref)
+        => @ref.Select(Amount);
 }
 
 // Used for Toolshed queries.
diff --git a/Content.Server/Station/Commands/StationCommand.cs b/Content.Server/Station/Commands/StationCommand.cs
index 96e47d63363..cfda730eca9 100644
--- a/Content.Server/Station/Commands/StationCommand.cs
+++ b/Content.Server/Station/Commands/StationCommand.cs
@@ -27,7 +27,7 @@ public IEnumerable<EntityUid> List()
     }
 
     [CommandImplementation("get")]
-    public EntityUid Get([CommandInvocationContext] IInvocationContext ctx)
+    public EntityUid Get(IInvocationContext ctx)
     {
         _station ??= GetSys<StationSystem>();
 
@@ -54,7 +54,6 @@ public EntityUid Get([CommandInvocationContext] IInvocationContext ctx)
     public EntityUid? LargestGrid([PipedArgument] EntityUid input)
     {
         _station ??= GetSys<StationSystem>();
-
         return _station.GetLargestGrid(Comp<StationDataComponent>(input));
     }
 
@@ -80,46 +79,30 @@ public IEnumerable<EntityUid> Grids([PipedArgument] IEnumerable<EntityUid> input
         => input.Select(Config);
 
     [CommandImplementation("addgrid")]
-    public void AddGrid(
-        [CommandInvocationContext] IInvocationContext ctx,
-        [PipedArgument] EntityUid input,
-        [CommandArgument] ValueRef<EntityUid> grid
-        )
+    public void AddGrid([PipedArgument] EntityUid input, EntityUid grid)
     {
         _station ??= GetSys<StationSystem>();
-
-        _station.AddGridToStation(input, grid.Evaluate(ctx));
+        _station.AddGridToStation(input, grid);
     }
 
     [CommandImplementation("rmgrid")]
-    public void RmGrid(
-        [CommandInvocationContext] IInvocationContext ctx,
-        [PipedArgument] EntityUid input,
-        [CommandArgument] ValueRef<EntityUid> grid
-    )
+    public void RmGrid([PipedArgument] EntityUid input, EntityUid grid)
     {
         _station ??= GetSys<StationSystem>();
-
-        _station.RemoveGridFromStation(input, grid.Evaluate(ctx));
+        _station.RemoveGridFromStation(input, grid);
     }
 
     [CommandImplementation("rename")]
-    public void Rename([CommandInvocationContext] IInvocationContext ctx,
-        [PipedArgument] EntityUid input,
-        [CommandArgument] ValueRef<string> name
-    )
+    public void Rename([PipedArgument] EntityUid input, string name)
     {
         _station ??= GetSys<StationSystem>();
-
-        _station.RenameStation(input, name.Evaluate(ctx)!);
+        _station.RenameStation(input, name);
     }
 
     [CommandImplementation("rerollBounties")]
-    public void RerollBounties([CommandInvocationContext] IInvocationContext ctx,
-        [PipedArgument] EntityUid input)
+    public void RerollBounties([PipedArgument] EntityUid input)
     {
         _cargo ??= GetSys<CargoSystem>();
-
         _cargo.RerollBountyDatabase(input);
     }
 }
diff --git a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
index f2704d53f4c..9cb2fd2f710 100644
--- a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
+++ b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
@@ -72,7 +72,7 @@ public sealed class StationEventCommand : ToolshedCommand
         private EventManagerSystem? _stationEvent;
 
         [CommandImplementation("lsprob")]
-        public IEnumerable<(string, float)> LsProb()
+        public IEnumerable<(string, float)> LsProb(EntityPrototype eventScheduler)
         {
             _stationEvent ??= GetSys<EventManagerSystem>();
             var events = _stationEvent.AllEvents();
@@ -86,7 +86,7 @@ public sealed class StationEventCommand : ToolshedCommand
         }
 
         [CommandImplementation("lsprobtime")]
-        public IEnumerable<(string, float)> LsProbTime([CommandArgument] float time)
+        public IEnumerable<(string, float)> LsProbTime(EntityPrototype eventScheduler, float time)
         {
             _stationEvent ??= GetSys<EventManagerSystem>();
             var events = _stationEvent.AllEvents().Where(pair => pair.Value.EarliestStart <= time).ToList();
@@ -100,7 +100,7 @@ public sealed class StationEventCommand : ToolshedCommand
         }
 
         [CommandImplementation("prob")]
-        public float Prob([CommandArgument] string eventId)
+        public float Prob(EntityPrototype eventScheduler, string eventId)
         {
             _stationEvent ??= GetSys<EventManagerSystem>();
             var events = _stationEvent.AllEvents();
diff --git a/Content.Server/Toolshed/Commands/AdminDebug/ACmdCommand.cs b/Content.Server/Toolshed/Commands/AdminDebug/ACmdCommand.cs
index f113e496555..ff110a9d9ed 100644
--- a/Content.Server/Toolshed/Commands/AdminDebug/ACmdCommand.cs
+++ b/Content.Server/Toolshed/Commands/AdminDebug/ACmdCommand.cs
@@ -22,13 +22,9 @@ public sealed class ACmdCommand : ToolshedCommand
     }
 
     [CommandImplementation("caninvoke")]
-    public bool CanInvoke(
-        [CommandInvocationContext] IInvocationContext ctx,
-        [PipedArgument] CommandSpec command,
-        [CommandArgument] ValueRef<ICommonSession> player
-        )
+    public bool CanInvoke(IInvocationContext ctx, [PipedArgument] CommandSpec command, ICommonSession player)
     {
         // Deliberately discard the error.
-        return ((IPermissionController) _adminManager).CheckInvokable(command, player.Evaluate(ctx), out var err);
+        return ((IPermissionController) _adminManager).CheckInvokable(command, player, out _);
     }
 }
diff --git a/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs b/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs
index 1b11dffeea7..e74bdf3b6b6 100644
--- a/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs
+++ b/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs
@@ -15,10 +15,10 @@ public sealed class RunVerbAsCommand : ToolshedCommand
 
     [CommandImplementation]
     public IEnumerable<NetEntity> RunVerbAs(
-            [CommandInvocationContext] IInvocationContext ctx,
+            IInvocationContext ctx,
             [PipedArgument] IEnumerable<NetEntity> input,
-            [CommandArgument] ValueRef<NetEntity> runner,
-            [CommandArgument] string verb
+            EntityUid runner,
+            string verb
         )
     {
         _verb ??= GetSys<SharedVerbSystem>();
@@ -26,17 +26,14 @@ [CommandArgument] string verb
 
         foreach (var i in input)
         {
-            var runnerNet = runner.Evaluate(ctx);
-            var runnerEid = EntityManager.GetEntity(runnerNet);
-
-            if (EntityManager.Deleted(runnerEid) && runnerEid.IsValid())
-                ctx.ReportError(new DeadEntity(runnerEid));
+            if (EntityManager.Deleted(runner) && runner.IsValid())
+                ctx.ReportError(new DeadEntity(runner));
 
             if (ctx.GetErrors().Any())
                 yield break;
 
             var eId = EntityManager.GetEntity(i);
-            var verbs = _verb.GetLocalVerbs(eId, runnerEid, Verb.VerbTypes, true);
+            var verbs = _verb.GetLocalVerbs(eId, runner, Verb.VerbTypes, true);
 
             // if the "verb name" is actually a verb-type, try run any verb of that type.
             var verbType = Verb.VerbTypes.FirstOrDefault(x => x.Name == verb);
@@ -45,7 +42,7 @@ [CommandArgument] string verb
                 var verbTy = verbs.FirstOrDefault(v => v.GetType() == verbType);
                 if (verbTy != null)
                 {
-                    _verb.ExecuteVerb(verbTy, runnerEid, eId, forced: true);
+                    _verb.ExecuteVerb(verbTy, runner, eId, forced: true);
                     yield return i;
                 }
             }
@@ -54,7 +51,7 @@ [CommandArgument] string verb
             {
                 if (verbTy.Text.ToLowerInvariant() == verb)
                 {
-                    _verb.ExecuteVerb(verbTy, runnerEid, eId, forced: true);
+                    _verb.ExecuteVerb(verbTy, runner, eId, forced: true);
                     yield return i;
                 }
             }
diff --git a/Content.Server/Toolshed/Commands/VisualizeCommand.cs b/Content.Server/Toolshed/Commands/VisualizeCommand.cs
index 74fd4cf844a..73bef536d18 100644
--- a/Content.Server/Toolshed/Commands/VisualizeCommand.cs
+++ b/Content.Server/Toolshed/Commands/VisualizeCommand.cs
@@ -16,7 +16,7 @@ public sealed class VisualizeCommand : ToolshedCommand
 
     [CommandImplementation]
     public void VisualizeEntities(
-            [CommandInvocationContext] IInvocationContext ctx,
+            IInvocationContext ctx,
             [PipedArgument] IEnumerable<EntityUid> input
         )
     {
diff --git a/Resources/toolshedEngineCommandPerms.yml b/Resources/toolshedEngineCommandPerms.yml
index 97de43e0b1f..4cea8a2b873 100644
--- a/Resources/toolshedEngineCommandPerms.yml
+++ b/Resources/toolshedEngineCommandPerms.yml
@@ -6,7 +6,6 @@
     - physics
     - player
     - splat
-    - emplace
     - bin
     - extremes
     - reduce
@@ -19,29 +18,29 @@
     - iota
     - rep
     - to
-    - iterate
 
 - Flags: DEBUG
   Commands:
     - comp
     - delete
-    - do
+    - with
+    - prototyped
     - named
     - paused
-    - with
-    - count
+    - emplace
+    - do
+    - iterate
     - select
     - where
-    - prototyped
+    - count
     - types
-    - ecscomp
     - actor
     - spawn
+    - replace
     - mappos
     - pos
     - tp
     - allcomps
-    - replace
     - entitysystemupdateorder
     - mind
 
@@ -53,80 +52,62 @@
 - Flags: ADMIN
   Commands:
     - fuck
-    - ent
-    - as
-    - buildinfo
-    - help
-    - explain
-    - cmd
-    - stopwatch
+    - '=>'
+    - '?'
+    - 'or?'
+    - '??'
+    - rng
     - self
+    - sum
+    - take
+    - join
     - search
+    - first
+    - unique
+    - any
+    - contains
     - isnull
-    - help
     - isempty
-    - any
-    - unique
     - cd
     - ls
-    - loc
-    - vars
-    - '=>'
-    - first
-    - val
+    - stopwatch
+    - append
+    - min
+    - max
+    - average
     - '+'
     - '-'
     - '*'
     - '/'
-    - 'min'
-    - 'max'
-    - '&'
-    - '|'
-    - '^'
-    - 'neg'
+    - '%'
+    - '%/'
+    - '&~'
+    - '|~'
+    - '^~'
+    - '~'
     - '<'
     - '>'
     - '<='
     - '>='
     - '=='
     - '!='
-    - f
-    - i
-    - s
-    - b
     - '+/'
     - '-/'
     - '*/'
     - '//'
-    - join
-    - append
-    - '?'
-    - 'or?'
-    - '??'
-    - rng
-    - 'sum'
-    - take
-    - curtick
-    - curtime
-    - realtime
-    - servertime
-    - more
-    - '%'
-    - '%/'
-    - '&~'
-    - '|~'
-    - '^~'
-    - '~'
-    - 'abs'
-    - 'average'
-    - 'bibytecount'
-    - 'shortestbitlength'
-    - 'countleadzeros'
-    - 'counttrailingzeros'
-    - 'fpi'
-    - 'fe'
-    - 'ftau'
-    - 'fepsilon'
+    - '&'
+    - '|'
+    - '^'
+    - neg
+    - abs
+    - bibytecount
+    - shortestbitlength
+    - countleadzeros
+    - counttrailingzeros
+    - fpi
+    - fe
+    - ftau
+    - fepsilon
     - dpi
     - de
     - dtau
@@ -182,3 +163,29 @@
     - atanpi
     - pick
     - tee
+
+- Flags: HOST
+  Commands:
+    - methods
+    - ioc
+
+- Commands:
+    - ent
+    - f
+    - i
+    - s
+    - b
+    - as
+    - var
+    - vars
+    - val
+    - help
+    - explain
+    - cmd
+    - buildinfo
+    - loc
+    - curtick
+    - curtime
+    - realtime
+    - servertime
+    - more

From 2d8ddc669c5706ba5ccb08fb146cd37f15afeb83 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 21 Dec 2024 17:17:06 -0400
Subject: [PATCH 239/366] Switch to use proper method

---
 Content.Server/Database/ServerDbManager.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Database/ServerDbManager.cs b/Content.Server/Database/ServerDbManager.cs
index 9f24c07e6a2..0ac5ef5e786 100644
--- a/Content.Server/Database/ServerDbManager.cs
+++ b/Content.Server/Database/ServerDbManager.cs
@@ -288,7 +288,15 @@ Task<int> AddConnectionLogAsync(
         Task DeleteAdminMessage(int id, Guid deletedBy, DateTimeOffset deletedAt);
         Task HideServerBanFromNotes(int id, Guid deletedBy, DateTimeOffset deletedAt);
         Task HideServerRoleBanFromNotes(int id, Guid deletedBy, DateTimeOffset deletedAt);
-        Task MarkMessageAsSeen(int id);
+
+        /// <summary>
+        /// Mark an admin message as being seen by the target player.
+        /// </summary>
+        /// <param name="id">The database ID of the admin message.</param>
+        /// <param name="dismissedToo">
+        /// If true, the message is "permanently dismissed" and will not be shown to the player again when they join.
+        /// </param>
+        Task MarkMessageAsSeen(int id, bool dismissedToo);
 
         #endregion
 

From a17c28a2a7984f41013dfc6b927ed9ba41452e8b Mon Sep 17 00:00:00 2001
From: Kara <lunarautomaton6@gmail.com>
Date: Mon, 6 May 2024 00:33:30 -0700
Subject: [PATCH 240/366] Round event frequency simulation command (#27718)

---
 .../BasicStationEventSchedulerSystem.cs       | 57 +++++++++++++++++++
 .../StationEvents/EventManagerSystem.cs       | 17 +++---
 2 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
index 9cb2fd2f710..01730ef5930 100644
--- a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
+++ b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using Content.Server.Administration;
 using Content.Server.GameTicking;
+using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules;
 using Content.Server.StationEvents.Components;
 using Content.Shared.Administration;
@@ -25,6 +26,9 @@ public sealed class BasicStationEventSchedulerSystem : GameRuleSystem<BasicStati
         [Dependency] private readonly EventManagerSystem _event = default!;
         [Dependency] private readonly IConfigurationManager _config = default!;
 
+        public const float MinEventTime = 60 * 3;
+        public const float MaxEventTime = 60 * 10;
+
         protected override void Ended(EntityUid uid, BasicStationEventSchedulerComponent component, GameRuleComponent gameRule,
             GameRuleEndedEvent args)
         {
@@ -70,6 +74,59 @@ private void ResetTimer(BasicStationEventSchedulerComponent component)
     public sealed class StationEventCommand : ToolshedCommand
     {
         private EventManagerSystem? _stationEvent;
+        private BasicStationEventSchedulerSystem? _basicScheduler;
+        private IRobustRandom? _random;
+
+        /// <summary>
+        ///     Estimates the expected number of times an event will run over the course of X rounds, taking into account weights and
+        ///     how many events are expected to run over a given timeframe for a given playercount by repeatedly simulating rounds.
+        ///     Effectively /100 (if you put 100 rounds) = probability an event will run per round.
+        /// </summary>
+        /// <remarks>
+        ///     This isn't perfect. Code path eventually goes into <see cref="EventManagerSystem.CanRun"/>, which requires
+        ///     state from <see cref="GameTicker"/>. As a result, you should probably just run this locally and not doing
+        ///     a real round (it won't pollute the state, but it will get contaminated by previously ran events in the actual round)
+        ///     and things like `MaxOccurrences` and `ReoccurrenceDelay` won't be respected.
+        ///
+        ///     I consider these to not be that relevant to the analysis here though (and I don't want most uses of them
+        ///     to even exist) so I think it's fine.
+        /// </remarks>
+        [CommandImplementation("simulate")]
+        public IEnumerable<(string, float)> Simulate([CommandArgument] int rounds, [CommandArgument] int playerCount, [CommandArgument] float roundEndMean, [CommandArgument] float roundEndStdDev)
+        {
+            _stationEvent ??= GetSys<EventManagerSystem>();
+            _basicScheduler ??= GetSys<BasicStationEventSchedulerSystem>();
+            _random ??= IoCManager.Resolve<IRobustRandom>();
+
+            var occurrences = new Dictionary<string, int>();
+
+            foreach (var ev in _stationEvent.AllEvents())
+            {
+                occurrences.Add(ev.Key.ID, 0);
+            }
+
+            for (var i = 0; i < rounds; i++)
+            {
+                var curTime = TimeSpan.Zero;
+                var randomEndTime = _random.NextGaussian(roundEndMean, roundEndStdDev) * 60; // *60 = minutes to seconds
+                if (randomEndTime <= 0)
+                    continue;
+
+                while (curTime.TotalSeconds < randomEndTime)
+                {
+                    // sim an event
+                    curTime += TimeSpan.FromSeconds(_random.NextFloat(BasicStationEventSchedulerSystem.MinEventTime, BasicStationEventSchedulerSystem.MaxEventTime));
+                    var available = _stationEvent.AvailableEvents(false, playerCount, curTime);
+                    var ev = _stationEvent.FindEvent(available);
+                    if (ev == null)
+                        continue;
+
+                    occurrences[ev] += 1;
+                }
+            }
+
+            return occurrences.Select(p => (p.Key, (float) p.Value)).OrderByDescending(p => p.Item2);
+        }
 
         [CommandImplementation("lsprob")]
         public IEnumerable<(string, float)> LsProb(EntityPrototype eventScheduler)
diff --git a/Content.Server/StationEvents/EventManagerSystem.cs b/Content.Server/StationEvents/EventManagerSystem.cs
index 9c0005d06db..eec4d792178 100644
--- a/Content.Server/StationEvents/EventManagerSystem.cs
+++ b/Content.Server/StationEvents/EventManagerSystem.cs
@@ -66,7 +66,7 @@ public string RunRandomEvent()
     /// Pick a random event from the available events at this time, also considering their weightings.
     /// </summary>
     /// <returns></returns>
-    private string? FindEvent(Dictionary<EntityPrototype, StationEventComponent> availableEvents)
+    public string? FindEvent(Dictionary<EntityPrototype, StationEventComponent> availableEvents)
     {
         if (availableEvents.Count == 0)
         {
@@ -100,16 +100,20 @@ public string RunRandomEvent()
     /// <summary>
     /// Gets the events that have met their player count, time-until start, etc.
     /// </summary>
-    /// <param name="ignoreEarliestStart"></param>
+    /// <param name="playerCountOverride">Override for player count, if using this to simulate events rather than in an actual round.</param>
+    /// <param name="currentTimeOverride">Override for round time, if using this to simulate events rather than in an actual round.</param>
     /// <returns></returns>
-    private Dictionary<EntityPrototype, StationEventComponent> AvailableEvents(bool ignoreEarliestStart = false)
+    public Dictionary<EntityPrototype, StationEventComponent> AvailableEvents(
+        bool ignoreEarliestStart = false,
+        int? playerCountOverride = null,
+        TimeSpan? currentTimeOverride = null)
     {
-        var playerCount = _playerManager.PlayerCount;
+        var playerCount = playerCountOverride ?? _playerManager.PlayerCount;
 
         // playerCount does a lock so we'll just keep the variable here
-        var currentTime = !ignoreEarliestStart
+        var currentTime = currentTimeOverride ?? (!ignoreEarliestStart
             ? GameTicker.RoundDuration()
-            : TimeSpan.Zero;
+            : TimeSpan.Zero);
 
         var result = new Dictionary<EntityPrototype, StationEventComponent>();
 
@@ -117,7 +121,6 @@ private Dictionary<EntityPrototype, StationEventComponent> AvailableEvents(bool
         {
             if (CanRun(proto, stationEvent, playerCount, currentTime))
             {
-                Log.Debug($"Adding event {proto.ID} to possibilities");
                 result.Add(proto, stationEvent);
             }
         }

From e061b5ea2148eacda6ca12dd5508a44e7755d2df Mon Sep 17 00:00:00 2001
From: no <165581243+pissdemon@users.noreply.github.com>
Date: Sun, 12 May 2024 16:35:30 +0200
Subject: [PATCH 241/366] Prevent admin-frozen players from ghosting or
 suiciding, add "Freeze And Mute" verb (#27813)

* prevent admin-frozen players from ghosting or suiciding

* Add "Freeze and Mute" admin verb

* Allow "Freeze And Mute" admin verb when player is already frozen but not muted

* Remove redundant scream handler (scream action just emotes, duh)

* AdminFrozenSystem: clean imports

* Update Content.Server/Chat/Commands/SuicideCommand.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Update Ghost.cs

* retrigger ci (empty commit)

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
---
 .../Systems/AdminFrozenSystem.cs              |  7 +++
 .../Systems/AdminFrozenSystem.cs              | 16 +++++
 .../Administration/Systems/AdminVerbSystem.cs | 63 ++++++++++++++-----
 .../Chat/Commands/SuicideCommand.cs           |  2 +
 Content.Server/Ghost/Ghost.cs                 | 21 +++++--
 .../Administration/AdminFrozenComponent.cs    |  9 ++-
 ...enSystem.cs => SharedAdminFrozenSystem.cs} | 20 +++++-
 .../en-US/administration/admin-verbs.ftl      |  1 +
 .../en-US/chat/commands/ghost-command.ftl     |  5 ++
 .../en-US/chat/commands/suicide-command.ftl   |  2 +
 10 files changed, 123 insertions(+), 23 deletions(-)
 create mode 100644 Content.Client/Administration/Systems/AdminFrozenSystem.cs
 create mode 100644 Content.Server/Administration/Systems/AdminFrozenSystem.cs
 rename Content.Shared/Administration/{AdminFrozenSystem.cs => SharedAdminFrozenSystem.cs} (78%)
 create mode 100644 Resources/Locale/en-US/chat/commands/ghost-command.ftl

diff --git a/Content.Client/Administration/Systems/AdminFrozenSystem.cs b/Content.Client/Administration/Systems/AdminFrozenSystem.cs
new file mode 100644
index 00000000000..885585f985c
--- /dev/null
+++ b/Content.Client/Administration/Systems/AdminFrozenSystem.cs
@@ -0,0 +1,7 @@
+using Content.Shared.Administration;
+
+namespace Content.Client.Administration.Systems;
+
+public sealed class AdminFrozenSystem : SharedAdminFrozenSystem
+{
+}
diff --git a/Content.Server/Administration/Systems/AdminFrozenSystem.cs b/Content.Server/Administration/Systems/AdminFrozenSystem.cs
new file mode 100644
index 00000000000..baf7b682b85
--- /dev/null
+++ b/Content.Server/Administration/Systems/AdminFrozenSystem.cs
@@ -0,0 +1,16 @@
+using Content.Shared.Administration;
+
+namespace Content.Server.Administration.Systems;
+
+public sealed class AdminFrozenSystem : SharedAdminFrozenSystem
+{
+    /// <summary>
+    /// Freezes and mutes the given entity.
+    /// </summary>
+    public void FreezeAndMute(EntityUid uid)
+    {
+        var comp = EnsureComp<AdminFrozenComponent>(uid);
+        comp.Muted = true;
+        Dirty(uid, comp);
+    }
+}
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.cs b/Content.Server/Administration/Systems/AdminVerbSystem.cs
index 1f593d2f4d9..1e701794ffc 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs
@@ -137,24 +137,57 @@ private void AddAdminVerbs(GetVerbsEvent<Verb> args)
                     args.Verbs.Add(prayerVerb);
 
                     // Freeze
-                    var frozen = HasComp<AdminFrozenComponent>(args.Target);
-                    args.Verbs.Add(new Verb
+                    var frozen = TryComp<AdminFrozenComponent>(args.Target, out var frozenComp);
+                    var frozenAndMuted = frozenComp?.Muted ?? false;
+
+                    if (!frozen)
                     {
-                        Priority = -1, // This is just so it doesn't change position in the menu between freeze/unfreeze.
-                        Text = frozen
-                            ? Loc.GetString("admin-verbs-unfreeze")
-                            : Loc.GetString("admin-verbs-freeze"),
-                        Category = VerbCategory.Admin,
-                        Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/snow.svg.192dpi.png")),
-                        Act = () =>
+                        args.Verbs.Add(new Verb
                         {
-                            if (frozen)
-                                RemComp<AdminFrozenComponent>(args.Target);
-                            else
+                            Priority = -1, // This is just so it doesn't change position in the menu between freeze/unfreeze.
+                            Text = Loc.GetString("admin-verbs-freeze"),
+                            Category = VerbCategory.Admin,
+                            Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/snow.svg.192dpi.png")),
+                            Act = () =>
+                            {
                                 EnsureComp<AdminFrozenComponent>(args.Target);
-                        },
-                        Impact = LogImpact.Medium,
-                    });
+                            },
+                            Impact = LogImpact.Medium,
+                        });
+                    }
+
+                    if (!frozenAndMuted)
+                    {
+                        // allow you to additionally mute someone when they are already frozen
+                        args.Verbs.Add(new Verb
+                        {
+                            Priority = -1, // This is just so it doesn't change position in the menu between freeze/unfreeze.
+                            Text = Loc.GetString("admin-verbs-freeze-and-mute"),
+                            Category = VerbCategory.Admin,
+                            Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/snow.svg.192dpi.png")),
+                            Act = () =>
+                            {
+                                _freeze.FreezeAndMute(args.Target);
+                            },
+                            Impact = LogImpact.Medium,
+                        });
+                    }
+
+                    if (frozen)
+                    {
+                        args.Verbs.Add(new Verb
+                        {
+                            Priority = -1, // This is just so it doesn't change position in the menu between freeze/unfreeze.
+                            Text = Loc.GetString("admin-verbs-unfreeze"),
+                            Category = VerbCategory.Admin,
+                            Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/snow.svg.192dpi.png")),
+                            Act = () =>
+                            {
+                                RemComp<AdminFrozenComponent>(args.Target);
+                            },
+                            Impact = LogImpact.Medium,
+                        });
+                    }
 
                     // Erase
                     args.Verbs.Add(new Verb
diff --git a/Content.Server/Chat/Commands/SuicideCommand.cs b/Content.Server/Chat/Commands/SuicideCommand.cs
index e3794bcaa8f..7f6e88e8b54 100644
--- a/Content.Server/Chat/Commands/SuicideCommand.cs
+++ b/Content.Server/Chat/Commands/SuicideCommand.cs
@@ -1,5 +1,6 @@
 using Content.Server.GameTicking;
 using Content.Server.Popups;
+using Content.Server.Popups;
 using Content.Shared.Administration;
 using Content.Shared.Chat;
 using Content.Shared.Mind;
@@ -55,6 +56,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
                 return;
 
             shell.WriteLine(Loc.GetString("ghost-command-denied"));
+            shell.WriteLine(Loc.GetString("ghost-command-denied"));
         }
     }
 }
diff --git a/Content.Server/Ghost/Ghost.cs b/Content.Server/Ghost/Ghost.cs
index 1453bf3faa9..69d81d95929 100644
--- a/Content.Server/Ghost/Ghost.cs
+++ b/Content.Server/Ghost/Ghost.cs
@@ -1,4 +1,5 @@
 using Content.Server.GameTicking;
+using Content.Server.Popups;
 using Content.Shared.Administration;
 using Content.Shared.Mind;
 using Robust.Shared.Console;
@@ -11,15 +12,25 @@ public sealed class Ghost : IConsoleCommand
         [Dependency] private readonly IEntityManager _entities = default!;
 
         public string Command => "ghost";
-        public string Description => "Give up on life and become a ghost.";
-        public string Help => "ghost";
+        public string Description => Loc.GetString("ghost-command-description");
+        public string Help => Loc.GetString("ghost-command-help-text");
 
         public void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             var player = shell.Player;
             if (player == null)
             {
-                shell.WriteLine("You have no session, you can't ghost.");
+                shell.WriteLine(Loc.GetString("ghost-command-no-session"));
+                return;
+            }
+
+            if (player.AttachedEntity is { Valid: true } frozen &&
+                _entities.HasComponent<AdminFrozenComponent>(frozen))
+            {
+                var deniedMessage = Loc.GetString("ghost-command-denied");
+                shell.WriteLine(deniedMessage);
+                _entities.System<PopupSystem>()
+                    .PopupEntity(deniedMessage, frozen, frozen);
                 return;
             }
 
@@ -30,9 +41,9 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
                 mind = _entities.GetComponent<MindComponent>(mindId);
             }
 
-            if (!EntitySystem.Get<GameTicker>().OnGhostAttempt(mindId, true, true, mind))
+            if (!_entities.System<GameTicker>().OnGhostAttempt(mindId, true, true, mind))
             {
-                shell.WriteLine("You can't ghost right now.");
+                shell.WriteLine(Loc.GetString("ghost-command-denied"));
             }
         }
     }
diff --git a/Content.Shared/Administration/AdminFrozenComponent.cs b/Content.Shared/Administration/AdminFrozenComponent.cs
index 164cf764c86..bfcf1db5261 100644
--- a/Content.Shared/Administration/AdminFrozenComponent.cs
+++ b/Content.Shared/Administration/AdminFrozenComponent.cs
@@ -2,8 +2,13 @@
 
 namespace Content.Shared.Administration;
 
-[RegisterComponent, Access(typeof(AdminFrozenSystem))]
-[NetworkedComponent]
+[RegisterComponent, Access(typeof(SharedAdminFrozenSystem))]
+[NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class AdminFrozenComponent : Component
 {
+    /// <summary>
+    /// Whether the player is also muted.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Muted;
 }
diff --git a/Content.Shared/Administration/AdminFrozenSystem.cs b/Content.Shared/Administration/SharedAdminFrozenSystem.cs
similarity index 78%
rename from Content.Shared/Administration/AdminFrozenSystem.cs
rename to Content.Shared/Administration/SharedAdminFrozenSystem.cs
index 4ec9600b0bd..2fa22e00052 100644
--- a/Content.Shared/Administration/AdminFrozenSystem.cs
+++ b/Content.Shared/Administration/SharedAdminFrozenSystem.cs
@@ -1,15 +1,17 @@
 using Content.Shared.ActionBlocker;
+using Content.Shared.Emoting;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Item;
 using Content.Shared.Movement.Events;
 using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Movement.Pulling.Events;
 using Content.Shared.Movement.Pulling.Systems;
+using Content.Shared.Speech;
 using Content.Shared.Throwing;
 
 namespace Content.Shared.Administration;
 
-public sealed class AdminFrozenSystem : EntitySystem
+public abstract class SharedAdminFrozenSystem : EntitySystem
 {
     [Dependency] private readonly ActionBlockerSystem _blocker = default!;
     [Dependency] private readonly PullingSystem _pulling = default!;
@@ -28,6 +30,16 @@ public override void Initialize()
         SubscribeLocalEvent<AdminFrozenComponent, PullAttemptEvent>(OnPullAttempt);
         SubscribeLocalEvent<AdminFrozenComponent, AttackAttemptEvent>(OnAttempt);
         SubscribeLocalEvent<AdminFrozenComponent, ChangeDirectionAttemptEvent>(OnAttempt);
+        SubscribeLocalEvent<AdminFrozenComponent, EmoteAttemptEvent>(OnEmoteAttempt);
+        SubscribeLocalEvent<AdminFrozenComponent, SpeakAttemptEvent>(OnSpeakAttempt);
+    }
+
+    private void OnSpeakAttempt(EntityUid uid, AdminFrozenComponent component, SpeakAttemptEvent args)
+    {
+        if (!component.Muted)
+            return;
+
+        args.Cancel();
     }
 
     private void OnAttempt(EntityUid uid, AdminFrozenComponent component, CancellableEntityEventArgs args)
@@ -62,4 +74,10 @@ private void UpdateCanMove(EntityUid uid, AdminFrozenComponent component, Entity
     {
         _blocker.UpdateCanMove(uid);
     }
+
+    private void OnEmoteAttempt(EntityUid uid, AdminFrozenComponent component, EmoteAttemptEvent args)
+    {
+        if (component.Muted)
+            args.Cancel();
+    }
 }
diff --git a/Resources/Locale/en-US/administration/admin-verbs.ftl b/Resources/Locale/en-US/administration/admin-verbs.ftl
index 03f92f7c420..16715087ee4 100644
--- a/Resources/Locale/en-US/administration/admin-verbs.ftl
+++ b/Resources/Locale/en-US/administration/admin-verbs.ftl
@@ -6,6 +6,7 @@ admin-verbs-admin-logs-entity = Entity Logs
 admin-verbs-teleport-to = Teleport To
 admin-verbs-teleport-here = Teleport Here
 admin-verbs-freeze = Freeze
+admin-verbs-freeze-and-mute = Freeze And Mute
 admin-verbs-unfreeze = Unfreeze
 admin-verbs-erase = Erase
 admin-verbs-erase-description = Removes the player from the round and crew manifest and deletes their chat messages.
diff --git a/Resources/Locale/en-US/chat/commands/ghost-command.ftl b/Resources/Locale/en-US/chat/commands/ghost-command.ftl
new file mode 100644
index 00000000000..08e78d34ce5
--- /dev/null
+++ b/Resources/Locale/en-US/chat/commands/ghost-command.ftl
@@ -0,0 +1,5 @@
+ghost-command-description = Give up on life and become a ghost.
+ghost-command-help-text = The ghost command turns you into a ghost and makes the character you played permanently catatonic.
+                          Please note that you cannot return to your character's body after ghosting.
+ghost-command-no-session = You have no session, you can't ghost.
+ghost-command-denied = You cannot ghost right now.
diff --git a/Resources/Locale/en-US/chat/commands/suicide-command.ftl b/Resources/Locale/en-US/chat/commands/suicide-command.ftl
index 6748aa630cd..36e861169b8 100644
--- a/Resources/Locale/en-US/chat/commands/suicide-command.ftl
+++ b/Resources/Locale/en-US/chat/commands/suicide-command.ftl
@@ -6,3 +6,5 @@ suicide-command-help-text = The suicide command gives you a quick way out of a r
 suicide-command-default-text-others = {$name} is attempting to bite their own tongue!
 suicide-command-default-text-self = You attempt to bite your own tongue!
 suicide-command-already-dead = You can't suicide. You're dead.
+suicide-command-no-mind = You have no mind!
+suicide-command-denied = You cannot suicide right now.

From 8038c5f65664505384bed8b82afb990755c1e990 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 21 Dec 2024 17:23:46 -0400
Subject: [PATCH 242/366] Fix all errors

---
 .../EntitySystems/FoodGuideDataSystem.cs       |  1 +
 .../Chemistry/Effects/ChemRemovePsionic.cs     | 13 ++++++++-----
 .../Chemistry/Effects/ChemRerollPsionic.cs     | 11 +++++++----
 .../EntitySystems/DeepFryerSystem.Update.cs    | 18 ++++++++++--------
 .../Kitchen/EntitySystems/DeepFryerSystem.cs   |  7 ++++---
 5 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/Content.Server/Nutrition/EntitySystems/FoodGuideDataSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodGuideDataSystem.cs
index 56ade987629..84c81c45956 100644
--- a/Content.Server/Nutrition/EntitySystems/FoodGuideDataSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FoodGuideDataSystem.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using Content.Client.Chemistry.EntitySystems;
 using Content.Server.Chemistry.ReactionEffects;
+using Content.Server.EntityEffects.Effects;
 using Content.Server.Nutrition.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.Reaction;
diff --git a/Content.Server/Nyanotrasen/Chemistry/Effects/ChemRemovePsionic.cs b/Content.Server/Nyanotrasen/Chemistry/Effects/ChemRemovePsionic.cs
index e500e246d5b..f21c88d0834 100644
--- a/Content.Server/Nyanotrasen/Chemistry/Effects/ChemRemovePsionic.cs
+++ b/Content.Server/Nyanotrasen/Chemistry/Effects/ChemRemovePsionic.cs
@@ -1,5 +1,5 @@
-using Content.Shared.Chemistry.Reagent;
 using Content.Server.Abilities.Psionics;
+using Content.Shared.EntityEffects;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 
@@ -9,19 +9,22 @@ namespace Content.Server.Chemistry.ReagentEffects
     /// Rerolls psionics once.
     /// </summary>
     [UsedImplicitly]
-    public sealed partial class ChemRemovePsionic : ReagentEffect
+    public sealed partial class ChemRemovePsionic : EntityEffect
     {
         protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
             => Loc.GetString("reagent-effect-guidebook-chem-remove-psionic", ("chance", Probability));
 
-        public override void Effect(ReagentEffectArgs args)
+        public override void Effect(EntityEffectBaseArgs args)
         {
-            if (args.Scale != 1f)
+            if (args is not EntityEffectReagentArgs effectArgs)
+                return;
+
+            if (effectArgs.Scale != 1f)
                 return;
 
             var psySys = args.EntityManager.EntitySysManager.GetEntitySystem<PsionicAbilitiesSystem>();
 
-            psySys.MindBreak(args.SolutionEntity);
+            psySys.MindBreak(effectArgs.TargetEntity);
         }
     }
 }
diff --git a/Content.Server/Nyanotrasen/Chemistry/Effects/ChemRerollPsionic.cs b/Content.Server/Nyanotrasen/Chemistry/Effects/ChemRerollPsionic.cs
index 987a41c04a1..c3357938ac4 100644
--- a/Content.Server/Nyanotrasen/Chemistry/Effects/ChemRerollPsionic.cs
+++ b/Content.Server/Nyanotrasen/Chemistry/Effects/ChemRerollPsionic.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Chemistry.Reagent;
 using Content.Server.Psionics;
+using Content.Shared.EntityEffects;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 
@@ -9,7 +10,7 @@ namespace Content.Server.Chemistry.ReagentEffects
     /// Rerolls psionics once.
     /// </summary>
     [UsedImplicitly]
-    public sealed partial class ChemRerollPsionic : ReagentEffect
+    public sealed partial class ChemRerollPsionic : EntityEffect
     {
         protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
             => Loc.GetString("reagent-effect-guidebook-chem-reroll-psionic", ("chance", Probability));
@@ -20,11 +21,13 @@ public sealed partial class ChemRerollPsionic : ReagentEffect
         [DataField("bonusMultiplier")]
         public float BonusMuliplier = 1f;
 
-        public override void Effect(ReagentEffectArgs args)
+        public override void Effect(EntityEffectBaseArgs args)
         {
-            var psySys = args.EntityManager.EntitySysManager.GetEntitySystem<PsionicsSystem>();
+            if (args is not EntityEffectReagentArgs _)
+                return;
 
-            psySys.RerollPsionics(args.SolutionEntity, bonusMuliplier: BonusMuliplier);
+            var psySys = args.EntityManager.EntitySysManager.GetEntitySystem<PsionicsSystem>();
+            psySys.RerollPsionics(args.TargetEntity, bonusMuliplier: BonusMuliplier);
         }
     }
 }
diff --git a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Update.cs b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Update.cs
index 0978cffeb4b..ceab74801b2 100644
--- a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Update.cs
+++ b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Update.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Content.Shared.Popups;
 using Robust.Shared.Player;
@@ -54,14 +55,15 @@ public override void Update(float frameTime)
 
                             foreach (var effect in component.UnsafeOilVolumeEffects)
                             {
-                                effect.Effect(new ReagentEffectArgs(uid,
-                                        null,
-                                        component.Solution,
-                                        proto!,
-                                        reagent.Quantity,
-                                        EntityManager,
-                                        null,
-                                        1f));
+                                var effectsArgs = new EntityEffectReagentArgs(uid,
+                                    EntityManager,
+                                    null,
+                                    component.Solution,
+                                    reagent.Quantity,
+                                    proto!,
+                                    null,
+                                    1f);
+                                effect.Effect(effectsArgs);
                             }
 
                         }
diff --git a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs
index 74d4f5a1ac0..ec1b81cfb34 100644
--- a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs
+++ b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs
@@ -28,6 +28,7 @@
 using Content.Shared.Destructible;
 using Content.Shared.DoAfter;
 using Content.Shared.DragDrop;
+using Content.Shared.EntityEffects;
 using Content.Shared.Examine;
 using Content.Shared.FixedPoint;
 using Content.Shared.Hands.Components;
@@ -399,12 +400,12 @@ private void OnInitDeepFryer(EntityUid uid, DeepFryerComponent component, Compon
         {
             //JJ Comment - not sure this works. Need to check if Reagent.ToString is correct.
             _prototypeManager.TryIndex<ReagentPrototype>(reagent.Reagent.ToString(), out var proto);
-            var effectsArgs = new ReagentEffectArgs(uid,
+            var effectsArgs = new EntityEffectReagentArgs(uid,
+                EntityManager,
                 null,
                 component.Solution,
-                proto!,
                 reagent.Quantity,
-                EntityManager,
+                proto!,
                 null,
                 1f);
             foreach (var effect in component.UnsafeOilVolumeEffects)

From ebd00f5f00185ab38f29851e4c5bfa3ec4a21079 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 21 Dec 2024 17:48:03 -0400
Subject: [PATCH 243/366] tags

---
 Content.Server/Administration/BanPanelEui.cs  |   1 +
 .../Administration/Toolshed/TagCommand.cs     |   1 +
 Content.Server/Database/ServerDbManager.cs    |  12 +
 Content.Server/Database/UserDbDataManager.cs  |   4 +
 .../Station/Commands/JobsCommand.cs           |   6 +-
 Content.Shared/Tag/TagSystem.cs               | 768 +++++++++---------
 6 files changed, 413 insertions(+), 379 deletions(-)

diff --git a/Content.Server/Administration/BanPanelEui.cs b/Content.Server/Administration/BanPanelEui.cs
index ebe20afa5f7..3e336932088 100644
--- a/Content.Server/Administration/BanPanelEui.cs
+++ b/Content.Server/Administration/BanPanelEui.cs
@@ -7,6 +7,7 @@
 using Content.Shared.Administration;
 using Content.Shared.Database;
 using Content.Shared.Eui;
+using Robust.Server.Player;
 using Robust.Shared.Network;
 
 namespace Content.Server.Administration;
diff --git a/Content.Server/Administration/Toolshed/TagCommand.cs b/Content.Server/Administration/Toolshed/TagCommand.cs
index 18cbb7f8fa8..9c5d1b62bf4 100644
--- a/Content.Server/Administration/Toolshed/TagCommand.cs
+++ b/Content.Server/Administration/Toolshed/TagCommand.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using Content.Shared.Administration;
 using Content.Shared.Tag;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Toolshed;
 using Robust.Shared.Toolshed.Syntax;
 using Robust.Shared.Toolshed.TypeParsers;
diff --git a/Content.Server/Database/ServerDbManager.cs b/Content.Server/Database/ServerDbManager.cs
index 0ac5ef5e786..d3099500622 100644
--- a/Content.Server/Database/ServerDbManager.cs
+++ b/Content.Server/Database/ServerDbManager.cs
@@ -300,6 +300,18 @@ Task<int> AddConnectionLogAsync(
 
         #endregion
 
+        #region Job Whitelists
+
+        Task AddJobWhitelist(Guid player, ProtoId<JobPrototype> job);
+
+
+        Task<List<string>> GetJobWhitelists(Guid player, CancellationToken cancel = default);
+        Task<bool> IsJobWhitelisted(Guid player, ProtoId<JobPrototype> job);
+
+        Task<bool> RemoveJobWhitelist(Guid player, ProtoId<JobPrototype> job);
+
+        #endregion
+
         #region DB Notifications
 
         void SubscribeToNotifications(Action<DatabaseNotification> handler);
diff --git a/Content.Server/Database/UserDbDataManager.cs b/Content.Server/Database/UserDbDataManager.cs
index 700b75846ae..50759008c3c 100644
--- a/Content.Server/Database/UserDbDataManager.cs
+++ b/Content.Server/Database/UserDbDataManager.cs
@@ -1,5 +1,6 @@
 using System.Threading;
 using System.Threading.Tasks;
+using Content.Server.Players.PlayTimeTracking;
 using Content.Server.Preferences.Managers;
 using Robust.Server.Player;
 using Robust.Shared.Network;
@@ -23,6 +24,9 @@ public sealed class UserDbDataManager : IPostInjectInit
     [Dependency] private readonly PlayTimeTrackingManager _playTimeTracking = default!;
 
     private readonly Dictionary<NetUserId, UserData> _users = new();
+    private readonly List<OnLoadPlayer> _onLoadPlayer = [];
+    private readonly List<OnFinishLoad> _onFinishLoad = [];
+    private readonly List<OnPlayerDisconnect> _onPlayerDisconnect = [];
 
     private ISawmill _sawmill = default!;
 
diff --git a/Content.Server/Station/Commands/JobsCommand.cs b/Content.Server/Station/Commands/JobsCommand.cs
index 599a87aac6c..1e39140e840 100644
--- a/Content.Server/Station/Commands/JobsCommand.cs
+++ b/Content.Server/Station/Commands/JobsCommand.cs
@@ -75,15 +75,15 @@ public IEnumerable<JobSlotRef> Set([PipedArgument] IEnumerable<JobSlotRef> @ref,
         => @ref.Select(x => Set(x, by));
 
     [CommandImplementation("amount")]
-    public int Amount([PipedArgument] JobSlotRef @ref)
+    public uint Amount([PipedArgument] JobSlotRef @ref)
     {
         _jobs ??= GetSys<StationJobsSystem>();
         _jobs.TryGetJobSlot(@ref.Station, @ref.Job, out var slots);
-        return slots ?? 0;
+        return slots.HasValue ? slots.Value : 0;
     }
 
     [CommandImplementation("amount")]
-    public IEnumerable<int> Amount([PipedArgument] IEnumerable<JobSlotRef> @ref)
+    public IEnumerable<uint> Amount([PipedArgument] IEnumerable<JobSlotRef> @ref)
         => @ref.Select(Amount);
 }
 
diff --git a/Content.Shared/Tag/TagSystem.cs b/Content.Shared/Tag/TagSystem.cs
index b9fef076c88..f1f620a6949 100644
--- a/Content.Shared/Tag/TagSystem.cs
+++ b/Content.Shared/Tag/TagSystem.cs
@@ -1,11 +1,19 @@
-using System.Diagnostics;
-using System.Linq;
-using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Tag;
 
+/// <summary>
+/// The system that is responsible for working with tags.
+/// Checking the existence of the <see cref="TagPrototype"/> only happens in DEBUG builds,
+/// to improve performance, so don't forget to check it.
+/// </summary>
+/// <summary>
+/// The methods to add or remove a list of tags have only an implementation with the <see cref="IEnumerable{T}"/> type,
+/// it's not much, but it takes away performance,
+/// if you need to use them often, it's better to make a proper implementation,
+/// you can read more <a href="https://github.com/space-wizards/space-station-14/pull/28272">HERE</a>.
+/// </summary>
 public sealed class TagSystem : EntitySystem
 {
     [Dependency] private readonly IPrototypeManager _proto = default!;
@@ -15,541 +23,514 @@ public sealed class TagSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
+
         _tagQuery = GetEntityQuery<TagComponent>();
-        SubscribeLocalEvent<TagComponent, ComponentGetState>(OnTagGetState);
-        SubscribeLocalEvent<TagComponent, ComponentHandleState>(OnTagHandleState);
 
 #if DEBUG
         SubscribeLocalEvent<TagComponent, ComponentInit>(OnTagInit);
+#endif
     }
 
+#if DEBUG
     private void OnTagInit(EntityUid uid, TagComponent component, ComponentInit args)
     {
         foreach (var tag in component.Tags)
         {
             AssertValidTag(tag);
         }
-#endif
-    }
-
-
-    private void OnTagHandleState(EntityUid uid, TagComponent component, ref ComponentHandleState args)
-    {
-        if (args.Current is not TagComponentState state)
-            return;
-
-        component.Tags.Clear();
-
-        foreach (var tag in state.Tags)
-        {
-            AssertValidTag(tag);
-            component.Tags.Add(tag);
-        }
-    }
-
-    private static void OnTagGetState(EntityUid uid, TagComponent component, ref ComponentGetState args)
-    {
-        var tags = new string[component.Tags.Count];
-        var i = 0;
-
-        foreach (var tag in component.Tags)
-        {
-            tags[i] = tag;
-            i++;
-        }
-
-        args.State = new TagComponentState(tags);
-    }
-
-    private void AssertValidTag(string id)
-    {
-        DebugTools.Assert(_proto.HasIndex<TagPrototype>(id), $"Unknown tag: {id}");
     }
+#endif
 
     /// <summary>
-    ///     Tries to add a tag to an entity if the tag doesn't already exist.
+    /// Tries to add a tag to an entity if the tag doesn't already exist.
     /// </summary>
-    /// <param name="entity">The entity to add the tag to.</param>
-    /// <param name="id">The tag to add.</param>
     /// <returns>
-    ///     true if it was added, false otherwise even if it already existed.
+    /// true if it was added, false otherwise even if it already existed.
     /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if no <see cref="TagPrototype"/> exists with the given id.
+    /// Thrown if no <see cref="TagPrototype"/> exists with the given id.
     /// </exception>
-    public bool AddTag(EntityUid entity, string id)
+    public bool AddTag(EntityUid entityUid, ProtoId<TagPrototype> tag)
     {
-        return AddTag(entity, EnsureComp<TagComponent>(entity), id);
+        return AddTag((entityUid, EnsureComp<TagComponent>(entityUid)), tag);
     }
 
     /// <summary>
-    ///     Tries to add the given tags to an entity if the tags don't already exist.
+    /// Tries to add the given tags to an entity if the tags don't already exist.
     /// </summary>
-    /// <param name="entity">The entity to add the tag to.</param>
-    /// <param name="ids">The tags to add.</param>
     /// <returns>
-    ///     true if any tags were added, false otherwise even if they all already existed.
+    /// true if any tags were added, false otherwise even if they all already existed.
     /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
     /// </exception>
-    public bool AddTags(EntityUid entity, params string[] ids)
+    public bool AddTags(EntityUid entityUid, params ProtoId<TagPrototype>[] tags)
     {
-        return AddTags(entity, EnsureComp<TagComponent>(entity), ids);
+        return AddTags(entityUid,  (IEnumerable<ProtoId<TagPrototype>>)tags);
     }
 
     /// <summary>
-    ///     Tries to add the given tags to an entity if the tags don't already exist.
+    /// Tries to add the given tags to an entity if the tags don't already exist.
     /// </summary>
-    /// <param name="entity">The entity to add the tag to.</param>
-    /// <param name="ids">The tags to add.</param>
     /// <returns>
-    ///     true if any tags were added, false otherwise even if they all already existed.
+    /// true if any tags were added, false otherwise even if they all already existed.
     /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
     /// </exception>
-    public bool AddTags(EntityUid entity, IEnumerable<string> ids)
+    public bool AddTags(EntityUid entityUid, IEnumerable<ProtoId<TagPrototype>> tags)
     {
-        return AddTags(entity, EnsureComp<TagComponent>(entity), ids);
+        return AddTags((entityUid, EnsureComp<TagComponent>(entityUid)), tags);
     }
 
     /// <summary>
-    ///     Tries to add a tag to an entity if it has a <see cref="TagComponent"/>
-    ///     and the tag doesn't already exist.
+    /// Tries to add a tag to an entity if it has a <see cref="TagComponent"/>
+    /// and the tag doesn't already exist.
     /// </summary>
-    /// <param name="entity">The entity to add the tag to.</param>
-    /// <param name="id">The tag to add.</param>
     /// <returns>
-    ///     true if it was added, false otherwise even if it already existed.
+    /// true if it was added, false otherwise even if it already existed.
     /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if no <see cref="TagPrototype"/> exists with the given id.
+    /// Thrown if no <see cref="TagPrototype"/> exists with the given id.
     /// </exception>
-    public bool TryAddTag(EntityUid entity, string id)
+    public bool TryAddTag(EntityUid entityUid, ProtoId<TagPrototype> tag)
     {
-        return TryComp<TagComponent>(entity, out var component) &&
-               AddTag(entity, component, id);
+        return _tagQuery.TryComp(entityUid, out var component) &&
+               AddTag((entityUid, component), tag);
     }
 
     /// <summary>
-    ///     Tries to add the given tags to an entity if it has a
-    ///     <see cref="TagComponent"/> and the tags don't already exist.
+    /// Tries to add the given tags to an entity if it has a
+    /// <see cref="TagComponent"/> and the tags don't already exist.
     /// </summary>
-    /// <param name="entity">The entity to add the tag to.</param>
-    /// <param name="ids">The tags to add.</param>
     /// <returns>
-    ///     true if any tags were added, false otherwise even if they all already existed.
+    /// true if any tags were added, false otherwise even if they all already existed.
     /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
     /// </exception>
-    public bool TryAddTags(EntityUid entity, params string[] ids)
+    public bool TryAddTags(EntityUid entityUid, params ProtoId<TagPrototype>[] tags)
     {
-        return TryComp<TagComponent>(entity, out var component) &&
-               AddTags(entity, component, ids);
+        return TryAddTags(entityUid, (IEnumerable<ProtoId<TagPrototype>>)tags);
     }
 
     /// <summary>
-    ///     Tries to add the given tags to an entity if it has a
-    ///     <see cref="TagComponent"/> and the tags don't already exist.
+    /// Tries to add the given tags to an entity if it has a
+    /// <see cref="TagComponent"/> and the tags don't already exist.
     /// </summary>
-    /// <param name="entity">The entity to add the tag to.</param>
-    /// <param name="ids">The tags to add.</param>
     /// <returns>
-    ///     true if any tags were added, false otherwise even if they all already existed.
+    /// true if any tags were added, false otherwise even if they all already existed.
     /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
     /// </exception>
-    public bool TryAddTags(EntityUid entity, IEnumerable<string> ids)
+    public bool TryAddTags(EntityUid entityUid, IEnumerable<ProtoId<TagPrototype>> tags)
     {
-        return TryComp<TagComponent>(entity, out var component) &&
-               AddTags(entity, component, ids);
+        return _tagQuery.TryComp(entityUid, out var component) &&
+               AddTags((entityUid, component), tags);
     }
 
     /// <summary>
-    ///     Checks if a tag has been added to an entity.
+    /// Checks if a tag has been added to an entity.
     /// </summary>
-    /// <param name="entity">The entity to check.</param>
-    /// <param name="id">The tag to check for.</param>
-    /// <returns>true if it exists, false otherwise.</returns>
+    /// <returns>
+    /// true if it exists, false otherwise.
+    /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if no <see cref="TagPrototype"/> exists with the given id.
+    /// Thrown if no <see cref="TagPrototype"/> exists with the given id.
     /// </exception>
-    public bool HasTag(EntityUid entity, string id)
-    {
-        return _tagQuery.TryComp(entity, out var component) &&
-               HasTag(component, id);
-    }
-
-    /// <summary>
-    ///     Checks if a tag has been added to an entity.
-    /// </summary>
-    [Obsolete]
-    public bool HasTag(EntityUid entity, string id, EntityQuery<TagComponent> tagQuery)
+    public bool HasTag(EntityUid entityUid, ProtoId<TagPrototype> tag)
     {
-        return tagQuery.TryGetComponent(entity, out var component) &&
-               HasTag(component, id);
+        return _tagQuery.TryComp(entityUid, out var component) &&
+               HasTag(component, tag);
     }
 
     /// <summary>
-    ///     Checks if all of the given tags have been added to an entity.
+    /// Checks if a tag has been added to an entity.
     /// </summary>
-    /// <param name="entity">The entity to check.</param>
-    /// <param name="id">The tags to check for.</param>
-    /// <returns>true if they all exist, false otherwise.</returns>
+    /// <returns>
+    /// true if it exists, false otherwise.
+    /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if no <see cref="TagPrototype"/> exists with the given id.
     /// </exception>
-    public bool HasAllTags(EntityUid entity, string id) => HasTag(entity, id);
+    public bool HasAllTags(EntityUid entityUid, ProtoId<TagPrototype> tag) =>
+        HasTag(entityUid, tag);
 
     /// <summary>
-    ///     Checks if all of the given tags have been added to an entity.
+    /// Checks if all of the given tags have been added to an entity.
     /// </summary>
-    /// <param name="entity">The entity to check.</param>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if they all exist, false otherwise.</returns>
+    /// <returns>
+    /// true if they all exist, false otherwise.
+    /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
     /// </exception>
-    public bool HasAllTags(EntityUid entity, List<string> ids)
+    public bool HasAllTags(EntityUid entityUid, params ProtoId<TagPrototype>[] tags)
     {
-        return _tagQuery.TryComp(entity, out var component) &&
-               HasAllTags(component, ids);
+        return _tagQuery.TryComp(entityUid, out var component) &&
+               HasAllTags(component, tags);
     }
 
     /// <summary>
-    ///     Checks if all of the given tags have been added to an entity.
+    /// Checks if all of the given tags have been added to an entity.
     /// </summary>
-    /// <param name="entity">The entity to check.</param>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if they all exist, false otherwise.</returns>
+    /// <returns>
+    /// true if they all exist, false otherwise.
+    /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
     /// </exception>
-    public bool HasAllTags(EntityUid entity, IEnumerable<string> ids)
+    public bool HasAllTags(EntityUid entityUid, HashSet<ProtoId<TagPrototype>> tags)
     {
-        return _tagQuery.TryComp(entity, out var component) &&
-               HasAllTags(component, ids);
+        return _tagQuery.TryComp(entityUid, out var component) &&
+               HasAllTags(component, tags);
     }
 
     /// <summary>
-    ///     Checks if all of the given tags have been added to an entity.
+    /// Checks if all of the given tags have been added to an entity.
     /// </summary>
-    /// <param name="entity">The entity to check.</param>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if they all exist, false otherwise.</returns>
+    /// <returns>
+    /// true if they all exist, false otherwise.
+    /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
     /// </exception>
-    public bool HasAllTags(EntityUid entity, List<ProtoId<TagPrototype>> ids)
+    public bool HasAllTags(EntityUid entityUid, List<ProtoId<TagPrototype>> tags)
     {
-        return _tagQuery.TryComp(entity, out var component) &&
-               HasAllTags(component, ids);
+        return _tagQuery.TryComp(entityUid, out var component) &&
+               HasAllTags(component, tags);
     }
 
     /// <summary>
-    ///     Checks if any of the given tags have been added to an entity.
+    /// Checks if all of the given tags have been added to an entity.
     /// </summary>
-    /// <param name="entity">The entity to check.</param>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if any of them exist, false otherwise.</returns>
+    /// <returns>
+    /// true if they all exist, false otherwise.
+    /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
     /// </exception>
-    public bool HasAnyTag(EntityUid entity, params string[] ids)
+    public bool HasAllTags(EntityUid entityUid, IEnumerable<ProtoId<TagPrototype>> tags)
     {
-        return _tagQuery.TryComp(entity, out var component) &&
-               HasAnyTag(component, ids);
+        return _tagQuery.TryComp(entityUid, out var component) &&
+               HasAllTags(component, tags);
     }
 
     /// <summary>
-    ///     Checks if any of the given tags have been added to an entity.
+    /// Checks if a tag has been added to an entity.
     /// </summary>
-    /// <param name="entity">The entity to check.</param>
-    /// <param name="id">The tag to check for.</param>
-    /// <returns>true if any of them exist, false otherwise.</returns>
+    /// <returns>
+    /// true if it exists, false otherwise.
+    /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if no <see cref="TagPrototype"/> exists with the given id.
     /// </exception>
-    public bool HasAnyTag(EntityUid entity, string id) => HasTag(entity, id);
+    public bool HasAnyTag(EntityUid entityUid, ProtoId<TagPrototype> tag) =>
+        HasTag(entityUid, tag);
 
     /// <summary>
-    ///     Checks if any of the given tags have been added to an entity.
+    /// Checks if any of the given tags have been added to an entity.
     /// </summary>
-    /// <param name="entity">The entity to check.</param>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if any of them exist, false otherwise.</returns>
+    /// <returns>
+    /// true if any of them exist, false otherwise.
+    /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
     /// </exception>
-    public bool HasAnyTag(EntityUid entity, List<string> ids)
+    public bool HasAnyTag(EntityUid entityUid, params ProtoId<TagPrototype>[] tags)
     {
-        return _tagQuery.TryComp(entity, out var component) &&
-               HasAnyTag(component, ids);
+        return _tagQuery.TryComp(entityUid, out var component) &&
+               HasAnyTag(component, tags);
     }
 
     /// <summary>
-    ///     Checks if any of the given tags have been added to an entity.
+    /// Checks if any of the given tags have been added to an entity.
     /// </summary>
-    /// <param name="entity">The entity to check.</param>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if any of them exist, false otherwise.</returns>
+    /// <returns>
+    /// true if any of them exist, false otherwise.
+    /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
     /// </exception>
-    public bool HasAnyTag(EntityUid entity, List<ProtoId<TagPrototype>> ids)
+    public bool HasAnyTag(EntityUid entityUid, HashSet<ProtoId<TagPrototype>> tags)
     {
-        return TryComp<TagComponent>(entity, out var component) &&
-               HasAnyTag(component, ids);
+        return _tagQuery.TryComp(entityUid, out var component) &&
+               HasAnyTag(component, tags);
     }
 
     /// <summary>
-    ///     Checks if any of the given tags have been added to an entity.
+    /// Checks if any of the given tags have been added to an entity.
     /// </summary>
-    /// <param name="entity">The entity to check.</param>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if any of them exist, false otherwise.</returns>
+    /// <returns>
+    /// true if any of them exist, false otherwise.
+    /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
     /// </exception>
-    public bool HasAnyTag(EntityUid entity, IEnumerable<string> ids)
+    public bool HasAnyTag(EntityUid entityUid, List<ProtoId<TagPrototype>> tags)
     {
-        return _tagQuery.TryComp(entity, out var component) &&
-               HasAnyTag(component, ids);
+        return _tagQuery.TryComp(entityUid, out var component) &&
+               HasAnyTag(component, tags);
     }
 
     /// <summary>
-    ///     Tries to remove a tag from an entity if it exists.
+    /// Checks if any of the given tags have been added to an entity.
     /// </summary>
-    /// <param name="entity">The entity to remove the tag from.</param>
-    /// <param name="id">The tag to remove.</param>
     /// <returns>
-    ///     true if it was removed, false otherwise even if it didn't exist.
+    /// true if any of them exist, false otherwise.
     /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if no <see cref="TagPrototype"/> exists with the given id.
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
     /// </exception>
-    public bool RemoveTag(EntityUid entity, string id)
+    public bool HasAnyTag(EntityUid entityUid, IEnumerable<ProtoId<TagPrototype>> tags)
     {
-        return TryComp<TagComponent>(entity, out var component) &&
-               RemoveTag(entity, component, id);
+        return _tagQuery.TryComp(entityUid, out var component) &&
+               HasAnyTag(component, tags);
     }
 
     /// <summary>
-    ///     Tries to remove a tag from an entity if it exists.
+    /// Checks if a tag has been added to an component.
     /// </summary>
-    /// <param name="entity">The entity to remove the tag from.</param>
-    /// <param name="ids">The tag to remove.</param>
     /// <returns>
-    ///     true if it was removed, false otherwise even if it didn't exist.
+    /// true if it exists, false otherwise.
+    /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if no <see cref="TagPrototype"/> exists with the given id.
     /// </exception>
-    /// </returns>
-    public bool RemoveTags(EntityUid entity, params string[] ids)
+    public bool HasTag(TagComponent component, ProtoId<TagPrototype> tag)
     {
-        return TryComp<TagComponent>(entity, out var component) &&
-               RemoveTags(entity, component, ids);
+#if DEBUG
+        AssertValidTag(tag);
+#endif
+        return component.Tags.Contains(tag);
     }
 
     /// <summary>
-    ///     Tries to remove a tag from an entity if it exists.
+    /// Checks if a tag has been added to an component.
     /// </summary>
-    /// <param name="entity">The entity to remove the tag from.</param>
-    /// <param name="ids">The tag to remove.</param>
     /// <returns>
-    ///     true if it was removed, false otherwise even if it didn't exist.
+    /// true if it exists, false otherwise.
     /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if no <see cref="TagPrototype"/> exists with the given id.
     /// </exception>
-    public bool RemoveTags(EntityUid entity, IEnumerable<string> ids)
-    {
-        return TryComp<TagComponent>(entity, out var component) &&
-               RemoveTags(entity, component, ids);
-    }
+    public bool HasAllTags(TagComponent component, ProtoId<TagPrototype> tag) =>
+        HasTag(component, tag);
 
     /// <summary>
-    ///     Tries to add a tag if it doesn't already exist.
+    /// Checks if all of the given tags have been added to an component.
     /// </summary>
-    /// <param name="id">The tag to add.</param>
-    /// <returns>true if it was added, false if it already existed.</returns>
+    /// <returns>
+    /// true if they all exist, false otherwise.
+    /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if no <see cref="TagPrototype"/> exists with the given id.
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
     /// </exception>
-    public bool AddTag(EntityUid uid, TagComponent component, string id)
+    public bool HasAllTags(TagComponent component, params ProtoId<TagPrototype>[] tags)
     {
-        AssertValidTag(id);
-        var added = component.Tags.Add(id);
-
-        if (added)
+        foreach (var tag in tags)
         {
-            Dirty(uid, component);
-            return true;
+#if DEBUG
+            AssertValidTag(tag);
+#endif
+            if (!component.Tags.Contains(tag))
+                return false;
         }
 
-        return false;
+        return true;
     }
 
     /// <summary>
-    ///     Tries to add the given tags if they don't already exist.
+    /// Checks if all of the given tags have been added to an component.
     /// </summary>
-    /// <param name="ids">The tags to add.</param>
-    /// <returns>true if any tags were added, false if they all already existed.</returns>
+    /// <returns>
+    /// true if they all exist, false otherwise.
+    /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
     /// </exception>
-    public bool AddTags(EntityUid uid, TagComponent component, params string[] ids)
+    public bool HasAllTagsArray(TagComponent component, ProtoId<TagPrototype>[] tags)
     {
-        return AddTags(uid, component, ids.AsEnumerable());
+        foreach (var tag in tags)
+        {
+#if DEBUG
+            AssertValidTag(tag);
+#endif
+            if (!component.Tags.Contains(tag))
+                return false;
+        }
+
+        return true;
     }
 
     /// <summary>
-    ///     Tries to add the given tags if they don't already exist.
+    /// Checks if all of the given tags have been added to an component.
     /// </summary>
-    /// <param name="ids">The tags to add.</param>
-    /// <returns>true if any tags were added, false if they all already existed.</returns>
+    /// <returns>
+    /// true if they all exist, false otherwise.
+    /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
     /// </exception>
-    public bool AddTags(EntityUid uid, TagComponent component, IEnumerable<string> ids)
+    public bool HasAllTags(TagComponent component, List<ProtoId<TagPrototype>> tags)
     {
-        var count = component.Tags.Count;
-
-        foreach (var id in ids)
-        {
-            AssertValidTag(id);
-            component.Tags.Add(id);
-        }
-
-        if (component.Tags.Count > count)
+        foreach (var tag in tags)
         {
-            Dirty(uid, component);
-            return true;
+#if DEBUG
+            AssertValidTag(tag);
+#endif
+            if (!component.Tags.Contains(tag))
+                return false;
         }
 
-        return false;
+        return true;
     }
 
     /// <summary>
-    ///     Checks if a tag has been added.
+    /// Checks if all of the given tags have been added to an component.
     /// </summary>
-    /// <param name="id">The tag to check for.</param>
-    /// <returns>true if it exists, false otherwise.</returns>
+    /// <returns>
+    /// true if they all exist, false otherwise.
+    /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if no <see cref="TagPrototype"/> exists with the given id.
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
     /// </exception>
-    public bool HasTag(TagComponent component, string id)
+    public bool HasAllTags(TagComponent component, HashSet<ProtoId<TagPrototype>> tags)
     {
-        AssertValidTag(id);
-        return component.Tags.Contains(id);
+        foreach (var tag in tags)
+        {
+#if DEBUG
+            AssertValidTag(tag);
+#endif
+            if (!component.Tags.Contains(tag))
+                return false;
+        }
+
+        return true;
     }
 
     /// <summary>
-    ///     Checks if all of the given tags have been added.
+    /// Checks if all of the given tags have been added to an component.
     /// </summary>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if they all exist, false otherwise.</returns>
+    /// <returns>
+    /// true if they all exist, false otherwise.
+    /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
     /// </exception>
-    public bool HasAllTags(TagComponent component, params string[] ids)
+    public bool HasAllTags(TagComponent component, IEnumerable<ProtoId<TagPrototype>> tags)
     {
-        return HasAllTags(component, ids.AsEnumerable());
+        foreach (var tag in tags)
+        {
+#if DEBUG
+            AssertValidTag(tag);
+#endif
+            if (!component.Tags.Contains(tag))
+                return false;
+        }
+
+        return true;
     }
 
     /// <summary>
-    ///     Checks if all of the given tags have been added.
+    /// Checks if a tag has been added to an component.
     /// </summary>
-    /// <param name="id">The tag to check for.</param>
-    /// <returns>true if they all exist, false otherwise.</returns>
+    /// <returns>
+    /// true if it exists, false otherwise.
+    /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if no <see cref="TagPrototype"/> exists with the given id.
     /// </exception>
-    public bool HasAllTags(TagComponent component, string id) => HasTag(component, id);
+    public bool HasAnyTag(TagComponent component, ProtoId<TagPrototype> tag) =>
+        HasTag(component, tag);
 
     /// <summary>
-    ///     Checks if all of the given tags have been added.
+    /// Checks if any of the given tags have been added to an component.
     /// </summary>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if they all exist, false otherwise.</returns>
+    /// <returns>
+    /// true if any of them exist, false otherwise.
+    /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
     /// </exception>
-    public bool HasAllTags(TagComponent component, List<string> ids)
+    public bool HasAnyTag(TagComponent component, params ProtoId<TagPrototype>[] tags)
     {
-        foreach (var id in ids)
+        foreach (var tag in tags)
         {
-            AssertValidTag(id);
-
-            if (!component.Tags.Contains(id))
-                return false;
+#if DEBUG
+            AssertValidTag(tag);
+#endif
+            if (component.Tags.Contains(tag))
+                return true;
         }
 
-        return true;
+        return false;
     }
 
     /// <summary>
-    ///     Checks if all of the given tags have been added.
+    /// Checks if any of the given tags have been added to an component.
     /// </summary>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if they all exist, false otherwise.</returns>
+    /// <returns>
+    /// true if any of them exist, false otherwise.
+    /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
     /// </exception>
-    public bool HasAllTags(TagComponent component, IEnumerable<string> ids)
+    public bool HasAnyTag(TagComponent component, HashSet<ProtoId<TagPrototype>> tags)
     {
-        foreach (var id in ids)
+        foreach (var tag in tags)
         {
-            AssertValidTag(id);
-
-            if (!component.Tags.Contains(id))
-                return false;
-
+#if DEBUG
+            AssertValidTag(tag);
+#endif
+            if (component.Tags.Contains(tag))
+                return true;
         }
 
-        return true;
+        return false;
     }
 
     /// <summary>
-    ///     Checks if all of the given tags have been added.
+    /// Checks if any of the given tags have been added to an component.
     /// </summary>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if they all exist, false otherwise.</returns>
+    /// <returns>
+    /// true if any of them exist, false otherwise.
+    /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
     /// </exception>
-    public bool HasAllTags(TagComponent component, List<ProtoId<TagPrototype>> ids)
+    public bool HasAnyTag(TagComponent component, List<ProtoId<TagPrototype>> tags)
     {
-        foreach (var id in ids)
+        foreach (var tag in tags)
         {
-            AssertValidTag(id);
-
-            if (!component.Tags.Contains(id))
-                return false;
-
+#if DEBUG
+            AssertValidTag(tag);
+#endif
+            if (component.Tags.Contains(tag))
+                return true;
         }
 
-        return true;
+        return false;
     }
 
     /// <summary>
-    ///     Checks if any of the given tags have been added.
+    /// Checks if any of the given tags have been added to an component.
     /// </summary>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if any of them exist, false otherwise.</returns>
+    /// <returns>
+    /// true if any of them exist, false otherwise.
+    /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
     /// </exception>
-    public bool HasAnyTag(TagComponent component, params string[] ids)
+    public bool HasAnyTag(TagComponent component, IEnumerable<ProtoId<TagPrototype>> tags)
     {
-        foreach (var id in ids)
+        foreach (var tag in tags)
         {
-            AssertValidTag(id);
-
-            if (component.Tags.Contains(id))
+#if DEBUG
+            AssertValidTag(tag);
+#endif
+            if (component.Tags.Contains(tag))
                 return true;
         }
 
@@ -557,143 +538,178 @@ public bool HasAnyTag(TagComponent component, params string[] ids)
     }
 
     /// <summary>
-    ///     Checks if any of the given tags have been added.
+    /// Tries to remove a tag from an entity if it exists.
     /// </summary>
-    /// <param name="id">The tag to check for.</param>
-    /// <returns>true if any of them exist, false otherwise.</returns>
+    /// <returns>
+    /// true if it was removed, false otherwise even if it didn't exist.
+    /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if no <see cref="TagPrototype"/> exists with the given id.
     /// </exception>
-    public bool HasAnyTag(TagComponent component, string id) => HasTag(component, id);
+    public bool RemoveTag(EntityUid entityUid, ProtoId<TagPrototype> tag)
+    {
+        return _tagQuery.TryComp(entityUid, out var component) &&
+               RemoveTag((entityUid, component), tag);
+    }
 
     /// <summary>
-    ///     Checks if any of the given tags have been added.
+    /// Tries to remove a tag from an entity if it exists.
     /// </summary>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if any of them exist, false otherwise.</returns>
+    /// <returns>
+    /// true if it was removed, false otherwise even if it didn't exist.
+    /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
     /// </exception>
-    public bool HasAnyTag(TagComponent component, List<string> ids)
+    public bool RemoveTags(EntityUid entityUid, params ProtoId<TagPrototype>[] tags)
     {
-        foreach (var id in ids)
-        {
-            AssertValidTag(id);
-
-            if (component.Tags.Contains(id))
-            {
-                return true;
-            }
-        }
+        return RemoveTags(entityUid, (IEnumerable<ProtoId<TagPrototype>>)tags);
+    }
 
-        return false;
+    /// <summary>
+    /// Tries to remove a tag from an entity if it exists.
+    /// </summary>
+    /// <returns>
+    /// true if it was removed, false otherwise even if it didn't exist.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool RemoveTags(EntityUid entityUid, IEnumerable<ProtoId<TagPrototype>> tags)
+    {
+        return _tagQuery.TryComp(entityUid, out var component) &&
+               RemoveTags((entityUid, component), tags);
     }
 
     /// <summary>
-    ///     Checks if any of the given tags have been added.
+    /// Tries to add a tag if it doesn't already exist.
     /// </summary>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if any of them exist, false otherwise.</returns>
+    /// <returns>
+    /// true if it was added, false if it already existed.
+    /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if no <see cref="TagPrototype"/> exists with the given id.
     /// </exception>
-    public bool HasAnyTag(TagComponent component, IEnumerable<string> ids)
+    public bool AddTag(Entity<TagComponent> entity, ProtoId<TagPrototype> tag)
     {
-        foreach (var id in ids)
-        {
-            AssertValidTag(id);
+#if DEBUG
+        AssertValidTag(tag);
+#endif
+        if (!entity.Comp.Tags.Add(tag))
+            return false;
 
-            if (component.Tags.Contains(id))
-            {
-                return true;
-            }
-        }
+        Dirty(entity);
+        return true;
+    }
 
-        return false;
+    /// <summary>
+    /// Tries to add the given tags if they don't already exist.
+    /// </summary>
+    /// <returns>
+    /// true if any tags were added, false if they all already existed.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool AddTags(Entity<TagComponent> entity, params ProtoId<TagPrototype>[] tags)
+    {
+        return AddTags(entity, (IEnumerable<ProtoId<TagPrototype>>)tags);
     }
 
     /// <summary>
-    ///     Checks if any of the given tags have been added.
+    /// Tries to add the given tags if they don't already exist.
     /// </summary>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if any of them exist, false otherwise.</returns>
+    /// <returns>
+    /// true if any tags were added, false if they all already existed.
+    /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
     /// </exception>
-    public bool HasAnyTag(TagComponent comp, List<ProtoId<TagPrototype>> ids)
+    public bool AddTags(Entity<TagComponent> entity, IEnumerable<ProtoId<TagPrototype>> tags)
     {
-        foreach (var id in ids)
+        var update = false;
+        foreach (var tag in tags)
         {
-            AssertValidTag(id);
-
-            if (comp.Tags.Contains(id))
-                return true;
+#if DEBUG
+            AssertValidTag(tag);
+#endif
+            if (entity.Comp.Tags.Add(tag) && !update)
+                update = true;
         }
 
-        return false;
+        if (!update)
+            return false;
+
+        Dirty(entity);
+        return true;
     }
 
     /// <summary>
-    ///     Tries to remove a tag if it exists.
+    /// Tries to remove a tag if it exists.
     /// </summary>
     /// <returns>
-    ///     true if it was removed, false otherwise even if it didn't exist.
+    /// true if it was removed, false otherwise even if it didn't exist.
     /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if no <see cref="TagPrototype"/> exists with the given id.
+    /// Thrown if no <see cref="TagPrototype"/> exists with the given id.
     /// </exception>
-    public bool RemoveTag(EntityUid uid, TagComponent component, string id)
+    public bool RemoveTag(Entity<TagComponent> entity, ProtoId<TagPrototype> tag)
     {
-        AssertValidTag(id);
+#if DEBUG
+        AssertValidTag(tag);
+#endif
 
-        if (component.Tags.Remove(id))
-        {
-            Dirty(uid, component);
-            return true;
-        }
+        if (!entity.Comp.Tags.Remove(tag))
+            return false;
 
-        return false;
+        Dirty(entity);
+        return true;
     }
 
     /// <summary>
-    ///     Tries to remove all of the given tags if they exist.
+    /// Tries to remove all of the given tags if they exist.
     /// </summary>
-    /// <param name="ids">The tags to remove.</param>
     /// <returns>
-    ///     true if it was removed, false otherwise even if they didn't exist.
+    /// true if any tag was removed, false otherwise.
     /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
     /// </exception>
-    public bool RemoveTags(EntityUid uid, TagComponent component, params string[] ids)
+    public bool RemoveTags(Entity<TagComponent> entity, params ProtoId<TagPrototype>[] tags)
     {
-        return RemoveTags(uid, component, ids.AsEnumerable());
+        return RemoveTags(entity, (IEnumerable<ProtoId<TagPrototype>>)tags);
     }
 
     /// <summary>
-    ///     Tries to remove all of the given tags if they exist.
+    /// Tries to remove all of the given tags if they exist.
     /// </summary>
-    /// <param name="ids">The tags to remove.</param>
-    /// <returns>true if any tag was removed, false otherwise.</returns>
+    /// <returns>
+    /// true if any tag was removed, false otherwise.
+    /// </returns>
     /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
     /// </exception>
-    public bool RemoveTags(EntityUid uid, TagComponent component, IEnumerable<string> ids)
+    public bool RemoveTags(Entity<TagComponent> entity, IEnumerable<ProtoId<TagPrototype>> tags)
     {
-        var count = component.Tags.Count;
-
-        foreach (var id in ids)
+        var update = false;
+        foreach (var tag in tags)
         {
-            AssertValidTag(id);
-            component.Tags.Remove(id);
+#if DEBUG
+            AssertValidTag(tag);
+#endif
+            if (entity.Comp.Tags.Remove(tag) && !update)
+                update = true;
         }
 
-        if (component.Tags.Count < count)
-        {
-            Dirty(uid, component);
-            return true;
-        }
+        if (!update)
+            return false;
 
-        return false;
+        Dirty(entity);
+        return true;
+    }
+
+    private void AssertValidTag(string id)
+    {
+        DebugTools.Assert(_proto.HasIndex<TagPrototype>(id), $"Unknown tag: {id}");
     }
 }

From cfb1fdf94b52cc863c7acf9566fff6ff830d1d41 Mon Sep 17 00:00:00 2001
From: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com>
Date: Sun, 2 Jun 2024 11:11:19 +1000
Subject: [PATCH 244/366] Cleans up tag system (#28272)

* Updated tag system

* Added params methods

* Fixed tag integration tests

* Fixed params methods recursion

* Revert has All/Any tag one argument realisation

* Updated tag integration tests

* Shit happens

* Added individual List/HashSet methods, docs, tests
---
 Content.Client/Verbs/VerbSystem.cs            |   3 +-
 Content.IntegrationTests/Tests/Tag/TagTest.cs | 161 ++++++++++++------
 .../Administration/Toolshed/TagCommand.cs     |   6 +-
 .../Mech/Systems/MechAssemblySystem.cs        |   2 +-
 .../Procedural/DungeonJob.PostGen.cs          |   5 +-
 Content.Server/Procedural/DungeonJob.cs       |   5 +-
 Content.Server/Procedural/DungeonSystem.cs    |   4 +
 .../EntitySystems/RevenantSystem.Abilities.cs |   2 +-
 Content.Server/Spreader/SpreaderSystem.cs     |  10 +-
 .../SharedChameleonClothingSystem.cs          |   5 +-
 .../Conditions/NoWindowsInTile.cs             |   3 +-
 .../EntitySystems/AnchorableSystem.cs         |  11 +-
 .../MultipleTagsConstructionGraphStep.cs      |  13 +-
 .../Pinpointer/SharedNavMapSystem.cs          |   4 +-
 Content.Shared/Tag/TagComponent.cs            |  16 +-
 Content.Shared/Tag/TagComponentState.cs       |  15 --
 Content.Shared/Tag/TagPrototype.cs            |  24 ++-
 17 files changed, 162 insertions(+), 127 deletions(-)
 delete mode 100644 Content.Shared/Tag/TagComponentState.cs

diff --git a/Content.Client/Verbs/VerbSystem.cs b/Content.Client/Verbs/VerbSystem.cs
index 2e6c5f58099..5f1f49e5fd0 100644
--- a/Content.Client/Verbs/VerbSystem.cs
+++ b/Content.Client/Verbs/VerbSystem.cs
@@ -123,7 +123,6 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true
             if ((visibility & MenuVisibility.Invisible) == 0)
             {
                 var spriteQuery = GetEntityQuery<SpriteComponent>();
-                var tagQuery = GetEntityQuery<TagComponent>();
 
                 for (var i = entities.Count - 1; i >= 0; i--)
                 {
@@ -131,7 +130,7 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true
 
                     if (!spriteQuery.TryGetComponent(entity, out var spriteComponent) ||
                         !spriteComponent.Visible ||
-                        _tagSystem.HasTag(entity, "HideContextMenu", tagQuery))
+                        _tagSystem.HasTag(entity, "HideContextMenu"))
                     {
                         entities.RemoveSwap(i);
                     }
diff --git a/Content.IntegrationTests/Tests/Tag/TagTest.cs b/Content.IntegrationTests/Tests/Tag/TagTest.cs
index cbcdd1c6c62..e6cd2accaf5 100644
--- a/Content.IntegrationTests/Tests/Tag/TagTest.cs
+++ b/Content.IntegrationTests/Tests/Tag/TagTest.cs
@@ -53,11 +53,13 @@ public async Task TagComponentTest()
 
             EntityUid sTagDummy = default;
             TagComponent sTagComponent = null!;
+            Entity<TagComponent> sTagEntity = default;
 
             await server.WaitPost(() =>
             {
                 sTagDummy = sEntityManager.SpawnEntity(TagEntityId, MapCoordinates.Nullspace);
                 sTagComponent = sEntityManager.GetComponent<TagComponent>(sTagDummy);
+                sTagEntity = new Entity<TagComponent>(sTagDummy, sTagComponent);
             });
 
             await server.WaitAssertion(() =>
@@ -130,49 +132,64 @@ await server.WaitAssertion(() =>
                 Assert.Multiple(() =>
                 {
                     // Cannot add the starting tag again
-                    Assert.That(tagSystem.AddTag(sTagDummy, sTagComponent, StartingTag), Is.False);
-                    Assert.That(tagSystem.AddTags(sTagDummy, sTagComponent, StartingTag, StartingTag), Is.False);
-                    Assert.That(tagSystem.AddTags(sTagDummy, sTagComponent, new List<string> { StartingTag, StartingTag }), Is.False);
+                    Assert.That(tagSystem.AddTag(sTagEntity, StartingTag), Is.False);
+
+                    Assert.That(tagSystem.AddTags(sTagEntity, StartingTag, StartingTag), Is.False);
+                    Assert.That(tagSystem.AddTags(sTagEntity, new List<ProtoId<TagPrototype>> { StartingTag, StartingTag }), Is.False);
+                    Assert.That(tagSystem.AddTags(sTagEntity, new HashSet<ProtoId<TagPrototype>> { StartingTag, StartingTag }), Is.False);
 
                     // Has the starting tag
                     Assert.That(tagSystem.HasTag(sTagComponent, StartingTag), Is.True);
+
                     Assert.That(tagSystem.HasAllTags(sTagComponent, StartingTag, StartingTag), Is.True);
-                    Assert.That(tagSystem.HasAllTags(sTagComponent, new List<string> { StartingTag, StartingTag }), Is.True);
+                    Assert.That(tagSystem.HasAllTags(sTagComponent, new List<ProtoId<TagPrototype>> { StartingTag, StartingTag }), Is.True);
+                    Assert.That(tagSystem.HasAllTags(sTagComponent, new HashSet<ProtoId<TagPrototype>> { StartingTag, StartingTag }), Is.True);
+
                     Assert.That(tagSystem.HasAnyTag(sTagComponent, StartingTag, StartingTag), Is.True);
-                    Assert.That(tagSystem.HasAnyTag(sTagComponent, new List<string> { StartingTag, StartingTag }), Is.True);
+                    Assert.That(tagSystem.HasAnyTag(sTagComponent, new List<ProtoId<TagPrototype>> { StartingTag, StartingTag }), Is.True);
+                    Assert.That(tagSystem.HasAnyTag(sTagComponent, new HashSet<ProtoId<TagPrototype>> { StartingTag, StartingTag }), Is.True);
 
                     // Does not have the added tag yet
                     Assert.That(tagSystem.HasTag(sTagComponent, AddedTag), Is.False);
+
                     Assert.That(tagSystem.HasAllTags(sTagComponent, AddedTag, AddedTag), Is.False);
-                    Assert.That(tagSystem.HasAllTags(sTagComponent, new List<string> { AddedTag, AddedTag }), Is.False);
+                    Assert.That(tagSystem.HasAllTags(sTagComponent, new List<ProtoId<TagPrototype>> { AddedTag, AddedTag }), Is.False);
+                    Assert.That(tagSystem.HasAllTags(sTagComponent, new HashSet<ProtoId<TagPrototype>> { AddedTag, AddedTag }), Is.False);
+
                     Assert.That(tagSystem.HasAnyTag(sTagComponent, AddedTag, AddedTag), Is.False);
-                    Assert.That(tagSystem.HasAnyTag(sTagComponent, new List<string> { AddedTag, AddedTag }), Is.False);
+                    Assert.That(tagSystem.HasAnyTag(sTagComponent, new List<ProtoId<TagPrototype>> { AddedTag, AddedTag }), Is.False);
+                    Assert.That(tagSystem.HasAnyTag(sTagComponent, new HashSet<ProtoId<TagPrototype>> { AddedTag, AddedTag }), Is.False);
 
                     // Has a combination of the two tags
                     Assert.That(tagSystem.HasAnyTag(sTagComponent, StartingTag, AddedTag), Is.True);
-                    Assert.That(tagSystem.HasAnyTag(sTagComponent, new List<string> { StartingTag, AddedTag }), Is.True);
+                    Assert.That(tagSystem.HasAnyTag(sTagComponent, new List<ProtoId<TagPrototype>> { StartingTag, AddedTag }), Is.True);
+                    Assert.That(tagSystem.HasAnyTag(sTagComponent, new HashSet<ProtoId<TagPrototype>> { StartingTag, AddedTag }), Is.True);
 
                     // Does not have both tags
                     Assert.That(tagSystem.HasAllTags(sTagComponent, StartingTag, AddedTag), Is.False);
-                    Assert.That(tagSystem.HasAllTags(sTagComponent, new List<string> { StartingTag, AddedTag }), Is.False);
+                    Assert.That(tagSystem.HasAllTags(sTagComponent, new List<ProtoId<TagPrototype>> { StartingTag, AddedTag }), Is.False);
+                    Assert.That(tagSystem.HasAllTags(sTagComponent, new HashSet<ProtoId<TagPrototype>> { StartingTag, AddedTag }), Is.False);
 
                     // Cannot remove a tag that does not exist
-                    Assert.That(tagSystem.RemoveTag(sTagDummy, sTagComponent, AddedTag), Is.False);
-                    Assert.That(tagSystem.RemoveTags(sTagDummy, sTagComponent, AddedTag, AddedTag), Is.False);
-                    Assert.That(tagSystem.RemoveTags(sTagDummy, sTagComponent, new List<string> { AddedTag, AddedTag }), Is.False);
+                    Assert.That(tagSystem.RemoveTag(sTagEntity, AddedTag), Is.False);
+
+                    Assert.That(tagSystem.RemoveTags(sTagEntity, AddedTag, AddedTag), Is.False);
+                    Assert.That(tagSystem.RemoveTags(sTagEntity, new List<ProtoId<TagPrototype>> { AddedTag, AddedTag }), Is.False);
+                    Assert.That(tagSystem.RemoveTags(sTagEntity, new HashSet<ProtoId<TagPrototype>> { AddedTag, AddedTag }), Is.False);
                 });
 
                 // Can add the new tag
-                Assert.That(tagSystem.AddTag(sTagDummy, sTagComponent, AddedTag), Is.True);
+                Assert.That(tagSystem.AddTag(sTagEntity, AddedTag), Is.True);
 
                 Assert.Multiple(() =>
                 {
                     // Cannot add it twice
-                    Assert.That(tagSystem.AddTag(sTagDummy, sTagComponent, AddedTag), Is.False);
+                    Assert.That(tagSystem.AddTag(sTagEntity, AddedTag), Is.False);
 
                     // Cannot add existing tags
-                    Assert.That(tagSystem.AddTags(sTagDummy, sTagComponent, StartingTag, AddedTag), Is.False);
-                    Assert.That(tagSystem.AddTags(sTagDummy, sTagComponent, new List<string> { StartingTag, AddedTag }), Is.False);
+                    Assert.That(tagSystem.AddTags(sTagEntity, StartingTag, AddedTag), Is.False);
+                    Assert.That(tagSystem.AddTags(sTagEntity, new List<ProtoId<TagPrototype>> { StartingTag, AddedTag }), Is.False);
+                    Assert.That(tagSystem.AddTags(sTagEntity, new HashSet<ProtoId<TagPrototype>> { StartingTag, AddedTag }), Is.False);
 
                     // Now has two tags
                     Assert.That(sTagComponent.Tags, Has.Count.EqualTo(2));
@@ -180,65 +197,103 @@ await server.WaitAssertion(() =>
                     // Has both tags
                     Assert.That(tagSystem.HasTag(sTagComponent, StartingTag), Is.True);
                     Assert.That(tagSystem.HasTag(sTagComponent, AddedTag), Is.True);
+
                     Assert.That(tagSystem.HasAllTags(sTagComponent, StartingTag, StartingTag), Is.True);
                     Assert.That(tagSystem.HasAllTags(sTagComponent, AddedTag, StartingTag), Is.True);
-                    Assert.That(tagSystem.HasAllTags(sTagComponent, new List<string> { StartingTag, AddedTag }), Is.True);
-                    Assert.That(tagSystem.HasAllTags(sTagComponent, new List<string> { AddedTag, StartingTag }), Is.True);
+                    Assert.That(tagSystem.HasAllTags(sTagComponent, new List<ProtoId<TagPrototype>> { StartingTag, AddedTag }), Is.True);
+                    Assert.That(tagSystem.HasAllTags(sTagComponent, new List<ProtoId<TagPrototype>> { AddedTag, StartingTag }), Is.True);
+                    Assert.That(tagSystem.HasAllTags(sTagComponent, new HashSet<ProtoId<TagPrototype>> { StartingTag, AddedTag }), Is.True);
+                    Assert.That(tagSystem.HasAllTags(sTagComponent, new HashSet<ProtoId<TagPrototype>> { AddedTag, StartingTag }), Is.True);
+
                     Assert.That(tagSystem.HasAnyTag(sTagComponent, StartingTag, AddedTag), Is.True);
                     Assert.That(tagSystem.HasAnyTag(sTagComponent, AddedTag, StartingTag), Is.True);
+                    Assert.That(tagSystem.HasAnyTag(sTagComponent, new List<ProtoId<TagPrototype>> { StartingTag, AddedTag }), Is.True);
+                    Assert.That(tagSystem.HasAnyTag(sTagComponent, new List<ProtoId<TagPrototype>> { AddedTag, StartingTag }), Is.True);
+                    Assert.That(tagSystem.HasAnyTag(sTagComponent, new HashSet<ProtoId<TagPrototype>> { StartingTag, AddedTag }), Is.True);
+                    Assert.That(tagSystem.HasAnyTag(sTagComponent, new HashSet<ProtoId<TagPrototype>> { AddedTag, StartingTag }), Is.True);
                 });
 
                 Assert.Multiple(() =>
                 {
                     // Remove the existing starting tag
-                    Assert.That(tagSystem.RemoveTag(sTagDummy, sTagComponent, StartingTag), Is.True);
+                    Assert.That(tagSystem.RemoveTag(sTagEntity, StartingTag), Is.True);
 
                     // Remove the existing added tag
-                    Assert.That(tagSystem.RemoveTags(sTagDummy, sTagComponent, AddedTag, AddedTag), Is.True);
+                    Assert.That(tagSystem.RemoveTags(sTagEntity, AddedTag, AddedTag), Is.True);
                 });
 
                 Assert.Multiple(() =>
                 {
                     // No tags left to remove
-                    Assert.That(tagSystem.RemoveTags(sTagDummy, sTagComponent, new List<string> { StartingTag, AddedTag }), Is.False);
+                    Assert.That(tagSystem.RemoveTags(sTagEntity, new List<ProtoId<TagPrototype>> { StartingTag, AddedTag }), Is.False);
 
                     // No tags left in the component
                     Assert.That(sTagComponent.Tags, Is.Empty);
                 });
 
-#if !DEBUG
-                return;
+                // It is run only in DEBUG build,
+                // as the checks are performed only in DEBUG build.
+#if DEBUG
+                // Has single
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasTag(sTagDummy, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasTag(sTagComponent, UnregisteredTag); });
+
+                // HasAny entityUid methods
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAnyTag(sTagDummy, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAnyTag(sTagDummy, UnregisteredTag, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAnyTag(sTagDummy, new List<ProtoId<TagPrototype>> { UnregisteredTag }); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAnyTag(sTagDummy, new HashSet<ProtoId<TagPrototype>> { UnregisteredTag }); });
+
+                // HasAny component methods
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAnyTag(sTagComponent, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAnyTag(sTagComponent, UnregisteredTag, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAnyTag(sTagComponent, new List<ProtoId<TagPrototype>> { UnregisteredTag }); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAnyTag(sTagComponent, new HashSet<ProtoId<TagPrototype>> { UnregisteredTag }); });
+
+                // HasAll entityUid methods
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAllTags(sTagDummy, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAllTags(sTagDummy, UnregisteredTag, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAllTags(sTagDummy, new List<ProtoId<TagPrototype>> { UnregisteredTag }); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAllTags(sTagDummy, new HashSet<ProtoId<TagPrototype>> { UnregisteredTag }); });
+
+                // HasAll component methods
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAllTags(sTagComponent, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAllTags(sTagComponent, UnregisteredTag, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAllTags(sTagComponent, new List<ProtoId<TagPrototype>> { UnregisteredTag }); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAllTags(sTagComponent, new HashSet<ProtoId<TagPrototype>> { UnregisteredTag }); });
+
+                // RemoveTag single
+                Assert.Throws<DebugAssertException>(() => { tagSystem.RemoveTag(sTagDummy, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.RemoveTag(sTagEntity, UnregisteredTag); });
+
+                // RemoveTags entityUid methods
+                Assert.Throws<DebugAssertException>(() => { tagSystem.RemoveTags(sTagDummy, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.RemoveTags(sTagDummy, UnregisteredTag, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.RemoveTags(sTagDummy, new List<ProtoId<TagPrototype>> { UnregisteredTag }); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.RemoveTags(sTagDummy, new HashSet<ProtoId<TagPrototype>> { UnregisteredTag }); });
+
+                // RemoveTags entity methods
+                Assert.Throws<DebugAssertException>(() => { tagSystem.RemoveTags(sTagEntity, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.RemoveTags(sTagEntity, UnregisteredTag, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.RemoveTags(sTagEntity, new List<ProtoId<TagPrototype>> { UnregisteredTag }); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.RemoveTags(sTagEntity, new HashSet<ProtoId<TagPrototype>> { UnregisteredTag }); });
+
+                // AddTag single
+                Assert.Throws<DebugAssertException>(() => { tagSystem.AddTag(sTagDummy, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.AddTag(sTagEntity, UnregisteredTag); });
+
+                // AddTags entityUid methods
+                Assert.Throws<DebugAssertException>(() => { tagSystem.AddTags(sTagDummy, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.AddTags(sTagDummy, UnregisteredTag, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.AddTags(sTagDummy, new List<ProtoId<TagPrototype>> { UnregisteredTag }); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.AddTags(sTagDummy, new HashSet<ProtoId<TagPrototype>> { UnregisteredTag }); });
+
+                // AddTags entity methods
+                Assert.Throws<DebugAssertException>(() => { tagSystem.AddTags(sTagEntity, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.AddTags(sTagEntity, UnregisteredTag, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.AddTags(sTagEntity, new List<ProtoId<TagPrototype>> { UnregisteredTag }); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.AddTags(sTagEntity, new HashSet<ProtoId<TagPrototype>> { UnregisteredTag }); });
 #endif
-
-                // Single
-                Assert.Throws<DebugAssertException>(() =>
-                {
-                    tagSystem.HasTag(sTagDummy, UnregisteredTag);
-                });
-                Assert.Throws<DebugAssertException>(() =>
-                {
-                    tagSystem.HasTag(sTagComponent, UnregisteredTag);
-                });
-
-                // Any
-                Assert.Throws<DebugAssertException>(() =>
-                {
-                    tagSystem.HasAnyTag(sTagDummy, UnregisteredTag);
-                });
-                Assert.Throws<DebugAssertException>(() =>
-                {
-                    tagSystem.HasAnyTag(sTagComponent, UnregisteredTag);
-                });
-
-                // All
-                Assert.Throws<DebugAssertException>(() =>
-                {
-                    tagSystem.HasAllTags(sTagDummy, UnregisteredTag);
-                });
-                Assert.Throws<DebugAssertException>(() =>
-                {
-                    tagSystem.HasAllTags(sTagComponent, UnregisteredTag);
-                });
             });
             await pair.CleanReturnAsync();
         }
diff --git a/Content.Server/Administration/Toolshed/TagCommand.cs b/Content.Server/Administration/Toolshed/TagCommand.cs
index 9c5d1b62bf4..ad3b33a9429 100644
--- a/Content.Server/Administration/Toolshed/TagCommand.cs
+++ b/Content.Server/Administration/Toolshed/TagCommand.cs
@@ -14,14 +14,14 @@ public sealed class TagCommand : ToolshedCommand
     private TagSystem? _tag;
 
     [CommandImplementation("list")]
-    public IEnumerable<string> List([PipedArgument] IEnumerable<EntityUid> ent)
+    public IEnumerable<ProtoId<TagPrototype>> List([PipedArgument] IEnumerable<EntityUid> ent)
     {
         return ent.SelectMany(x =>
         {
             if (TryComp<TagComponent>(x, out var tags))
                 // Note: Cast is required for C# to figure out the type signature.
-                return (IEnumerable<string>)tags.Tags;
-            return Array.Empty<string>();
+                return (IEnumerable<ProtoId<TagPrototype>>)tags.Tags;
+            return Array.Empty<ProtoId<TagPrototype>>();
         });
     }
 
diff --git a/Content.Server/Mech/Systems/MechAssemblySystem.cs b/Content.Server/Mech/Systems/MechAssemblySystem.cs
index 57c0174657a..4b408343b7a 100644
--- a/Content.Server/Mech/Systems/MechAssemblySystem.cs
+++ b/Content.Server/Mech/Systems/MechAssemblySystem.cs
@@ -47,7 +47,7 @@ private void OnInteractUsing(EntityUid uid, MechAssemblyComponent component, Int
 
         foreach (var (tag, val) in component.RequiredParts)
         {
-            if (!val && tagComp.Tags.Contains(tag))
+            if (!val && _tag.HasTag(tagComp, tag))
             {
                 component.RequiredParts[tag] = true;
                 _container.Insert(args.Used, component.PartsContainer);
diff --git a/Content.Server/Procedural/DungeonJob.PostGen.cs b/Content.Server/Procedural/DungeonJob.PostGen.cs
index b326bcc378f..cb9e64f04e2 100644
--- a/Content.Server/Procedural/DungeonJob.PostGen.cs
+++ b/Content.Server/Procedural/DungeonJob.PostGen.cs
@@ -13,6 +13,7 @@
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
@@ -24,13 +25,15 @@ public sealed partial class DungeonJob
      * Run after the main dungeon generation
      */
 
+    private static readonly ProtoId<TagPrototype> WallTag = "Wall";
+
     private bool HasWall(MapGridComponent grid, Vector2i tile)
     {
         var anchored = _maps.GetAnchoredEntitiesEnumerator(_gridUid, _grid, tile);
 
         while (anchored.MoveNext(out var uid))
         {
-            if (_tagQuery.TryGetComponent(uid, out var tagComp) && tagComp.Tags.Contains("Wall"))
+            if (_tag.HasTag(uid.Value, WallTag))
                 return true;
         }
 
diff --git a/Content.Server/Procedural/DungeonJob.cs b/Content.Server/Procedural/DungeonJob.cs
index 8fecf1c9e8e..bf2822ff423 100644
--- a/Content.Server/Procedural/DungeonJob.cs
+++ b/Content.Server/Procedural/DungeonJob.cs
@@ -28,10 +28,10 @@ public sealed partial class DungeonJob : Job<Dungeon>
     private readonly DecalSystem _decals;
     private readonly DungeonSystem _dungeon;
     private readonly EntityLookupSystem _lookup;
+    private readonly TagSystem _tag;
     private readonly TileSystem _tile;
     private readonly SharedMapSystem _maps;
     private readonly SharedTransformSystem _transform;
-    private EntityQuery<TagComponent> _tagQuery;
 
     private readonly DungeonConfigPrototype _gen;
     private readonly int _seed;
@@ -53,6 +53,7 @@ public DungeonJob(
         DecalSystem decals,
         DungeonSystem dungeon,
         EntityLookupSystem lookup,
+        TagSystem tag,
         TileSystem tile,
         SharedTransformSystem transform,
         DungeonConfigPrototype gen,
@@ -72,10 +73,10 @@ public DungeonJob(
         _decals = decals;
         _dungeon = dungeon;
         _lookup = lookup;
+        _tag = tag;
         _tile = tile;
         _maps = _entManager.System<SharedMapSystem>();
         _transform = transform;
-        _tagQuery = _entManager.GetEntityQuery<TagComponent>();
 
         _gen = gen;
         _grid = grid;
diff --git a/Content.Server/Procedural/DungeonSystem.cs b/Content.Server/Procedural/DungeonSystem.cs
index 069508bcbbb..36009896a2c 100644
--- a/Content.Server/Procedural/DungeonSystem.cs
+++ b/Content.Server/Procedural/DungeonSystem.cs
@@ -10,6 +10,7 @@
 using Content.Shared.Maps;
 using Content.Shared.Physics;
 using Content.Shared.Procedural;
+using Content.Shared.Tag;
 using Robust.Server.GameObjects;
 using Robust.Shared.Configuration;
 using Robust.Shared.Console;
@@ -31,6 +32,7 @@ public sealed partial class DungeonSystem : SharedDungeonSystem
     [Dependency] private readonly AnchorableSystem _anchorable = default!;
     [Dependency] private readonly DecalSystem _decals = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
+    [Dependency] private readonly TagSystem _tag = default!;
     [Dependency] private readonly TileSystem _tile = default!;
     [Dependency] private readonly MapLoaderSystem _loader = default!;
     [Dependency] private readonly SharedMapSystem _maps = default!;
@@ -199,6 +201,7 @@ public void GenerateDungeon(DungeonConfigPrototype gen,
             _decals,
             this,
             _lookup,
+            _tag,
             _tile,
             _transform,
             gen,
@@ -231,6 +234,7 @@ public async Task<Dungeon> GenerateDungeonAsync(
             _decals,
             this,
             _lookup,
+            _tag,
             _tile,
             _transform,
             gen,
diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
index bf87cf5a600..c889d59f155 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
@@ -248,7 +248,7 @@ private void OnDefileAction(EntityUid uid, RevenantComponent component, Revenant
         foreach (var ent in lookup)
         {
             //break windows
-            if (tags.HasComponent(ent) && _tag.HasAnyTag(ent, "Window"))
+            if (tags.HasComponent(ent) && _tag.HasTag(ent, "Window"))
             {
                 //hardcoded damage specifiers til i die.
                 var dspec = new DamageSpecifier();
diff --git a/Content.Server/Spreader/SpreaderSystem.cs b/Content.Server/Spreader/SpreaderSystem.cs
index fe14d86aa1d..7de8a43d354 100644
--- a/Content.Server/Spreader/SpreaderSystem.cs
+++ b/Content.Server/Spreader/SpreaderSystem.cs
@@ -21,6 +21,7 @@ public sealed class SpreaderSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
     [Dependency] private readonly SharedMapSystem _map = default!;
+    [Dependency] private readonly TagSystem _tag = default!;
 
     /// <summary>
     /// Cached maximum number of updates per spreader prototype. This is applied per-grid.
@@ -37,8 +38,7 @@ public sealed class SpreaderSystem : EntitySystem
 
     public const float SpreadCooldownSeconds = 1;
 
-    [ValidatePrototypeId<TagPrototype>]
-    private const string IgnoredTag = "SpreaderIgnore";
+    private static readonly ProtoId<TagPrototype> IgnoredTag = "SpreaderIgnore";
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -189,7 +189,6 @@ public void GetNeighbors(EntityUid uid, TransformComponent comp, ProtoId<EdgeSpr
         var airtightQuery = GetEntityQuery<AirtightComponent>();
         var dockQuery = GetEntityQuery<DockingComponent>();
         var xformQuery = GetEntityQuery<TransformComponent>();
-        var tagQuery = GetEntityQuery<TagComponent>();
         var blockedAtmosDirs = AtmosDirection.Invalid;
 
         // Due to docking ports they may not necessarily be opposite directions.
@@ -212,7 +211,7 @@ public void GetNeighbors(EntityUid uid, TransformComponent comp, ProtoId<EdgeSpr
 
             // If we're on a blocked tile work out which directions we can go.
             if (!airtightQuery.TryGetComponent(ent, out var airtight) || !airtight.AirBlocked ||
-                tagQuery.TryGetComponent(ent, out var tags) && tags.Tags.Contains(IgnoredTag))
+                _tag.HasTag(ent.Value, IgnoredTag))
             {
                 continue;
             }
@@ -250,8 +249,7 @@ public void GetNeighbors(EntityUid uid, TransformComponent comp, ProtoId<EdgeSpr
 
             while (directionEnumerator.MoveNext(out var ent))
             {
-                if (!airtightQuery.TryGetComponent(ent, out var airtight) || !airtight.AirBlocked ||
-                    tagQuery.TryGetComponent(ent, out var tags) && tags.Tags.Contains(IgnoredTag))
+                if (!airtightQuery.TryGetComponent(ent, out var airtight) || !airtight.AirBlocked || _tag.HasTag(ent.Value, IgnoredTag))
                 {
                     continue;
                 }
diff --git a/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs
index 5bf1e6739e9..f5df04037ee 100644
--- a/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs
@@ -12,9 +12,10 @@ public abstract class SharedChameleonClothingSystem : EntitySystem
 {
     [Dependency] private readonly IComponentFactory _factory = default!;
     [Dependency] private readonly IPrototypeManager _proto = default!;
-    [Dependency] private readonly SharedItemSystem _itemSystem = default!;
     [Dependency] private readonly ClothingSystem _clothingSystem = default!;
     [Dependency] private readonly MetaDataSystem _metaData = default!;
+    [Dependency] private readonly SharedItemSystem _itemSystem = default!;
+    [Dependency] private readonly TagSystem _tag = default!;
 
     public override void Initialize()
     {
@@ -81,7 +82,7 @@ public bool IsValidTarget(EntityPrototype proto, SlotFlags chameleonSlot = SlotF
             return false;
 
         // check if it is marked as valid chameleon target
-        if (!proto.TryGetComponent(out TagComponent? tags, _factory) || !tags.Tags.Contains("WhitelistChameleon"))
+        if (!proto.TryGetComponent(out TagComponent? tag, _factory) || !_tag.HasTag(tag, "WhitelistChameleon"))
             return false;
 
         // check if it's valid clothing
diff --git a/Content.Shared/Construction/Conditions/NoWindowsInTile.cs b/Content.Shared/Construction/Conditions/NoWindowsInTile.cs
index be6bc2cfacb..3ae3b593627 100644
--- a/Content.Shared/Construction/Conditions/NoWindowsInTile.cs
+++ b/Content.Shared/Construction/Conditions/NoWindowsInTile.cs
@@ -12,13 +12,12 @@ public sealed partial class NoWindowsInTile : IConstructionCondition
         public bool Condition(EntityUid user, EntityCoordinates location, Direction direction)
         {
             var entManager = IoCManager.Resolve<IEntityManager>();
-            var tagQuery = entManager.GetEntityQuery<TagComponent>();
             var sysMan = entManager.EntitySysManager;
             var tagSystem = sysMan.GetEntitySystem<TagSystem>();
 
             foreach (var entity in location.GetEntitiesInTile(LookupFlags.Static))
             {
-                if (tagSystem.HasTag(entity, "Window", tagQuery))
+                if (tagSystem.HasTag(entity, "Window"))
                     return false;
             }
 
diff --git a/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs b/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
index 94453b84706..efb5dfd0248 100644
--- a/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
+++ b/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
@@ -15,6 +15,7 @@
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
 using Content.Shared.Tag;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem;
@@ -32,16 +33,14 @@ public sealed partial class AnchorableSystem : EntitySystem
     [Dependency] private   readonly TagSystem _tagSystem = default!;
 
     private EntityQuery<PhysicsComponent> _physicsQuery;
-    private EntityQuery<TagComponent> _tagQuery;
 
-    public const string Unstackable = "Unstackable";
+    public readonly ProtoId<TagPrototype> Unstackable = "Unstackable";
 
     public override void Initialize()
     {
         base.Initialize();
 
         _physicsQuery = GetEntityQuery<PhysicsComponent>();
-        _tagQuery = GetEntityQuery<TagComponent>();
 
         SubscribeLocalEvent<AnchorableComponent, InteractUsingEvent>(OnInteractUsing,
             before: new[] { typeof(ItemSlotsSystem) }, after: new[] { typeof(SharedConstructionSystem) });
@@ -312,7 +311,7 @@ public bool AnyUnstackable(EntityUid uid, EntityCoordinates location)
         DebugTools.Assert(!Transform(uid).Anchored);
 
         // If we are unstackable, iterate through any other entities anchored on the current square
-        return _tagSystem.HasTag(uid, Unstackable, _tagQuery) && AnyUnstackablesAnchoredAt(location);
+        return _tagSystem.HasTag(uid, Unstackable) && AnyUnstackablesAnchoredAt(location);
     }
 
     public bool AnyUnstackablesAnchoredAt(EntityCoordinates location)
@@ -327,10 +326,8 @@ public bool AnyUnstackablesAnchoredAt(EntityCoordinates location)
         while (enumerator.MoveNext(out var entity))
         {
             // If we find another unstackable here, return true.
-            if (_tagSystem.HasTag(entity.Value, Unstackable, _tagQuery))
-            {
+            if (_tagSystem.HasTag(entity.Value, Unstackable))
                 return true;
-            }
         }
 
         return false;
diff --git a/Content.Shared/Construction/Steps/MultipleTagsConstructionGraphStep.cs b/Content.Shared/Construction/Steps/MultipleTagsConstructionGraphStep.cs
index 668952dac23..07ba46946a6 100644
--- a/Content.Shared/Construction/Steps/MultipleTagsConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/MultipleTagsConstructionGraphStep.cs
@@ -1,14 +1,15 @@
 using Content.Shared.Tag;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Construction.Steps
 {
     public sealed partial class MultipleTagsConstructionGraphStep : ArbitraryInsertConstructionGraphStep
     {
         [DataField("allTags")]
-        private List<string>? _allTags;
+        private List<ProtoId<TagPrototype>>? _allTags;
 
         [DataField("anyTags")]
-        private List<string>? _anyTags;
+        private List<ProtoId<TagPrototype>>? _anyTags;
 
         private static bool IsNullOrEmpty<T>(ICollection<T>? list)
         {
@@ -21,16 +22,12 @@ public override bool EntityValid(EntityUid uid, IEntityManager entityManager, IC
             if (IsNullOrEmpty(_allTags) && IsNullOrEmpty(_anyTags))
                 return false; // Step is somehow invalid, we return.
 
-            // No tags at all.
-            if (!entityManager.TryGetComponent(uid, out TagComponent? tags))
-                return false;
-
             var tagSystem = entityManager.EntitySysManager.GetEntitySystem<TagSystem>();
 
-            if (_allTags != null && !tagSystem.HasAllTags(tags, _allTags))
+            if (_allTags != null && !tagSystem.HasAllTags(uid, _allTags))
                 return false; // We don't have all the tags needed.
 
-            if (_anyTags != null && !tagSystem.HasAnyTag(tags, _anyTags))
+            if (_anyTags != null && !tagSystem.HasAnyTag(uid, _anyTags))
                 return false; // We don't have any of the tags needed.
 
             // This entity is valid!
diff --git a/Content.Shared/Pinpointer/SharedNavMapSystem.cs b/Content.Shared/Pinpointer/SharedNavMapSystem.cs
index 8575d121f39..37d60dec28a 100644
--- a/Content.Shared/Pinpointer/SharedNavMapSystem.cs
+++ b/Content.Shared/Pinpointer/SharedNavMapSystem.cs
@@ -25,7 +25,7 @@ public abstract class SharedNavMapSystem : EntitySystem
     [Robust.Shared.IoC.Dependency] private readonly TagSystem _tagSystem = default!;
     [Robust.Shared.IoC.Dependency] private readonly INetManager _net = default!;
 
-    private readonly string[] _wallTags = ["Wall", "Window"];
+    private static readonly ProtoId<TagPrototype>[] WallTags = {"Wall", "Window"};
     private EntityQuery<NavMapDoorComponent> _doorQuery;
 
     public override void Initialize()
@@ -59,7 +59,7 @@ public NavMapChunkType GetEntityType(EntityUid uid)
         if (_doorQuery.HasComp(uid))
             return NavMapChunkType.Airlock;
 
-        if (_tagSystem.HasAnyTag(uid, _wallTags))
+        if (_tagSystem.HasAnyTag(uid, WallTags))
             return NavMapChunkType.Wall;
 
         return NavMapChunkType.Invalid;
diff --git a/Content.Shared/Tag/TagComponent.cs b/Content.Shared/Tag/TagComponent.cs
index b5b8a48a441..ad4240ba06c 100644
--- a/Content.Shared/Tag/TagComponent.cs
+++ b/Content.Shared/Tag/TagComponent.cs
@@ -1,13 +1,11 @@
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
+using Robust.Shared.Prototypes;
 
-namespace Content.Shared.Tag
+namespace Content.Shared.Tag;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(TagSystem))]
+public sealed partial class TagComponent : Component
 {
-    [RegisterComponent, NetworkedComponent, Access(typeof(TagSystem))]
-    public sealed partial class TagComponent : Component
-    {
-        [DataField("tags", customTypeSerializer: typeof(PrototypeIdHashSetSerializer<TagPrototype>))]
-        [Access(typeof(TagSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
-        public HashSet<string> Tags = new();
-    }
+    [DataField, ViewVariables, AutoNetworkedField]
+    public HashSet<ProtoId<TagPrototype>> Tags = new();
 }
diff --git a/Content.Shared/Tag/TagComponentState.cs b/Content.Shared/Tag/TagComponentState.cs
deleted file mode 100644
index 9919aba108d..00000000000
--- a/Content.Shared/Tag/TagComponentState.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Tag
-{
-    [Serializable, NetSerializable]
-    public sealed class TagComponentState : ComponentState
-    {
-        public TagComponentState(string[] tags)
-        {
-            Tags = tags;
-        }
-
-        public string[] Tags { get; }
-    }
-}
diff --git a/Content.Shared/Tag/TagPrototype.cs b/Content.Shared/Tag/TagPrototype.cs
index 2a06e22cf90..97f8c1af7d4 100644
--- a/Content.Shared/Tag/TagPrototype.cs
+++ b/Content.Shared/Tag/TagPrototype.cs
@@ -1,17 +1,15 @@
 using Robust.Shared.Prototypes;
 
-namespace Content.Shared.Tag
+namespace Content.Shared.Tag;
+
+/// <summary>
+/// Prototype representing a tag in YAML.
+/// Meant to only have an ID property, as that is the only thing that
+/// gets saved in TagComponent.
+/// </summary>
+[Prototype("Tag")]
+public sealed partial class TagPrototype : IPrototype
 {
-    /// <summary>
-    ///     Prototype representing a tag in YAML.
-    ///     Meant to only have an ID property, as that is the only thing that
-    ///     gets saved in TagComponent.
-    /// </summary>
-    [Prototype("Tag")]
-    public sealed partial class TagPrototype : IPrototype
-    {
-        [ViewVariables]
-        [IdDataField]
-        public string ID { get; private set; } = default!;
-    }
+    [IdDataField, ViewVariables]
+    public string ID { get; } = string.Empty;
 }

From 78bfce227b829c12baae7eb8a355fa99632ae202 Mon Sep 17 00:00:00 2001
From: osjarw <62134478+osjarw@users.noreply.github.com>
Date: Wed, 19 Jun 2024 03:20:57 +0300
Subject: [PATCH 245/366] Fix air alarms (#29172)

Broken by #28272
---
 Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
index b9ab1098977..81a3968e6ff 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
@@ -12,6 +12,7 @@
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Atmos.Monitor.Systems;
@@ -87,7 +88,7 @@ private void OnPacketRecv(EntityUid uid, AtmosAlarmableComponent component, Devi
             return;
 
         if (!args.Data.TryGetValue(DeviceNetworkConstants.Command, out string? cmd)
-            || !args.Data.TryGetValue(AlertSource, out HashSet<string>? sourceTags))
+            || !args.Data.TryGetValue(AlertSource, out HashSet<ProtoId<TagPrototype>>? sourceTags))
         {
             return;
         }

From 9bb4c93c7247db7c9b33cf590a0a3d60d427de77 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 21 Dec 2024 17:55:19 -0400
Subject: [PATCH 246/366] Fix melee and DB errors

---
 .../Commands/RoleBanListCommand.cs            |  3 +--
 .../Administration/Notes/AdminMessageEui.cs   | 17 +++++++------
 .../Administration/Systems/AdminSystem.cs     |  2 +-
 .../BasicStationEventSchedulerSystem.cs       |  1 +
 .../Weapons/Melee/SharedMeleeWeaponSystem.cs  | 24 +++++++++----------
 5 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/Content.Server/Administration/Commands/RoleBanListCommand.cs b/Content.Server/Administration/Commands/RoleBanListCommand.cs
index 6af17e6bc3d..c87a0b3b544 100644
--- a/Content.Server/Administration/Commands/RoleBanListCommand.cs
+++ b/Content.Server/Administration/Commands/RoleBanListCommand.cs
@@ -42,10 +42,9 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
         }
 
         var targetUid = located.UserId;
-        var targetHWid = located.LastHWId;
         var targetAddress = located.LastAddress;
 
-            var bans = await _dbManager.GetServerRoleBansAsync(data.LastAddress, data.UserId, data.LastLegacyHWId, data.LastModernHWIds, includeUnbanned);
+            var bans = await dbMan.GetServerRoleBansAsync(targetAddress, targetUid, located.LastLegacyHWId, located.LastModernHWIds, includeUnbanned);
 
         if (bans.Count == 0)
         {
diff --git a/Content.Server/Administration/Notes/AdminMessageEui.cs b/Content.Server/Administration/Notes/AdminMessageEui.cs
index 94523634635..e53394ab47d 100644
--- a/Content.Server/Administration/Notes/AdminMessageEui.cs
+++ b/Content.Server/Administration/Notes/AdminMessageEui.cs
@@ -14,9 +14,11 @@ public sealed class AdminMessageEui : BaseEui
 {
     [Dependency] private readonly IAdminNotesManager _notesMan = default!;
     [Dependency] private readonly IConfigurationManager _cfg = default!;
-    private readonly float _closeWait;
-    private AdminMessageRecord? _message;
-    private DateTime _startTime;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+
+    private readonly TimeSpan _closeWait;
+    private readonly TimeSpan _endTime;
+    private readonly AdminMessageRecord[] _messages;
 
     public AdminMessageEui(AdminMessageRecord[] messages)
     {
@@ -26,7 +28,7 @@ public AdminMessageEui(AdminMessageRecord[] messages)
         _messages = messages;
     }
 
-    public void SetMessage(AdminMessageRecord message)
+    public override void Opened()
     {
         StateDirty();
     }
@@ -35,9 +37,10 @@ public override EuiStateBase GetNewState()
     {
         return new AdminMessageEuiState(
             _closeWait,
-            _message.Message,
-            _message.CreatedBy?.LastSeenUserName ?? "[System]",
-            _message.CreatedAt.UtcDateTime
+            _messages.Select(x => new AdminMessageEuiState.Message(
+                x.Message,
+                x.CreatedBy?.LastSeenUserName ?? Loc.GetString("admin-notes-fallback-admin-name"),
+                x.CreatedAt.UtcDateTime)).ToArray()
         );
     }
 
diff --git a/Content.Server/Administration/Systems/AdminSystem.cs b/Content.Server/Administration/Systems/AdminSystem.cs
index 08056936e87..5612d3717a0 100644
--- a/Content.Server/Administration/Systems/AdminSystem.cs
+++ b/Content.Server/Administration/Systems/AdminSystem.cs
@@ -78,7 +78,7 @@ public override void Initialize()
             Subs.CVar(_config, CCVars.PanicBunkerCountDeadminnedAdmins, OnPanicBunkerCountDeadminnedAdminsChanged, true);
             Subs.CVar(_config, CCVars.PanicBunkerShowReason, OnShowReasonChanged, true);
             Subs.CVar(_config, CCVars.PanicBunkerMinAccountAge, OnPanicBunkerMinAccountAgeChanged, true);
-            Subs.CVar(_config, CCVars.PanicBunkerMinOverallMinutes, OnPanicBunkerMinOverallMinutesChanged, true);
+            Subs.CVar(_config, CCVars.PanicBunkerMinOverallHours, OnPanicBunkerMinOverallHoursChanged, true);
 
             /*
              * TODO: Remove baby jail code once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future.
diff --git a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
index 01730ef5930..9e507eefae9 100644
--- a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
+++ b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
@@ -9,6 +9,7 @@
 using Content.Shared.GameTicking.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Toolshed;
 using Robust.Shared.Utility;
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index 6cad299587c..4b506cc1200 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -840,17 +840,17 @@ private void OnItemToggle(EntityUid uid, ItemToggleMeleeWeaponComponent itemTogg
             if (itemToggleMelee.ActivatedSoundOnHitNoDamage != null)
             {
                 //Setting the deactivated sound on no damage hit to the weapon's regular value before changing it.
-                itemToggleMelee.DeactivatedSoundOnHitNoDamage ??= meleeWeapon.NoDamageSound;
-                meleeWeapon.NoDamageSound = itemToggleMelee.ActivatedSoundOnHitNoDamage;
-                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.NoDamageSound));
+                itemToggleMelee.DeactivatedSoundOnHitNoDamage ??= meleeWeapon.SoundNoDamage;
+                meleeWeapon.SoundNoDamage = itemToggleMelee.ActivatedSoundOnHitNoDamage;
+                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.SoundNoDamage));
             }
 
             if (itemToggleMelee.ActivatedSoundOnSwing != null)
             {
                 //Setting the deactivated sound on no damage hit to the weapon's regular value before changing it.
-                itemToggleMelee.DeactivatedSoundOnSwing ??= meleeWeapon.SwingSound;
-                meleeWeapon.SwingSound = itemToggleMelee.ActivatedSoundOnSwing;
-                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.SwingSound));
+                itemToggleMelee.DeactivatedSoundOnSwing ??= meleeWeapon.SoundSwing;
+                meleeWeapon.SoundSwing = itemToggleMelee.ActivatedSoundOnSwing;
+                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.SoundSwing));
             }
 
             if (itemToggleMelee.DeactivatedSecret)
@@ -866,19 +866,19 @@ private void OnItemToggle(EntityUid uid, ItemToggleMeleeWeaponComponent itemTogg
                 DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.Damage));
             }
 
-            meleeWeapon.HitSound = itemToggleMelee.DeactivatedSoundOnHit;
-            DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.HitSound));
+            meleeWeapon.SoundHit = itemToggleMelee.DeactivatedSoundOnHit;
+            DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.SoundHit));
 
             if (itemToggleMelee.DeactivatedSoundOnHitNoDamage != null)
             {
-                meleeWeapon.NoDamageSound = itemToggleMelee.DeactivatedSoundOnHitNoDamage;
-                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.NoDamageSound));
+                meleeWeapon.SoundNoDamage = itemToggleMelee.DeactivatedSoundOnHitNoDamage;
+                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.SoundNoDamage));
             }
 
             if (itemToggleMelee.DeactivatedSoundOnSwing != null)
             {
-                meleeWeapon.SwingSound = itemToggleMelee.DeactivatedSoundOnSwing;
-                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.SwingSound));
+                meleeWeapon.SoundSwing = itemToggleMelee.DeactivatedSoundOnSwing;
+                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.SoundSwing));
             }
 
             if (itemToggleMelee.DeactivatedSecret)

From c1b272ad73de37e19030f746880cf772911a789c Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 21 Dec 2024 17:59:03 -0400
Subject: [PATCH 247/366] Revert "Implement field-deltas for melee"

This reverts commit 67ed4c377bcaebf82ffab7d5b2d4f454faa23726.
---
 .../Weapons/Melee/MeleeWeaponComponent.cs     |  4 +--
 .../Weapons/Melee/SharedMeleeWeaponSystem.cs  | 27 +++++--------------
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
index 851699c9815..b33b2cbc4f6 100644
--- a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
+++ b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
@@ -11,7 +11,7 @@ namespace Content.Shared.Weapons.Melee;
 /// <summary>
 /// When given to a mob lets them do unarmed attacks, or when given to an item lets someone wield it to do attacks.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(fieldDeltas: true), AutoGenerateComponentPause]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
 public sealed partial class MeleeWeaponComponent : Component
 {
     // TODO: This is becoming bloated as shit.
@@ -96,7 +96,7 @@ public sealed partial class MeleeWeaponComponent : Component
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
     public bool ResistanceBypass = false;
-
+    
     /// <summary>
     /// Base damage for this weapon. Can be modified via heavy damage or other means.
     /// </summary>
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index 4b506cc1200..7a3e7ee503a 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -104,7 +104,7 @@ private void OnMeleeShot(EntityUid uid, MeleeWeaponComponent component, ref GunS
         if (gun.NextFire > component.NextAttack)
         {
             component.NextAttack = gun.NextFire;
-            DirtyField(uid, component, nameof(MeleeWeaponComponent.NextAttack));
+            Dirty(uid, component);
         }
     }
 
@@ -128,7 +128,7 @@ private void OnMeleeSelected(EntityUid uid, MeleeWeaponComponent component, Hand
             return;
 
         component.NextAttack = minimum;
-        DirtyField(uid, component, nameof(MeleeWeaponComponent.NextAttack));
+        Dirty(uid, component);
     }
 
     private void OnGetBonusMeleeDamage(EntityUid uid, BonusMeleeDamageComponent component, ref GetMeleeDamageEvent args)
@@ -168,7 +168,7 @@ private void OnStopAttack(StopAttackEvent msg, EntitySessionEventArgs args)
             return;
 
         weapon.Attacking = false;
-        DirtyField(weaponUid, weapon, nameof(MeleeWeaponComponent.Attacking));
+        Dirty(weaponUid, weapon);
     }
 
     private void OnLightAttack(LightAttackEvent msg, EntitySessionEventArgs args)
@@ -392,7 +392,7 @@ private bool AttemptAttack(EntityUid user, EntityUid weaponUid, MeleeWeaponCompo
             swings++;
         }
 
-        DirtyField(weaponUid, weapon, nameof(MeleeWeaponComponent.NextAttack));
+        Dirty(weaponUid, weapon);
 
         // Do this AFTER attack so it doesn't spam every tick
         var ev = new AttemptMeleeEvent();
@@ -832,7 +832,6 @@ private void OnItemToggle(EntityUid uid, ItemToggleMeleeWeaponComponent itemTogg
                 //Setting deactivated damage to the weapon's regular value before changing it.
                 itemToggleMelee.DeactivatedDamage ??= meleeWeapon.Damage;
                 meleeWeapon.Damage = itemToggleMelee.ActivatedDamage;
-                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.Damage));
             }
 
             meleeWeapon.SoundHit = itemToggleMelee.ActivatedSoundOnHit;
@@ -842,7 +841,6 @@ private void OnItemToggle(EntityUid uid, ItemToggleMeleeWeaponComponent itemTogg
                 //Setting the deactivated sound on no damage hit to the weapon's regular value before changing it.
                 itemToggleMelee.DeactivatedSoundOnHitNoDamage ??= meleeWeapon.SoundNoDamage;
                 meleeWeapon.SoundNoDamage = itemToggleMelee.ActivatedSoundOnHitNoDamage;
-                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.SoundNoDamage));
             }
 
             if (itemToggleMelee.ActivatedSoundOnSwing != null)
@@ -850,41 +848,28 @@ private void OnItemToggle(EntityUid uid, ItemToggleMeleeWeaponComponent itemTogg
                 //Setting the deactivated sound on no damage hit to the weapon's regular value before changing it.
                 itemToggleMelee.DeactivatedSoundOnSwing ??= meleeWeapon.SoundSwing;
                 meleeWeapon.SoundSwing = itemToggleMelee.ActivatedSoundOnSwing;
-                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.SoundSwing));
             }
 
             if (itemToggleMelee.DeactivatedSecret)
-            {
                 meleeWeapon.Hidden = false;
-            }
         }
         else
         {
             if (itemToggleMelee.DeactivatedDamage != null)
-            {
                 meleeWeapon.Damage = itemToggleMelee.DeactivatedDamage;
-                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.Damage));
-            }
 
             meleeWeapon.SoundHit = itemToggleMelee.DeactivatedSoundOnHit;
-            DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.SoundHit));
 
             if (itemToggleMelee.DeactivatedSoundOnHitNoDamage != null)
-            {
                 meleeWeapon.SoundNoDamage = itemToggleMelee.DeactivatedSoundOnHitNoDamage;
-                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.SoundNoDamage));
-            }
 
             if (itemToggleMelee.DeactivatedSoundOnSwing != null)
-            {
                 meleeWeapon.SoundSwing = itemToggleMelee.DeactivatedSoundOnSwing;
-                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.SoundSwing));
-            }
 
             if (itemToggleMelee.DeactivatedSecret)
-            {
                 meleeWeapon.Hidden = true;
-            }
         }
+
+        Dirty(uid, meleeWeapon);
     }
 }

From db0cd2c50adb42a6b33b82c60c0b24e8c522946d Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 21 Dec 2024 18:01:20 -0400
Subject: [PATCH 248/366] Revert "Implement some field-level deltas (#28242)"

This reverts commit ea0359eb6987fe02ad2101c1e7bc3a61bbc280cf.
---
 .../Body/Systems/BloodstreamSystem.cs         |   2 +-
 .../Body/Systems/MetabolizerSystem.cs         |   4 +-
 .../Body/Systems/RespiratorSystem.cs          |   7 +-
 Content.Server/Botany/SeedPrototype.cs        |   4 +-
 .../ReactionEffects/AreaReactionEffect.cs     |  83 ++++++++++
 .../CreateEntityReactionEffect.cs             |  17 +--
 .../ReactionEffects}/EmpReactionEffect.cs     |  21 +--
 .../ExplosionReactionEffect.cs                |  72 +++++++++
 .../SolutionTemperatureEffects.cs             | 121 +++++++++++++++
 .../BodyTemperature.cs                        |  36 +++++
 .../HasTagCondition.cs                        |  12 +-
 .../MobStateCondition.cs                      |  30 ++++
 .../ReagentEffectConditions/OrganType.cs      |  48 ++++++
 .../ReagentThreshold.cs                       |  51 +++++++
 .../SolutionTemperature.cs                    |  36 +++++
 .../ReagentEffectConditions/TotalDamage.cs    |  35 +++++
 .../ReagentEffectConditions/TotalHunger.cs    |  35 +++++
 .../ReagentEffects}/ActivateArtifact.cs       |  11 +-
 .../ReagentEffects/AddToSolutionReaction.cs   |  31 ++++
 .../ReagentEffects}/AdjustAlert.cs            |  16 +-
 .../ReagentEffects}/AdjustReagent.cs          |  56 +++----
 .../ReagentEffects}/AdjustTemperature.cs      |  17 +--
 .../ReagentEffects}/CauseZombieInfection.cs   |  13 +-
 .../ReagentEffects}/ChemAddMoodlet.cs         |   0
 .../ReagentEffects/ChemCleanBloodstream.cs    |  33 ++++
 .../ReagentEffects/ChemHealEyeDamage.cs       |  32 ++++
 .../ReagentEffects}/ChemVomit.cs              |  15 +-
 .../ReagentEffects}/CreateGas.cs              |  21 +--
 .../ReagentEffects}/CureZombieInfection.cs    |  17 ++-
 .../ReagentEffects}/Drunk.cs                  |  15 +-
 .../Chemistry/ReagentEffects/Electrocute.cs   |  31 ++++
 .../ReagentEffects}/Emote.cs                  |  12 +-
 .../ReagentEffects/ExtinguishReaction.cs      |  24 +++
 .../ReagentEffects/FlammableReaction.cs       |  34 +++++
 .../ReagentEffects}/HealthChange.cs           |  23 ++-
 .../Chemistry/ReagentEffects/Ignite.cs        |  25 +++
 .../ReagentEffects}/MakeSentient.cs           |  10 +-
 .../ReagentEffects/ModifyBleedAmount.cs       |  31 ++++
 .../ReagentEffects/ModifyBloodLevel.cs        |  32 ++++
 .../Chemistry/ReagentEffects/ModifyLungGas.cs |  30 ++++
 .../ReagentEffects/MovespeedModifier.cs       |  75 +++++++++
 .../Chemistry/ReagentEffects/Oxygenate.cs     |  25 +++
 .../ReagentEffects}/Paralyze.cs               |  14 +-
 .../PlantMetabolism/PlantAdjustAttribute.cs   |  45 ++++++
 .../PlantMetabolism/PlantAdjustHealth.cs      |  19 +++
 .../PlantAdjustMutationLevel.cs               |  15 ++
 .../PlantMetabolism/PlantAdjustMutationMod.cs |  17 +++
 .../PlantMetabolism/PlantAdjustNutrition.cs   |  20 +++
 .../PlantMetabolism/PlantAdjustPests.cs       |  17 +++
 .../PlantMetabolism/PlantAdjustToxins.cs      |  17 +++
 .../PlantMetabolism/PlantAdjustWater.cs       |  20 +++
 .../PlantMetabolism/PlantAdjustWeeds.cs       |  17 +++
 .../PlantMetabolism/PlantAffectGrowth.cs      |  20 +++
 .../PlantMetabolism/PlantCryoxadone.cs        |  33 ++++
 .../PlantMetabolism/PlantDiethylamine.cs      |  41 +++++
 .../PlantMetabolism/PlantPhalanximine.cs      |  24 +++
 .../PlantMetabolism/RobustHarvest.cs          |  54 +++++++
 .../ReagentEffects}/Polymorph.cs              |  11 +-
 .../ReagentEffects}/PopupMessage.cs           |  29 ++--
 .../ReagentEffects}/PurifyEvil.cs             |   0
 .../ReagentEffects}/ReduceRotting.cs          |  16 +-
 .../ReagentEffects}/ResetNarcolepsy.cs        |  14 +-
 .../ReagentEffects}/SatiateHunger.cs          |  23 +--
 .../Chemistry/ReagentEffects/SatiateThirst.cs |  32 ++++
 .../StatusEffects/GenericStatusEffect.cs      |  76 +++++++++
 .../ReagentEffects/StatusEffects/Jitter.cs    |  41 +++++
 .../ReagentEffects/WashCreamPieReaction.cs    |  22 +++
 .../ReagentEffects}/WearableReaction.cs       |  26 ++--
 .../EffectConditions/BodyTemperature.cs       |  35 -----
 .../EffectConditions/JobCondition.cs          |  39 -----
 .../EffectConditions/MobStateCondition.cs     |  29 ----
 .../EffectConditions/OrganType.cs             |  53 -------
 .../EffectConditions/ReagentThreshold.cs      |  57 -------
 .../EffectConditions/SolutionTemperature.cs   |  40 -----
 .../EffectConditions/TotalDamage.cs           |  34 -----
 .../EffectConditions/TotalHunger.cs           |  34 -----
 .../Effects/AddToSolutionReaction.cs          |  38 -----
 .../Effects/AreaReactionEffect.cs             |  91 -----------
 .../Effects/ChemCleanBloodstream.cs           |  40 -----
 .../Effects/ChemHealEyeDamage.cs              |  31 ----
 .../EntityEffects/Effects/Electrocute.cs      |  38 -----
 .../Effects/ExplosionReactionEffect.cs        |  77 ----------
 .../Effects/ExtinguishReaction.cs             |  36 -----
 .../Effects/FlammableReaction.cs              |  45 ------
 .../EntityEffects/Effects/Ignite.cs           |  31 ----
 .../Effects/ModifyBleedAmount.cs              |  35 -----
 .../EntityEffects/Effects/ModifyBloodLevel.cs |  37 -----
 .../EntityEffects/Effects/ModifyLungGas.cs    |  49 ------
 .../Effects/MovespeedModifier.cs              |  78 ----------
 .../EntityEffects/Effects/Oxygenate.cs        |  32 ----
 .../PlantMetabolism/PlantAdjustAttribute.cs   |  61 --------
 .../PlantMetabolism/PlantAdjustHealth.cs      |  21 ---
 .../PlantAdjustMutationLevel.cs               |  16 --
 .../PlantMetabolism/PlantAdjustMutationMod.cs |  19 ---
 .../PlantMetabolism/PlantAdjustNutrition.cs   |  21 ---
 .../PlantMetabolism/PlantAdjustPests.cs       |  20 ---
 .../PlantMetabolism/PlantAdjustToxins.cs      |  20 ---
 .../PlantMetabolism/PlantAdjustWater.cs       |  22 ---
 .../PlantMetabolism/PlantAdjustWeeds.cs       |  19 ---
 .../PlantMetabolism/PlantAffectGrowth.cs      |  22 ---
 .../PlantMetabolism/PlantCryoxadone.cs        |  32 ----
 .../PlantMetabolism/PlantDiethylamine.cs      |  41 -----
 .../PlantMetabolism/PlantPhalanximine.cs      |  23 ---
 .../Effects/PlantMetabolism/RobustHarvest.cs  |  53 -------
 .../EntityEffects/Effects/SatiateThirst.cs    |  32 ----
 .../Effects/SolutionTemperatureEffects.cs     | 144 ------------------
 .../StatusEffects/GenericStatusEffect.cs      |  77 ----------
 .../Effects/StatusEffects/Jitter.cs           |  42 -----
 .../Effects/WashCreamPieReaction.cs           |  22 ---
 .../Fluids/EntitySystems/SmokeSystem.cs       |   2 +-
 .../GuideGenerator/ChemistryJsonGenerator.cs  |   5 +-
 .../GuideGenerator/ReactionJsonGenerator.cs   |   4 +-
 Content.Server/GuideGenerator/ReagentEntry.cs |   3 +-
 .../Nutrition/EntitySystems/DrinkSystem.cs    |   3 +-
 Content.Server/Tiles/LavaComponent.cs         |  23 +++
 Content.Server/Tiles/LavaSystem.cs            |  38 +++++
 .../Tiles/TileEntityEffectComponent.cs        |  19 ---
 .../Tiles/TileEntityEffectSystem.cs           |  32 ----
 .../Reaction/ChemicalReactionSystem.cs        |   7 +-
 .../Chemistry/Reaction/ReactionPrototype.cs   |   3 +-
 .../Chemistry/Reaction/ReactiveComponent.cs   |   3 +-
 Content.Shared/Chemistry/ReactiveSystem.cs    | 137 ++++++++---------
 .../Chemistry/Reagent/ReagentEffect.cs        | 113 ++++++++++++++
 .../Reagent/ReagentEffectCondition.cs         |  22 +++
 .../Chemistry/Reagent/ReagentPrototype.cs     |  13 +-
 Content.Shared/EntityEffects/EntityEffect.cs  | 132 ----------------
 .../EntityEffects/EntityEffectCondition.cs    |  22 ---
 Resources/Prototypes/Entities/Tiles/lava.yml  |   6 -
 .../Entities/Tiles/liquid_plasma.yml          |   8 +-
 129 files changed, 1942 insertions(+), 2245 deletions(-)
 create mode 100644 Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
 rename Content.Server/{EntityEffects/Effects => Chemistry/ReactionEffects}/CreateEntityReactionEffect.cs (80%)
 rename Content.Server/{EntityEffects/Effects => Chemistry/ReactionEffects}/EmpReactionEffect.cs (67%)
 create mode 100644 Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs
 create mode 100644 Content.Server/Chemistry/ReactionEffects/SolutionTemperatureEffects.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffectConditions/BodyTemperature.cs
 rename Content.Server/{EntityEffects/EffectConditions => Chemistry/ReagentEffectConditions}/HasTagCondition.cs (68%)
 create mode 100644 Content.Server/Chemistry/ReagentEffectConditions/MobStateCondition.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffectConditions/OrganType.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffectConditions/ReagentThreshold.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffectConditions/SolutionTemperature.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffectConditions/TotalDamage.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffectConditions/TotalHunger.cs
 rename Content.Server/{EntityEffects/Effects => Chemistry/ReagentEffects}/ActivateArtifact.cs (56%)
 create mode 100644 Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs
 rename Content.Server/{EntityEffects/Effects => Chemistry/ReagentEffects}/AdjustAlert.cs (76%)
 rename Content.Server/{EntityEffects/Effects => Chemistry/ReagentEffects}/AdjustReagent.cs (58%)
 rename Content.Server/{EntityEffects/Effects => Chemistry/ReagentEffects}/AdjustTemperature.cs (56%)
 rename Content.Server/{EntityEffects/Effects => Chemistry/ReagentEffects}/CauseZombieInfection.cs (64%)
 rename Content.Server/{EntityEffects/Effects => Chemistry/ReagentEffects}/ChemAddMoodlet.cs (100%)
 create mode 100644 Content.Server/Chemistry/ReagentEffects/ChemCleanBloodstream.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffects/ChemHealEyeDamage.cs
 rename Content.Server/{EntityEffects/Effects => Chemistry/ReagentEffects}/ChemVomit.cs (65%)
 rename Content.Server/{EntityEffects/Effects => Chemistry/ReagentEffects}/CreateGas.cs (62%)
 rename Content.Server/{EntityEffects/Effects => Chemistry/ReagentEffects}/CureZombieInfection.cs (73%)
 rename Content.Server/{EntityEffects/Effects => Chemistry/ReagentEffects}/Drunk.cs (65%)
 create mode 100644 Content.Server/Chemistry/ReagentEffects/Electrocute.cs
 rename Content.Server/{EntityEffects/Effects => Chemistry/ReagentEffects}/Emote.cs (73%)
 create mode 100644 Content.Server/Chemistry/ReagentEffects/ExtinguishReaction.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffects/FlammableReaction.cs
 rename Content.Server/{EntityEffects/Effects => Chemistry/ReagentEffects}/HealthChange.cs (85%)
 create mode 100644 Content.Server/Chemistry/ReagentEffects/Ignite.cs
 rename Content.Server/{EntityEffects/Effects => Chemistry/ReagentEffects}/MakeSentient.cs (92%)
 create mode 100644 Content.Server/Chemistry/ReagentEffects/ModifyBleedAmount.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffects/ModifyBloodLevel.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffects/ModifyLungGas.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffects/MovespeedModifier.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffects/Oxygenate.cs
 rename Content.Server/{EntityEffects/Effects => Chemistry/ReagentEffects}/Paralyze.cs (57%)
 create mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustAttribute.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustHealth.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationLevel.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationMod.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustNutrition.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustPests.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustToxins.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWater.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWeeds.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAffectGrowth.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantCryoxadone.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantDiethylamine.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantPhalanximine.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/RobustHarvest.cs
 rename Content.Server/{EntityEffects/Effects => Chemistry/ReagentEffects}/Polymorph.cs (80%)
 rename Content.Server/{EntityEffects/Effects => Chemistry/ReagentEffects}/PopupMessage.cs (60%)
 rename Content.Server/{EntityEffects/Effects => Chemistry/ReagentEffects}/PurifyEvil.cs (100%)
 rename Content.Server/{EntityEffects/Effects => Chemistry/ReagentEffects}/ReduceRotting.cs (61%)
 rename Content.Server/{EntityEffects/Effects => Chemistry/ReagentEffects}/ResetNarcolepsy.cs (63%)
 rename Content.Server/{EntityEffects/Effects => Chemistry/ReagentEffects}/SatiateHunger.cs (53%)
 create mode 100644 Content.Server/Chemistry/ReagentEffects/SatiateThirst.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffects/StatusEffects/GenericStatusEffect.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffects/StatusEffects/Jitter.cs
 create mode 100644 Content.Server/Chemistry/ReagentEffects/WashCreamPieReaction.cs
 rename Content.Server/{EntityEffects/Effects => Chemistry/ReagentEffects}/WearableReaction.cs (50%)
 delete mode 100644 Content.Server/EntityEffects/EffectConditions/BodyTemperature.cs
 delete mode 100644 Content.Server/EntityEffects/EffectConditions/JobCondition.cs
 delete mode 100644 Content.Server/EntityEffects/EffectConditions/MobStateCondition.cs
 delete mode 100644 Content.Server/EntityEffects/EffectConditions/OrganType.cs
 delete mode 100644 Content.Server/EntityEffects/EffectConditions/ReagentThreshold.cs
 delete mode 100644 Content.Server/EntityEffects/EffectConditions/SolutionTemperature.cs
 delete mode 100644 Content.Server/EntityEffects/EffectConditions/TotalDamage.cs
 delete mode 100644 Content.Server/EntityEffects/EffectConditions/TotalHunger.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/AddToSolutionReaction.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/AreaReactionEffect.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/ChemCleanBloodstream.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/ChemHealEyeDamage.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Electrocute.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/ExplosionReactionEffect.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/ExtinguishReaction.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/FlammableReaction.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Ignite.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/ModifyBleedAmount.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/ModifyBloodLevel.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/ModifyLungGas.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/MovespeedModifier.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Oxygenate.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/SatiateThirst.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/SolutionTemperatureEffects.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/StatusEffects/Jitter.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/WashCreamPieReaction.cs
 create mode 100644 Content.Server/Tiles/LavaComponent.cs
 create mode 100644 Content.Server/Tiles/LavaSystem.cs
 delete mode 100644 Content.Server/Tiles/TileEntityEffectComponent.cs
 delete mode 100644 Content.Server/Tiles/TileEntityEffectSystem.cs
 create mode 100644 Content.Shared/Chemistry/Reagent/ReagentEffect.cs
 create mode 100644 Content.Shared/Chemistry/Reagent/ReagentEffectCondition.cs
 delete mode 100644 Content.Shared/EntityEffects/EntityEffect.cs
 delete mode 100644 Content.Shared/EntityEffects/EntityEffectCondition.cs

diff --git a/Content.Server/Body/Systems/BloodstreamSystem.cs b/Content.Server/Body/Systems/BloodstreamSystem.cs
index a40bafc8cff..54e51d7e35e 100644
--- a/Content.Server/Body/Systems/BloodstreamSystem.cs
+++ b/Content.Server/Body/Systems/BloodstreamSystem.cs
@@ -1,7 +1,7 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Events;
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.EntityEffects.Effects;
+using Content.Server.Chemistry.ReactionEffects;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Forensics;
 using Content.Server.Popups;
diff --git a/Content.Server/Body/Systems/MetabolizerSystem.cs b/Content.Server/Body/Systems/MetabolizerSystem.cs
index 8b0f0ac6f8d..a7eec8e3c02 100644
--- a/Content.Server/Body/Systems/MetabolizerSystem.cs
+++ b/Content.Server/Body/Systems/MetabolizerSystem.cs
@@ -6,7 +6,6 @@
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
-using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
@@ -197,7 +196,8 @@ private void TryMetabolize(Entity<MetabolizerComponent, OrganComponent?, Solutio
                     var ev = new TryMetabolizeReagent(reagent, proto, quantity);
                     RaiseLocalEvent(actualEntity, ref ev);
 
-                    var args = new EntityEffectReagentArgs(actualEntity, EntityManager, ent, solution, mostToRemove, proto, null, scale);
+                    var args = new ReagentEffectArgs(actualEntity, ent, solution, proto, mostToRemove,
+                        EntityManager, null, scale * ev.Scale, ev.QuantityMultiplier);
 
                     // do all effects, if conditions apply
                     foreach (var effect in entry.Effects)
diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
index a8af257292e..53bb1ff80c7 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -3,8 +3,8 @@
 using Content.Server.Body.Components;
 using Content.Server.Chat.Systems;
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.EntityEffects.EffectConditions;
-using Content.Server.EntityEffects.Effects;
+using Content.Server.Chemistry.ReagentEffectConditions;
+using Content.Server.Chemistry.ReagentEffects;
 using Content.Server.Popups;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
@@ -15,7 +15,6 @@
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
 using Content.Shared.Database;
-using Content.Shared.EntityEffects;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Mood;
 using JetBrains.Annotations;
@@ -269,7 +268,7 @@ private float GetSaturation(Solution solution, Entity<MetabolizerComponent?> lun
         // TODO generalize condition checks
         // this is pretty janky, but I just want to bodge a method that checks if an entity can breathe a gas mixture
         // Applying actual reaction effects require a full ReagentEffectArgs struct.
-        bool CanMetabolize(EntityEffect effect)
+        bool CanMetabolize(ReagentEffect effect)
         {
             if (effect.Conditions == null)
                 return true;
diff --git a/Content.Server/Botany/SeedPrototype.cs b/Content.Server/Botany/SeedPrototype.cs
index d08f5985215..e9cf34e6ba6 100644
--- a/Content.Server/Botany/SeedPrototype.cs
+++ b/Content.Server/Botany/SeedPrototype.cs
@@ -1,7 +1,7 @@
 using Content.Server.Botany.Components;
 using Content.Server.Botany.Systems;
 using Content.Shared.Atmos;
-using Content.Shared.EntityEffects;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
@@ -80,7 +80,7 @@ public partial struct SeedChemQuantity
 
 // TODO reduce the number of friends to a reasonable level. Requires ECS-ing things like plant holder component.
 [Virtual, DataDefinition]
-[Access(typeof(BotanySystem), typeof(PlantHolderSystem), typeof(SeedExtractorSystem), typeof(PlantHolderComponent), typeof(EntityEffect), typeof(MutationSystem))]
+[Access(typeof(BotanySystem), typeof(PlantHolderSystem), typeof(SeedExtractorSystem), typeof(PlantHolderComponent), typeof(ReagentEffect), typeof(MutationSystem))]
 public partial class SeedData
 {
     #region Tracking
diff --git a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
new file mode 100644
index 00000000000..ebbf4e0341b
--- /dev/null
+++ b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
@@ -0,0 +1,83 @@
+using Content.Server.Fluids.EntitySystems;
+using Content.Shared.Audio;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Coordinates.Helpers;
+using Content.Shared.Database;
+using Content.Shared.FixedPoint;
+using Content.Shared.Maps;
+using JetBrains.Annotations;
+using Robust.Server.GameObjects;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Server.Chemistry.ReactionEffects
+{
+    /// <summary>
+    /// Basically smoke and foam reactions.
+    /// </summary>
+    [UsedImplicitly]
+    [DataDefinition]
+    public sealed partial class AreaReactionEffect : ReagentEffect
+    {
+        /// <summary>
+        /// How many seconds will the effect stay, counting after fully spreading.
+        /// </summary>
+        [DataField("duration")] private float _duration = 10;
+
+        /// <summary>
+        /// How many units of reaction for 1 smoke entity.
+        /// </summary>
+        [DataField] public FixedPoint2 OverflowThreshold = FixedPoint2.New(2.5);
+
+        /// <summary>
+        /// The entity prototype that will be spawned as the effect.
+        /// </summary>
+        [DataField("prototypeId", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
+        private string _prototypeId = default!;
+
+        /// <summary>
+        /// Sound that will get played when this reaction effect occurs.
+        /// </summary>
+        [DataField("sound", required: true)] private SoundSpecifier _sound = default!;
+
+        public override bool ShouldLog => true;
+
+        protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+            => Loc.GetString("reagent-effect-guidebook-missing");
+
+        public override LogImpact LogImpact => LogImpact.High;
+
+        public override void Effect(ReagentEffectArgs args)
+        {
+            if (args.Source == null)
+                return;
+
+            var spreadAmount = (int) Math.Max(0, Math.Ceiling((args.Quantity / OverflowThreshold).Float()));
+            var splitSolution = args.Source.SplitSolution(args.Source.Volume);
+            var transform = args.EntityManager.GetComponent<TransformComponent>(args.SolutionEntity);
+            var mapManager = IoCManager.Resolve<IMapManager>();
+            var mapSys = args.EntityManager.System<MapSystem>();
+            var sys = args.EntityManager.System<TransformSystem>();
+            var mapCoords = sys.GetMapCoordinates(args.SolutionEntity, xform: transform);
+
+            if (!mapManager.TryFindGridAt(mapCoords, out var gridUid, out var grid) ||
+                !mapSys.TryGetTileRef(gridUid, grid, transform.Coordinates, out var tileRef) ||
+                tileRef.Tile.IsSpace())
+            {
+                return;
+            }
+
+            var coords = mapSys.MapToGrid(gridUid, mapCoords);
+            var ent = args.EntityManager.SpawnEntity(_prototypeId, coords.SnapToGrid());
+
+            var smoke = args.EntityManager.System<SmokeSystem>();
+            smoke.StartSmoke(ent, splitSolution, _duration, spreadAmount);
+
+            var audio = args.EntityManager.System<SharedAudioSystem>();
+            audio.PlayPvs(_sound, args.SolutionEntity, AudioHelpers.WithVariation(0.125f));
+        }
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/CreateEntityReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/CreateEntityReactionEffect.cs
similarity index 80%
rename from Content.Server/EntityEffects/Effects/CreateEntityReactionEffect.cs
rename to Content.Server/Chemistry/ReactionEffects/CreateEntityReactionEffect.cs
index 5288cb587da..0d5acc17220 100644
--- a/Content.Server/EntityEffects/Effects/CreateEntityReactionEffect.cs
+++ b/Content.Server/Chemistry/ReactionEffects/CreateEntityReactionEffect.cs
@@ -1,11 +1,12 @@
-using Content.Shared.EntityEffects;
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.EntityEffects.Effects;
+namespace Content.Server.Chemistry.ReactionEffects;
 
 [DataDefinition]
-public sealed partial class CreateEntityReactionEffect : EntityEffect
+public sealed partial class CreateEntityReactionEffect : ReagentEffect
 {
     /// <summary>
     ///     What entity to create.
@@ -25,17 +26,15 @@ public sealed partial class CreateEntityReactionEffect : EntityEffect
             ("entname", IoCManager.Resolve<IPrototypeManager>().Index<EntityPrototype>(Entity).Name),
             ("amount", Number));
 
-    public override void Effect(EntityEffectBaseArgs args)
+    public override void Effect(ReagentEffectArgs args)
     {
-        var transform = args.EntityManager.GetComponent<TransformComponent>(args.TargetEntity);
+        var transform = args.EntityManager.GetComponent<TransformComponent>(args.SolutionEntity);
         var transformSystem = args.EntityManager.System<SharedTransformSystem>();
-        var quantity = (int)Number;
-        if (args is EntityEffectReagentArgs reagentArgs)
-            quantity *= reagentArgs.Quantity.Int();
+        var quantity = Number * args.Quantity.Int();
 
         for (var i = 0; i < quantity; i++)
         {
-            var uid = args.EntityManager.SpawnEntity(Entity, transformSystem.GetMapCoordinates(args.TargetEntity, xform: transform));
+            var uid = args.EntityManager.SpawnEntity(Entity, transformSystem.GetMapCoordinates(args.SolutionEntity, xform: transform));
             transformSystem.AttachToGridOrMap(uid);
 
             // TODO figure out how to properly spawn inside of containers
diff --git a/Content.Server/EntityEffects/Effects/EmpReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/EmpReactionEffect.cs
similarity index 67%
rename from Content.Server/EntityEffects/Effects/EmpReactionEffect.cs
rename to Content.Server/Chemistry/ReactionEffects/EmpReactionEffect.cs
index ec7801f0832..9a320ffc398 100644
--- a/Content.Server/EntityEffects/Effects/EmpReactionEffect.cs
+++ b/Content.Server/Chemistry/ReactionEffects/EmpReactionEffect.cs
@@ -1,17 +1,16 @@
 using Content.Server.Emp;
-using Content.Shared.EntityEffects;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Server.GameObjects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.EntityEffects.Effects;
+namespace Content.Server.Chemistry.ReactionEffects;
 
 
 [DataDefinition]
-public sealed partial class EmpReactionEffect : EntityEffect
+public sealed partial class EmpReactionEffect : ReagentEffect
 {
     /// <summary>
-    ///     Impulse range per unit of quantity
+    ///     Impulse range per unit of reagent
     /// </summary>
     [DataField("rangePerUnit")]
     public float EmpRangePerUnit = 0.5f;
@@ -37,20 +36,14 @@ public sealed partial class EmpReactionEffect : EntityEffect
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
             => Loc.GetString("reagent-effect-guidebook-emp-reaction-effect", ("chance", Probability));
 
-    public override void Effect(EntityEffectBaseArgs args)
+    public override void Effect(ReagentEffectArgs args)
     {
         var tSys = args.EntityManager.System<TransformSystem>();
-        var transform = args.EntityManager.GetComponent<TransformComponent>(args.TargetEntity);
-
-        var range = EmpRangePerUnit;
-
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            range = MathF.Min((float) (reagentArgs.Quantity * EmpRangePerUnit), EmpMaxRange);
-        }
+        var transform = args.EntityManager.GetComponent<TransformComponent>(args.SolutionEntity);
+        var range = MathF.Min((float) (args.Quantity*EmpRangePerUnit), EmpMaxRange);
 
         args.EntityManager.System<EmpSystem>()
-            .EmpPulse(tSys.GetMapCoordinates(args.TargetEntity, xform: transform),
+            .EmpPulse(tSys.GetMapCoordinates(args.SolutionEntity, xform: transform),
             range,
             EnergyConsumption,
             DisableDuration);
diff --git a/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs
new file mode 100644
index 00000000000..8a558a3ffdc
--- /dev/null
+++ b/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs
@@ -0,0 +1,72 @@
+using Content.Server.Explosion.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Database;
+using Content.Shared.Explosion;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using System.Text.Json.Serialization;
+
+namespace Content.Server.Chemistry.ReactionEffects
+{
+    [DataDefinition]
+    public sealed partial class ExplosionReactionEffect : ReagentEffect
+    {
+        /// <summary>
+        ///     The type of explosion. Determines damage types and tile break chance scaling.
+        /// </summary>
+        [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<ExplosionPrototype>))]
+        [JsonIgnore]
+        public string ExplosionType = default!;
+
+        /// <summary>
+        ///     The max intensity the explosion can have at a given tile. Places an upper limit of damage and tile break
+        ///     chance.
+        /// </summary>
+        [DataField]
+        [JsonIgnore]
+        public float MaxIntensity = 5;
+
+        /// <summary>
+        ///     How quickly intensity drops off as you move away from the epicenter
+        /// </summary>
+        [DataField]
+        [JsonIgnore]
+        public float IntensitySlope = 1;
+
+        /// <summary>
+        ///     The maximum total intensity that this chemical reaction can achieve. Basically here to prevent people
+        ///     from creating a nuke by collecting enough potassium and water.
+        /// </summary>
+        /// <remarks>
+        ///     A slope of 1 and MaxTotalIntensity of 100 corresponds to a radius of around 4.5 tiles.
+        /// </remarks>
+        [DataField]
+        [JsonIgnore]
+        public float MaxTotalIntensity = 100;
+
+        /// <summary>
+        ///     The intensity of the explosion per unit reaction.
+        /// </summary>
+        [DataField]
+        [JsonIgnore]
+        public float IntensityPerUnit = 1;
+
+        public override bool ShouldLog => true;
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+            => Loc.GetString("reagent-effect-guidebook-explosion-reaction-effect", ("chance", Probability));
+        public override LogImpact LogImpact => LogImpact.High;
+
+        public override void Effect(ReagentEffectArgs args)
+        {
+            var intensity = MathF.Min((float) args.Quantity * IntensityPerUnit, MaxTotalIntensity);
+
+            EntitySystem.Get<ExplosionSystem>().QueueExplosion(
+                args.SolutionEntity,
+                ExplosionType,
+                intensity,
+                IntensitySlope,
+                MaxIntensity);
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReactionEffects/SolutionTemperatureEffects.cs b/Content.Server/Chemistry/ReactionEffects/SolutionTemperatureEffects.cs
new file mode 100644
index 00000000000..ec58754883d
--- /dev/null
+++ b/Content.Server/Chemistry/ReactionEffects/SolutionTemperatureEffects.cs
@@ -0,0 +1,121 @@
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Chemistry.ReactionEffects
+{
+    /// <summary>
+    ///     Sets the temperature of the solution involved with the reaction to a new value.
+    /// </summary>
+    [DataDefinition]
+    public sealed partial class SetSolutionTemperatureEffect : ReagentEffect
+    {
+        /// <summary>
+        ///     The temperature to set the solution to.
+        /// </summary>
+        [DataField("temperature", required: true)] private float _temperature;
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+            => Loc.GetString("reagent-effect-guidebook-set-solution-temperature-effect",
+                ("chance", Probability), ("temperature", _temperature));
+
+        public override void Effect(ReagentEffectArgs args)
+        {
+            var solution = args.Source;
+            if (solution == null)
+                return;
+
+            solution.Temperature = _temperature;
+        }
+    }
+
+    /// <summary>
+    ///     Adjusts the temperature of the solution involved in the reaction.
+    /// </summary>
+    [DataDefinition]
+    public sealed partial class AdjustSolutionTemperatureEffect : ReagentEffect
+    {
+        /// <summary>
+        ///     The change in temperature.
+        /// </summary>
+        [DataField("delta", required: true)] private float _delta;
+
+        /// <summary>
+        ///     The minimum temperature this effect can reach.
+        /// </summary>
+        [DataField("minTemp")] private float _minTemp = 0.0f;
+
+        /// <summary>
+        ///     The maximum temperature this effect can reach.
+        /// </summary>
+        [DataField("maxTemp")] private float _maxTemp = float.PositiveInfinity;
+
+        /// <summary>
+        ///     If true, then scale ranges by intensity. If not, the ranges are the same regardless of reactant amount.
+        /// </summary>
+        [DataField("scaled")] private bool _scaled;
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+            => Loc.GetString("reagent-effect-guidebook-adjust-solution-temperature-effect",
+                ("chance", Probability), ("deltasign", MathF.Sign(_delta)), ("mintemp", _minTemp), ("maxtemp", _maxTemp));
+
+        public override void Effect(ReagentEffectArgs args)
+        {
+            var solution = args.Source;
+            if (solution == null || solution.Volume == 0)
+                return;
+
+            var deltaT = _scaled ? _delta * (float) args.Quantity : _delta;
+            solution.Temperature = Math.Clamp(solution.Temperature + deltaT, _minTemp, _maxTemp);
+        }
+    }
+
+    /// <summary>
+    ///     Adjusts the thermal energy of the solution involved in the reaction.
+    /// </summary>
+    public sealed partial class AdjustSolutionThermalEnergyEffect : ReagentEffect
+    {
+        /// <summary>
+        ///     The change in energy.
+        /// </summary>
+        [DataField("delta", required: true)] private float _delta;
+
+        /// <summary>
+        ///     The minimum temperature this effect can reach.
+        /// </summary>
+        [DataField("minTemp")] private float _minTemp = 0.0f;
+
+        /// <summary>
+        ///     The maximum temperature this effect can reach.
+        /// </summary>
+        [DataField("maxTemp")] private float _maxTemp = float.PositiveInfinity;
+
+        /// <summary>
+        ///     If true, then scale ranges by intensity. If not, the ranges are the same regardless of reactant amount.
+        /// </summary>
+        [DataField("scaled")] private bool _scaled;
+
+        public override void Effect(ReagentEffectArgs args)
+        {
+            var solution = args.Source;
+            if (solution == null || solution.Volume == 0)
+                return;
+
+            if (_delta > 0 && solution.Temperature >= _maxTemp)
+                return;
+            if (_delta < 0 && solution.Temperature <= _minTemp)
+                return;
+
+            var heatCap = solution.GetHeatCapacity(null);
+            var deltaT = _scaled
+                ? _delta / heatCap * (float) args.Quantity
+                : _delta / heatCap;
+
+            solution.Temperature = Math.Clamp(solution.Temperature + deltaT, _minTemp, _maxTemp);
+        }
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+            => Loc.GetString("reagent-effect-guidebook-adjust-solution-temperature-effect",
+                ("chance", Probability), ("deltasign", MathF.Sign(_delta)), ("mintemp", _minTemp), ("maxtemp", _maxTemp));
+    }
+
+}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/BodyTemperature.cs b/Content.Server/Chemistry/ReagentEffectConditions/BodyTemperature.cs
new file mode 100644
index 00000000000..9c47bb58ab8
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffectConditions/BodyTemperature.cs
@@ -0,0 +1,36 @@
+using Content.Server.Temperature.Components;
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Chemistry.ReagentEffectConditions
+{
+    /// <summary>
+    ///     Requires the solution entity to be above or below a certain temperature.
+    ///     Used for things like cryoxadone and pyroxadone.
+    /// </summary>
+    public sealed partial class Temperature : ReagentEffectCondition
+    {
+        [DataField]
+        public float Min = 0;
+
+        [DataField]
+        public float Max = float.PositiveInfinity;
+        public override bool Condition(ReagentEffectArgs args)
+        {
+            if (args.EntityManager.TryGetComponent(args.SolutionEntity, out TemperatureComponent? temp))
+            {
+                if (temp.CurrentTemperature > Min && temp.CurrentTemperature < Max)
+                    return true;
+            }
+
+            return false;
+        }
+
+        public override string GuidebookExplanation(IPrototypeManager prototype)
+        {
+            return Loc.GetString("reagent-effect-condition-guidebook-body-temperature",
+                ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
+                ("min", Min));
+        }
+    }
+}
diff --git a/Content.Server/EntityEffects/EffectConditions/HasTagCondition.cs b/Content.Server/Chemistry/ReagentEffectConditions/HasTagCondition.cs
similarity index 68%
rename from Content.Server/EntityEffects/EffectConditions/HasTagCondition.cs
rename to Content.Server/Chemistry/ReagentEffectConditions/HasTagCondition.cs
index b0428b41bfc..52d4d00eb3f 100644
--- a/Content.Server/EntityEffects/EffectConditions/HasTagCondition.cs
+++ b/Content.Server/Chemistry/ReagentEffectConditions/HasTagCondition.cs
@@ -1,13 +1,13 @@
-using Content.Shared.EntityEffects;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Tag;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.EntityEffects.EffectConditions;
+namespace Content.Server.Chemistry.ReagentEffectConditions;
 
 [UsedImplicitly]
-public sealed partial class HasTag : EntityEffectCondition
+public sealed partial class HasTag : ReagentEffectCondition
 {
     [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<TagPrototype>))]
     public string Tag = default!;
@@ -15,10 +15,10 @@ public sealed partial class HasTag : EntityEffectCondition
     [DataField]
     public bool Invert = false;
 
-    public override bool Condition(EntityEffectBaseArgs args)
+    public override bool Condition(ReagentEffectArgs args)
     {
-        if (args.EntityManager.TryGetComponent<TagComponent>(args.TargetEntity, out var tag))
-            return args.EntityManager.System<TagSystem>().HasTag(tag, Tag) ^ Invert;
+        if (args.EntityManager.TryGetComponent<TagComponent>(args.SolutionEntity, out var tag))
+            return EntitySystem.Get<TagSystem>().HasTag(tag, Tag) ^ Invert;
 
         return false;
     }
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/MobStateCondition.cs b/Content.Server/Chemistry/ReagentEffectConditions/MobStateCondition.cs
new file mode 100644
index 00000000000..377eb7d9065
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffectConditions/MobStateCondition.cs
@@ -0,0 +1,30 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Chemistry.ReagentEffectConditions
+{
+    public sealed partial class MobStateCondition : ReagentEffectCondition
+    {
+        [DataField]
+        public MobState Mobstate = MobState.Alive;
+
+        public override bool Condition(ReagentEffectArgs args)
+        {
+            if (args.EntityManager.TryGetComponent(args.SolutionEntity, out MobStateComponent? mobState))
+            {
+                if (mobState.CurrentState == Mobstate)
+                    return true;
+            }
+
+            return false;
+        }
+
+        public override string GuidebookExplanation(IPrototypeManager prototype)
+        {
+            return Loc.GetString("reagent-effect-condition-guidebook-mob-state-condition", ("state", Mobstate));
+        }
+    }
+}
+
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/OrganType.cs b/Content.Server/Chemistry/ReagentEffectConditions/OrganType.cs
new file mode 100644
index 00000000000..986c3d79c8d
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffectConditions/OrganType.cs
@@ -0,0 +1,48 @@
+using Content.Server.Body.Components;
+using Content.Shared.Body.Prototypes;
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Server.Chemistry.ReagentEffectConditions
+{
+    /// <summary>
+    ///     Requires that the metabolizing organ is or is not tagged with a certain MetabolizerType
+    /// </summary>
+    public sealed partial class OrganType : ReagentEffectCondition
+    {
+        [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<MetabolizerTypePrototype>))]
+        public string Type = default!;
+
+        /// <summary>
+        ///     Does this condition pass when the organ has the type, or when it doesn't have the type?
+        /// </summary>
+        [DataField]
+        public bool ShouldHave = true;
+
+        public override bool Condition(ReagentEffectArgs args)
+        {
+            if (args.OrganEntity == null)
+                return false;
+
+            return Condition(args.OrganEntity.Value, args.EntityManager);
+        }
+
+        public bool Condition(Entity<MetabolizerComponent?> metabolizer, IEntityManager entMan)
+        {
+            metabolizer.Comp ??= entMan.GetComponentOrNull<MetabolizerComponent>(metabolizer.Owner);
+            if (metabolizer.Comp != null
+                && metabolizer.Comp.MetabolizerTypes != null
+                && metabolizer.Comp.MetabolizerTypes.Contains(Type))
+                return ShouldHave;
+            return !ShouldHave;
+        }
+
+        public override string GuidebookExplanation(IPrototypeManager prototype)
+        {
+            return Loc.GetString("reagent-effect-condition-guidebook-organ-type",
+                ("name", prototype.Index<MetabolizerTypePrototype>(Type).LocalizedName),
+                ("shouldhave", ShouldHave));
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/ReagentThreshold.cs b/Content.Server/Chemistry/ReagentEffectConditions/ReagentThreshold.cs
new file mode 100644
index 00000000000..061af2b3aef
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffectConditions/ReagentThreshold.cs
@@ -0,0 +1,51 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Chemistry.ReagentEffectConditions
+{
+    /// <summary>
+    ///     Used for implementing reagent effects that require a certain amount of reagent before it should be applied.
+    ///     For instance, overdoses.
+    ///
+    ///     This can also trigger on -other- reagents, not just the one metabolizing. By default, it uses the
+    ///     one being metabolized.
+    /// </summary>
+    public sealed partial class ReagentThreshold : ReagentEffectCondition
+    {
+        [DataField]
+        public FixedPoint2 Min = FixedPoint2.Zero;
+
+        [DataField]
+        public FixedPoint2 Max = FixedPoint2.MaxValue;
+
+        // TODO use ReagentId
+        [DataField]
+        public string? Reagent;
+
+        public override bool Condition(ReagentEffectArgs args)
+        {
+            var reagent = Reagent ?? args.Reagent?.ID;
+            if (reagent == null)
+                return true; // No condition to apply.
+
+            var quant = FixedPoint2.Zero;
+            if (args.Source != null)
+                quant = args.Source.GetTotalPrototypeQuantity(reagent) * args.QuantityMultiplier;
+
+            return quant >= Min && quant <= Max;
+        }
+
+        public override string GuidebookExplanation(IPrototypeManager prototype)
+        {
+            ReagentPrototype? reagentProto = null;
+            if (Reagent is not null)
+                prototype.TryIndex(Reagent, out reagentProto);
+
+            return Loc.GetString("reagent-effect-condition-guidebook-reagent-threshold",
+                ("reagent", reagentProto?.LocalizedName ?? Loc.GetString("reagent-effect-condition-guidebook-this-reagent")),
+                ("max", Max == FixedPoint2.MaxValue ? (float) int.MaxValue : Max.Float()),
+                ("min", Min.Float()));
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/SolutionTemperature.cs b/Content.Server/Chemistry/ReagentEffectConditions/SolutionTemperature.cs
new file mode 100644
index 00000000000..4387f2ba93b
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffectConditions/SolutionTemperature.cs
@@ -0,0 +1,36 @@
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Chemistry.ReagentEffectConditions
+{
+    /// <summary>
+    ///     Requires the solution to be above or below a certain temperature.
+    ///     Used for things like explosives.
+    /// </summary>
+    public sealed partial class SolutionTemperature : ReagentEffectCondition
+    {
+        [DataField]
+        public float Min = 0.0f;
+
+        [DataField]
+        public float Max = float.PositiveInfinity;
+        public override bool Condition(ReagentEffectArgs args)
+        {
+            if (args.Source == null)
+                return false;
+            if (args.Source.Temperature < Min)
+                return false;
+            if (args.Source.Temperature > Max)
+                return false;
+
+            return true;
+        }
+
+        public override string GuidebookExplanation(IPrototypeManager prototype)
+        {
+            return Loc.GetString("reagent-effect-condition-guidebook-solution-temperature",
+                ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
+                ("min", Min));
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/TotalDamage.cs b/Content.Server/Chemistry/ReagentEffectConditions/TotalDamage.cs
new file mode 100644
index 00000000000..49630ef9ab0
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffectConditions/TotalDamage.cs
@@ -0,0 +1,35 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Damage;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Chemistry.ReagentEffectConditions
+{
+    public sealed partial class TotalDamage : ReagentEffectCondition
+    {
+        [DataField]
+        public FixedPoint2 Max = FixedPoint2.MaxValue;
+
+        [DataField]
+        public FixedPoint2 Min = FixedPoint2.Zero;
+
+        public override bool Condition(ReagentEffectArgs args)
+        {
+            if (args.EntityManager.TryGetComponent(args.SolutionEntity, out DamageableComponent? damage))
+            {
+                var total = damage.TotalDamage;
+                if (total > Min && total < Max)
+                    return true;
+            }
+
+            return false;
+        }
+
+        public override string GuidebookExplanation(IPrototypeManager prototype)
+        {
+            return Loc.GetString("reagent-effect-condition-guidebook-total-damage",
+                ("max", Max == FixedPoint2.MaxValue ? (float) int.MaxValue : Max.Float()),
+                ("min", Min.Float()));
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/TotalHunger.cs b/Content.Server/Chemistry/ReagentEffectConditions/TotalHunger.cs
new file mode 100644
index 00000000000..1dd12e632a7
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffectConditions/TotalHunger.cs
@@ -0,0 +1,35 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Chemistry.ReagentEffectConditions
+{
+    public sealed partial class Hunger : ReagentEffectCondition
+    {
+        [DataField]
+        public float Max = float.PositiveInfinity;
+
+        [DataField]
+        public float Min = 0;
+
+        public override bool Condition(ReagentEffectArgs args)
+        {
+            if (args.EntityManager.TryGetComponent(args.SolutionEntity, out HungerComponent? hunger))
+            {
+                var total = hunger.CurrentHunger;
+                if (total > Min && total < Max)
+                    return true;
+            }
+
+            return false;
+        }
+
+        public override string GuidebookExplanation(IPrototypeManager prototype)
+        {
+            return Loc.GetString("reagent-effect-condition-guidebook-total-hunger",
+                ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
+                ("min", Min));
+        }
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/ActivateArtifact.cs b/Content.Server/Chemistry/ReagentEffects/ActivateArtifact.cs
similarity index 56%
rename from Content.Server/EntityEffects/Effects/ActivateArtifact.cs
rename to Content.Server/Chemistry/ReagentEffects/ActivateArtifact.cs
index 3e973884995..41af90f60a1 100644
--- a/Content.Server/EntityEffects/Effects/ActivateArtifact.cs
+++ b/Content.Server/Chemistry/ReagentEffects/ActivateArtifact.cs
@@ -1,16 +1,15 @@
-using Content.Server.Xenoarchaeology.XenoArtifacts;
+using Content.Server.Xenoarchaeology.XenoArtifacts;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.Prototypes;
-using Content.Shared.EntityEffects;
 
-namespace Content.Server.EntityEffects.Effects;
+namespace Content.Server.Chemistry.ReagentEffects;
 
-public sealed partial class ActivateArtifact : EntityEffect
+public sealed partial class ActivateArtifact : ReagentEffect
 {
-    public override void Effect(EntityEffectBaseArgs args)
+    public override void Effect(ReagentEffectArgs args)
     {
         var artifact = args.EntityManager.EntitySysManager.GetEntitySystem<ArtifactSystem>();
-        artifact.TryActivateArtifact(args.TargetEntity);
+        artifact.TryActivateArtifact(args.SolutionEntity);
     }
 
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
diff --git a/Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs b/Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs
new file mode 100644
index 00000000000..6a43739b0ee
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs
@@ -0,0 +1,31 @@
+using Content.Server.Chemistry.Containers.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Chemistry.ReagentEffects
+{
+    [UsedImplicitly]
+    public sealed partial class AddToSolutionReaction : ReagentEffect
+    {
+        [DataField("solution")]
+        private string _solution = "reagents";
+
+        public override void Effect(ReagentEffectArgs args)
+        {
+            if (args.Reagent == null)
+                return;
+
+            // TODO see if this is correct
+            var solutionContainerSystem = args.EntityManager.System<SolutionContainerSystem>();
+            if (!solutionContainerSystem.TryGetSolution(args.SolutionEntity, _solution, out var solutionContainer))
+                return;
+
+            if (solutionContainerSystem.TryAddReagent(solutionContainer.Value, args.Reagent.ID, args.Quantity, out var accepted))
+                args.Source?.RemoveReagent(args.Reagent.ID, accepted);
+        }
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+            Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability));
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/AdjustAlert.cs b/Content.Server/Chemistry/ReagentEffects/AdjustAlert.cs
similarity index 76%
rename from Content.Server/EntityEffects/Effects/AdjustAlert.cs
rename to Content.Server/Chemistry/ReagentEffects/AdjustAlert.cs
index 3bf57b309d1..40858176bd1 100644
--- a/Content.Server/EntityEffects/Effects/AdjustAlert.cs
+++ b/Content.Server/Chemistry/ReagentEffects/AdjustAlert.cs
@@ -1,11 +1,11 @@
-using Content.Shared.Alert;
-using Content.Shared.EntityEffects;
+using Content.Shared.Alert;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
-namespace Content.Server.EntityEffects.Effects;
+namespace Content.Server.Chemistry.ReagentEffects;
 
-public sealed partial class AdjustAlert : EntityEffect
+public sealed partial class AdjustAlert : ReagentEffect
 {
     /// <summary>
     /// The specific Alert that will be adjusted
@@ -34,15 +34,15 @@ public sealed partial class AdjustAlert : EntityEffect
     //JUSTIFICATION: This just changes some visuals, doesn't need to be documented.
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => null;
 
-    public override void Effect(EntityEffectBaseArgs args)
+    public override void Effect(ReagentEffectArgs args)
     {
         var alertSys = args.EntityManager.EntitySysManager.GetEntitySystem<AlertsSystem>();
-        if (!args.EntityManager.HasComponent<AlertsComponent>(args.TargetEntity))
+        if (!args.EntityManager.HasComponent<AlertsComponent>(args.SolutionEntity))
             return;
 
         if (Clear && Time <= 0)
         {
-            alertSys.ClearAlert(args.TargetEntity, AlertType);
+                alertSys.ClearAlert(args.SolutionEntity, AlertType);
         }
         else
         {
@@ -52,7 +52,7 @@ public override void Effect(EntityEffectBaseArgs args)
             if ((ShowCooldown || Clear) && Time > 0)
                 cooldown = (timing.CurTime, timing.CurTime + TimeSpan.FromSeconds(Time));
 
-            alertSys.ShowAlert(args.TargetEntity, AlertType, cooldown: cooldown, autoRemove: Clear, showCooldown: ShowCooldown);
+            alertSys.ShowAlert(args.SolutionEntity, AlertType, cooldown: cooldown, autoRemove: Clear, showCooldown: ShowCooldown);
         }
 
     }
diff --git a/Content.Server/EntityEffects/Effects/AdjustReagent.cs b/Content.Server/Chemistry/ReagentEffects/AdjustReagent.cs
similarity index 58%
rename from Content.Server/EntityEffects/Effects/AdjustReagent.cs
rename to Content.Server/Chemistry/ReagentEffects/AdjustReagent.cs
index 71117d6ec53..16d69edd9aa 100644
--- a/Content.Server/EntityEffects/Effects/AdjustReagent.cs
+++ b/Content.Server/Chemistry/ReagentEffects/AdjustReagent.cs
@@ -1,15 +1,14 @@
 using Content.Shared.Body.Prototypes;
 using Content.Shared.Chemistry.Reagent;
-using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.EntityEffects.Effects
+namespace Content.Server.Chemistry.ReagentEffects
 {
     [UsedImplicitly]
-    public sealed partial class AdjustReagent : EntityEffect
+    public sealed partial class AdjustReagent : ReagentEffect
     {
         /// <summary>
         ///     The reagent ID to remove. Only one of this and <see cref="Group"/> should be active.
@@ -28,43 +27,36 @@ public sealed partial class AdjustReagent : EntityEffect
         [DataField(required: true)]
         public FixedPoint2 Amount = default!;
 
-        public override void Effect(EntityEffectBaseArgs args)
+        public override void Effect(ReagentEffectArgs args)
         {
-            if (args is EntityEffectReagentArgs reagentArgs)
-            {
-                if (reagentArgs.Source == null)
-                    return;
+            if (args.Source == null)
+                return;
 
-                var amount = Amount;
-                amount *= reagentArgs.Scale;
+            var amount = Amount;
+            amount *= args.Scale;
 
-                if (Reagent != null)
-                {
-                    if (amount < 0 && reagentArgs.Source.ContainsPrototype(Reagent))
-                        reagentArgs.Source.RemoveReagent(Reagent, -amount);
-                    if (amount > 0)
-                        reagentArgs.Source.AddReagent(Reagent, amount);
-                }
-                else if (Group != null)
+            if (Reagent != null)
+            {
+                if (amount < 0 && args.Source.ContainsPrototype(Reagent))
+                    args.Source.RemoveReagent(Reagent, -amount);
+                if (amount > 0)
+                    args.Source.AddReagent(Reagent, amount);
+            }
+            else if (Group != null)
+            {
+                var prototypeMan = IoCManager.Resolve<IPrototypeManager>();
+                foreach (var quant in args.Source.Contents.ToArray())
                 {
-                    var prototypeMan = IoCManager.Resolve<IPrototypeManager>();
-                    foreach (var quant in reagentArgs.Source.Contents.ToArray())
+                    var proto = prototypeMan.Index<ReagentPrototype>(quant.Reagent.Prototype);
+                    if (proto.Metabolisms != null && proto.Metabolisms.ContainsKey(Group))
                     {
-                        var proto = prototypeMan.Index<ReagentPrototype>(quant.Reagent.Prototype);
-                        if (proto.Metabolisms != null && proto.Metabolisms.ContainsKey(Group))
-                        {
-                            if (amount < 0)
-                                reagentArgs.Source.RemoveReagent(quant.Reagent, amount);
-                            if (amount > 0)
-                                reagentArgs.Source.AddReagent(quant.Reagent, amount);
-                        }
+                        if (amount < 0)
+                            args.Source.RemoveReagent(quant.Reagent, amount);
+                        if (amount > 0)
+                            args.Source.AddReagent(quant.Reagent, amount);
                     }
                 }
-                return;
             }
-
-            // TODO: Someone needs to figure out how to do this for non-reagent effects.
-            throw new NotImplementedException();
         }
 
         protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
diff --git a/Content.Server/EntityEffects/Effects/AdjustTemperature.cs b/Content.Server/Chemistry/ReagentEffects/AdjustTemperature.cs
similarity index 56%
rename from Content.Server/EntityEffects/Effects/AdjustTemperature.cs
rename to Content.Server/Chemistry/ReagentEffects/AdjustTemperature.cs
index 3c5c77c309d..9b975720678 100644
--- a/Content.Server/EntityEffects/Effects/AdjustTemperature.cs
+++ b/Content.Server/Chemistry/ReagentEffects/AdjustTemperature.cs
@@ -1,11 +1,11 @@
 using Content.Server.Temperature.Components;
 using Content.Server.Temperature.Systems;
-using Content.Shared.EntityEffects;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.EntityEffects.Effects
+namespace Content.Server.Chemistry.ReagentEffects
 {
-    public sealed partial class AdjustTemperature : EntityEffect
+    public sealed partial class AdjustTemperature : ReagentEffect
     {
         [DataField]
         public float Amount;
@@ -16,19 +16,16 @@ public sealed partial class AdjustTemperature : EntityEffect
                 ("deltasign", MathF.Sign(Amount)),
                 ("amount", MathF.Abs(Amount)));
 
-        public override void Effect(EntityEffectBaseArgs args)
+        public override void Effect(ReagentEffectArgs args)
         {
-            if (args.EntityManager.TryGetComponent(args.TargetEntity, out TemperatureComponent? temp))
+            if (args.EntityManager.TryGetComponent(args.SolutionEntity, out TemperatureComponent? temp))
             {
                 var sys = args.EntityManager.EntitySysManager.GetEntitySystem<TemperatureSystem>();
                 var amount = Amount;
 
-                if (args is EntityEffectReagentArgs reagentArgs)
-                {
-                    amount *= reagentArgs.Scale.Float();
-                }
+                amount *= args.Scale;
 
-                sys.ChangeHeat(args.TargetEntity, amount, true, temp);
+                sys.ChangeHeat(args.SolutionEntity, amount, true, temp);
             }
         }
     }
diff --git a/Content.Server/EntityEffects/Effects/CauseZombieInfection.cs b/Content.Server/Chemistry/ReagentEffects/CauseZombieInfection.cs
similarity index 64%
rename from Content.Server/EntityEffects/Effects/CauseZombieInfection.cs
rename to Content.Server/Chemistry/ReagentEffects/CauseZombieInfection.cs
index dcbc676fe77..029b1495002 100644
--- a/Content.Server/EntityEffects/Effects/CauseZombieInfection.cs
+++ b/Content.Server/Chemistry/ReagentEffects/CauseZombieInfection.cs
@@ -1,20 +1,21 @@
 using Content.Server.Zombies;
-using Content.Shared.EntityEffects;
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.EntityEffects.Effects;
+namespace Content.Server.Chemistry.ReagentEffects;
 
-public sealed partial class CauseZombieInfection : EntityEffect
+public sealed partial class CauseZombieInfection : ReagentEffect
 {
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
         => Loc.GetString("reagent-effect-guidebook-cause-zombie-infection", ("chance", Probability));
 
     // Adds the Zombie Infection Components
-    public override void Effect(EntityEffectBaseArgs args)
+    public override void Effect(ReagentEffectArgs args)
     {
         var entityManager = args.EntityManager;
-        entityManager.EnsureComponent<ZombifyOnDeathComponent>(args.TargetEntity);
-        entityManager.EnsureComponent<PendingZombieComponent>(args.TargetEntity);
+        entityManager.EnsureComponent<ZombifyOnDeathComponent>(args.SolutionEntity);
+        entityManager.EnsureComponent<PendingZombieComponent>(args.SolutionEntity);
     }
 }
 
diff --git a/Content.Server/EntityEffects/Effects/ChemAddMoodlet.cs b/Content.Server/Chemistry/ReagentEffects/ChemAddMoodlet.cs
similarity index 100%
rename from Content.Server/EntityEffects/Effects/ChemAddMoodlet.cs
rename to Content.Server/Chemistry/ReagentEffects/ChemAddMoodlet.cs
diff --git a/Content.Server/Chemistry/ReagentEffects/ChemCleanBloodstream.cs b/Content.Server/Chemistry/ReagentEffects/ChemCleanBloodstream.cs
new file mode 100644
index 00000000000..402b30a069b
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/ChemCleanBloodstream.cs
@@ -0,0 +1,33 @@
+using Content.Server.Body.Systems;
+using Content.Shared.Chemistry.Reagent;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Chemistry.ReactionEffects
+{
+    /// <summary>
+    /// Basically smoke and foam reactions.
+    /// </summary>
+    [UsedImplicitly]
+    public sealed partial class ChemCleanBloodstream : ReagentEffect
+    {
+        [DataField]
+        public float CleanseRate = 3.0f;
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+            => Loc.GetString("reagent-effect-guidebook-chem-clean-bloodstream", ("chance", Probability));
+
+        public override void Effect(ReagentEffectArgs args)
+        {
+            if (args.Source == null || args.Reagent == null)
+                return;
+
+            var cleanseRate = CleanseRate;
+
+            cleanseRate *= args.Scale;
+
+            var bloodstreamSys = EntitySystem.Get<BloodstreamSystem>();
+            bloodstreamSys.FlushChemicals(args.SolutionEntity, args.Reagent.ID, cleanseRate);
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/ChemHealEyeDamage.cs b/Content.Server/Chemistry/ReagentEffects/ChemHealEyeDamage.cs
new file mode 100644
index 00000000000..206b8ed04dc
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/ChemHealEyeDamage.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Eye.Blinding;
+using Content.Shared.Eye.Blinding.Systems;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Chemistry.ReagentEffects
+{
+    /// <summary>
+    /// Heal or apply eye damage
+    /// </summary>
+    [UsedImplicitly]
+    public sealed partial class ChemHealEyeDamage : ReagentEffect
+    {
+        /// <summary>
+        /// How much eye damage to add.
+        /// </summary>
+        [DataField]
+        public int Amount = -1;
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+            => Loc.GetString("reagent-effect-guidebook-cure-eye-damage", ("chance", Probability), ("deltasign", MathF.Sign(Amount)));
+
+        public override void Effect(ReagentEffectArgs args)
+        {
+            if (args.Scale != 1f) // huh?
+                return;
+
+            args.EntityManager.EntitySysManager.GetEntitySystem<BlindableSystem>().AdjustEyeDamage(args.SolutionEntity, Amount);
+        }
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/ChemVomit.cs b/Content.Server/Chemistry/ReagentEffects/ChemVomit.cs
similarity index 65%
rename from Content.Server/EntityEffects/Effects/ChemVomit.cs
rename to Content.Server/Chemistry/ReagentEffects/ChemVomit.cs
index 0d1bac87d1c..851c0adf5f2 100644
--- a/Content.Server/EntityEffects/Effects/ChemVomit.cs
+++ b/Content.Server/Chemistry/ReagentEffects/ChemVomit.cs
@@ -1,15 +1,15 @@
 using Content.Server.Medical;
-using Content.Shared.EntityEffects;
+using Content.Shared.Chemistry.Reagent;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.EntityEffects.Effects
+namespace Content.Server.Chemistry.ReagentEffects
 {
     /// <summary>
     /// Forces you to vomit.
     /// </summary>
     [UsedImplicitly]
-    public sealed partial class ChemVomit : EntityEffect
+    public sealed partial class ChemVomit : ReagentEffect
     {
         /// How many units of thirst to add each time we vomit
         [DataField]
@@ -21,15 +21,14 @@ public sealed partial class ChemVomit : EntityEffect
         protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
             => Loc.GetString("reagent-effect-guidebook-chem-vomit", ("chance", Probability));
 
-        public override void Effect(EntityEffectBaseArgs args)
+        public override void Effect(ReagentEffectArgs args)
         {
-            if (args is EntityEffectReagentArgs reagentArgs)
-                if (reagentArgs.Scale != 1f)
-                    return;
+            if (args.Scale != 1f)
+                return;
 
             var vomitSys = args.EntityManager.EntitySysManager.GetEntitySystem<VomitSystem>();
 
-            vomitSys.Vomit(args.TargetEntity, ThirstAmount, HungerAmount);
+            vomitSys.Vomit(args.SolutionEntity, ThirstAmount, HungerAmount);
         }
     }
 }
diff --git a/Content.Server/EntityEffects/Effects/CreateGas.cs b/Content.Server/Chemistry/ReagentEffects/CreateGas.cs
similarity index 62%
rename from Content.Server/EntityEffects/Effects/CreateGas.cs
rename to Content.Server/Chemistry/ReagentEffects/CreateGas.cs
index fb57a43c48d..c1da3c48db3 100644
--- a/Content.Server/EntityEffects/Effects/CreateGas.cs
+++ b/Content.Server/Chemistry/ReagentEffects/CreateGas.cs
@@ -1,12 +1,12 @@
-using Content.Server.Atmos.EntitySystems;
+using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Atmos;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
-using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.EntityEffects.Effects;
+namespace Content.Server.Chemistry.ReagentEffects;
 
-public sealed partial class CreateGas : EntityEffect
+public sealed partial class CreateGas : ReagentEffect
 {
     [DataField(required: true)]
     public Gas Gas = default!;
@@ -31,22 +31,15 @@ public sealed partial class CreateGas : EntityEffect
 
     public override LogImpact LogImpact => LogImpact.High;
 
-    public override void Effect(EntityEffectBaseArgs args)
+    public override void Effect(ReagentEffectArgs args)
     {
         var atmosSys = args.EntityManager.EntitySysManager.GetEntitySystem<AtmosphereSystem>();
 
-        var tileMix = atmosSys.GetContainingMixture(args.TargetEntity, false, true);
+        var tileMix = atmosSys.GetContainingMixture(args.SolutionEntity, false, true);
 
         if (tileMix != null)
         {
-            if (args is EntityEffectReagentArgs reagentArgs)
-            {
-                tileMix.AdjustMoles(Gas, reagentArgs.Quantity.Float() * Multiplier);
-            }
-            else
-            {
-                tileMix.AdjustMoles(Gas, Multiplier);
-            }
+            tileMix.AdjustMoles(Gas, args.Quantity.Float() * Multiplier);
         }
     }
 }
diff --git a/Content.Server/EntityEffects/Effects/CureZombieInfection.cs b/Content.Server/Chemistry/ReagentEffects/CureZombieInfection.cs
similarity index 73%
rename from Content.Server/EntityEffects/Effects/CureZombieInfection.cs
rename to Content.Server/Chemistry/ReagentEffects/CureZombieInfection.cs
index 066fa872489..d56fc115310 100644
--- a/Content.Server/EntityEffects/Effects/CureZombieInfection.cs
+++ b/Content.Server/Chemistry/ReagentEffects/CureZombieInfection.cs
@@ -1,10 +1,11 @@
 using Content.Server.Zombies;
-using Content.Shared.EntityEffects;
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.EntityEffects.Effects;
+namespace Content.Server.Chemistry.ReagentEffects;
 
-public sealed partial class CureZombieInfection : EntityEffect
+public sealed partial class CureZombieInfection : ReagentEffect
 {
     [DataField]
     public bool Innoculate;
@@ -18,18 +19,18 @@ public sealed partial class CureZombieInfection : EntityEffect
     }
 
     // Removes the Zombie Infection Components
-    public override void Effect(EntityEffectBaseArgs args)
+    public override void Effect(ReagentEffectArgs args)
     {
         var entityManager = args.EntityManager;
-        if (entityManager.HasComponent<IncurableZombieComponent>(args.TargetEntity))
+        if (entityManager.HasComponent<IncurableZombieComponent>(args.SolutionEntity))
             return;
 
-        entityManager.RemoveComponent<ZombifyOnDeathComponent>(args.TargetEntity);
-        entityManager.RemoveComponent<PendingZombieComponent>(args.TargetEntity);
+        entityManager.RemoveComponent<ZombifyOnDeathComponent>(args.SolutionEntity);
+        entityManager.RemoveComponent<PendingZombieComponent>(args.SolutionEntity);
 
         if (Innoculate)
         {
-            entityManager.EnsureComponent<ZombieImmuneComponent>(args.TargetEntity);
+            entityManager.EnsureComponent<ZombieImmuneComponent>(args.SolutionEntity);
         }
     }
 }
diff --git a/Content.Server/EntityEffects/Effects/Drunk.cs b/Content.Server/Chemistry/ReagentEffects/Drunk.cs
similarity index 65%
rename from Content.Server/EntityEffects/Effects/Drunk.cs
rename to Content.Server/Chemistry/ReagentEffects/Drunk.cs
index c41c349aaa1..6088db5787c 100644
--- a/Content.Server/EntityEffects/Effects/Drunk.cs
+++ b/Content.Server/Chemistry/ReagentEffects/Drunk.cs
@@ -1,10 +1,10 @@
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Drunk;
-using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.EntityEffects.Effects;
+namespace Content.Server.Chemistry.ReagentEffects;
 
-public sealed partial class Drunk : EntityEffect
+public sealed partial class Drunk : ReagentEffect
 {
     /// <summary>
     ///     BoozePower is how long each metabolism cycle will make the drunk effect last for.
@@ -21,14 +21,13 @@ public sealed partial class Drunk : EntityEffect
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
         => Loc.GetString("reagent-effect-guidebook-drunk", ("chance", Probability));
 
-    public override void Effect(EntityEffectBaseArgs args)
+    public override void Effect(ReagentEffectArgs args)
     {
         var boozePower = BoozePower;
 
-        if (args is EntityEffectReagentArgs reagentArgs)
-            boozePower *= reagentArgs.Scale.Float();
-        
+        boozePower *= Math.Max(args.Scale, 1);
+
         var drunkSys = args.EntityManager.EntitySysManager.GetEntitySystem<SharedDrunkSystem>();
-        drunkSys.TryApplyDrunkenness(args.TargetEntity, boozePower, SlurSpeech);
+        drunkSys.TryApplyDrunkenness(args.SolutionEntity, boozePower, SlurSpeech);
     }
 }
diff --git a/Content.Server/Chemistry/ReagentEffects/Electrocute.cs b/Content.Server/Chemistry/ReagentEffects/Electrocute.cs
new file mode 100644
index 00000000000..272a0fce42a
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/Electrocute.cs
@@ -0,0 +1,31 @@
+using Content.Server.Electrocution;
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Chemistry.ReagentEffects;
+
+public sealed partial class Electrocute : ReagentEffect
+{
+    [DataField] public int ElectrocuteTime = 2;
+
+    [DataField] public int ElectrocuteDamageScale = 5;
+
+    /// <remarks>
+    ///     true - refresh electrocute time,  false - accumulate electrocute time
+    /// </remarks>
+    [DataField] public bool Refresh = true;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-electrocute", ("chance", Probability), ("time", ElectrocuteTime));
+
+    public override bool ShouldLog => true;
+
+    public override void Effect(ReagentEffectArgs args)
+    {
+        args.EntityManager.System<ElectrocutionSystem>().TryDoElectrocution(args.SolutionEntity, null,
+            Math.Max((args.Quantity * ElectrocuteDamageScale).Int(), 1), TimeSpan.FromSeconds(ElectrocuteTime), Refresh, ignoreInsulation: true);
+
+        if (args.Reagent != null)
+            args.Source?.RemoveReagent(args.Reagent.ID, args.Quantity);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Emote.cs b/Content.Server/Chemistry/ReagentEffects/Emote.cs
similarity index 73%
rename from Content.Server/EntityEffects/Effects/Emote.cs
rename to Content.Server/Chemistry/ReagentEffects/Emote.cs
index 1d8e27ab0f8..7097ea649a5 100644
--- a/Content.Server/EntityEffects/Effects/Emote.cs
+++ b/Content.Server/Chemistry/ReagentEffects/Emote.cs
@@ -1,18 +1,18 @@
 using Content.Server.Chat.Systems;
 using Content.Shared.Chat;
 using Content.Shared.Chat.Prototypes;
-using Content.Shared.EntityEffects;
+using Content.Shared.Chemistry.Reagent;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.EntityEffects.Effects;
+namespace Content.Server.Chemistry.ReagentEffects;
 
 /// <summary>
 ///     Tries to force someone to emote (scream, laugh, etc). Still respects whitelists/blacklists and other limits of the specified emote unless forced.
 /// </summary>
 [UsedImplicitly]
-public sealed partial class Emote : EntityEffect
+public sealed partial class Emote : ReagentEffect
 {
     [DataField("emote", customTypeSerializer: typeof(PrototypeIdSerializer<EmotePrototype>))]
     public string? EmoteId;
@@ -27,16 +27,16 @@ public sealed partial class Emote : EntityEffect
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
         => null;
 
-    public override void Effect(EntityEffectBaseArgs args)
+    public override void Effect(ReagentEffectArgs args)
     {
         if (EmoteId == null)
             return;
 
         var chatSys = args.EntityManager.System<ChatSystem>();
         if (ShowInChat)
-            chatSys.TryEmoteWithChat(args.TargetEntity, EmoteId, ChatTransmitRange.GhostRangeLimit, forceEmote: Force);
+            chatSys.TryEmoteWithChat(args.SolutionEntity, EmoteId, ChatTransmitRange.GhostRangeLimit);
         else
-            chatSys.TryEmoteWithoutChat(args.TargetEntity, EmoteId);
+            chatSys.TryEmoteWithoutChat(args.SolutionEntity, EmoteId);
 
     }
 }
diff --git a/Content.Server/Chemistry/ReagentEffects/ExtinguishReaction.cs b/Content.Server/Chemistry/ReagentEffects/ExtinguishReaction.cs
new file mode 100644
index 00000000000..e9029089988
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/ExtinguishReaction.cs
@@ -0,0 +1,24 @@
+using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Chemistry.ReagentEffects
+{
+    [UsedImplicitly]
+    public sealed partial class ExtinguishReaction : ReagentEffect
+    {
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+            => Loc.GetString("reagent-effect-guidebook-extinguish-reaction", ("chance", Probability));
+
+        public override void Effect(ReagentEffectArgs args)
+        {
+            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out FlammableComponent? flammable)) return;
+
+            var flammableSystem = EntitySystem.Get<FlammableSystem>();
+            flammableSystem.Extinguish(args.SolutionEntity, flammable);
+            flammableSystem.AdjustFireStacks(args.SolutionEntity, -1.5f * (float) args.Quantity, flammable);
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/FlammableReaction.cs b/Content.Server/Chemistry/ReagentEffects/FlammableReaction.cs
new file mode 100644
index 00000000000..5b36967f6a8
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/FlammableReaction.cs
@@ -0,0 +1,34 @@
+using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Database;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Chemistry.ReagentEffects
+{
+    [UsedImplicitly]
+    public sealed partial class FlammableReaction : ReagentEffect
+    {
+        [DataField]
+        public float Multiplier = 0.05f;
+
+        public override bool ShouldLog => true;
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+            => Loc.GetString("reagent-effect-guidebook-flammable-reaction", ("chance", Probability));
+
+        public override LogImpact LogImpact => LogImpact.Medium;
+
+        public override void Effect(ReagentEffectArgs args)
+        {
+            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out FlammableComponent? flammable))
+                return;
+
+            args.EntityManager.System<FlammableSystem>().AdjustFireStacks(args.SolutionEntity, args.Quantity.Float() * Multiplier, flammable);
+
+            if (args.Reagent != null)
+                args.Source?.RemoveReagent(args.Reagent.ID, args.Quantity);
+        }
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/HealthChange.cs b/Content.Server/Chemistry/ReagentEffects/HealthChange.cs
similarity index 85%
rename from Content.Server/EntityEffects/Effects/HealthChange.cs
rename to Content.Server/Chemistry/ReagentEffects/HealthChange.cs
index 7c359b1c59e..53933072b6d 100644
--- a/Content.Server/EntityEffects/Effects/HealthChange.cs
+++ b/Content.Server/Chemistry/ReagentEffects/HealthChange.cs
@@ -1,6 +1,6 @@
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
-using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Content.Shared.Localizations;
 using Content.Shared.Targeting; // Shitmed
@@ -9,16 +9,16 @@
 using System.Linq;
 using System.Text.Json.Serialization;
 
-namespace Content.Server.EntityEffects.Effects
+namespace Content.Server.Chemistry.ReagentEffects
 {
     /// <summary>
-    /// Default metabolism used for medicine reagents.
+    /// Default metabolism for medicine reagents.
     /// </summary>
     [UsedImplicitly]
-    public sealed partial class HealthChange : EntityEffect
+    public sealed partial class HealthChange : ReagentEffect
     {
         /// <summary>
-        /// Damage to apply every cycle. Damage Ignores resistances.
+        /// Damage to apply every metabolism cycle. Damage Ignores resistances.
         /// </summary>
         [DataField(required: true)]
         [JsonPropertyName("damage")]
@@ -27,7 +27,6 @@ public sealed partial class HealthChange : EntityEffect
         /// <summary>
         ///     Should this effect scale the damage by the amount of chemical in the solution?
         ///     Useful for touch reactions, like styptic powder or acid.
-        ///     Only usable if the EntityEffectBaseArgs is an EntityEffectReagentArgs.
         /// </summary>
         [DataField]
         [JsonPropertyName("scaleByQuantity")]
@@ -112,17 +111,13 @@ protected override string ReagentEffectGuidebookText(IPrototypeManager prototype
                 ("healsordeals", healsordeals));
         }
 
-        public override void Effect(EntityEffectBaseArgs args)
+        public override void Effect(ReagentEffectArgs args)
         {
-            var scale = FixedPoint2.New(1);
-
-            if (args is EntityEffectReagentArgs reagentArgs)
-            {
-                scale = ScaleByQuantity ? reagentArgs.Quantity * reagentArgs.Scale : reagentArgs.Scale;
-            }
+            var scale = ScaleByQuantity ? args.Quantity : FixedPoint2.New(1);
+            scale *= args.Scale;
 
             args.EntityManager.System<DamageableSystem>().TryChangeDamage(
-                args.TargetEntity,
+                args.SolutionEntity,
                 Damage * scale,
                 IgnoreResistances,
                 interruptsDoAfters: false,
diff --git a/Content.Server/Chemistry/ReagentEffects/Ignite.cs b/Content.Server/Chemistry/ReagentEffects/Ignite.cs
new file mode 100644
index 00000000000..1fc90f63e31
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/Ignite.cs
@@ -0,0 +1,25 @@
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Database;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Chemistry.ReagentEffects;
+
+/// <summary>
+///     Ignites a mob.
+/// </summary>
+public sealed partial class Ignite : ReagentEffect
+{
+    public override bool ShouldLog => true;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-ignite", ("chance", Probability));
+
+    public override LogImpact LogImpact => LogImpact.Medium;
+
+    public override void Effect(ReagentEffectArgs args)
+    {
+        var flamSys = EntitySystem.Get<FlammableSystem>();
+        flamSys.Ignite(args.SolutionEntity, args.OrganEntity ?? args.SolutionEntity);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/MakeSentient.cs b/Content.Server/Chemistry/ReagentEffects/MakeSentient.cs
similarity index 92%
rename from Content.Server/EntityEffects/Effects/MakeSentient.cs
rename to Content.Server/Chemistry/ReagentEffects/MakeSentient.cs
index 65da9e72219..21bfe239232 100644
--- a/Content.Server/EntityEffects/Effects/MakeSentient.cs
+++ b/Content.Server/Chemistry/ReagentEffects/MakeSentient.cs
@@ -2,7 +2,7 @@
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.Language;
 using Content.Server.Speech.Components;
-using Content.Shared.EntityEffects;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Language;
 using Content.Shared.Language.Systems;
 using Content.Shared.Mind.Components;
@@ -11,17 +11,17 @@
 using Content.Shared.Language.Components; //Delta-V - Banning humanoids from becoming ghost roles.
 using Content.Shared.Language.Events;
 
-namespace Content.Server.EntityEffects.Effects;
+namespace Content.Server.Chemistry.ReagentEffects;
 
-public sealed partial class MakeSentient : EntityEffect
+public sealed partial class MakeSentient : ReagentEffect
 {
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
         => Loc.GetString("reagent-effect-guidebook-make-sentient", ("chance", Probability));
 
-    public override void Effect(EntityEffectBaseArgs args)
+    public override void Effect(ReagentEffectArgs args)
     {
         var entityManager = args.EntityManager;
-        var uid = args.TargetEntity;
+        var uid = args.SolutionEntity;
 
         // Let affected entities speak normally to make this effect different from, say, the "random sentience" event
         // This also works on entities that already have a mind
diff --git a/Content.Server/Chemistry/ReagentEffects/ModifyBleedAmount.cs b/Content.Server/Chemistry/ReagentEffects/ModifyBleedAmount.cs
new file mode 100644
index 00000000000..7b966ea4788
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/ModifyBleedAmount.cs
@@ -0,0 +1,31 @@
+using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Chemistry.ReagentEffects;
+
+public sealed partial class ModifyBleedAmount : ReagentEffect
+{
+    [DataField]
+    public bool Scaled = false;
+
+    [DataField]
+    public float Amount = -1.0f;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-modify-bleed-amount", ("chance", Probability),
+            ("deltasign", MathF.Sign(Amount)));
+
+    public override void Effect(ReagentEffectArgs args)
+    {
+        if (args.EntityManager.TryGetComponent<BloodstreamComponent>(args.SolutionEntity, out var blood))
+        {
+            var sys = EntitySystem.Get<BloodstreamSystem>();
+            var amt = Scaled ? Amount * args.Quantity.Float() : Amount;
+            amt *= args.Scale;
+
+            sys.TryModifyBleedAmount(args.SolutionEntity, amt, blood);
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/ModifyBloodLevel.cs b/Content.Server/Chemistry/ReagentEffects/ModifyBloodLevel.cs
new file mode 100644
index 00000000000..748aa71083e
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/ModifyBloodLevel.cs
@@ -0,0 +1,32 @@
+using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Chemistry.ReagentEffects;
+
+public sealed partial class ModifyBloodLevel : ReagentEffect
+{
+    [DataField]
+    public bool Scaled = false;
+
+    [DataField]
+    public FixedPoint2 Amount = 1.0f;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-modify-blood-level", ("chance", Probability),
+            ("deltasign", MathF.Sign(Amount.Float())));
+
+    public override void Effect(ReagentEffectArgs args)
+    {
+        if (args.EntityManager.TryGetComponent<BloodstreamComponent>(args.SolutionEntity, out var blood))
+        {
+            var sys = EntitySystem.Get<BloodstreamSystem>();
+            var amt = Scaled ? Amount * args.Quantity : Amount;
+            amt *= args.Scale;
+
+            sys.TryModifyBloodLevel(args.SolutionEntity, amt, blood);
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/ModifyLungGas.cs b/Content.Server/Chemistry/ReagentEffects/ModifyLungGas.cs
new file mode 100644
index 00000000000..e7466fbc85d
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/ModifyLungGas.cs
@@ -0,0 +1,30 @@
+using Content.Server.Body.Components;
+using Content.Shared.Atmos;
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Chemistry.ReagentEffects;
+
+public sealed partial class ModifyLungGas : ReagentEffect
+{
+    [DataField("ratios", required: true)]
+    private Dictionary<Gas, float> _ratios = default!;
+
+    // JUSTIFICATION: This is internal magic that players never directly interact with.
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => null;
+
+    public override void Effect(ReagentEffectArgs args)
+    {
+        if (!args.EntityManager.TryGetComponent<LungComponent>(args.OrganEntity, out var lung))
+            return;
+
+        foreach (var (gas, ratio) in _ratios)
+        {
+            var quantity = ratio * args.Quantity.Float() / Atmospherics.BreathMolesToReagentMultiplier;
+            if (quantity < 0)
+                quantity = Math.Max(quantity, -lung.Air[(int)gas]);
+            lung.Air.AdjustMoles(gas, quantity);
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/MovespeedModifier.cs b/Content.Server/Chemistry/ReagentEffects/MovespeedModifier.cs
new file mode 100644
index 00000000000..0301742c5af
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/MovespeedModifier.cs
@@ -0,0 +1,75 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Movement.Systems;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Server.Chemistry.ReagentEffects
+{
+    /// <summary>
+    /// Default metabolism for stimulants and tranqs. Attempts to find a MovementSpeedModifier on the target,
+    /// adding one if not there and to change the movespeed
+    /// </summary>
+    public sealed partial class MovespeedModifier : ReagentEffect
+    {
+        /// <summary>
+        /// How much the entities' walk speed is multiplied by.
+        /// </summary>
+        [DataField]
+        public float WalkSpeedModifier { get; set; } = 1;
+
+        /// <summary>
+        /// How much the entities' run speed is multiplied by.
+        /// </summary>
+        [DataField]
+        public float SprintSpeedModifier { get; set; } = 1;
+
+        /// <summary>
+        /// How long the modifier applies (in seconds) when metabolized.
+        /// </summary>
+        [DataField]
+        public float StatusLifetime = 2f;
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        {
+            return Loc.GetString("reagent-effect-guidebook-movespeed-modifier",
+                ("chance", Probability),
+                ("walkspeed", WalkSpeedModifier),
+                ("time", StatusLifetime));
+        }
+
+        /// <summary>
+        /// Remove reagent at set rate, changes the movespeed modifiers and adds a MovespeedModifierMetabolismComponent if not already there.
+        /// </summary>
+        public override void Effect(ReagentEffectArgs args)
+        {
+            var status = args.EntityManager.EnsureComponent<MovespeedModifierMetabolismComponent>(args.SolutionEntity);
+
+            // Only refresh movement if we need to.
+            var modified = !status.WalkSpeedModifier.Equals(WalkSpeedModifier) ||
+                           !status.SprintSpeedModifier.Equals(SprintSpeedModifier);
+
+            status.WalkSpeedModifier = WalkSpeedModifier;
+            status.SprintSpeedModifier = SprintSpeedModifier;
+
+            // only going to scale application time
+            var statusLifetime = StatusLifetime;
+            statusLifetime *= args.Scale;
+
+            IncreaseTimer(status, statusLifetime);
+
+            if (modified)
+                EntitySystem.Get<MovementSpeedModifierSystem>().RefreshMovementSpeedModifiers(args.SolutionEntity);
+
+        }
+        public void IncreaseTimer(MovespeedModifierMetabolismComponent status, float time)
+        {
+            var gameTiming = IoCManager.Resolve<IGameTiming>();
+
+            var offsetTime = Math.Max(status.ModifierTimer.TotalSeconds, gameTiming.CurTime.TotalSeconds);
+
+            status.ModifierTimer = TimeSpan.FromSeconds(offsetTime + time);
+            status.Dirty();
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/Oxygenate.cs b/Content.Server/Chemistry/ReagentEffects/Oxygenate.cs
new file mode 100644
index 00000000000..34a2454139e
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/Oxygenate.cs
@@ -0,0 +1,25 @@
+using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Chemistry.ReagentEffects;
+
+public sealed partial class Oxygenate : ReagentEffect
+{
+    [DataField]
+    public float Factor = 1f;
+
+    // JUSTIFICATION: This is internal magic that players never directly interact with.
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => null;
+
+    public override void Effect(ReagentEffectArgs args)
+    {
+        if (args.EntityManager.TryGetComponent<RespiratorComponent>(args.SolutionEntity, out var resp))
+        {
+            var respSys = EntitySystem.Get<RespiratorSystem>();
+            respSys.UpdateSaturation(args.SolutionEntity, args.Quantity.Float() * Factor, resp);
+        }
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Paralyze.cs b/Content.Server/Chemistry/ReagentEffects/Paralyze.cs
similarity index 57%
rename from Content.Server/EntityEffects/Effects/Paralyze.cs
rename to Content.Server/Chemistry/ReagentEffects/Paralyze.cs
index 7dd2fdc1057..077d1abf2c2 100644
--- a/Content.Server/EntityEffects/Effects/Paralyze.cs
+++ b/Content.Server/Chemistry/ReagentEffects/Paralyze.cs
@@ -1,10 +1,10 @@
 using Content.Server.Stunnable;
-using Content.Shared.EntityEffects;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.EntityEffects.Effects;
+namespace Content.Server.Chemistry.ReagentEffects;
 
-public sealed partial class Paralyze : EntityEffect
+public sealed partial class Paralyze : ReagentEffect
 {
     [DataField] public double ParalyzeTime = 2;
 
@@ -18,14 +18,12 @@ public sealed partial class Paralyze : EntityEffect
             ("chance", Probability),
             ("time", ParalyzeTime));
 
-    public override void Effect(EntityEffectBaseArgs args)
+    public override void Effect(ReagentEffectArgs args)
     {
         var paralyzeTime = ParalyzeTime;
+        paralyzeTime *= args.Scale;
 
-        if (args is EntityEffectReagentArgs reagentArgs)
-            paralyzeTime *= (double)reagentArgs.Scale;
-
-        args.EntityManager.System<StunSystem>().TryParalyze(args.TargetEntity, TimeSpan.FromSeconds(paralyzeTime), Refresh);
+        EntitySystem.Get<StunSystem>().TryParalyze(args.SolutionEntity, TimeSpan.FromSeconds(paralyzeTime), Refresh);
     }
 }
 
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustAttribute.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustAttribute.cs
new file mode 100644
index 00000000000..f43b4828f93
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustAttribute.cs
@@ -0,0 +1,45 @@
+using Content.Server.Botany.Components;
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
+{
+    [ImplicitDataDefinitionForInheritors]
+    public abstract partial class PlantAdjustAttribute : ReagentEffect
+    {
+        [DataField]
+        public float Amount { get; protected set; } = 1;
+
+        [DataField]
+        public float Prob { get; protected set; } = 1; // = (80);
+
+        /// <summary>
+        ///     Checks if the plant holder can metabolize the reagent or not. Checks if it has an alive plant by default.
+        /// </summary>
+        /// <param name="plantHolder">The entity holding the plant</param>
+        /// <param name="plantHolderComponent">The plant holder component</param>
+        /// <param name="entityManager">The entity manager</param>
+        /// <param name="mustHaveAlivePlant">Whether to check if it has an alive plant or not</param>
+        /// <returns></returns>
+        public bool CanMetabolize(EntityUid plantHolder, [NotNullWhen(true)] out PlantHolderComponent? plantHolderComponent,
+            IEntityManager entityManager,
+            bool mustHaveAlivePlant = true)
+        {
+            plantHolderComponent = null;
+
+            if (!entityManager.TryGetComponent(plantHolder, out plantHolderComponent)
+                                    || mustHaveAlivePlant && (plantHolderComponent.Seed == null || plantHolderComponent.Dead))
+                return false;
+
+            if (Prob >= 1f)
+                return true;
+
+            // Dependencies are never injected for reagents if you intend to do that for this.
+            return !(Prob <= 0f) && IoCManager.Resolve<IRobustRandom>().Prob(Prob);
+        }
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability));
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustHealth.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustHealth.cs
new file mode 100644
index 00000000000..f03464469eb
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustHealth.cs
@@ -0,0 +1,19 @@
+using Content.Server.Botany.Systems;
+using Content.Shared.Chemistry.Reagent;
+
+namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
+{
+    public sealed partial class PlantAdjustHealth : PlantAdjustAttribute
+    {
+        public override void Effect(ReagentEffectArgs args)
+        {
+            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
+                return;
+
+            var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+
+            plantHolderComp.Health += Amount;
+            plantHolder.CheckHealth(args.SolutionEntity, plantHolderComp);
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationLevel.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationLevel.cs
new file mode 100644
index 00000000000..8c8d04765a2
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationLevel.cs
@@ -0,0 +1,15 @@
+using Content.Shared.Chemistry.Reagent;
+
+namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
+{
+    public sealed partial class PlantAdjustMutationLevel : PlantAdjustAttribute
+    {
+        public override void Effect(ReagentEffectArgs args)
+        {
+            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
+                return;
+
+            plantHolderComp.MutationLevel += Amount * plantHolderComp.MutationMod;
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationMod.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationMod.cs
new file mode 100644
index 00000000000..af4a00a044e
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationMod.cs
@@ -0,0 +1,17 @@
+using Content.Shared.Chemistry.Reagent;
+using JetBrains.Annotations;
+
+namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
+{
+    [UsedImplicitly]
+    public sealed partial class PlantAdjustMutationMod : PlantAdjustAttribute
+    {
+        public override void Effect(ReagentEffectArgs args)
+        {
+            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
+                return;
+
+            plantHolderComp.MutationMod += Amount;
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustNutrition.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustNutrition.cs
new file mode 100644
index 00000000000..900121412e8
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustNutrition.cs
@@ -0,0 +1,20 @@
+using Content.Server.Botany.Systems;
+using Content.Shared.Chemistry.Reagent;
+using JetBrains.Annotations;
+
+namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
+{
+    [UsedImplicitly]
+    public sealed partial class PlantAdjustNutrition : PlantAdjustAttribute
+    {
+        public override void Effect(ReagentEffectArgs args)
+        {
+            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager, mustHaveAlivePlant: false))
+                return;
+
+            var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+
+            plantHolder.AdjustNutrient(args.SolutionEntity, Amount, plantHolderComp);
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustPests.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustPests.cs
new file mode 100644
index 00000000000..27729b4b2ca
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustPests.cs
@@ -0,0 +1,17 @@
+using Content.Shared.Chemistry.Reagent;
+using JetBrains.Annotations;
+
+namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
+{
+    [UsedImplicitly]
+    public sealed partial class PlantAdjustPests : PlantAdjustAttribute
+    {
+        public override void Effect(ReagentEffectArgs args)
+        {
+            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
+                return;
+
+            plantHolderComp.PestLevel += Amount;
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustToxins.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustToxins.cs
new file mode 100644
index 00000000000..35130238ad5
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustToxins.cs
@@ -0,0 +1,17 @@
+using Content.Shared.Chemistry.Reagent;
+using JetBrains.Annotations;
+
+namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
+{
+    [UsedImplicitly]
+    public sealed partial class PlantAdjustToxins : PlantAdjustAttribute
+    {
+        public override void Effect(ReagentEffectArgs args)
+        {
+            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
+                return;
+
+            plantHolderComp.Toxins += Amount;
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWater.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWater.cs
new file mode 100644
index 00000000000..71b4670dc65
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWater.cs
@@ -0,0 +1,20 @@
+using Content.Server.Botany.Systems;
+using Content.Shared.Chemistry.Reagent;
+using JetBrains.Annotations;
+
+namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
+{
+    [UsedImplicitly]
+    public sealed partial class PlantAdjustWater : PlantAdjustAttribute
+    {
+        public override void Effect(ReagentEffectArgs args)
+        {
+            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager, mustHaveAlivePlant: false))
+                return;
+
+            var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+
+            plantHolder.AdjustWater(args.SolutionEntity, Amount, plantHolderComp);
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWeeds.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWeeds.cs
new file mode 100644
index 00000000000..6184b95adb8
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWeeds.cs
@@ -0,0 +1,17 @@
+using Content.Shared.Chemistry.Reagent;
+using JetBrains.Annotations;
+
+namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
+{
+    [UsedImplicitly]
+    public sealed partial class PlantAdjustWeeds : PlantAdjustAttribute
+    {
+        public override void Effect(ReagentEffectArgs args)
+        {
+            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
+                return;
+
+            plantHolderComp.WeedLevel += Amount;
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAffectGrowth.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAffectGrowth.cs
new file mode 100644
index 00000000000..54ec628fdc9
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAffectGrowth.cs
@@ -0,0 +1,20 @@
+using Content.Server.Botany.Systems;
+using Content.Shared.Chemistry.Reagent;
+using JetBrains.Annotations;
+
+namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
+{
+    [UsedImplicitly]
+    public sealed partial class PlantAffectGrowth : PlantAdjustAttribute
+    {
+        public override void Effect(ReagentEffectArgs args)
+        {
+            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
+                return;
+
+            var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+
+            plantHolder.AffectGrowth(args.SolutionEntity, (int) Amount, plantHolderComp);
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantCryoxadone.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantCryoxadone.cs
new file mode 100644
index 00000000000..83a5f56e592
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantCryoxadone.cs
@@ -0,0 +1,33 @@
+using Content.Server.Botany.Components;
+using Content.Shared.Chemistry.Reagent;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
+{
+    [UsedImplicitly]
+    [DataDefinition]
+    public sealed partial class PlantCryoxadone : ReagentEffect
+    {
+        public override void Effect(ReagentEffectArgs args)
+        {
+            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out PlantHolderComponent? plantHolderComp)
+            || plantHolderComp.Seed == null || plantHolderComp.Dead)
+                return;
+
+            var deviation = 0;
+            var seed = plantHolderComp.Seed;
+            var random = IoCManager.Resolve<IRobustRandom>();
+            if (plantHolderComp.Age > seed.Maturation)
+                deviation = (int) Math.Max(seed.Maturation - 1, plantHolderComp.Age - random.Next(7, 10));
+            else
+                deviation = (int) (seed.Maturation / seed.GrowthStages);
+            plantHolderComp.Age -= deviation;
+            plantHolderComp.SkipAging++;
+            plantHolderComp.ForceUpdate = true;
+        }
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability));
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantDiethylamine.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantDiethylamine.cs
new file mode 100644
index 00000000000..23cb436d2f1
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantDiethylamine.cs
@@ -0,0 +1,41 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.Chemistry.Reagent;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
+{
+    [UsedImplicitly]
+    [DataDefinition]
+    public sealed partial class PlantDiethylamine : ReagentEffect
+    {
+        public override void Effect(ReagentEffectArgs args)
+        {
+            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out PlantHolderComponent? plantHolderComp)
+                                    || plantHolderComp.Seed == null || plantHolderComp.Dead ||
+                                    plantHolderComp.Seed.Immutable)
+                return;
+
+
+            var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+
+            var random = IoCManager.Resolve<IRobustRandom>();
+
+            if (random.Prob(0.1f))
+            {
+                plantHolder.EnsureUniqueSeed(args.SolutionEntity, plantHolderComp);
+                plantHolderComp.Seed.Lifespan++;
+            }
+
+            if (random.Prob(0.1f))
+            {
+                plantHolder.EnsureUniqueSeed(args.SolutionEntity, plantHolderComp);
+                plantHolderComp.Seed.Endurance++;
+            }
+        }
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability));
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantPhalanximine.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantPhalanximine.cs
new file mode 100644
index 00000000000..c0640d7fc04
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantPhalanximine.cs
@@ -0,0 +1,24 @@
+using Content.Server.Botany.Components;
+using Content.Shared.Chemistry.Reagent;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
+{
+    [UsedImplicitly]
+    [DataDefinition]
+    public sealed partial class PlantPhalanximine : ReagentEffect
+    {
+        public override void Effect(ReagentEffectArgs args)
+        {
+            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out PlantHolderComponent? plantHolderComp)
+                                    || plantHolderComp.Seed == null || plantHolderComp.Dead ||
+                                    plantHolderComp.Seed.Immutable)
+                return;
+
+            plantHolderComp.Seed.Viable = true;
+        }
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability));
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/RobustHarvest.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/RobustHarvest.cs
new file mode 100644
index 00000000000..990a5a5003f
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/RobustHarvest.cs
@@ -0,0 +1,54 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.Chemistry.Reagent;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
+{
+    [UsedImplicitly]
+    [DataDefinition]
+    public sealed partial class RobustHarvest : ReagentEffect
+    {
+        [DataField]
+        public int PotencyLimit = 50;
+
+        [DataField]
+        public int PotencyIncrease = 3;
+
+        [DataField]
+        public int PotencySeedlessThreshold = 30;
+
+        public override void Effect(ReagentEffectArgs args)
+        {
+            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out PlantHolderComponent? plantHolderComp)
+                                    || plantHolderComp.Seed == null || plantHolderComp.Dead ||
+                                    plantHolderComp.Seed.Immutable)
+                return;
+
+
+            var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+            var random = IoCManager.Resolve<IRobustRandom>();
+
+            if (plantHolderComp.Seed.Potency < PotencyLimit)
+            {
+                plantHolder.EnsureUniqueSeed(args.SolutionEntity, plantHolderComp);
+                plantHolderComp.Seed.Potency = Math.Min(plantHolderComp.Seed.Potency + PotencyIncrease, PotencyLimit);
+
+                if (plantHolderComp.Seed.Potency > PotencySeedlessThreshold)
+                {
+                    plantHolderComp.Seed.Seedless = true;
+                }
+            }
+            else if (plantHolderComp.Seed.Yield > 1 && random.Prob(0.1f))
+            {
+                // Too much of a good thing reduces yield
+                plantHolder.EnsureUniqueSeed(args.SolutionEntity, plantHolderComp);
+                plantHolderComp.Seed.Yield--;
+            }
+        }
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability));
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Polymorph.cs b/Content.Server/Chemistry/ReagentEffects/Polymorph.cs
similarity index 80%
rename from Content.Server/EntityEffects/Effects/Polymorph.cs
rename to Content.Server/Chemistry/ReagentEffects/Polymorph.cs
index 00a5c6613d0..fea372125ee 100644
--- a/Content.Server/EntityEffects/Effects/Polymorph.cs
+++ b/Content.Server/Chemistry/ReagentEffects/Polymorph.cs
@@ -1,14 +1,13 @@
 using Content.Server.Polymorph.Components;
 using Content.Server.Polymorph.Systems;
-using Content.Shared.EntityEffects;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Polymorph;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Content.Shared.EntityEffects;
 
-namespace Content.Server.EntityEffects.Effects;
+namespace Content.Server.Chemistry.ReagentEffects;
 
-public sealed partial class Polymorph : EntityEffect
+public sealed partial class Polymorph : ReagentEffect
 {
     /// <summary>
     ///     What polymorph prototype is used on effect
@@ -21,10 +20,10 @@ public sealed partial class Polymorph : EntityEffect
             ("chance", Probability), ("entityname",
                 prototype.Index<EntityPrototype>(prototype.Index<PolymorphPrototype>(PolymorphPrototype).Configuration.Entity).Name));
 
-    public override void Effect(EntityEffectBaseArgs args)
+    public override void Effect(ReagentEffectArgs args)
     {
         var entityManager = args.EntityManager;
-        var uid = args.TargetEntity;
+        var uid = args.SolutionEntity;
         var polySystem = entityManager.System<PolymorphSystem>();
 
         // Make it into a prototype
diff --git a/Content.Server/EntityEffects/Effects/PopupMessage.cs b/Content.Server/Chemistry/ReagentEffects/PopupMessage.cs
similarity index 60%
rename from Content.Server/EntityEffects/Effects/PopupMessage.cs
rename to Content.Server/Chemistry/ReagentEffects/PopupMessage.cs
index ac22b13051b..8278e95c1da 100644
--- a/Content.Server/EntityEffects/Effects/PopupMessage.cs
+++ b/Content.Server/Chemistry/ReagentEffects/PopupMessage.cs
@@ -1,11 +1,12 @@
-using Content.Shared.EntityEffects;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Popups;
+using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
-namespace Content.Server.EntityEffects.Effects
+namespace Content.Server.Chemistry.ReagentEffects
 {
-    public sealed partial class PopupMessage : EntityEffect
+    public sealed partial class PopupMessage : ReagentEffect
     {
         [DataField(required: true)]
         public string[] Messages = default!;
@@ -20,30 +21,20 @@ public sealed partial class PopupMessage : EntityEffect
         protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
             => null;
 
-        public override void Effect(EntityEffectBaseArgs args)
+        public override void Effect(ReagentEffectArgs args)
         {
             var popupSys = args.EntityManager.EntitySysManager.GetEntitySystem<SharedPopupSystem>();
             var random = IoCManager.Resolve<IRobustRandom>();
 
             var msg = random.Pick(Messages);
-            var msgArgs = new (string, object)[]
-            {
-                ("entity", args.TargetEntity),
+            var msgArgs = new (string, object)[] {
+                ("entity", args.SolutionEntity),
+                ("organ", args.OrganEntity.GetValueOrDefault()),
             };
-
-            if (args is EntityEffectReagentArgs reagentArgs)
-            {
-                msgArgs = new (string, object)[]
-                {
-                    ("entity", reagentArgs.TargetEntity),
-                    ("organ", reagentArgs.OrganEntity.GetValueOrDefault()),
-                };
-            }
-
             if (Type == PopupRecipients.Local)
-                popupSys.PopupEntity(Loc.GetString(msg, msgArgs), args.TargetEntity, args.TargetEntity, VisualType);
+                popupSys.PopupEntity(Loc.GetString(msg, msgArgs), args.SolutionEntity, args.SolutionEntity, VisualType);
             else if (Type == PopupRecipients.Pvs)
-                popupSys.PopupEntity(Loc.GetString(msg, msgArgs), args.TargetEntity, VisualType);
+                popupSys.PopupEntity(Loc.GetString(msg, msgArgs), args.SolutionEntity, VisualType);
         }
     }
 
diff --git a/Content.Server/EntityEffects/Effects/PurifyEvil.cs b/Content.Server/Chemistry/ReagentEffects/PurifyEvil.cs
similarity index 100%
rename from Content.Server/EntityEffects/Effects/PurifyEvil.cs
rename to Content.Server/Chemistry/ReagentEffects/PurifyEvil.cs
diff --git a/Content.Server/EntityEffects/Effects/ReduceRotting.cs b/Content.Server/Chemistry/ReagentEffects/ReduceRotting.cs
similarity index 61%
rename from Content.Server/EntityEffects/Effects/ReduceRotting.cs
rename to Content.Server/Chemistry/ReagentEffects/ReduceRotting.cs
index 5c00492744d..cea4f853321 100644
--- a/Content.Server/EntityEffects/Effects/ReduceRotting.cs
+++ b/Content.Server/Chemistry/ReagentEffects/ReduceRotting.cs
@@ -1,16 +1,15 @@
 using Content.Shared.Chemistry.Reagent;
-using Content.Shared.EntityEffects;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Content.Server.Atmos.Rotting;
 
-namespace Content.Server.EntityEffects.Effects
+namespace Content.Server.Chemistry.ReagentEffects
 {
     /// <summary>
     /// Reduces the rotting accumulator on the patient, making them revivable.
     /// </summary>
     [UsedImplicitly]
-    public sealed partial class ReduceRotting : EntityEffect
+    public sealed partial class ReduceRotting : ReagentEffect
     {
         [DataField("seconds")]
         public double RottingAmount = 10;
@@ -19,17 +18,14 @@ public sealed partial class ReduceRotting : EntityEffect
             => Loc.GetString("reagent-effect-guidebook-reduce-rotting",
                 ("chance", Probability),
                 ("time", RottingAmount));
-        public override void Effect(EntityEffectBaseArgs args)
+        public override void Effect(ReagentEffectArgs args)
         {
-            if (args is EntityEffectReagentArgs reagentArgs)
-            {
-                if (reagentArgs.Scale != 1f)
-                    return;
-            }
+            if (args.Scale != 1f)
+                return;
 
             var rottingSys = args.EntityManager.EntitySysManager.GetEntitySystem<RottingSystem>();
 
-            rottingSys.ReduceAccumulator(args.TargetEntity, TimeSpan.FromSeconds(RottingAmount));
+            rottingSys.ReduceAccumulator(args.SolutionEntity, TimeSpan.FromSeconds(RottingAmount));
         }
     }
 }
diff --git a/Content.Server/EntityEffects/Effects/ResetNarcolepsy.cs b/Content.Server/Chemistry/ReagentEffects/ResetNarcolepsy.cs
similarity index 63%
rename from Content.Server/EntityEffects/Effects/ResetNarcolepsy.cs
rename to Content.Server/Chemistry/ReagentEffects/ResetNarcolepsy.cs
index 40a9c982515..2893505fc85 100644
--- a/Content.Server/EntityEffects/Effects/ResetNarcolepsy.cs
+++ b/Content.Server/Chemistry/ReagentEffects/ResetNarcolepsy.cs
@@ -1,16 +1,15 @@
 using Content.Server.Traits.Assorted;
 using Content.Shared.Chemistry.Reagent;
-using Content.Shared.EntityEffects;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.EntityEffects.Effects;
+namespace Content.Server.Chemistry.ReagentEffects;
 
 /// <summary>
 /// Reset narcolepsy timer
 /// </summary>
 [UsedImplicitly]
-public sealed partial class ResetNarcolepsy : EntityEffect
+public sealed partial class ResetNarcolepsy : ReagentEffect
 {
     /// <summary>
     /// The # of seconds the effect resets the narcolepsy timer to
@@ -21,12 +20,11 @@ public sealed partial class ResetNarcolepsy : EntityEffect
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
         => Loc.GetString("reagent-effect-guidebook-reset-narcolepsy", ("chance", Probability));
 
-    public override void Effect(EntityEffectBaseArgs args)
+    public override void Effect(ReagentEffectArgs args)
     {
-        if (args is EntityEffectReagentArgs reagentArgs)
-            if (reagentArgs.Scale != 1f)
-                return;
+        if (args.Scale != 1f)
+            return;
 
-        args.EntityManager.EntitySysManager.GetEntitySystem<NarcolepsySystem>().AdjustNarcolepsyTimer(args.TargetEntity, TimerReset);
+        args.EntityManager.EntitySysManager.GetEntitySystem<NarcolepsySystem>().AdjustNarcolepsyTimer(args.SolutionEntity, TimerReset);
     }
 }
diff --git a/Content.Server/EntityEffects/Effects/SatiateHunger.cs b/Content.Server/Chemistry/ReagentEffects/SatiateHunger.cs
similarity index 53%
rename from Content.Server/EntityEffects/Effects/SatiateHunger.cs
rename to Content.Server/Chemistry/ReagentEffects/SatiateHunger.cs
index dd58654dffc..be772022556 100644
--- a/Content.Server/EntityEffects/Effects/SatiateHunger.cs
+++ b/Content.Server/Chemistry/ReagentEffects/SatiateHunger.cs
@@ -1,40 +1,31 @@
-using Content.Server.Nutrition.Components;
+using Content.Server.Nutrition.Components;
 using Content.Shared.Chemistry.Reagent;
-using Content.Shared.EntityEffects;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.EntityEffects.Effects
+namespace Content.Server.Chemistry.ReagentEffects
 {
     /// <summary>
     /// Attempts to find a HungerComponent on the target,
     /// and to update it's hunger values.
     /// </summary>
-    public sealed partial class SatiateHunger : EntityEffect
+    public sealed partial class SatiateHunger : ReagentEffect
     {
         private const float DefaultNutritionFactor = 3.0f;
 
         /// <summary>
-        ///     How much hunger is satiated.
-        ///     Is multiplied by quantity if used with EntityEffectReagentArgs.
+        ///     How much hunger is satiated when 1u of the reagent is metabolized
         /// </summary>
         [DataField("factor")] public float NutritionFactor { get; set; } = DefaultNutritionFactor;
 
         //Remove reagent at set rate, satiate hunger if a HungerComponent can be found
-        public override void Effect(EntityEffectBaseArgs args)
+        public override void Effect(ReagentEffectArgs args)
         {
             var entman = args.EntityManager;
-            if (!entman.TryGetComponent(args.TargetEntity, out HungerComponent? hunger))
+            if (!entman.TryGetComponent(args.SolutionEntity, out HungerComponent? hunger))
                 return;
-            if (args is EntityEffectReagentArgs reagentArgs)
-            {
-                entman.System<HungerSystem>().ModifyHunger(reagentArgs.TargetEntity, NutritionFactor * (float) reagentArgs.Quantity, hunger);
-            }
-            else
-            {
-                entman.System<HungerSystem>().ModifyHunger(args.TargetEntity, NutritionFactor, hunger);
-            }
+            entman.System<HungerSystem>().ModifyHunger(args.SolutionEntity, NutritionFactor * (float) args.Quantity, hunger);
         }
 
         protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
diff --git a/Content.Server/Chemistry/ReagentEffects/SatiateThirst.cs b/Content.Server/Chemistry/ReagentEffects/SatiateThirst.cs
new file mode 100644
index 00000000000..1208e74367b
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/SatiateThirst.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Chemistry.ReagentEffects
+{
+    /// <summary>
+    /// Default metabolism for drink reagents. Attempts to find a ThirstComponent on the target,
+    /// and to update it's thirst values.
+    /// </summary>
+    public sealed partial class SatiateThirst : ReagentEffect
+    {
+        private const float DefaultHydrationFactor = 3.0f;
+
+        /// How much thirst is satiated each metabolism tick. Not currently tied to
+        /// rate or anything.
+        [DataField("factor")]
+        public float HydrationFactor { get; set; } = DefaultHydrationFactor;
+
+        /// Satiate thirst if a ThirstComponent can be found
+        public override void Effect(ReagentEffectArgs args)
+        {
+            var uid = args.SolutionEntity;
+            if (args.EntityManager.TryGetComponent(uid, out ThirstComponent? thirst))
+                EntitySystem.Get<ThirstSystem>().ModifyThirst(uid, thirst, HydrationFactor);
+        }
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+            => Loc.GetString("reagent-effect-guidebook-satiate-thirst", ("chance", Probability), ("relative",  HydrationFactor / DefaultHydrationFactor));
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/StatusEffects/GenericStatusEffect.cs b/Content.Server/Chemistry/ReagentEffects/StatusEffects/GenericStatusEffect.cs
new file mode 100644
index 00000000000..66454b25fd6
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/StatusEffects/GenericStatusEffect.cs
@@ -0,0 +1,76 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.StatusEffect;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Chemistry.ReagentEffects.StatusEffects
+{
+    /// <summary>
+    ///     Adds a generic status effect to the entity,
+    ///     not worrying about things like how to affect the time it lasts for
+    ///     or component fields or anything. Just adds a component to an entity
+    ///     for a given time. Easy.
+    /// </summary>
+    /// <remarks>
+    ///     Can be used for things like adding accents or something. I don't know. Go wild.
+    /// </remarks>
+    [UsedImplicitly]
+    public sealed partial class GenericStatusEffect : ReagentEffect
+    {
+        [DataField(required: true)]
+        public string Key = default!;
+
+        [DataField]
+        public string Component = String.Empty;
+
+        [DataField]
+        public float Time = 2.0f;
+
+        /// <remarks>
+        ///     true - refresh status effect time,  false - accumulate status effect time
+        /// </remarks>
+        [DataField]
+        public bool Refresh = true;
+
+        /// <summary>
+        ///     Should this effect add the status effect, remove time from it, or set its cooldown?
+        /// </summary>
+        [DataField]
+        public StatusEffectMetabolismType Type = StatusEffectMetabolismType.Add;
+
+        public override void Effect(ReagentEffectArgs args)
+        {
+            var statusSys = args.EntityManager.EntitySysManager.GetEntitySystem<StatusEffectsSystem>();
+
+            var time = Time;
+            time *= args.Scale;
+
+            if (Type == StatusEffectMetabolismType.Add && Component != String.Empty)
+            {
+                statusSys.TryAddStatusEffect(args.SolutionEntity, Key, TimeSpan.FromSeconds(time), Refresh, Component);
+            }
+            else if (Type == StatusEffectMetabolismType.Remove)
+            {
+                statusSys.TryRemoveTime(args.SolutionEntity, Key, TimeSpan.FromSeconds(time));
+            }
+            else if (Type == StatusEffectMetabolismType.Set)
+            {
+                statusSys.TrySetTime(args.SolutionEntity, Key, TimeSpan.FromSeconds(time));
+            }
+        }
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString(
+            "reagent-effect-guidebook-status-effect",
+            ("chance", Probability),
+            ("type", Type),
+            ("time", Time),
+            ("key", $"reagent-effect-status-effect-{Key}"));
+    }
+
+    public enum StatusEffectMetabolismType
+    {
+        Add,
+        Remove,
+        Set
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/StatusEffects/Jitter.cs b/Content.Server/Chemistry/ReagentEffects/StatusEffects/Jitter.cs
new file mode 100644
index 00000000000..7ee70957b7a
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/StatusEffects/Jitter.cs
@@ -0,0 +1,41 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Jittering;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Chemistry.ReagentEffects.StatusEffects
+{
+    /// <summary>
+    ///     Adds the jitter status effect to a mob.
+    ///     This doesn't use generic status effects because it needs to
+    ///     take in some parameters that JitterSystem needs.
+    /// </summary>
+    public sealed partial class Jitter : ReagentEffect
+    {
+        [DataField]
+        public float Amplitude = 10.0f;
+
+        [DataField]
+        public float Frequency = 4.0f;
+
+        [DataField]
+        public float Time = 2.0f;
+
+        /// <remarks>
+        ///     true - refresh jitter time,  false - accumulate jitter time
+        /// </remarks>
+        [DataField]
+        public bool Refresh = true;
+
+        public override void Effect(ReagentEffectArgs args)
+        {
+            var time = Time;
+            time *= args.Scale;
+
+            args.EntityManager.EntitySysManager.GetEntitySystem<SharedJitteringSystem>()
+                .DoJitter(args.SolutionEntity, TimeSpan.FromSeconds(time), Refresh, Amplitude, Frequency);
+        }
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+            Loc.GetString("reagent-effect-guidebook-jittering", ("chance", Probability));
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/WashCreamPieReaction.cs b/Content.Server/Chemistry/ReagentEffects/WashCreamPieReaction.cs
new file mode 100644
index 00000000000..9bf6792eca2
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/WashCreamPieReaction.cs
@@ -0,0 +1,22 @@
+using Content.Server.Nutrition.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Nutrition.Components;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Chemistry.ReagentEffects
+{
+    [UsedImplicitly]
+    public sealed partial class WashCreamPieReaction : ReagentEffect
+    {
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+            => Loc.GetString("reagent-effect-guidebook-wash-cream-pie-reaction", ("chance", Probability));
+
+        public override void Effect(ReagentEffectArgs args)
+        {
+            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out CreamPiedComponent? creamPied)) return;
+
+            EntitySystem.Get<CreamPieSystem>().SetCreamPied(args.SolutionEntity, creamPied, false);
+        }
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/WearableReaction.cs b/Content.Server/Chemistry/ReagentEffects/WearableReaction.cs
similarity index 50%
rename from Content.Server/EntityEffects/Effects/WearableReaction.cs
rename to Content.Server/Chemistry/ReagentEffects/WearableReaction.cs
index 9655bbc073f..d9f8414995d 100644
--- a/Content.Server/EntityEffects/Effects/WearableReaction.cs
+++ b/Content.Server/Chemistry/ReagentEffects/WearableReaction.cs
@@ -1,19 +1,17 @@
 using Content.Shared.Inventory;
 using Content.Shared.Chemistry.Reagent;
-using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.EntityEffects.Effects.Effects;
+namespace Content.Server.Chemistry.ReagentEffects;
 
 /// <summary>
-/// A reaction effect that spawns a PrototypeID in the entity's Slot, and attempts to consume the reagent if EntityEffectReagentArgs.
-/// Used to implement the water droplet effect for arachnids.
+/// A reaction effect that consumes the required amount of reagent and spawns PrototypeID in the
+/// entity's Slot. Used to implement the water droplet effect for arachnids.
 /// </summary>
-public sealed partial class WearableReaction : EntityEffect
+public sealed partial class WearableReaction : ReagentEffect
 {
     /// <summary>
     /// Minimum quantity of reagent required to trigger this effect.
-    /// Only used with EntityEffectReagentArgs.
     /// </summary>
     [DataField]
     public float AmountThreshold = 1f;
@@ -32,17 +30,13 @@ public sealed partial class WearableReaction : EntityEffect
 
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => null;
 
-    public override void Effect(EntityEffectBaseArgs args)
+    public override void Effect(ReagentEffectArgs args)
     {
+        if (args.Reagent == null || args.Quantity < AmountThreshold)
+            return;
+
         // SpawnItemInSlot returns false if slot is already occupied
-        if (args.EntityManager.System<InventorySystem>().SpawnItemInSlot(args.TargetEntity, Slot, PrototypeID))
-        {
-            if (args is EntityEffectReagentArgs reagentArgs)
-            {
-                if (reagentArgs.Reagent == null || reagentArgs.Quantity < AmountThreshold)
-                    return;
-                reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, AmountThreshold);
-            }
-        }
+        if (args.EntityManager.System<InventorySystem>().SpawnItemInSlot(args.SolutionEntity, Slot, PrototypeID))
+            args.Source?.RemoveReagent(args.Reagent.ID, AmountThreshold);
     }
 }
diff --git a/Content.Server/EntityEffects/EffectConditions/BodyTemperature.cs b/Content.Server/EntityEffects/EffectConditions/BodyTemperature.cs
deleted file mode 100644
index 9f68bec9182..00000000000
--- a/Content.Server/EntityEffects/EffectConditions/BodyTemperature.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Content.Server.Temperature.Components;
-using Content.Shared.EntityEffects;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.EntityEffects.EffectConditions;
-
-/// <summary>
-///     Requires the target entity to be above or below a certain temperature.
-///     Used for things like cryoxadone and pyroxadone.
-/// </summary>
-public sealed partial class Temperature : EntityEffectCondition
-{
-    [DataField]
-    public float Min = 0;
-
-    [DataField]
-    public float Max = float.PositiveInfinity;
-    public override bool Condition(EntityEffectBaseArgs args)
-    {
-        if (args.EntityManager.TryGetComponent(args.TargetEntity, out TemperatureComponent? temp))
-        {
-            if (temp.CurrentTemperature > Min && temp.CurrentTemperature < Max)
-                return true;
-        }
-
-        return false;
-    }
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        return Loc.GetString("reagent-effect-condition-guidebook-body-temperature",
-            ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
-            ("min", Min));
-    }
-}
diff --git a/Content.Server/EntityEffects/EffectConditions/JobCondition.cs b/Content.Server/EntityEffects/EffectConditions/JobCondition.cs
deleted file mode 100644
index c62cb60a22d..00000000000
--- a/Content.Server/EntityEffects/EffectConditions/JobCondition.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System.Linq;
-using Content.Shared.EntityEffects;
-using Content.Shared.Localizations;
-using Robust.Shared.Prototypes;
-using Content.Shared.Mind.Components;
-using Content.Shared.Roles;
-using Content.Shared.Roles.Jobs;
-
-namespace Content.Server.EntityEffects.EffectConditions;
-
-public sealed partial class JobCondition : EntityEffectCondition
-{
-    [DataField(required: true)] public List<ProtoId<JobPrototype>> Job;
-
-    public override bool Condition(EntityEffectBaseArgs args)
-    {
-        args.EntityManager.TryGetComponent<MindContainerComponent>(args.TargetEntity, out var mindContainer);
-        if (mindContainer != null && mindContainer.Mind != null)
-        {
-            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;
-            }
-        }
-
-        return false;
-    }
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        var localizedNames = Job.Select(jobId => prototype.Index(jobId).LocalizedName).ToList();
-        return Loc.GetString("reagent-effect-condition-guidebook-job-condition", ("job", ContentLocalizationManager.FormatListToOr(localizedNames)));
-    }
-}
-
-
diff --git a/Content.Server/EntityEffects/EffectConditions/MobStateCondition.cs b/Content.Server/EntityEffects/EffectConditions/MobStateCondition.cs
deleted file mode 100644
index d676b29bf9e..00000000000
--- a/Content.Server/EntityEffects/EffectConditions/MobStateCondition.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Content.Shared.EntityEffects;
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.EntityEffects.EffectConditions;
-
-public sealed partial class MobStateCondition : EntityEffectCondition
-{
-    [DataField]
-    public MobState Mobstate = MobState.Alive;
-
-    public override bool Condition(EntityEffectBaseArgs args)
-    {
-        if (args.EntityManager.TryGetComponent(args.TargetEntity, out MobStateComponent? mobState))
-        {
-            if (mobState.CurrentState == Mobstate)
-                return true;
-        }
-
-        return false;
-    }
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        return Loc.GetString("reagent-effect-condition-guidebook-mob-state-condition", ("state", Mobstate));
-    }
-}
-
diff --git a/Content.Server/EntityEffects/EffectConditions/OrganType.cs b/Content.Server/EntityEffects/EffectConditions/OrganType.cs
deleted file mode 100644
index fc52608fab2..00000000000
--- a/Content.Server/EntityEffects/EffectConditions/OrganType.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Shared.Body.Prototypes;
-using Content.Shared.EntityEffects;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.EntityEffects.EffectConditions;
-
-/// <summary>
-///     Requires that the metabolizing organ is or is not tagged with a certain MetabolizerType
-/// </summary>
-public sealed partial class OrganType : EntityEffectCondition
-{
-    [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<MetabolizerTypePrototype>))]
-    public string Type = default!;
-
-    /// <summary>
-    ///     Does this condition pass when the organ has the type, or when it doesn't have the type?
-    /// </summary>
-    [DataField]
-    public bool ShouldHave = true;
-
-    public override bool Condition(EntityEffectBaseArgs args)
-    {
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            if (reagentArgs.OrganEntity == null)
-                return false;
-
-            return Condition(reagentArgs.OrganEntity.Value, reagentArgs.EntityManager);
-        }
-
-        // TODO: Someone needs to figure out how to do this for non-reagent effects.
-        throw new NotImplementedException();
-    }
-
-    public bool Condition(Entity<MetabolizerComponent?> metabolizer, IEntityManager entMan)
-    {
-        metabolizer.Comp ??= entMan.GetComponentOrNull<MetabolizerComponent>(metabolizer.Owner);
-        if (metabolizer.Comp != null
-            && metabolizer.Comp.MetabolizerTypes != null
-            && metabolizer.Comp.MetabolizerTypes.Contains(Type))
-            return ShouldHave;
-        return !ShouldHave;
-    }
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        return Loc.GetString("reagent-effect-condition-guidebook-organ-type",
-            ("name", prototype.Index<MetabolizerTypePrototype>(Type).LocalizedName),
-            ("shouldhave", ShouldHave));
-    }
-}
diff --git a/Content.Server/EntityEffects/EffectConditions/ReagentThreshold.cs b/Content.Server/EntityEffects/EffectConditions/ReagentThreshold.cs
deleted file mode 100644
index 6cbd7b4ea57..00000000000
--- a/Content.Server/EntityEffects/EffectConditions/ReagentThreshold.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.EntityEffects;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.EntityEffects.EffectConditions;
-
-/// <summary>
-///     Used for implementing reagent effects that require a certain amount of reagent before it should be applied.
-///     For instance, overdoses.
-///
-///     This can also trigger on -other- reagents, not just the one metabolizing. By default, it uses the
-///     one being metabolized.
-/// </summary>
-public sealed partial class ReagentThreshold : EntityEffectCondition
-{
-    [DataField]
-    public FixedPoint2 Min = FixedPoint2.Zero;
-
-    [DataField]
-    public FixedPoint2 Max = FixedPoint2.MaxValue;
-
-    // TODO use ReagentId
-    [DataField]
-    public string? Reagent;
-
-    public override bool Condition(EntityEffectBaseArgs args)
-    {
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            var reagent = Reagent ?? reagentArgs.Reagent?.ID;
-            if (reagent == null)
-                return true; // No condition to apply.
-
-            var quant = FixedPoint2.Zero;
-            if (reagentArgs.Source != null)
-                quant = reagentArgs.Source.GetTotalPrototypeQuantity(reagent);
-
-            return quant >= Min && quant <= Max;
-        }
-
-        // TODO: Someone needs to figure out how to do this for non-reagent effects.
-        throw new NotImplementedException();
-    }
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        ReagentPrototype? reagentProto = null;
-        if (Reagent is not null)
-            prototype.TryIndex(Reagent, out reagentProto);
-
-        return Loc.GetString("reagent-effect-condition-guidebook-reagent-threshold",
-            ("reagent", reagentProto?.LocalizedName ?? Loc.GetString("reagent-effect-condition-guidebook-this-reagent")),
-            ("max", Max == FixedPoint2.MaxValue ? (float) int.MaxValue : Max.Float()),
-            ("min", Min.Float()));
-    }
-}
diff --git a/Content.Server/EntityEffects/EffectConditions/SolutionTemperature.cs b/Content.Server/EntityEffects/EffectConditions/SolutionTemperature.cs
deleted file mode 100644
index b964435db52..00000000000
--- a/Content.Server/EntityEffects/EffectConditions/SolutionTemperature.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using Content.Shared.EntityEffects;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.EntityEffects.EffectConditions;
-
-/// <summary>
-///     Requires the solution to be above or below a certain temperature.
-///     Used for things like explosives.
-/// </summary>
-public sealed partial class SolutionTemperature : EntityEffectCondition
-{
-    [DataField]
-    public float Min = 0.0f;
-
-    [DataField]
-    public float Max = float.PositiveInfinity;
-    public override bool Condition(EntityEffectBaseArgs args)
-    {
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            if (reagentArgs.Source == null)
-                return false;
-            if (reagentArgs.Source.Temperature < Min)
-                return false;
-            if (reagentArgs.Source.Temperature > Max)
-                return false;
-            return true;
-        }
-
-        // TODO: Someone needs to figure out how to do this for non-reagent effects.
-        throw new NotImplementedException();
-    }
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        return Loc.GetString("reagent-effect-condition-guidebook-solution-temperature",
-            ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
-            ("min", Min));
-    }
-}
diff --git a/Content.Server/EntityEffects/EffectConditions/TotalDamage.cs b/Content.Server/EntityEffects/EffectConditions/TotalDamage.cs
deleted file mode 100644
index 2d039a1ac8f..00000000000
--- a/Content.Server/EntityEffects/EffectConditions/TotalDamage.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Content.Shared.EntityEffects;
-using Content.Shared.Damage;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.EntityEffects.EffectConditions;
-
-public sealed partial class TotalDamage : EntityEffectCondition
-{
-    [DataField]
-    public FixedPoint2 Max = FixedPoint2.MaxValue;
-
-    [DataField]
-    public FixedPoint2 Min = FixedPoint2.Zero;
-
-    public override bool Condition(EntityEffectBaseArgs args)
-    {
-        if (args.EntityManager.TryGetComponent(args.TargetEntity, out DamageableComponent? damage))
-        {
-            var total = damage.TotalDamage;
-            if (total > Min && total < Max)
-                return true;
-        }
-
-        return false;
-    }
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        return Loc.GetString("reagent-effect-condition-guidebook-total-damage",
-            ("max", Max == FixedPoint2.MaxValue ? (float) int.MaxValue : Max.Float()),
-            ("min", Min.Float()));
-    }
-}
diff --git a/Content.Server/EntityEffects/EffectConditions/TotalHunger.cs b/Content.Server/EntityEffects/EffectConditions/TotalHunger.cs
deleted file mode 100644
index 84ad4c22403..00000000000
--- a/Content.Server/EntityEffects/EffectConditions/TotalHunger.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Content.Shared.EntityEffects;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.EntityEffects.EffectConditions;
-
-public sealed partial class Hunger : EntityEffectCondition
-{
-    [DataField]
-    public float Max = float.PositiveInfinity;
-
-    [DataField]
-    public float Min = 0;
-
-    public override bool Condition(EntityEffectBaseArgs args)
-    {
-        if (args.EntityManager.TryGetComponent(args.TargetEntity, out HungerComponent? hunger))
-        {
-            var total = hunger.CurrentHunger;
-            if (total > Min && total < Max)
-                return true;
-        }
-
-        return false;
-    }
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        return Loc.GetString("reagent-effect-condition-guidebook-total-hunger",
-            ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
-            ("min", Min));
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/AddToSolutionReaction.cs b/Content.Server/EntityEffects/Effects/AddToSolutionReaction.cs
deleted file mode 100644
index 10fb667ca48..00000000000
--- a/Content.Server/EntityEffects/Effects/AddToSolutionReaction.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Shared.EntityEffects;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.EntityEffects.Effects
-{
-    [UsedImplicitly]
-    public sealed partial class AddToSolutionReaction : EntityEffect
-    {
-        [DataField("solution")]
-        private string _solution = "reagents";
-
-        public override void Effect(EntityEffectBaseArgs args)
-        {
-            if (args is EntityEffectReagentArgs reagentArgs) {
-                if (reagentArgs.Reagent == null)
-                    return;
-
-                // TODO see if this is correct
-                var solutionContainerSystem = reagentArgs.EntityManager.System<SolutionContainerSystem>();
-                if (!solutionContainerSystem.TryGetSolution(reagentArgs.TargetEntity, _solution, out var solutionContainer))
-                    return;
-
-                if (solutionContainerSystem.TryAddReagent(solutionContainer.Value, reagentArgs.Reagent.ID, reagentArgs.Quantity, out var accepted))
-                    reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, accepted);
-
-                return;
-            }
-
-            // TODO: Someone needs to figure out how to do this for non-reagent effects.
-            throw new NotImplementedException();
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-            Loc.GetString("reagent-effect-guidebook-add-to-solution-reaction", ("chance", Probability));
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/AreaReactionEffect.cs b/Content.Server/EntityEffects/Effects/AreaReactionEffect.cs
deleted file mode 100644
index 481f1fc27c5..00000000000
--- a/Content.Server/EntityEffects/Effects/AreaReactionEffect.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using Content.Server.Fluids.EntitySystems;
-using Content.Shared.Audio;
-using Content.Shared.Coordinates.Helpers;
-using Content.Shared.Database;
-using Content.Shared.EntityEffects;
-using Content.Shared.FixedPoint;
-using Content.Shared.Maps;
-using JetBrains.Annotations;
-using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.EntityEffects.Effects;
-
-/// <summary>
-/// Basically smoke and foam reactions.
-/// </summary>
-[UsedImplicitly]
-[DataDefinition]
-public sealed partial class AreaReactionEffect : EntityEffect
-{
-    /// <summary>
-    /// How many seconds will the effect stay, counting after fully spreading.
-    /// </summary>
-    [DataField("duration")] private float _duration = 10;
-
-    /// <summary>
-    /// How many units of reaction for 1 smoke entity.
-    /// </summary>
-    [DataField] public FixedPoint2 OverflowThreshold = FixedPoint2.New(2.5);
-
-    /// <summary>
-    /// The entity prototype that will be spawned as the effect.
-    /// </summary>
-    [DataField("prototypeId", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
-    private string _prototypeId = default!;
-
-    /// <summary>
-    /// Sound that will get played when this reaction effect occurs.
-    /// </summary>
-    [DataField("sound", required: true)] private SoundSpecifier _sound = default!;
-
-    public override bool ShouldLog => true;
-
-    protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-area-reaction",
-                    ("duration", _duration)
-                );
-
-    public override LogImpact LogImpact => LogImpact.High;
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            if (reagentArgs.Source == null)
-                return;
-
-            var spreadAmount = (int) Math.Max(0, Math.Ceiling((reagentArgs.Quantity / OverflowThreshold).Float()));
-            var splitSolution = reagentArgs.Source.SplitSolution(reagentArgs.Source.Volume);
-            var transform = reagentArgs.EntityManager.GetComponent<TransformComponent>(reagentArgs.TargetEntity);
-            var mapManager = IoCManager.Resolve<IMapManager>();
-            var mapSys = reagentArgs.EntityManager.System<MapSystem>();
-            var sys = reagentArgs.EntityManager.System<TransformSystem>();
-            var mapCoords = sys.GetMapCoordinates(reagentArgs.TargetEntity, xform: transform);
-
-            if (!mapManager.TryFindGridAt(mapCoords, out var gridUid, out var grid) ||
-                !mapSys.TryGetTileRef(gridUid, grid, transform.Coordinates, out var tileRef) ||
-                tileRef.Tile.IsSpace())
-            {
-                return;
-            }
-
-            var coords = mapSys.MapToGrid(gridUid, mapCoords);
-            var ent = reagentArgs.EntityManager.SpawnEntity(_prototypeId, coords.SnapToGrid());
-
-            var smoke = reagentArgs.EntityManager.System<SmokeSystem>();
-            smoke.StartSmoke(ent, splitSolution, _duration, spreadAmount);
-
-            var audio = reagentArgs.EntityManager.System<SharedAudioSystem>();
-            audio.PlayPvs(_sound, reagentArgs.TargetEntity, AudioHelpers.WithVariation(0.125f));
-            return;
-        }
-
-        // TODO: Someone needs to figure out how to do this for non-reagent effects.
-        throw new NotImplementedException();
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/ChemCleanBloodstream.cs b/Content.Server/EntityEffects/Effects/ChemCleanBloodstream.cs
deleted file mode 100644
index b7f6f0dc885..00000000000
--- a/Content.Server/EntityEffects/Effects/ChemCleanBloodstream.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using Content.Server.Body.Systems;
-using Content.Shared.EntityEffects;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.EntityEffects.Effects;
-
-/// <summary>
-/// Basically smoke and foam reactions.
-/// </summary>
-[UsedImplicitly]
-public sealed partial class ChemCleanBloodstream : EntityEffect
-{
-    [DataField]
-    public float CleanseRate = 3.0f;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-chem-clean-bloodstream", ("chance", Probability));
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        
-        var cleanseRate = CleanseRate;
-
-        var bloodstreamSys = args.EntityManager.System<BloodstreamSystem>();
-
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            if (reagentArgs.Source == null || reagentArgs.Reagent == null)
-                return;
-
-            cleanseRate *= reagentArgs.Scale.Float();
-            bloodstreamSys.FlushChemicals(args.TargetEntity, reagentArgs.Reagent.ID, cleanseRate);
-        }
-        else
-        {
-            bloodstreamSys.FlushChemicals(args.TargetEntity, "", cleanseRate);
-        }
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/ChemHealEyeDamage.cs b/Content.Server/EntityEffects/Effects/ChemHealEyeDamage.cs
deleted file mode 100644
index 42fc9ffa9fb..00000000000
--- a/Content.Server/EntityEffects/Effects/ChemHealEyeDamage.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Content.Shared.EntityEffects;
-using Content.Shared.Eye.Blinding.Systems;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.EntityEffects.Effects;
-
-/// <summary>
-/// Heal or apply eye damage
-/// </summary>
-[UsedImplicitly]
-public sealed partial class ChemHealEyeDamage : EntityEffect
-{
-    /// <summary>
-    /// How much eye damage to add.
-    /// </summary>
-    [DataField]
-    public int Amount = -1;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-cure-eye-damage", ("chance", Probability), ("deltasign", MathF.Sign(Amount)));
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (args is EntityEffectReagentArgs reagentArgs)
-            if (reagentArgs.Scale != 1f) // huh?
-                return;
-
-        args.EntityManager.EntitySysManager.GetEntitySystem<BlindableSystem>().AdjustEyeDamage(args.TargetEntity, Amount);
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Electrocute.cs b/Content.Server/EntityEffects/Effects/Electrocute.cs
deleted file mode 100644
index f6a5f1a2da7..00000000000
--- a/Content.Server/EntityEffects/Effects/Electrocute.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Content.Server.Electrocution;
-using Content.Shared.EntityEffects;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.EntityEffects.Effects;
-
-public sealed partial class Electrocute : EntityEffect
-{
-    [DataField] public int ElectrocuteTime = 2;
-
-    [DataField] public int ElectrocuteDamageScale = 5;
-
-    /// <remarks>
-    ///     true - refresh electrocute time,  false - accumulate electrocute time
-    /// </remarks>
-    [DataField] public bool Refresh = true;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-electrocute", ("chance", Probability), ("time", ElectrocuteTime));
-
-    public override bool ShouldLog => true;
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            reagentArgs.EntityManager.System<ElectrocutionSystem>().TryDoElectrocution(reagentArgs.TargetEntity, null,
-                Math.Max((reagentArgs.Quantity * ElectrocuteDamageScale).Int(), 1), TimeSpan.FromSeconds(ElectrocuteTime), Refresh, ignoreInsulation: true);
-
-            if (reagentArgs.Reagent != null)
-                reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, reagentArgs.Quantity);
-        } else
-        {
-            args.EntityManager.System<ElectrocutionSystem>().TryDoElectrocution(args.TargetEntity, null,
-                Math.Max(ElectrocuteDamageScale, 1), TimeSpan.FromSeconds(ElectrocuteTime), Refresh, ignoreInsulation: true);
-        }
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/ExplosionReactionEffect.cs b/Content.Server/EntityEffects/Effects/ExplosionReactionEffect.cs
deleted file mode 100644
index 689757d0440..00000000000
--- a/Content.Server/EntityEffects/Effects/ExplosionReactionEffect.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using Content.Server.Explosion.EntitySystems;
-using Content.Shared.Database;
-using Content.Shared.EntityEffects;
-using Content.Shared.Explosion;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using System.Text.Json.Serialization;
-
-namespace Content.Server.EntityEffects.Effects;
-
-[DataDefinition]
-public sealed partial class ExplosionReactionEffect : EntityEffect
-{
-    /// <summary>
-    ///     The type of explosion. Determines damage types and tile break chance scaling.
-    /// </summary>
-    [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<ExplosionPrototype>))]
-    [JsonIgnore]
-    public string ExplosionType = default!;
-
-    /// <summary>
-    ///     The max intensity the explosion can have at a given tile. Places an upper limit of damage and tile break
-    ///     chance.
-    /// </summary>
-    [DataField]
-    [JsonIgnore]
-    public float MaxIntensity = 5;
-
-    /// <summary>
-    ///     How quickly intensity drops off as you move away from the epicenter
-    /// </summary>
-    [DataField]
-    [JsonIgnore]
-    public float IntensitySlope = 1;
-
-    /// <summary>
-    ///     The maximum total intensity that this chemical reaction can achieve. Basically here to prevent people
-    ///     from creating a nuke by collecting enough potassium and water.
-    /// </summary>
-    /// <remarks>
-    ///     A slope of 1 and MaxTotalIntensity of 100 corresponds to a radius of around 4.5 tiles.
-    /// </remarks>
-    [DataField]
-    [JsonIgnore]
-    public float MaxTotalIntensity = 100;
-
-    /// <summary>
-    ///     The intensity of the explosion per unit reaction.
-    /// </summary>
-    [DataField]
-    [JsonIgnore]
-    public float IntensityPerUnit = 1;
-
-    public override bool ShouldLog => true;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-explosion-reaction-effect", ("chance", Probability));
-    public override LogImpact LogImpact => LogImpact.High;
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var intensity = IntensityPerUnit;
-
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            intensity = MathF.Min((float) reagentArgs.Quantity * IntensityPerUnit, MaxTotalIntensity);
-        }
-
-        args.EntityManager.System<ExplosionSystem>()
-            .QueueExplosion(
-            args.TargetEntity,
-            ExplosionType,
-            intensity,
-            IntensitySlope,
-            MaxIntensity);
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/ExtinguishReaction.cs b/Content.Server/EntityEffects/Effects/ExtinguishReaction.cs
deleted file mode 100644
index 6d7e7c2fcd8..00000000000
--- a/Content.Server/EntityEffects/Effects/ExtinguishReaction.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Content.Server.Atmos.Components;
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.EntityEffects;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.EntityEffects.Effects
-{
-    [UsedImplicitly]
-    public sealed partial class ExtinguishReaction : EntityEffect
-    {
-        /// <summary>
-        ///     Amount of firestacks reduced.
-        /// </summary>
-        [DataField]
-        public float FireStacksAdjustment = -1.5f;
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-extinguish-reaction", ("chance", Probability));
-
-        public override void Effect(EntityEffectBaseArgs args)
-        {
-            if (!args.EntityManager.TryGetComponent(args.TargetEntity, out FlammableComponent? flammable)) return;
-
-            var flammableSystem = args.EntityManager.System<FlammableSystem>();
-            flammableSystem.Extinguish(args.TargetEntity, flammable);
-            if (args is EntityEffectReagentArgs reagentArgs)
-            {
-                flammableSystem.AdjustFireStacks(reagentArgs.TargetEntity, FireStacksAdjustment * (float) reagentArgs.Quantity, flammable);
-            } else
-            {
-                flammableSystem.AdjustFireStacks(args.TargetEntity, FireStacksAdjustment, flammable);
-            }
-        }
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/FlammableReaction.cs b/Content.Server/EntityEffects/Effects/FlammableReaction.cs
deleted file mode 100644
index edd499ab4a5..00000000000
--- a/Content.Server/EntityEffects/Effects/FlammableReaction.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using Content.Server.Atmos.Components;
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.Database;
-using Content.Shared.EntityEffects;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.EntityEffects.Effects
-{
-    [UsedImplicitly]
-    public sealed partial class FlammableReaction : EntityEffect
-    {
-        [DataField]
-        public float Multiplier = 0.05f;
-
-        [DataField]
-        public float MultiplierOnExisting = 1f;
-
-        public override bool ShouldLog => true;
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-flammable-reaction", ("chance", Probability));
-
-        public override LogImpact LogImpact => LogImpact.Medium;
-
-        public override void Effect(EntityEffectBaseArgs args)
-        {
-            if (!args.EntityManager.TryGetComponent(args.TargetEntity, out FlammableComponent? flammable))
-                return;
-
-            var multiplier = flammable.FireStacks == 0f ? Multiplier : MultiplierOnExisting;
-            var quantity = 1f;
-            if (args is EntityEffectReagentArgs reagentArgs)
-            {
-                quantity = reagentArgs.Quantity.Float();
-                reagentArgs.EntityManager.System<FlammableSystem>().AdjustFireStacks(args.TargetEntity, quantity * multiplier, flammable);
-                if (reagentArgs.Reagent != null)
-                    reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, reagentArgs.Quantity);
-            } else
-            {
-                args.EntityManager.System<FlammableSystem>().AdjustFireStacks(args.TargetEntity, multiplier, flammable);
-            }
-        }
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Ignite.cs b/Content.Server/EntityEffects/Effects/Ignite.cs
deleted file mode 100644
index cca2a301fdf..00000000000
--- a/Content.Server/EntityEffects/Effects/Ignite.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.Database;
-using Content.Shared.EntityEffects;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.EntityEffects.Effects;
-
-/// <summary>
-///     Ignites a mob.
-/// </summary>
-public sealed partial class Ignite : EntityEffect
-{
-    public override bool ShouldLog => true;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-ignite", ("chance", Probability));
-
-    public override LogImpact LogImpact => LogImpact.Medium;
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var flamSys = args.EntityManager.System<FlammableSystem>();
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            flamSys.Ignite(reagentArgs.TargetEntity, reagentArgs.OrganEntity ?? reagentArgs.TargetEntity);
-        } else
-        {
-            flamSys.Ignite(args.TargetEntity, args.TargetEntity);
-        }
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/ModifyBleedAmount.cs b/Content.Server/EntityEffects/Effects/ModifyBleedAmount.cs
deleted file mode 100644
index 58bc304f5ea..00000000000
--- a/Content.Server/EntityEffects/Effects/ModifyBleedAmount.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
-using Content.Shared.EntityEffects;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.EntityEffects.Effects;
-
-public sealed partial class ModifyBleedAmount : EntityEffect
-{
-    [DataField]
-    public bool Scaled = false;
-
-    [DataField]
-    public float Amount = -1.0f;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-modify-bleed-amount", ("chance", Probability),
-            ("deltasign", MathF.Sign(Amount)));
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (args.EntityManager.TryGetComponent<BloodstreamComponent>(args.TargetEntity, out var blood))
-        {
-            var sys = args.EntityManager.System<BloodstreamSystem>();
-            var amt = Amount;
-            if (args is EntityEffectReagentArgs reagentArgs) {
-                if (Scaled)
-                    amt *= reagentArgs.Quantity.Float();
-                amt *= reagentArgs.Scale.Float();
-            }
-
-            sys.TryModifyBleedAmount(args.TargetEntity, amt, blood);
-        }
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/ModifyBloodLevel.cs b/Content.Server/EntityEffects/Effects/ModifyBloodLevel.cs
deleted file mode 100644
index d8aca7d2842..00000000000
--- a/Content.Server/EntityEffects/Effects/ModifyBloodLevel.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
-using Content.Shared.EntityEffects;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.EntityEffects.Effects;
-
-public sealed partial class ModifyBloodLevel : EntityEffect
-{
-    [DataField]
-    public bool Scaled = false;
-
-    [DataField]
-    public FixedPoint2 Amount = 1.0f;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-modify-blood-level", ("chance", Probability),
-            ("deltasign", MathF.Sign(Amount.Float())));
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (args.EntityManager.TryGetComponent<BloodstreamComponent>(args.TargetEntity, out var blood))
-        {
-            var sys = args.EntityManager.System<BloodstreamSystem>();
-            var amt = Amount;
-            if (args is EntityEffectReagentArgs reagentArgs)
-            {
-                if (Scaled)
-                    amt *= reagentArgs.Quantity;
-                amt *= reagentArgs.Scale;
-            }
-
-            sys.TryModifyBloodLevel(args.TargetEntity, amt, blood);
-        }
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/ModifyLungGas.cs b/Content.Server/EntityEffects/Effects/ModifyLungGas.cs
deleted file mode 100644
index b4f35e3d56b..00000000000
--- a/Content.Server/EntityEffects/Effects/ModifyLungGas.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Shared.Atmos;
-using Content.Shared.EntityEffects;
-using Robust.Shared.Prototypes;
-using Content.Shared.EntityEffects;
-
-namespace Content.Server.EntityEffects.Effects;
-
-public sealed partial class ModifyLungGas : EntityEffect
-{
-    [DataField("ratios", required: true)]
-    private Dictionary<Gas, float> _ratios = default!;
-
-    // JUSTIFICATION: This is internal magic that players never directly interact with.
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => null;
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-
-        LungComponent? lung;
-        float amount = 1f;
-
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            if (!args.EntityManager.TryGetComponent<LungComponent>(reagentArgs.OrganEntity, out var organLung))
-                return;
-            lung = organLung;
-            amount = reagentArgs.Quantity.Float();
-        }
-        else
-        {
-            if (!args.EntityManager.TryGetComponent<LungComponent>(args.TargetEntity, out var organLung)) //Likely needs to be modified to ensure it works correctly
-                return;
-            lung = organLung;
-        }
-
-        if (lung != null)
-        {
-            foreach (var (gas, ratio) in _ratios)
-            {
-                var quantity = ratio * amount / Atmospherics.BreathMolesToReagentMultiplier;
-                if (quantity < 0)
-                    quantity = Math.Max(quantity, -lung.Air[(int) gas]);
-                lung.Air.AdjustMoles(gas, quantity);
-            }
-        }
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/MovespeedModifier.cs b/Content.Server/EntityEffects/Effects/MovespeedModifier.cs
deleted file mode 100644
index ac1f143e9fb..00000000000
--- a/Content.Server/EntityEffects/Effects/MovespeedModifier.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using Content.Shared.Chemistry.Components;
-using Content.Shared.EntityEffects;
-using Content.Shared.Movement.Systems;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-
-namespace Content.Server.EntityEffects.Effects;
-
-/// <summary>
-/// Default metabolism for stimulants and tranqs. Attempts to find a MovementSpeedModifier on the target,
-/// adding one if not there and to change the movespeed
-/// </summary>
-public sealed partial class MovespeedModifier : EntityEffect
-{
-    /// <summary>
-    /// How much the entities' walk speed is multiplied by.
-    /// </summary>
-    [DataField]
-    public float WalkSpeedModifier { get; set; } = 1;
-
-    /// <summary>
-    /// How much the entities' run speed is multiplied by.
-    /// </summary>
-    [DataField]
-    public float SprintSpeedModifier { get; set; } = 1;
-
-    /// <summary>
-    /// How long the modifier applies (in seconds).
-    /// Is scaled by reagent amount if used with an EntityEffectReagentArgs.
-    /// </summary>
-    [DataField]
-    public float StatusLifetime = 2f;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        return Loc.GetString("reagent-effect-guidebook-movespeed-modifier",
-            ("chance", Probability),
-            ("walkspeed", WalkSpeedModifier),
-            ("time", StatusLifetime));
-    }
-
-    /// <summary>
-    /// Remove reagent at set rate, changes the movespeed modifiers and adds a MovespeedModifierMetabolismComponent if not already there.
-    /// </summary>
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var status = args.EntityManager.EnsureComponent<MovespeedModifierMetabolismComponent>(args.TargetEntity);
-
-        // Only refresh movement if we need to.
-        var modified = !status.WalkSpeedModifier.Equals(WalkSpeedModifier) ||
-                       !status.SprintSpeedModifier.Equals(SprintSpeedModifier);
-
-        status.WalkSpeedModifier = WalkSpeedModifier;
-        status.SprintSpeedModifier = SprintSpeedModifier;
-
-        // only going to scale application time
-        var statusLifetime = StatusLifetime;
-
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            statusLifetime *= reagentArgs.Scale.Float();
-        }
-
-        IncreaseTimer(status, statusLifetime);
-
-        if (modified)
-            args.EntityManager.System<MovementSpeedModifierSystem>().RefreshMovementSpeedModifiers(args.TargetEntity);
-    }
-    public void IncreaseTimer(MovespeedModifierMetabolismComponent status, float time)
-    {
-        var gameTiming = IoCManager.Resolve<IGameTiming>();
-
-        var offsetTime = Math.Max(status.ModifierTimer.TotalSeconds, gameTiming.CurTime.TotalSeconds);
-
-        status.ModifierTimer = TimeSpan.FromSeconds(offsetTime + time);
-        status.Dirty();
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Oxygenate.cs b/Content.Server/EntityEffects/Effects/Oxygenate.cs
deleted file mode 100644
index 60383188c9f..00000000000
--- a/Content.Server/EntityEffects/Effects/Oxygenate.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
-using Content.Shared.EntityEffects;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.EntityEffects.Effects;
-
-public sealed partial class Oxygenate : EntityEffect
-{
-    [DataField]
-    public float Factor = 1f;
-
-    // JUSTIFICATION: This is internal magic that players never directly interact with.
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => null;
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-
-        var multiplier = 1f;
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            multiplier = reagentArgs.Quantity.Float();
-        }
-
-        if (args.EntityManager.TryGetComponent<RespiratorComponent>(args.TargetEntity, out var resp))
-        {
-            var respSys = args.EntityManager.System<RespiratorSystem>();
-            respSys.UpdateSaturation(args.TargetEntity, multiplier * Factor, resp);
-        }
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs
deleted file mode 100644
index 5133fe502ff..00000000000
--- a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Shared.EntityEffects;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using System.Diagnostics.CodeAnalysis;
-
-namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
-
-[ImplicitDataDefinitionForInheritors]
-public abstract partial class PlantAdjustAttribute : EntityEffect
-{
-    [DataField]
-    public float Amount { get; protected set; } = 1;
-
-    /// <summary>
-    /// Localisation key for the name of the adjusted attribute. Used for guidebook descriptions.
-    /// </summary>
-    [DataField]
-    public abstract string GuidebookAttributeName { get; set; }
-
-    /// <summary>
-    /// Whether the attribute in question is a good thing. Used for guidebook descriptions to determine the color of the number.
-    /// </summary>
-    [DataField]
-    public virtual bool GuidebookIsAttributePositive { get; protected set; } = true;
-
-    /// <summary>
-    ///     Checks if the plant holder can metabolize the reagent or not. Checks if it has an alive plant by default.
-    /// </summary>
-    /// <param name="plantHolder">The entity holding the plant</param>
-    /// <param name="plantHolderComponent">The plant holder component</param>
-    /// <param name="entityManager">The entity manager</param>
-    /// <param name="mustHaveAlivePlant">Whether to check if it has an alive plant or not</param>
-    /// <returns></returns>
-    public bool CanMetabolize(EntityUid plantHolder, [NotNullWhen(true)] out PlantHolderComponent? plantHolderComponent,
-        IEntityManager entityManager,
-        bool mustHaveAlivePlant = true)
-    {
-        plantHolderComponent = null;
-
-        if (!entityManager.TryGetComponent(plantHolder, out plantHolderComponent)
-                                || mustHaveAlivePlant && (plantHolderComponent.Seed == null || plantHolderComponent.Dead))
-            return false;
-
-        return true;
-    }
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        string color;
-        if (GuidebookIsAttributePositive ^ Amount < 0.0)
-        {
-            color = "green";
-        }
-        else
-        {
-            color = "red";
-        }
-        return Loc.GetString("reagent-effect-guidebook-plant-attribute", ("attribute", Loc.GetString(GuidebookAttributeName)), ("amount", Amount.ToString("0.00")), ("colorName", color), ("chance", Probability));
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs
deleted file mode 100644
index 774f6ec48c6..00000000000
--- a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Content.Server.Botany.Systems;
-using Content.Shared.EntityEffects;
-
-namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
-
-public sealed partial class PlantAdjustHealth : PlantAdjustAttribute
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-health";
-    
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
-            return;
-
-        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
-
-        plantHolderComp.Health += Amount;
-        plantHolder.CheckHealth(args.TargetEntity, plantHolderComp);
-    }
-}
-
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs
deleted file mode 100644
index bf41a21bcb0..00000000000
--- a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Shared.EntityEffects;
-
-namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
-
-public sealed partial class PlantAdjustMutationLevel : PlantAdjustAttribute
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-mutation-level";
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
-            return;
-
-        plantHolderComp.MutationLevel += Amount * plantHolderComp.MutationMod;
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs
deleted file mode 100644
index 6ed793e6143..00000000000
--- a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Content.Shared.EntityEffects;
-using JetBrains.Annotations;
-
-namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
-
-[UsedImplicitly]
-public sealed partial class PlantAdjustMutationMod : PlantAdjustAttribute
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-mutation-mod";
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
-            return;
-
-        plantHolderComp.MutationMod += Amount;
-    }
-}
-
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs
deleted file mode 100644
index b9389afacdf..00000000000
--- a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Content.Server.Botany.Systems;
-using Content.Shared.EntityEffects;
-using JetBrains.Annotations;
-
-namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
-
-[UsedImplicitly]
-public sealed partial class PlantAdjustNutrition : PlantAdjustAttribute
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-nutrition";
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager, mustHaveAlivePlant: false))
-            return;
-
-        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
-
-        plantHolder.AdjustNutrient(args.TargetEntity, Amount, plantHolderComp);
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs
deleted file mode 100644
index 219529bfc4c..00000000000
--- a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Shared.EntityEffects;
-using JetBrains.Annotations;
-
-namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
-
-[UsedImplicitly]
-public sealed partial class PlantAdjustPests : PlantAdjustAttribute
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-pests";
-    public override bool GuidebookIsAttributePositive { get; protected set; } = false;
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
-            return;
-
-        plantHolderComp.PestLevel += Amount;
-    }
-}
-
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs
deleted file mode 100644
index ab1baa42850..00000000000
--- a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Shared.EntityEffects;
-using JetBrains.Annotations;
-
-namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
-
-[UsedImplicitly]
-public sealed partial class PlantAdjustToxins : PlantAdjustAttribute
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-toxins";
-    public override bool GuidebookIsAttributePositive { get; protected set; } = false;
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
-            return;
-
-        plantHolderComp.Toxins += Amount;
-    }
-}
-
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs
deleted file mode 100644
index 41774977d54..00000000000
--- a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Content.Server.Botany.Systems;
-using Content.Shared.EntityEffects;
-using JetBrains.Annotations;
-
-namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
-
-[UsedImplicitly]
-public sealed partial class PlantAdjustWater : PlantAdjustAttribute
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-water";
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager, mustHaveAlivePlant: false))
-            return;
-
-        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
-
-        plantHolder.AdjustWater(args.TargetEntity, Amount, plantHolderComp);
-    }
-}
-
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs
deleted file mode 100644
index 421e31998db..00000000000
--- a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Content.Shared.EntityEffects;
-using JetBrains.Annotations;
-
-namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
-
-[UsedImplicitly]
-public sealed partial class PlantAdjustWeeds : PlantAdjustAttribute
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-weeds";
-    public override bool GuidebookIsAttributePositive { get; protected set; } = false;
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
-            return;
-
-        plantHolderComp.WeedLevel += Amount;
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs
deleted file mode 100644
index 397eace399a..00000000000
--- a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Content.Server.Botany.Systems;
-using Content.Shared.EntityEffects;
-using JetBrains.Annotations;
-
-namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
-
-[UsedImplicitly]
-public sealed partial class PlantAffectGrowth : PlantAdjustAttribute
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-growth";
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
-            return;
-
-        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
-
-        plantHolder.AffectGrowth(args.TargetEntity, (int) Amount, plantHolderComp);
-    }
-}
-
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs
deleted file mode 100644
index 7fe4b7a1707..00000000000
--- a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Shared.EntityEffects;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
-
-[UsedImplicitly]
-[DataDefinition]
-public sealed partial class PlantCryoxadone : EntityEffect
-{
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (!args.EntityManager.TryGetComponent(args.TargetEntity, out PlantHolderComponent? plantHolderComp)
-        || plantHolderComp.Seed == null || plantHolderComp.Dead)
-            return;
-
-        var deviation = 0;
-        var seed = plantHolderComp.Seed;
-        var random = IoCManager.Resolve<IRobustRandom>();
-        if (plantHolderComp.Age > seed.Maturation)
-            deviation = (int) Math.Max(seed.Maturation - 1, plantHolderComp.Age - random.Next(7, 10));
-        else
-            deviation = (int) (seed.Maturation / seed.GrowthStages);
-        plantHolderComp.Age -= deviation;
-        plantHolderComp.SkipAging++;
-        plantHolderComp.ForceUpdate = true;
-    }
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-cryoxadone", ("chance", Probability));
-}
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs
deleted file mode 100644
index 36b6a833423..00000000000
--- a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Server.Botany.Systems;
-using Content.Shared.EntityEffects;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
-
-[UsedImplicitly]
-[DataDefinition]
-public sealed partial class PlantDiethylamine : EntityEffect
-{
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (!args.EntityManager.TryGetComponent(args.TargetEntity, out PlantHolderComponent? plantHolderComp)
-                                || plantHolderComp.Seed == null || plantHolderComp.Dead ||
-                                plantHolderComp.Seed.Immutable)
-            return;
-
-
-        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
-
-        var random = IoCManager.Resolve<IRobustRandom>();
-
-        if (random.Prob(0.1f))
-        {
-            plantHolder.EnsureUniqueSeed(args.TargetEntity, plantHolderComp);
-            plantHolderComp.Seed.Lifespan++;
-        }
-
-        if (random.Prob(0.1f))
-        {
-            plantHolder.EnsureUniqueSeed(args.TargetEntity, plantHolderComp);
-            plantHolderComp.Seed.Endurance++;
-        }
-    }
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-diethylamine", ("chance", Probability));
-}
-
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs
deleted file mode 100644
index 96d98bfbf2e..00000000000
--- a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Shared.EntityEffects;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
-
-[UsedImplicitly]
-[DataDefinition]
-public sealed partial class PlantPhalanximine : EntityEffect
-{
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (!args.EntityManager.TryGetComponent(args.TargetEntity, out PlantHolderComponent? plantHolderComp)
-                                || plantHolderComp.Seed == null || plantHolderComp.Dead ||
-                                plantHolderComp.Seed.Immutable)
-            return;
-
-        plantHolderComp.Seed.Viable = true;
-    }
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-phalanximine", ("chance", Probability));
-}
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs
deleted file mode 100644
index 695cb96675c..00000000000
--- a/Content.Server/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Server.Botany.Systems;
-using Content.Shared.EntityEffects;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
-
-[UsedImplicitly]
-[DataDefinition]
-public sealed partial class RobustHarvest : EntityEffect
-{
-    [DataField]
-    public int PotencyLimit = 50;
-
-    [DataField]
-    public int PotencyIncrease = 3;
-
-    [DataField]
-    public int PotencySeedlessThreshold = 30;
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (!args.EntityManager.TryGetComponent(args.TargetEntity, out PlantHolderComponent? plantHolderComp)
-                                || plantHolderComp.Seed == null || plantHolderComp.Dead ||
-                                plantHolderComp.Seed.Immutable)
-            return;
-
-
-        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
-        var random = IoCManager.Resolve<IRobustRandom>();
-
-        if (plantHolderComp.Seed.Potency < PotencyLimit)
-        {
-            plantHolder.EnsureUniqueSeed(args.TargetEntity, plantHolderComp);
-            plantHolderComp.Seed.Potency = Math.Min(plantHolderComp.Seed.Potency + PotencyIncrease, PotencyLimit);
-
-            if (plantHolderComp.Seed.Potency > PotencySeedlessThreshold)
-            {
-                plantHolderComp.Seed.Seedless = true;
-            }
-        }
-        else if (plantHolderComp.Seed.Yield > 1 && random.Prob(0.1f))
-        {
-            // Too much of a good thing reduces yield
-            plantHolder.EnsureUniqueSeed(args.TargetEntity, plantHolderComp);
-            plantHolderComp.Seed.Yield--;
-        }
-    }
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-robust-harvest", ("seedlesstreshold", PotencySeedlessThreshold), ("limit", PotencyLimit), ("increase", PotencyIncrease), ("chance", Probability));
-}
diff --git a/Content.Server/EntityEffects/Effects/SatiateThirst.cs b/Content.Server/EntityEffects/Effects/SatiateThirst.cs
deleted file mode 100644
index d0dbe4371b9..00000000000
--- a/Content.Server/EntityEffects/Effects/SatiateThirst.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.EntityEffects;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.Nutrition.EntitySystems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.EntityEffects.Effects;
-
-/// <summary>
-/// Default metabolism for drink reagents. Attempts to find a ThirstComponent on the target,
-/// and to update it's thirst values.
-/// </summary>
-public sealed partial class SatiateThirst : EntityEffect
-{
-    private const float DefaultHydrationFactor = 3.0f;
-
-    /// How much thirst is satiated each tick. Not currently tied to
-    /// rate or anything.
-    [DataField("factor")]
-    public float HydrationFactor { get; set; } = DefaultHydrationFactor;
-
-    /// Satiate thirst if a ThirstComponent can be found
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var uid = args.TargetEntity;
-        if (args.EntityManager.TryGetComponent(uid, out ThirstComponent? thirst))
-            args.EntityManager.System<ThirstSystem>().ModifyThirst(uid, thirst, HydrationFactor);
-    }
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-satiate-thirst", ("chance", Probability), ("relative",  HydrationFactor / DefaultHydrationFactor));
-}
diff --git a/Content.Server/EntityEffects/Effects/SolutionTemperatureEffects.cs b/Content.Server/EntityEffects/Effects/SolutionTemperatureEffects.cs
deleted file mode 100644
index 85c20dbcd11..00000000000
--- a/Content.Server/EntityEffects/Effects/SolutionTemperatureEffects.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.EntityEffects;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.EntityEffects.Effects;
-
-/// <summary>
-///     Sets the temperature of the solution involved with the reaction to a new value.
-/// </summary>
-[DataDefinition]
-public sealed partial class SetSolutionTemperatureEffect : EntityEffect
-{
-    /// <summary>
-    ///     The temperature to set the solution to.
-    /// </summary>
-    [DataField("temperature", required: true)] private float _temperature;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-set-solution-temperature-effect",
-            ("chance", Probability), ("temperature", _temperature));
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            var solution = reagentArgs.Source;
-            if (solution == null)
-                return;
-
-            solution.Temperature = _temperature;
-
-            return;
-        }
-
-        // TODO: Someone needs to figure out how to do this for non-reagent effects.
-        throw new NotImplementedException();
-    }
-}
-
-/// <summary>
-///     Adjusts the temperature of the solution involved in the reaction.
-/// </summary>
-[DataDefinition]
-public sealed partial class AdjustSolutionTemperatureEffect : EntityEffect
-{
-    /// <summary>
-    ///     The change in temperature.
-    /// </summary>
-    [DataField("delta", required: true)] private float _delta;
-
-    /// <summary>
-    ///     The minimum temperature this effect can reach.
-    /// </summary>
-    [DataField("minTemp")] private float _minTemp = 0.0f;
-
-    /// <summary>
-    ///     The maximum temperature this effect can reach.
-    /// </summary>
-    [DataField("maxTemp")] private float _maxTemp = float.PositiveInfinity;
-
-    /// <summary>
-    ///     If true, then scale ranges by intensity. If not, the ranges are the same regardless of reactant amount.
-    /// </summary>
-    [DataField("scaled")] private bool _scaled;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-adjust-solution-temperature-effect",
-            ("chance", Probability), ("deltasign", MathF.Sign(_delta)), ("mintemp", _minTemp), ("maxtemp", _maxTemp));
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            var solution = reagentArgs.Source;
-            if (solution == null || solution.Volume == 0)
-                return;
-
-            var deltaT = _scaled ? _delta * (float) reagentArgs.Quantity : _delta;
-            solution.Temperature = Math.Clamp(solution.Temperature + deltaT, _minTemp, _maxTemp);
-
-            return;
-        }
-
-        // TODO: Someone needs to figure out how to do this for non-reagent effects.
-        throw new NotImplementedException();
-    }
-}
-
-/// <summary>
-///     Adjusts the thermal energy of the solution involved in the reaction.
-/// </summary>
-public sealed partial class AdjustSolutionThermalEnergyEffect : EntityEffect
-{
-    /// <summary>
-    ///     The change in energy.
-    /// </summary>
-    [DataField("delta", required: true)] private float _delta;
-
-    /// <summary>
-    ///     The minimum temperature this effect can reach.
-    /// </summary>
-    [DataField("minTemp")] private float _minTemp = 0.0f;
-
-    /// <summary>
-    ///     The maximum temperature this effect can reach.
-    /// </summary>
-    [DataField("maxTemp")] private float _maxTemp = float.PositiveInfinity;
-
-    /// <summary>
-    ///     If true, then scale ranges by intensity. If not, the ranges are the same regardless of reactant amount.
-    /// </summary>
-    [DataField("scaled")] private bool _scaled;
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            var solution = reagentArgs.Source;
-            if (solution == null || solution.Volume == 0)
-                return;
-
-            if (_delta > 0 && solution.Temperature >= _maxTemp)
-                return;
-            if (_delta < 0 && solution.Temperature <= _minTemp)
-                return;
-
-            var heatCap = solution.GetHeatCapacity(null);
-            var deltaT = _scaled
-                ? _delta / heatCap * (float) reagentArgs.Quantity
-                : _delta / heatCap;
-
-            solution.Temperature = Math.Clamp(solution.Temperature + deltaT, _minTemp, _maxTemp);
-
-            return;
-        }
-
-        // TODO: Someone needs to figure out how to do this for non-reagent effects.
-        throw new NotImplementedException();
-    }
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-adjust-solution-temperature-effect",
-            ("chance", Probability), ("deltasign", MathF.Sign(_delta)), ("mintemp", _minTemp), ("maxtemp", _maxTemp));
-}
diff --git a/Content.Server/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs b/Content.Server/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs
deleted file mode 100644
index bb9bbf34469..00000000000
--- a/Content.Server/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.EntityEffects;
-using Content.Shared.StatusEffect;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.EntityEffects.Effects.StatusEffects;
-
-/// <summary>
-///     Adds a generic status effect to the entity,
-///     not worrying about things like how to affect the time it lasts for
-///     or component fields or anything. Just adds a component to an entity
-///     for a given time. Easy.
-/// </summary>
-/// <remarks>
-///     Can be used for things like adding accents or something. I don't know. Go wild.
-/// </remarks>
-[UsedImplicitly]
-public sealed partial class GenericStatusEffect : EntityEffect
-{
-    [DataField(required: true)]
-    public string Key = default!;
-
-    [DataField]
-    public string Component = String.Empty;
-
-    [DataField]
-    public float Time = 2.0f;
-
-    /// <remarks>
-    ///     true - refresh status effect time,  false - accumulate status effect time
-    /// </remarks>
-    [DataField]
-    public bool Refresh = true;
-
-    /// <summary>
-    ///     Should this effect add the status effect, remove time from it, or set its cooldown?
-    /// </summary>
-    [DataField]
-    public StatusEffectMetabolismType Type = StatusEffectMetabolismType.Add;
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var statusSys = args.EntityManager.EntitySysManager.GetEntitySystem<StatusEffectsSystem>();
-
-        var time = Time;
-        if (args is EntityEffectReagentArgs reagentArgs)
-            time *= reagentArgs.Scale.Float();
-
-        if (Type == StatusEffectMetabolismType.Add && Component != String.Empty)
-        {
-            statusSys.TryAddStatusEffect(args.TargetEntity, Key, TimeSpan.FromSeconds(time), Refresh, Component);
-        }
-        else if (Type == StatusEffectMetabolismType.Remove)
-        {
-            statusSys.TryRemoveTime(args.TargetEntity, Key, TimeSpan.FromSeconds(time));
-        }
-        else if (Type == StatusEffectMetabolismType.Set)
-        {
-            statusSys.TrySetTime(args.TargetEntity, Key, TimeSpan.FromSeconds(time));
-        }
-    }
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString(
-        "reagent-effect-guidebook-status-effect",
-        ("chance", Probability),
-        ("type", Type),
-        ("time", Time),
-        ("key", $"reagent-effect-status-effect-{Key}"));
-}
-
-public enum StatusEffectMetabolismType
-{
-    Add,
-    Remove,
-    Set
-}
diff --git a/Content.Server/EntityEffects/Effects/StatusEffects/Jitter.cs b/Content.Server/EntityEffects/Effects/StatusEffects/Jitter.cs
deleted file mode 100644
index dbca4fad588..00000000000
--- a/Content.Server/EntityEffects/Effects/StatusEffects/Jitter.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.EntityEffects;
-using Content.Shared.Jittering;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.EntityEffects.Effects.StatusEffects;
-
-/// <summary>
-///     Adds the jitter status effect to a mob.
-///     This doesn't use generic status effects because it needs to
-///     take in some parameters that JitterSystem needs.
-/// </summary>
-public sealed partial class Jitter : EntityEffect
-{
-    [DataField]
-    public float Amplitude = 10.0f;
-
-    [DataField]
-    public float Frequency = 4.0f;
-
-    [DataField]
-    public float Time = 2.0f;
-
-    /// <remarks>
-    ///     true - refresh jitter time,  false - accumulate jitter time
-    /// </remarks>
-    [DataField]
-    public bool Refresh = true;
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var time = Time;
-        if (args is EntityEffectReagentArgs reagentArgs)
-            time *= reagentArgs.Scale.Float();
-
-        args.EntityManager.EntitySysManager.GetEntitySystem<SharedJitteringSystem>()
-            .DoJitter(args.TargetEntity, TimeSpan.FromSeconds(time), Refresh, Amplitude, Frequency);
-    }
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-        Loc.GetString("reagent-effect-guidebook-jittering", ("chance", Probability));
-}
diff --git a/Content.Server/EntityEffects/Effects/WashCreamPieReaction.cs b/Content.Server/EntityEffects/Effects/WashCreamPieReaction.cs
deleted file mode 100644
index 67bfac6335d..00000000000
--- a/Content.Server/EntityEffects/Effects/WashCreamPieReaction.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Content.Server.Nutrition.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.EntityEffects;
-using Content.Shared.Nutrition.Components;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.EntityEffects.Effects;
-
-[UsedImplicitly]
-public sealed partial class WashCreamPieReaction : EntityEffect
-{
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-wash-cream-pie-reaction", ("chance", Probability));
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (!args.EntityManager.TryGetComponent(args.TargetEntity, out CreamPiedComponent? creamPied)) return;
-
-        args.EntityManager.System<CreamPieSystem>().SetCreamPied(args.TargetEntity, creamPied, false);
-    }
-}
diff --git a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
index 62d04db492f..ae170842a0c 100644
--- a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
@@ -2,7 +2,7 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.EntityEffects.Effects;
+using Content.Server.Chemistry.ReactionEffects;
 using Content.Server.Spreader;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
diff --git a/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs b/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs
index 8fd088408c0..7e107ce1a5a 100644
--- a/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs
+++ b/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs
@@ -5,7 +5,6 @@
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
-using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Prototypes;
 
@@ -41,8 +40,8 @@ public static void PublishJson(StreamWriter file)
             WriteIndented = true,
             Converters =
             {
-                new UniversalJsonConverter<EntityEffect>(),
-                new UniversalJsonConverter<EntityEffectCondition>(),
+                new UniversalJsonConverter<ReagentEffect>(),
+                new UniversalJsonConverter<ReagentEffectCondition>(),
                 new UniversalJsonConverter<ReagentEffectsEntry>(),
                 new UniversalJsonConverter<DamageSpecifier>(),
                 new FixedPointJsonConverter()
diff --git a/Content.Server/GuideGenerator/ReactionJsonGenerator.cs b/Content.Server/GuideGenerator/ReactionJsonGenerator.cs
index 06c230d6071..123dd5f8eb3 100644
--- a/Content.Server/GuideGenerator/ReactionJsonGenerator.cs
+++ b/Content.Server/GuideGenerator/ReactionJsonGenerator.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Text.Json;
 using Content.Shared.Chemistry.Reaction;
-using Content.Shared.EntityEffects;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.GuideGenerator;
@@ -24,7 +24,7 @@ public static void PublishJson(StreamWriter file)
             WriteIndented = true,
             Converters =
             {
-                new UniversalJsonConverter<EntityEffect>(),
+                new UniversalJsonConverter<ReagentEffect>(),
             }
         };
 
diff --git a/Content.Server/GuideGenerator/ReagentEntry.cs b/Content.Server/GuideGenerator/ReagentEntry.cs
index 8b597ad61bc..ab9e7582060 100644
--- a/Content.Server/GuideGenerator/ReagentEntry.cs
+++ b/Content.Server/GuideGenerator/ReagentEntry.cs
@@ -4,7 +4,6 @@
 using Content.Shared.Body.Prototypes;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
-using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.GuideGenerator;
@@ -62,7 +61,7 @@ public sealed class ReactionEntry
     public Dictionary<string, float> Products { get; }
 
     [JsonPropertyName("effects")]
-    public List<EntityEffect> Effects { get; }
+    public List<ReagentEffect> Effects { get; }
 
     public ReactionEntry(ReactionPrototype proto)
     {
diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
index 3b4afc2d6ad..6781d07956b 100644
--- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
@@ -1,7 +1,7 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.EntityEffects.Effects;
+using Content.Server.Chemistry.ReagentEffects;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Forensics;
 using Content.Server.Inventory;
@@ -17,7 +17,6 @@
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
-using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
diff --git a/Content.Server/Tiles/LavaComponent.cs b/Content.Server/Tiles/LavaComponent.cs
new file mode 100644
index 00000000000..1f36e8ffb05
--- /dev/null
+++ b/Content.Server/Tiles/LavaComponent.cs
@@ -0,0 +1,23 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Server.Tiles;
+
+/// <summary>
+/// Applies flammable and damage while vaulting.
+/// </summary>
+[RegisterComponent, Access(typeof(LavaSystem))]
+public sealed partial class LavaComponent : Component
+{
+    /// <summary>
+    /// Sound played if something disintegrates in lava.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField("soundDisintegration")]
+    public SoundSpecifier DisintegrationSound = new SoundPathSpecifier("/Audio/Effects/lightburn.ogg");
+
+    /// <summary>
+    /// How many fire stacks are applied per second.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField("fireStacks")]
+    public float FireStacks = 1.25f;
+}
diff --git a/Content.Server/Tiles/LavaSystem.cs b/Content.Server/Tiles/LavaSystem.cs
new file mode 100644
index 00000000000..51bd6f8475f
--- /dev/null
+++ b/Content.Server/Tiles/LavaSystem.cs
@@ -0,0 +1,38 @@
+using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.StepTrigger.Systems;
+
+namespace Content.Server.Tiles;
+
+public sealed class LavaSystem : EntitySystem
+{
+    [Dependency] private readonly FlammableSystem _flammable = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<LavaComponent, StepTriggeredOffEvent>(OnLavaStepTriggered);
+        SubscribeLocalEvent<LavaComponent, StepTriggerAttemptEvent>(OnLavaStepTriggerAttempt);
+    }
+
+    private void OnLavaStepTriggerAttempt(EntityUid uid, LavaComponent component, ref StepTriggerAttemptEvent args)
+    {
+        if (!HasComp<FlammableComponent>(args.Tripper))
+            return;
+
+        args.Continue = true;
+    }
+
+    private void OnLavaStepTriggered(EntityUid uid, LavaComponent component, ref StepTriggeredOffEvent args)
+    {
+        var otherUid = args.Tripper;
+
+        if (TryComp<FlammableComponent>(otherUid, out var flammable))
+        {
+            // Apply the fury of a thousand suns
+            var multiplier = flammable.FireStacks == 0f ? 5f : 1f;
+            _flammable.AdjustFireStacks(otherUid, component.FireStacks * multiplier, flammable);
+            _flammable.Ignite(otherUid, uid, flammable);
+        }
+    }
+}
diff --git a/Content.Server/Tiles/TileEntityEffectComponent.cs b/Content.Server/Tiles/TileEntityEffectComponent.cs
deleted file mode 100644
index 4201af47f9e..00000000000
--- a/Content.Server/Tiles/TileEntityEffectComponent.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.EntityEffects;
-using Robust.Shared.Audio;
-using Robust.Shared.GameStates;
-
-namespace Content.Server.Tiles;
-
-/// <summary>
-/// Applies effects upon stepping onto a tile.
-/// </summary>
-[RegisterComponent, Access(typeof(TileEntityEffectSystem))]
-public sealed partial class TileEntityEffectComponent : Component
-{
-    /// <summary>
-    /// List of effects that should be applied.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField]
-    public List<EntityEffect> Effects = default!;
-}
diff --git a/Content.Server/Tiles/TileEntityEffectSystem.cs b/Content.Server/Tiles/TileEntityEffectSystem.cs
deleted file mode 100644
index 7149f16e1ad..00000000000
--- a/Content.Server/Tiles/TileEntityEffectSystem.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Content.Server.Atmos.Components;
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.StepTrigger.Systems;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.EntityEffects;
-
-namespace Content.Server.Tiles;
-
-public sealed class TileEntityEffectSystem : EntitySystem
-{
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<TileEntityEffectComponent, StepTriggeredOffEvent>(OnTileStepTriggered);
-        SubscribeLocalEvent<TileEntityEffectComponent, StepTriggerAttemptEvent>(OnTileStepTriggerAttempt);
-    }
-    private void OnTileStepTriggerAttempt(Entity<TileEntityEffectComponent> ent, ref StepTriggerAttemptEvent args)
-    {
-        args.Continue = true;
-    }
-
-    private void OnTileStepTriggered(Entity<TileEntityEffectComponent> ent, ref StepTriggeredOffEvent args)
-    {
-        var otherUid = args.Tripper;
-
-        foreach (var effect in ent.Comp.Effects)
-        {
-            effect.Effect(new EntityEffectBaseArgs(otherUid, EntityManager));
-        }
-    }
-}
diff --git a/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs b/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
index f9dfa9b2734..f2b13d34881 100644
--- a/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
+++ b/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
@@ -2,7 +2,6 @@
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
-using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Prototypes;
@@ -198,7 +197,9 @@ private List<string> PerformReaction(Entity<SolutionComponent> soln, ReactionPro
 
         private void OnReaction(Entity<SolutionComponent> soln, ReactionPrototype reaction, ReagentPrototype? reagent, FixedPoint2 unitReactions)
         {
-            var args = new EntityEffectReagentArgs(soln, EntityManager, null, soln.Comp.Solution, unitReactions, reagent, null, 1f);
+            var args = new ReagentEffectArgs(soln, null, soln.Comp.Solution,
+                reagent,
+                unitReactions, EntityManager, null, 1f);
 
             var posFound = _transformSystem.TryGetMapOrGridCoordinates(soln, out var gridPos);
 
@@ -212,7 +213,7 @@ private void OnReaction(Entity<SolutionComponent> soln, ReactionPrototype reacti
 
                 if (effect.ShouldLog)
                 {
-                    var entity = args.TargetEntity;
+                    var entity = args.SolutionEntity;
                     _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
                         $"Reaction effect {effect.GetType().Name:effect} of reaction {reaction.ID:reaction} applied on entity {ToPrettyString(entity):entity} at Pos:{(posFound ? $"{gridPos:coordinates}" : "[Grid or Map not Found")}");
                 }
diff --git a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
index 351aa50b0f3..f4e9619b172 100644
--- a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
+++ b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
@@ -1,6 +1,5 @@
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
-using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
@@ -60,7 +59,7 @@ public sealed partial class ReactionPrototype : IPrototype, IComparable<Reaction
         /// <summary>
         /// Effects to be triggered when the reaction occurs.
         /// </summary>
-        [DataField("effects", serverOnly: true)] public List<EntityEffect> Effects = new();
+        [DataField("effects", serverOnly: true)] public List<ReagentEffect> Effects = new();
 
         /// <summary>
         /// How dangerous is this effect? Stuff like bicaridine should be low, while things like methamphetamine
diff --git a/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs b/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs
index cabdee93c1a..310129c6fc7 100644
--- a/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs
+++ b/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Chemistry.Reagent;
-using Content.Shared.EntityEffects;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
 
@@ -34,7 +33,7 @@ public sealed partial class ReactiveReagentEffectEntry
     public HashSet<string>? Reagents = null;
 
     [DataField("effects", required: true)]
-    public List<EntityEffect> Effects = default!;
+    public List<ReagentEffect> Effects = default!;
 
     [DataField("groups", readOnly: true, serverOnly: true,
         customTypeSerializer:typeof(PrototypeIdDictionarySerializer<HashSet<ReactionMethod>, ReactiveGroupPrototype>))]
diff --git a/Content.Shared/Chemistry/ReactiveSystem.cs b/Content.Shared/Chemistry/ReactiveSystem.cs
index edd75bb0b4c..57b008de0c7 100644
--- a/Content.Shared/Chemistry/ReactiveSystem.cs
+++ b/Content.Shared/Chemistry/ReactiveSystem.cs
@@ -3,107 +3,102 @@
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
-using Content.Shared.EntityEffects;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
-namespace Content.Shared.Chemistry;
-
-[UsedImplicitly]
-public sealed class ReactiveSystem : EntitySystem
+namespace Content.Shared.Chemistry
 {
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly IRobustRandom _robustRandom = default!;
-    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-
-    public void DoEntityReaction(EntityUid uid, Solution solution, ReactionMethod method)
+    [UsedImplicitly]
+    public sealed class ReactiveSystem : EntitySystem
     {
-        foreach (var reagent in solution.Contents.ToArray())
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly IRobustRandom _robustRandom = default!;
+        [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+
+        public void DoEntityReaction(EntityUid uid, Solution solution, ReactionMethod method)
         {
-            ReactionEntity(uid, method, reagent, solution);
+            foreach (var reagent in solution.Contents.ToArray())
+            {
+                ReactionEntity(uid, method, reagent, solution);
+            }
         }
-    }
 
-    public void ReactionEntity(EntityUid uid, ReactionMethod method, ReagentQuantity reagentQuantity, Solution? source)
-    {
-        // We throw if the reagent specified doesn't exist.
-        var proto = _prototypeManager.Index<ReagentPrototype>(reagentQuantity.Reagent.Prototype);
-        ReactionEntity(uid, method, proto, reagentQuantity, source);
-    }
+        public void ReactionEntity(EntityUid uid, ReactionMethod method, ReagentQuantity reagentQuantity, Solution? source)
+        {
+            // We throw if the reagent specified doesn't exist.
+            var proto = _prototypeManager.Index<ReagentPrototype>(reagentQuantity.Reagent.Prototype);
+            ReactionEntity(uid, method, proto, reagentQuantity, source);
+        }
 
-    public void ReactionEntity(EntityUid uid, ReactionMethod method, ReagentPrototype proto,
-        ReagentQuantity reagentQuantity, Solution? source)
-    {
-        if (!TryComp(uid, out ReactiveComponent? reactive))
-            return;
+        public void ReactionEntity(EntityUid uid, ReactionMethod method, ReagentPrototype proto,
+            ReagentQuantity reagentQuantity, Solution? source)
+        {
+            if (!TryComp(uid, out ReactiveComponent? reactive))
+                return;
 
-        // If we have a source solution, use the reagent quantity we have left. Otherwise, use the reaction volume specified.
-        var args = new EntityEffectReagentArgs(uid, EntityManager, null, source, source?.GetReagentQuantity(reagentQuantity.Reagent) ?? reagentQuantity.Quantity, proto, method, 1f);
+            // If we have a source solution, use the reagent quantity we have left. Otherwise, use the reaction volume specified.
+            var args = new ReagentEffectArgs(uid, null, source, proto,
+                source?.GetReagentQuantity(reagentQuantity.Reagent) ?? reagentQuantity.Quantity, EntityManager, method, 1f);
 
-        // First, check if the reagent wants to apply any effects.
-        if (proto.ReactiveEffects != null && reactive.ReactiveGroups != null)
-        {
-            foreach (var (key, val) in proto.ReactiveEffects)
+            // First, check if the reagent wants to apply any effects.
+            if (proto.ReactiveEffects != null && reactive.ReactiveGroups != null)
             {
-                if (!val.Methods.Contains(method))
-                    continue;
-
-                if (!reactive.ReactiveGroups.ContainsKey(key))
-                    continue;
+                foreach (var (key, val) in proto.ReactiveEffects)
+                {
+                    if (!val.Methods.Contains(method))
+                        continue;
 
-                if (!reactive.ReactiveGroups[key].Contains(method))
-                    continue;
+                    if (!reactive.ReactiveGroups.ContainsKey(key))
+                        continue;
 
-                foreach (var effect in val.Effects)
-                {
-                    if (!effect.ShouldApply(args, _robustRandom))
+                    if (!reactive.ReactiveGroups[key].Contains(method))
                         continue;
 
-                    if (effect.ShouldLog)
+                    foreach (var effect in val.Effects)
                     {
-                        var entity = args.TargetEntity;
-                        _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
-                            $"Reactive effect {effect.GetType().Name:effect} of reagent {proto.ID:reagent} with method {method} applied on entity {ToPrettyString(entity):entity} at {Transform(entity).Coordinates:coordinates}");
-                    }
+                        if (!effect.ShouldApply(args, _robustRandom))
+                            continue;
+
+                        if (effect.ShouldLog)
+                        {
+                            var entity = args.SolutionEntity;
+                            _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
+                                $"Reactive effect {effect.GetType().Name:effect} of reagent {proto.ID:reagent} with method {method} applied on entity {ToPrettyString(entity):entity} at {Transform(entity).Coordinates:coordinates}");
+                        }
 
-                    effect.Effect(args);
+                        effect.Effect(args);
+                    }
                 }
             }
-        }
 
-        // Then, check if the prototype has any effects it can apply as well.
-        if (reactive.Reactions != null)
-        {
-            foreach (var entry in reactive.Reactions)
+            // Then, check if the prototype has any effects it can apply as well.
+            if (reactive.Reactions != null)
             {
-                if (!entry.Methods.Contains(method))
-                    continue;
-
-                if (entry.Reagents != null && !entry.Reagents.Contains(proto.ID))
-                    continue;
-
-                foreach (var effect in entry.Effects)
+                foreach (var entry in reactive.Reactions)
                 {
-                    if (!effect.ShouldApply(args, _robustRandom))
+                    if (!entry.Methods.Contains(method))
+                        continue;
+
+                    if (entry.Reagents != null && !entry.Reagents.Contains(proto.ID))
                         continue;
 
-                    if (effect.ShouldLog)
+                    foreach (var effect in entry.Effects)
                     {
-                        var entity = args.TargetEntity;
-                        _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
-                            $"Reactive effect {effect.GetType().Name:effect} of {ToPrettyString(entity):entity} using reagent {proto.ID:reagent} with method {method} at {Transform(entity).Coordinates:coordinates}");
-                    }
+                        if (!effect.ShouldApply(args, _robustRandom))
+                            continue;
 
-                    effect.Effect(args);
+                        if (effect.ShouldLog)
+                        {
+                            var entity = args.SolutionEntity;
+                            _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
+                                $"Reactive effect {effect.GetType().Name:effect} of {ToPrettyString(entity):entity} using reagent {proto.ID:reagent} with method {method} at {Transform(entity).Coordinates:coordinates}");
+                        }
+
+                        effect.Effect(args);
+                    }
                 }
             }
         }
     }
 }
-public enum ReactionMethod
-{
-Touch,
-Injection,
-Ingestion,
-}
diff --git a/Content.Shared/Chemistry/Reagent/ReagentEffect.cs b/Content.Shared/Chemistry/Reagent/ReagentEffect.cs
new file mode 100644
index 00000000000..41eea55cca4
--- /dev/null
+++ b/Content.Shared/Chemistry/Reagent/ReagentEffect.cs
@@ -0,0 +1,113 @@
+using System.Linq;
+using System.Text.Json.Serialization;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Database;
+using Content.Shared.FixedPoint;
+using Content.Shared.Localizations;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Shared.Chemistry.Reagent
+{
+    /// <summary>
+    ///     Reagent effects describe behavior that occurs when a reagent is ingested and metabolized by some
+    ///     organ. They only trigger when all of <see cref="Conditions"/> are satisfied.
+    /// </summary>
+    [ImplicitDataDefinitionForInheritors]
+    [MeansImplicitUse]
+    public abstract partial class ReagentEffect
+    {
+        [JsonPropertyName("id")] private protected string _id => this.GetType().Name;
+        /// <summary>
+        ///     The list of conditions required for the effect to activate. Not required.
+        /// </summary>
+        [JsonPropertyName("conditions")]
+        [DataField("conditions")]
+        public ReagentEffectCondition[]? Conditions;
+
+        public virtual string ReagentEffectFormat => "guidebook-reagent-effect-description";
+
+        protected abstract string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys); // => Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability));
+
+        /// <summary>
+        ///     What's the chance, from 0 to 1, that this effect will occur?
+        /// </summary>
+        [JsonPropertyName("probability")]
+        [DataField("probability")]
+        public float Probability = 1.0f;
+
+        [JsonIgnore]
+        [DataField("logImpact")]
+        public virtual LogImpact LogImpact { get; private set; } = LogImpact.Low;
+
+        /// <summary>
+        ///     Should this reagent effect log at all?
+        /// </summary>
+        [JsonIgnore]
+        [DataField("shouldLog")]
+        public virtual bool ShouldLog { get; private set; } = false;
+
+        public abstract void Effect(ReagentEffectArgs args);
+
+        /// <summary>
+        /// Produces a localized, bbcode'd guidebook description for this effect.
+        /// </summary>
+        /// <returns></returns>
+        public string? GuidebookEffectDescription(IPrototypeManager prototype, IEntitySystemManager entSys)
+        {
+            var effect = ReagentEffectGuidebookText(prototype, entSys);
+            if (effect is null)
+                return null;
+
+            return Loc.GetString(ReagentEffectFormat, ("effect", effect), ("chance", Probability),
+                ("conditionCount", Conditions?.Length ?? 0),
+                ("conditions",
+                    ContentLocalizationManager.FormatList(Conditions?.Select(x => x.GuidebookExplanation(prototype)).ToList() ??
+                                                          new List<string>())));
+        }
+    }
+
+    public static class ReagentEffectExt
+    {
+        public static bool ShouldApply(this ReagentEffect effect, ReagentEffectArgs args,
+            IRobustRandom? random = null)
+        {
+            if (random == null)
+                random = IoCManager.Resolve<IRobustRandom>();
+
+            if (effect.Probability < 1.0f && !random.Prob(effect.Probability))
+                return false;
+
+            if (effect.Conditions != null)
+            {
+                foreach (var cond in effect.Conditions)
+                {
+                    if (!cond.Condition(args))
+                        return false;
+                }
+            }
+
+            return true;
+        }
+    }
+
+    public enum ReactionMethod
+    {
+        Touch,
+        Injection,
+        Ingestion,
+    }
+
+    public readonly record struct ReagentEffectArgs(
+        EntityUid SolutionEntity,
+        EntityUid? OrganEntity,
+        Solution? Source,
+        ReagentPrototype? Reagent,
+        FixedPoint2 Quantity,
+        IEntityManager EntityManager,
+        ReactionMethod? Method,
+        float Scale = 1f,
+        float QuantityMultiplier = 1f
+    );
+}
diff --git a/Content.Shared/Chemistry/Reagent/ReagentEffectCondition.cs b/Content.Shared/Chemistry/Reagent/ReagentEffectCondition.cs
new file mode 100644
index 00000000000..a32b4fa8e3a
--- /dev/null
+++ b/Content.Shared/Chemistry/Reagent/ReagentEffectCondition.cs
@@ -0,0 +1,22 @@
+using System.Text.Json.Serialization;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Chemistry.Reagent
+{
+    [ImplicitDataDefinitionForInheritors]
+    [MeansImplicitUse]
+    public abstract partial class ReagentEffectCondition
+    {
+        [JsonPropertyName("id")] private protected string _id => this.GetType().Name;
+
+        public abstract bool Condition(ReagentEffectArgs args);
+
+        /// <summary>
+        /// Effect explanations are of the form "[chance to] [action] when [condition] and [condition]"
+        /// </summary>
+        /// <param name="prototype"></param>
+        /// <returns></returns>
+        public abstract string GuidebookExplanation(IPrototypeManager prototype);
+    }
+}
diff --git a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
index 08bee30a0f1..df1b1aa20b4 100644
--- a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
+++ b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
@@ -1,11 +1,10 @@
-using System.Collections.Frozen;
+using System.Collections.Frozen;
 using System.Linq;
 using System.Text.Json.Serialization;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Body.Prototypes;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reaction;
-using Content.Shared.EntityEffects;
 using Content.Shared.Database;
 using Content.Shared.FixedPoint;
 using Content.Shared.Nutrition;
@@ -135,7 +134,7 @@ public sealed partial class ReagentPrototype : IPrototype, IInheritingPrototype
         public List<ITileReaction> TileReactions = new(0);
 
         [DataField("plantMetabolism", serverOnly: true)]
-        public List<EntityEffect> PlantMetabolisms = new(0);
+        public List<ReagentEffect> PlantMetabolisms = new(0);
 
         [DataField]
         public float PricePerUnit;
@@ -171,7 +170,7 @@ public void ReactionPlant(EntityUid? plantHolder, ReagentQuantity amount, Soluti
 
             var entMan = IoCManager.Resolve<IEntityManager>();
             var random = IoCManager.Resolve<IRobustRandom>();
-            var args = new EntityEffectReagentArgs(plantHolder.Value, entMan, null, solution, amount.Quantity, this, null, 1f);
+            var args = new ReagentEffectArgs(plantHolder.Value, null, solution, this, amount.Quantity, entMan, null, 1f);
             foreach (var plantMetabolizable in PlantMetabolisms)
             {
                 if (!plantMetabolizable.ShouldApply(args, random))
@@ -179,7 +178,7 @@ public void ReactionPlant(EntityUid? plantHolder, ReagentQuantity amount, Soluti
 
                 if (plantMetabolizable.ShouldLog)
                 {
-                    var entity = args.TargetEntity;
+                    var entity = args.SolutionEntity;
                     entMan.System<SharedAdminLogSystem>().Add(LogType.ReagentEffect, plantMetabolizable.LogImpact,
                         $"Plant metabolism effect {plantMetabolizable.GetType().Name:effect} of reagent {ID:reagent} applied on entity {entMan.ToPrettyString(entity):entity} at {entMan.GetComponent<TransformComponent>(entity).Coordinates:coordinates}");
                 }
@@ -221,7 +220,7 @@ public sealed partial class ReagentEffectsEntry
         /// </summary>
         [JsonPropertyName("effects")]
         [DataField("effects", required: true)]
-        public EntityEffect[] Effects = default!;
+        public ReagentEffect[] Effects = default!;
 
         public ReagentEffectsGuideEntry MakeGuideEntry(IPrototypeManager prototype, IEntitySystemManager entSys)
         {
@@ -255,6 +254,6 @@ public sealed partial class ReactiveReagentEffectEntry
         public HashSet<ReactionMethod> Methods = default!;
 
         [DataField("effects", required: true)]
-        public EntityEffect[] Effects = default!;
+        public ReagentEffect[] Effects = default!;
     }
 }
diff --git a/Content.Shared/EntityEffects/EntityEffect.cs b/Content.Shared/EntityEffects/EntityEffect.cs
deleted file mode 100644
index 21e79f224de..00000000000
--- a/Content.Shared/EntityEffects/EntityEffect.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-using System.Linq;
-using System.Text.Json.Serialization;
-using Content.Shared.Chemistry;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Database;
-using Content.Shared.FixedPoint;
-using Content.Shared.Localizations;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Toolshed.TypeParsers;
-
-namespace Content.Shared.EntityEffects;
-
-/// <summary>
-///     Entity effects describe behavior that occurs on different kinds of triggers, e.g. when a reagent is ingested and metabolized by some
-///     organ. They only trigger when all of <see cref="Conditions"/> are satisfied.
-/// </summary>
-[ImplicitDataDefinitionForInheritors]
-[MeansImplicitUse]
-public abstract partial class EntityEffect
-{
-    private protected string _id => this.GetType().Name;
-    /// <summary>
-    ///     The list of conditions required for the effect to activate. Not required.
-    /// </summary>
-    [DataField("conditions")]
-    public EntityEffectCondition[]? Conditions;
-
-    public virtual string ReagentEffectFormat => "guidebook-reagent-effect-description";
-
-    protected abstract string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys);
-
-    /// <summary>
-    ///     What's the chance, from 0 to 1, that this effect will occur?
-    /// </summary>
-    [DataField("probability")]
-    public float Probability = 1.0f;
-
-    public virtual LogImpact LogImpact { get; private set; } = LogImpact.Low;
-
-    /// <summary>
-    ///     Should this entity effect log at all?
-    /// </summary>
-    public virtual bool ShouldLog { get; private set; } = false;
-
-    public abstract void Effect(EntityEffectBaseArgs args);
-
-    /// <summary>
-    /// Produces a localized, bbcode'd guidebook description for this effect.
-    /// </summary>
-    /// <returns></returns>
-    public string? GuidebookEffectDescription(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        var effect = ReagentEffectGuidebookText(prototype, entSys);
-        if (effect is null)
-            return null;
-
-        return Loc.GetString(ReagentEffectFormat, ("effect", effect), ("chance", Probability),
-            ("conditionCount", Conditions?.Length ?? 0),
-            ("conditions",
-                ContentLocalizationManager.FormatList(Conditions?.Select(x => x.GuidebookExplanation(prototype)).ToList() ??
-                                                        new List<string>())));
-    }
-}
-
-public static class EntityEffectExt
-{
-    public static bool ShouldApply(this EntityEffect effect, EntityEffectBaseArgs args,
-        IRobustRandom? random = null)
-    {
-        if (random == null)
-            random = IoCManager.Resolve<IRobustRandom>();
-
-        if (effect.Probability < 1.0f && !random.Prob(effect.Probability))
-            return false;
-
-        if (effect.Conditions != null)
-        {
-            foreach (var cond in effect.Conditions)
-            {
-                if (!cond.Condition(args))
-                    return false;
-            }
-        }
-
-        return true;
-    }
-}
-
-/// <summary>
-///     EntityEffectBaseArgs only contains the target of an effect.
-///     If a trigger wants to include more info (e.g. the quantity of the chemical triggering the effect), it can be extended (see EntityEffectReagentArgs).
-/// </summary>
-public record class EntityEffectBaseArgs
-{
-    public EntityUid TargetEntity;
-
-    public IEntityManager EntityManager = default!;
-
-    public EntityEffectBaseArgs(EntityUid targetEntity, IEntityManager entityManager)
-    {
-        TargetEntity = targetEntity;
-        EntityManager = entityManager;
-    }
-}
-
-public record class EntityEffectReagentArgs : EntityEffectBaseArgs
-{
-    public EntityUid? OrganEntity;
-
-    public Solution? Source;
-
-    public FixedPoint2 Quantity;
-
-    public ReagentPrototype? Reagent;
-
-    public ReactionMethod? Method;
-
-    public FixedPoint2 Scale;
-
-    public EntityEffectReagentArgs(EntityUid targetEntity, IEntityManager entityManager, EntityUid? organEntity, Solution? source, FixedPoint2 quantity, ReagentPrototype? reagent, ReactionMethod? method, FixedPoint2 scale) : base(targetEntity, entityManager)
-    {
-        OrganEntity = organEntity;
-        Source = source;
-        Quantity = quantity;
-        Reagent = reagent;
-        Method = method;
-        Scale = scale;
-    }
-}
diff --git a/Content.Shared/EntityEffects/EntityEffectCondition.cs b/Content.Shared/EntityEffects/EntityEffectCondition.cs
deleted file mode 100644
index d6028b9f2c4..00000000000
--- a/Content.Shared/EntityEffects/EntityEffectCondition.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Text.Json.Serialization;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects;
-
-[ImplicitDataDefinitionForInheritors]
-[MeansImplicitUse]
-public abstract partial class EntityEffectCondition
-{
-    [JsonPropertyName("id")] private protected string _id => this.GetType().Name;
-
-    public abstract bool Condition(EntityEffectBaseArgs args);
-
-    /// <summary>
-    /// Effect explanations are of the form "[chance to] [action] when [condition] and [condition]"
-    /// </summary>
-    /// <param name="prototype"></param>
-    /// <returns></returns>
-    public abstract string GuidebookExplanation(IPrototypeManager prototype);
-}
-
diff --git a/Resources/Prototypes/Entities/Tiles/lava.yml b/Resources/Prototypes/Entities/Tiles/lava.yml
index 29a5cd885c3..9d61304af9d 100644
--- a/Resources/Prototypes/Entities/Tiles/lava.yml
+++ b/Resources/Prototypes/Entities/Tiles/lava.yml
@@ -18,12 +18,6 @@
         - Lava
   - type: Lava
     fireStacks: 0.75
-  - type: TileEntityEffect
-    effects:
-    - !type:FlammableReaction
-      multiplier: 3.75
-      multiplierOnExisting: 0.75
-    - !type:Ignite
   - type: Transform
     anchored: true
   - type: SyncSprite
diff --git a/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml b/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
index ed38f86ff42..500286ead31 100644
--- a/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
+++ b/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: FloorLiquidPlasmaEntity
   name: liquid plasma
   description: Sweet, expensive nectar. Don't consume.
@@ -18,12 +18,6 @@
       - Lava
   - type: Lava
     fireStacks: 0.75
-  - type: TileEntityEffect
-    effects:
-    - !type:FlammableReaction
-      multiplier: 3.75
-      multiplierOnExisting: 0.75
-    - !type:Ignite
   - type: Transform
     anchored: true
   - type: SyncSprite

From b4520d08f2801f8ff77790b5e25384379296bf37 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 21 Dec 2024 18:04:09 -0400
Subject: [PATCH 249/366] Reapply "Implement some field-level deltas (#28242)"

This reverts commit db0cd2c50adb42a6b33b82c60c0b24e8c522946d.
---
 .../Body/Systems/BloodstreamSystem.cs         |   2 +-
 .../Body/Systems/MetabolizerSystem.cs         |   4 +-
 .../Body/Systems/RespiratorSystem.cs          |   7 +-
 Content.Server/Botany/SeedPrototype.cs        |   4 +-
 .../ReactionEffects/AreaReactionEffect.cs     |  83 ----------
 .../ExplosionReactionEffect.cs                |  72 ---------
 .../SolutionTemperatureEffects.cs             | 121 ---------------
 .../BodyTemperature.cs                        |  36 -----
 .../MobStateCondition.cs                      |  30 ----
 .../ReagentEffectConditions/OrganType.cs      |  48 ------
 .../ReagentThreshold.cs                       |  51 -------
 .../SolutionTemperature.cs                    |  36 -----
 .../ReagentEffectConditions/TotalDamage.cs    |  35 -----
 .../ReagentEffectConditions/TotalHunger.cs    |  35 -----
 .../ReagentEffects/AddToSolutionReaction.cs   |  31 ----
 .../ReagentEffects/ChemCleanBloodstream.cs    |  33 ----
 .../ReagentEffects/ChemHealEyeDamage.cs       |  32 ----
 .../Chemistry/ReagentEffects/Electrocute.cs   |  31 ----
 .../ReagentEffects/ExtinguishReaction.cs      |  24 ---
 .../ReagentEffects/FlammableReaction.cs       |  34 -----
 .../Chemistry/ReagentEffects/Ignite.cs        |  25 ---
 .../ReagentEffects/ModifyBleedAmount.cs       |  31 ----
 .../ReagentEffects/ModifyBloodLevel.cs        |  32 ----
 .../Chemistry/ReagentEffects/ModifyLungGas.cs |  30 ----
 .../ReagentEffects/MovespeedModifier.cs       |  75 ---------
 .../Chemistry/ReagentEffects/Oxygenate.cs     |  25 ---
 .../PlantMetabolism/PlantAdjustAttribute.cs   |  45 ------
 .../PlantMetabolism/PlantAdjustHealth.cs      |  19 ---
 .../PlantAdjustMutationLevel.cs               |  15 --
 .../PlantMetabolism/PlantAdjustMutationMod.cs |  17 ---
 .../PlantMetabolism/PlantAdjustNutrition.cs   |  20 ---
 .../PlantMetabolism/PlantAdjustPests.cs       |  17 ---
 .../PlantMetabolism/PlantAdjustToxins.cs      |  17 ---
 .../PlantMetabolism/PlantAdjustWater.cs       |  20 ---
 .../PlantMetabolism/PlantAdjustWeeds.cs       |  17 ---
 .../PlantMetabolism/PlantAffectGrowth.cs      |  20 ---
 .../PlantMetabolism/PlantCryoxadone.cs        |  33 ----
 .../PlantMetabolism/PlantDiethylamine.cs      |  41 -----
 .../PlantMetabolism/PlantPhalanximine.cs      |  24 ---
 .../PlantMetabolism/RobustHarvest.cs          |  54 -------
 .../Chemistry/ReagentEffects/SatiateThirst.cs |  32 ----
 .../StatusEffects/GenericStatusEffect.cs      |  76 ---------
 .../ReagentEffects/StatusEffects/Jitter.cs    |  41 -----
 .../ReagentEffects/WashCreamPieReaction.cs    |  22 ---
 .../EffectConditions/BodyTemperature.cs       |  35 +++++
 .../EffectConditions}/HasTagCondition.cs      |  12 +-
 .../EffectConditions/JobCondition.cs          |  39 +++++
 .../EffectConditions/MobStateCondition.cs     |  29 ++++
 .../EffectConditions/OrganType.cs             |  53 +++++++
 .../EffectConditions/ReagentThreshold.cs      |  57 +++++++
 .../EffectConditions/SolutionTemperature.cs   |  40 +++++
 .../EffectConditions/TotalDamage.cs           |  34 +++++
 .../EffectConditions/TotalHunger.cs           |  34 +++++
 .../Effects}/ActivateArtifact.cs              |  11 +-
 .../Effects/AddToSolutionReaction.cs          |  38 +++++
 .../Effects}/AdjustAlert.cs                   |  16 +-
 .../Effects}/AdjustReagent.cs                 |  56 ++++---
 .../Effects}/AdjustTemperature.cs             |  17 ++-
 .../Effects/AreaReactionEffect.cs             |  91 +++++++++++
 .../Effects}/CauseZombieInfection.cs          |  13 +-
 .../Effects}/ChemAddMoodlet.cs                |   0
 .../Effects/ChemCleanBloodstream.cs           |  40 +++++
 .../Effects/ChemHealEyeDamage.cs              |  31 ++++
 .../Effects}/ChemVomit.cs                     |  15 +-
 .../Effects}/CreateEntityReactionEffect.cs    |  17 ++-
 .../Effects}/CreateGas.cs                     |  21 ++-
 .../Effects}/CureZombieInfection.cs           |  17 +--
 .../Effects}/Drunk.cs                         |  15 +-
 .../EntityEffects/Effects/Electrocute.cs      |  38 +++++
 .../Effects}/Emote.cs                         |  12 +-
 .../Effects}/EmpReactionEffect.cs             |  21 ++-
 .../Effects/ExplosionReactionEffect.cs        |  77 ++++++++++
 .../Effects/ExtinguishReaction.cs             |  36 +++++
 .../Effects/FlammableReaction.cs              |  45 ++++++
 .../Effects}/HealthChange.cs                  |  23 +--
 .../EntityEffects/Effects/Ignite.cs           |  31 ++++
 .../Effects}/MakeSentient.cs                  |  10 +-
 .../Effects/ModifyBleedAmount.cs              |  35 +++++
 .../EntityEffects/Effects/ModifyBloodLevel.cs |  37 +++++
 .../EntityEffects/Effects/ModifyLungGas.cs    |  49 ++++++
 .../Effects/MovespeedModifier.cs              |  78 ++++++++++
 .../EntityEffects/Effects/Oxygenate.cs        |  32 ++++
 .../Effects}/Paralyze.cs                      |  14 +-
 .../PlantMetabolism/PlantAdjustAttribute.cs   |  61 ++++++++
 .../PlantMetabolism/PlantAdjustHealth.cs      |  21 +++
 .../PlantAdjustMutationLevel.cs               |  16 ++
 .../PlantMetabolism/PlantAdjustMutationMod.cs |  19 +++
 .../PlantMetabolism/PlantAdjustNutrition.cs   |  21 +++
 .../PlantMetabolism/PlantAdjustPests.cs       |  20 +++
 .../PlantMetabolism/PlantAdjustToxins.cs      |  20 +++
 .../PlantMetabolism/PlantAdjustWater.cs       |  22 +++
 .../PlantMetabolism/PlantAdjustWeeds.cs       |  19 +++
 .../PlantMetabolism/PlantAffectGrowth.cs      |  22 +++
 .../PlantMetabolism/PlantCryoxadone.cs        |  32 ++++
 .../PlantMetabolism/PlantDiethylamine.cs      |  41 +++++
 .../PlantMetabolism/PlantPhalanximine.cs      |  23 +++
 .../Effects/PlantMetabolism/RobustHarvest.cs  |  53 +++++++
 .../Effects}/Polymorph.cs                     |  11 +-
 .../Effects}/PopupMessage.cs                  |  29 ++--
 .../Effects}/PurifyEvil.cs                    |   0
 .../Effects}/ReduceRotting.cs                 |  16 +-
 .../Effects}/ResetNarcolepsy.cs               |  14 +-
 .../Effects}/SatiateHunger.cs                 |  23 ++-
 .../EntityEffects/Effects/SatiateThirst.cs    |  32 ++++
 .../Effects/SolutionTemperatureEffects.cs     | 144 ++++++++++++++++++
 .../StatusEffects/GenericStatusEffect.cs      |  77 ++++++++++
 .../Effects/StatusEffects/Jitter.cs           |  42 +++++
 .../Effects/WashCreamPieReaction.cs           |  22 +++
 .../Effects}/WearableReaction.cs              |  26 ++--
 .../Fluids/EntitySystems/SmokeSystem.cs       |   2 +-
 .../GuideGenerator/ChemistryJsonGenerator.cs  |   5 +-
 .../GuideGenerator/ReactionJsonGenerator.cs   |   4 +-
 Content.Server/GuideGenerator/ReagentEntry.cs |   3 +-
 .../Nutrition/EntitySystems/DrinkSystem.cs    |   3 +-
 Content.Server/Tiles/LavaComponent.cs         |  23 ---
 Content.Server/Tiles/LavaSystem.cs            |  38 -----
 .../Tiles/TileEntityEffectComponent.cs        |  19 +++
 .../Tiles/TileEntityEffectSystem.cs           |  32 ++++
 .../Reaction/ChemicalReactionSystem.cs        |   7 +-
 .../Chemistry/Reaction/ReactionPrototype.cs   |   3 +-
 .../Chemistry/Reaction/ReactiveComponent.cs   |   3 +-
 Content.Shared/Chemistry/ReactiveSystem.cs    | 137 +++++++++--------
 .../Chemistry/Reagent/ReagentEffect.cs        | 113 --------------
 .../Reagent/ReagentEffectCondition.cs         |  22 ---
 .../Chemistry/Reagent/ReagentPrototype.cs     |  13 +-
 Content.Shared/EntityEffects/EntityEffect.cs  | 132 ++++++++++++++++
 .../EntityEffects/EntityEffectCondition.cs    |  22 +++
 Resources/Prototypes/Entities/Tiles/lava.yml  |   6 +
 .../Entities/Tiles/liquid_plasma.yml          |   8 +-
 129 files changed, 2245 insertions(+), 1942 deletions(-)
 delete mode 100644 Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
 delete mode 100644 Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs
 delete mode 100644 Content.Server/Chemistry/ReactionEffects/SolutionTemperatureEffects.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffectConditions/BodyTemperature.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffectConditions/MobStateCondition.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffectConditions/OrganType.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffectConditions/ReagentThreshold.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffectConditions/SolutionTemperature.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffectConditions/TotalDamage.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffectConditions/TotalHunger.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/ChemCleanBloodstream.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/ChemHealEyeDamage.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/Electrocute.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/ExtinguishReaction.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/FlammableReaction.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/Ignite.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/ModifyBleedAmount.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/ModifyBloodLevel.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/ModifyLungGas.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/MovespeedModifier.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/Oxygenate.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustAttribute.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustHealth.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationLevel.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationMod.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustNutrition.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustPests.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustToxins.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWater.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWeeds.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAffectGrowth.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantCryoxadone.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantDiethylamine.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantPhalanximine.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/PlantMetabolism/RobustHarvest.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/SatiateThirst.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/StatusEffects/GenericStatusEffect.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/StatusEffects/Jitter.cs
 delete mode 100644 Content.Server/Chemistry/ReagentEffects/WashCreamPieReaction.cs
 create mode 100644 Content.Server/EntityEffects/EffectConditions/BodyTemperature.cs
 rename Content.Server/{Chemistry/ReagentEffectConditions => EntityEffects/EffectConditions}/HasTagCondition.cs (68%)
 create mode 100644 Content.Server/EntityEffects/EffectConditions/JobCondition.cs
 create mode 100644 Content.Server/EntityEffects/EffectConditions/MobStateCondition.cs
 create mode 100644 Content.Server/EntityEffects/EffectConditions/OrganType.cs
 create mode 100644 Content.Server/EntityEffects/EffectConditions/ReagentThreshold.cs
 create mode 100644 Content.Server/EntityEffects/EffectConditions/SolutionTemperature.cs
 create mode 100644 Content.Server/EntityEffects/EffectConditions/TotalDamage.cs
 create mode 100644 Content.Server/EntityEffects/EffectConditions/TotalHunger.cs
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/ActivateArtifact.cs (56%)
 create mode 100644 Content.Server/EntityEffects/Effects/AddToSolutionReaction.cs
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/AdjustAlert.cs (76%)
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/AdjustReagent.cs (58%)
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/AdjustTemperature.cs (56%)
 create mode 100644 Content.Server/EntityEffects/Effects/AreaReactionEffect.cs
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/CauseZombieInfection.cs (64%)
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/ChemAddMoodlet.cs (100%)
 create mode 100644 Content.Server/EntityEffects/Effects/ChemCleanBloodstream.cs
 create mode 100644 Content.Server/EntityEffects/Effects/ChemHealEyeDamage.cs
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/ChemVomit.cs (65%)
 rename Content.Server/{Chemistry/ReactionEffects => EntityEffects/Effects}/CreateEntityReactionEffect.cs (80%)
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/CreateGas.cs (62%)
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/CureZombieInfection.cs (73%)
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/Drunk.cs (65%)
 create mode 100644 Content.Server/EntityEffects/Effects/Electrocute.cs
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/Emote.cs (73%)
 rename Content.Server/{Chemistry/ReactionEffects => EntityEffects/Effects}/EmpReactionEffect.cs (67%)
 create mode 100644 Content.Server/EntityEffects/Effects/ExplosionReactionEffect.cs
 create mode 100644 Content.Server/EntityEffects/Effects/ExtinguishReaction.cs
 create mode 100644 Content.Server/EntityEffects/Effects/FlammableReaction.cs
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/HealthChange.cs (85%)
 create mode 100644 Content.Server/EntityEffects/Effects/Ignite.cs
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/MakeSentient.cs (92%)
 create mode 100644 Content.Server/EntityEffects/Effects/ModifyBleedAmount.cs
 create mode 100644 Content.Server/EntityEffects/Effects/ModifyBloodLevel.cs
 create mode 100644 Content.Server/EntityEffects/Effects/ModifyLungGas.cs
 create mode 100644 Content.Server/EntityEffects/Effects/MovespeedModifier.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Oxygenate.cs
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/Paralyze.cs (57%)
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs
 create mode 100644 Content.Server/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/Polymorph.cs (80%)
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/PopupMessage.cs (60%)
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/PurifyEvil.cs (100%)
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/ReduceRotting.cs (61%)
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/ResetNarcolepsy.cs (63%)
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/SatiateHunger.cs (53%)
 create mode 100644 Content.Server/EntityEffects/Effects/SatiateThirst.cs
 create mode 100644 Content.Server/EntityEffects/Effects/SolutionTemperatureEffects.cs
 create mode 100644 Content.Server/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs
 create mode 100644 Content.Server/EntityEffects/Effects/StatusEffects/Jitter.cs
 create mode 100644 Content.Server/EntityEffects/Effects/WashCreamPieReaction.cs
 rename Content.Server/{Chemistry/ReagentEffects => EntityEffects/Effects}/WearableReaction.cs (50%)
 delete mode 100644 Content.Server/Tiles/LavaComponent.cs
 delete mode 100644 Content.Server/Tiles/LavaSystem.cs
 create mode 100644 Content.Server/Tiles/TileEntityEffectComponent.cs
 create mode 100644 Content.Server/Tiles/TileEntityEffectSystem.cs
 delete mode 100644 Content.Shared/Chemistry/Reagent/ReagentEffect.cs
 delete mode 100644 Content.Shared/Chemistry/Reagent/ReagentEffectCondition.cs
 create mode 100644 Content.Shared/EntityEffects/EntityEffect.cs
 create mode 100644 Content.Shared/EntityEffects/EntityEffectCondition.cs

diff --git a/Content.Server/Body/Systems/BloodstreamSystem.cs b/Content.Server/Body/Systems/BloodstreamSystem.cs
index 54e51d7e35e..a40bafc8cff 100644
--- a/Content.Server/Body/Systems/BloodstreamSystem.cs
+++ b/Content.Server/Body/Systems/BloodstreamSystem.cs
@@ -1,7 +1,7 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Events;
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Chemistry.ReactionEffects;
+using Content.Server.EntityEffects.Effects;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Forensics;
 using Content.Server.Popups;
diff --git a/Content.Server/Body/Systems/MetabolizerSystem.cs b/Content.Server/Body/Systems/MetabolizerSystem.cs
index a7eec8e3c02..8b0f0ac6f8d 100644
--- a/Content.Server/Body/Systems/MetabolizerSystem.cs
+++ b/Content.Server/Body/Systems/MetabolizerSystem.cs
@@ -6,6 +6,7 @@
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
+using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
@@ -196,8 +197,7 @@ private void TryMetabolize(Entity<MetabolizerComponent, OrganComponent?, Solutio
                     var ev = new TryMetabolizeReagent(reagent, proto, quantity);
                     RaiseLocalEvent(actualEntity, ref ev);
 
-                    var args = new ReagentEffectArgs(actualEntity, ent, solution, proto, mostToRemove,
-                        EntityManager, null, scale * ev.Scale, ev.QuantityMultiplier);
+                    var args = new EntityEffectReagentArgs(actualEntity, EntityManager, ent, solution, mostToRemove, proto, null, scale);
 
                     // do all effects, if conditions apply
                     foreach (var effect in entry.Effects)
diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
index 53bb1ff80c7..a8af257292e 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -3,8 +3,8 @@
 using Content.Server.Body.Components;
 using Content.Server.Chat.Systems;
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Chemistry.ReagentEffectConditions;
-using Content.Server.Chemistry.ReagentEffects;
+using Content.Server.EntityEffects.EffectConditions;
+using Content.Server.EntityEffects.Effects;
 using Content.Server.Popups;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
@@ -15,6 +15,7 @@
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
 using Content.Shared.Database;
+using Content.Shared.EntityEffects;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Mood;
 using JetBrains.Annotations;
@@ -268,7 +269,7 @@ private float GetSaturation(Solution solution, Entity<MetabolizerComponent?> lun
         // TODO generalize condition checks
         // this is pretty janky, but I just want to bodge a method that checks if an entity can breathe a gas mixture
         // Applying actual reaction effects require a full ReagentEffectArgs struct.
-        bool CanMetabolize(ReagentEffect effect)
+        bool CanMetabolize(EntityEffect effect)
         {
             if (effect.Conditions == null)
                 return true;
diff --git a/Content.Server/Botany/SeedPrototype.cs b/Content.Server/Botany/SeedPrototype.cs
index e9cf34e6ba6..d08f5985215 100644
--- a/Content.Server/Botany/SeedPrototype.cs
+++ b/Content.Server/Botany/SeedPrototype.cs
@@ -1,7 +1,7 @@
 using Content.Server.Botany.Components;
 using Content.Server.Botany.Systems;
 using Content.Shared.Atmos;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
@@ -80,7 +80,7 @@ public partial struct SeedChemQuantity
 
 // TODO reduce the number of friends to a reasonable level. Requires ECS-ing things like plant holder component.
 [Virtual, DataDefinition]
-[Access(typeof(BotanySystem), typeof(PlantHolderSystem), typeof(SeedExtractorSystem), typeof(PlantHolderComponent), typeof(ReagentEffect), typeof(MutationSystem))]
+[Access(typeof(BotanySystem), typeof(PlantHolderSystem), typeof(SeedExtractorSystem), typeof(PlantHolderComponent), typeof(EntityEffect), typeof(MutationSystem))]
 public partial class SeedData
 {
     #region Tracking
diff --git a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
deleted file mode 100644
index ebbf4e0341b..00000000000
--- a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using Content.Server.Fluids.EntitySystems;
-using Content.Shared.Audio;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Coordinates.Helpers;
-using Content.Shared.Database;
-using Content.Shared.FixedPoint;
-using Content.Shared.Maps;
-using JetBrains.Annotations;
-using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.Chemistry.ReactionEffects
-{
-    /// <summary>
-    /// Basically smoke and foam reactions.
-    /// </summary>
-    [UsedImplicitly]
-    [DataDefinition]
-    public sealed partial class AreaReactionEffect : ReagentEffect
-    {
-        /// <summary>
-        /// How many seconds will the effect stay, counting after fully spreading.
-        /// </summary>
-        [DataField("duration")] private float _duration = 10;
-
-        /// <summary>
-        /// How many units of reaction for 1 smoke entity.
-        /// </summary>
-        [DataField] public FixedPoint2 OverflowThreshold = FixedPoint2.New(2.5);
-
-        /// <summary>
-        /// The entity prototype that will be spawned as the effect.
-        /// </summary>
-        [DataField("prototypeId", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
-        private string _prototypeId = default!;
-
-        /// <summary>
-        /// Sound that will get played when this reaction effect occurs.
-        /// </summary>
-        [DataField("sound", required: true)] private SoundSpecifier _sound = default!;
-
-        public override bool ShouldLog => true;
-
-        protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-missing");
-
-        public override LogImpact LogImpact => LogImpact.High;
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (args.Source == null)
-                return;
-
-            var spreadAmount = (int) Math.Max(0, Math.Ceiling((args.Quantity / OverflowThreshold).Float()));
-            var splitSolution = args.Source.SplitSolution(args.Source.Volume);
-            var transform = args.EntityManager.GetComponent<TransformComponent>(args.SolutionEntity);
-            var mapManager = IoCManager.Resolve<IMapManager>();
-            var mapSys = args.EntityManager.System<MapSystem>();
-            var sys = args.EntityManager.System<TransformSystem>();
-            var mapCoords = sys.GetMapCoordinates(args.SolutionEntity, xform: transform);
-
-            if (!mapManager.TryFindGridAt(mapCoords, out var gridUid, out var grid) ||
-                !mapSys.TryGetTileRef(gridUid, grid, transform.Coordinates, out var tileRef) ||
-                tileRef.Tile.IsSpace())
-            {
-                return;
-            }
-
-            var coords = mapSys.MapToGrid(gridUid, mapCoords);
-            var ent = args.EntityManager.SpawnEntity(_prototypeId, coords.SnapToGrid());
-
-            var smoke = args.EntityManager.System<SmokeSystem>();
-            smoke.StartSmoke(ent, splitSolution, _duration, spreadAmount);
-
-            var audio = args.EntityManager.System<SharedAudioSystem>();
-            audio.PlayPvs(_sound, args.SolutionEntity, AudioHelpers.WithVariation(0.125f));
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs
deleted file mode 100644
index 8a558a3ffdc..00000000000
--- a/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using Content.Server.Explosion.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Database;
-using Content.Shared.Explosion;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using System.Text.Json.Serialization;
-
-namespace Content.Server.Chemistry.ReactionEffects
-{
-    [DataDefinition]
-    public sealed partial class ExplosionReactionEffect : ReagentEffect
-    {
-        /// <summary>
-        ///     The type of explosion. Determines damage types and tile break chance scaling.
-        /// </summary>
-        [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<ExplosionPrototype>))]
-        [JsonIgnore]
-        public string ExplosionType = default!;
-
-        /// <summary>
-        ///     The max intensity the explosion can have at a given tile. Places an upper limit of damage and tile break
-        ///     chance.
-        /// </summary>
-        [DataField]
-        [JsonIgnore]
-        public float MaxIntensity = 5;
-
-        /// <summary>
-        ///     How quickly intensity drops off as you move away from the epicenter
-        /// </summary>
-        [DataField]
-        [JsonIgnore]
-        public float IntensitySlope = 1;
-
-        /// <summary>
-        ///     The maximum total intensity that this chemical reaction can achieve. Basically here to prevent people
-        ///     from creating a nuke by collecting enough potassium and water.
-        /// </summary>
-        /// <remarks>
-        ///     A slope of 1 and MaxTotalIntensity of 100 corresponds to a radius of around 4.5 tiles.
-        /// </remarks>
-        [DataField]
-        [JsonIgnore]
-        public float MaxTotalIntensity = 100;
-
-        /// <summary>
-        ///     The intensity of the explosion per unit reaction.
-        /// </summary>
-        [DataField]
-        [JsonIgnore]
-        public float IntensityPerUnit = 1;
-
-        public override bool ShouldLog => true;
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-explosion-reaction-effect", ("chance", Probability));
-        public override LogImpact LogImpact => LogImpact.High;
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            var intensity = MathF.Min((float) args.Quantity * IntensityPerUnit, MaxTotalIntensity);
-
-            EntitySystem.Get<ExplosionSystem>().QueueExplosion(
-                args.SolutionEntity,
-                ExplosionType,
-                intensity,
-                IntensitySlope,
-                MaxIntensity);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReactionEffects/SolutionTemperatureEffects.cs b/Content.Server/Chemistry/ReactionEffects/SolutionTemperatureEffects.cs
deleted file mode 100644
index ec58754883d..00000000000
--- a/Content.Server/Chemistry/ReactionEffects/SolutionTemperatureEffects.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReactionEffects
-{
-    /// <summary>
-    ///     Sets the temperature of the solution involved with the reaction to a new value.
-    /// </summary>
-    [DataDefinition]
-    public sealed partial class SetSolutionTemperatureEffect : ReagentEffect
-    {
-        /// <summary>
-        ///     The temperature to set the solution to.
-        /// </summary>
-        [DataField("temperature", required: true)] private float _temperature;
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-set-solution-temperature-effect",
-                ("chance", Probability), ("temperature", _temperature));
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            var solution = args.Source;
-            if (solution == null)
-                return;
-
-            solution.Temperature = _temperature;
-        }
-    }
-
-    /// <summary>
-    ///     Adjusts the temperature of the solution involved in the reaction.
-    /// </summary>
-    [DataDefinition]
-    public sealed partial class AdjustSolutionTemperatureEffect : ReagentEffect
-    {
-        /// <summary>
-        ///     The change in temperature.
-        /// </summary>
-        [DataField("delta", required: true)] private float _delta;
-
-        /// <summary>
-        ///     The minimum temperature this effect can reach.
-        /// </summary>
-        [DataField("minTemp")] private float _minTemp = 0.0f;
-
-        /// <summary>
-        ///     The maximum temperature this effect can reach.
-        /// </summary>
-        [DataField("maxTemp")] private float _maxTemp = float.PositiveInfinity;
-
-        /// <summary>
-        ///     If true, then scale ranges by intensity. If not, the ranges are the same regardless of reactant amount.
-        /// </summary>
-        [DataField("scaled")] private bool _scaled;
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-adjust-solution-temperature-effect",
-                ("chance", Probability), ("deltasign", MathF.Sign(_delta)), ("mintemp", _minTemp), ("maxtemp", _maxTemp));
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            var solution = args.Source;
-            if (solution == null || solution.Volume == 0)
-                return;
-
-            var deltaT = _scaled ? _delta * (float) args.Quantity : _delta;
-            solution.Temperature = Math.Clamp(solution.Temperature + deltaT, _minTemp, _maxTemp);
-        }
-    }
-
-    /// <summary>
-    ///     Adjusts the thermal energy of the solution involved in the reaction.
-    /// </summary>
-    public sealed partial class AdjustSolutionThermalEnergyEffect : ReagentEffect
-    {
-        /// <summary>
-        ///     The change in energy.
-        /// </summary>
-        [DataField("delta", required: true)] private float _delta;
-
-        /// <summary>
-        ///     The minimum temperature this effect can reach.
-        /// </summary>
-        [DataField("minTemp")] private float _minTemp = 0.0f;
-
-        /// <summary>
-        ///     The maximum temperature this effect can reach.
-        /// </summary>
-        [DataField("maxTemp")] private float _maxTemp = float.PositiveInfinity;
-
-        /// <summary>
-        ///     If true, then scale ranges by intensity. If not, the ranges are the same regardless of reactant amount.
-        /// </summary>
-        [DataField("scaled")] private bool _scaled;
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            var solution = args.Source;
-            if (solution == null || solution.Volume == 0)
-                return;
-
-            if (_delta > 0 && solution.Temperature >= _maxTemp)
-                return;
-            if (_delta < 0 && solution.Temperature <= _minTemp)
-                return;
-
-            var heatCap = solution.GetHeatCapacity(null);
-            var deltaT = _scaled
-                ? _delta / heatCap * (float) args.Quantity
-                : _delta / heatCap;
-
-            solution.Temperature = Math.Clamp(solution.Temperature + deltaT, _minTemp, _maxTemp);
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-adjust-solution-temperature-effect",
-                ("chance", Probability), ("deltasign", MathF.Sign(_delta)), ("mintemp", _minTemp), ("maxtemp", _maxTemp));
-    }
-
-}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/BodyTemperature.cs b/Content.Server/Chemistry/ReagentEffectConditions/BodyTemperature.cs
deleted file mode 100644
index 9c47bb58ab8..00000000000
--- a/Content.Server/Chemistry/ReagentEffectConditions/BodyTemperature.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Content.Server.Temperature.Components;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffectConditions
-{
-    /// <summary>
-    ///     Requires the solution entity to be above or below a certain temperature.
-    ///     Used for things like cryoxadone and pyroxadone.
-    /// </summary>
-    public sealed partial class Temperature : ReagentEffectCondition
-    {
-        [DataField]
-        public float Min = 0;
-
-        [DataField]
-        public float Max = float.PositiveInfinity;
-        public override bool Condition(ReagentEffectArgs args)
-        {
-            if (args.EntityManager.TryGetComponent(args.SolutionEntity, out TemperatureComponent? temp))
-            {
-                if (temp.CurrentTemperature > Min && temp.CurrentTemperature < Max)
-                    return true;
-            }
-
-            return false;
-        }
-
-        public override string GuidebookExplanation(IPrototypeManager prototype)
-        {
-            return Loc.GetString("reagent-effect-condition-guidebook-body-temperature",
-                ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
-                ("min", Min));
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/MobStateCondition.cs b/Content.Server/Chemistry/ReagentEffectConditions/MobStateCondition.cs
deleted file mode 100644
index 377eb7d9065..00000000000
--- a/Content.Server/Chemistry/ReagentEffectConditions/MobStateCondition.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffectConditions
-{
-    public sealed partial class MobStateCondition : ReagentEffectCondition
-    {
-        [DataField]
-        public MobState Mobstate = MobState.Alive;
-
-        public override bool Condition(ReagentEffectArgs args)
-        {
-            if (args.EntityManager.TryGetComponent(args.SolutionEntity, out MobStateComponent? mobState))
-            {
-                if (mobState.CurrentState == Mobstate)
-                    return true;
-            }
-
-            return false;
-        }
-
-        public override string GuidebookExplanation(IPrototypeManager prototype)
-        {
-            return Loc.GetString("reagent-effect-condition-guidebook-mob-state-condition", ("state", Mobstate));
-        }
-    }
-}
-
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/OrganType.cs b/Content.Server/Chemistry/ReagentEffectConditions/OrganType.cs
deleted file mode 100644
index 986c3d79c8d..00000000000
--- a/Content.Server/Chemistry/ReagentEffectConditions/OrganType.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Shared.Body.Prototypes;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.Chemistry.ReagentEffectConditions
-{
-    /// <summary>
-    ///     Requires that the metabolizing organ is or is not tagged with a certain MetabolizerType
-    /// </summary>
-    public sealed partial class OrganType : ReagentEffectCondition
-    {
-        [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<MetabolizerTypePrototype>))]
-        public string Type = default!;
-
-        /// <summary>
-        ///     Does this condition pass when the organ has the type, or when it doesn't have the type?
-        /// </summary>
-        [DataField]
-        public bool ShouldHave = true;
-
-        public override bool Condition(ReagentEffectArgs args)
-        {
-            if (args.OrganEntity == null)
-                return false;
-
-            return Condition(args.OrganEntity.Value, args.EntityManager);
-        }
-
-        public bool Condition(Entity<MetabolizerComponent?> metabolizer, IEntityManager entMan)
-        {
-            metabolizer.Comp ??= entMan.GetComponentOrNull<MetabolizerComponent>(metabolizer.Owner);
-            if (metabolizer.Comp != null
-                && metabolizer.Comp.MetabolizerTypes != null
-                && metabolizer.Comp.MetabolizerTypes.Contains(Type))
-                return ShouldHave;
-            return !ShouldHave;
-        }
-
-        public override string GuidebookExplanation(IPrototypeManager prototype)
-        {
-            return Loc.GetString("reagent-effect-condition-guidebook-organ-type",
-                ("name", prototype.Index<MetabolizerTypePrototype>(Type).LocalizedName),
-                ("shouldhave", ShouldHave));
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/ReagentThreshold.cs b/Content.Server/Chemistry/ReagentEffectConditions/ReagentThreshold.cs
deleted file mode 100644
index 061af2b3aef..00000000000
--- a/Content.Server/Chemistry/ReagentEffectConditions/ReagentThreshold.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffectConditions
-{
-    /// <summary>
-    ///     Used for implementing reagent effects that require a certain amount of reagent before it should be applied.
-    ///     For instance, overdoses.
-    ///
-    ///     This can also trigger on -other- reagents, not just the one metabolizing. By default, it uses the
-    ///     one being metabolized.
-    /// </summary>
-    public sealed partial class ReagentThreshold : ReagentEffectCondition
-    {
-        [DataField]
-        public FixedPoint2 Min = FixedPoint2.Zero;
-
-        [DataField]
-        public FixedPoint2 Max = FixedPoint2.MaxValue;
-
-        // TODO use ReagentId
-        [DataField]
-        public string? Reagent;
-
-        public override bool Condition(ReagentEffectArgs args)
-        {
-            var reagent = Reagent ?? args.Reagent?.ID;
-            if (reagent == null)
-                return true; // No condition to apply.
-
-            var quant = FixedPoint2.Zero;
-            if (args.Source != null)
-                quant = args.Source.GetTotalPrototypeQuantity(reagent) * args.QuantityMultiplier;
-
-            return quant >= Min && quant <= Max;
-        }
-
-        public override string GuidebookExplanation(IPrototypeManager prototype)
-        {
-            ReagentPrototype? reagentProto = null;
-            if (Reagent is not null)
-                prototype.TryIndex(Reagent, out reagentProto);
-
-            return Loc.GetString("reagent-effect-condition-guidebook-reagent-threshold",
-                ("reagent", reagentProto?.LocalizedName ?? Loc.GetString("reagent-effect-condition-guidebook-this-reagent")),
-                ("max", Max == FixedPoint2.MaxValue ? (float) int.MaxValue : Max.Float()),
-                ("min", Min.Float()));
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/SolutionTemperature.cs b/Content.Server/Chemistry/ReagentEffectConditions/SolutionTemperature.cs
deleted file mode 100644
index 4387f2ba93b..00000000000
--- a/Content.Server/Chemistry/ReagentEffectConditions/SolutionTemperature.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffectConditions
-{
-    /// <summary>
-    ///     Requires the solution to be above or below a certain temperature.
-    ///     Used for things like explosives.
-    /// </summary>
-    public sealed partial class SolutionTemperature : ReagentEffectCondition
-    {
-        [DataField]
-        public float Min = 0.0f;
-
-        [DataField]
-        public float Max = float.PositiveInfinity;
-        public override bool Condition(ReagentEffectArgs args)
-        {
-            if (args.Source == null)
-                return false;
-            if (args.Source.Temperature < Min)
-                return false;
-            if (args.Source.Temperature > Max)
-                return false;
-
-            return true;
-        }
-
-        public override string GuidebookExplanation(IPrototypeManager prototype)
-        {
-            return Loc.GetString("reagent-effect-condition-guidebook-solution-temperature",
-                ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
-                ("min", Min));
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/TotalDamage.cs b/Content.Server/Chemistry/ReagentEffectConditions/TotalDamage.cs
deleted file mode 100644
index 49630ef9ab0..00000000000
--- a/Content.Server/Chemistry/ReagentEffectConditions/TotalDamage.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Damage;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffectConditions
-{
-    public sealed partial class TotalDamage : ReagentEffectCondition
-    {
-        [DataField]
-        public FixedPoint2 Max = FixedPoint2.MaxValue;
-
-        [DataField]
-        public FixedPoint2 Min = FixedPoint2.Zero;
-
-        public override bool Condition(ReagentEffectArgs args)
-        {
-            if (args.EntityManager.TryGetComponent(args.SolutionEntity, out DamageableComponent? damage))
-            {
-                var total = damage.TotalDamage;
-                if (total > Min && total < Max)
-                    return true;
-            }
-
-            return false;
-        }
-
-        public override string GuidebookExplanation(IPrototypeManager prototype)
-        {
-            return Loc.GetString("reagent-effect-condition-guidebook-total-damage",
-                ("max", Max == FixedPoint2.MaxValue ? (float) int.MaxValue : Max.Float()),
-                ("min", Min.Float()));
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/TotalHunger.cs b/Content.Server/Chemistry/ReagentEffectConditions/TotalHunger.cs
deleted file mode 100644
index 1dd12e632a7..00000000000
--- a/Content.Server/Chemistry/ReagentEffectConditions/TotalHunger.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffectConditions
-{
-    public sealed partial class Hunger : ReagentEffectCondition
-    {
-        [DataField]
-        public float Max = float.PositiveInfinity;
-
-        [DataField]
-        public float Min = 0;
-
-        public override bool Condition(ReagentEffectArgs args)
-        {
-            if (args.EntityManager.TryGetComponent(args.SolutionEntity, out HungerComponent? hunger))
-            {
-                var total = hunger.CurrentHunger;
-                if (total > Min && total < Max)
-                    return true;
-            }
-
-            return false;
-        }
-
-        public override string GuidebookExplanation(IPrototypeManager prototype)
-        {
-            return Loc.GetString("reagent-effect-condition-guidebook-total-hunger",
-                ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
-                ("min", Min));
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs b/Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs
deleted file mode 100644
index 6a43739b0ee..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects
-{
-    [UsedImplicitly]
-    public sealed partial class AddToSolutionReaction : ReagentEffect
-    {
-        [DataField("solution")]
-        private string _solution = "reagents";
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (args.Reagent == null)
-                return;
-
-            // TODO see if this is correct
-            var solutionContainerSystem = args.EntityManager.System<SolutionContainerSystem>();
-            if (!solutionContainerSystem.TryGetSolution(args.SolutionEntity, _solution, out var solutionContainer))
-                return;
-
-            if (solutionContainerSystem.TryAddReagent(solutionContainer.Value, args.Reagent.ID, args.Quantity, out var accepted))
-                args.Source?.RemoveReagent(args.Reagent.ID, accepted);
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-            Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability));
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/ChemCleanBloodstream.cs b/Content.Server/Chemistry/ReagentEffects/ChemCleanBloodstream.cs
deleted file mode 100644
index 402b30a069b..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/ChemCleanBloodstream.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Content.Server.Body.Systems;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReactionEffects
-{
-    /// <summary>
-    /// Basically smoke and foam reactions.
-    /// </summary>
-    [UsedImplicitly]
-    public sealed partial class ChemCleanBloodstream : ReagentEffect
-    {
-        [DataField]
-        public float CleanseRate = 3.0f;
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-chem-clean-bloodstream", ("chance", Probability));
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (args.Source == null || args.Reagent == null)
-                return;
-
-            var cleanseRate = CleanseRate;
-
-            cleanseRate *= args.Scale;
-
-            var bloodstreamSys = EntitySystem.Get<BloodstreamSystem>();
-            bloodstreamSys.FlushChemicals(args.SolutionEntity, args.Reagent.ID, cleanseRate);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/ChemHealEyeDamage.cs b/Content.Server/Chemistry/ReagentEffects/ChemHealEyeDamage.cs
deleted file mode 100644
index 206b8ed04dc..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/ChemHealEyeDamage.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Eye.Blinding;
-using Content.Shared.Eye.Blinding.Systems;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects
-{
-    /// <summary>
-    /// Heal or apply eye damage
-    /// </summary>
-    [UsedImplicitly]
-    public sealed partial class ChemHealEyeDamage : ReagentEffect
-    {
-        /// <summary>
-        /// How much eye damage to add.
-        /// </summary>
-        [DataField]
-        public int Amount = -1;
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-cure-eye-damage", ("chance", Probability), ("deltasign", MathF.Sign(Amount)));
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (args.Scale != 1f) // huh?
-                return;
-
-            args.EntityManager.EntitySysManager.GetEntitySystem<BlindableSystem>().AdjustEyeDamage(args.SolutionEntity, Amount);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/Electrocute.cs b/Content.Server/Chemistry/ReagentEffects/Electrocute.cs
deleted file mode 100644
index 272a0fce42a..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/Electrocute.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Content.Server.Electrocution;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects;
-
-public sealed partial class Electrocute : ReagentEffect
-{
-    [DataField] public int ElectrocuteTime = 2;
-
-    [DataField] public int ElectrocuteDamageScale = 5;
-
-    /// <remarks>
-    ///     true - refresh electrocute time,  false - accumulate electrocute time
-    /// </remarks>
-    [DataField] public bool Refresh = true;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-electrocute", ("chance", Probability), ("time", ElectrocuteTime));
-
-    public override bool ShouldLog => true;
-
-    public override void Effect(ReagentEffectArgs args)
-    {
-        args.EntityManager.System<ElectrocutionSystem>().TryDoElectrocution(args.SolutionEntity, null,
-            Math.Max((args.Quantity * ElectrocuteDamageScale).Int(), 1), TimeSpan.FromSeconds(ElectrocuteTime), Refresh, ignoreInsulation: true);
-
-        if (args.Reagent != null)
-            args.Source?.RemoveReagent(args.Reagent.ID, args.Quantity);
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/ExtinguishReaction.cs b/Content.Server/Chemistry/ReagentEffects/ExtinguishReaction.cs
deleted file mode 100644
index e9029089988..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/ExtinguishReaction.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Content.Server.Atmos.Components;
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects
-{
-    [UsedImplicitly]
-    public sealed partial class ExtinguishReaction : ReagentEffect
-    {
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-extinguish-reaction", ("chance", Probability));
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out FlammableComponent? flammable)) return;
-
-            var flammableSystem = EntitySystem.Get<FlammableSystem>();
-            flammableSystem.Extinguish(args.SolutionEntity, flammable);
-            flammableSystem.AdjustFireStacks(args.SolutionEntity, -1.5f * (float) args.Quantity, flammable);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/FlammableReaction.cs b/Content.Server/Chemistry/ReagentEffects/FlammableReaction.cs
deleted file mode 100644
index 5b36967f6a8..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/FlammableReaction.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Content.Server.Atmos.Components;
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Database;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects
-{
-    [UsedImplicitly]
-    public sealed partial class FlammableReaction : ReagentEffect
-    {
-        [DataField]
-        public float Multiplier = 0.05f;
-
-        public override bool ShouldLog => true;
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-flammable-reaction", ("chance", Probability));
-
-        public override LogImpact LogImpact => LogImpact.Medium;
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out FlammableComponent? flammable))
-                return;
-
-            args.EntityManager.System<FlammableSystem>().AdjustFireStacks(args.SolutionEntity, args.Quantity.Float() * Multiplier, flammable);
-
-            if (args.Reagent != null)
-                args.Source?.RemoveReagent(args.Reagent.ID, args.Quantity);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/Ignite.cs b/Content.Server/Chemistry/ReagentEffects/Ignite.cs
deleted file mode 100644
index 1fc90f63e31..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/Ignite.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Database;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects;
-
-/// <summary>
-///     Ignites a mob.
-/// </summary>
-public sealed partial class Ignite : ReagentEffect
-{
-    public override bool ShouldLog => true;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-ignite", ("chance", Probability));
-
-    public override LogImpact LogImpact => LogImpact.Medium;
-
-    public override void Effect(ReagentEffectArgs args)
-    {
-        var flamSys = EntitySystem.Get<FlammableSystem>();
-        flamSys.Ignite(args.SolutionEntity, args.OrganEntity ?? args.SolutionEntity);
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/ModifyBleedAmount.cs b/Content.Server/Chemistry/ReagentEffects/ModifyBleedAmount.cs
deleted file mode 100644
index 7b966ea4788..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/ModifyBleedAmount.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects;
-
-public sealed partial class ModifyBleedAmount : ReagentEffect
-{
-    [DataField]
-    public bool Scaled = false;
-
-    [DataField]
-    public float Amount = -1.0f;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-modify-bleed-amount", ("chance", Probability),
-            ("deltasign", MathF.Sign(Amount)));
-
-    public override void Effect(ReagentEffectArgs args)
-    {
-        if (args.EntityManager.TryGetComponent<BloodstreamComponent>(args.SolutionEntity, out var blood))
-        {
-            var sys = EntitySystem.Get<BloodstreamSystem>();
-            var amt = Scaled ? Amount * args.Quantity.Float() : Amount;
-            amt *= args.Scale;
-
-            sys.TryModifyBleedAmount(args.SolutionEntity, amt, blood);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/ModifyBloodLevel.cs b/Content.Server/Chemistry/ReagentEffects/ModifyBloodLevel.cs
deleted file mode 100644
index 748aa71083e..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/ModifyBloodLevel.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects;
-
-public sealed partial class ModifyBloodLevel : ReagentEffect
-{
-    [DataField]
-    public bool Scaled = false;
-
-    [DataField]
-    public FixedPoint2 Amount = 1.0f;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-modify-blood-level", ("chance", Probability),
-            ("deltasign", MathF.Sign(Amount.Float())));
-
-    public override void Effect(ReagentEffectArgs args)
-    {
-        if (args.EntityManager.TryGetComponent<BloodstreamComponent>(args.SolutionEntity, out var blood))
-        {
-            var sys = EntitySystem.Get<BloodstreamSystem>();
-            var amt = Scaled ? Amount * args.Quantity : Amount;
-            amt *= args.Scale;
-
-            sys.TryModifyBloodLevel(args.SolutionEntity, amt, blood);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/ModifyLungGas.cs b/Content.Server/Chemistry/ReagentEffects/ModifyLungGas.cs
deleted file mode 100644
index e7466fbc85d..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/ModifyLungGas.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Shared.Atmos;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects;
-
-public sealed partial class ModifyLungGas : ReagentEffect
-{
-    [DataField("ratios", required: true)]
-    private Dictionary<Gas, float> _ratios = default!;
-
-    // JUSTIFICATION: This is internal magic that players never directly interact with.
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => null;
-
-    public override void Effect(ReagentEffectArgs args)
-    {
-        if (!args.EntityManager.TryGetComponent<LungComponent>(args.OrganEntity, out var lung))
-            return;
-
-        foreach (var (gas, ratio) in _ratios)
-        {
-            var quantity = ratio * args.Quantity.Float() / Atmospherics.BreathMolesToReagentMultiplier;
-            if (quantity < 0)
-                quantity = Math.Max(quantity, -lung.Air[(int)gas]);
-            lung.Air.AdjustMoles(gas, quantity);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/MovespeedModifier.cs b/Content.Server/Chemistry/ReagentEffects/MovespeedModifier.cs
deleted file mode 100644
index 0301742c5af..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/MovespeedModifier.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Movement.Systems;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-
-namespace Content.Server.Chemistry.ReagentEffects
-{
-    /// <summary>
-    /// Default metabolism for stimulants and tranqs. Attempts to find a MovementSpeedModifier on the target,
-    /// adding one if not there and to change the movespeed
-    /// </summary>
-    public sealed partial class MovespeedModifier : ReagentEffect
-    {
-        /// <summary>
-        /// How much the entities' walk speed is multiplied by.
-        /// </summary>
-        [DataField]
-        public float WalkSpeedModifier { get; set; } = 1;
-
-        /// <summary>
-        /// How much the entities' run speed is multiplied by.
-        /// </summary>
-        [DataField]
-        public float SprintSpeedModifier { get; set; } = 1;
-
-        /// <summary>
-        /// How long the modifier applies (in seconds) when metabolized.
-        /// </summary>
-        [DataField]
-        public float StatusLifetime = 2f;
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        {
-            return Loc.GetString("reagent-effect-guidebook-movespeed-modifier",
-                ("chance", Probability),
-                ("walkspeed", WalkSpeedModifier),
-                ("time", StatusLifetime));
-        }
-
-        /// <summary>
-        /// Remove reagent at set rate, changes the movespeed modifiers and adds a MovespeedModifierMetabolismComponent if not already there.
-        /// </summary>
-        public override void Effect(ReagentEffectArgs args)
-        {
-            var status = args.EntityManager.EnsureComponent<MovespeedModifierMetabolismComponent>(args.SolutionEntity);
-
-            // Only refresh movement if we need to.
-            var modified = !status.WalkSpeedModifier.Equals(WalkSpeedModifier) ||
-                           !status.SprintSpeedModifier.Equals(SprintSpeedModifier);
-
-            status.WalkSpeedModifier = WalkSpeedModifier;
-            status.SprintSpeedModifier = SprintSpeedModifier;
-
-            // only going to scale application time
-            var statusLifetime = StatusLifetime;
-            statusLifetime *= args.Scale;
-
-            IncreaseTimer(status, statusLifetime);
-
-            if (modified)
-                EntitySystem.Get<MovementSpeedModifierSystem>().RefreshMovementSpeedModifiers(args.SolutionEntity);
-
-        }
-        public void IncreaseTimer(MovespeedModifierMetabolismComponent status, float time)
-        {
-            var gameTiming = IoCManager.Resolve<IGameTiming>();
-
-            var offsetTime = Math.Max(status.ModifierTimer.TotalSeconds, gameTiming.CurTime.TotalSeconds);
-
-            status.ModifierTimer = TimeSpan.FromSeconds(offsetTime + time);
-            status.Dirty();
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/Oxygenate.cs b/Content.Server/Chemistry/ReagentEffects/Oxygenate.cs
deleted file mode 100644
index 34a2454139e..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/Oxygenate.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects;
-
-public sealed partial class Oxygenate : ReagentEffect
-{
-    [DataField]
-    public float Factor = 1f;
-
-    // JUSTIFICATION: This is internal magic that players never directly interact with.
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => null;
-
-    public override void Effect(ReagentEffectArgs args)
-    {
-        if (args.EntityManager.TryGetComponent<RespiratorComponent>(args.SolutionEntity, out var resp))
-        {
-            var respSys = EntitySystem.Get<RespiratorSystem>();
-            respSys.UpdateSaturation(args.SolutionEntity, args.Quantity.Float() * Factor, resp);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustAttribute.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustAttribute.cs
deleted file mode 100644
index f43b4828f93..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustAttribute.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using System.Diagnostics.CodeAnalysis;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [ImplicitDataDefinitionForInheritors]
-    public abstract partial class PlantAdjustAttribute : ReagentEffect
-    {
-        [DataField]
-        public float Amount { get; protected set; } = 1;
-
-        [DataField]
-        public float Prob { get; protected set; } = 1; // = (80);
-
-        /// <summary>
-        ///     Checks if the plant holder can metabolize the reagent or not. Checks if it has an alive plant by default.
-        /// </summary>
-        /// <param name="plantHolder">The entity holding the plant</param>
-        /// <param name="plantHolderComponent">The plant holder component</param>
-        /// <param name="entityManager">The entity manager</param>
-        /// <param name="mustHaveAlivePlant">Whether to check if it has an alive plant or not</param>
-        /// <returns></returns>
-        public bool CanMetabolize(EntityUid plantHolder, [NotNullWhen(true)] out PlantHolderComponent? plantHolderComponent,
-            IEntityManager entityManager,
-            bool mustHaveAlivePlant = true)
-        {
-            plantHolderComponent = null;
-
-            if (!entityManager.TryGetComponent(plantHolder, out plantHolderComponent)
-                                    || mustHaveAlivePlant && (plantHolderComponent.Seed == null || plantHolderComponent.Dead))
-                return false;
-
-            if (Prob >= 1f)
-                return true;
-
-            // Dependencies are never injected for reagents if you intend to do that for this.
-            return !(Prob <= 0f) && IoCManager.Resolve<IRobustRandom>().Prob(Prob);
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability));
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustHealth.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustHealth.cs
deleted file mode 100644
index f03464469eb..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustHealth.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Content.Server.Botany.Systems;
-using Content.Shared.Chemistry.Reagent;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    public sealed partial class PlantAdjustHealth : PlantAdjustAttribute
-    {
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
-                return;
-
-            var plantHolder = args.EntityManager.System<PlantHolderSystem>();
-
-            plantHolderComp.Health += Amount;
-            plantHolder.CheckHealth(args.SolutionEntity, plantHolderComp);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationLevel.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationLevel.cs
deleted file mode 100644
index 8c8d04765a2..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationLevel.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    public sealed partial class PlantAdjustMutationLevel : PlantAdjustAttribute
-    {
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
-                return;
-
-            plantHolderComp.MutationLevel += Amount * plantHolderComp.MutationMod;
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationMod.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationMod.cs
deleted file mode 100644
index af4a00a044e..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationMod.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    public sealed partial class PlantAdjustMutationMod : PlantAdjustAttribute
-    {
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
-                return;
-
-            plantHolderComp.MutationMod += Amount;
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustNutrition.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustNutrition.cs
deleted file mode 100644
index 900121412e8..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustNutrition.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Server.Botany.Systems;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    public sealed partial class PlantAdjustNutrition : PlantAdjustAttribute
-    {
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager, mustHaveAlivePlant: false))
-                return;
-
-            var plantHolder = args.EntityManager.System<PlantHolderSystem>();
-
-            plantHolder.AdjustNutrient(args.SolutionEntity, Amount, plantHolderComp);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustPests.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustPests.cs
deleted file mode 100644
index 27729b4b2ca..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustPests.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    public sealed partial class PlantAdjustPests : PlantAdjustAttribute
-    {
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
-                return;
-
-            plantHolderComp.PestLevel += Amount;
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustToxins.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustToxins.cs
deleted file mode 100644
index 35130238ad5..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustToxins.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    public sealed partial class PlantAdjustToxins : PlantAdjustAttribute
-    {
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
-                return;
-
-            plantHolderComp.Toxins += Amount;
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWater.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWater.cs
deleted file mode 100644
index 71b4670dc65..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWater.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Server.Botany.Systems;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    public sealed partial class PlantAdjustWater : PlantAdjustAttribute
-    {
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager, mustHaveAlivePlant: false))
-                return;
-
-            var plantHolder = args.EntityManager.System<PlantHolderSystem>();
-
-            plantHolder.AdjustWater(args.SolutionEntity, Amount, plantHolderComp);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWeeds.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWeeds.cs
deleted file mode 100644
index 6184b95adb8..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWeeds.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    public sealed partial class PlantAdjustWeeds : PlantAdjustAttribute
-    {
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
-                return;
-
-            plantHolderComp.WeedLevel += Amount;
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAffectGrowth.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAffectGrowth.cs
deleted file mode 100644
index 54ec628fdc9..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAffectGrowth.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Server.Botany.Systems;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    public sealed partial class PlantAffectGrowth : PlantAdjustAttribute
-    {
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
-                return;
-
-            var plantHolder = args.EntityManager.System<PlantHolderSystem>();
-
-            plantHolder.AffectGrowth(args.SolutionEntity, (int) Amount, plantHolderComp);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantCryoxadone.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantCryoxadone.cs
deleted file mode 100644
index 83a5f56e592..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantCryoxadone.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    [DataDefinition]
-    public sealed partial class PlantCryoxadone : ReagentEffect
-    {
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out PlantHolderComponent? plantHolderComp)
-            || plantHolderComp.Seed == null || plantHolderComp.Dead)
-                return;
-
-            var deviation = 0;
-            var seed = plantHolderComp.Seed;
-            var random = IoCManager.Resolve<IRobustRandom>();
-            if (plantHolderComp.Age > seed.Maturation)
-                deviation = (int) Math.Max(seed.Maturation - 1, plantHolderComp.Age - random.Next(7, 10));
-            else
-                deviation = (int) (seed.Maturation / seed.GrowthStages);
-            plantHolderComp.Age -= deviation;
-            plantHolderComp.SkipAging++;
-            plantHolderComp.ForceUpdate = true;
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability));
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantDiethylamine.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantDiethylamine.cs
deleted file mode 100644
index 23cb436d2f1..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantDiethylamine.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Server.Botany.Systems;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    [DataDefinition]
-    public sealed partial class PlantDiethylamine : ReagentEffect
-    {
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out PlantHolderComponent? plantHolderComp)
-                                    || plantHolderComp.Seed == null || plantHolderComp.Dead ||
-                                    plantHolderComp.Seed.Immutable)
-                return;
-
-
-            var plantHolder = args.EntityManager.System<PlantHolderSystem>();
-
-            var random = IoCManager.Resolve<IRobustRandom>();
-
-            if (random.Prob(0.1f))
-            {
-                plantHolder.EnsureUniqueSeed(args.SolutionEntity, plantHolderComp);
-                plantHolderComp.Seed.Lifespan++;
-            }
-
-            if (random.Prob(0.1f))
-            {
-                plantHolder.EnsureUniqueSeed(args.SolutionEntity, plantHolderComp);
-                plantHolderComp.Seed.Endurance++;
-            }
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability));
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantPhalanximine.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantPhalanximine.cs
deleted file mode 100644
index c0640d7fc04..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantPhalanximine.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    [DataDefinition]
-    public sealed partial class PlantPhalanximine : ReagentEffect
-    {
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out PlantHolderComponent? plantHolderComp)
-                                    || plantHolderComp.Seed == null || plantHolderComp.Dead ||
-                                    plantHolderComp.Seed.Immutable)
-                return;
-
-            plantHolderComp.Seed.Viable = true;
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability));
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/RobustHarvest.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/RobustHarvest.cs
deleted file mode 100644
index 990a5a5003f..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/RobustHarvest.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Server.Botany.Systems;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    [DataDefinition]
-    public sealed partial class RobustHarvest : ReagentEffect
-    {
-        [DataField]
-        public int PotencyLimit = 50;
-
-        [DataField]
-        public int PotencyIncrease = 3;
-
-        [DataField]
-        public int PotencySeedlessThreshold = 30;
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out PlantHolderComponent? plantHolderComp)
-                                    || plantHolderComp.Seed == null || plantHolderComp.Dead ||
-                                    plantHolderComp.Seed.Immutable)
-                return;
-
-
-            var plantHolder = args.EntityManager.System<PlantHolderSystem>();
-            var random = IoCManager.Resolve<IRobustRandom>();
-
-            if (plantHolderComp.Seed.Potency < PotencyLimit)
-            {
-                plantHolder.EnsureUniqueSeed(args.SolutionEntity, plantHolderComp);
-                plantHolderComp.Seed.Potency = Math.Min(plantHolderComp.Seed.Potency + PotencyIncrease, PotencyLimit);
-
-                if (plantHolderComp.Seed.Potency > PotencySeedlessThreshold)
-                {
-                    plantHolderComp.Seed.Seedless = true;
-                }
-            }
-            else if (plantHolderComp.Seed.Yield > 1 && random.Prob(0.1f))
-            {
-                // Too much of a good thing reduces yield
-                plantHolder.EnsureUniqueSeed(args.SolutionEntity, plantHolderComp);
-                plantHolderComp.Seed.Yield--;
-            }
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability));
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/SatiateThirst.cs b/Content.Server/Chemistry/ReagentEffects/SatiateThirst.cs
deleted file mode 100644
index 1208e74367b..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/SatiateThirst.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.Nutrition.EntitySystems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects
-{
-    /// <summary>
-    /// Default metabolism for drink reagents. Attempts to find a ThirstComponent on the target,
-    /// and to update it's thirst values.
-    /// </summary>
-    public sealed partial class SatiateThirst : ReagentEffect
-    {
-        private const float DefaultHydrationFactor = 3.0f;
-
-        /// How much thirst is satiated each metabolism tick. Not currently tied to
-        /// rate or anything.
-        [DataField("factor")]
-        public float HydrationFactor { get; set; } = DefaultHydrationFactor;
-
-        /// Satiate thirst if a ThirstComponent can be found
-        public override void Effect(ReagentEffectArgs args)
-        {
-            var uid = args.SolutionEntity;
-            if (args.EntityManager.TryGetComponent(uid, out ThirstComponent? thirst))
-                EntitySystem.Get<ThirstSystem>().ModifyThirst(uid, thirst, HydrationFactor);
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-satiate-thirst", ("chance", Probability), ("relative",  HydrationFactor / DefaultHydrationFactor));
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/StatusEffects/GenericStatusEffect.cs b/Content.Server/Chemistry/ReagentEffects/StatusEffects/GenericStatusEffect.cs
deleted file mode 100644
index 66454b25fd6..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/StatusEffects/GenericStatusEffect.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.StatusEffect;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects.StatusEffects
-{
-    /// <summary>
-    ///     Adds a generic status effect to the entity,
-    ///     not worrying about things like how to affect the time it lasts for
-    ///     or component fields or anything. Just adds a component to an entity
-    ///     for a given time. Easy.
-    /// </summary>
-    /// <remarks>
-    ///     Can be used for things like adding accents or something. I don't know. Go wild.
-    /// </remarks>
-    [UsedImplicitly]
-    public sealed partial class GenericStatusEffect : ReagentEffect
-    {
-        [DataField(required: true)]
-        public string Key = default!;
-
-        [DataField]
-        public string Component = String.Empty;
-
-        [DataField]
-        public float Time = 2.0f;
-
-        /// <remarks>
-        ///     true - refresh status effect time,  false - accumulate status effect time
-        /// </remarks>
-        [DataField]
-        public bool Refresh = true;
-
-        /// <summary>
-        ///     Should this effect add the status effect, remove time from it, or set its cooldown?
-        /// </summary>
-        [DataField]
-        public StatusEffectMetabolismType Type = StatusEffectMetabolismType.Add;
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            var statusSys = args.EntityManager.EntitySysManager.GetEntitySystem<StatusEffectsSystem>();
-
-            var time = Time;
-            time *= args.Scale;
-
-            if (Type == StatusEffectMetabolismType.Add && Component != String.Empty)
-            {
-                statusSys.TryAddStatusEffect(args.SolutionEntity, Key, TimeSpan.FromSeconds(time), Refresh, Component);
-            }
-            else if (Type == StatusEffectMetabolismType.Remove)
-            {
-                statusSys.TryRemoveTime(args.SolutionEntity, Key, TimeSpan.FromSeconds(time));
-            }
-            else if (Type == StatusEffectMetabolismType.Set)
-            {
-                statusSys.TrySetTime(args.SolutionEntity, Key, TimeSpan.FromSeconds(time));
-            }
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString(
-            "reagent-effect-guidebook-status-effect",
-            ("chance", Probability),
-            ("type", Type),
-            ("time", Time),
-            ("key", $"reagent-effect-status-effect-{Key}"));
-    }
-
-    public enum StatusEffectMetabolismType
-    {
-        Add,
-        Remove,
-        Set
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/StatusEffects/Jitter.cs b/Content.Server/Chemistry/ReagentEffects/StatusEffects/Jitter.cs
deleted file mode 100644
index 7ee70957b7a..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/StatusEffects/Jitter.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Jittering;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects.StatusEffects
-{
-    /// <summary>
-    ///     Adds the jitter status effect to a mob.
-    ///     This doesn't use generic status effects because it needs to
-    ///     take in some parameters that JitterSystem needs.
-    /// </summary>
-    public sealed partial class Jitter : ReagentEffect
-    {
-        [DataField]
-        public float Amplitude = 10.0f;
-
-        [DataField]
-        public float Frequency = 4.0f;
-
-        [DataField]
-        public float Time = 2.0f;
-
-        /// <remarks>
-        ///     true - refresh jitter time,  false - accumulate jitter time
-        /// </remarks>
-        [DataField]
-        public bool Refresh = true;
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            var time = Time;
-            time *= args.Scale;
-
-            args.EntityManager.EntitySysManager.GetEntitySystem<SharedJitteringSystem>()
-                .DoJitter(args.SolutionEntity, TimeSpan.FromSeconds(time), Refresh, Amplitude, Frequency);
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-            Loc.GetString("reagent-effect-guidebook-jittering", ("chance", Probability));
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/WashCreamPieReaction.cs b/Content.Server/Chemistry/ReagentEffects/WashCreamPieReaction.cs
deleted file mode 100644
index 9bf6792eca2..00000000000
--- a/Content.Server/Chemistry/ReagentEffects/WashCreamPieReaction.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Content.Server.Nutrition.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Nutrition.Components;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects
-{
-    [UsedImplicitly]
-    public sealed partial class WashCreamPieReaction : ReagentEffect
-    {
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-wash-cream-pie-reaction", ("chance", Probability));
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out CreamPiedComponent? creamPied)) return;
-
-            EntitySystem.Get<CreamPieSystem>().SetCreamPied(args.SolutionEntity, creamPied, false);
-        }
-    }
-}
diff --git a/Content.Server/EntityEffects/EffectConditions/BodyTemperature.cs b/Content.Server/EntityEffects/EffectConditions/BodyTemperature.cs
new file mode 100644
index 00000000000..9f68bec9182
--- /dev/null
+++ b/Content.Server/EntityEffects/EffectConditions/BodyTemperature.cs
@@ -0,0 +1,35 @@
+using Content.Server.Temperature.Components;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.EffectConditions;
+
+/// <summary>
+///     Requires the target entity to be above or below a certain temperature.
+///     Used for things like cryoxadone and pyroxadone.
+/// </summary>
+public sealed partial class Temperature : EntityEffectCondition
+{
+    [DataField]
+    public float Min = 0;
+
+    [DataField]
+    public float Max = float.PositiveInfinity;
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (args.EntityManager.TryGetComponent(args.TargetEntity, out TemperatureComponent? temp))
+        {
+            if (temp.CurrentTemperature > Min && temp.CurrentTemperature < Max)
+                return true;
+        }
+
+        return false;
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        return Loc.GetString("reagent-effect-condition-guidebook-body-temperature",
+            ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
+            ("min", Min));
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/HasTagCondition.cs b/Content.Server/EntityEffects/EffectConditions/HasTagCondition.cs
similarity index 68%
rename from Content.Server/Chemistry/ReagentEffectConditions/HasTagCondition.cs
rename to Content.Server/EntityEffects/EffectConditions/HasTagCondition.cs
index 52d4d00eb3f..b0428b41bfc 100644
--- a/Content.Server/Chemistry/ReagentEffectConditions/HasTagCondition.cs
+++ b/Content.Server/EntityEffects/EffectConditions/HasTagCondition.cs
@@ -1,13 +1,13 @@
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Content.Shared.Tag;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.Chemistry.ReagentEffectConditions;
+namespace Content.Server.EntityEffects.EffectConditions;
 
 [UsedImplicitly]
-public sealed partial class HasTag : ReagentEffectCondition
+public sealed partial class HasTag : EntityEffectCondition
 {
     [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<TagPrototype>))]
     public string Tag = default!;
@@ -15,10 +15,10 @@ public sealed partial class HasTag : ReagentEffectCondition
     [DataField]
     public bool Invert = false;
 
-    public override bool Condition(ReagentEffectArgs args)
+    public override bool Condition(EntityEffectBaseArgs args)
     {
-        if (args.EntityManager.TryGetComponent<TagComponent>(args.SolutionEntity, out var tag))
-            return EntitySystem.Get<TagSystem>().HasTag(tag, Tag) ^ Invert;
+        if (args.EntityManager.TryGetComponent<TagComponent>(args.TargetEntity, out var tag))
+            return args.EntityManager.System<TagSystem>().HasTag(tag, Tag) ^ Invert;
 
         return false;
     }
diff --git a/Content.Server/EntityEffects/EffectConditions/JobCondition.cs b/Content.Server/EntityEffects/EffectConditions/JobCondition.cs
new file mode 100644
index 00000000000..c62cb60a22d
--- /dev/null
+++ b/Content.Server/EntityEffects/EffectConditions/JobCondition.cs
@@ -0,0 +1,39 @@
+using System.Linq;
+using Content.Shared.EntityEffects;
+using Content.Shared.Localizations;
+using Robust.Shared.Prototypes;
+using Content.Shared.Mind.Components;
+using Content.Shared.Roles;
+using Content.Shared.Roles.Jobs;
+
+namespace Content.Server.EntityEffects.EffectConditions;
+
+public sealed partial class JobCondition : EntityEffectCondition
+{
+    [DataField(required: true)] public List<ProtoId<JobPrototype>> Job;
+
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        args.EntityManager.TryGetComponent<MindContainerComponent>(args.TargetEntity, out var mindContainer);
+        if (mindContainer != null && mindContainer.Mind != null)
+        {
+            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;
+            }
+        }
+
+        return false;
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        var localizedNames = Job.Select(jobId => prototype.Index(jobId).LocalizedName).ToList();
+        return Loc.GetString("reagent-effect-condition-guidebook-job-condition", ("job", ContentLocalizationManager.FormatListToOr(localizedNames)));
+    }
+}
+
+
diff --git a/Content.Server/EntityEffects/EffectConditions/MobStateCondition.cs b/Content.Server/EntityEffects/EffectConditions/MobStateCondition.cs
new file mode 100644
index 00000000000..d676b29bf9e
--- /dev/null
+++ b/Content.Server/EntityEffects/EffectConditions/MobStateCondition.cs
@@ -0,0 +1,29 @@
+using Content.Shared.EntityEffects;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.EffectConditions;
+
+public sealed partial class MobStateCondition : EntityEffectCondition
+{
+    [DataField]
+    public MobState Mobstate = MobState.Alive;
+
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (args.EntityManager.TryGetComponent(args.TargetEntity, out MobStateComponent? mobState))
+        {
+            if (mobState.CurrentState == Mobstate)
+                return true;
+        }
+
+        return false;
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        return Loc.GetString("reagent-effect-condition-guidebook-mob-state-condition", ("state", Mobstate));
+    }
+}
+
diff --git a/Content.Server/EntityEffects/EffectConditions/OrganType.cs b/Content.Server/EntityEffects/EffectConditions/OrganType.cs
new file mode 100644
index 00000000000..fc52608fab2
--- /dev/null
+++ b/Content.Server/EntityEffects/EffectConditions/OrganType.cs
@@ -0,0 +1,53 @@
+using Content.Server.Body.Components;
+using Content.Shared.Body.Prototypes;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Server.EntityEffects.EffectConditions;
+
+/// <summary>
+///     Requires that the metabolizing organ is or is not tagged with a certain MetabolizerType
+/// </summary>
+public sealed partial class OrganType : EntityEffectCondition
+{
+    [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<MetabolizerTypePrototype>))]
+    public string Type = default!;
+
+    /// <summary>
+    ///     Does this condition pass when the organ has the type, or when it doesn't have the type?
+    /// </summary>
+    [DataField]
+    public bool ShouldHave = true;
+
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            if (reagentArgs.OrganEntity == null)
+                return false;
+
+            return Condition(reagentArgs.OrganEntity.Value, reagentArgs.EntityManager);
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+
+    public bool Condition(Entity<MetabolizerComponent?> metabolizer, IEntityManager entMan)
+    {
+        metabolizer.Comp ??= entMan.GetComponentOrNull<MetabolizerComponent>(metabolizer.Owner);
+        if (metabolizer.Comp != null
+            && metabolizer.Comp.MetabolizerTypes != null
+            && metabolizer.Comp.MetabolizerTypes.Contains(Type))
+            return ShouldHave;
+        return !ShouldHave;
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        return Loc.GetString("reagent-effect-condition-guidebook-organ-type",
+            ("name", prototype.Index<MetabolizerTypePrototype>(Type).LocalizedName),
+            ("shouldhave", ShouldHave));
+    }
+}
diff --git a/Content.Server/EntityEffects/EffectConditions/ReagentThreshold.cs b/Content.Server/EntityEffects/EffectConditions/ReagentThreshold.cs
new file mode 100644
index 00000000000..6cbd7b4ea57
--- /dev/null
+++ b/Content.Server/EntityEffects/EffectConditions/ReagentThreshold.cs
@@ -0,0 +1,57 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.EffectConditions;
+
+/// <summary>
+///     Used for implementing reagent effects that require a certain amount of reagent before it should be applied.
+///     For instance, overdoses.
+///
+///     This can also trigger on -other- reagents, not just the one metabolizing. By default, it uses the
+///     one being metabolized.
+/// </summary>
+public sealed partial class ReagentThreshold : EntityEffectCondition
+{
+    [DataField]
+    public FixedPoint2 Min = FixedPoint2.Zero;
+
+    [DataField]
+    public FixedPoint2 Max = FixedPoint2.MaxValue;
+
+    // TODO use ReagentId
+    [DataField]
+    public string? Reagent;
+
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            var reagent = Reagent ?? reagentArgs.Reagent?.ID;
+            if (reagent == null)
+                return true; // No condition to apply.
+
+            var quant = FixedPoint2.Zero;
+            if (reagentArgs.Source != null)
+                quant = reagentArgs.Source.GetTotalPrototypeQuantity(reagent);
+
+            return quant >= Min && quant <= Max;
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        ReagentPrototype? reagentProto = null;
+        if (Reagent is not null)
+            prototype.TryIndex(Reagent, out reagentProto);
+
+        return Loc.GetString("reagent-effect-condition-guidebook-reagent-threshold",
+            ("reagent", reagentProto?.LocalizedName ?? Loc.GetString("reagent-effect-condition-guidebook-this-reagent")),
+            ("max", Max == FixedPoint2.MaxValue ? (float) int.MaxValue : Max.Float()),
+            ("min", Min.Float()));
+    }
+}
diff --git a/Content.Server/EntityEffects/EffectConditions/SolutionTemperature.cs b/Content.Server/EntityEffects/EffectConditions/SolutionTemperature.cs
new file mode 100644
index 00000000000..b964435db52
--- /dev/null
+++ b/Content.Server/EntityEffects/EffectConditions/SolutionTemperature.cs
@@ -0,0 +1,40 @@
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.EffectConditions;
+
+/// <summary>
+///     Requires the solution to be above or below a certain temperature.
+///     Used for things like explosives.
+/// </summary>
+public sealed partial class SolutionTemperature : EntityEffectCondition
+{
+    [DataField]
+    public float Min = 0.0f;
+
+    [DataField]
+    public float Max = float.PositiveInfinity;
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            if (reagentArgs.Source == null)
+                return false;
+            if (reagentArgs.Source.Temperature < Min)
+                return false;
+            if (reagentArgs.Source.Temperature > Max)
+                return false;
+            return true;
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        return Loc.GetString("reagent-effect-condition-guidebook-solution-temperature",
+            ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
+            ("min", Min));
+    }
+}
diff --git a/Content.Server/EntityEffects/EffectConditions/TotalDamage.cs b/Content.Server/EntityEffects/EffectConditions/TotalDamage.cs
new file mode 100644
index 00000000000..2d039a1ac8f
--- /dev/null
+++ b/Content.Server/EntityEffects/EffectConditions/TotalDamage.cs
@@ -0,0 +1,34 @@
+using Content.Shared.EntityEffects;
+using Content.Shared.Damage;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.EffectConditions;
+
+public sealed partial class TotalDamage : EntityEffectCondition
+{
+    [DataField]
+    public FixedPoint2 Max = FixedPoint2.MaxValue;
+
+    [DataField]
+    public FixedPoint2 Min = FixedPoint2.Zero;
+
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (args.EntityManager.TryGetComponent(args.TargetEntity, out DamageableComponent? damage))
+        {
+            var total = damage.TotalDamage;
+            if (total > Min && total < Max)
+                return true;
+        }
+
+        return false;
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        return Loc.GetString("reagent-effect-condition-guidebook-total-damage",
+            ("max", Max == FixedPoint2.MaxValue ? (float) int.MaxValue : Max.Float()),
+            ("min", Min.Float()));
+    }
+}
diff --git a/Content.Server/EntityEffects/EffectConditions/TotalHunger.cs b/Content.Server/EntityEffects/EffectConditions/TotalHunger.cs
new file mode 100644
index 00000000000..84ad4c22403
--- /dev/null
+++ b/Content.Server/EntityEffects/EffectConditions/TotalHunger.cs
@@ -0,0 +1,34 @@
+using Content.Shared.EntityEffects;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.EffectConditions;
+
+public sealed partial class Hunger : EntityEffectCondition
+{
+    [DataField]
+    public float Max = float.PositiveInfinity;
+
+    [DataField]
+    public float Min = 0;
+
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (args.EntityManager.TryGetComponent(args.TargetEntity, out HungerComponent? hunger))
+        {
+            var total = hunger.CurrentHunger;
+            if (total > Min && total < Max)
+                return true;
+        }
+
+        return false;
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        return Loc.GetString("reagent-effect-condition-guidebook-total-hunger",
+            ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
+            ("min", Min));
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/ActivateArtifact.cs b/Content.Server/EntityEffects/Effects/ActivateArtifact.cs
similarity index 56%
rename from Content.Server/Chemistry/ReagentEffects/ActivateArtifact.cs
rename to Content.Server/EntityEffects/Effects/ActivateArtifact.cs
index 41af90f60a1..3e973884995 100644
--- a/Content.Server/Chemistry/ReagentEffects/ActivateArtifact.cs
+++ b/Content.Server/EntityEffects/Effects/ActivateArtifact.cs
@@ -1,15 +1,16 @@
-using Content.Server.Xenoarchaeology.XenoArtifacts;
+using Content.Server.Xenoarchaeology.XenoArtifacts;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.Prototypes;
+using Content.Shared.EntityEffects;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class ActivateArtifact : ReagentEffect
+public sealed partial class ActivateArtifact : EntityEffect
 {
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var artifact = args.EntityManager.EntitySysManager.GetEntitySystem<ArtifactSystem>();
-        artifact.TryActivateArtifact(args.SolutionEntity);
+        artifact.TryActivateArtifact(args.TargetEntity);
     }
 
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
diff --git a/Content.Server/EntityEffects/Effects/AddToSolutionReaction.cs b/Content.Server/EntityEffects/Effects/AddToSolutionReaction.cs
new file mode 100644
index 00000000000..10fb667ca48
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/AddToSolutionReaction.cs
@@ -0,0 +1,38 @@
+using Content.Server.Chemistry.Containers.EntitySystems;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects
+{
+    [UsedImplicitly]
+    public sealed partial class AddToSolutionReaction : EntityEffect
+    {
+        [DataField("solution")]
+        private string _solution = "reagents";
+
+        public override void Effect(EntityEffectBaseArgs args)
+        {
+            if (args is EntityEffectReagentArgs reagentArgs) {
+                if (reagentArgs.Reagent == null)
+                    return;
+
+                // TODO see if this is correct
+                var solutionContainerSystem = reagentArgs.EntityManager.System<SolutionContainerSystem>();
+                if (!solutionContainerSystem.TryGetSolution(reagentArgs.TargetEntity, _solution, out var solutionContainer))
+                    return;
+
+                if (solutionContainerSystem.TryAddReagent(solutionContainer.Value, reagentArgs.Reagent.ID, reagentArgs.Quantity, out var accepted))
+                    reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, accepted);
+
+                return;
+            }
+
+            // TODO: Someone needs to figure out how to do this for non-reagent effects.
+            throw new NotImplementedException();
+        }
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+            Loc.GetString("reagent-effect-guidebook-add-to-solution-reaction", ("chance", Probability));
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/AdjustAlert.cs b/Content.Server/EntityEffects/Effects/AdjustAlert.cs
similarity index 76%
rename from Content.Server/Chemistry/ReagentEffects/AdjustAlert.cs
rename to Content.Server/EntityEffects/Effects/AdjustAlert.cs
index 40858176bd1..3bf57b309d1 100644
--- a/Content.Server/Chemistry/ReagentEffects/AdjustAlert.cs
+++ b/Content.Server/EntityEffects/Effects/AdjustAlert.cs
@@ -1,11 +1,11 @@
-using Content.Shared.Alert;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Alert;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class AdjustAlert : ReagentEffect
+public sealed partial class AdjustAlert : EntityEffect
 {
     /// <summary>
     /// The specific Alert that will be adjusted
@@ -34,15 +34,15 @@ public sealed partial class AdjustAlert : ReagentEffect
     //JUSTIFICATION: This just changes some visuals, doesn't need to be documented.
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => null;
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var alertSys = args.EntityManager.EntitySysManager.GetEntitySystem<AlertsSystem>();
-        if (!args.EntityManager.HasComponent<AlertsComponent>(args.SolutionEntity))
+        if (!args.EntityManager.HasComponent<AlertsComponent>(args.TargetEntity))
             return;
 
         if (Clear && Time <= 0)
         {
-                alertSys.ClearAlert(args.SolutionEntity, AlertType);
+            alertSys.ClearAlert(args.TargetEntity, AlertType);
         }
         else
         {
@@ -52,7 +52,7 @@ public override void Effect(ReagentEffectArgs args)
             if ((ShowCooldown || Clear) && Time > 0)
                 cooldown = (timing.CurTime, timing.CurTime + TimeSpan.FromSeconds(Time));
 
-            alertSys.ShowAlert(args.SolutionEntity, AlertType, cooldown: cooldown, autoRemove: Clear, showCooldown: ShowCooldown);
+            alertSys.ShowAlert(args.TargetEntity, AlertType, cooldown: cooldown, autoRemove: Clear, showCooldown: ShowCooldown);
         }
 
     }
diff --git a/Content.Server/Chemistry/ReagentEffects/AdjustReagent.cs b/Content.Server/EntityEffects/Effects/AdjustReagent.cs
similarity index 58%
rename from Content.Server/Chemistry/ReagentEffects/AdjustReagent.cs
rename to Content.Server/EntityEffects/Effects/AdjustReagent.cs
index 16d69edd9aa..71117d6ec53 100644
--- a/Content.Server/Chemistry/ReagentEffects/AdjustReagent.cs
+++ b/Content.Server/EntityEffects/Effects/AdjustReagent.cs
@@ -1,14 +1,15 @@
 using Content.Shared.Body.Prototypes;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.Chemistry.ReagentEffects
+namespace Content.Server.EntityEffects.Effects
 {
     [UsedImplicitly]
-    public sealed partial class AdjustReagent : ReagentEffect
+    public sealed partial class AdjustReagent : EntityEffect
     {
         /// <summary>
         ///     The reagent ID to remove. Only one of this and <see cref="Group"/> should be active.
@@ -27,36 +28,43 @@ public sealed partial class AdjustReagent : ReagentEffect
         [DataField(required: true)]
         public FixedPoint2 Amount = default!;
 
-        public override void Effect(ReagentEffectArgs args)
+        public override void Effect(EntityEffectBaseArgs args)
         {
-            if (args.Source == null)
-                return;
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                if (reagentArgs.Source == null)
+                    return;
 
-            var amount = Amount;
-            amount *= args.Scale;
+                var amount = Amount;
+                amount *= reagentArgs.Scale;
 
-            if (Reagent != null)
-            {
-                if (amount < 0 && args.Source.ContainsPrototype(Reagent))
-                    args.Source.RemoveReagent(Reagent, -amount);
-                if (amount > 0)
-                    args.Source.AddReagent(Reagent, amount);
-            }
-            else if (Group != null)
-            {
-                var prototypeMan = IoCManager.Resolve<IPrototypeManager>();
-                foreach (var quant in args.Source.Contents.ToArray())
+                if (Reagent != null)
                 {
-                    var proto = prototypeMan.Index<ReagentPrototype>(quant.Reagent.Prototype);
-                    if (proto.Metabolisms != null && proto.Metabolisms.ContainsKey(Group))
+                    if (amount < 0 && reagentArgs.Source.ContainsPrototype(Reagent))
+                        reagentArgs.Source.RemoveReagent(Reagent, -amount);
+                    if (amount > 0)
+                        reagentArgs.Source.AddReagent(Reagent, amount);
+                }
+                else if (Group != null)
+                {
+                    var prototypeMan = IoCManager.Resolve<IPrototypeManager>();
+                    foreach (var quant in reagentArgs.Source.Contents.ToArray())
                     {
-                        if (amount < 0)
-                            args.Source.RemoveReagent(quant.Reagent, amount);
-                        if (amount > 0)
-                            args.Source.AddReagent(quant.Reagent, amount);
+                        var proto = prototypeMan.Index<ReagentPrototype>(quant.Reagent.Prototype);
+                        if (proto.Metabolisms != null && proto.Metabolisms.ContainsKey(Group))
+                        {
+                            if (amount < 0)
+                                reagentArgs.Source.RemoveReagent(quant.Reagent, amount);
+                            if (amount > 0)
+                                reagentArgs.Source.AddReagent(quant.Reagent, amount);
+                        }
                     }
                 }
+                return;
             }
+
+            // TODO: Someone needs to figure out how to do this for non-reagent effects.
+            throw new NotImplementedException();
         }
 
         protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
diff --git a/Content.Server/Chemistry/ReagentEffects/AdjustTemperature.cs b/Content.Server/EntityEffects/Effects/AdjustTemperature.cs
similarity index 56%
rename from Content.Server/Chemistry/ReagentEffects/AdjustTemperature.cs
rename to Content.Server/EntityEffects/Effects/AdjustTemperature.cs
index 9b975720678..3c5c77c309d 100644
--- a/Content.Server/Chemistry/ReagentEffects/AdjustTemperature.cs
+++ b/Content.Server/EntityEffects/Effects/AdjustTemperature.cs
@@ -1,11 +1,11 @@
 using Content.Server.Temperature.Components;
 using Content.Server.Temperature.Systems;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects
+namespace Content.Server.EntityEffects.Effects
 {
-    public sealed partial class AdjustTemperature : ReagentEffect
+    public sealed partial class AdjustTemperature : EntityEffect
     {
         [DataField]
         public float Amount;
@@ -16,16 +16,19 @@ public sealed partial class AdjustTemperature : ReagentEffect
                 ("deltasign", MathF.Sign(Amount)),
                 ("amount", MathF.Abs(Amount)));
 
-        public override void Effect(ReagentEffectArgs args)
+        public override void Effect(EntityEffectBaseArgs args)
         {
-            if (args.EntityManager.TryGetComponent(args.SolutionEntity, out TemperatureComponent? temp))
+            if (args.EntityManager.TryGetComponent(args.TargetEntity, out TemperatureComponent? temp))
             {
                 var sys = args.EntityManager.EntitySysManager.GetEntitySystem<TemperatureSystem>();
                 var amount = Amount;
 
-                amount *= args.Scale;
+                if (args is EntityEffectReagentArgs reagentArgs)
+                {
+                    amount *= reagentArgs.Scale.Float();
+                }
 
-                sys.ChangeHeat(args.SolutionEntity, amount, true, temp);
+                sys.ChangeHeat(args.TargetEntity, amount, true, temp);
             }
         }
     }
diff --git a/Content.Server/EntityEffects/Effects/AreaReactionEffect.cs b/Content.Server/EntityEffects/Effects/AreaReactionEffect.cs
new file mode 100644
index 00000000000..481f1fc27c5
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/AreaReactionEffect.cs
@@ -0,0 +1,91 @@
+using Content.Server.Fluids.EntitySystems;
+using Content.Shared.Audio;
+using Content.Shared.Coordinates.Helpers;
+using Content.Shared.Database;
+using Content.Shared.EntityEffects;
+using Content.Shared.FixedPoint;
+using Content.Shared.Maps;
+using JetBrains.Annotations;
+using Robust.Server.GameObjects;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Server.EntityEffects.Effects;
+
+/// <summary>
+/// Basically smoke and foam reactions.
+/// </summary>
+[UsedImplicitly]
+[DataDefinition]
+public sealed partial class AreaReactionEffect : EntityEffect
+{
+    /// <summary>
+    /// How many seconds will the effect stay, counting after fully spreading.
+    /// </summary>
+    [DataField("duration")] private float _duration = 10;
+
+    /// <summary>
+    /// How many units of reaction for 1 smoke entity.
+    /// </summary>
+    [DataField] public FixedPoint2 OverflowThreshold = FixedPoint2.New(2.5);
+
+    /// <summary>
+    /// The entity prototype that will be spawned as the effect.
+    /// </summary>
+    [DataField("prototypeId", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
+    private string _prototypeId = default!;
+
+    /// <summary>
+    /// Sound that will get played when this reaction effect occurs.
+    /// </summary>
+    [DataField("sound", required: true)] private SoundSpecifier _sound = default!;
+
+    public override bool ShouldLog => true;
+
+    protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+            => Loc.GetString("reagent-effect-guidebook-area-reaction",
+                    ("duration", _duration)
+                );
+
+    public override LogImpact LogImpact => LogImpact.High;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            if (reagentArgs.Source == null)
+                return;
+
+            var spreadAmount = (int) Math.Max(0, Math.Ceiling((reagentArgs.Quantity / OverflowThreshold).Float()));
+            var splitSolution = reagentArgs.Source.SplitSolution(reagentArgs.Source.Volume);
+            var transform = reagentArgs.EntityManager.GetComponent<TransformComponent>(reagentArgs.TargetEntity);
+            var mapManager = IoCManager.Resolve<IMapManager>();
+            var mapSys = reagentArgs.EntityManager.System<MapSystem>();
+            var sys = reagentArgs.EntityManager.System<TransformSystem>();
+            var mapCoords = sys.GetMapCoordinates(reagentArgs.TargetEntity, xform: transform);
+
+            if (!mapManager.TryFindGridAt(mapCoords, out var gridUid, out var grid) ||
+                !mapSys.TryGetTileRef(gridUid, grid, transform.Coordinates, out var tileRef) ||
+                tileRef.Tile.IsSpace())
+            {
+                return;
+            }
+
+            var coords = mapSys.MapToGrid(gridUid, mapCoords);
+            var ent = reagentArgs.EntityManager.SpawnEntity(_prototypeId, coords.SnapToGrid());
+
+            var smoke = reagentArgs.EntityManager.System<SmokeSystem>();
+            smoke.StartSmoke(ent, splitSolution, _duration, spreadAmount);
+
+            var audio = reagentArgs.EntityManager.System<SharedAudioSystem>();
+            audio.PlayPvs(_sound, reagentArgs.TargetEntity, AudioHelpers.WithVariation(0.125f));
+            return;
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/CauseZombieInfection.cs b/Content.Server/EntityEffects/Effects/CauseZombieInfection.cs
similarity index 64%
rename from Content.Server/Chemistry/ReagentEffects/CauseZombieInfection.cs
rename to Content.Server/EntityEffects/Effects/CauseZombieInfection.cs
index 029b1495002..dcbc676fe77 100644
--- a/Content.Server/Chemistry/ReagentEffects/CauseZombieInfection.cs
+++ b/Content.Server/EntityEffects/Effects/CauseZombieInfection.cs
@@ -1,21 +1,20 @@
 using Content.Server.Zombies;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Configuration;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class CauseZombieInfection : ReagentEffect
+public sealed partial class CauseZombieInfection : EntityEffect
 {
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
         => Loc.GetString("reagent-effect-guidebook-cause-zombie-infection", ("chance", Probability));
 
     // Adds the Zombie Infection Components
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var entityManager = args.EntityManager;
-        entityManager.EnsureComponent<ZombifyOnDeathComponent>(args.SolutionEntity);
-        entityManager.EnsureComponent<PendingZombieComponent>(args.SolutionEntity);
+        entityManager.EnsureComponent<ZombifyOnDeathComponent>(args.TargetEntity);
+        entityManager.EnsureComponent<PendingZombieComponent>(args.TargetEntity);
     }
 }
 
diff --git a/Content.Server/Chemistry/ReagentEffects/ChemAddMoodlet.cs b/Content.Server/EntityEffects/Effects/ChemAddMoodlet.cs
similarity index 100%
rename from Content.Server/Chemistry/ReagentEffects/ChemAddMoodlet.cs
rename to Content.Server/EntityEffects/Effects/ChemAddMoodlet.cs
diff --git a/Content.Server/EntityEffects/Effects/ChemCleanBloodstream.cs b/Content.Server/EntityEffects/Effects/ChemCleanBloodstream.cs
new file mode 100644
index 00000000000..b7f6f0dc885
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/ChemCleanBloodstream.cs
@@ -0,0 +1,40 @@
+using Content.Server.Body.Systems;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects;
+
+/// <summary>
+/// Basically smoke and foam reactions.
+/// </summary>
+[UsedImplicitly]
+public sealed partial class ChemCleanBloodstream : EntityEffect
+{
+    [DataField]
+    public float CleanseRate = 3.0f;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-chem-clean-bloodstream", ("chance", Probability));
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        
+        var cleanseRate = CleanseRate;
+
+        var bloodstreamSys = args.EntityManager.System<BloodstreamSystem>();
+
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            if (reagentArgs.Source == null || reagentArgs.Reagent == null)
+                return;
+
+            cleanseRate *= reagentArgs.Scale.Float();
+            bloodstreamSys.FlushChemicals(args.TargetEntity, reagentArgs.Reagent.ID, cleanseRate);
+        }
+        else
+        {
+            bloodstreamSys.FlushChemicals(args.TargetEntity, "", cleanseRate);
+        }
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/ChemHealEyeDamage.cs b/Content.Server/EntityEffects/Effects/ChemHealEyeDamage.cs
new file mode 100644
index 00000000000..42fc9ffa9fb
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/ChemHealEyeDamage.cs
@@ -0,0 +1,31 @@
+using Content.Shared.EntityEffects;
+using Content.Shared.Eye.Blinding.Systems;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects;
+
+/// <summary>
+/// Heal or apply eye damage
+/// </summary>
+[UsedImplicitly]
+public sealed partial class ChemHealEyeDamage : EntityEffect
+{
+    /// <summary>
+    /// How much eye damage to add.
+    /// </summary>
+    [DataField]
+    public int Amount = -1;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-cure-eye-damage", ("chance", Probability), ("deltasign", MathF.Sign(Amount)));
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+            if (reagentArgs.Scale != 1f) // huh?
+                return;
+
+        args.EntityManager.EntitySysManager.GetEntitySystem<BlindableSystem>().AdjustEyeDamage(args.TargetEntity, Amount);
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/ChemVomit.cs b/Content.Server/EntityEffects/Effects/ChemVomit.cs
similarity index 65%
rename from Content.Server/Chemistry/ReagentEffects/ChemVomit.cs
rename to Content.Server/EntityEffects/Effects/ChemVomit.cs
index 851c0adf5f2..0d1bac87d1c 100644
--- a/Content.Server/Chemistry/ReagentEffects/ChemVomit.cs
+++ b/Content.Server/EntityEffects/Effects/ChemVomit.cs
@@ -1,15 +1,15 @@
 using Content.Server.Medical;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects
+namespace Content.Server.EntityEffects.Effects
 {
     /// <summary>
     /// Forces you to vomit.
     /// </summary>
     [UsedImplicitly]
-    public sealed partial class ChemVomit : ReagentEffect
+    public sealed partial class ChemVomit : EntityEffect
     {
         /// How many units of thirst to add each time we vomit
         [DataField]
@@ -21,14 +21,15 @@ public sealed partial class ChemVomit : ReagentEffect
         protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
             => Loc.GetString("reagent-effect-guidebook-chem-vomit", ("chance", Probability));
 
-        public override void Effect(ReagentEffectArgs args)
+        public override void Effect(EntityEffectBaseArgs args)
         {
-            if (args.Scale != 1f)
-                return;
+            if (args is EntityEffectReagentArgs reagentArgs)
+                if (reagentArgs.Scale != 1f)
+                    return;
 
             var vomitSys = args.EntityManager.EntitySysManager.GetEntitySystem<VomitSystem>();
 
-            vomitSys.Vomit(args.SolutionEntity, ThirstAmount, HungerAmount);
+            vomitSys.Vomit(args.TargetEntity, ThirstAmount, HungerAmount);
         }
     }
 }
diff --git a/Content.Server/Chemistry/ReactionEffects/CreateEntityReactionEffect.cs b/Content.Server/EntityEffects/Effects/CreateEntityReactionEffect.cs
similarity index 80%
rename from Content.Server/Chemistry/ReactionEffects/CreateEntityReactionEffect.cs
rename to Content.Server/EntityEffects/Effects/CreateEntityReactionEffect.cs
index 0d5acc17220..5288cb587da 100644
--- a/Content.Server/Chemistry/ReactionEffects/CreateEntityReactionEffect.cs
+++ b/Content.Server/EntityEffects/Effects/CreateEntityReactionEffect.cs
@@ -1,12 +1,11 @@
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.GameObjects;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.Chemistry.ReactionEffects;
+namespace Content.Server.EntityEffects.Effects;
 
 [DataDefinition]
-public sealed partial class CreateEntityReactionEffect : ReagentEffect
+public sealed partial class CreateEntityReactionEffect : EntityEffect
 {
     /// <summary>
     ///     What entity to create.
@@ -26,15 +25,17 @@ public sealed partial class CreateEntityReactionEffect : ReagentEffect
             ("entname", IoCManager.Resolve<IPrototypeManager>().Index<EntityPrototype>(Entity).Name),
             ("amount", Number));
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
-        var transform = args.EntityManager.GetComponent<TransformComponent>(args.SolutionEntity);
+        var transform = args.EntityManager.GetComponent<TransformComponent>(args.TargetEntity);
         var transformSystem = args.EntityManager.System<SharedTransformSystem>();
-        var quantity = Number * args.Quantity.Int();
+        var quantity = (int)Number;
+        if (args is EntityEffectReagentArgs reagentArgs)
+            quantity *= reagentArgs.Quantity.Int();
 
         for (var i = 0; i < quantity; i++)
         {
-            var uid = args.EntityManager.SpawnEntity(Entity, transformSystem.GetMapCoordinates(args.SolutionEntity, xform: transform));
+            var uid = args.EntityManager.SpawnEntity(Entity, transformSystem.GetMapCoordinates(args.TargetEntity, xform: transform));
             transformSystem.AttachToGridOrMap(uid);
 
             // TODO figure out how to properly spawn inside of containers
diff --git a/Content.Server/Chemistry/ReagentEffects/CreateGas.cs b/Content.Server/EntityEffects/Effects/CreateGas.cs
similarity index 62%
rename from Content.Server/Chemistry/ReagentEffects/CreateGas.cs
rename to Content.Server/EntityEffects/Effects/CreateGas.cs
index c1da3c48db3..fb57a43c48d 100644
--- a/Content.Server/Chemistry/ReagentEffects/CreateGas.cs
+++ b/Content.Server/EntityEffects/Effects/CreateGas.cs
@@ -1,12 +1,12 @@
-using Content.Server.Atmos.EntitySystems;
+using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Atmos;
-using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class CreateGas : ReagentEffect
+public sealed partial class CreateGas : EntityEffect
 {
     [DataField(required: true)]
     public Gas Gas = default!;
@@ -31,15 +31,22 @@ public sealed partial class CreateGas : ReagentEffect
 
     public override LogImpact LogImpact => LogImpact.High;
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var atmosSys = args.EntityManager.EntitySysManager.GetEntitySystem<AtmosphereSystem>();
 
-        var tileMix = atmosSys.GetContainingMixture(args.SolutionEntity, false, true);
+        var tileMix = atmosSys.GetContainingMixture(args.TargetEntity, false, true);
 
         if (tileMix != null)
         {
-            tileMix.AdjustMoles(Gas, args.Quantity.Float() * Multiplier);
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                tileMix.AdjustMoles(Gas, reagentArgs.Quantity.Float() * Multiplier);
+            }
+            else
+            {
+                tileMix.AdjustMoles(Gas, Multiplier);
+            }
         }
     }
 }
diff --git a/Content.Server/Chemistry/ReagentEffects/CureZombieInfection.cs b/Content.Server/EntityEffects/Effects/CureZombieInfection.cs
similarity index 73%
rename from Content.Server/Chemistry/ReagentEffects/CureZombieInfection.cs
rename to Content.Server/EntityEffects/Effects/CureZombieInfection.cs
index d56fc115310..066fa872489 100644
--- a/Content.Server/Chemistry/ReagentEffects/CureZombieInfection.cs
+++ b/Content.Server/EntityEffects/Effects/CureZombieInfection.cs
@@ -1,11 +1,10 @@
 using Content.Server.Zombies;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Configuration;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class CureZombieInfection : ReagentEffect
+public sealed partial class CureZombieInfection : EntityEffect
 {
     [DataField]
     public bool Innoculate;
@@ -19,18 +18,18 @@ public sealed partial class CureZombieInfection : ReagentEffect
     }
 
     // Removes the Zombie Infection Components
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var entityManager = args.EntityManager;
-        if (entityManager.HasComponent<IncurableZombieComponent>(args.SolutionEntity))
+        if (entityManager.HasComponent<IncurableZombieComponent>(args.TargetEntity))
             return;
 
-        entityManager.RemoveComponent<ZombifyOnDeathComponent>(args.SolutionEntity);
-        entityManager.RemoveComponent<PendingZombieComponent>(args.SolutionEntity);
+        entityManager.RemoveComponent<ZombifyOnDeathComponent>(args.TargetEntity);
+        entityManager.RemoveComponent<PendingZombieComponent>(args.TargetEntity);
 
         if (Innoculate)
         {
-            entityManager.EnsureComponent<ZombieImmuneComponent>(args.SolutionEntity);
+            entityManager.EnsureComponent<ZombieImmuneComponent>(args.TargetEntity);
         }
     }
 }
diff --git a/Content.Server/Chemistry/ReagentEffects/Drunk.cs b/Content.Server/EntityEffects/Effects/Drunk.cs
similarity index 65%
rename from Content.Server/Chemistry/ReagentEffects/Drunk.cs
rename to Content.Server/EntityEffects/Effects/Drunk.cs
index 6088db5787c..c41c349aaa1 100644
--- a/Content.Server/Chemistry/ReagentEffects/Drunk.cs
+++ b/Content.Server/EntityEffects/Effects/Drunk.cs
@@ -1,10 +1,10 @@
-using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Drunk;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class Drunk : ReagentEffect
+public sealed partial class Drunk : EntityEffect
 {
     /// <summary>
     ///     BoozePower is how long each metabolism cycle will make the drunk effect last for.
@@ -21,13 +21,14 @@ public sealed partial class Drunk : ReagentEffect
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
         => Loc.GetString("reagent-effect-guidebook-drunk", ("chance", Probability));
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var boozePower = BoozePower;
 
-        boozePower *= Math.Max(args.Scale, 1);
-
+        if (args is EntityEffectReagentArgs reagentArgs)
+            boozePower *= reagentArgs.Scale.Float();
+        
         var drunkSys = args.EntityManager.EntitySysManager.GetEntitySystem<SharedDrunkSystem>();
-        drunkSys.TryApplyDrunkenness(args.SolutionEntity, boozePower, SlurSpeech);
+        drunkSys.TryApplyDrunkenness(args.TargetEntity, boozePower, SlurSpeech);
     }
 }
diff --git a/Content.Server/EntityEffects/Effects/Electrocute.cs b/Content.Server/EntityEffects/Effects/Electrocute.cs
new file mode 100644
index 00000000000..f6a5f1a2da7
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Electrocute.cs
@@ -0,0 +1,38 @@
+using Content.Server.Electrocution;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects;
+
+public sealed partial class Electrocute : EntityEffect
+{
+    [DataField] public int ElectrocuteTime = 2;
+
+    [DataField] public int ElectrocuteDamageScale = 5;
+
+    /// <remarks>
+    ///     true - refresh electrocute time,  false - accumulate electrocute time
+    /// </remarks>
+    [DataField] public bool Refresh = true;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-electrocute", ("chance", Probability), ("time", ElectrocuteTime));
+
+    public override bool ShouldLog => true;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            reagentArgs.EntityManager.System<ElectrocutionSystem>().TryDoElectrocution(reagentArgs.TargetEntity, null,
+                Math.Max((reagentArgs.Quantity * ElectrocuteDamageScale).Int(), 1), TimeSpan.FromSeconds(ElectrocuteTime), Refresh, ignoreInsulation: true);
+
+            if (reagentArgs.Reagent != null)
+                reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, reagentArgs.Quantity);
+        } else
+        {
+            args.EntityManager.System<ElectrocutionSystem>().TryDoElectrocution(args.TargetEntity, null,
+                Math.Max(ElectrocuteDamageScale, 1), TimeSpan.FromSeconds(ElectrocuteTime), Refresh, ignoreInsulation: true);
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/Emote.cs b/Content.Server/EntityEffects/Effects/Emote.cs
similarity index 73%
rename from Content.Server/Chemistry/ReagentEffects/Emote.cs
rename to Content.Server/EntityEffects/Effects/Emote.cs
index 7097ea649a5..1d8e27ab0f8 100644
--- a/Content.Server/Chemistry/ReagentEffects/Emote.cs
+++ b/Content.Server/EntityEffects/Effects/Emote.cs
@@ -1,18 +1,18 @@
 using Content.Server.Chat.Systems;
 using Content.Shared.Chat;
 using Content.Shared.Chat.Prototypes;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
 /// <summary>
 ///     Tries to force someone to emote (scream, laugh, etc). Still respects whitelists/blacklists and other limits of the specified emote unless forced.
 /// </summary>
 [UsedImplicitly]
-public sealed partial class Emote : ReagentEffect
+public sealed partial class Emote : EntityEffect
 {
     [DataField("emote", customTypeSerializer: typeof(PrototypeIdSerializer<EmotePrototype>))]
     public string? EmoteId;
@@ -27,16 +27,16 @@ public sealed partial class Emote : ReagentEffect
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
         => null;
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         if (EmoteId == null)
             return;
 
         var chatSys = args.EntityManager.System<ChatSystem>();
         if (ShowInChat)
-            chatSys.TryEmoteWithChat(args.SolutionEntity, EmoteId, ChatTransmitRange.GhostRangeLimit);
+            chatSys.TryEmoteWithChat(args.TargetEntity, EmoteId, ChatTransmitRange.GhostRangeLimit, forceEmote: Force);
         else
-            chatSys.TryEmoteWithoutChat(args.SolutionEntity, EmoteId);
+            chatSys.TryEmoteWithoutChat(args.TargetEntity, EmoteId);
 
     }
 }
diff --git a/Content.Server/Chemistry/ReactionEffects/EmpReactionEffect.cs b/Content.Server/EntityEffects/Effects/EmpReactionEffect.cs
similarity index 67%
rename from Content.Server/Chemistry/ReactionEffects/EmpReactionEffect.cs
rename to Content.Server/EntityEffects/Effects/EmpReactionEffect.cs
index 9a320ffc398..ec7801f0832 100644
--- a/Content.Server/Chemistry/ReactionEffects/EmpReactionEffect.cs
+++ b/Content.Server/EntityEffects/Effects/EmpReactionEffect.cs
@@ -1,16 +1,17 @@
 using Content.Server.Emp;
+using Content.Shared.EntityEffects;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Server.GameObjects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReactionEffects;
+namespace Content.Server.EntityEffects.Effects;
 
 
 [DataDefinition]
-public sealed partial class EmpReactionEffect : ReagentEffect
+public sealed partial class EmpReactionEffect : EntityEffect
 {
     /// <summary>
-    ///     Impulse range per unit of reagent
+    ///     Impulse range per unit of quantity
     /// </summary>
     [DataField("rangePerUnit")]
     public float EmpRangePerUnit = 0.5f;
@@ -36,14 +37,20 @@ public sealed partial class EmpReactionEffect : ReagentEffect
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
             => Loc.GetString("reagent-effect-guidebook-emp-reaction-effect", ("chance", Probability));
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var tSys = args.EntityManager.System<TransformSystem>();
-        var transform = args.EntityManager.GetComponent<TransformComponent>(args.SolutionEntity);
-        var range = MathF.Min((float) (args.Quantity*EmpRangePerUnit), EmpMaxRange);
+        var transform = args.EntityManager.GetComponent<TransformComponent>(args.TargetEntity);
+
+        var range = EmpRangePerUnit;
+
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            range = MathF.Min((float) (reagentArgs.Quantity * EmpRangePerUnit), EmpMaxRange);
+        }
 
         args.EntityManager.System<EmpSystem>()
-            .EmpPulse(tSys.GetMapCoordinates(args.SolutionEntity, xform: transform),
+            .EmpPulse(tSys.GetMapCoordinates(args.TargetEntity, xform: transform),
             range,
             EnergyConsumption,
             DisableDuration);
diff --git a/Content.Server/EntityEffects/Effects/ExplosionReactionEffect.cs b/Content.Server/EntityEffects/Effects/ExplosionReactionEffect.cs
new file mode 100644
index 00000000000..689757d0440
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/ExplosionReactionEffect.cs
@@ -0,0 +1,77 @@
+using Content.Server.Explosion.EntitySystems;
+using Content.Shared.Database;
+using Content.Shared.EntityEffects;
+using Content.Shared.Explosion;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using System.Text.Json.Serialization;
+
+namespace Content.Server.EntityEffects.Effects;
+
+[DataDefinition]
+public sealed partial class ExplosionReactionEffect : EntityEffect
+{
+    /// <summary>
+    ///     The type of explosion. Determines damage types and tile break chance scaling.
+    /// </summary>
+    [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<ExplosionPrototype>))]
+    [JsonIgnore]
+    public string ExplosionType = default!;
+
+    /// <summary>
+    ///     The max intensity the explosion can have at a given tile. Places an upper limit of damage and tile break
+    ///     chance.
+    /// </summary>
+    [DataField]
+    [JsonIgnore]
+    public float MaxIntensity = 5;
+
+    /// <summary>
+    ///     How quickly intensity drops off as you move away from the epicenter
+    /// </summary>
+    [DataField]
+    [JsonIgnore]
+    public float IntensitySlope = 1;
+
+    /// <summary>
+    ///     The maximum total intensity that this chemical reaction can achieve. Basically here to prevent people
+    ///     from creating a nuke by collecting enough potassium and water.
+    /// </summary>
+    /// <remarks>
+    ///     A slope of 1 and MaxTotalIntensity of 100 corresponds to a radius of around 4.5 tiles.
+    /// </remarks>
+    [DataField]
+    [JsonIgnore]
+    public float MaxTotalIntensity = 100;
+
+    /// <summary>
+    ///     The intensity of the explosion per unit reaction.
+    /// </summary>
+    [DataField]
+    [JsonIgnore]
+    public float IntensityPerUnit = 1;
+
+    public override bool ShouldLog => true;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-explosion-reaction-effect", ("chance", Probability));
+    public override LogImpact LogImpact => LogImpact.High;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var intensity = IntensityPerUnit;
+
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            intensity = MathF.Min((float) reagentArgs.Quantity * IntensityPerUnit, MaxTotalIntensity);
+        }
+
+        args.EntityManager.System<ExplosionSystem>()
+            .QueueExplosion(
+            args.TargetEntity,
+            ExplosionType,
+            intensity,
+            IntensitySlope,
+            MaxIntensity);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/ExtinguishReaction.cs b/Content.Server/EntityEffects/Effects/ExtinguishReaction.cs
new file mode 100644
index 00000000000..6d7e7c2fcd8
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/ExtinguishReaction.cs
@@ -0,0 +1,36 @@
+using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects
+{
+    [UsedImplicitly]
+    public sealed partial class ExtinguishReaction : EntityEffect
+    {
+        /// <summary>
+        ///     Amount of firestacks reduced.
+        /// </summary>
+        [DataField]
+        public float FireStacksAdjustment = -1.5f;
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+            => Loc.GetString("reagent-effect-guidebook-extinguish-reaction", ("chance", Probability));
+
+        public override void Effect(EntityEffectBaseArgs args)
+        {
+            if (!args.EntityManager.TryGetComponent(args.TargetEntity, out FlammableComponent? flammable)) return;
+
+            var flammableSystem = args.EntityManager.System<FlammableSystem>();
+            flammableSystem.Extinguish(args.TargetEntity, flammable);
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                flammableSystem.AdjustFireStacks(reagentArgs.TargetEntity, FireStacksAdjustment * (float) reagentArgs.Quantity, flammable);
+            } else
+            {
+                flammableSystem.AdjustFireStacks(args.TargetEntity, FireStacksAdjustment, flammable);
+            }
+        }
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/FlammableReaction.cs b/Content.Server/EntityEffects/Effects/FlammableReaction.cs
new file mode 100644
index 00000000000..edd499ab4a5
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/FlammableReaction.cs
@@ -0,0 +1,45 @@
+using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Database;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects
+{
+    [UsedImplicitly]
+    public sealed partial class FlammableReaction : EntityEffect
+    {
+        [DataField]
+        public float Multiplier = 0.05f;
+
+        [DataField]
+        public float MultiplierOnExisting = 1f;
+
+        public override bool ShouldLog => true;
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+            => Loc.GetString("reagent-effect-guidebook-flammable-reaction", ("chance", Probability));
+
+        public override LogImpact LogImpact => LogImpact.Medium;
+
+        public override void Effect(EntityEffectBaseArgs args)
+        {
+            if (!args.EntityManager.TryGetComponent(args.TargetEntity, out FlammableComponent? flammable))
+                return;
+
+            var multiplier = flammable.FireStacks == 0f ? Multiplier : MultiplierOnExisting;
+            var quantity = 1f;
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                quantity = reagentArgs.Quantity.Float();
+                reagentArgs.EntityManager.System<FlammableSystem>().AdjustFireStacks(args.TargetEntity, quantity * multiplier, flammable);
+                if (reagentArgs.Reagent != null)
+                    reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, reagentArgs.Quantity);
+            } else
+            {
+                args.EntityManager.System<FlammableSystem>().AdjustFireStacks(args.TargetEntity, multiplier, flammable);
+            }
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/HealthChange.cs b/Content.Server/EntityEffects/Effects/HealthChange.cs
similarity index 85%
rename from Content.Server/Chemistry/ReagentEffects/HealthChange.cs
rename to Content.Server/EntityEffects/Effects/HealthChange.cs
index 53933072b6d..7c359b1c59e 100644
--- a/Content.Server/Chemistry/ReagentEffects/HealthChange.cs
+++ b/Content.Server/EntityEffects/Effects/HealthChange.cs
@@ -1,6 +1,6 @@
-using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
+using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Content.Shared.Localizations;
 using Content.Shared.Targeting; // Shitmed
@@ -9,16 +9,16 @@
 using System.Linq;
 using System.Text.Json.Serialization;
 
-namespace Content.Server.Chemistry.ReagentEffects
+namespace Content.Server.EntityEffects.Effects
 {
     /// <summary>
-    /// Default metabolism for medicine reagents.
+    /// Default metabolism used for medicine reagents.
     /// </summary>
     [UsedImplicitly]
-    public sealed partial class HealthChange : ReagentEffect
+    public sealed partial class HealthChange : EntityEffect
     {
         /// <summary>
-        /// Damage to apply every metabolism cycle. Damage Ignores resistances.
+        /// Damage to apply every cycle. Damage Ignores resistances.
         /// </summary>
         [DataField(required: true)]
         [JsonPropertyName("damage")]
@@ -27,6 +27,7 @@ public sealed partial class HealthChange : ReagentEffect
         /// <summary>
         ///     Should this effect scale the damage by the amount of chemical in the solution?
         ///     Useful for touch reactions, like styptic powder or acid.
+        ///     Only usable if the EntityEffectBaseArgs is an EntityEffectReagentArgs.
         /// </summary>
         [DataField]
         [JsonPropertyName("scaleByQuantity")]
@@ -111,13 +112,17 @@ protected override string ReagentEffectGuidebookText(IPrototypeManager prototype
                 ("healsordeals", healsordeals));
         }
 
-        public override void Effect(ReagentEffectArgs args)
+        public override void Effect(EntityEffectBaseArgs args)
         {
-            var scale = ScaleByQuantity ? args.Quantity : FixedPoint2.New(1);
-            scale *= args.Scale;
+            var scale = FixedPoint2.New(1);
+
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                scale = ScaleByQuantity ? reagentArgs.Quantity * reagentArgs.Scale : reagentArgs.Scale;
+            }
 
             args.EntityManager.System<DamageableSystem>().TryChangeDamage(
-                args.SolutionEntity,
+                args.TargetEntity,
                 Damage * scale,
                 IgnoreResistances,
                 interruptsDoAfters: false,
diff --git a/Content.Server/EntityEffects/Effects/Ignite.cs b/Content.Server/EntityEffects/Effects/Ignite.cs
new file mode 100644
index 00000000000..cca2a301fdf
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Ignite.cs
@@ -0,0 +1,31 @@
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Database;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects;
+
+/// <summary>
+///     Ignites a mob.
+/// </summary>
+public sealed partial class Ignite : EntityEffect
+{
+    public override bool ShouldLog => true;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-ignite", ("chance", Probability));
+
+    public override LogImpact LogImpact => LogImpact.Medium;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var flamSys = args.EntityManager.System<FlammableSystem>();
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            flamSys.Ignite(reagentArgs.TargetEntity, reagentArgs.OrganEntity ?? reagentArgs.TargetEntity);
+        } else
+        {
+            flamSys.Ignite(args.TargetEntity, args.TargetEntity);
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/MakeSentient.cs b/Content.Server/EntityEffects/Effects/MakeSentient.cs
similarity index 92%
rename from Content.Server/Chemistry/ReagentEffects/MakeSentient.cs
rename to Content.Server/EntityEffects/Effects/MakeSentient.cs
index 21bfe239232..65da9e72219 100644
--- a/Content.Server/Chemistry/ReagentEffects/MakeSentient.cs
+++ b/Content.Server/EntityEffects/Effects/MakeSentient.cs
@@ -2,7 +2,7 @@
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.Language;
 using Content.Server.Speech.Components;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Content.Shared.Language;
 using Content.Shared.Language.Systems;
 using Content.Shared.Mind.Components;
@@ -11,17 +11,17 @@
 using Content.Shared.Language.Components; //Delta-V - Banning humanoids from becoming ghost roles.
 using Content.Shared.Language.Events;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class MakeSentient : ReagentEffect
+public sealed partial class MakeSentient : EntityEffect
 {
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
         => Loc.GetString("reagent-effect-guidebook-make-sentient", ("chance", Probability));
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var entityManager = args.EntityManager;
-        var uid = args.SolutionEntity;
+        var uid = args.TargetEntity;
 
         // Let affected entities speak normally to make this effect different from, say, the "random sentience" event
         // This also works on entities that already have a mind
diff --git a/Content.Server/EntityEffects/Effects/ModifyBleedAmount.cs b/Content.Server/EntityEffects/Effects/ModifyBleedAmount.cs
new file mode 100644
index 00000000000..58bc304f5ea
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/ModifyBleedAmount.cs
@@ -0,0 +1,35 @@
+using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects;
+
+public sealed partial class ModifyBleedAmount : EntityEffect
+{
+    [DataField]
+    public bool Scaled = false;
+
+    [DataField]
+    public float Amount = -1.0f;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-modify-bleed-amount", ("chance", Probability),
+            ("deltasign", MathF.Sign(Amount)));
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args.EntityManager.TryGetComponent<BloodstreamComponent>(args.TargetEntity, out var blood))
+        {
+            var sys = args.EntityManager.System<BloodstreamSystem>();
+            var amt = Amount;
+            if (args is EntityEffectReagentArgs reagentArgs) {
+                if (Scaled)
+                    amt *= reagentArgs.Quantity.Float();
+                amt *= reagentArgs.Scale.Float();
+            }
+
+            sys.TryModifyBleedAmount(args.TargetEntity, amt, blood);
+        }
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/ModifyBloodLevel.cs b/Content.Server/EntityEffects/Effects/ModifyBloodLevel.cs
new file mode 100644
index 00000000000..d8aca7d2842
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/ModifyBloodLevel.cs
@@ -0,0 +1,37 @@
+using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
+using Content.Shared.EntityEffects;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects;
+
+public sealed partial class ModifyBloodLevel : EntityEffect
+{
+    [DataField]
+    public bool Scaled = false;
+
+    [DataField]
+    public FixedPoint2 Amount = 1.0f;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-modify-blood-level", ("chance", Probability),
+            ("deltasign", MathF.Sign(Amount.Float())));
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args.EntityManager.TryGetComponent<BloodstreamComponent>(args.TargetEntity, out var blood))
+        {
+            var sys = args.EntityManager.System<BloodstreamSystem>();
+            var amt = Amount;
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                if (Scaled)
+                    amt *= reagentArgs.Quantity;
+                amt *= reagentArgs.Scale;
+            }
+
+            sys.TryModifyBloodLevel(args.TargetEntity, amt, blood);
+        }
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/ModifyLungGas.cs b/Content.Server/EntityEffects/Effects/ModifyLungGas.cs
new file mode 100644
index 00000000000..b4f35e3d56b
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/ModifyLungGas.cs
@@ -0,0 +1,49 @@
+using Content.Server.Body.Components;
+using Content.Shared.Atmos;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+using Content.Shared.EntityEffects;
+
+namespace Content.Server.EntityEffects.Effects;
+
+public sealed partial class ModifyLungGas : EntityEffect
+{
+    [DataField("ratios", required: true)]
+    private Dictionary<Gas, float> _ratios = default!;
+
+    // JUSTIFICATION: This is internal magic that players never directly interact with.
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => null;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+
+        LungComponent? lung;
+        float amount = 1f;
+
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            if (!args.EntityManager.TryGetComponent<LungComponent>(reagentArgs.OrganEntity, out var organLung))
+                return;
+            lung = organLung;
+            amount = reagentArgs.Quantity.Float();
+        }
+        else
+        {
+            if (!args.EntityManager.TryGetComponent<LungComponent>(args.TargetEntity, out var organLung)) //Likely needs to be modified to ensure it works correctly
+                return;
+            lung = organLung;
+        }
+
+        if (lung != null)
+        {
+            foreach (var (gas, ratio) in _ratios)
+            {
+                var quantity = ratio * amount / Atmospherics.BreathMolesToReagentMultiplier;
+                if (quantity < 0)
+                    quantity = Math.Max(quantity, -lung.Air[(int) gas]);
+                lung.Air.AdjustMoles(gas, quantity);
+            }
+        }
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/MovespeedModifier.cs b/Content.Server/EntityEffects/Effects/MovespeedModifier.cs
new file mode 100644
index 00000000000..ac1f143e9fb
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/MovespeedModifier.cs
@@ -0,0 +1,78 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.Movement.Systems;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Server.EntityEffects.Effects;
+
+/// <summary>
+/// Default metabolism for stimulants and tranqs. Attempts to find a MovementSpeedModifier on the target,
+/// adding one if not there and to change the movespeed
+/// </summary>
+public sealed partial class MovespeedModifier : EntityEffect
+{
+    /// <summary>
+    /// How much the entities' walk speed is multiplied by.
+    /// </summary>
+    [DataField]
+    public float WalkSpeedModifier { get; set; } = 1;
+
+    /// <summary>
+    /// How much the entities' run speed is multiplied by.
+    /// </summary>
+    [DataField]
+    public float SprintSpeedModifier { get; set; } = 1;
+
+    /// <summary>
+    /// How long the modifier applies (in seconds).
+    /// Is scaled by reagent amount if used with an EntityEffectReagentArgs.
+    /// </summary>
+    [DataField]
+    public float StatusLifetime = 2f;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        return Loc.GetString("reagent-effect-guidebook-movespeed-modifier",
+            ("chance", Probability),
+            ("walkspeed", WalkSpeedModifier),
+            ("time", StatusLifetime));
+    }
+
+    /// <summary>
+    /// Remove reagent at set rate, changes the movespeed modifiers and adds a MovespeedModifierMetabolismComponent if not already there.
+    /// </summary>
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var status = args.EntityManager.EnsureComponent<MovespeedModifierMetabolismComponent>(args.TargetEntity);
+
+        // Only refresh movement if we need to.
+        var modified = !status.WalkSpeedModifier.Equals(WalkSpeedModifier) ||
+                       !status.SprintSpeedModifier.Equals(SprintSpeedModifier);
+
+        status.WalkSpeedModifier = WalkSpeedModifier;
+        status.SprintSpeedModifier = SprintSpeedModifier;
+
+        // only going to scale application time
+        var statusLifetime = StatusLifetime;
+
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            statusLifetime *= reagentArgs.Scale.Float();
+        }
+
+        IncreaseTimer(status, statusLifetime);
+
+        if (modified)
+            args.EntityManager.System<MovementSpeedModifierSystem>().RefreshMovementSpeedModifiers(args.TargetEntity);
+    }
+    public void IncreaseTimer(MovespeedModifierMetabolismComponent status, float time)
+    {
+        var gameTiming = IoCManager.Resolve<IGameTiming>();
+
+        var offsetTime = Math.Max(status.ModifierTimer.TotalSeconds, gameTiming.CurTime.TotalSeconds);
+
+        status.ModifierTimer = TimeSpan.FromSeconds(offsetTime + time);
+        status.Dirty();
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Oxygenate.cs b/Content.Server/EntityEffects/Effects/Oxygenate.cs
new file mode 100644
index 00000000000..60383188c9f
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Oxygenate.cs
@@ -0,0 +1,32 @@
+using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects;
+
+public sealed partial class Oxygenate : EntityEffect
+{
+    [DataField]
+    public float Factor = 1f;
+
+    // JUSTIFICATION: This is internal magic that players never directly interact with.
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => null;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+
+        var multiplier = 1f;
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            multiplier = reagentArgs.Quantity.Float();
+        }
+
+        if (args.EntityManager.TryGetComponent<RespiratorComponent>(args.TargetEntity, out var resp))
+        {
+            var respSys = args.EntityManager.System<RespiratorSystem>();
+            respSys.UpdateSaturation(args.TargetEntity, multiplier * Factor, resp);
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/Paralyze.cs b/Content.Server/EntityEffects/Effects/Paralyze.cs
similarity index 57%
rename from Content.Server/Chemistry/ReagentEffects/Paralyze.cs
rename to Content.Server/EntityEffects/Effects/Paralyze.cs
index 077d1abf2c2..7dd2fdc1057 100644
--- a/Content.Server/Chemistry/ReagentEffects/Paralyze.cs
+++ b/Content.Server/EntityEffects/Effects/Paralyze.cs
@@ -1,10 +1,10 @@
 using Content.Server.Stunnable;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class Paralyze : ReagentEffect
+public sealed partial class Paralyze : EntityEffect
 {
     [DataField] public double ParalyzeTime = 2;
 
@@ -18,12 +18,14 @@ public sealed partial class Paralyze : ReagentEffect
             ("chance", Probability),
             ("time", ParalyzeTime));
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var paralyzeTime = ParalyzeTime;
-        paralyzeTime *= args.Scale;
 
-        EntitySystem.Get<StunSystem>().TryParalyze(args.SolutionEntity, TimeSpan.FromSeconds(paralyzeTime), Refresh);
+        if (args is EntityEffectReagentArgs reagentArgs)
+            paralyzeTime *= (double)reagentArgs.Scale;
+
+        args.EntityManager.System<StunSystem>().TryParalyze(args.TargetEntity, TimeSpan.FromSeconds(paralyzeTime), Refresh);
     }
 }
 
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs
new file mode 100644
index 00000000000..5133fe502ff
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs
@@ -0,0 +1,61 @@
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[ImplicitDataDefinitionForInheritors]
+public abstract partial class PlantAdjustAttribute : EntityEffect
+{
+    [DataField]
+    public float Amount { get; protected set; } = 1;
+
+    /// <summary>
+    /// Localisation key for the name of the adjusted attribute. Used for guidebook descriptions.
+    /// </summary>
+    [DataField]
+    public abstract string GuidebookAttributeName { get; set; }
+
+    /// <summary>
+    /// Whether the attribute in question is a good thing. Used for guidebook descriptions to determine the color of the number.
+    /// </summary>
+    [DataField]
+    public virtual bool GuidebookIsAttributePositive { get; protected set; } = true;
+
+    /// <summary>
+    ///     Checks if the plant holder can metabolize the reagent or not. Checks if it has an alive plant by default.
+    /// </summary>
+    /// <param name="plantHolder">The entity holding the plant</param>
+    /// <param name="plantHolderComponent">The plant holder component</param>
+    /// <param name="entityManager">The entity manager</param>
+    /// <param name="mustHaveAlivePlant">Whether to check if it has an alive plant or not</param>
+    /// <returns></returns>
+    public bool CanMetabolize(EntityUid plantHolder, [NotNullWhen(true)] out PlantHolderComponent? plantHolderComponent,
+        IEntityManager entityManager,
+        bool mustHaveAlivePlant = true)
+    {
+        plantHolderComponent = null;
+
+        if (!entityManager.TryGetComponent(plantHolder, out plantHolderComponent)
+                                || mustHaveAlivePlant && (plantHolderComponent.Seed == null || plantHolderComponent.Dead))
+            return false;
+
+        return true;
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        string color;
+        if (GuidebookIsAttributePositive ^ Amount < 0.0)
+        {
+            color = "green";
+        }
+        else
+        {
+            color = "red";
+        }
+        return Loc.GetString("reagent-effect-guidebook-plant-attribute", ("attribute", Loc.GetString(GuidebookAttributeName)), ("amount", Amount.ToString("0.00")), ("colorName", color), ("chance", Probability));
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs
new file mode 100644
index 00000000000..774f6ec48c6
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs
@@ -0,0 +1,21 @@
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+public sealed partial class PlantAdjustHealth : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-health";
+    
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
+            return;
+
+        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+
+        plantHolderComp.Health += Amount;
+        plantHolder.CheckHealth(args.TargetEntity, plantHolderComp);
+    }
+}
+
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs
new file mode 100644
index 00000000000..bf41a21bcb0
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs
@@ -0,0 +1,16 @@
+using Content.Shared.EntityEffects;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+public sealed partial class PlantAdjustMutationLevel : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-mutation-level";
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
+            return;
+
+        plantHolderComp.MutationLevel += Amount * plantHolderComp.MutationMod;
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs
new file mode 100644
index 00000000000..6ed793e6143
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs
@@ -0,0 +1,19 @@
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+public sealed partial class PlantAdjustMutationMod : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-mutation-mod";
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
+            return;
+
+        plantHolderComp.MutationMod += Amount;
+    }
+}
+
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs
new file mode 100644
index 00000000000..b9389afacdf
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs
@@ -0,0 +1,21 @@
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+public sealed partial class PlantAdjustNutrition : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-nutrition";
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager, mustHaveAlivePlant: false))
+            return;
+
+        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+
+        plantHolder.AdjustNutrient(args.TargetEntity, Amount, plantHolderComp);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs
new file mode 100644
index 00000000000..219529bfc4c
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs
@@ -0,0 +1,20 @@
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+public sealed partial class PlantAdjustPests : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-pests";
+    public override bool GuidebookIsAttributePositive { get; protected set; } = false;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
+            return;
+
+        plantHolderComp.PestLevel += Amount;
+    }
+}
+
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs
new file mode 100644
index 00000000000..ab1baa42850
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs
@@ -0,0 +1,20 @@
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+public sealed partial class PlantAdjustToxins : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-toxins";
+    public override bool GuidebookIsAttributePositive { get; protected set; } = false;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
+            return;
+
+        plantHolderComp.Toxins += Amount;
+    }
+}
+
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs
new file mode 100644
index 00000000000..41774977d54
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs
@@ -0,0 +1,22 @@
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+public sealed partial class PlantAdjustWater : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-water";
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager, mustHaveAlivePlant: false))
+            return;
+
+        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+
+        plantHolder.AdjustWater(args.TargetEntity, Amount, plantHolderComp);
+    }
+}
+
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs
new file mode 100644
index 00000000000..421e31998db
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs
@@ -0,0 +1,19 @@
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+public sealed partial class PlantAdjustWeeds : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-weeds";
+    public override bool GuidebookIsAttributePositive { get; protected set; } = false;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
+            return;
+
+        plantHolderComp.WeedLevel += Amount;
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs
new file mode 100644
index 00000000000..397eace399a
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs
@@ -0,0 +1,22 @@
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+public sealed partial class PlantAffectGrowth : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-growth";
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
+            return;
+
+        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+
+        plantHolder.AffectGrowth(args.TargetEntity, (int) Amount, plantHolderComp);
+    }
+}
+
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs
new file mode 100644
index 00000000000..7fe4b7a1707
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs
@@ -0,0 +1,32 @@
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+[DataDefinition]
+public sealed partial class PlantCryoxadone : EntityEffect
+{
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!args.EntityManager.TryGetComponent(args.TargetEntity, out PlantHolderComponent? plantHolderComp)
+        || plantHolderComp.Seed == null || plantHolderComp.Dead)
+            return;
+
+        var deviation = 0;
+        var seed = plantHolderComp.Seed;
+        var random = IoCManager.Resolve<IRobustRandom>();
+        if (plantHolderComp.Age > seed.Maturation)
+            deviation = (int) Math.Max(seed.Maturation - 1, plantHolderComp.Age - random.Next(7, 10));
+        else
+            deviation = (int) (seed.Maturation / seed.GrowthStages);
+        plantHolderComp.Age -= deviation;
+        plantHolderComp.SkipAging++;
+        plantHolderComp.ForceUpdate = true;
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-cryoxadone", ("chance", Probability));
+}
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs
new file mode 100644
index 00000000000..36b6a833423
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs
@@ -0,0 +1,41 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+[DataDefinition]
+public sealed partial class PlantDiethylamine : EntityEffect
+{
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!args.EntityManager.TryGetComponent(args.TargetEntity, out PlantHolderComponent? plantHolderComp)
+                                || plantHolderComp.Seed == null || plantHolderComp.Dead ||
+                                plantHolderComp.Seed.Immutable)
+            return;
+
+
+        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+
+        var random = IoCManager.Resolve<IRobustRandom>();
+
+        if (random.Prob(0.1f))
+        {
+            plantHolder.EnsureUniqueSeed(args.TargetEntity, plantHolderComp);
+            plantHolderComp.Seed.Lifespan++;
+        }
+
+        if (random.Prob(0.1f))
+        {
+            plantHolder.EnsureUniqueSeed(args.TargetEntity, plantHolderComp);
+            plantHolderComp.Seed.Endurance++;
+        }
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-diethylamine", ("chance", Probability));
+}
+
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs
new file mode 100644
index 00000000000..96d98bfbf2e
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs
@@ -0,0 +1,23 @@
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+[DataDefinition]
+public sealed partial class PlantPhalanximine : EntityEffect
+{
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!args.EntityManager.TryGetComponent(args.TargetEntity, out PlantHolderComponent? plantHolderComp)
+                                || plantHolderComp.Seed == null || plantHolderComp.Dead ||
+                                plantHolderComp.Seed.Immutable)
+            return;
+
+        plantHolderComp.Seed.Viable = true;
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-phalanximine", ("chance", Probability));
+}
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs
new file mode 100644
index 00000000000..695cb96675c
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs
@@ -0,0 +1,53 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+[DataDefinition]
+public sealed partial class RobustHarvest : EntityEffect
+{
+    [DataField]
+    public int PotencyLimit = 50;
+
+    [DataField]
+    public int PotencyIncrease = 3;
+
+    [DataField]
+    public int PotencySeedlessThreshold = 30;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!args.EntityManager.TryGetComponent(args.TargetEntity, out PlantHolderComponent? plantHolderComp)
+                                || plantHolderComp.Seed == null || plantHolderComp.Dead ||
+                                plantHolderComp.Seed.Immutable)
+            return;
+
+
+        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+        var random = IoCManager.Resolve<IRobustRandom>();
+
+        if (plantHolderComp.Seed.Potency < PotencyLimit)
+        {
+            plantHolder.EnsureUniqueSeed(args.TargetEntity, plantHolderComp);
+            plantHolderComp.Seed.Potency = Math.Min(plantHolderComp.Seed.Potency + PotencyIncrease, PotencyLimit);
+
+            if (plantHolderComp.Seed.Potency > PotencySeedlessThreshold)
+            {
+                plantHolderComp.Seed.Seedless = true;
+            }
+        }
+        else if (plantHolderComp.Seed.Yield > 1 && random.Prob(0.1f))
+        {
+            // Too much of a good thing reduces yield
+            plantHolder.EnsureUniqueSeed(args.TargetEntity, plantHolderComp);
+            plantHolderComp.Seed.Yield--;
+        }
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-robust-harvest", ("seedlesstreshold", PotencySeedlessThreshold), ("limit", PotencyLimit), ("increase", PotencyIncrease), ("chance", Probability));
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/Polymorph.cs b/Content.Server/EntityEffects/Effects/Polymorph.cs
similarity index 80%
rename from Content.Server/Chemistry/ReagentEffects/Polymorph.cs
rename to Content.Server/EntityEffects/Effects/Polymorph.cs
index fea372125ee..00a5c6613d0 100644
--- a/Content.Server/Chemistry/ReagentEffects/Polymorph.cs
+++ b/Content.Server/EntityEffects/Effects/Polymorph.cs
@@ -1,13 +1,14 @@
 using Content.Server.Polymorph.Components;
 using Content.Server.Polymorph.Systems;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Content.Shared.Polymorph;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Content.Shared.EntityEffects;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class Polymorph : ReagentEffect
+public sealed partial class Polymorph : EntityEffect
 {
     /// <summary>
     ///     What polymorph prototype is used on effect
@@ -20,10 +21,10 @@ public sealed partial class Polymorph : ReagentEffect
             ("chance", Probability), ("entityname",
                 prototype.Index<EntityPrototype>(prototype.Index<PolymorphPrototype>(PolymorphPrototype).Configuration.Entity).Name));
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var entityManager = args.EntityManager;
-        var uid = args.SolutionEntity;
+        var uid = args.TargetEntity;
         var polySystem = entityManager.System<PolymorphSystem>();
 
         // Make it into a prototype
diff --git a/Content.Server/Chemistry/ReagentEffects/PopupMessage.cs b/Content.Server/EntityEffects/Effects/PopupMessage.cs
similarity index 60%
rename from Content.Server/Chemistry/ReagentEffects/PopupMessage.cs
rename to Content.Server/EntityEffects/Effects/PopupMessage.cs
index 8278e95c1da..ac22b13051b 100644
--- a/Content.Server/Chemistry/ReagentEffects/PopupMessage.cs
+++ b/Content.Server/EntityEffects/Effects/PopupMessage.cs
@@ -1,12 +1,11 @@
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Content.Shared.Popups;
-using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
-namespace Content.Server.Chemistry.ReagentEffects
+namespace Content.Server.EntityEffects.Effects
 {
-    public sealed partial class PopupMessage : ReagentEffect
+    public sealed partial class PopupMessage : EntityEffect
     {
         [DataField(required: true)]
         public string[] Messages = default!;
@@ -21,20 +20,30 @@ public sealed partial class PopupMessage : ReagentEffect
         protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
             => null;
 
-        public override void Effect(ReagentEffectArgs args)
+        public override void Effect(EntityEffectBaseArgs args)
         {
             var popupSys = args.EntityManager.EntitySysManager.GetEntitySystem<SharedPopupSystem>();
             var random = IoCManager.Resolve<IRobustRandom>();
 
             var msg = random.Pick(Messages);
-            var msgArgs = new (string, object)[] {
-                ("entity", args.SolutionEntity),
-                ("organ", args.OrganEntity.GetValueOrDefault()),
+            var msgArgs = new (string, object)[]
+            {
+                ("entity", args.TargetEntity),
             };
+
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                msgArgs = new (string, object)[]
+                {
+                    ("entity", reagentArgs.TargetEntity),
+                    ("organ", reagentArgs.OrganEntity.GetValueOrDefault()),
+                };
+            }
+
             if (Type == PopupRecipients.Local)
-                popupSys.PopupEntity(Loc.GetString(msg, msgArgs), args.SolutionEntity, args.SolutionEntity, VisualType);
+                popupSys.PopupEntity(Loc.GetString(msg, msgArgs), args.TargetEntity, args.TargetEntity, VisualType);
             else if (Type == PopupRecipients.Pvs)
-                popupSys.PopupEntity(Loc.GetString(msg, msgArgs), args.SolutionEntity, VisualType);
+                popupSys.PopupEntity(Loc.GetString(msg, msgArgs), args.TargetEntity, VisualType);
         }
     }
 
diff --git a/Content.Server/Chemistry/ReagentEffects/PurifyEvil.cs b/Content.Server/EntityEffects/Effects/PurifyEvil.cs
similarity index 100%
rename from Content.Server/Chemistry/ReagentEffects/PurifyEvil.cs
rename to Content.Server/EntityEffects/Effects/PurifyEvil.cs
diff --git a/Content.Server/Chemistry/ReagentEffects/ReduceRotting.cs b/Content.Server/EntityEffects/Effects/ReduceRotting.cs
similarity index 61%
rename from Content.Server/Chemistry/ReagentEffects/ReduceRotting.cs
rename to Content.Server/EntityEffects/Effects/ReduceRotting.cs
index cea4f853321..5c00492744d 100644
--- a/Content.Server/Chemistry/ReagentEffects/ReduceRotting.cs
+++ b/Content.Server/EntityEffects/Effects/ReduceRotting.cs
@@ -1,15 +1,16 @@
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Content.Server.Atmos.Rotting;
 
-namespace Content.Server.Chemistry.ReagentEffects
+namespace Content.Server.EntityEffects.Effects
 {
     /// <summary>
     /// Reduces the rotting accumulator on the patient, making them revivable.
     /// </summary>
     [UsedImplicitly]
-    public sealed partial class ReduceRotting : ReagentEffect
+    public sealed partial class ReduceRotting : EntityEffect
     {
         [DataField("seconds")]
         public double RottingAmount = 10;
@@ -18,14 +19,17 @@ public sealed partial class ReduceRotting : ReagentEffect
             => Loc.GetString("reagent-effect-guidebook-reduce-rotting",
                 ("chance", Probability),
                 ("time", RottingAmount));
-        public override void Effect(ReagentEffectArgs args)
+        public override void Effect(EntityEffectBaseArgs args)
         {
-            if (args.Scale != 1f)
-                return;
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                if (reagentArgs.Scale != 1f)
+                    return;
+            }
 
             var rottingSys = args.EntityManager.EntitySysManager.GetEntitySystem<RottingSystem>();
 
-            rottingSys.ReduceAccumulator(args.SolutionEntity, TimeSpan.FromSeconds(RottingAmount));
+            rottingSys.ReduceAccumulator(args.TargetEntity, TimeSpan.FromSeconds(RottingAmount));
         }
     }
 }
diff --git a/Content.Server/Chemistry/ReagentEffects/ResetNarcolepsy.cs b/Content.Server/EntityEffects/Effects/ResetNarcolepsy.cs
similarity index 63%
rename from Content.Server/Chemistry/ReagentEffects/ResetNarcolepsy.cs
rename to Content.Server/EntityEffects/Effects/ResetNarcolepsy.cs
index 2893505fc85..40a9c982515 100644
--- a/Content.Server/Chemistry/ReagentEffects/ResetNarcolepsy.cs
+++ b/Content.Server/EntityEffects/Effects/ResetNarcolepsy.cs
@@ -1,15 +1,16 @@
 using Content.Server.Traits.Assorted;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
 /// <summary>
 /// Reset narcolepsy timer
 /// </summary>
 [UsedImplicitly]
-public sealed partial class ResetNarcolepsy : ReagentEffect
+public sealed partial class ResetNarcolepsy : EntityEffect
 {
     /// <summary>
     /// The # of seconds the effect resets the narcolepsy timer to
@@ -20,11 +21,12 @@ public sealed partial class ResetNarcolepsy : ReagentEffect
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
         => Loc.GetString("reagent-effect-guidebook-reset-narcolepsy", ("chance", Probability));
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
-        if (args.Scale != 1f)
-            return;
+        if (args is EntityEffectReagentArgs reagentArgs)
+            if (reagentArgs.Scale != 1f)
+                return;
 
-        args.EntityManager.EntitySysManager.GetEntitySystem<NarcolepsySystem>().AdjustNarcolepsyTimer(args.SolutionEntity, TimerReset);
+        args.EntityManager.EntitySysManager.GetEntitySystem<NarcolepsySystem>().AdjustNarcolepsyTimer(args.TargetEntity, TimerReset);
     }
 }
diff --git a/Content.Server/Chemistry/ReagentEffects/SatiateHunger.cs b/Content.Server/EntityEffects/Effects/SatiateHunger.cs
similarity index 53%
rename from Content.Server/Chemistry/ReagentEffects/SatiateHunger.cs
rename to Content.Server/EntityEffects/Effects/SatiateHunger.cs
index be772022556..dd58654dffc 100644
--- a/Content.Server/Chemistry/ReagentEffects/SatiateHunger.cs
+++ b/Content.Server/EntityEffects/Effects/SatiateHunger.cs
@@ -1,31 +1,40 @@
-using Content.Server.Nutrition.Components;
+using Content.Server.Nutrition.Components;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects
+namespace Content.Server.EntityEffects.Effects
 {
     /// <summary>
     /// Attempts to find a HungerComponent on the target,
     /// and to update it's hunger values.
     /// </summary>
-    public sealed partial class SatiateHunger : ReagentEffect
+    public sealed partial class SatiateHunger : EntityEffect
     {
         private const float DefaultNutritionFactor = 3.0f;
 
         /// <summary>
-        ///     How much hunger is satiated when 1u of the reagent is metabolized
+        ///     How much hunger is satiated.
+        ///     Is multiplied by quantity if used with EntityEffectReagentArgs.
         /// </summary>
         [DataField("factor")] public float NutritionFactor { get; set; } = DefaultNutritionFactor;
 
         //Remove reagent at set rate, satiate hunger if a HungerComponent can be found
-        public override void Effect(ReagentEffectArgs args)
+        public override void Effect(EntityEffectBaseArgs args)
         {
             var entman = args.EntityManager;
-            if (!entman.TryGetComponent(args.SolutionEntity, out HungerComponent? hunger))
+            if (!entman.TryGetComponent(args.TargetEntity, out HungerComponent? hunger))
                 return;
-            entman.System<HungerSystem>().ModifyHunger(args.SolutionEntity, NutritionFactor * (float) args.Quantity, hunger);
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                entman.System<HungerSystem>().ModifyHunger(reagentArgs.TargetEntity, NutritionFactor * (float) reagentArgs.Quantity, hunger);
+            }
+            else
+            {
+                entman.System<HungerSystem>().ModifyHunger(args.TargetEntity, NutritionFactor, hunger);
+            }
         }
 
         protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
diff --git a/Content.Server/EntityEffects/Effects/SatiateThirst.cs b/Content.Server/EntityEffects/Effects/SatiateThirst.cs
new file mode 100644
index 00000000000..d0dbe4371b9
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/SatiateThirst.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects;
+
+/// <summary>
+/// Default metabolism for drink reagents. Attempts to find a ThirstComponent on the target,
+/// and to update it's thirst values.
+/// </summary>
+public sealed partial class SatiateThirst : EntityEffect
+{
+    private const float DefaultHydrationFactor = 3.0f;
+
+    /// How much thirst is satiated each tick. Not currently tied to
+    /// rate or anything.
+    [DataField("factor")]
+    public float HydrationFactor { get; set; } = DefaultHydrationFactor;
+
+    /// Satiate thirst if a ThirstComponent can be found
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var uid = args.TargetEntity;
+        if (args.EntityManager.TryGetComponent(uid, out ThirstComponent? thirst))
+            args.EntityManager.System<ThirstSystem>().ModifyThirst(uid, thirst, HydrationFactor);
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-satiate-thirst", ("chance", Probability), ("relative",  HydrationFactor / DefaultHydrationFactor));
+}
diff --git a/Content.Server/EntityEffects/Effects/SolutionTemperatureEffects.cs b/Content.Server/EntityEffects/Effects/SolutionTemperatureEffects.cs
new file mode 100644
index 00000000000..85c20dbcd11
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/SolutionTemperatureEffects.cs
@@ -0,0 +1,144 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects;
+
+/// <summary>
+///     Sets the temperature of the solution involved with the reaction to a new value.
+/// </summary>
+[DataDefinition]
+public sealed partial class SetSolutionTemperatureEffect : EntityEffect
+{
+    /// <summary>
+    ///     The temperature to set the solution to.
+    /// </summary>
+    [DataField("temperature", required: true)] private float _temperature;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-set-solution-temperature-effect",
+            ("chance", Probability), ("temperature", _temperature));
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            var solution = reagentArgs.Source;
+            if (solution == null)
+                return;
+
+            solution.Temperature = _temperature;
+
+            return;
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+}
+
+/// <summary>
+///     Adjusts the temperature of the solution involved in the reaction.
+/// </summary>
+[DataDefinition]
+public sealed partial class AdjustSolutionTemperatureEffect : EntityEffect
+{
+    /// <summary>
+    ///     The change in temperature.
+    /// </summary>
+    [DataField("delta", required: true)] private float _delta;
+
+    /// <summary>
+    ///     The minimum temperature this effect can reach.
+    /// </summary>
+    [DataField("minTemp")] private float _minTemp = 0.0f;
+
+    /// <summary>
+    ///     The maximum temperature this effect can reach.
+    /// </summary>
+    [DataField("maxTemp")] private float _maxTemp = float.PositiveInfinity;
+
+    /// <summary>
+    ///     If true, then scale ranges by intensity. If not, the ranges are the same regardless of reactant amount.
+    /// </summary>
+    [DataField("scaled")] private bool _scaled;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-adjust-solution-temperature-effect",
+            ("chance", Probability), ("deltasign", MathF.Sign(_delta)), ("mintemp", _minTemp), ("maxtemp", _maxTemp));
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            var solution = reagentArgs.Source;
+            if (solution == null || solution.Volume == 0)
+                return;
+
+            var deltaT = _scaled ? _delta * (float) reagentArgs.Quantity : _delta;
+            solution.Temperature = Math.Clamp(solution.Temperature + deltaT, _minTemp, _maxTemp);
+
+            return;
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+}
+
+/// <summary>
+///     Adjusts the thermal energy of the solution involved in the reaction.
+/// </summary>
+public sealed partial class AdjustSolutionThermalEnergyEffect : EntityEffect
+{
+    /// <summary>
+    ///     The change in energy.
+    /// </summary>
+    [DataField("delta", required: true)] private float _delta;
+
+    /// <summary>
+    ///     The minimum temperature this effect can reach.
+    /// </summary>
+    [DataField("minTemp")] private float _minTemp = 0.0f;
+
+    /// <summary>
+    ///     The maximum temperature this effect can reach.
+    /// </summary>
+    [DataField("maxTemp")] private float _maxTemp = float.PositiveInfinity;
+
+    /// <summary>
+    ///     If true, then scale ranges by intensity. If not, the ranges are the same regardless of reactant amount.
+    /// </summary>
+    [DataField("scaled")] private bool _scaled;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            var solution = reagentArgs.Source;
+            if (solution == null || solution.Volume == 0)
+                return;
+
+            if (_delta > 0 && solution.Temperature >= _maxTemp)
+                return;
+            if (_delta < 0 && solution.Temperature <= _minTemp)
+                return;
+
+            var heatCap = solution.GetHeatCapacity(null);
+            var deltaT = _scaled
+                ? _delta / heatCap * (float) reagentArgs.Quantity
+                : _delta / heatCap;
+
+            solution.Temperature = Math.Clamp(solution.Temperature + deltaT, _minTemp, _maxTemp);
+
+            return;
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-adjust-solution-temperature-effect",
+            ("chance", Probability), ("deltasign", MathF.Sign(_delta)), ("mintemp", _minTemp), ("maxtemp", _maxTemp));
+}
diff --git a/Content.Server/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs b/Content.Server/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs
new file mode 100644
index 00000000000..bb9bbf34469
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs
@@ -0,0 +1,77 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
+using Content.Shared.StatusEffect;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects.StatusEffects;
+
+/// <summary>
+///     Adds a generic status effect to the entity,
+///     not worrying about things like how to affect the time it lasts for
+///     or component fields or anything. Just adds a component to an entity
+///     for a given time. Easy.
+/// </summary>
+/// <remarks>
+///     Can be used for things like adding accents or something. I don't know. Go wild.
+/// </remarks>
+[UsedImplicitly]
+public sealed partial class GenericStatusEffect : EntityEffect
+{
+    [DataField(required: true)]
+    public string Key = default!;
+
+    [DataField]
+    public string Component = String.Empty;
+
+    [DataField]
+    public float Time = 2.0f;
+
+    /// <remarks>
+    ///     true - refresh status effect time,  false - accumulate status effect time
+    /// </remarks>
+    [DataField]
+    public bool Refresh = true;
+
+    /// <summary>
+    ///     Should this effect add the status effect, remove time from it, or set its cooldown?
+    /// </summary>
+    [DataField]
+    public StatusEffectMetabolismType Type = StatusEffectMetabolismType.Add;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var statusSys = args.EntityManager.EntitySysManager.GetEntitySystem<StatusEffectsSystem>();
+
+        var time = Time;
+        if (args is EntityEffectReagentArgs reagentArgs)
+            time *= reagentArgs.Scale.Float();
+
+        if (Type == StatusEffectMetabolismType.Add && Component != String.Empty)
+        {
+            statusSys.TryAddStatusEffect(args.TargetEntity, Key, TimeSpan.FromSeconds(time), Refresh, Component);
+        }
+        else if (Type == StatusEffectMetabolismType.Remove)
+        {
+            statusSys.TryRemoveTime(args.TargetEntity, Key, TimeSpan.FromSeconds(time));
+        }
+        else if (Type == StatusEffectMetabolismType.Set)
+        {
+            statusSys.TrySetTime(args.TargetEntity, Key, TimeSpan.FromSeconds(time));
+        }
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString(
+        "reagent-effect-guidebook-status-effect",
+        ("chance", Probability),
+        ("type", Type),
+        ("time", Time),
+        ("key", $"reagent-effect-status-effect-{Key}"));
+}
+
+public enum StatusEffectMetabolismType
+{
+    Add,
+    Remove,
+    Set
+}
diff --git a/Content.Server/EntityEffects/Effects/StatusEffects/Jitter.cs b/Content.Server/EntityEffects/Effects/StatusEffects/Jitter.cs
new file mode 100644
index 00000000000..dbca4fad588
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/StatusEffects/Jitter.cs
@@ -0,0 +1,42 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
+using Content.Shared.Jittering;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects.StatusEffects;
+
+/// <summary>
+///     Adds the jitter status effect to a mob.
+///     This doesn't use generic status effects because it needs to
+///     take in some parameters that JitterSystem needs.
+/// </summary>
+public sealed partial class Jitter : EntityEffect
+{
+    [DataField]
+    public float Amplitude = 10.0f;
+
+    [DataField]
+    public float Frequency = 4.0f;
+
+    [DataField]
+    public float Time = 2.0f;
+
+    /// <remarks>
+    ///     true - refresh jitter time,  false - accumulate jitter time
+    /// </remarks>
+    [DataField]
+    public bool Refresh = true;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var time = Time;
+        if (args is EntityEffectReagentArgs reagentArgs)
+            time *= reagentArgs.Scale.Float();
+
+        args.EntityManager.EntitySysManager.GetEntitySystem<SharedJitteringSystem>()
+            .DoJitter(args.TargetEntity, TimeSpan.FromSeconds(time), Refresh, Amplitude, Frequency);
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("reagent-effect-guidebook-jittering", ("chance", Probability));
+}
diff --git a/Content.Server/EntityEffects/Effects/WashCreamPieReaction.cs b/Content.Server/EntityEffects/Effects/WashCreamPieReaction.cs
new file mode 100644
index 00000000000..67bfac6335d
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/WashCreamPieReaction.cs
@@ -0,0 +1,22 @@
+using Content.Server.Nutrition.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
+using Content.Shared.Nutrition.Components;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects;
+
+[UsedImplicitly]
+public sealed partial class WashCreamPieReaction : EntityEffect
+{
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-wash-cream-pie-reaction", ("chance", Probability));
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!args.EntityManager.TryGetComponent(args.TargetEntity, out CreamPiedComponent? creamPied)) return;
+
+        args.EntityManager.System<CreamPieSystem>().SetCreamPied(args.TargetEntity, creamPied, false);
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/WearableReaction.cs b/Content.Server/EntityEffects/Effects/WearableReaction.cs
similarity index 50%
rename from Content.Server/Chemistry/ReagentEffects/WearableReaction.cs
rename to Content.Server/EntityEffects/Effects/WearableReaction.cs
index d9f8414995d..9655bbc073f 100644
--- a/Content.Server/Chemistry/ReagentEffects/WearableReaction.cs
+++ b/Content.Server/EntityEffects/Effects/WearableReaction.cs
@@ -1,17 +1,19 @@
 using Content.Shared.Inventory;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects.Effects;
 
 /// <summary>
-/// A reaction effect that consumes the required amount of reagent and spawns PrototypeID in the
-/// entity's Slot. Used to implement the water droplet effect for arachnids.
+/// A reaction effect that spawns a PrototypeID in the entity's Slot, and attempts to consume the reagent if EntityEffectReagentArgs.
+/// Used to implement the water droplet effect for arachnids.
 /// </summary>
-public sealed partial class WearableReaction : ReagentEffect
+public sealed partial class WearableReaction : EntityEffect
 {
     /// <summary>
     /// Minimum quantity of reagent required to trigger this effect.
+    /// Only used with EntityEffectReagentArgs.
     /// </summary>
     [DataField]
     public float AmountThreshold = 1f;
@@ -30,13 +32,17 @@ public sealed partial class WearableReaction : ReagentEffect
 
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => null;
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
-        if (args.Reagent == null || args.Quantity < AmountThreshold)
-            return;
-
         // SpawnItemInSlot returns false if slot is already occupied
-        if (args.EntityManager.System<InventorySystem>().SpawnItemInSlot(args.SolutionEntity, Slot, PrototypeID))
-            args.Source?.RemoveReagent(args.Reagent.ID, AmountThreshold);
+        if (args.EntityManager.System<InventorySystem>().SpawnItemInSlot(args.TargetEntity, Slot, PrototypeID))
+        {
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                if (reagentArgs.Reagent == null || reagentArgs.Quantity < AmountThreshold)
+                    return;
+                reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, AmountThreshold);
+            }
+        }
     }
 }
diff --git a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
index ae170842a0c..62d04db492f 100644
--- a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
@@ -2,7 +2,7 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Chemistry.ReactionEffects;
+using Content.Server.EntityEffects.Effects;
 using Content.Server.Spreader;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
diff --git a/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs b/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs
index 7e107ce1a5a..8fd088408c0 100644
--- a/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs
+++ b/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs
@@ -5,6 +5,7 @@
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
+using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Prototypes;
 
@@ -40,8 +41,8 @@ public static void PublishJson(StreamWriter file)
             WriteIndented = true,
             Converters =
             {
-                new UniversalJsonConverter<ReagentEffect>(),
-                new UniversalJsonConverter<ReagentEffectCondition>(),
+                new UniversalJsonConverter<EntityEffect>(),
+                new UniversalJsonConverter<EntityEffectCondition>(),
                 new UniversalJsonConverter<ReagentEffectsEntry>(),
                 new UniversalJsonConverter<DamageSpecifier>(),
                 new FixedPointJsonConverter()
diff --git a/Content.Server/GuideGenerator/ReactionJsonGenerator.cs b/Content.Server/GuideGenerator/ReactionJsonGenerator.cs
index 123dd5f8eb3..06c230d6071 100644
--- a/Content.Server/GuideGenerator/ReactionJsonGenerator.cs
+++ b/Content.Server/GuideGenerator/ReactionJsonGenerator.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Text.Json;
 using Content.Shared.Chemistry.Reaction;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.GuideGenerator;
@@ -24,7 +24,7 @@ public static void PublishJson(StreamWriter file)
             WriteIndented = true,
             Converters =
             {
-                new UniversalJsonConverter<ReagentEffect>(),
+                new UniversalJsonConverter<EntityEffect>(),
             }
         };
 
diff --git a/Content.Server/GuideGenerator/ReagentEntry.cs b/Content.Server/GuideGenerator/ReagentEntry.cs
index ab9e7582060..8b597ad61bc 100644
--- a/Content.Server/GuideGenerator/ReagentEntry.cs
+++ b/Content.Server/GuideGenerator/ReagentEntry.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Body.Prototypes;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.GuideGenerator;
@@ -61,7 +62,7 @@ public sealed class ReactionEntry
     public Dictionary<string, float> Products { get; }
 
     [JsonPropertyName("effects")]
-    public List<ReagentEffect> Effects { get; }
+    public List<EntityEffect> Effects { get; }
 
     public ReactionEntry(ReactionPrototype proto)
     {
diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
index 6781d07956b..3b4afc2d6ad 100644
--- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
@@ -1,7 +1,7 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Chemistry.ReagentEffects;
+using Content.Server.EntityEffects.Effects;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Forensics;
 using Content.Server.Inventory;
@@ -17,6 +17,7 @@
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
+using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
diff --git a/Content.Server/Tiles/LavaComponent.cs b/Content.Server/Tiles/LavaComponent.cs
deleted file mode 100644
index 1f36e8ffb05..00000000000
--- a/Content.Server/Tiles/LavaComponent.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Robust.Shared.Audio;
-using Robust.Shared.GameStates;
-
-namespace Content.Server.Tiles;
-
-/// <summary>
-/// Applies flammable and damage while vaulting.
-/// </summary>
-[RegisterComponent, Access(typeof(LavaSystem))]
-public sealed partial class LavaComponent : Component
-{
-    /// <summary>
-    /// Sound played if something disintegrates in lava.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("soundDisintegration")]
-    public SoundSpecifier DisintegrationSound = new SoundPathSpecifier("/Audio/Effects/lightburn.ogg");
-
-    /// <summary>
-    /// How many fire stacks are applied per second.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("fireStacks")]
-    public float FireStacks = 1.25f;
-}
diff --git a/Content.Server/Tiles/LavaSystem.cs b/Content.Server/Tiles/LavaSystem.cs
deleted file mode 100644
index 51bd6f8475f..00000000000
--- a/Content.Server/Tiles/LavaSystem.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Content.Server.Atmos.Components;
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.StepTrigger.Systems;
-
-namespace Content.Server.Tiles;
-
-public sealed class LavaSystem : EntitySystem
-{
-    [Dependency] private readonly FlammableSystem _flammable = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<LavaComponent, StepTriggeredOffEvent>(OnLavaStepTriggered);
-        SubscribeLocalEvent<LavaComponent, StepTriggerAttemptEvent>(OnLavaStepTriggerAttempt);
-    }
-
-    private void OnLavaStepTriggerAttempt(EntityUid uid, LavaComponent component, ref StepTriggerAttemptEvent args)
-    {
-        if (!HasComp<FlammableComponent>(args.Tripper))
-            return;
-
-        args.Continue = true;
-    }
-
-    private void OnLavaStepTriggered(EntityUid uid, LavaComponent component, ref StepTriggeredOffEvent args)
-    {
-        var otherUid = args.Tripper;
-
-        if (TryComp<FlammableComponent>(otherUid, out var flammable))
-        {
-            // Apply the fury of a thousand suns
-            var multiplier = flammable.FireStacks == 0f ? 5f : 1f;
-            _flammable.AdjustFireStacks(otherUid, component.FireStacks * multiplier, flammable);
-            _flammable.Ignite(otherUid, uid, flammable);
-        }
-    }
-}
diff --git a/Content.Server/Tiles/TileEntityEffectComponent.cs b/Content.Server/Tiles/TileEntityEffectComponent.cs
new file mode 100644
index 00000000000..4201af47f9e
--- /dev/null
+++ b/Content.Server/Tiles/TileEntityEffectComponent.cs
@@ -0,0 +1,19 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Server.Tiles;
+
+/// <summary>
+/// Applies effects upon stepping onto a tile.
+/// </summary>
+[RegisterComponent, Access(typeof(TileEntityEffectSystem))]
+public sealed partial class TileEntityEffectComponent : Component
+{
+    /// <summary>
+    /// List of effects that should be applied.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField]
+    public List<EntityEffect> Effects = default!;
+}
diff --git a/Content.Server/Tiles/TileEntityEffectSystem.cs b/Content.Server/Tiles/TileEntityEffectSystem.cs
new file mode 100644
index 00000000000..7149f16e1ad
--- /dev/null
+++ b/Content.Server/Tiles/TileEntityEffectSystem.cs
@@ -0,0 +1,32 @@
+using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.StepTrigger.Systems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
+
+namespace Content.Server.Tiles;
+
+public sealed class TileEntityEffectSystem : EntitySystem
+{
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<TileEntityEffectComponent, StepTriggeredOffEvent>(OnTileStepTriggered);
+        SubscribeLocalEvent<TileEntityEffectComponent, StepTriggerAttemptEvent>(OnTileStepTriggerAttempt);
+    }
+    private void OnTileStepTriggerAttempt(Entity<TileEntityEffectComponent> ent, ref StepTriggerAttemptEvent args)
+    {
+        args.Continue = true;
+    }
+
+    private void OnTileStepTriggered(Entity<TileEntityEffectComponent> ent, ref StepTriggeredOffEvent args)
+    {
+        var otherUid = args.Tripper;
+
+        foreach (var effect in ent.Comp.Effects)
+        {
+            effect.Effect(new EntityEffectBaseArgs(otherUid, EntityManager));
+        }
+    }
+}
diff --git a/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs b/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
index f2b13d34881..f9dfa9b2734 100644
--- a/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
+++ b/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
+using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Prototypes;
@@ -197,9 +198,7 @@ private List<string> PerformReaction(Entity<SolutionComponent> soln, ReactionPro
 
         private void OnReaction(Entity<SolutionComponent> soln, ReactionPrototype reaction, ReagentPrototype? reagent, FixedPoint2 unitReactions)
         {
-            var args = new ReagentEffectArgs(soln, null, soln.Comp.Solution,
-                reagent,
-                unitReactions, EntityManager, null, 1f);
+            var args = new EntityEffectReagentArgs(soln, EntityManager, null, soln.Comp.Solution, unitReactions, reagent, null, 1f);
 
             var posFound = _transformSystem.TryGetMapOrGridCoordinates(soln, out var gridPos);
 
@@ -213,7 +212,7 @@ private void OnReaction(Entity<SolutionComponent> soln, ReactionPrototype reacti
 
                 if (effect.ShouldLog)
                 {
-                    var entity = args.SolutionEntity;
+                    var entity = args.TargetEntity;
                     _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
                         $"Reaction effect {effect.GetType().Name:effect} of reaction {reaction.ID:reaction} applied on entity {ToPrettyString(entity):entity} at Pos:{(posFound ? $"{gridPos:coordinates}" : "[Grid or Map not Found")}");
                 }
diff --git a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
index f4e9619b172..351aa50b0f3 100644
--- a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
+++ b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
+using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
@@ -59,7 +60,7 @@ public sealed partial class ReactionPrototype : IPrototype, IComparable<Reaction
         /// <summary>
         /// Effects to be triggered when the reaction occurs.
         /// </summary>
-        [DataField("effects", serverOnly: true)] public List<ReagentEffect> Effects = new();
+        [DataField("effects", serverOnly: true)] public List<EntityEffect> Effects = new();
 
         /// <summary>
         /// How dangerous is this effect? Stuff like bicaridine should be low, while things like methamphetamine
diff --git a/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs b/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs
index 310129c6fc7..cabdee93c1a 100644
--- a/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs
+++ b/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
 
@@ -33,7 +34,7 @@ public sealed partial class ReactiveReagentEffectEntry
     public HashSet<string>? Reagents = null;
 
     [DataField("effects", required: true)]
-    public List<ReagentEffect> Effects = default!;
+    public List<EntityEffect> Effects = default!;
 
     [DataField("groups", readOnly: true, serverOnly: true,
         customTypeSerializer:typeof(PrototypeIdDictionarySerializer<HashSet<ReactionMethod>, ReactiveGroupPrototype>))]
diff --git a/Content.Shared/Chemistry/ReactiveSystem.cs b/Content.Shared/Chemistry/ReactiveSystem.cs
index 57b008de0c7..edd75bb0b4c 100644
--- a/Content.Shared/Chemistry/ReactiveSystem.cs
+++ b/Content.Shared/Chemistry/ReactiveSystem.cs
@@ -3,102 +3,107 @@
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
+using Content.Shared.EntityEffects;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
-namespace Content.Shared.Chemistry
+namespace Content.Shared.Chemistry;
+
+[UsedImplicitly]
+public sealed class ReactiveSystem : EntitySystem
 {
-    [UsedImplicitly]
-    public sealed class ReactiveSystem : EntitySystem
-    {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly IRobustRandom _robustRandom = default!;
-        [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IRobustRandom _robustRandom = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
 
-        public void DoEntityReaction(EntityUid uid, Solution solution, ReactionMethod method)
+    public void DoEntityReaction(EntityUid uid, Solution solution, ReactionMethod method)
+    {
+        foreach (var reagent in solution.Contents.ToArray())
         {
-            foreach (var reagent in solution.Contents.ToArray())
-            {
-                ReactionEntity(uid, method, reagent, solution);
-            }
+            ReactionEntity(uid, method, reagent, solution);
         }
+    }
 
-        public void ReactionEntity(EntityUid uid, ReactionMethod method, ReagentQuantity reagentQuantity, Solution? source)
-        {
-            // We throw if the reagent specified doesn't exist.
-            var proto = _prototypeManager.Index<ReagentPrototype>(reagentQuantity.Reagent.Prototype);
-            ReactionEntity(uid, method, proto, reagentQuantity, source);
-        }
+    public void ReactionEntity(EntityUid uid, ReactionMethod method, ReagentQuantity reagentQuantity, Solution? source)
+    {
+        // We throw if the reagent specified doesn't exist.
+        var proto = _prototypeManager.Index<ReagentPrototype>(reagentQuantity.Reagent.Prototype);
+        ReactionEntity(uid, method, proto, reagentQuantity, source);
+    }
 
-        public void ReactionEntity(EntityUid uid, ReactionMethod method, ReagentPrototype proto,
-            ReagentQuantity reagentQuantity, Solution? source)
-        {
-            if (!TryComp(uid, out ReactiveComponent? reactive))
-                return;
+    public void ReactionEntity(EntityUid uid, ReactionMethod method, ReagentPrototype proto,
+        ReagentQuantity reagentQuantity, Solution? source)
+    {
+        if (!TryComp(uid, out ReactiveComponent? reactive))
+            return;
 
-            // If we have a source solution, use the reagent quantity we have left. Otherwise, use the reaction volume specified.
-            var args = new ReagentEffectArgs(uid, null, source, proto,
-                source?.GetReagentQuantity(reagentQuantity.Reagent) ?? reagentQuantity.Quantity, EntityManager, method, 1f);
+        // If we have a source solution, use the reagent quantity we have left. Otherwise, use the reaction volume specified.
+        var args = new EntityEffectReagentArgs(uid, EntityManager, null, source, source?.GetReagentQuantity(reagentQuantity.Reagent) ?? reagentQuantity.Quantity, proto, method, 1f);
 
-            // First, check if the reagent wants to apply any effects.
-            if (proto.ReactiveEffects != null && reactive.ReactiveGroups != null)
+        // First, check if the reagent wants to apply any effects.
+        if (proto.ReactiveEffects != null && reactive.ReactiveGroups != null)
+        {
+            foreach (var (key, val) in proto.ReactiveEffects)
             {
-                foreach (var (key, val) in proto.ReactiveEffects)
-                {
-                    if (!val.Methods.Contains(method))
-                        continue;
+                if (!val.Methods.Contains(method))
+                    continue;
 
-                    if (!reactive.ReactiveGroups.ContainsKey(key))
-                        continue;
+                if (!reactive.ReactiveGroups.ContainsKey(key))
+                    continue;
 
-                    if (!reactive.ReactiveGroups[key].Contains(method))
+                if (!reactive.ReactiveGroups[key].Contains(method))
+                    continue;
+
+                foreach (var effect in val.Effects)
+                {
+                    if (!effect.ShouldApply(args, _robustRandom))
                         continue;
 
-                    foreach (var effect in val.Effects)
+                    if (effect.ShouldLog)
                     {
-                        if (!effect.ShouldApply(args, _robustRandom))
-                            continue;
-
-                        if (effect.ShouldLog)
-                        {
-                            var entity = args.SolutionEntity;
-                            _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
-                                $"Reactive effect {effect.GetType().Name:effect} of reagent {proto.ID:reagent} with method {method} applied on entity {ToPrettyString(entity):entity} at {Transform(entity).Coordinates:coordinates}");
-                        }
-
-                        effect.Effect(args);
+                        var entity = args.TargetEntity;
+                        _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
+                            $"Reactive effect {effect.GetType().Name:effect} of reagent {proto.ID:reagent} with method {method} applied on entity {ToPrettyString(entity):entity} at {Transform(entity).Coordinates:coordinates}");
                     }
+
+                    effect.Effect(args);
                 }
             }
+        }
 
-            // Then, check if the prototype has any effects it can apply as well.
-            if (reactive.Reactions != null)
+        // Then, check if the prototype has any effects it can apply as well.
+        if (reactive.Reactions != null)
+        {
+            foreach (var entry in reactive.Reactions)
             {
-                foreach (var entry in reactive.Reactions)
-                {
-                    if (!entry.Methods.Contains(method))
-                        continue;
+                if (!entry.Methods.Contains(method))
+                    continue;
+
+                if (entry.Reagents != null && !entry.Reagents.Contains(proto.ID))
+                    continue;
 
-                    if (entry.Reagents != null && !entry.Reagents.Contains(proto.ID))
+                foreach (var effect in entry.Effects)
+                {
+                    if (!effect.ShouldApply(args, _robustRandom))
                         continue;
 
-                    foreach (var effect in entry.Effects)
+                    if (effect.ShouldLog)
                     {
-                        if (!effect.ShouldApply(args, _robustRandom))
-                            continue;
-
-                        if (effect.ShouldLog)
-                        {
-                            var entity = args.SolutionEntity;
-                            _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
-                                $"Reactive effect {effect.GetType().Name:effect} of {ToPrettyString(entity):entity} using reagent {proto.ID:reagent} with method {method} at {Transform(entity).Coordinates:coordinates}");
-                        }
-
-                        effect.Effect(args);
+                        var entity = args.TargetEntity;
+                        _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
+                            $"Reactive effect {effect.GetType().Name:effect} of {ToPrettyString(entity):entity} using reagent {proto.ID:reagent} with method {method} at {Transform(entity).Coordinates:coordinates}");
                     }
+
+                    effect.Effect(args);
                 }
             }
         }
     }
 }
+public enum ReactionMethod
+{
+Touch,
+Injection,
+Ingestion,
+}
diff --git a/Content.Shared/Chemistry/Reagent/ReagentEffect.cs b/Content.Shared/Chemistry/Reagent/ReagentEffect.cs
deleted file mode 100644
index 41eea55cca4..00000000000
--- a/Content.Shared/Chemistry/Reagent/ReagentEffect.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-using System.Linq;
-using System.Text.Json.Serialization;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Database;
-using Content.Shared.FixedPoint;
-using Content.Shared.Localizations;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Shared.Chemistry.Reagent
-{
-    /// <summary>
-    ///     Reagent effects describe behavior that occurs when a reagent is ingested and metabolized by some
-    ///     organ. They only trigger when all of <see cref="Conditions"/> are satisfied.
-    /// </summary>
-    [ImplicitDataDefinitionForInheritors]
-    [MeansImplicitUse]
-    public abstract partial class ReagentEffect
-    {
-        [JsonPropertyName("id")] private protected string _id => this.GetType().Name;
-        /// <summary>
-        ///     The list of conditions required for the effect to activate. Not required.
-        /// </summary>
-        [JsonPropertyName("conditions")]
-        [DataField("conditions")]
-        public ReagentEffectCondition[]? Conditions;
-
-        public virtual string ReagentEffectFormat => "guidebook-reagent-effect-description";
-
-        protected abstract string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys); // => Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability));
-
-        /// <summary>
-        ///     What's the chance, from 0 to 1, that this effect will occur?
-        /// </summary>
-        [JsonPropertyName("probability")]
-        [DataField("probability")]
-        public float Probability = 1.0f;
-
-        [JsonIgnore]
-        [DataField("logImpact")]
-        public virtual LogImpact LogImpact { get; private set; } = LogImpact.Low;
-
-        /// <summary>
-        ///     Should this reagent effect log at all?
-        /// </summary>
-        [JsonIgnore]
-        [DataField("shouldLog")]
-        public virtual bool ShouldLog { get; private set; } = false;
-
-        public abstract void Effect(ReagentEffectArgs args);
-
-        /// <summary>
-        /// Produces a localized, bbcode'd guidebook description for this effect.
-        /// </summary>
-        /// <returns></returns>
-        public string? GuidebookEffectDescription(IPrototypeManager prototype, IEntitySystemManager entSys)
-        {
-            var effect = ReagentEffectGuidebookText(prototype, entSys);
-            if (effect is null)
-                return null;
-
-            return Loc.GetString(ReagentEffectFormat, ("effect", effect), ("chance", Probability),
-                ("conditionCount", Conditions?.Length ?? 0),
-                ("conditions",
-                    ContentLocalizationManager.FormatList(Conditions?.Select(x => x.GuidebookExplanation(prototype)).ToList() ??
-                                                          new List<string>())));
-        }
-    }
-
-    public static class ReagentEffectExt
-    {
-        public static bool ShouldApply(this ReagentEffect effect, ReagentEffectArgs args,
-            IRobustRandom? random = null)
-        {
-            if (random == null)
-                random = IoCManager.Resolve<IRobustRandom>();
-
-            if (effect.Probability < 1.0f && !random.Prob(effect.Probability))
-                return false;
-
-            if (effect.Conditions != null)
-            {
-                foreach (var cond in effect.Conditions)
-                {
-                    if (!cond.Condition(args))
-                        return false;
-                }
-            }
-
-            return true;
-        }
-    }
-
-    public enum ReactionMethod
-    {
-        Touch,
-        Injection,
-        Ingestion,
-    }
-
-    public readonly record struct ReagentEffectArgs(
-        EntityUid SolutionEntity,
-        EntityUid? OrganEntity,
-        Solution? Source,
-        ReagentPrototype? Reagent,
-        FixedPoint2 Quantity,
-        IEntityManager EntityManager,
-        ReactionMethod? Method,
-        float Scale = 1f,
-        float QuantityMultiplier = 1f
-    );
-}
diff --git a/Content.Shared/Chemistry/Reagent/ReagentEffectCondition.cs b/Content.Shared/Chemistry/Reagent/ReagentEffectCondition.cs
deleted file mode 100644
index a32b4fa8e3a..00000000000
--- a/Content.Shared/Chemistry/Reagent/ReagentEffectCondition.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Text.Json.Serialization;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Chemistry.Reagent
-{
-    [ImplicitDataDefinitionForInheritors]
-    [MeansImplicitUse]
-    public abstract partial class ReagentEffectCondition
-    {
-        [JsonPropertyName("id")] private protected string _id => this.GetType().Name;
-
-        public abstract bool Condition(ReagentEffectArgs args);
-
-        /// <summary>
-        /// Effect explanations are of the form "[chance to] [action] when [condition] and [condition]"
-        /// </summary>
-        /// <param name="prototype"></param>
-        /// <returns></returns>
-        public abstract string GuidebookExplanation(IPrototypeManager prototype);
-    }
-}
diff --git a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
index df1b1aa20b4..08bee30a0f1 100644
--- a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
+++ b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
@@ -1,10 +1,11 @@
-using System.Collections.Frozen;
+using System.Collections.Frozen;
 using System.Linq;
 using System.Text.Json.Serialization;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Body.Prototypes;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reaction;
+using Content.Shared.EntityEffects;
 using Content.Shared.Database;
 using Content.Shared.FixedPoint;
 using Content.Shared.Nutrition;
@@ -134,7 +135,7 @@ public sealed partial class ReagentPrototype : IPrototype, IInheritingPrototype
         public List<ITileReaction> TileReactions = new(0);
 
         [DataField("plantMetabolism", serverOnly: true)]
-        public List<ReagentEffect> PlantMetabolisms = new(0);
+        public List<EntityEffect> PlantMetabolisms = new(0);
 
         [DataField]
         public float PricePerUnit;
@@ -170,7 +171,7 @@ public void ReactionPlant(EntityUid? plantHolder, ReagentQuantity amount, Soluti
 
             var entMan = IoCManager.Resolve<IEntityManager>();
             var random = IoCManager.Resolve<IRobustRandom>();
-            var args = new ReagentEffectArgs(plantHolder.Value, null, solution, this, amount.Quantity, entMan, null, 1f);
+            var args = new EntityEffectReagentArgs(plantHolder.Value, entMan, null, solution, amount.Quantity, this, null, 1f);
             foreach (var plantMetabolizable in PlantMetabolisms)
             {
                 if (!plantMetabolizable.ShouldApply(args, random))
@@ -178,7 +179,7 @@ public void ReactionPlant(EntityUid? plantHolder, ReagentQuantity amount, Soluti
 
                 if (plantMetabolizable.ShouldLog)
                 {
-                    var entity = args.SolutionEntity;
+                    var entity = args.TargetEntity;
                     entMan.System<SharedAdminLogSystem>().Add(LogType.ReagentEffect, plantMetabolizable.LogImpact,
                         $"Plant metabolism effect {plantMetabolizable.GetType().Name:effect} of reagent {ID:reagent} applied on entity {entMan.ToPrettyString(entity):entity} at {entMan.GetComponent<TransformComponent>(entity).Coordinates:coordinates}");
                 }
@@ -220,7 +221,7 @@ public sealed partial class ReagentEffectsEntry
         /// </summary>
         [JsonPropertyName("effects")]
         [DataField("effects", required: true)]
-        public ReagentEffect[] Effects = default!;
+        public EntityEffect[] Effects = default!;
 
         public ReagentEffectsGuideEntry MakeGuideEntry(IPrototypeManager prototype, IEntitySystemManager entSys)
         {
@@ -254,6 +255,6 @@ public sealed partial class ReactiveReagentEffectEntry
         public HashSet<ReactionMethod> Methods = default!;
 
         [DataField("effects", required: true)]
-        public ReagentEffect[] Effects = default!;
+        public EntityEffect[] Effects = default!;
     }
 }
diff --git a/Content.Shared/EntityEffects/EntityEffect.cs b/Content.Shared/EntityEffects/EntityEffect.cs
new file mode 100644
index 00000000000..21e79f224de
--- /dev/null
+++ b/Content.Shared/EntityEffects/EntityEffect.cs
@@ -0,0 +1,132 @@
+using System.Linq;
+using System.Text.Json.Serialization;
+using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Database;
+using Content.Shared.FixedPoint;
+using Content.Shared.Localizations;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Toolshed.TypeParsers;
+
+namespace Content.Shared.EntityEffects;
+
+/// <summary>
+///     Entity effects describe behavior that occurs on different kinds of triggers, e.g. when a reagent is ingested and metabolized by some
+///     organ. They only trigger when all of <see cref="Conditions"/> are satisfied.
+/// </summary>
+[ImplicitDataDefinitionForInheritors]
+[MeansImplicitUse]
+public abstract partial class EntityEffect
+{
+    private protected string _id => this.GetType().Name;
+    /// <summary>
+    ///     The list of conditions required for the effect to activate. Not required.
+    /// </summary>
+    [DataField("conditions")]
+    public EntityEffectCondition[]? Conditions;
+
+    public virtual string ReagentEffectFormat => "guidebook-reagent-effect-description";
+
+    protected abstract string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys);
+
+    /// <summary>
+    ///     What's the chance, from 0 to 1, that this effect will occur?
+    /// </summary>
+    [DataField("probability")]
+    public float Probability = 1.0f;
+
+    public virtual LogImpact LogImpact { get; private set; } = LogImpact.Low;
+
+    /// <summary>
+    ///     Should this entity effect log at all?
+    /// </summary>
+    public virtual bool ShouldLog { get; private set; } = false;
+
+    public abstract void Effect(EntityEffectBaseArgs args);
+
+    /// <summary>
+    /// Produces a localized, bbcode'd guidebook description for this effect.
+    /// </summary>
+    /// <returns></returns>
+    public string? GuidebookEffectDescription(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        var effect = ReagentEffectGuidebookText(prototype, entSys);
+        if (effect is null)
+            return null;
+
+        return Loc.GetString(ReagentEffectFormat, ("effect", effect), ("chance", Probability),
+            ("conditionCount", Conditions?.Length ?? 0),
+            ("conditions",
+                ContentLocalizationManager.FormatList(Conditions?.Select(x => x.GuidebookExplanation(prototype)).ToList() ??
+                                                        new List<string>())));
+    }
+}
+
+public static class EntityEffectExt
+{
+    public static bool ShouldApply(this EntityEffect effect, EntityEffectBaseArgs args,
+        IRobustRandom? random = null)
+    {
+        if (random == null)
+            random = IoCManager.Resolve<IRobustRandom>();
+
+        if (effect.Probability < 1.0f && !random.Prob(effect.Probability))
+            return false;
+
+        if (effect.Conditions != null)
+        {
+            foreach (var cond in effect.Conditions)
+            {
+                if (!cond.Condition(args))
+                    return false;
+            }
+        }
+
+        return true;
+    }
+}
+
+/// <summary>
+///     EntityEffectBaseArgs only contains the target of an effect.
+///     If a trigger wants to include more info (e.g. the quantity of the chemical triggering the effect), it can be extended (see EntityEffectReagentArgs).
+/// </summary>
+public record class EntityEffectBaseArgs
+{
+    public EntityUid TargetEntity;
+
+    public IEntityManager EntityManager = default!;
+
+    public EntityEffectBaseArgs(EntityUid targetEntity, IEntityManager entityManager)
+    {
+        TargetEntity = targetEntity;
+        EntityManager = entityManager;
+    }
+}
+
+public record class EntityEffectReagentArgs : EntityEffectBaseArgs
+{
+    public EntityUid? OrganEntity;
+
+    public Solution? Source;
+
+    public FixedPoint2 Quantity;
+
+    public ReagentPrototype? Reagent;
+
+    public ReactionMethod? Method;
+
+    public FixedPoint2 Scale;
+
+    public EntityEffectReagentArgs(EntityUid targetEntity, IEntityManager entityManager, EntityUid? organEntity, Solution? source, FixedPoint2 quantity, ReagentPrototype? reagent, ReactionMethod? method, FixedPoint2 scale) : base(targetEntity, entityManager)
+    {
+        OrganEntity = organEntity;
+        Source = source;
+        Quantity = quantity;
+        Reagent = reagent;
+        Method = method;
+        Scale = scale;
+    }
+}
diff --git a/Content.Shared/EntityEffects/EntityEffectCondition.cs b/Content.Shared/EntityEffects/EntityEffectCondition.cs
new file mode 100644
index 00000000000..d6028b9f2c4
--- /dev/null
+++ b/Content.Shared/EntityEffects/EntityEffectCondition.cs
@@ -0,0 +1,22 @@
+using System.Text.Json.Serialization;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects;
+
+[ImplicitDataDefinitionForInheritors]
+[MeansImplicitUse]
+public abstract partial class EntityEffectCondition
+{
+    [JsonPropertyName("id")] private protected string _id => this.GetType().Name;
+
+    public abstract bool Condition(EntityEffectBaseArgs args);
+
+    /// <summary>
+    /// Effect explanations are of the form "[chance to] [action] when [condition] and [condition]"
+    /// </summary>
+    /// <param name="prototype"></param>
+    /// <returns></returns>
+    public abstract string GuidebookExplanation(IPrototypeManager prototype);
+}
+
diff --git a/Resources/Prototypes/Entities/Tiles/lava.yml b/Resources/Prototypes/Entities/Tiles/lava.yml
index 9d61304af9d..29a5cd885c3 100644
--- a/Resources/Prototypes/Entities/Tiles/lava.yml
+++ b/Resources/Prototypes/Entities/Tiles/lava.yml
@@ -18,6 +18,12 @@
         - Lava
   - type: Lava
     fireStacks: 0.75
+  - type: TileEntityEffect
+    effects:
+    - !type:FlammableReaction
+      multiplier: 3.75
+      multiplierOnExisting: 0.75
+    - !type:Ignite
   - type: Transform
     anchored: true
   - type: SyncSprite
diff --git a/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml b/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
index 500286ead31..ed38f86ff42 100644
--- a/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
+++ b/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: FloorLiquidPlasmaEntity
   name: liquid plasma
   description: Sweet, expensive nectar. Don't consume.
@@ -18,6 +18,12 @@
       - Lava
   - type: Lava
     fireStacks: 0.75
+  - type: TileEntityEffect
+    effects:
+    - !type:FlammableReaction
+      multiplier: 3.75
+      multiplierOnExisting: 0.75
+    - !type:Ignite
   - type: Transform
     anchored: true
   - type: SyncSprite

From 6b463d6abb3454fb52441f781323525bf927c029 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 21 Dec 2024 17:59:03 -0400
Subject: [PATCH 250/366] Reapply "Implement field-deltas for melee"

This reverts commit c1b272ad73de37e19030f746880cf772911a789c.
---
 .../Weapons/Melee/MeleeWeaponComponent.cs     |  4 +--
 .../Weapons/Melee/SharedMeleeWeaponSystem.cs  | 27 ++++++++++++++-----
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
index b33b2cbc4f6..851699c9815 100644
--- a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
+++ b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
@@ -11,7 +11,7 @@ namespace Content.Shared.Weapons.Melee;
 /// <summary>
 /// When given to a mob lets them do unarmed attacks, or when given to an item lets someone wield it to do attacks.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(fieldDeltas: true), AutoGenerateComponentPause]
 public sealed partial class MeleeWeaponComponent : Component
 {
     // TODO: This is becoming bloated as shit.
@@ -96,7 +96,7 @@ public sealed partial class MeleeWeaponComponent : Component
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
     public bool ResistanceBypass = false;
-    
+
     /// <summary>
     /// Base damage for this weapon. Can be modified via heavy damage or other means.
     /// </summary>
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index 7a3e7ee503a..4b506cc1200 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -104,7 +104,7 @@ private void OnMeleeShot(EntityUid uid, MeleeWeaponComponent component, ref GunS
         if (gun.NextFire > component.NextAttack)
         {
             component.NextAttack = gun.NextFire;
-            Dirty(uid, component);
+            DirtyField(uid, component, nameof(MeleeWeaponComponent.NextAttack));
         }
     }
 
@@ -128,7 +128,7 @@ private void OnMeleeSelected(EntityUid uid, MeleeWeaponComponent component, Hand
             return;
 
         component.NextAttack = minimum;
-        Dirty(uid, component);
+        DirtyField(uid, component, nameof(MeleeWeaponComponent.NextAttack));
     }
 
     private void OnGetBonusMeleeDamage(EntityUid uid, BonusMeleeDamageComponent component, ref GetMeleeDamageEvent args)
@@ -168,7 +168,7 @@ private void OnStopAttack(StopAttackEvent msg, EntitySessionEventArgs args)
             return;
 
         weapon.Attacking = false;
-        Dirty(weaponUid, weapon);
+        DirtyField(weaponUid, weapon, nameof(MeleeWeaponComponent.Attacking));
     }
 
     private void OnLightAttack(LightAttackEvent msg, EntitySessionEventArgs args)
@@ -392,7 +392,7 @@ private bool AttemptAttack(EntityUid user, EntityUid weaponUid, MeleeWeaponCompo
             swings++;
         }
 
-        Dirty(weaponUid, weapon);
+        DirtyField(weaponUid, weapon, nameof(MeleeWeaponComponent.NextAttack));
 
         // Do this AFTER attack so it doesn't spam every tick
         var ev = new AttemptMeleeEvent();
@@ -832,6 +832,7 @@ private void OnItemToggle(EntityUid uid, ItemToggleMeleeWeaponComponent itemTogg
                 //Setting deactivated damage to the weapon's regular value before changing it.
                 itemToggleMelee.DeactivatedDamage ??= meleeWeapon.Damage;
                 meleeWeapon.Damage = itemToggleMelee.ActivatedDamage;
+                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.Damage));
             }
 
             meleeWeapon.SoundHit = itemToggleMelee.ActivatedSoundOnHit;
@@ -841,6 +842,7 @@ private void OnItemToggle(EntityUid uid, ItemToggleMeleeWeaponComponent itemTogg
                 //Setting the deactivated sound on no damage hit to the weapon's regular value before changing it.
                 itemToggleMelee.DeactivatedSoundOnHitNoDamage ??= meleeWeapon.SoundNoDamage;
                 meleeWeapon.SoundNoDamage = itemToggleMelee.ActivatedSoundOnHitNoDamage;
+                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.SoundNoDamage));
             }
 
             if (itemToggleMelee.ActivatedSoundOnSwing != null)
@@ -848,28 +850,41 @@ private void OnItemToggle(EntityUid uid, ItemToggleMeleeWeaponComponent itemTogg
                 //Setting the deactivated sound on no damage hit to the weapon's regular value before changing it.
                 itemToggleMelee.DeactivatedSoundOnSwing ??= meleeWeapon.SoundSwing;
                 meleeWeapon.SoundSwing = itemToggleMelee.ActivatedSoundOnSwing;
+                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.SoundSwing));
             }
 
             if (itemToggleMelee.DeactivatedSecret)
+            {
                 meleeWeapon.Hidden = false;
+            }
         }
         else
         {
             if (itemToggleMelee.DeactivatedDamage != null)
+            {
                 meleeWeapon.Damage = itemToggleMelee.DeactivatedDamage;
+                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.Damage));
+            }
 
             meleeWeapon.SoundHit = itemToggleMelee.DeactivatedSoundOnHit;
+            DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.SoundHit));
 
             if (itemToggleMelee.DeactivatedSoundOnHitNoDamage != null)
+            {
                 meleeWeapon.SoundNoDamage = itemToggleMelee.DeactivatedSoundOnHitNoDamage;
+                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.SoundNoDamage));
+            }
 
             if (itemToggleMelee.DeactivatedSoundOnSwing != null)
+            {
                 meleeWeapon.SoundSwing = itemToggleMelee.DeactivatedSoundOnSwing;
+                DirtyField(uid, meleeWeapon, nameof(MeleeWeaponComponent.SoundSwing));
+            }
 
             if (itemToggleMelee.DeactivatedSecret)
+            {
                 meleeWeapon.Hidden = true;
+            }
         }
-
-        Dirty(uid, meleeWeapon);
     }
 }

From 309a549b5eefb3f82b0a39019516c4d59ac33283 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 21 Dec 2024 18:04:42 -0400
Subject: [PATCH 251/366] Wrong imports

---
 Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
index 9e507eefae9..95c2b0085bd 100644
--- a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
+++ b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
@@ -1,7 +1,6 @@
 using System.Linq;
 using Content.Server.Administration;
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules;
 using Content.Server.StationEvents.Components;
 using Content.Shared.Administration;

From 9e1bee4e7a6b36ff21339d4c18244d78030e50e3 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 22 Dec 2024 05:23:22 -0400
Subject: [PATCH 252/366] v237.4.0

---
 RobustToolbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RobustToolbox b/RobustToolbox
index 5e97db435c0..acb1d37b99f 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 5e97db435c05b4c188184ef90e5d77b0500403d0
+Subproject commit acb1d37b99f52ed9e372860ee946fa0f897665b9

From 032c4eb1485e106c37057f5fcd3e103699e64f3e Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 22 Dec 2024 05:27:21 -0400
Subject: [PATCH 253/366] test

---
 RobustToolbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RobustToolbox b/RobustToolbox
index acb1d37b99f..5e97db435c0 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit acb1d37b99f52ed9e372860ee946fa0f897665b9
+Subproject commit 5e97db435c05b4c188184ef90e5d77b0500403d0

From ace74124e3b477e43e9328dec8eceb10418a752a Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 22 Dec 2024 06:00:03 -0400
Subject: [PATCH 254/366] Avoid using EntityUid as a networked dictionary's key
 until hotfix.

---
 .../Damage/Components/StaminaComponent.cs          |  2 +-
 Content.Shared/Damage/Systems/StaminaSystem.cs     | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Content.Shared/Damage/Components/StaminaComponent.cs b/Content.Shared/Damage/Components/StaminaComponent.cs
index 46eaa9f1f05..b138043a929 100644
--- a/Content.Shared/Damage/Components/StaminaComponent.cs
+++ b/Content.Shared/Damage/Components/StaminaComponent.cs
@@ -46,7 +46,7 @@ public sealed partial class StaminaComponent : Component
     /// DrainRate how much it changes per tick, and ModifiesSpeed if it should slow down the user.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public Dictionary<EntityUid, (float DrainRate, bool ModifiesSpeed)> ActiveDrains = new();
+    public Dictionary<NetEntity, (float DrainRate, bool ModifiesSpeed)> ActiveDrains = new();
 
     /// <summary>
     /// How long will this mob be stunned for?
diff --git a/Content.Shared/Damage/Systems/StaminaSystem.cs b/Content.Shared/Damage/Systems/StaminaSystem.cs
index 4f0b0061916..5bacfe48deb 100644
--- a/Content.Shared/Damage/Systems/StaminaSystem.cs
+++ b/Content.Shared/Damage/Systems/StaminaSystem.cs
@@ -334,7 +334,7 @@ public void ToggleStaminaDrain(EntityUid target, float drainRate, bool enabled,
             return;
 
         // If theres no source, we assume its the target that caused the drain.
-        var actualSource = source ?? target;
+        var actualSource = GetNetEntity(source) ?? GetNetEntity(target);
 
         if (enabled)
         {
@@ -368,11 +368,11 @@ public override void Update(float frameTime)
             if (comp.ActiveDrains.Count > 0)
                 foreach (var (source, (drainRate, modifiesSpeed)) in comp.ActiveDrains)
                     TakeStaminaDamage(uid,
-                    drainRate * frameTime,
-                    comp,
-                    source: source,
-                    visual: false,
-                    allowsSlowdown: modifiesSpeed);
+                        drainRate * frameTime,
+                        comp,
+                        source: GetEntity(source),
+                        visual: false,
+                        allowsSlowdown: modifiesSpeed);
             // Shouldn't need to consider paused time as we're only iterating non-paused stamina components.
             var nextUpdate = comp.NextUpdate;
 
@@ -433,4 +433,4 @@ private void ExitStamCrit(EntityUid uid, StaminaComponent? component = null)
 ///     Raised before stamina damage is dealt to allow other systems to cancel it.
 /// </summary>
 [ByRefEvent]
-public record struct BeforeStaminaDamageEvent(float Value, bool Cancelled = false);
\ No newline at end of file
+public record struct BeforeStaminaDamageEvent(float Value, bool Cancelled = false);

From 119322bb98dece26855cd332d6a343ebc019edb3 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 22 Dec 2024 06:06:54 -0400
Subject: [PATCH 255/366] Does fix?

---
 Resources/Prototypes/Entities/Tiles/liquid_plasma.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml b/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
index ed38f86ff42..3de5f5c120f 100644
--- a/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
+++ b/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
@@ -16,8 +16,6 @@
     triggerGroups:
       types:
       - Lava
-  - type: Lava
-    fireStacks: 0.75
   - type: TileEntityEffect
     effects:
     - !type:FlammableReaction

From fea3cd262677d3d4da8effb6bc79209bfd607fc4 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 22 Dec 2024 06:22:44 -0400
Subject: [PATCH 256/366] This does fix

---
 Resources/Prototypes/Entities/Tiles/lava.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Resources/Prototypes/Entities/Tiles/lava.yml b/Resources/Prototypes/Entities/Tiles/lava.yml
index 29a5cd885c3..c448cd41a95 100644
--- a/Resources/Prototypes/Entities/Tiles/lava.yml
+++ b/Resources/Prototypes/Entities/Tiles/lava.yml
@@ -13,9 +13,6 @@
     blacklist:
       tags:
         - Catwalk
-    triggerGroups:
-      types:
-        - Lava
   - type: Lava
     fireStacks: 0.75
   - type: TileEntityEffect

From c306a3f3572cc1b60435aef8212866340a36c229 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 22 Dec 2024 06:27:38 -0400
Subject: [PATCH 257/366] No, this does fix.

---
 Resources/Prototypes/Entities/Tiles/lava.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Tiles/lava.yml b/Resources/Prototypes/Entities/Tiles/lava.yml
index c448cd41a95..3bc1cf1d239 100644
--- a/Resources/Prototypes/Entities/Tiles/lava.yml
+++ b/Resources/Prototypes/Entities/Tiles/lava.yml
@@ -13,8 +13,9 @@
     blacklist:
       tags:
         - Catwalk
-  - type: Lava
-    fireStacks: 0.75
+    triggerGroups:
+      types:
+        - Lava
   - type: TileEntityEffect
     effects:
     - !type:FlammableReaction

From dc1883e4536980d9baf72101b80b3f7c63ca56e3 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 22 Dec 2024 06:36:57 -0400
Subject: [PATCH 258/366] Use probability, not prob

---
 Resources/Prototypes/Reagents/botany.yml   | 10 +++++-----
 Resources/Prototypes/Reagents/elements.yml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Resources/Prototypes/Reagents/botany.yml b/Resources/Prototypes/Reagents/botany.yml
index cdd19dc308d..99e9182103d 100644
--- a/Resources/Prototypes/Reagents/botany.yml
+++ b/Resources/Prototypes/Reagents/botany.yml
@@ -31,7 +31,7 @@
     - !type:PlantAdjustHealth
       amount: -0.5
     - !type:PlantAdjustMutationMod
-      prob: 0.3
+      probability: 0.3
       amount: 0.4
   metabolisms:
     Medicine:
@@ -115,10 +115,10 @@
     - !type:PlantAdjustNutrition
       amount: 0.05
     - !type:PlantAdjustWeeds
-      prob: 0.025
+      probability: 0.025
       amount: 1
     - !type:PlantAdjustPests
-      prob: 0.025
+      probability: 0.025
       amount: 1
     - !type:RobustHarvest {}
   metabolisms:
@@ -273,12 +273,12 @@
   - !type:PlantAdjustNutrition
     amount: 0.1
   - !type:PlantAdjustPests
-    prob: 0.1
+    probability: 0.1
     amount: -1
   - !type:PlantAdjustHealth
     amount: 0.1
   - !type:PlantAffectGrowth
-    prob: 0.2
+    probability: 0.2
     amount: 1
   - !type:PlantDiethylamine {}
   metabolisms:
diff --git a/Resources/Prototypes/Reagents/elements.yml b/Resources/Prototypes/Reagents/elements.yml
index e47335b1b4a..4f05568ad2b 100644
--- a/Resources/Prototypes/Reagents/elements.yml
+++ b/Resources/Prototypes/Reagents/elements.yml
@@ -334,7 +334,7 @@
   - !type:PlantAdjustHealth
     amount: -1.5
   - !type:PlantAdjustMutationMod
-    prob: 0.2
+    probability: 0.2
     amount: 0.1
   metabolisms:
     Poison:

From fc94a19e0272af8bbe1791b0ca12e7bc96e93067 Mon Sep 17 00:00:00 2001
From: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
Date: Sat, 20 Jul 2024 18:28:43 -0500
Subject: [PATCH 259/366] Add debug logs to baby jail and fix playtime logic
 (#30158)

* add debug logs

* Update Model.cs

* fix playtime logic for null playtime

* remove unnecessary condition

* either me or the compiler is having a C# skill issue
---
 Content.Server.Database/Model.cs               |  3 +++
 Content.Server/Connection/ConnectionManager.cs | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index e3e4f3669b9..80492d03628 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -885,6 +885,9 @@ public enum ConnectionDenyReason : byte
         Panic = 3,
         /*
          * TODO: Remove baby jail code once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future.
+         * 
+         * If baby jail is removed, please reserve this value for as long as can reasonably be done to prevent causing ambiguity in connection denial reasons.
+         * Reservation by commenting out the value is likely sufficient for this purpose, but may impact projects which depend on SS14 like SS14.Admin.
          */
         BabyJail = 4,
     }
diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
index ef636a029f5..0048d6069cd 100644
--- a/Content.Server/Connection/ConnectionManager.cs
+++ b/Content.Server/Connection/ConnectionManager.cs
@@ -291,6 +291,12 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
                 return (false, "");
 
             var isAccountAgeInvalid = record.FirstSeenTime.CompareTo(DateTimeOffset.Now - TimeSpan.FromMinutes(maxAccountAgeMinutes)) <= 0;
+
+            if (isAccountAgeInvalid)
+            {
+                _sawmill.Debug($"Baby jail will deny {userId} for account age {record.FirstSeenTime}"); // Remove on or after 2024-09
+            }
+
             if (isAccountAgeInvalid && showReason)
             {
                 var locAccountReason = reason != string.Empty
@@ -305,7 +311,12 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
             }
 
             var overallTime = ( await _db.GetPlayTimes(e.UserId)).Find(p => p.Tracker == PlayTimeTrackingShared.TrackerOverall);
-            var isTotalPlaytimeInvalid = overallTime == null || overallTime.TimeSpent.TotalMinutes >= maxPlaytimeMinutes;
+            var isTotalPlaytimeInvalid = overallTime != null && overallTime.TimeSpent.TotalMinutes >= maxPlaytimeMinutes;
+
+            if (isTotalPlaytimeInvalid)
+            {
+                _sawmill.Debug($"Baby jail will deny {userId} for playtime {overallTime!.TimeSpent}"); // Remove on or after 2024-09
+            }
 
             if (isTotalPlaytimeInvalid && showReason)
             {

From 4bcdee9c30d07dbc5be21081234af0a12ca43c1a Mon Sep 17 00:00:00 2001
From: Simon <63975668+Simyon264@users.noreply.github.com>
Date: Tue, 27 Aug 2024 18:01:17 +0200
Subject: [PATCH 260/366] Automated whitelists (#23985)

* Beginnings of making the breadmemes jobs easier

* stuff

* stuff pt. 2

* Stuff pt.3

* Stuff I forgot last time

* Basic whitelist

Only people that are added to the whitelist with the addwhitelist command will be able to join. I call this the "legacy" whitelist

* Remove always deny condition in favor of just breaking if playtime check fails

* Change default whitelist

Default whitelist is now the "legacy" whitelist.

* localization

* Admin check

* minor spelling change

* Fix build

* Whitelist message

* Fix vars not being datafield and spelling mistakes

* Minor spelling mistake

* Change config for salamander

* Reviews and stuff

* Add summaries

* Fix whitelists

* Forgot to add a datafield

* Fixing stuff I guess

* Reuse admin remarks to reduce load when connecting.

* Update log messages to be verbose instead of debug

* Reviews

* whoops

* Explain a bit more how whitelist checking works

* Apply CE's review

* Append Membership to Blacklist and Whitelist conditions

* Fix review comments

* Uncapitalize playerConnectionWhitelist, add to ignored client prototypes

* Make note count field work

* Fix cvar for thingy

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
---
 Content.Client/Entry/EntryPoint.cs            |    1 +
 .../20240112194620_Blacklist.Designer.cs      | 1769 +++++++++++++++++
 .../Postgres/20240112194620_Blacklist.cs      |   33 +
 .../PostgresServerDbContextModelSnapshot.cs   |   14 +
 .../20240112194612_Blacklist.Designer.cs      | 1701 ++++++++++++++++
 .../Sqlite/20240112194612_Blacklist.cs        |   33 +
 .../SqliteServerDbContextModelSnapshot.cs     |   13 +
 Content.Server.Database/Model.cs              |   10 +
 .../Connection/ConnectionManager.Whitelist.cs |  221 ++
 .../Connection/ConnectionManager.cs           |   17 +-
 .../Connection/Whitelist/BlacklistCommands.cs |  117 ++
 .../Conditions/ConditionAlwaysMatch.cs        |   12 +
 .../ConditionManualBlacklistMembership.cs     |   12 +
 .../ConditionManualWhitelistMembership.cs     |   12 +
 .../Conditions/ConditionNotesDateRange.cs     |   34 +
 .../Conditions/ConditionNotesPlaytimeRange.cs |   30 +
 .../Conditions/ConditionPlayerCount.cs        |   16 +
 .../Whitelist/Conditions/ConditionPlaytime.cs |   15 +
 .../Whitelist/WhitelistCondition.cs           |   41 +
 .../Whitelist/WhitelistPrototype.cs           |   42 +
 Content.Server/Database/ServerDbBase.cs       |   23 +
 Content.Server/Database/ServerDbManager.cs    |   28 +
 Content.Server/Entry/EntryPoint.cs            |    1 +
 Content.Shared/CCVar/CCVars.cs                |   19 +-
 .../Locale/en-US/connection-messages.ftl      |   38 +-
 Resources/Prototypes/whitelists.yml           |    7 +
 Resources/Prototypes/wizardsDenWhitelists.yml |   39 +
 27 files changed, 4265 insertions(+), 33 deletions(-)
 create mode 100644 Content.Server.Database/Migrations/Postgres/20240112194620_Blacklist.Designer.cs
 create mode 100644 Content.Server.Database/Migrations/Postgres/20240112194620_Blacklist.cs
 create mode 100644 Content.Server.Database/Migrations/Sqlite/20240112194612_Blacklist.Designer.cs
 create mode 100644 Content.Server.Database/Migrations/Sqlite/20240112194612_Blacklist.cs
 create mode 100644 Content.Server/Connection/ConnectionManager.Whitelist.cs
 create mode 100644 Content.Server/Connection/Whitelist/BlacklistCommands.cs
 create mode 100644 Content.Server/Connection/Whitelist/Conditions/ConditionAlwaysMatch.cs
 create mode 100644 Content.Server/Connection/Whitelist/Conditions/ConditionManualBlacklistMembership.cs
 create mode 100644 Content.Server/Connection/Whitelist/Conditions/ConditionManualWhitelistMembership.cs
 create mode 100644 Content.Server/Connection/Whitelist/Conditions/ConditionNotesDateRange.cs
 create mode 100644 Content.Server/Connection/Whitelist/Conditions/ConditionNotesPlaytimeRange.cs
 create mode 100644 Content.Server/Connection/Whitelist/Conditions/ConditionPlayerCount.cs
 create mode 100644 Content.Server/Connection/Whitelist/Conditions/ConditionPlaytime.cs
 create mode 100644 Content.Server/Connection/Whitelist/WhitelistCondition.cs
 create mode 100644 Content.Server/Connection/Whitelist/WhitelistPrototype.cs
 create mode 100644 Resources/Prototypes/whitelists.yml
 create mode 100644 Resources/Prototypes/wizardsDenWhitelists.yml

diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index d53babcd664..05d3454f48f 100644
--- a/Content.Client/Entry/EntryPoint.cs
+++ b/Content.Client/Entry/EntryPoint.cs
@@ -109,6 +109,7 @@ public override void Init()
             _prototypeManager.RegisterIgnore("lobbyBackground");
             _prototypeManager.RegisterIgnore("gamePreset");
             _prototypeManager.RegisterIgnore("noiseChannel");
+            _prototypeManager.RegisterIgnore("playerConnectionWhitelist");
             _prototypeManager.RegisterIgnore("spaceBiome");
             _prototypeManager.RegisterIgnore("worldgenConfig");
             _prototypeManager.RegisterIgnore("gameRule");
diff --git a/Content.Server.Database/Migrations/Postgres/20240112194620_Blacklist.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240112194620_Blacklist.Designer.cs
new file mode 100644
index 00000000000..61aa1a8c73e
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20240112194620_Blacklist.Designer.cs
@@ -0,0 +1,1769 @@
+// <auto-generated />
+using System;
+using System.Net;
+using System.Text.Json;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    [DbContext(typeof(PostgresServerDbContext))]
+    [Migration("20240112194620_Blacklist")]
+    partial class Blacklist
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.4")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("boolean")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<short>("Impact")
+                        .HasColumnType("smallint")
+                        .HasColumnName("impact");
+
+                    b.Property<JsonDocument>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Message")
+                        .HasAnnotation("Npgsql:TsVectorConfig", "english");
+
+                    NpgsqlIndexBuilderExtensions.HasMethod(b.HasIndex("Message"), "GIN");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("integer")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_messages_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("boolean")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_notes_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("boolean")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_watchlists_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("antag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("assigned_user_id_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Blacklist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_blacklist");
+
+                    b.ToTable("blacklist", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<IPAddress>("Address")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("smallint")
+                        .HasColumnName("denied");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("time");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("job_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("play_time_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("interval")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("player_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<IPAddress>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<byte[]>("LastSeenHWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("last_seen_hwid");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", null, t =>
+                        {
+                            t.HasCheckConstraint("LastSeenAddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= last_seen_address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("integer")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Age")
+                        .HasColumnType("integer")
+                        .HasColumnName("age");
+
+                    b.Property<string>("Backpack")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("backpack");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("Clothing")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("clothing");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_name");
+
+                    b.Property<JsonDocument>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("integer")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("integer")
+                        .HasColumnName("slot");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("StartDate")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValue(new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified))
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<ValueTuple<IPAddress, int>?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("boolean")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("integer")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("integer")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_hit_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_role_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<ValueTuple<IPAddress, int>?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("role_unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("trait_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("integer")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/20240112194620_Blacklist.cs b/Content.Server.Database/Migrations/Postgres/20240112194620_Blacklist.cs
new file mode 100644
index 00000000000..a6a34626ed4
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20240112194620_Blacklist.cs
@@ -0,0 +1,33 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    /// <inheritdoc />
+    public partial class Blacklist : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "blacklist",
+                columns: table => new
+                {
+                    user_id = table.Column<Guid>(type: "uuid", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_blacklist", x => x.user_id);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "blacklist");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
index d9bde5e94ef..633d494beb2 100644
--- a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
@@ -512,6 +512,20 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("assigned_user_id", (string)null);
                 });
 
+            modelBuilder.Entity("Content.Server.Database.Blacklist",
+                b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_blacklist");
+
+                    b.ToTable("blacklist", (string) null);
+                });
+
             modelBuilder.Entity("Content.Server.Database.BanTemplate", b =>
                 {
                     b.Property<int>("Id")
diff --git a/Content.Server.Database/Migrations/Sqlite/20240112194612_Blacklist.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240112194612_Blacklist.Designer.cs
new file mode 100644
index 00000000000..049901bc7d4
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240112194612_Blacklist.Designer.cs
@@ -0,0 +1,1701 @@
+// <auto-generated />
+using System;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    [DbContext(typeof(SqliteServerDbContext))]
+    [Migration("20240112194612_Blacklist")]
+    partial class Blacklist
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "7.0.4");
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_flag_id");
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<sbyte>("Impact")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("impact");
+
+                    b.Property<string>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_messages_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_notes_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_watchlists_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("antag_id");
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("assigned_user_id_id");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Blacklist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_blacklist");
+
+                    b.ToTable("blacklist", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_log_id");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("denied");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("job_id");
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("play_time_id");
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("player_id");
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<string>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<byte[]>("LastSeenHWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("last_seen_hwid");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<int>("Age")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("age");
+
+                    b.Property<string>("Backpack")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("backpack");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("Clothing")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("clothing");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_name");
+
+                    b.Property<byte[]>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("slot");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("StartDate")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasDefaultValue(new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified))
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_hit_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_role_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("role_unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("trait_id");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("BLOB")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/20240112194612_Blacklist.cs b/Content.Server.Database/Migrations/Sqlite/20240112194612_Blacklist.cs
new file mode 100644
index 00000000000..4988a3c336c
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240112194612_Blacklist.cs
@@ -0,0 +1,33 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    /// <inheritdoc />
+    public partial class Blacklist : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "blacklist",
+                columns: table => new
+                {
+                    user_id = table.Column<Guid>(type: "TEXT", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_blacklist", x => x.user_id);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "blacklist");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
index cc2c9a9ad3f..e8d2247cfa0 100644
--- a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
@@ -483,6 +483,19 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("assigned_user_id", (string)null);
                 });
 
+            modelBuilder.Entity("Content.Server.Database.Blacklist",
+                b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_blacklist");
+
+                    b.ToTable("blacklist", (string) null);
+                });
             modelBuilder.Entity("Content.Server.Database.BanTemplate", b =>
                 {
                     b.Property<int>("Id")
diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index 80492d03628..5a43da21a8f 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -32,6 +32,7 @@ protected ServerDbContext(DbContextOptions options) : base(options)
         public DbSet<AdminLog> AdminLog { get; set; } = null!;
         public DbSet<AdminLogPlayer> AdminLogPlayer { get; set; } = null!;
         public DbSet<Whitelist> Whitelist { get; set; } = null!;
+        public DbSet<Blacklist> Blacklist { get; set; } = null!;
         public DbSet<ServerBan> Ban { get; set; } = default!;
         public DbSet<ServerUnban> Unban { get; set; } = default!;
         public DbSet<ServerBanExemption> BanExemption { get; set; } = default!;
@@ -526,6 +527,15 @@ public class Whitelist
         [Required, Key] public Guid UserId { get; set; }
     }
 
+    /// <summary>
+    /// List of users who are on the "blacklist". This is a list that may be used by Whitelist implementations to deny access to certain users.
+    /// </summary>
+    [Table("blacklist")]
+    public class Blacklist
+    {
+        [Required, Key] public Guid UserId { get; set; }
+    }
+
     public class Admin
     {
         [Key] public Guid UserId { get; set; }
diff --git a/Content.Server/Connection/ConnectionManager.Whitelist.cs b/Content.Server/Connection/ConnectionManager.Whitelist.cs
new file mode 100644
index 00000000000..212c87e17a6
--- /dev/null
+++ b/Content.Server/Connection/ConnectionManager.Whitelist.cs
@@ -0,0 +1,221 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Content.Server.Connection.Whitelist;
+using Content.Server.Connection.Whitelist.Conditions;
+using Content.Server.Database;
+using Content.Shared.CCVar;
+using Content.Shared.Database;
+using Content.Shared.Players.PlayTimeTracking;
+using Robust.Shared.Network;
+
+namespace Content.Server.Connection;
+
+/// <summary>
+/// Handles whitelist conditions for incoming connections.
+/// </summary>
+public sealed partial class ConnectionManager
+{
+    private PlayerConnectionWhitelistPrototype[]? _whitelists;
+
+    public void PostInit()
+    {
+        _cfg.OnValueChanged(CCVars.WhitelistPrototypeList, UpdateWhitelists, true);
+    }
+
+    private void UpdateWhitelists(string s)
+    {
+        var list = new List<PlayerConnectionWhitelistPrototype>();
+        foreach (var id in s.Split(','))
+        {
+            if (_prototypeManager.TryIndex(id, out PlayerConnectionWhitelistPrototype? prototype))
+            {
+                list.Add(prototype);
+            }
+            else
+            {
+                _sawmill.Fatal($"Whitelist prototype {id} does not exist. Denying all connections.");
+                _whitelists = null; // Invalidate the list, causes deny on all connections.
+                return;
+            }
+        }
+
+        _whitelists = list.ToArray();
+    }
+
+    private bool IsValid(PlayerConnectionWhitelistPrototype whitelist, int playerCount)
+    {
+        return playerCount >= whitelist.MinimumPlayers && playerCount <= whitelist.MaximumPlayers;
+    }
+
+    public async Task<(bool isWhitelisted, string? denyMessage)> IsWhitelisted(PlayerConnectionWhitelistPrototype whitelist, NetUserData data, ISawmill sawmill)
+    {
+        var cacheRemarks = await _db.GetAllAdminRemarks(data.UserId);
+        var cachePlaytime = await _db.GetPlayTimes(data.UserId);
+
+        foreach (var condition in whitelist.Conditions)
+        {
+            bool matched;
+            string denyMessage;
+            switch (condition)
+            {
+                case ConditionAlwaysMatch:
+                    matched = true;
+                    denyMessage = Loc.GetString("whitelist-always-deny");
+                    break;
+                case ConditionManualWhitelistMembership:
+                    matched = await CheckConditionManualWhitelist(data);
+                    denyMessage = Loc.GetString("whitelist-manual");
+                    break;
+                case ConditionManualBlacklistMembership:
+                    matched = await CheckConditionManualBlacklist(data);
+                    denyMessage = Loc.GetString("whitelist-blacklisted");
+                    break;
+                case ConditionNotesDateRange conditionNotes:
+                    matched = CheckConditionNotesDateRange(conditionNotes, cacheRemarks);
+                    denyMessage = Loc.GetString("whitelist-notes");
+                    break;
+                case ConditionPlayerCount conditionPlayerCount:
+                    matched = CheckConditionPlayerCount(conditionPlayerCount);
+                    denyMessage = Loc.GetString("whitelist-player-count");
+                    break;
+                case ConditionPlaytime conditionPlaytime:
+                    matched = CheckConditionPlaytime(conditionPlaytime, cachePlaytime);
+                    denyMessage = Loc.GetString("whitelist-playtime", ("minutes", conditionPlaytime.MinimumPlaytime));
+                    break;
+                case ConditionNotesPlaytimeRange conditionNotesPlaytimeRange:
+                    matched = CheckConditionNotesPlaytimeRange(conditionNotesPlaytimeRange, cacheRemarks, cachePlaytime);
+                    denyMessage = Loc.GetString("whitelist-notes");
+                    break;
+                default:
+                    throw new NotImplementedException($"Whitelist condition {condition.GetType().Name} not implemented");
+            }
+
+            sawmill.Verbose($"User {data.UserName} whitelist condition {condition.GetType().Name} result: {matched}");
+            sawmill.Verbose($"Action: {condition.Action.ToString()}");
+            switch (condition.Action)
+            {
+                case ConditionAction.Allow:
+                    if (matched)
+                    {
+                        sawmill.Verbose($"User {data.UserName} passed whitelist condition {condition.GetType().Name} and it's a breaking condition");
+                        return (true, denyMessage);
+                    }
+                    break;
+                case ConditionAction.Deny:
+                    if (matched)
+                    {
+                        sawmill.Verbose($"User {data.UserName} failed whitelist condition {condition.GetType().Name}");
+                        return (false, denyMessage);
+                    }
+                    break;
+                default:
+                    sawmill.Verbose($"User {data.UserName} failed whitelist condition {condition.GetType().Name} but it's not a breaking condition");
+                    break;
+            }
+        }
+        sawmill.Verbose($"User {data.UserName} passed all whitelist conditions");
+        return (true, null);
+    }
+
+    #region Condition Checking
+
+    private async Task<bool> CheckConditionManualWhitelist(NetUserData data)
+    {
+        return !(await _db.GetWhitelistStatusAsync(data.UserId));
+    }
+
+    private async Task<bool> CheckConditionManualBlacklist(NetUserData data)
+    {
+        return await _db.GetBlacklistStatusAsync(data.UserId);
+    }
+
+    private bool CheckConditionNotesDateRange(ConditionNotesDateRange conditionNotes, List<IAdminRemarksRecord> remarks)
+    {
+        var range = DateTime.UtcNow.AddDays(-conditionNotes.Range);
+
+        return CheckRemarks(remarks,
+            conditionNotes.IncludeExpired,
+            conditionNotes.IncludeSecret,
+            conditionNotes.MinimumSeverity,
+            conditionNotes.MinimumNotes,
+            adminRemarksRecord => adminRemarksRecord.CreatedAt > range);
+    }
+
+    private bool CheckConditionPlayerCount(ConditionPlayerCount conditionPlayerCount)
+    {
+        var count = _plyMgr.PlayerCount;
+        return count >= conditionPlayerCount.MinimumPlayers && count <= conditionPlayerCount.MaximumPlayers;
+    }
+
+    private bool CheckConditionPlaytime(ConditionPlaytime conditionPlaytime, List<PlayTime> playtime)
+    {
+        var tracker = playtime.Find(p => p.Tracker == PlayTimeTrackingShared.TrackerOverall);
+        if (tracker is null)
+        {
+            return false;
+        }
+
+        return tracker.TimeSpent.TotalMinutes >= conditionPlaytime.MinimumPlaytime;
+    }
+
+    private bool CheckConditionNotesPlaytimeRange(
+        ConditionNotesPlaytimeRange conditionNotesPlaytimeRange,
+        List<IAdminRemarksRecord> remarks,
+        List<PlayTime> playtime)
+    {
+        var overallTracker = playtime.Find(p => p.Tracker == PlayTimeTrackingShared.TrackerOverall);
+        if (overallTracker is null)
+        {
+            return false;
+        }
+
+        return CheckRemarks(remarks,
+            conditionNotesPlaytimeRange.IncludeExpired,
+            conditionNotesPlaytimeRange.IncludeSecret,
+            conditionNotesPlaytimeRange.MinimumSeverity,
+            conditionNotesPlaytimeRange.MinimumNotes,
+            adminRemarksRecord => adminRemarksRecord.PlaytimeAtNote >= overallTracker.TimeSpent - TimeSpan.FromMinutes(conditionNotesPlaytimeRange.Range));
+    }
+
+    private bool CheckRemarks(List<IAdminRemarksRecord> remarks, bool includeExpired, bool includeSecret, NoteSeverity minimumSeverity, int MinimumNotes, Func<IAdminRemarksRecord, bool> additionalCheck)
+    {
+        var utcNow = DateTime.UtcNow;
+
+        var notes = remarks.Count(r => r is AdminNoteRecord note && note.Severity >= minimumSeverity && (includeSecret || !note.Secret) && (includeExpired || note.ExpirationTime == null || note.ExpirationTime > utcNow));
+        if (notes < MinimumNotes)
+        {
+            return false;
+        }
+
+        foreach (var adminRemarksRecord in remarks)
+        {
+            // If we're not including expired notes, skip them
+            if (!includeExpired && (adminRemarksRecord.ExpirationTime == null || adminRemarksRecord.ExpirationTime <= utcNow))
+                continue;
+
+            // In order to get the severity of the remark, we need to see if it's an AdminNoteRecord.
+            if (adminRemarksRecord is not AdminNoteRecord adminNoteRecord)
+                continue;
+
+            // We want to filter out secret notes if we're not including them.
+            if (!includeSecret && adminNoteRecord.Secret)
+                continue;
+
+            // At this point, we need to remove the note if it's not within the severity range.
+            if (adminNoteRecord.Severity < minimumSeverity)
+                continue;
+
+            // Perform the additional check specific to each method
+            if (!additionalCheck(adminRemarksRecord))
+                continue;
+
+            // If we've made it this far, we have a match
+            return true;
+        }
+
+        // No matches
+        return false;
+    }
+
+    #endregion
+}
diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
index 0048d6069cd..18f0d6ba116 100644
--- a/Content.Server/Connection/ConnectionManager.cs
+++ b/Content.Server/Connection/ConnectionManager.cs
@@ -1,4 +1,9 @@
 using System.Collections.Immutable;
+using System.Linq;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using Content.Server.Connection.Whitelist;
+using Content.Server.Connection.Whitelist.Conditions;
 using System.Runtime.InteropServices;
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;
@@ -11,6 +16,8 @@
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Player;
 using Robust.Shared.Timing;
 
 /*
@@ -22,6 +29,7 @@ namespace Content.Server.Connection
     public interface IConnectionManager
     {
         void Initialize();
+        void PostInit();
 
         Task<bool> HasPrivilegedJoin(NetUserId userId);
 
@@ -41,7 +49,7 @@ public interface IConnectionManager
     /// <summary>
     ///     Handles various duties like guest username assignment, bans, connection logs, etc...
     /// </summary>
-    public sealed class ConnectionManager : IConnectionManager
+    public sealed partial class ConnectionManager : IConnectionManager
     {
         [Dependency] private readonly IServerDbManager _dbManager = default!;
         [Dependency] private readonly IPlayerManager _plyMgr = default!;
@@ -50,9 +58,11 @@ public sealed class ConnectionManager : IConnectionManager
         [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly ILocalizationManager _loc = default!;
         [Dependency] private readonly ServerDbEntryManager _serverDbEntry = default!;
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly ILogManager _logManager = default!;
 
+        private ISawmill _sawmill = default!;
         private readonly Dictionary<NetUserId, TimeSpan> _temporaryBypasses = [];
         private ISawmill _sawmill = default!;
 
@@ -227,9 +237,8 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
             if ((_plyMgr.PlayerCount >= _cfg.GetCVar(CCVars.SoftMaxPlayers) && !adminBypass) && !wasInGame)
                 return (ConnectionDenyReason.Full, Loc.GetString("soft-player-cap-full"), null);
 
-
-            // DeltaV - Replace existing softwhitelist implementation
-            if (_cfg.GetCVar(CCVars.WhitelistEnabled)) //_cfg.GetCVar(CCVars.WhitelistEnabled))
+            // Checks for whitelist IF it's enabled AND the user isn't an admin. Admins are always allowed.
+            if (false)
             {
                 var min = _cfg.GetCVar(CCVars.WhitelistMinPlayers);
                 var max = _cfg.GetCVar(CCVars.WhitelistMaxPlayers);
diff --git a/Content.Server/Connection/Whitelist/BlacklistCommands.cs b/Content.Server/Connection/Whitelist/BlacklistCommands.cs
new file mode 100644
index 00000000000..e79fb7ee22e
--- /dev/null
+++ b/Content.Server/Connection/Whitelist/BlacklistCommands.cs
@@ -0,0 +1,117 @@
+using Content.Server.Administration;
+using Content.Server.Database;
+using Content.Shared.Administration;
+using Robust.Shared.Console;
+
+namespace Content.Server.Connection.Whitelist;
+
+[AdminCommand(AdminFlags.Ban)]
+public sealed class AddBlacklistCommand : LocalizedCommands
+{
+    [Dependency] private readonly IPlayerLocator _playerLocator = default!;
+    [Dependency] private readonly IServerDbManager _db = default!;
+
+    public override string Command => "blacklistadd";
+
+    public override async void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (args.Length == 0)
+        {
+            shell.WriteError(Loc.GetString("shell-need-minimum-one-argument"));
+            shell.WriteLine(Help);
+            return;
+        }
+
+        if (args.Length > 1)
+        {
+            shell.WriteError(Loc.GetString("shell-need-exactly-one-argument"));
+            shell.WriteLine(Help);
+            return;
+        }
+
+        var name = args[0];
+        var data = await _playerLocator.LookupIdByNameAsync(name);
+
+        if (data == null)
+        {
+            shell.WriteError(Loc.GetString("cmd-blacklistadd-not-found", ("username", args[0])));
+            return;
+        }
+        var guid = data.UserId;
+        var isBlacklisted = await _db.GetBlacklistStatusAsync(guid);
+        if (isBlacklisted)
+        {
+            shell.WriteLine(Loc.GetString("cmd-blacklistadd-existing", ("username", data.Username)));
+            return;
+        }
+
+        await _db.AddToBlacklistAsync(guid);
+        shell.WriteLine(Loc.GetString("cmd-blacklistadd-added", ("username", data.Username)));
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length == 1)
+        {
+            return CompletionResult.FromHint(Loc.GetString("cmd-blacklistadd-arg-player"));
+        }
+
+        return CompletionResult.Empty;
+    }
+}
+
+[AdminCommand(AdminFlags.Ban)]
+public sealed class RemoveBlacklistCommand : LocalizedCommands
+{
+    [Dependency] private readonly IPlayerLocator _playerLocator = default!;
+    [Dependency] private readonly IServerDbManager _db = default!;
+
+    public override string Command => "blacklistremove";
+
+    public override async void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (args.Length == 0)
+        {
+            shell.WriteError(Loc.GetString("shell-need-minimum-one-argument"));
+            shell.WriteLine(Help);
+            return;
+        }
+
+        if (args.Length > 1)
+        {
+            shell.WriteError(Loc.GetString("shell-need-exactly-one-argument"));
+            shell.WriteLine(Help);
+            return;
+        }
+
+        var name = args[0];
+        var data = await _playerLocator.LookupIdByNameAsync(name);
+
+        if (data == null)
+        {
+            shell.WriteError(Loc.GetString("cmd-blacklistremove-not-found", ("username", args[0])));
+            return;
+        }
+
+        var guid = data.UserId;
+        var isBlacklisted = await _db.GetBlacklistStatusAsync(guid);
+        if (!isBlacklisted)
+        {
+            shell.WriteLine(Loc.GetString("cmd-blacklistremove-existing", ("username", data.Username)));
+            return;
+        }
+
+        await _db.RemoveFromBlacklistAsync(guid);
+        shell.WriteLine(Loc.GetString("cmd-blacklistremove-removed", ("username", data.Username)));
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length == 1)
+        {
+            return CompletionResult.FromHint(Loc.GetString("cmd-blacklistremove-arg-player"));
+        }
+
+        return CompletionResult.Empty;
+    }
+}
diff --git a/Content.Server/Connection/Whitelist/Conditions/ConditionAlwaysMatch.cs b/Content.Server/Connection/Whitelist/Conditions/ConditionAlwaysMatch.cs
new file mode 100644
index 00000000000..9fe5db40120
--- /dev/null
+++ b/Content.Server/Connection/Whitelist/Conditions/ConditionAlwaysMatch.cs
@@ -0,0 +1,12 @@
+using System.Threading.Tasks;
+using Robust.Shared.Network;
+
+namespace Content.Server.Connection.Whitelist.Conditions;
+
+/// <summary>
+/// Condition that always matches
+/// </summary>
+public sealed partial class ConditionAlwaysMatch : WhitelistCondition
+{
+
+}
diff --git a/Content.Server/Connection/Whitelist/Conditions/ConditionManualBlacklistMembership.cs b/Content.Server/Connection/Whitelist/Conditions/ConditionManualBlacklistMembership.cs
new file mode 100644
index 00000000000..9d67129e71f
--- /dev/null
+++ b/Content.Server/Connection/Whitelist/Conditions/ConditionManualBlacklistMembership.cs
@@ -0,0 +1,12 @@
+using System.Threading.Tasks;
+using Content.Server.Database;
+using Robust.Shared.Network;
+
+namespace Content.Server.Connection.Whitelist.Conditions;
+
+/// <summary>
+/// Condition that matches if the player is in the manual blacklist.
+/// </summary>
+public sealed partial class ConditionManualBlacklistMembership : WhitelistCondition
+{
+}
diff --git a/Content.Server/Connection/Whitelist/Conditions/ConditionManualWhitelistMembership.cs b/Content.Server/Connection/Whitelist/Conditions/ConditionManualWhitelistMembership.cs
new file mode 100644
index 00000000000..a31835f9c2f
--- /dev/null
+++ b/Content.Server/Connection/Whitelist/Conditions/ConditionManualWhitelistMembership.cs
@@ -0,0 +1,12 @@
+using System.Threading.Tasks;
+using Content.Server.Database;
+using Robust.Shared.Network;
+
+namespace Content.Server.Connection.Whitelist.Conditions;
+
+/// <summary>
+/// Condition that matches if the player is in the manual whitelist.
+/// </summary>
+public sealed partial class ConditionManualWhitelistMembership : WhitelistCondition
+{
+}
diff --git a/Content.Server/Connection/Whitelist/Conditions/ConditionNotesDateRange.cs b/Content.Server/Connection/Whitelist/Conditions/ConditionNotesDateRange.cs
new file mode 100644
index 00000000000..1e34bc63734
--- /dev/null
+++ b/Content.Server/Connection/Whitelist/Conditions/ConditionNotesDateRange.cs
@@ -0,0 +1,34 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Content.Server.Database;
+using Content.Shared.Database;
+using Robust.Shared.Network;
+
+namespace Content.Server.Connection.Whitelist.Conditions;
+
+/// <summary>
+/// Condition that matches if the player has notes within a certain date range.
+/// </summary>
+public sealed partial class ConditionNotesDateRange : WhitelistCondition
+{
+    [DataField]
+    public bool IncludeExpired = false;
+
+    [DataField]
+    public NoteSeverity MinimumSeverity  = NoteSeverity.Minor;
+
+    /// <summary>
+    /// The minimum number of notes required.
+    /// </summary>
+    [DataField]
+    public int MinimumNotes = 1;
+
+    /// <summary>
+    /// Range in days to check for notes.
+    /// </summary>
+    [DataField]
+    public int Range = int.MaxValue;
+
+    [DataField]
+    public bool IncludeSecret = false;
+}
diff --git a/Content.Server/Connection/Whitelist/Conditions/ConditionNotesPlaytimeRange.cs b/Content.Server/Connection/Whitelist/Conditions/ConditionNotesPlaytimeRange.cs
new file mode 100644
index 00000000000..d2d22a8cd0d
--- /dev/null
+++ b/Content.Server/Connection/Whitelist/Conditions/ConditionNotesPlaytimeRange.cs
@@ -0,0 +1,30 @@
+using Content.Shared.Database;
+
+namespace Content.Server.Connection.Whitelist.Conditions;
+
+/// <summary>
+/// Condition that matches if the player has notes within a certain playtime range.
+/// </summary>
+public sealed partial class ConditionNotesPlaytimeRange : WhitelistCondition
+{
+    [DataField]
+    public bool IncludeExpired = false;
+
+    [DataField]
+    public NoteSeverity MinimumSeverity  = NoteSeverity.Minor;
+
+    /// <summary>
+    /// The minimum number of notes required.
+    /// </summary>
+    [DataField]
+    public int MinimumNotes = 1;
+
+    /// <summary>
+    /// The range in minutes to check for notes.
+    /// </summary>
+    [DataField]
+    public int Range = int.MaxValue;
+
+    [DataField]
+    public bool IncludeSecret = false;
+}
diff --git a/Content.Server/Connection/Whitelist/Conditions/ConditionPlayerCount.cs b/Content.Server/Connection/Whitelist/Conditions/ConditionPlayerCount.cs
new file mode 100644
index 00000000000..432ad32c4ac
--- /dev/null
+++ b/Content.Server/Connection/Whitelist/Conditions/ConditionPlayerCount.cs
@@ -0,0 +1,16 @@
+using System.Threading.Tasks;
+using Robust.Server.Player;
+using Robust.Shared.Network;
+
+namespace Content.Server.Connection.Whitelist.Conditions;
+
+/// <summary>
+/// Condition that matches if the player count is within a certain range.
+/// </summary>
+public sealed partial class ConditionPlayerCount : WhitelistCondition
+{
+    [DataField]
+    public int MinimumPlayers  = 0;
+    [DataField]
+    public int MaximumPlayers = int.MaxValue;
+}
diff --git a/Content.Server/Connection/Whitelist/Conditions/ConditionPlaytime.cs b/Content.Server/Connection/Whitelist/Conditions/ConditionPlaytime.cs
new file mode 100644
index 00000000000..7b45181e120
--- /dev/null
+++ b/Content.Server/Connection/Whitelist/Conditions/ConditionPlaytime.cs
@@ -0,0 +1,15 @@
+using System.Threading.Tasks;
+using Content.Server.Database;
+using Content.Shared.Players.PlayTimeTracking;
+using Robust.Shared.Network;
+
+namespace Content.Server.Connection.Whitelist.Conditions;
+
+/// <summary>
+/// Condition that matches if the player has played for a certain amount of time.
+/// </summary>
+public sealed partial class ConditionPlaytime : WhitelistCondition
+{
+    [DataField]
+    public int MinimumPlaytime = 0; // In minutes
+}
diff --git a/Content.Server/Connection/Whitelist/WhitelistCondition.cs b/Content.Server/Connection/Whitelist/WhitelistCondition.cs
new file mode 100644
index 00000000000..b68fd529968
--- /dev/null
+++ b/Content.Server/Connection/Whitelist/WhitelistCondition.cs
@@ -0,0 +1,41 @@
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using Robust.Shared.Network;
+
+namespace Content.Server.Connection.Whitelist;
+
+/// <summary>
+/// This class is used to determine if a player should be allowed to join the server.
+/// It is used in <see cref="PlayerConnectionWhitelistPrototype"/>
+/// </summary>
+[ImplicitDataDefinitionForInheritors]
+[MeansImplicitUse]
+public abstract partial class WhitelistCondition
+{
+    /// <summary>
+    /// What action should be taken if this condition is met?
+    /// Defaults to <see cref="ConditionAction.Next"/>.
+    /// </summary>
+    [DataField]
+    public ConditionAction Action { get; set; } = ConditionAction.Next;
+}
+
+/// <summary>
+/// Determines what action should be taken if a condition is met.
+/// </summary>
+public enum ConditionAction
+{
+    /// <summary>
+    /// The player is allowed to join, and the next conditions will be skipped.
+    /// </summary>
+    Allow,
+    /// <summary>
+    /// The player is denied to join, and the next conditions will be skipped.
+    /// </summary>
+    Deny,
+    /// <summary>
+    /// The next condition should be checked.
+    /// </summary>
+    Next
+}
diff --git a/Content.Server/Connection/Whitelist/WhitelistPrototype.cs b/Content.Server/Connection/Whitelist/WhitelistPrototype.cs
new file mode 100644
index 00000000000..2b8b9babbc0
--- /dev/null
+++ b/Content.Server/Connection/Whitelist/WhitelistPrototype.cs
@@ -0,0 +1,42 @@
+using System.Threading.Tasks;
+using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Connection.Whitelist;
+
+/// <summary>
+/// Used by the <see cref="ConnectionManager"/> to determine if a player should be allowed to join the server.
+/// Used in the whitelist.prototype_list CVar.
+///
+/// Whitelists are used to determine if a player is allowed to connect.
+/// You define a PlayerConnectionWhitelist with a list of conditions.
+/// Every condition has a type and a <see cref="ConditionAction"/> along with other parameters depending on the type.
+/// Action must either be Allow, Deny or Next.
+/// Allow means the player is instantly allowed to connect if the condition is met.
+/// Deny means the player is instantly denied to connect if the condition is met.
+/// Next means the next condition in the list is checked.
+/// If the condition doesn't match, the next condition is checked.
+/// </summary>
+[Prototype("playerConnectionWhitelist")]
+public sealed class PlayerConnectionWhitelistPrototype : IPrototype
+{
+    [IdDataField]
+    public string ID { get; } = default!;
+
+    /// <summary>
+    /// Minimum number of players required for this whitelist to be active.
+    /// If there are less players than this, the whitelist will be ignored and the next one in the list will be used.
+    /// </summary>
+    [DataField]
+    public int MinimumPlayers { get; } = 0;
+
+    /// <summary>
+    /// Maximum number of players allowed for this whitelist to be active.
+    /// If there are more players than this, the whitelist will be ignored and the next one in the list will be used.
+    /// </summary>
+    [DataField]
+    public int MaximumPlayers { get; } = int.MaxValue;
+
+    [DataField]
+    public WhitelistCondition[] Conditions { get; } = default!;
+}
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index b636411ff5e..5f9ef727d61 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -1041,6 +1041,29 @@ public async Task SetLastReadRules(NetUserId player, DateTimeOffset date)
             await db.DbContext.SaveChangesAsync();
         }
 
+        public async Task<bool> GetBlacklistStatusAsync(NetUserId player)
+        {
+            await using var db = await GetDb();
+
+            return await db.DbContext.Blacklist.AnyAsync(w => w.UserId == player);
+        }
+
+        public async Task AddToBlacklistAsync(NetUserId player)
+        {
+            await using var db = await GetDb();
+
+            db.DbContext.Blacklist.Add(new Blacklist() { UserId = player });
+            await db.DbContext.SaveChangesAsync();
+        }
+
+        public async Task RemoveFromBlacklistAsync(NetUserId player)
+        {
+            await using var db = await GetDb();
+            var entry = await db.DbContext.Blacklist.SingleAsync(w => w.UserId == player);
+            db.DbContext.Blacklist.Remove(entry);
+            await db.DbContext.SaveChangesAsync();
+        }
+
         #endregion
 
         #region Uploaded Resources Logs
diff --git a/Content.Server/Database/ServerDbManager.cs b/Content.Server/Database/ServerDbManager.cs
index d3099500622..c614e231cca 100644
--- a/Content.Server/Database/ServerDbManager.cs
+++ b/Content.Server/Database/ServerDbManager.cs
@@ -251,6 +251,16 @@ Task<int> AddConnectionLogAsync(
 
         #endregion
 
+        #region Blacklist
+
+        Task<bool> GetBlacklistStatusAsync(NetUserId player);
+
+        Task AddToBlacklistAsync(NetUserId player);
+
+        Task RemoveFromBlacklistAsync(NetUserId player);
+
+        #endregion
+
         #region Uploaded Resources Logs
 
         Task AddUploadedResourceLogAsync(NetUserId user, DateTimeOffset date, string path, byte[] data);
@@ -751,6 +761,24 @@ public Task RemoveFromWhitelistAsync(NetUserId player)
             return RunDbCommand(() => _db.RemoveFromWhitelistAsync(player));
         }
 
+        public Task<bool> GetBlacklistStatusAsync(NetUserId player)
+        {
+            DbReadOpsMetric.Inc();
+            return RunDbCommand(() => _db.GetBlacklistStatusAsync(player));
+        }
+
+        public Task AddToBlacklistAsync(NetUserId player)
+        {
+            DbWriteOpsMetric.Inc();
+            return RunDbCommand(() => _db.AddToBlacklistAsync(player));
+        }
+
+        public Task RemoveFromBlacklistAsync(NetUserId player)
+        {
+            DbWriteOpsMetric.Inc();
+            return RunDbCommand(() => _db.RemoveFromBlacklistAsync(player));
+        }
+
         public Task AddUploadedResourceLogAsync(NetUserId user, DateTimeOffset date, string path, byte[] data)
         {
             DbWriteOpsMetric.Inc();
diff --git a/Content.Server/Entry/EntryPoint.cs b/Content.Server/Entry/EntryPoint.cs
index 97a9ba2535e..8000f2ef027 100644
--- a/Content.Server/Entry/EntryPoint.cs
+++ b/Content.Server/Entry/EntryPoint.cs
@@ -151,6 +151,7 @@ public override void PostInit()
                 IoCManager.Resolve<IGameMapManager>().Initialize();
                 IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<GameTicker>().PostInitialize();
                 IoCManager.Resolve<IBanManager>().Initialize();
+                IoCManager.Resolve<IConnectionManager>().PostInit();
             }
         }
 
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 9d3265ef220..73970409c82 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -1543,22 +1543,11 @@ public static readonly CVarDef<bool>
             CVarDef.Create("whitelist.enabled", false, CVar.REPLICATED);
 
         /// <summary>
-        ///     The loc string to display as a disconnect reason when someone is not whitelisted.
+        ///     Specifies the whitelist prototypes to be used by the server. This should be a comma-separated list of prototypes.
+        ///     If a whitelists conditions to be active fail (for example player count), the next whitelist will be used instead. If no whitelist is valid, the player will be allowed to connect.
         /// </summary>
-        public static readonly CVarDef<string> WhitelistReason =
-            CVarDef.Create("whitelist.reason", "whitelist-not-whitelisted", CVar.SERVERONLY);
-
-        /// <summary>
-        ///     If the playercount is below this number, the whitelist will not apply.
-        /// </summary>
-        public static readonly CVarDef<int> WhitelistMinPlayers =
-            CVarDef.Create("whitelist.min_players", 0, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     If the playercount is above this number, the whitelist will not apply.
-        /// </summary>
-        public static readonly CVarDef<int> WhitelistMaxPlayers =
-            CVarDef.Create("whitelist.max_players", int.MaxValue, CVar.SERVERONLY);
+        public static readonly CVarDef<string> WhitelistPrototypeList =
+            CVarDef.Create("whitelist.prototype_list", "basicWhitelist", CVar.SERVERONLY);
 
         /*
          * VOTE
diff --git a/Resources/Locale/en-US/connection-messages.ftl b/Resources/Locale/en-US/connection-messages.ftl
index 309e8fc2f83..c8f29cdf848 100644
--- a/Resources/Locale/en-US/connection-messages.ftl
+++ b/Resources/Locale/en-US/connection-messages.ftl
@@ -1,16 +1,4 @@
-whitelist-not-whitelisted = You are not whitelisted.
-
-# proper handling for having a min/max or not
-whitelist-playercount-invalid = {$min ->
-    [0] The whitelist for this server only applies below {$max} players.
-    *[other] The whitelist for this server only applies above {$min} {$max ->
-        [2147483647] -> players, so you may be able to join later.
-       *[other] -> players and below {$max} players, so you may be able to join later.
-    }
-}
-whitelist-not-whitelisted-rp = You are not whitelisted. To become whitelisted, visit our Discord (which can be found at https://spacestation14.io) and check the #rp-whitelist channel.
-
-cmd-whitelistadd-desc = Adds the player with the given username to the server whitelist.
+cmd-whitelistadd-desc = Adds the player with the given username to the server whitelist.
 cmd-whitelistadd-help = Usage: whitelistadd <username or User ID>
 cmd-whitelistadd-existing = {$username} is already on the whitelist!
 cmd-whitelistadd-added = {$username} added to the whitelist
@@ -40,8 +28,30 @@ panic-bunker-account-denied-reason = This server is in panic bunker mode, often
 panic-bunker-account-reason-account = Your Space Station 14 account is too new. It must be older than {$minutes} minutes
 panic-bunker-account-reason-overall = Your overall playtime on the server must be greater than {$minutes} $minutes
 
+whitelist-playtime = You do not have enough playtime to join this server. You need at least {$minutes} minutes of playtime to join this server.
+whitelist-player-count = This server is currently not accepting players. Please try again later.
+whitelist-notes = You currently have too many admin notes to join this server. You can check your notes by typing /adminremarks in chat.
+whitelist-manual = You are not whitelisted on this server.
+whitelist-blacklisted = You are blacklisted from this server.
+whitelist-always-deny = You are not allowed to join this server.
+whitelist-fail-prefix = Not whitelisted: {$msg}
+whitelist-misconfigured = The server is misconfigured and is not accepting players. Please contact the server owner and try again later.
+
+cmd-blacklistadd-desc = Adds the player with the given username to the server blacklist.
+cmd-blacklistadd-help = Usage: blacklistadd <username>
+cmd-blacklistadd-existing = {$username} is already on the blacklist!
+cmd-blacklistadd-added = {$username} added to the blacklist
+cmd-blacklistadd-not-found = Unable to find '{$username}'
+cmd-blacklistadd-arg-player = [player]
+
+cmd-blacklistremove-desc = Removes the player with the given username from the server blacklist.
+cmd-blacklistremove-help = Usage: blacklistremove <username>
+cmd-blacklistremove-existing = {$username} is not on the blacklist!
+cmd-blacklistremove-removed = {$username} removed from the blacklist
+cmd-blacklistremove-not-found = Unable to find '{$username}'
+cmd-blacklistremove-arg-player = [player]
+
 baby-jail-account-denied = This server is a newbie server, intended for new players and those who want to help them. New connections by accounts that are too old or are not on a whitelist are not accepted. Check out some other servers and see everything Space Station 14 has to offer. Have fun!
 baby-jail-account-denied-reason = This server is a newbie server, intended for new players and those who want to help them. New connections by accounts that are too old or are not on a whitelist are not accepted. Check out some other servers and see everything Space Station 14 has to offer. Have fun! Reason: "{$reason}"
 baby-jail-account-reason-account = Your Space Station 14 account is too old. It must be younger than {$minutes} minutes
 baby-jail-account-reason-overall = Your overall playtime on the server must be younger than {$minutes} $minutes
-
diff --git a/Resources/Prototypes/whitelists.yml b/Resources/Prototypes/whitelists.yml
new file mode 100644
index 00000000000..8a99aa30eab
--- /dev/null
+++ b/Resources/Prototypes/whitelists.yml
@@ -0,0 +1,7 @@
+- type: playerConnectionWhitelist
+  id: basicWhitelist # Basic whitelist using only the ManualWhitelist condition
+  conditions:
+    - !type:ConditionManualWhitelistMembership
+      action: Allow # Allow connection if matched
+    - !type:ConditionAlwaysMatch # Condition that always matches
+      action: Deny # Deny connection if matched
diff --git a/Resources/Prototypes/wizardsDenWhitelists.yml b/Resources/Prototypes/wizardsDenWhitelists.yml
new file mode 100644
index 00000000000..c21d01e5a89
--- /dev/null
+++ b/Resources/Prototypes/wizardsDenWhitelists.yml
@@ -0,0 +1,39 @@
+# This is the whitelist used for Wizard's Den Salamander
+
+- type: playerConnectionWhitelist
+  id: salamanderMrpWhitelist
+  conditions:
+  - !type:ConditionManualBlacklistMembership # Deny blacklisted (MRP ban)
+    action: Deny
+  - !type:ConditionNotesPlaytimeRange # Deny for high severity notes in the last 30 days
+    includeExpired: false
+    minimumSeverity: 3 # High
+    minimumNotes: 1
+    range: 30 # 30 days
+    action: Deny
+    includeSecret: false
+  - !type:ConditionNotesPlaytimeRange # Deny for >=2 medium severity notes in the last 14 days
+    includeExpired: false
+    minimumSeverity: 2 # Medium
+    minimumNotes: 1
+    range: 14 # 14 Days
+    action: Deny
+    includeSecret: false
+  - !type:ConditionNotesPlaytimeRange # Deny for >=3 low severity notes in the last 14 days
+    includeExpired: false
+    minimumSeverity: 1 # Low
+    minimumNotes: 3
+    range: 14 # 14 Days
+    action: Deny
+    includeSecret: false
+  - !type:ConditionManualWhitelistMembership # Allow whitelisted players
+    action: Allow
+  - !type:ConditionPlayerCount # Allow when <= 15 players are online
+    minimumPlayers: 0
+    maximumPlayers: 15
+    action: Allow
+  #- !type:ConditionPlaytime
+  #  minimumPlaytime: 1200 # 20 hours to be whitelisted
+  #  action: Deny
+  - !type:ConditionAlwaysMatch
+    action: Deny

From bf75328bb4489b4b666b7ea352d0ed951d08be1c Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Fri, 21 Jun 2024 15:29:10 +0200
Subject: [PATCH 261/366] Add time index to connection log (#29281)

* Add time index to connection log

Queries go nyoom.

* Don't let me code shit at 5 AM
---
 ...1120713_ConnectionLogTimeIndex.Designer.cs | 1915 +++++++++++++++++
 .../20240621120713_ConnectionLogTimeIndex.cs  |   27 +
 .../PostgresServerDbContextModelSnapshot.cs   |    2 +
 ...1120705_ConnectionLogTimeIndex.Designer.cs | 1840 ++++++++++++++++
 .../20240621120705_ConnectionLogTimeIndex.cs  |   27 +
 .../SqliteServerDbContextModelSnapshot.cs     |    2 +
 Content.Server.Database/Model.cs              |    3 +
 7 files changed, 3816 insertions(+)
 create mode 100644 Content.Server.Database/Migrations/Postgres/20240621120713_ConnectionLogTimeIndex.Designer.cs
 create mode 100644 Content.Server.Database/Migrations/Postgres/20240621120713_ConnectionLogTimeIndex.cs
 create mode 100644 Content.Server.Database/Migrations/Sqlite/20240621120705_ConnectionLogTimeIndex.Designer.cs
 create mode 100644 Content.Server.Database/Migrations/Sqlite/20240621120705_ConnectionLogTimeIndex.cs

diff --git a/Content.Server.Database/Migrations/Postgres/20240621120713_ConnectionLogTimeIndex.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240621120713_ConnectionLogTimeIndex.Designer.cs
new file mode 100644
index 00000000000..8bd837236af
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20240621120713_ConnectionLogTimeIndex.Designer.cs
@@ -0,0 +1,1915 @@
+// <auto-generated />
+using System;
+using System.Net;
+using System.Text.Json;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using NpgsqlTypes;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    [DbContext(typeof(PostgresServerDbContext))]
+    [Migration("20240621120713_ConnectionLogTimeIndex")]
+    partial class ConnectionLogTimeIndex
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.0")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("boolean")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<short>("Impact")
+                        .HasColumnType("smallint")
+                        .HasColumnName("impact");
+
+                    b.Property<JsonDocument>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Message")
+                        .HasAnnotation("Npgsql:TsVectorConfig", "english");
+
+                    NpgsqlIndexBuilderExtensions.HasMethod(b.HasIndex("Message"), "GIN");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("integer")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_messages_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dismissed");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("boolean")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_notes_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("boolean")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_watchlists_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("antag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("assigned_user_id_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<IPAddress>("Address")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("smallint")
+                        .HasColumnName("denied");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("time");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("Time");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("job_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("play_time_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("interval")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("player_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<IPAddress>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<byte[]>("LastSeenHWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("last_seen_hwid");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", null, t =>
+                        {
+                            t.HasCheckConstraint("LastSeenAddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= last_seen_address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("integer")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Age")
+                        .HasColumnType("integer")
+                        .HasColumnName("age");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_name");
+
+                    b.Property<JsonDocument>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("integer")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("integer")
+                        .HasColumnName("slot");
+
+                    b.Property<int>("SpawnPriority")
+                        .HasColumnType("integer")
+                        .HasColumnName("spawn_priority");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<int>("ProfileLoadoutGroupId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout");
+
+                    b.HasIndex("ProfileLoadoutGroupId");
+
+                    b.ToTable("profile_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("group_name");
+
+                    b.Property<int>("ProfileRoleLoadoutId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout_group");
+
+                    b.HasIndex("ProfileRoleLoadoutId");
+
+                    b.ToTable("profile_loadout_group", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("RoleName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_role_loadout");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("profile_role_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.HasKey("PlayerUserId", "RoleId")
+                        .HasName("PK_role_whitelists");
+
+                    b.ToTable("role_whitelists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<NpgsqlInet?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("boolean")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("integer")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("integer")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_hit_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_role_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<NpgsqlInet?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("role_unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("trait_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("integer")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileLoadoutGroup", "ProfileLoadoutGroup")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileLoadoutGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_profile_loadout_group_profile_loadout_group~");
+
+                    b.Navigation("ProfileLoadoutGroup");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileRoleLoadout", "ProfileRoleLoadout")
+                        .WithMany("Groups")
+                        .HasForeignKey("ProfileRoleLoadoutId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_group_profile_role_loadout_profile_role_loa~");
+
+                    b.Navigation("ProfileRoleLoadout");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_role_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("JobWhitelists")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_role_whitelists_player_player_user_id");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+
+                    b.Navigation("JobWhitelists");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Loadouts");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Navigation("Loadouts");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Navigation("Groups");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/20240621120713_ConnectionLogTimeIndex.cs b/Content.Server.Database/Migrations/Postgres/20240621120713_ConnectionLogTimeIndex.cs
new file mode 100644
index 00000000000..736e9e37a22
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20240621120713_ConnectionLogTimeIndex.cs
@@ -0,0 +1,27 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    /// <inheritdoc />
+    public partial class ConnectionLogTimeIndex : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateIndex(
+                name: "IX_connection_log_time",
+                table: "connection_log",
+                column: "time");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_connection_log_time",
+                table: "connection_log");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
index 633d494beb2..a34a089d3d5 100644
--- a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
@@ -631,6 +631,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.HasIndex("ServerId")
                         .HasDatabaseName("IX_connection_log_server_id");
 
+                    b.HasIndex("Time");
+
                     b.HasIndex("UserId");
 
                     b.ToTable("connection_log", null, t =>
diff --git a/Content.Server.Database/Migrations/Sqlite/20240621120705_ConnectionLogTimeIndex.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240621120705_ConnectionLogTimeIndex.Designer.cs
new file mode 100644
index 00000000000..b3e512548ad
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240621120705_ConnectionLogTimeIndex.Designer.cs
@@ -0,0 +1,1840 @@
+// <auto-generated />
+using System;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    [DbContext(typeof(SqliteServerDbContext))]
+    [Migration("20240621120705_ConnectionLogTimeIndex")]
+    partial class ConnectionLogTimeIndex
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.0");
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_flag_id");
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<sbyte>("Impact")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("impact");
+
+                    b.Property<string>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_messages_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("dismissed");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_notes_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_watchlists_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("antag_id");
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("assigned_user_id_id");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_log_id");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("denied");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("Time");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("job_id");
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("play_time_id");
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("player_id");
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<string>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<byte[]>("LastSeenHWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("last_seen_hwid");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<int>("Age")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("age");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_name");
+
+                    b.Property<byte[]>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("slot");
+
+                    b.Property<int>("SpawnPriority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("spawn_priority");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_id");
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<int>("ProfileLoadoutGroupId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout");
+
+                    b.HasIndex("ProfileLoadoutGroupId");
+
+                    b.ToTable("profile_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("group_name");
+
+                    b.Property<int>("ProfileRoleLoadoutId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout_group");
+
+                    b.HasIndex("ProfileRoleLoadoutId");
+
+                    b.ToTable("profile_loadout_group", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("RoleName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_role_loadout");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("profile_role_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.HasKey("PlayerUserId", "RoleId")
+                        .HasName("PK_role_whitelists");
+
+                    b.ToTable("role_whitelists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_hit_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_role_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("role_unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("trait_id");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("BLOB")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileLoadoutGroup", "ProfileLoadoutGroup")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileLoadoutGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_profile_loadout_group_profile_loadout_group_id");
+
+                    b.Navigation("ProfileLoadoutGroup");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileRoleLoadout", "ProfileRoleLoadout")
+                        .WithMany("Groups")
+                        .HasForeignKey("ProfileRoleLoadoutId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_group_profile_role_loadout_profile_role_loadout_id");
+
+                    b.Navigation("ProfileRoleLoadout");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_role_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("JobWhitelists")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_role_whitelists_player_player_user_id");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+
+                    b.Navigation("JobWhitelists");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Loadouts");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Navigation("Loadouts");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Navigation("Groups");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/20240621120705_ConnectionLogTimeIndex.cs b/Content.Server.Database/Migrations/Sqlite/20240621120705_ConnectionLogTimeIndex.cs
new file mode 100644
index 00000000000..f97c62f6ccf
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240621120705_ConnectionLogTimeIndex.cs
@@ -0,0 +1,27 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    /// <inheritdoc />
+    public partial class ConnectionLogTimeIndex : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateIndex(
+                name: "IX_connection_log_time",
+                table: "connection_log",
+                column: "time");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_connection_log_time",
+                table: "connection_log");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
index e8d2247cfa0..0b9344c2446 100644
--- a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
@@ -597,6 +597,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.HasIndex("ServerId")
                         .HasDatabaseName("IX_connection_log_server_id");
 
+                    b.HasIndex("Time");
+
                     b.HasIndex("UserId");
 
                     b.ToTable("connection_log", (string)null);
diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index 5a43da21a8f..ba40b5ba08b 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -179,6 +179,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             modelBuilder.Entity<ConnectionLog>()
                 .HasIndex(p => p.UserId);
 
+            modelBuilder.Entity<ConnectionLog>()
+                .HasIndex(p => p.Time);
+
             modelBuilder.Entity<ConnectionLog>()
                 .Property(p => p.ServerId)
                 .HasDefaultValue(0);

From c769e77d7de6e788414ca8e6ff022fb25fc8af91 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Fri, 22 Mar 2024 16:50:55 +0100
Subject: [PATCH 262/366] Fix missing semicolon after migration. (#26337)

Are you kidding me EFCore doesn't sanitize this itself?
---
 .../Migrations/Postgres/20240318022005_AdminMessageDismiss.cs   | 2 +-
 .../Migrations/Sqlite/20240318021959_AdminMessageDismiss.cs     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Server.Database/Migrations/Postgres/20240318022005_AdminMessageDismiss.cs b/Content.Server.Database/Migrations/Postgres/20240318022005_AdminMessageDismiss.cs
index 9911aeffe2c..372eecc5859 100644
--- a/Content.Server.Database/Migrations/Postgres/20240318022005_AdminMessageDismiss.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240318022005_AdminMessageDismiss.cs
@@ -17,7 +17,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 nullable: false,
                 defaultValue: false);
 
-            migrationBuilder.Sql("UPDATE admin_messages SET dismissed = seen");
+            migrationBuilder.Sql("UPDATE admin_messages SET dismissed = seen;");
 
             migrationBuilder.AddCheckConstraint(
                 name: "NotDismissedAndSeen",
diff --git a/Content.Server.Database/Migrations/Sqlite/20240318021959_AdminMessageDismiss.cs b/Content.Server.Database/Migrations/Sqlite/20240318021959_AdminMessageDismiss.cs
index 4cad4b81367..e0f7d0e0c78 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240318021959_AdminMessageDismiss.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240318021959_AdminMessageDismiss.cs
@@ -17,7 +17,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 nullable: false,
                 defaultValue: false);
 
-            migrationBuilder.Sql("UPDATE admin_messages SET dismissed = seen");
+            migrationBuilder.Sql("UPDATE admin_messages SET dismissed = seen;");
 
             migrationBuilder.AddCheckConstraint(
                 name: "NotDismissedAndSeen",

From 6352f51b98ce4bf2494e92ebe29ffea24dfba06d Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Sun, 23 Jun 2024 17:33:54 +0200
Subject: [PATCH 263/366] Ban template system (#29365)

To help out admins, so they can easily fill out datacenter bans and stuff. Supports ban exemption flags and everything.

This is for use with SS14.Admin so it's just DB models here.
---
 .../20240623005121_BanTemplate.Designer.cs    | 279 ++++++++++++------
 .../20240623005113_BanTemplate.Designer.cs    | 267 ++++++++++++-----
 Content.Server.Database/Model.cs              |   1 +
 3 files changed, 385 insertions(+), 162 deletions(-)

diff --git a/Content.Server.Database/Migrations/Postgres/20240623005121_BanTemplate.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240623005121_BanTemplate.Designer.cs
index 2fb55ddfec8..5d89f3dd29b 100644
--- a/Content.Server.Database/Migrations/Postgres/20240623005121_BanTemplate.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240623005121_BanTemplate.Designer.cs
@@ -15,7 +15,7 @@
 namespace Content.Server.Database.Migrations.Postgres
 {
     [DbContext(typeof(PostgresServerDbContext))]
-    [Migration("20240623005113_BanTemplate")]
+    [Migration("20240623005121_BanTemplate")]
     partial class BanTemplate
     {
         /// <inheritdoc />
@@ -186,6 +186,10 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("deleted_by_id");
 
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dismissed");
+
                     b.Property<DateTime?>("ExpirationTime")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("expiration_time");
@@ -235,7 +239,10 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.HasIndex("RoundId")
                         .HasDatabaseName("IX_admin_messages_round_id");
 
-                    b.ToTable("admin_messages", (string)null);
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
                 });
 
             modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
@@ -509,49 +516,49 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                 });
 
             modelBuilder.Entity("Content.Server.Database.BanTemplate", b =>
-            {
-                b.Property<int>("Id")
-                    .ValueGeneratedOnAdd()
-                    .HasColumnType("integer")
-                    .HasColumnName("ban_template_id");
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_template_id");
 
-                NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
-                b.Property<bool>("AutoDelete")
-                    .HasColumnType("boolean")
-                    .HasColumnName("auto_delete");
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("boolean")
+                        .HasColumnName("auto_delete");
 
-                b.Property<int>("ExemptFlags")
-                    .HasColumnType("integer")
-                    .HasColumnName("exempt_flags");
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("integer")
+                        .HasColumnName("exempt_flags");
 
-                b.Property<bool>("Hidden")
-                    .HasColumnType("boolean")
-                    .HasColumnName("hidden");
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
 
-                b.Property<TimeSpan>("Length")
-                    .HasColumnType("interval")
-                    .HasColumnName("length");
+                    b.Property<TimeSpan>("Length")
+                        .HasColumnType("interval")
+                        .HasColumnName("length");
 
-                b.Property<string>("Reason")
-                    .IsRequired()
-                    .HasColumnType("text")
-                    .HasColumnName("reason");
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
 
-                b.Property<int>("Severity")
-                    .HasColumnType("integer")
-                    .HasColumnName("severity");
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
 
-                b.Property<string>("Title")
-                    .IsRequired()
-                    .HasColumnType("text")
-                    .HasColumnName("title");
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("title");
 
-                b.HasKey("Id")
-                    .HasName("PK_ban_template");
+                    b.HasKey("Id")
+                        .HasName("PK_ban_template");
 
-                b.ToTable("ban_template", (string)null);
-            });
+                    b.ToTable("ban_template", (string)null);
+                });
 
             modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
                 {
@@ -600,6 +607,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.HasIndex("ServerId")
                         .HasDatabaseName("IX_connection_log_server_id");
 
+                    b.HasIndex("Time");
+
                     b.HasIndex("UserId");
 
                     b.ToTable("connection_log", null, t =>
@@ -645,33 +654,6 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.ToTable("job", (string)null);
                 });
 
-            modelBuilder.Entity("Content.Server.Database.Loadout", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("loadout_id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("LoadoutName")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("loadout_name");
-
-                    b.Property<int>("ProfileId")
-                        .HasColumnType("integer")
-                        .HasColumnName("profile_id");
-
-                    b.HasKey("Id")
-                        .HasName("PK_loadout");
-
-                    b.HasIndex("ProfileId", "LoadoutName")
-                        .IsUnique();
-
-                    b.ToTable("loadout", (string)null);
-                });
-
             modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
                 {
                     b.Property<int>("Id")
@@ -803,21 +785,11 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("age");
 
-                    b.Property<string>("Backpack")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("backpack");
-
                     b.Property<string>("CharacterName")
                         .IsRequired()
                         .HasColumnType("text")
                         .HasColumnName("char_name");
 
-                    b.Property<string>("Clothing")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("clothing");
-
                     b.Property<string>("EyeColor")
                         .IsRequired()
                         .HasColumnType("text")
@@ -900,6 +872,100 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.ToTable("profile", (string)null);
                 });
 
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<int>("ProfileLoadoutGroupId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout");
+
+                    b.HasIndex("ProfileLoadoutGroupId");
+
+                    b.ToTable("profile_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("group_name");
+
+                    b.Property<int>("ProfileRoleLoadoutId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout_group");
+
+                    b.HasIndex("ProfileRoleLoadoutId");
+
+                    b.ToTable("profile_loadout_group", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("RoleName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_role_loadout");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("profile_role_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.HasKey("PlayerUserId", "RoleId")
+                        .HasName("PK_role_whitelists");
+
+                    b.ToTable("role_whitelists", (string)null);
+                });
+
             modelBuilder.Entity("Content.Server.Database.Round", b =>
                 {
                     b.Property<int>("Id")
@@ -913,10 +979,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("server_id");
 
-                    b.Property<DateTime>("StartDate")
-                        .ValueGeneratedOnAdd()
+                    b.Property<DateTime?>("StartDate")
                         .HasColumnType("timestamp with time zone")
-                        .HasDefaultValue(new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified))
                         .HasColumnName("start_date");
 
                     b.HasKey("Id")
@@ -1577,28 +1641,65 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Navigation("Profile");
                 });
 
-            modelBuilder.Entity("Content.Server.Database.Loadout", b =>
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileLoadoutGroup", "ProfileLoadoutGroup")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileLoadoutGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_profile_loadout_group_profile_loadout_group~");
+
+                    b.Navigation("ProfileLoadoutGroup");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileRoleLoadout", "ProfileRoleLoadout")
+                        .WithMany("Groups")
+                        .HasForeignKey("ProfileRoleLoadoutId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_group_profile_role_loadout_profile_role_loa~");
+
+                    b.Navigation("ProfileRoleLoadout");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
                 {
                     b.HasOne("Content.Server.Database.Profile", "Profile")
                         .WithMany("Loadouts")
                         .HasForeignKey("ProfileId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired()
-                        .HasConstraintName("FK_loadout_profile_profile_id");
+                        .HasConstraintName("FK_profile_role_loadout_profile_profile_id");
 
                     b.Navigation("Profile");
                 });
 
-            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
                 {
-                    b.HasOne("Content.Server.Database.Preference", "Preference")
-                        .WithMany("Profiles")
-                        .HasForeignKey("PreferenceId")
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("JobWhitelists")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired()
-                        .HasConstraintName("FK_profile_preference_preference_id");
+                        .HasConstraintName("FK_role_whitelists_player_player_user_id");
 
-                    b.Navigation("Preference");
+                    b.Navigation("Player");
                 });
 
             modelBuilder.Entity("Content.Server.Database.Round", b =>
@@ -1800,6 +1901,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Navigation("AdminWatchlistsLastEdited");
 
                     b.Navigation("AdminWatchlistsReceived");
+
+                    b.Navigation("JobWhitelists");
                 });
 
             modelBuilder.Entity("Content.Server.Database.Preference", b =>
@@ -1818,6 +1921,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Navigation("Traits");
                 });
 
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Navigation("Loadouts");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Navigation("Groups");
+                });
+
             modelBuilder.Entity("Content.Server.Database.Round", b =>
                 {
                     b.Navigation("AdminLogs");
diff --git a/Content.Server.Database/Migrations/Sqlite/20240623005113_BanTemplate.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240623005113_BanTemplate.Designer.cs
index 0bf74f84a70..acce21c2bd9 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240623005113_BanTemplate.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240623005113_BanTemplate.Designer.cs
@@ -169,6 +169,10 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("TEXT")
                         .HasColumnName("deleted_by_id");
 
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("dismissed");
+
                     b.Property<DateTime?>("ExpirationTime")
                         .HasColumnType("TEXT")
                         .HasColumnName("expiration_time");
@@ -218,7 +222,10 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.HasIndex("RoundId")
                         .HasDatabaseName("IX_admin_messages_round_id");
 
-                    b.ToTable("admin_messages", (string)null);
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
                 });
 
             modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
@@ -480,47 +487,47 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                 });
 
             modelBuilder.Entity("Content.Server.Database.BanTemplate", b =>
-            {
-                b.Property<int>("Id")
-                    .ValueGeneratedOnAdd()
-                    .HasColumnType("INTEGER")
-                    .HasColumnName("ban_template_id");
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_template_id");
 
-                b.Property<bool>("AutoDelete")
-                    .HasColumnType("INTEGER")
-                    .HasColumnName("auto_delete");
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("auto_delete");
 
-                b.Property<int>("ExemptFlags")
-                    .HasColumnType("INTEGER")
-                    .HasColumnName("exempt_flags");
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("exempt_flags");
 
-                b.Property<bool>("Hidden")
-                    .HasColumnType("INTEGER")
-                    .HasColumnName("hidden");
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
 
-                b.Property<TimeSpan>("Length")
-                    .HasColumnType("TEXT")
-                    .HasColumnName("length");
+                    b.Property<TimeSpan>("Length")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("length");
 
-                b.Property<string>("Reason")
-                    .IsRequired()
-                    .HasColumnType("TEXT")
-                    .HasColumnName("reason");
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
 
-                b.Property<int>("Severity")
-                    .HasColumnType("INTEGER")
-                    .HasColumnName("severity");
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
 
-                b.Property<string>("Title")
-                    .IsRequired()
-                    .HasColumnType("TEXT")
-                    .HasColumnName("title");
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("title");
 
-                b.HasKey("Id")
-                    .HasName("PK_ban_template");
+                    b.HasKey("Id")
+                        .HasName("PK_ban_template");
 
-                b.ToTable("ban_template", (string)null);
-            });
+                    b.ToTable("ban_template", (string)null);
+                });
 
             modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
                 {
@@ -567,6 +574,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.HasIndex("ServerId")
                         .HasDatabaseName("IX_connection_log_server_id");
 
+                    b.HasIndex("Time");
+
                     b.HasIndex("UserId");
 
                     b.ToTable("connection_log", (string)null);
@@ -607,31 +616,6 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.ToTable("job", (string)null);
                 });
 
-            modelBuilder.Entity("Content.Server.Database.Loadout", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("loadout_id");
-
-                    b.Property<string>("LoadoutName")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("loadout_name");
-
-                    b.Property<int>("ProfileId")
-                        .HasColumnType("INTEGER")
-                        .HasColumnName("profile_id");
-
-                    b.HasKey("Id")
-                        .HasName("PK_loadout");
-
-                    b.HasIndex("ProfileId", "LoadoutName")
-                        .IsUnique();
-
-                    b.ToTable("loadout", (string)null);
-                });
-
             modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
                 {
                     b.Property<int>("Id")
@@ -752,21 +736,11 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("INTEGER")
                         .HasColumnName("age");
 
-                    b.Property<string>("Backpack")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("backpack");
-
                     b.Property<string>("CharacterName")
                         .IsRequired()
                         .HasColumnType("TEXT")
                         .HasColumnName("char_name");
 
-                    b.Property<string>("Clothing")
-                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("clothing");
-
                     b.Property<string>("EyeColor")
                         .IsRequired()
                         .HasColumnType("TEXT")
@@ -849,6 +823,94 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.ToTable("profile", (string)null);
                 });
 
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_id");
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<int>("ProfileLoadoutGroupId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout");
+
+                    b.HasIndex("ProfileLoadoutGroupId");
+
+                    b.ToTable("profile_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("group_name");
+
+                    b.Property<int>("ProfileRoleLoadoutId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout_group");
+
+                    b.HasIndex("ProfileRoleLoadoutId");
+
+                    b.ToTable("profile_loadout_group", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("RoleName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_role_loadout");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("profile_role_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.HasKey("PlayerUserId", "RoleId")
+                        .HasName("PK_role_whitelists");
+
+                    b.ToTable("role_whitelists", (string)null);
+                });
+
             modelBuilder.Entity("Content.Server.Database.Round", b =>
                 {
                     b.Property<int>("Id")
@@ -860,10 +922,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("INTEGER")
                         .HasColumnName("server_id");
 
-                    b.Property<DateTime>("StartDate")
-                        .ValueGeneratedOnAdd()
+                    b.Property<DateTime?>("StartDate")
                         .HasColumnType("TEXT")
-                        .HasDefaultValue(new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified))
                         .HasColumnName("start_date");
 
                     b.HasKey("Id")
@@ -1504,28 +1564,65 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Navigation("Profile");
                 });
 
-            modelBuilder.Entity("Content.Server.Database.Loadout", b =>
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileLoadoutGroup", "ProfileLoadoutGroup")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileLoadoutGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_profile_loadout_group_profile_loadout_group_id");
+
+                    b.Navigation("ProfileLoadoutGroup");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileRoleLoadout", "ProfileRoleLoadout")
+                        .WithMany("Groups")
+                        .HasForeignKey("ProfileRoleLoadoutId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_group_profile_role_loadout_profile_role_loadout_id");
+
+                    b.Navigation("ProfileRoleLoadout");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
                 {
                     b.HasOne("Content.Server.Database.Profile", "Profile")
                         .WithMany("Loadouts")
                         .HasForeignKey("ProfileId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired()
-                        .HasConstraintName("FK_loadout_profile_profile_id");
+                        .HasConstraintName("FK_profile_role_loadout_profile_profile_id");
 
                     b.Navigation("Profile");
                 });
 
-            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
                 {
-                    b.HasOne("Content.Server.Database.Preference", "Preference")
-                        .WithMany("Profiles")
-                        .HasForeignKey("PreferenceId")
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("JobWhitelists")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired()
-                        .HasConstraintName("FK_profile_preference_preference_id");
+                        .HasConstraintName("FK_role_whitelists_player_player_user_id");
 
-                    b.Navigation("Preference");
+                    b.Navigation("Player");
                 });
 
             modelBuilder.Entity("Content.Server.Database.Round", b =>
@@ -1727,6 +1824,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Navigation("AdminWatchlistsLastEdited");
 
                     b.Navigation("AdminWatchlistsReceived");
+
+                    b.Navigation("JobWhitelists");
                 });
 
             modelBuilder.Entity("Content.Server.Database.Preference", b =>
@@ -1745,6 +1844,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Navigation("Traits");
                 });
 
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Navigation("Loadouts");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Navigation("Groups");
+                });
+
             modelBuilder.Entity("Content.Server.Database.Round", b =>
                 {
                     b.Navigation("AdminLogs");
diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index ba40b5ba08b..14bd7f4bcb8 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -47,6 +47,7 @@ protected ServerDbContext(DbContextOptions options) : base(options)
         public DbSet<AdminMessage> AdminMessages { get; set; } = null!;
         public DbSet<BanTemplate> BanTemplate { get; set; } = null!;
         public DbSet<RoleWhitelist> RoleWhitelists { get; set; } = null!;
+        public DbSet<BanTemplate> BanTemplate { get; set; } = null!;
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {

From ecc7c6b7dc1452e021d135508340efa002c5fb18 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 22 Dec 2024 15:58:20 -0400
Subject: [PATCH 264/366] ConnectionManager stuff

---
 Content.Server.Database/Model.cs              |   1 -
 .../Connection/ConnectionManager.cs           | 136 ++++++++++++------
 Content.Shared/CCVar/CCVars.cs                |   8 +-
 .../Locale/en-US/connection-messages.ftl      |  10 +-
 4 files changed, 100 insertions(+), 55 deletions(-)

diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index 14bd7f4bcb8..377718bcba5 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -45,7 +45,6 @@ protected ServerDbContext(DbContextOptions options) : base(options)
         public DbSet<AdminNote> AdminNotes { get; set; } = null!;
         public DbSet<AdminWatchlist> AdminWatchlists { get; set; } = null!;
         public DbSet<AdminMessage> AdminMessages { get; set; } = null!;
-        public DbSet<BanTemplate> BanTemplate { get; set; } = null!;
         public DbSet<RoleWhitelist> RoleWhitelists { get; set; } = null!;
         public DbSet<BanTemplate> BanTemplate { get; set; } = null!;
 
diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
index 18f0d6ba116..863f776e3ae 100644
--- a/Content.Server/Connection/ConnectionManager.cs
+++ b/Content.Server/Connection/ConnectionManager.cs
@@ -1,12 +1,8 @@
 using System.Collections.Immutable;
 using System.Linq;
-using System.Text.Json.Nodes;
 using System.Threading.Tasks;
-using Content.Server.Connection.Whitelist;
-using Content.Server.Connection.Whitelist.Conditions;
 using System.Runtime.InteropServices;
-using System.Text.Json.Nodes;
-using System.Threading.Tasks;
+using Content.Server.Chat.Managers;
 using Content.Server.Database;
 using Content.Server.GameTicking;
 using Content.Server.Preferences.Managers;
@@ -15,6 +11,7 @@
 using Content.Shared.Players.PlayTimeTracking;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
+using Robust.Shared.Enums;
 using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Player;
@@ -31,8 +28,6 @@ public interface IConnectionManager
         void Initialize();
         void PostInit();
 
-        Task<bool> HasPrivilegedJoin(NetUserId userId);
-
         /// <summary>
         /// Temporarily allow a user to bypass regular connection requirements.
         /// </summary>
@@ -51,7 +46,6 @@ public interface IConnectionManager
     /// </summary>
     public sealed partial class ConnectionManager : IConnectionManager
     {
-        [Dependency] private readonly IServerDbManager _dbManager = default!;
         [Dependency] private readonly IPlayerManager _plyMgr = default!;
         [Dependency] private readonly IServerNetManager _netMgr = default!;
         [Dependency] private readonly IServerDbManager _db = default!;
@@ -61,10 +55,11 @@ public sealed partial class ConnectionManager : IConnectionManager
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly ILogManager _logManager = default!;
+        [Dependency] private readonly IChatManager _chatManager = default!;
 
         private ISawmill _sawmill = default!;
         private readonly Dictionary<NetUserId, TimeSpan> _temporaryBypasses = [];
-        private ISawmill _sawmill = default!;
+
 
         private List<NetUserId> _connectedWhitelistedPlayers = new(); // DeltaV - Soft whitelist improvements
 
@@ -76,6 +71,7 @@ public void Initialize()
             _netMgr.Connected += OnConnected; // DeltaV - Soft whitelist improvements
             _netMgr.Disconnect += OnDisconnected; // DeltaV - Soft whitelist improvements
             _netMgr.AssignUserIdCallback = AssignUserIdCallback;
+            _plyMgr.PlayerStatusChanged += PlayerStatusChanged;
             // Approval-based IP bans disabled because they don't play well with Happy Eyeballs.
             // _netMgr.HandleApprovalCallback = HandleApproval;
         }
@@ -130,7 +126,11 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
                 if (banHits is { Count: > 0 })
                     await _db.AddServerBanHitsAsync(id, banHits);
 
-                e.Deny(msg);
+                var properties = new Dictionary<string, object>();
+                if (reason == ConnectionDenyReason.Full)
+                    properties["delay"] = _cfg.GetCVar(CCVars.GameServerFullReconnectDelay);
+
+                e.Deny(new NetDenyReason(msg, properties));
             }
             else
             {
@@ -143,6 +143,46 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
             }
         }
 
+        private async void PlayerStatusChanged(object? sender, SessionStatusEventArgs args)
+        {
+            if (args.NewStatus == SessionStatus.Connected)
+            {
+                AdminAlertIfSharedConnection(args.Session);
+            }
+        }
+
+        private void AdminAlertIfSharedConnection(ICommonSession newSession)
+        {
+            var playerThreshold = _cfg.GetCVar(CCVars.AdminAlertMinPlayersSharingConnection);
+            if (playerThreshold < 0)
+                return;
+
+            var addr = newSession.Channel.RemoteEndPoint.Address;
+
+            var otherConnectionsFromAddress = _plyMgr.Sessions.Where(session =>
+                    session.Status is SessionStatus.Connected or SessionStatus.InGame
+                    && session.Channel.RemoteEndPoint.Address.Equals(addr)
+                    && session.UserId != newSession.UserId)
+                .ToList();
+
+            var otherConnectionCount = otherConnectionsFromAddress.Count;
+            if (otherConnectionCount + 1 < playerThreshold) // Add one for the total, not just others, using the address
+                return;
+
+            var username = newSession.Name;
+            var otherUsernames = string.Join(", ",
+                otherConnectionsFromAddress.Select(session => session.Name));
+
+            _chatManager.SendAdminAlert(Loc.GetString("admin-alert-shared-connection",
+                ("player", username),
+                ("otherCount", otherConnectionCount),
+                ("otherList", otherUsernames)));
+        }
+
+        /*
+         * TODO: Jesus H Christ what is this utter mess of a function
+         * TODO: Break this apart into is constituent steps.
+         */
         private async Task<(ConnectionDenyReason, string, List<ServerBanDef>? bansHit)?> ShouldDeny(
             NetConnectingArgs e)
         {
@@ -173,17 +213,17 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
                 return null;
             }
 
-            var adminData = await _dbManager.GetAdminDataForAsync(e.UserId);
+            var adminData = await _db.GetAdminDataForAsync(e.UserId);
 
             if (_cfg.GetCVar(CCVars.PanicBunkerEnabled) && adminData == null)
             {
                 var showReason = _cfg.GetCVar(CCVars.PanicBunkerShowReason);
                 var customReason = _cfg.GetCVar(CCVars.PanicBunkerCustomReason);
 
-                var minMinutesAge = _cfg.GetCVar(CCVars.PanicBunkerMinAccountAge);
-                var record = await _dbManager.GetPlayerRecordByUserId(userId);
+                var minHoursAge = _cfg.GetCVar(CCVars.PanicBunkerMinAccountAge);
+                var record = await _db.GetPlayerRecordByUserId(userId);
                 var validAccountAge = record != null &&
-                                      record.FirstSeenTime.CompareTo(DateTimeOffset.Now - TimeSpan.FromMinutes(minMinutesAge)) <= 0;
+                                      record.FirstSeenTime.CompareTo(DateTimeOffset.UtcNow - TimeSpan.FromHours(minHoursAge)) <= 0;
                 var bypassAllowed = _cfg.GetCVar(CCVars.BypassBunkerWhitelist) && await _db.GetWhitelistStatusAsync(userId);
 
                 // Use the custom reason if it exists & they don't have the minimum account age
@@ -196,7 +236,7 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
                 {
                     return (ConnectionDenyReason.Panic,
                         Loc.GetString("panic-bunker-account-denied-reason",
-                            ("reason", Loc.GetString("panic-bunker-account-reason-account", ("minutes", minMinutesAge)))), null);
+                            ("reason", Loc.GetString("panic-bunker-account-reason-account", ("hours", minHoursAge)))), null);
                 }
 
                 var minOverallHours = _cfg.GetCVar(CCVars.PanicBunkerMinOverallHours);
@@ -235,40 +275,55 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
                             status == PlayerGameStatus.JoinedGame;
             var adminBypass = _cfg.GetCVar(CCVars.AdminBypassMaxPlayers) && adminData != null;
             if ((_plyMgr.PlayerCount >= _cfg.GetCVar(CCVars.SoftMaxPlayers) && !adminBypass) && !wasInGame)
+            {
                 return (ConnectionDenyReason.Full, Loc.GetString("soft-player-cap-full"), null);
+            }
 
-            // Checks for whitelist IF it's enabled AND the user isn't an admin. Admins are always allowed.
-            if (false)
+            // DeltaV - Replace existing softwhitelist implementation
+            if (false)//if (_cfg.GetCVar(CCVars.WhitelistEnabled) && adminData is null)
             {
-                var min = _cfg.GetCVar(CCVars.WhitelistMinPlayers);
-                var max = _cfg.GetCVar(CCVars.WhitelistMaxPlayers);
-                var playerCountValid = _plyMgr.PlayerCount >= min && _plyMgr.PlayerCount < max;
+                if (_whitelists is null)
+                {
+                    _sawmill.Error("Whitelist enabled but no whitelists loaded.");
+                    // Misconfigured, deny everyone.
+                    return (ConnectionDenyReason.Whitelist, Loc.GetString("whitelist-misconfigured"), null);
+                }
 
-                if (playerCountValid && await _db.GetWhitelistStatusAsync(userId) == false
-                                     && adminData is null)
+                foreach (var whitelist in _whitelists)
                 {
-                    var msg = Loc.GetString(_cfg.GetCVar(CCVars.WhitelistReason));
-                    // was the whitelist playercount changed?
-                    if (min > 0 || max < int.MaxValue)
-                        msg += "\n" + Loc.GetString("whitelist-playercount-invalid", ("min", min), ("max", max));
-                    return (ConnectionDenyReason.Whitelist, msg, null);
+                    if (!IsValid(whitelist, _plyMgr.PlayerCount))
+                    {
+                        // Not valid for current player count.
+                        continue;
+                    }
+
+                    var whitelistStatus = await IsWhitelisted(whitelist, e.UserData, _sawmill);
+                    if (!whitelistStatus.isWhitelisted)
+                    {
+                        // Not whitelisted.
+                        return (ConnectionDenyReason.Whitelist, Loc.GetString("whitelist-fail-prefix", ("msg", whitelistStatus.denyMessage!)), null);
+                    }
+
+                    // Whitelisted, don't check any more.
+                    break;
                 }
             }
 
             // DeltaV - Soft whitelist improvements
+            // TODO: replace this with a whitelist config prototype with a connected whitelisted players condition
             if (_cfg.GetCVar(CCVars.WhitelistEnabled))
             {
                 var connectedPlayers = _plyMgr.PlayerCount;
                 var connectedWhitelist = _connectedWhitelistedPlayers.Count;
 
-                var slots = _cfg.GetCVar(CCVars.WhitelistMinPlayers);
+                var slots = 25;
 
                 var noSlotsOpen = slots > 0 && slots < connectedPlayers - connectedWhitelist;
 
                 if (noSlotsOpen && await _db.GetWhitelistStatusAsync(userId) == false
                                      && adminData is null)
                 {
-                    var msg = Loc.GetString(_cfg.GetCVar(CCVars.WhitelistReason));
+                    var msg = Loc.GetString("whitelist-not-whitelisted-peri");
 
                     if (slots > 0)
                         msg += "\n" + Loc.GetString("whitelist-playercount-invalid", ("min", slots), ("max", _cfg.GetCVar(CCVars.SoftMaxPlayers)));
@@ -289,17 +344,17 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
             // Initial cvar retrieval
             var showReason = _cfg.GetCVar(CCVars.BabyJailShowReason);
             var reason = _cfg.GetCVar(CCVars.BabyJailCustomReason);
-            var maxAccountAgeMinutes = _cfg.GetCVar(CCVars.BabyJailMaxAccountAge);
-            var maxPlaytimeMinutes = _cfg.GetCVar(CCVars.BabyJailMaxOverallMinutes);
+            var maxAccountAgeHours = _cfg.GetCVar(CCVars.BabyJailMaxAccountAge);
+            var maxPlaytimeHours = _cfg.GetCVar(CCVars.BabyJailMaxOverallHours);
 
             // Wait some time to lookup data
-            var record = await _dbManager.GetPlayerRecordByUserId(userId);
+            var record = await _db.GetPlayerRecordByUserId(userId);
 
             // No player record = new account or the DB is having a skill issue
             if (record == null)
                 return (false, "");
 
-            var isAccountAgeInvalid = record.FirstSeenTime.CompareTo(DateTimeOffset.Now - TimeSpan.FromMinutes(maxAccountAgeMinutes)) <= 0;
+            var isAccountAgeInvalid = record.FirstSeenTime.CompareTo(DateTimeOffset.UtcNow - TimeSpan.FromHours(maxAccountAgeHours)) <= 0;
 
             if (isAccountAgeInvalid)
             {
@@ -314,13 +369,13 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
                         ("reason",
                             Loc.GetString(
                                 "baby-jail-account-reason-account",
-                                ("minutes", maxAccountAgeMinutes))));
+                                ("hours", maxAccountAgeHours))));
 
                 return (true, locAccountReason);
             }
 
             var overallTime = ( await _db.GetPlayTimes(e.UserId)).Find(p => p.Tracker == PlayTimeTrackingShared.TrackerOverall);
-            var isTotalPlaytimeInvalid = overallTime != null && overallTime.TimeSpent.TotalMinutes >= maxPlaytimeMinutes;
+            var isTotalPlaytimeInvalid = overallTime != null && overallTime.TimeSpent.TotalHours >= maxAccountAgeHours;
 
             if (isTotalPlaytimeInvalid)
             {
@@ -335,7 +390,7 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
                         ("reason",
                             Loc.GetString(
                                 "baby-jail-account-reason-overall",
-                                ("minutes", maxPlaytimeMinutes))));
+                                ("hours", maxPlaytimeHours))));
 
                 return (true, locPlaytimeReason);
             }
@@ -394,14 +449,5 @@ private async void OnDisconnected(object? sender, NetChannelArgs e)
                 _connectedWhitelistedPlayers.Remove(e.Channel.UserId);
             }
         }
-
-        public async Task<bool> HasPrivilegedJoin(NetUserId userId)
-        {
-            var isAdmin = await _dbManager.GetAdminDataForAsync(userId) != null;
-            var wasInGame = EntitySystem.TryGet<GameTicker>(out var ticker) &&
-                            ticker.PlayerGameStatuses.TryGetValue(userId, out var status) &&
-                            status == PlayerGameStatus.JoinedGame;
-            return isAdmin || wasInGame;
-        }
     }
 }
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 73970409c82..290d8e25738 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -355,17 +355,17 @@ public static readonly CVarDef<bool>
             CVarDef.Create("game.baby_jail.show_reason", false, CVar.SERVERONLY);
 
         /// <summary>
-        /// Maximum age of the account (from server's PoV, so from first-seen date) in minutes that can access baby
+        /// Maximum age of the account (from server's PoV, so from first-seen date) in hours that can access baby
         /// jailed servers.
         /// </summary>
         public static readonly CVarDef<int> BabyJailMaxAccountAge =
-            CVarDef.Create("game.baby_jail.max_account_age", 1440, CVar.SERVERONLY);
+            CVarDef.Create("game.baby_jail.max_account_age", 24, CVar.SERVERONLY);
 
         /// <summary>
         /// Maximum overall played time allowed to access baby jailed servers.
         /// </summary>
-        public static readonly CVarDef<int> BabyJailMaxOverallMinutes =
-            CVarDef.Create("game.baby_jail.max_overall_minutes", 120, CVar.SERVERONLY);
+        public static readonly CVarDef<int> BabyJailMaxOverallHours =
+            CVarDef.Create("game.baby_jail.max_overall_hours", 2, CVar.SERVERONLY);
 
         /// <summary>
         /// A custom message that will be used for connections denied due to the baby jail.
diff --git a/Resources/Locale/en-US/connection-messages.ftl b/Resources/Locale/en-US/connection-messages.ftl
index c8f29cdf848..475e8fdcbe3 100644
--- a/Resources/Locale/en-US/connection-messages.ftl
+++ b/Resources/Locale/en-US/connection-messages.ftl
@@ -25,10 +25,10 @@ ban-banned-3 = Attempts to circumvent this ban such as creating a new account wi
 soft-player-cap-full = The server is full!
 panic-bunker-account-denied = This server is in panic bunker mode, often enabled as a precaution against raids. New connections by accounts not meeting certain requirements are temporarily not accepted. Try again later
 panic-bunker-account-denied-reason = This server is in panic bunker mode, often enabled as a precaution against raids. New connections by accounts not meeting certain requirements are temporarily not accepted. Try again later. Reason: "{$reason}"
-panic-bunker-account-reason-account = Your Space Station 14 account is too new. It must be older than {$minutes} minutes
-panic-bunker-account-reason-overall = Your overall playtime on the server must be greater than {$minutes} $minutes
+panic-bunker-account-reason-account = Your Space Station 14 account is too new. It must be older than {$hours} hours
+panic-bunker-account-reason-overall = Your overall playtime on the server must be greater than {$hours} hours.
 
-whitelist-playtime = You do not have enough playtime to join this server. You need at least {$minutes} minutes of playtime to join this server.
+whitelist-playtime = You do not have enough playtime to join this server. You need at least {$hours} minutes of playtime to join this server.
 whitelist-player-count = This server is currently not accepting players. Please try again later.
 whitelist-notes = You currently have too many admin notes to join this server. You can check your notes by typing /adminremarks in chat.
 whitelist-manual = You are not whitelisted on this server.
@@ -53,5 +53,5 @@ cmd-blacklistremove-arg-player = [player]
 
 baby-jail-account-denied = This server is a newbie server, intended for new players and those who want to help them. New connections by accounts that are too old or are not on a whitelist are not accepted. Check out some other servers and see everything Space Station 14 has to offer. Have fun!
 baby-jail-account-denied-reason = This server is a newbie server, intended for new players and those who want to help them. New connections by accounts that are too old or are not on a whitelist are not accepted. Check out some other servers and see everything Space Station 14 has to offer. Have fun! Reason: "{$reason}"
-baby-jail-account-reason-account = Your Space Station 14 account is too old. It must be younger than {$minutes} minutes
-baby-jail-account-reason-overall = Your overall playtime on the server must be younger than {$minutes} $minutes
+baby-jail-account-reason-account = Your Space Station 14 account is too old. It must be younger than {$hours} hours.
+baby-jail-account-reason-overall = Your overall playtime on the server must be younger than {$hours} hours.

From d791123645af079b9c87c78788506bb2b0aea225 Mon Sep 17 00:00:00 2001
From: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
Date: Wed, 26 Jun 2024 08:43:43 -0500
Subject: [PATCH 265/366] Alert shared connections (#29405)

* add admin alert for active shared connections

* update wizden config

* review
---
 Content.Server/Connection/ConnectionManager.cs   |  1 +
 Content.Shared/CCVar/CCVars.cs                   | 16 ++++++++++++++++
 .../Locale/en-US/administration/admin-alerts.ftl |  1 +
 3 files changed, 18 insertions(+)
 create mode 100644 Resources/Locale/en-US/administration/admin-alerts.ftl

diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
index 863f776e3ae..ea0febb97ed 100644
--- a/Content.Server/Connection/ConnectionManager.cs
+++ b/Content.Server/Connection/ConnectionManager.cs
@@ -72,6 +72,7 @@ public void Initialize()
             _netMgr.Disconnect += OnDisconnected; // DeltaV - Soft whitelist improvements
             _netMgr.AssignUserIdCallback = AssignUserIdCallback;
             _plyMgr.PlayerStatusChanged += PlayerStatusChanged;
+            _plyMgr.PlayerStatusChanged += PlayerStatusChanged;
             // Approval-based IP bans disabled because they don't play well with Happy Eyeballs.
             // _netMgr.HandleApprovalCallback = HandleApproval;
         }
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 290d8e25738..993557a229b 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -281,6 +281,13 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<int> SoftMaxPlayers =
             CVarDef.Create("game.soft_max_players", 30, CVar.SERVERONLY | CVar.ARCHIVE);
 
+        /// <summary>
+        /// If a player gets denied connection to the server,
+        /// how long they are forced to wait before attempting to reconnect.
+        /// </summary>
+        public static readonly CVarDef<int> GameServerFullReconnectDelay =
+            CVarDef.Create("game.server_full_reconnect_delay", 30, CVar.SERVERONLY);
+
         /// <summary>
         /// Whether or not panic bunker is currently enabled.
         /// </summary>
@@ -960,6 +967,15 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<bool> ServerBanErasePlayer =
             CVarDef.Create("admin.server_ban_erase_player", false, CVar.ARCHIVE | CVar.SERVER | CVar.REPLICATED);
 
+        /// <summary>
+        ///     Minimum players sharing a connection required to create an alert. -1 to disable the alert.
+        /// </summary>
+        /// <remarks>
+        ///     If you set this to 0 or 1 then it will alert on every connection, so probably don't do that.
+        /// </remarks>
+        public static readonly CVarDef<int> AdminAlertMinPlayersSharingConnection =
+            CVarDef.Create("admin.alert.min_players_sharing_connection", -1, CVar.SERVERONLY);
+
         /// <summary>
         ///     Minimum explosion intensity to create an admin alert message. -1 to disable the alert.
         /// </summary>
diff --git a/Resources/Locale/en-US/administration/admin-alerts.ftl b/Resources/Locale/en-US/administration/admin-alerts.ftl
new file mode 100644
index 00000000000..40ab4737dcc
--- /dev/null
+++ b/Resources/Locale/en-US/administration/admin-alerts.ftl
@@ -0,0 +1 @@
+admin-alert-shared-connection = {$player} is sharing a connection with {$otherCount} connected player(s): {$otherList}

From f95934468e846a92c1826642c61f3556959f55f1 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 22 Dec 2024 16:21:08 -0400
Subject: [PATCH 266/366] Use hours

---
 .../UI/Tabs/BabyJailTab/BabyJailTab.xaml      |  8 +++---
 .../UI/Tabs/BabyJailTab/BabyJailTab.xaml.cs   | 26 +++++++++----------
 .../Commands/BabyJailCommand.cs               | 18 ++++++-------
 .../Commands/PanicBunkerCommand.cs            |  2 +-
 .../Administration/Systems/AdminSystem.cs     | 14 +++++-----
 .../Connection/ConnectionManager.cs           | 11 ++++++++
 .../Events/BabyJailChangedEvent.cs            |  4 +--
 Content.Shared/CCVar/CCVars.cs                |  4 +--
 .../administration/commands/babyjail.ftl      | 14 +++++-----
 .../administration/ui/tabs/babyjail-tab.ftl   |  2 +-
 10 files changed, 57 insertions(+), 46 deletions(-)

diff --git a/Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailTab.xaml b/Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailTab.xaml
index dd770c2be53..bee94e59c11 100644
--- a/Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailTab.xaml
@@ -14,12 +14,12 @@
             <BoxContainer Orientation="Horizontal" Margin="2">
                 <Label Text="{Loc admin-ui-baby-jail-max-account-age}" MinWidth="175" />
                 <LineEdit Name="MaxAccountAge" MinWidth="50" Margin="0 0 5 0" />
-                <Label Text="{Loc generic-minutes}" />
+                <Label Text="{Loc generic-hours}" />
             </BoxContainer>
             <BoxContainer Orientation="Horizontal" Margin="2">
-                <Label Text="{Loc admin-ui-baby-jail-max-overall-minutes}" MinWidth="175" />
-                <LineEdit Name="MaxOverallMinutes" MinWidth="50" Margin="0 0 5 0" />
-                <Label Text="{Loc generic-minutes}" />
+                <Label Text="{Loc admin-ui-baby-jail-max-overall-hours}" MinWidth="175" />
+                <LineEdit Name="MaxOverallHours" MinWidth="50" Margin="0 0 5 0" />
+                <Label Text="{Loc generic-hours}" />
             </BoxContainer>
         </BoxContainer>
     </BoxContainer>
diff --git a/Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailTab.xaml.cs b/Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailTab.xaml.cs
index aa9d6ced951..3ac50c4ff10 100644
--- a/Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailTab.xaml.cs
@@ -16,7 +16,7 @@ public sealed partial class BabyJailTab : Control
     [Dependency] private readonly IConsoleHost _console = default!;
 
     private string _maxAccountAge;
-    private string _maxOverallMinutes;
+    private string _maxOverallHours;
 
     public BabyJailTab()
     {
@@ -27,33 +27,33 @@ public BabyJailTab()
         MaxAccountAge.OnFocusExit += args => SendMaxAccountAge(args.Text);
         _maxAccountAge = MaxAccountAge.Text;
 
-        MaxOverallMinutes.OnTextEntered += args => SendMaxOverallMinutes(args.Text);
-        MaxOverallMinutes.OnFocusExit += args => SendMaxOverallMinutes(args.Text);
-        _maxOverallMinutes = MaxOverallMinutes.Text;
+        MaxOverallHours.OnTextEntered += args => SendMaxOverallHours(args.Text);
+        MaxOverallHours.OnFocusExit += args => SendMaxOverallHours(args.Text);
+        _maxOverallHours = MaxOverallHours.Text;
     }
 
     private void SendMaxAccountAge(string text)
     {
         if (string.IsNullOrWhiteSpace(text) ||
             text == _maxAccountAge ||
-            !int.TryParse(text, out var minutes))
+            !int.TryParse(text, out var hours))
         {
             return;
         }
 
-        _console.ExecuteCommand($"babyjail_max_account_age {minutes}");
+        _console.ExecuteCommand($"babyjail_max_account_age {hours}");
     }
 
-    private void SendMaxOverallMinutes(string text)
+    private void SendMaxOverallHours(string text)
     {
         if (string.IsNullOrWhiteSpace(text) ||
-            text == _maxOverallMinutes ||
-            !int.TryParse(text, out var minutes))
+            text == _maxOverallHours ||
+            !int.TryParse(text, out var hours))
         {
             return;
         }
 
-        _console.ExecuteCommand($"babyjail_max_overall_minutes {minutes}");
+        _console.ExecuteCommand($"babyjail_max_overall_hours {hours}");
     }
 
     public void UpdateStatus(BabyJailStatus status)
@@ -66,10 +66,10 @@ public void UpdateStatus(BabyJailStatus status)
         EnabledButton.ModulateSelfOverride = status.Enabled ? Color.Red : null;
         ShowReasonButton.Pressed = status.ShowReason;
 
-        MaxAccountAge.Text = status.MaxAccountAgeMinutes.ToString();
+        MaxAccountAge.Text = status.MaxAccountAgeHours.ToString();
         _maxAccountAge = MaxAccountAge.Text;
 
-        MaxOverallMinutes.Text = status.MaxOverallMinutes.ToString();
-        _maxOverallMinutes = MaxOverallMinutes.Text;
+        MaxOverallHours.Text = status.MaxOverallHours.ToString();
+        _maxOverallHours = MaxOverallHours.Text;
     }
 }
diff --git a/Content.Server/Administration/Commands/BabyJailCommand.cs b/Content.Server/Administration/Commands/BabyJailCommand.cs
index 058b67ca528..45687080d48 100644
--- a/Content.Server/Administration/Commands/BabyJailCommand.cs
+++ b/Content.Server/Administration/Commands/BabyJailCommand.cs
@@ -86,7 +86,7 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
             case 0:
             {
                 var current = _cfg.GetCVar(CCVars.BabyJailMaxAccountAge);
-                shell.WriteLine(Loc.GetString("babyjail-command-max-account-age-is", ("minutes", current)));
+                shell.WriteLine(Loc.GetString("babyjail-command-max-account-age-is", ("hours", current)));
                 break;
             }
             case > 1:
@@ -94,14 +94,14 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
                 return;
         }
 
-        if (!int.TryParse(args[0], out var minutes))
+        if (!int.TryParse(args[0], out var hours))
         {
             shell.WriteError(Loc.GetString("shell-argument-must-be-number"));
             return;
         }
 
-        _cfg.SetCVar(CCVars.BabyJailMaxAccountAge, minutes);
-        shell.WriteLine(Loc.GetString("babyjail-command-max-account-age-set", ("minutes", minutes)));
+        _cfg.SetCVar(CCVars.BabyJailMaxAccountAge, hours);
+        shell.WriteLine(Loc.GetString("babyjail-command-max-account-age-set", ("hours", hours)));
     }
 }
 
@@ -110,7 +110,7 @@ public sealed class BabyJailMinOverallHoursCommand : LocalizedCommands
 {
     [Dependency] private readonly IConfigurationManager _cfg = default!;
 
-    public override string Command => "babyjail_max_overall_minutes";
+    public override string Command => "babyjail_max_overall_hours";
 
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
@@ -118,8 +118,8 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             case 0:
             {
-                var current = _cfg.GetCVar(CCVars.BabyJailMaxOverallMinutes);
-                shell.WriteLine(Loc.GetString("babyjail-command-max-overall-minutes-is", ("minutes", current)));
+                var current = _cfg.GetCVar(CCVars.BabyJailMaxOverallHours);
+                shell.WriteLine(Loc.GetString("babyjail-command-max-overall-hours-is", ("hours", current)));
                 break;
             }
             case > 1:
@@ -133,7 +133,7 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
             return;
         }
 
-        _cfg.SetCVar(CCVars.BabyJailMaxOverallMinutes, hours);
-        shell.WriteLine(Loc.GetString("babyjail-command-overall-minutes-set", ("hours", hours)));
+        _cfg.SetCVar(CCVars.BabyJailMaxOverallHours, hours);
+        shell.WriteLine(Loc.GetString("babyjail-command-overall-hours-set", ("hours", hours)));
     }
 }
diff --git a/Content.Server/Administration/Commands/PanicBunkerCommand.cs b/Content.Server/Administration/Commands/PanicBunkerCommand.cs
index de3f3cbaea2..19271edf982 100644
--- a/Content.Server/Administration/Commands/PanicBunkerCommand.cs
+++ b/Content.Server/Administration/Commands/PanicBunkerCommand.cs
@@ -171,7 +171,7 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
         if (args.Length == 0)
         {
             var current = _cfg.GetCVar(CCVars.PanicBunkerMinOverallHours);
-            shell.WriteLine(Loc.GetString("panicbunker-command-min-overall-hours-is", ("minutes", current)));
+            shell.WriteLine(Loc.GetString("panicbunker-command-min-overall-hours-is", ("hours", current)));
         }
 
         if (args.Length > 1)
diff --git a/Content.Server/Administration/Systems/AdminSystem.cs b/Content.Server/Administration/Systems/AdminSystem.cs
index 5612d3717a0..76043dab50d 100644
--- a/Content.Server/Administration/Systems/AdminSystem.cs
+++ b/Content.Server/Administration/Systems/AdminSystem.cs
@@ -88,7 +88,7 @@ public override void Initialize()
             Subs.CVar(_config, CCVars.BabyJailEnabled, OnBabyJailChanged, true);
             Subs.CVar(_config, CCVars.BabyJailShowReason, OnBabyJailShowReasonChanged, true);
             Subs.CVar(_config, CCVars.BabyJailMaxAccountAge, OnBabyJailMaxAccountAgeChanged, true);
-            Subs.CVar(_config, CCVars.BabyJailMaxOverallMinutes, OnBabyJailMaxOverallMinutesChanged, true);
+            Subs.CVar(_config, CCVars.BabyJailMaxOverallHours, OnBabyJailMaxOverallHoursChanged, true);
             Subs.CVar(_config, CCVars.PanicBunkerMinOverallHours, OnPanicBunkerMinOverallHoursChanged, true);
 
             SubscribeLocalEvent<IdentityChangedEvent>(OnIdentityChanged);
@@ -303,15 +303,15 @@ private void OnBabyJailShowReasonChanged(bool enabled)
             SendBabyJailStatusAll();
         }
 
-        private void OnPanicBunkerMinAccountAgeChanged(int minutes)
+        private void OnPanicBunkerMinAccountAgeChanged(int hours)
         {
-            PanicBunker.MinAccountAgeHours = minutes / 60;
+            PanicBunker.MinAccountAgeHours = hours;
             SendPanicBunkerStatusAll();
         }
 
-        private void OnBabyJailMaxAccountAgeChanged(int minutes)
+        private void OnBabyJailMaxAccountAgeChanged(int hours)
         {
-            BabyJail.MaxAccountAgeMinutes = minutes;
+            BabyJail.MaxOverallHours = hours;
             SendBabyJailStatusAll();
         }
 
@@ -321,9 +321,9 @@ private void OnPanicBunkerMinOverallHoursChanged(int hours)
             SendPanicBunkerStatusAll();
         }
 
-        private void OnBabyJailMaxOverallMinutesChanged(int minutes)
+        private void OnBabyJailMaxOverallHoursChanged(int hours)
         {
-            BabyJail.MaxOverallMinutes = minutes;
+            BabyJail.MaxAccountAgeHours = hours;
             SendBabyJailStatusAll();
         }
 
diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
index ea0febb97ed..1f36ba63ddc 100644
--- a/Content.Server/Connection/ConnectionManager.cs
+++ b/Content.Server/Connection/ConnectionManager.cs
@@ -28,6 +28,8 @@ public interface IConnectionManager
         void Initialize();
         void PostInit();
 
+        Task<bool> HasPrivilegedJoin(NetUserId userId);
+
         /// <summary>
         /// Temporarily allow a user to bypass regular connection requirements.
         /// </summary>
@@ -450,5 +452,14 @@ private async void OnDisconnected(object? sender, NetChannelArgs e)
                 _connectedWhitelistedPlayers.Remove(e.Channel.UserId);
             }
         }
+
+        public async Task<bool> HasPrivilegedJoin(NetUserId userId)
+        {
+            var isAdmin = await _db.GetAdminDataForAsync(userId) != null;
+            var wasInGame = EntitySystem.TryGet<GameTicker>(out var ticker) &&
+                ticker.PlayerGameStatuses.TryGetValue(userId, out var status) &&
+                status == PlayerGameStatus.JoinedGame;
+            return isAdmin || wasInGame;
+        }
     }
 }
diff --git a/Content.Shared/Administration/Events/BabyJailChangedEvent.cs b/Content.Shared/Administration/Events/BabyJailChangedEvent.cs
index 56d5ce51626..bbe3495f77d 100644
--- a/Content.Shared/Administration/Events/BabyJailChangedEvent.cs
+++ b/Content.Shared/Administration/Events/BabyJailChangedEvent.cs
@@ -11,8 +11,8 @@ public sealed class BabyJailStatus
 {
     public bool Enabled;
     public bool ShowReason;
-    public int MaxAccountAgeMinutes;
-    public int MaxOverallMinutes;
+    public int MaxAccountAgeHours;
+    public int MaxOverallHours;
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 993557a229b..218507ff4bb 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -321,10 +321,10 @@ public static readonly CVarDef<bool>
             CVarDef.Create("game.panic_bunker.show_reason", false, CVar.SERVERONLY);
 
         /// <summary>
-        /// Minimum age of the account (from server's PoV, so from first-seen date) in minutes.
+        /// Minimum age of the account (from server's PoV, so from first-seen date) in hours.
         /// </summary>
         public static readonly CVarDef<int> PanicBunkerMinAccountAge =
-            CVarDef.Create("game.panic_bunker.min_account_age", 1440, CVar.SERVERONLY);
+            CVarDef.Create("game.panic_bunker.min_account_age", 24, CVar.SERVERONLY);
 
         /// <summary>
         /// Minimal overall played time.
diff --git a/Resources/Locale/en-US/administration/commands/babyjail.ftl b/Resources/Locale/en-US/administration/commands/babyjail.ftl
index 5a9d9490517..bbe77e5826e 100644
--- a/Resources/Locale/en-US/administration/commands/babyjail.ftl
+++ b/Resources/Locale/en-US/administration/commands/babyjail.ftl
@@ -9,11 +9,11 @@ babyjail-command-show-reason-enabled = The baby jail will now show a reason to u
 babyjail-command-show-reason-disabled = The baby jail will no longer show a reason to users it blocks from connecting.
 
 cmd-babyjail_max_account_age-desc = Gets or sets the maximum account age in minutes that an account can have to be allowed to connect with the baby jail enabled.
-cmd-babyjail_max_account_age-help = Usage: babyjail_max_account_age <minutes>
-babyjail-command-max-account-age-is = The maximum account age for the baby jail is {$minutes} minutes.
-babyjail-command-max-account-age-set = Set the maximum account age for the baby jail to {$minutes} minutes.
+cmd-babyjail_max_account_age-help = Usage: babyjail_max_account_age <hours>
+babyjail-command-max-account-age-is = The maximum account age for the baby jail is {$hours} hours.
+babyjail-command-max-account-age-set = Set the maximum account age for the baby jail to {$hours} hours.
 
-cmd-babyjail_max_overall_minutes-desc = Gets or sets the maximum overall playtime in minutes that an account can have to be allowed to connect with the baby jail enabled.
-cmd-babyjail_max_overall_minutes-help = Usage: babyjail_max_overall_minutes <minutes>
-babyjail-command-max-overall-minutes-is = The maximum overall playtime for the baby jail is {$minutes} minutes.
-babyjail-command-max-overall-minutes-set = Set the maximum overall playtime for the baby jail to {$minutes} minutes.
+cmd-babyjail_max_overall_hours-desc = Gets or sets the maximum overall playtime in minutes that an account can have to be allowed to connect with the baby jail enabled.
+cmd-babyjail_max_overall_hours-help = Usage: babyjail_max_overall_hours <hours>
+babyjail-command-max-overall-hours-is = The maximum overall playtime for the baby jail is {$hours} hours.
+babyjail-command-max-overall-hours-set = Set the maximum overall playtime for the baby jail to {$hours} hours.
diff --git a/Resources/Locale/en-US/administration/ui/tabs/babyjail-tab.ftl b/Resources/Locale/en-US/administration/ui/tabs/babyjail-tab.ftl
index 46dce54c1fc..9800e7f9f10 100644
--- a/Resources/Locale/en-US/administration/ui/tabs/babyjail-tab.ftl
+++ b/Resources/Locale/en-US/administration/ui/tabs/babyjail-tab.ftl
@@ -8,7 +8,7 @@ admin-ui-baby-jail-show-reason = Show Reason
 admin-ui-baby-jail-show-reason-tooltip = Show the user why they were blocked from connecting by the baby jail.
 
 admin-ui-baby-jail-max-account-age = Max. Account Age
-admin-ui-baby-jail-max-overall-minutes = Max. Overall Playtime
+admin-ui-baby-jail-max-overall-hours = Max. Overall Playtime
 
 admin-ui-baby-jail-is-enabled = [font size=20][bold]The baby jail is currently enabled.[/bold][/font]
 

From 0a9ebf0d803b7351ed4552c69da5fe27359916e8 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 22 Dec 2024 16:33:21 -0400
Subject: [PATCH 267/366] Migrationmaxxing?

---
 .../20241222203147_UpstreamMerge.Designer.cs  | 2030 +++++++++++++++++
 .../Postgres/20241222203147_UpstreamMerge.cs  |   89 +
 .../PostgresServerDbContextModelSnapshot.cs   |   58 +-
 .../20241222203134_UpstreamMerge.Designer.cs  | 1957 ++++++++++++++++
 .../Sqlite/20241222203134_UpstreamMerge.cs    |   89 +
 .../SqliteServerDbContextModelSnapshot.cs     |   57 +-
 6 files changed, 4197 insertions(+), 83 deletions(-)
 create mode 100644 Content.Server.Database/Migrations/Postgres/20241222203147_UpstreamMerge.Designer.cs
 create mode 100644 Content.Server.Database/Migrations/Postgres/20241222203147_UpstreamMerge.cs
 create mode 100644 Content.Server.Database/Migrations/Sqlite/20241222203134_UpstreamMerge.Designer.cs
 create mode 100644 Content.Server.Database/Migrations/Sqlite/20241222203134_UpstreamMerge.cs

diff --git a/Content.Server.Database/Migrations/Postgres/20241222203147_UpstreamMerge.Designer.cs b/Content.Server.Database/Migrations/Postgres/20241222203147_UpstreamMerge.Designer.cs
new file mode 100644
index 00000000000..691fed8d9ca
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20241222203147_UpstreamMerge.Designer.cs
@@ -0,0 +1,2030 @@
+// <auto-generated />
+using System;
+using System.Net;
+using System.Text.Json;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using NpgsqlTypes;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    [DbContext(typeof(PostgresServerDbContext))]
+    [Migration("20241222203147_UpstreamMerge")]
+    partial class UpstreamMerge
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.0")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("boolean")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<short>("Impact")
+                        .HasColumnType("smallint")
+                        .HasColumnName("impact");
+
+                    b.Property<JsonDocument>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Message")
+                        .HasAnnotation("Npgsql:TsVectorConfig", "english");
+
+                    NpgsqlIndexBuilderExtensions.HasMethod(b.HasIndex("Message"), "GIN");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("integer")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_messages_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dismissed");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("boolean")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_notes_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("boolean")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_watchlists_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("antag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("assigned_user_id_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanTemplate", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_template_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("boolean")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("integer")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<TimeSpan>("Length")
+                        .HasColumnType("interval")
+                        .HasColumnName("length");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("title");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ban_template");
+
+                    b.ToTable("ban_template", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Blacklist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_blacklist");
+
+                    b.ToTable("blacklist", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<IPAddress>("Address")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("smallint")
+                        .HasColumnName("denied");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("time");
+
+                    b.Property<float>("Trust")
+                        .HasColumnType("real")
+                        .HasColumnName("trust");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("Time");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("job_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Loadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("loadout_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("CustomColorTint")
+                        .HasColumnType("text")
+                        .HasColumnName("custom_color_tint");
+
+                    b.Property<string>("CustomDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("custom_description");
+
+                    b.Property<bool?>("CustomHeirloom")
+                        .HasColumnType("boolean")
+                        .HasColumnName("custom_heirloom");
+
+                    b.Property<string>("CustomName")
+                        .HasColumnType("text")
+                        .HasColumnName("custom_name");
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_loadout");
+
+                    b.HasIndex("ProfileId", "LoadoutName")
+                        .IsUnique();
+
+                    b.ToTable("loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("play_time_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("interval")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("player_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<IPAddress>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", null, t =>
+                        {
+                            t.HasCheckConstraint("LastSeenAddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= last_seen_address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("integer")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Age")
+                        .HasColumnType("integer")
+                        .HasColumnName("age");
+
+                    b.Property<string>("Backpack")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("backpack");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("Clothing")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("clothing");
+
+                    b.Property<string>("CustomSpecieName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("custom_specie_name");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_name");
+
+                    b.Property<float>("Height")
+                        .HasColumnType("real")
+                        .HasColumnName("height");
+
+                    b.Property<JsonDocument>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("integer")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("integer")
+                        .HasColumnName("slot");
+
+                    b.Property<int>("SpawnPriority")
+                        .HasColumnType("integer")
+                        .HasColumnName("spawn_priority");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("species");
+
+                    b.Property<float>("Width")
+                        .HasColumnType("real")
+                        .HasColumnName("width");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.HasKey("PlayerUserId", "RoleId")
+                        .HasName("PK_role_whitelists");
+
+                    b.ToTable("role_whitelists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<NpgsqlInet?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("boolean")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("integer")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("integer")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_hit_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_role_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<NpgsqlInet?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("role_unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("trait_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("integer")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ConnectionLogId")
+                                .HasColumnType("integer")
+                                .HasColumnName("connection_log_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid__type");
+
+                            b1.HasKey("ConnectionLogId");
+
+                            b1.ToTable("connection_log");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ConnectionLogId")
+                                .HasConstraintName("FK_connection_log_connection_log_connection_log_id");
+                        });
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Loadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "LastSeenHWId", b1 =>
+                        {
+                            b1.Property<int>("PlayerId")
+                                .HasColumnType("integer")
+                                .HasColumnName("player_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("last_seen_hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("last_seen_hwid__type");
+
+                            b1.HasKey("PlayerId");
+
+                            b1.ToTable("player");
+
+                            b1.WithOwner()
+                                .HasForeignKey("PlayerId")
+                                .HasConstraintName("FK_player_player_player_id");
+                        });
+
+                    b.Navigation("LastSeenHWId");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("JobWhitelists")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_role_whitelists_player_player_user_id");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerBanId")
+                                .HasColumnType("integer")
+                                .HasColumnName("server_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid__type");
+
+                            b1.HasKey("ServerBanId");
+
+                            b1.ToTable("server_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerBanId")
+                                .HasConstraintName("FK_server_ban_server_ban_server_ban_id");
+                        });
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerRoleBanId")
+                                .HasColumnType("integer")
+                                .HasColumnName("server_role_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid__type");
+
+                            b1.HasKey("ServerRoleBanId");
+
+                            b1.ToTable("server_role_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerRoleBanId")
+                                .HasConstraintName("FK_server_role_ban_server_role_ban_server_role_ban_id");
+                        });
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+
+                    b.Navigation("JobWhitelists");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Loadouts");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/20241222203147_UpstreamMerge.cs b/Content.Server.Database/Migrations/Postgres/20241222203147_UpstreamMerge.cs
new file mode 100644
index 00000000000..48b712d2e65
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20241222203147_UpstreamMerge.cs
@@ -0,0 +1,89 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    /// <inheritdoc />
+    public partial class UpstreamMerge : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "ProfileLoadout");
+
+            migrationBuilder.RenameColumn(
+                name: "hwid_type",
+                table: "server_role_ban",
+                newName: "hwid__type");
+
+            migrationBuilder.RenameColumn(
+                name: "hwid_type",
+                table: "server_ban",
+                newName: "hwid__type");
+
+            migrationBuilder.RenameColumn(
+                name: "last_seen_hwid_type",
+                table: "player",
+                newName: "last_seen_hwid__type");
+
+            migrationBuilder.RenameColumn(
+                name: "hwid_type",
+                table: "connection_log",
+                newName: "hwid__type");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_loadout_profile_profile_id",
+                table: "loadout",
+                column: "profile_id",
+                principalTable: "profile",
+                principalColumn: "profile_id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_loadout_profile_profile_id",
+                table: "loadout");
+
+            migrationBuilder.RenameColumn(
+                name: "hwid__type",
+                table: "server_role_ban",
+                newName: "hwid_type");
+
+            migrationBuilder.RenameColumn(
+                name: "hwid__type",
+                table: "server_ban",
+                newName: "hwid_type");
+
+            migrationBuilder.RenameColumn(
+                name: "last_seen_hwid__type",
+                table: "player",
+                newName: "last_seen_hwid_type");
+
+            migrationBuilder.RenameColumn(
+                name: "hwid__type",
+                table: "connection_log",
+                newName: "hwid_type");
+
+            migrationBuilder.CreateTable(
+                name: "ProfileLoadout",
+                columns: table => new
+                {
+                    ProfileId = table.Column<int>(type: "integer", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.ForeignKey(
+                        name: "FK_loadout_profile_profile_id",
+                        column: x => x.ProfileId,
+                        principalTable: "profile",
+                        principalColumn: "profile_id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
index a34a089d3d5..09767111da3 100644
--- a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
@@ -512,20 +512,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("assigned_user_id", (string)null);
                 });
 
-            modelBuilder.Entity("Content.Server.Database.Blacklist",
-                b =>
-                {
-                    b.Property<Guid>("UserId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("user_id");
-
-                    b.HasKey("UserId")
-                        .HasName("PK_blacklist");
-
-                    b.ToTable("blacklist", (string) null);
-                });
-
             modelBuilder.Entity("Content.Server.Database.BanTemplate", b =>
                 {
                     b.Property<int>("Id")
@@ -1641,7 +1627,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                                 .ValueGeneratedOnAdd()
                                 .HasColumnType("integer")
                                 .HasDefaultValue(0)
-                                .HasColumnName("hwid_type");
+                                .HasColumnName("hwid__type");
 
                             b1.HasKey("ConnectionLogId");
 
@@ -1669,6 +1655,18 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("Profile");
                 });
 
+            modelBuilder.Entity("Content.Server.Database.Loadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
             modelBuilder.Entity("Content.Server.Database.Player", b =>
                 {
                     b.OwnsOne("Content.Server.Database.TypedHwid", "LastSeenHWId", b1 =>
@@ -1686,7 +1684,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                                 .ValueGeneratedOnAdd()
                                 .HasColumnType("integer")
                                 .HasDefaultValue(0)
-                                .HasColumnName("last_seen_hwid_type");
+                                .HasColumnName("last_seen_hwid__type");
 
                             b1.HasKey("PlayerId");
 
@@ -1712,30 +1710,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("Preference");
                 });
 
-            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
-                {
-                    b.HasOne("Content.Server.Database.Profile", "Profile")
-                        .WithMany("Loadouts")
-                        .HasForeignKey("ProfileId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_loadout_profile_profile_id");
-
-                    b.Navigation("Profile");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Profile", b =>
-                {
-                    b.HasOne("Content.Server.Database.Preference", "Preference")
-                        .WithMany("Profiles")
-                        .HasForeignKey("PreferenceId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_profile_preference_preference_id");
-
-                    b.Navigation("Preference");
-                });
-
             modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
                 {
                     b.HasOne("Content.Server.Database.Player", "Player")
@@ -1797,7 +1771,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                                 .ValueGeneratedOnAdd()
                                 .HasColumnType("integer")
                                 .HasDefaultValue(0)
-                                .HasColumnName("hwid_type");
+                                .HasColumnName("hwid__type");
 
                             b1.HasKey("ServerBanId");
 
@@ -1874,7 +1848,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                                 .ValueGeneratedOnAdd()
                                 .HasColumnType("integer")
                                 .HasDefaultValue(0)
-                                .HasColumnName("hwid_type");
+                                .HasColumnName("hwid__type");
 
                             b1.HasKey("ServerRoleBanId");
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20241222203134_UpstreamMerge.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20241222203134_UpstreamMerge.Designer.cs
new file mode 100644
index 00000000000..30ea446c29e
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20241222203134_UpstreamMerge.Designer.cs
@@ -0,0 +1,1957 @@
+// <auto-generated />
+using System;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    [DbContext(typeof(SqliteServerDbContext))]
+    [Migration("20241222203134_UpstreamMerge")]
+    partial class UpstreamMerge
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.0");
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_flag_id");
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<sbyte>("Impact")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("impact");
+
+                    b.Property<string>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_messages_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("dismissed");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_notes_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_watchlists_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("antag_id");
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("assigned_user_id_id");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanTemplate", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_template_id");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<TimeSpan>("Length")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("length");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("title");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ban_template");
+
+                    b.ToTable("ban_template", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Blacklist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_blacklist");
+
+                    b.ToTable("blacklist", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_log_id");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("denied");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time");
+
+                    b.Property<float>("Trust")
+                        .HasColumnType("REAL")
+                        .HasColumnName("trust");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("Time");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("job_id");
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Loadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("loadout_id");
+
+                    b.Property<string>("CustomColorTint")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("custom_color_tint");
+
+                    b.Property<string>("CustomDescription")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("custom_description");
+
+                    b.Property<bool?>("CustomHeirloom")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("custom_heirloom");
+
+                    b.Property<string>("CustomName")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("custom_name");
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_loadout");
+
+                    b.HasIndex("ProfileId", "LoadoutName")
+                        .IsUnique();
+
+                    b.ToTable("loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("play_time_id");
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("player_id");
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<string>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<int>("Age")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("age");
+
+                    b.Property<string>("Backpack")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("backpack");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("Clothing")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("clothing");
+
+                    b.Property<string>("CustomSpecieName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("custom_specie_name");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_name");
+
+                    b.Property<float>("Height")
+                        .HasColumnType("REAL")
+                        .HasColumnName("height");
+
+                    b.Property<byte[]>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("slot");
+
+                    b.Property<int>("SpawnPriority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("spawn_priority");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("species");
+
+                    b.Property<float>("Width")
+                        .HasColumnType("REAL")
+                        .HasColumnName("width");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.HasKey("PlayerUserId", "RoleId")
+                        .HasName("PK_role_whitelists");
+
+                    b.ToTable("role_whitelists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_hit_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_role_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("role_unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("trait_id");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("BLOB")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ConnectionLogId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("connection_log_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid__type");
+
+                            b1.HasKey("ConnectionLogId");
+
+                            b1.ToTable("connection_log");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ConnectionLogId")
+                                .HasConstraintName("FK_connection_log_connection_log_connection_log_id");
+                        });
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Loadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "LastSeenHWId", b1 =>
+                        {
+                            b1.Property<int>("PlayerId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("player_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("last_seen_hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("last_seen_hwid__type");
+
+                            b1.HasKey("PlayerId");
+
+                            b1.ToTable("player");
+
+                            b1.WithOwner()
+                                .HasForeignKey("PlayerId")
+                                .HasConstraintName("FK_player_player_player_id");
+                        });
+
+                    b.Navigation("LastSeenHWId");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("JobWhitelists")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_role_whitelists_player_player_user_id");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerBanId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("server_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid__type");
+
+                            b1.HasKey("ServerBanId");
+
+                            b1.ToTable("server_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerBanId")
+                                .HasConstraintName("FK_server_ban_server_ban_server_ban_id");
+                        });
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerRoleBanId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("server_role_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid__type");
+
+                            b1.HasKey("ServerRoleBanId");
+
+                            b1.ToTable("server_role_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerRoleBanId")
+                                .HasConstraintName("FK_server_role_ban_server_role_ban_server_role_ban_id");
+                        });
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+
+                    b.Navigation("JobWhitelists");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Loadouts");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/20241222203134_UpstreamMerge.cs b/Content.Server.Database/Migrations/Sqlite/20241222203134_UpstreamMerge.cs
new file mode 100644
index 00000000000..1b513506ad0
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20241222203134_UpstreamMerge.cs
@@ -0,0 +1,89 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    /// <inheritdoc />
+    public partial class UpstreamMerge : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "ProfileLoadout");
+
+            migrationBuilder.RenameColumn(
+                name: "hwid_type",
+                table: "server_role_ban",
+                newName: "hwid__type");
+
+            migrationBuilder.RenameColumn(
+                name: "hwid_type",
+                table: "server_ban",
+                newName: "hwid__type");
+
+            migrationBuilder.RenameColumn(
+                name: "last_seen_hwid_type",
+                table: "player",
+                newName: "last_seen_hwid__type");
+
+            migrationBuilder.RenameColumn(
+                name: "hwid_type",
+                table: "connection_log",
+                newName: "hwid__type");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_loadout_profile_profile_id",
+                table: "loadout",
+                column: "profile_id",
+                principalTable: "profile",
+                principalColumn: "profile_id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_loadout_profile_profile_id",
+                table: "loadout");
+
+            migrationBuilder.RenameColumn(
+                name: "hwid__type",
+                table: "server_role_ban",
+                newName: "hwid_type");
+
+            migrationBuilder.RenameColumn(
+                name: "hwid__type",
+                table: "server_ban",
+                newName: "hwid_type");
+
+            migrationBuilder.RenameColumn(
+                name: "last_seen_hwid__type",
+                table: "player",
+                newName: "last_seen_hwid_type");
+
+            migrationBuilder.RenameColumn(
+                name: "hwid__type",
+                table: "connection_log",
+                newName: "hwid_type");
+
+            migrationBuilder.CreateTable(
+                name: "ProfileLoadout",
+                columns: table => new
+                {
+                    ProfileId = table.Column<int>(type: "INTEGER", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.ForeignKey(
+                        name: "FK_loadout_profile_profile_id",
+                        column: x => x.ProfileId,
+                        principalTable: "profile",
+                        principalColumn: "profile_id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
index 0b9344c2446..514c0007eed 100644
--- a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
@@ -483,19 +483,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("assigned_user_id", (string)null);
                 });
 
-            modelBuilder.Entity("Content.Server.Database.Blacklist",
-                b =>
-                {
-                    b.Property<Guid>("UserId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("user_id");
-
-                    b.HasKey("UserId")
-                        .HasName("PK_blacklist");
-
-                    b.ToTable("blacklist", (string) null);
-                });
             modelBuilder.Entity("Content.Server.Database.BanTemplate", b =>
                 {
                     b.Property<int>("Id")
@@ -1567,7 +1554,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                                 .ValueGeneratedOnAdd()
                                 .HasColumnType("INTEGER")
                                 .HasDefaultValue(0)
-                                .HasColumnName("hwid_type");
+                                .HasColumnName("hwid__type");
 
                             b1.HasKey("ConnectionLogId");
 
@@ -1595,6 +1582,18 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("Profile");
                 });
 
+            modelBuilder.Entity("Content.Server.Database.Loadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
             modelBuilder.Entity("Content.Server.Database.Player", b =>
                 {
                     b.OwnsOne("Content.Server.Database.TypedHwid", "LastSeenHWId", b1 =>
@@ -1612,7 +1611,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                                 .ValueGeneratedOnAdd()
                                 .HasColumnType("INTEGER")
                                 .HasDefaultValue(0)
-                                .HasColumnName("last_seen_hwid_type");
+                                .HasColumnName("last_seen_hwid__type");
 
                             b1.HasKey("PlayerId");
 
@@ -1638,30 +1637,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("Preference");
                 });
 
-            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
-                {
-                    b.HasOne("Content.Server.Database.Profile", "Profile")
-                        .WithMany("Loadouts")
-                        .HasForeignKey("ProfileId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_loadout_profile_profile_id");
-
-                    b.Navigation("Profile");
-                });
-
-            modelBuilder.Entity("Content.Server.Database.Profile", b =>
-                {
-                    b.HasOne("Content.Server.Database.Preference", "Preference")
-                        .WithMany("Profiles")
-                        .HasForeignKey("PreferenceId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("FK_profile_preference_preference_id");
-
-                    b.Navigation("Preference");
-                });
-
             modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
                 {
                     b.HasOne("Content.Server.Database.Player", "Player")
@@ -1723,7 +1698,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                                 .ValueGeneratedOnAdd()
                                 .HasColumnType("INTEGER")
                                 .HasDefaultValue(0)
-                                .HasColumnName("hwid_type");
+                                .HasColumnName("hwid__type");
 
                             b1.HasKey("ServerBanId");
 
@@ -1800,7 +1775,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                                 .ValueGeneratedOnAdd()
                                 .HasColumnType("INTEGER")
                                 .HasDefaultValue(0)
-                                .HasColumnName("hwid_type");
+                                .HasColumnName("hwid__type");
 
                             b1.HasKey("ServerRoleBanId");
 

From cb7df6788cb3f03503a16f59979b266213ec6ebf Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 22 Dec 2024 16:48:47 -0400
Subject: [PATCH 268/366] migration changes

---
 .../Migrations/Postgres/20241222203147_UpstreamMerge.cs       | 3 +--
 Content.Server.Database/add-migration.ps1                     | 4 ++--
 Content.Server.Database/remove-migration.ps1                  | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Content.Server.Database/Migrations/Postgres/20241222203147_UpstreamMerge.cs b/Content.Server.Database/Migrations/Postgres/20241222203147_UpstreamMerge.cs
index 48b712d2e65..7dcba9dda9d 100644
--- a/Content.Server.Database/Migrations/Postgres/20241222203147_UpstreamMerge.cs
+++ b/Content.Server.Database/Migrations/Postgres/20241222203147_UpstreamMerge.cs
@@ -10,8 +10,7 @@ public partial class UpstreamMerge : Migration
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.DropTable(
-                name: "ProfileLoadout");
+            migrationBuilder.Sql("DROP TABLE IF EXISTS ProileLoadouts;");
 
             migrationBuilder.RenameColumn(
                 name: "hwid_type",
diff --git a/Content.Server.Database/add-migration.ps1 b/Content.Server.Database/add-migration.ps1
index 7f44558eb7b..e8c7443c867 100755
--- a/Content.Server.Database/add-migration.ps1
+++ b/Content.Server.Database/add-migration.ps1
@@ -8,5 +8,5 @@ if ($name -eq "")
     exit
 }
 
-dotnet ef migrations add --context SqliteServerDbContext -o Migrations/Sqlite $name
-dotnet ef migrations add --context PostgresServerDbContext -o Migrations/Postgres $name
+dotnet ef migrations add --context SqliteServerDbContext --output-dir Migrations/Sqlite $name
+dotnet ef migrations add --context PostgresServerDbContext --output-dir Migrations/Postgres $name
diff --git a/Content.Server.Database/remove-migration.ps1 b/Content.Server.Database/remove-migration.ps1
index 7d3df6fb498..364d7d65f32 100755
--- a/Content.Server.Database/remove-migration.ps1
+++ b/Content.Server.Database/remove-migration.ps1
@@ -8,5 +8,5 @@ if ($name -eq "")
     exit
 }
 
-dotnet ef migrations remove --context SqliteServerDbContext -o Migrations/Sqlite $name
-dotnet ef migrations remove --context PostgresServerDbContext -o Migrations/Postgres $name
+dotnet ef migrations remove --context SqliteServerDbContext $name
+dotnet ef migrations remove --context PostgresServerDbContext $name

From 0fac65861b2bd5f2f86dd46c2132d7a060510cfa Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 22 Dec 2024 16:53:41 -0400
Subject: [PATCH 269/366] Only drop if it exists, stupid.

---
 .../Migrations/Sqlite/20241222203134_UpstreamMerge.cs          | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Content.Server.Database/Migrations/Sqlite/20241222203134_UpstreamMerge.cs b/Content.Server.Database/Migrations/Sqlite/20241222203134_UpstreamMerge.cs
index 1b513506ad0..f46ab47b408 100644
--- a/Content.Server.Database/Migrations/Sqlite/20241222203134_UpstreamMerge.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20241222203134_UpstreamMerge.cs
@@ -10,8 +10,7 @@ public partial class UpstreamMerge : Migration
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.DropTable(
-                name: "ProfileLoadout");
+            migrationBuilder.Sql("DROP TABLE IF EXISTS ProileLoadouts;");
 
             migrationBuilder.RenameColumn(
                 name: "hwid_type",

From d24876db945929477743cb216ffea5f4580daebf Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 22 Dec 2024 17:17:26 -0400
Subject: [PATCH 270/366] Wait, silly.

---
 Content.IntegrationTests/Pair/TestPair.Recycle.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Content.IntegrationTests/Pair/TestPair.Recycle.cs b/Content.IntegrationTests/Pair/TestPair.Recycle.cs
index c0f4b3b745f..b59a923e78c 100644
--- a/Content.IntegrationTests/Pair/TestPair.Recycle.cs
+++ b/Content.IntegrationTests/Pair/TestPair.Recycle.cs
@@ -2,10 +2,12 @@
 using System.IO;
 using System.Linq;
 using Content.Server.GameTicking;
+using Content.Server.Preferences.Managers;
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
+using Content.Shared.Preferences;
 using Robust.Client;
 using Robust.Server.Player;
 using Robust.Shared.Exceptions;
@@ -34,6 +36,10 @@ private async Task OnDirtyDispose()
 
     private async Task OnCleanDispose()
     {
+        await Server.WaitIdleAsync();
+        await Client.WaitIdleAsync();
+        await Server.RemoveAllDummySessions();
+
         if (TestMap != null)
         {
             await Server.WaitPost(() => Server.EntMan.DeleteEntity(TestMap.MapUid));
@@ -132,6 +138,7 @@ public async Task CleanPooledPair(PoolSettings settings, TextWriter testOut)
         if (gameTicker.RunLevel != GameRunLevel.PreRoundLobby)
         {
             await testOut.WriteLineAsync($"Recycling: {Watch.Elapsed.TotalMilliseconds} ms: Restarting round.");
+            Server.CfgMan.SetCVar(CCVars.GameDummyTicker, false);
             Assert.That(gameTicker.DummyTicker, Is.False);
             Server.CfgMan.SetCVar(CCVars.GameLobbyEnabled, true);
             await Server.WaitPost(() => gameTicker.RestartRound());

From 0fbd8da04d02dbffdd3332869e20fbc1fd9ed12d Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 23 Dec 2024 02:47:16 -0400
Subject: [PATCH 271/366] scuffed

---
 Content.IntegrationTests/Pair/TestPair.Recycle.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Content.IntegrationTests/Pair/TestPair.Recycle.cs b/Content.IntegrationTests/Pair/TestPair.Recycle.cs
index b59a923e78c..8976a9252c3 100644
--- a/Content.IntegrationTests/Pair/TestPair.Recycle.cs
+++ b/Content.IntegrationTests/Pair/TestPair.Recycle.cs
@@ -199,6 +199,10 @@ public void ValidateSettings(PoolSettings settings)
         var session = sPlayer.Sessions.Single();
         Assert.That(cPlayer.LocalSession?.UserId, Is.EqualTo(session.UserId));
 
+        if (!ticker.PlayerGameStatuses.ContainsKey(session.UserId))
+            Assert.Fail($"{session.UserId} was not found.\n\n" +
+                $"{string.Join(", ", ticker.PlayerGameStatuses.Keys.Select(s => s.ToString()))}");
+
         if (ticker.DummyTicker)
             return;
 

From 13b9ad9dc33811557915f2d22329df530c45b44c Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 23 Dec 2024 03:00:26 -0400
Subject: [PATCH 272/366] sillyyy

---
 Content.IntegrationTests/Pair/TestPair.Recycle.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Content.IntegrationTests/Pair/TestPair.Recycle.cs b/Content.IntegrationTests/Pair/TestPair.Recycle.cs
index 8976a9252c3..fc100c7604f 100644
--- a/Content.IntegrationTests/Pair/TestPair.Recycle.cs
+++ b/Content.IntegrationTests/Pair/TestPair.Recycle.cs
@@ -200,8 +200,14 @@ public void ValidateSettings(PoolSettings settings)
         Assert.That(cPlayer.LocalSession?.UserId, Is.EqualTo(session.UserId));
 
         if (!ticker.PlayerGameStatuses.ContainsKey(session.UserId))
-            Assert.Fail($"{session.UserId} was not found.\n\n" +
-                $"{string.Join(", ", ticker.PlayerGameStatuses.Keys.Select(s => s.ToString()))}");
+        {
+            var debugMsg = "Contains:";
+
+            foreach (var (id, playerStatus) in ticker.PlayerGameStatuses)
+                debugMsg += $"\n{id}";
+
+            Assert.Fail(debugMsg);
+        }
 
         if (ticker.DummyTicker)
             return;

From c2704bc9b44a15bd778406baad5ca2a1d16f9db1 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Sun, 13 Oct 2024 22:55:15 +0200
Subject: [PATCH 273/366] Fix some rounds failing to end due to mind roles
 (#32792)

* Fix some rounds failing to end due to mind roles

Fixes #32791

This is caused by ShowRoundEndScoreboard running into a bug trying to display antags: some player is showing up as antag with MindIsAntagonist(), but has no antag roles listed in MindGetAllRoleInfo().

This was caused by one of the roles of the player having the Antag boolean set, but having no AntagPrototype set.

The responsible mind role appeared to be MindRoleSubvertedSilicon which is missing a set for the SubvertedSilicon antag prototype.

I also added resilience to the round-end code to make it so that an exception showing the scoreboard (and sending the Discord message) would not cause the round end logic to completely abort from an exception.

I am planning to add an integration test to cover this bug (no prototype in mind roles), but I'll leave that for not-the-immediate-hotfix.

* At least one maintainer approved this tiny PR without reading it, not naming names.
---
 .../GameTicking/GameTicker.RoundFlow.cs       | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index eecbe3e6e38..b6bc79e371e 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -329,8 +329,23 @@ public void EndRound(string text = "")
 
             RunLevel = GameRunLevel.PostRound;
 
-            ShowRoundEndScoreboard(text);
-            SendRoundEndDiscordMessage();
+            try
+            {
+                ShowRoundEndScoreboard(text);
+            }
+            catch (Exception e)
+            {
+                Log.Error($"Error while showing round end scoreboard: {e}");
+            }
+
+            try
+            {
+                SendRoundEndDiscordMessage();
+            }
+            catch (Exception e)
+            {
+                Log.Error($"Error while sending round end Discord message: {e}");
+            }
         }
 
         public void ShowRoundEndScoreboard(string text = "")

From b5ab695134551c748948d0f1f3535f2be91b20f2 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Fri, 31 May 2024 14:44:35 +1200
Subject: [PATCH 274/366] Make tests automatically reset modified cvars
 (#28219)

* Make tests automatically reset modified cvars

* Fix bad return

* A

* Try Fix tests

* clarify comment

* update eng
---
 .../Pair/TestPair.Cvars.cs                    | 69 +++++++++++++++++++
 .../Pair/TestPair.Recycle.cs                  |  2 +
 Content.IntegrationTests/Pair/TestPair.cs     |  4 ++
 Content.IntegrationTests/PoolManager.cs       |  2 +
 .../Tests/GameRules/NukeOpsTest.cs            |  1 -
 .../Administration/Systems/AdminSystem.cs     | 13 ++++
 6 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 Content.IntegrationTests/Pair/TestPair.Cvars.cs

diff --git a/Content.IntegrationTests/Pair/TestPair.Cvars.cs b/Content.IntegrationTests/Pair/TestPair.Cvars.cs
new file mode 100644
index 00000000000..81df31fc9a3
--- /dev/null
+++ b/Content.IntegrationTests/Pair/TestPair.Cvars.cs
@@ -0,0 +1,69 @@
+#nullable enable
+using System.Collections.Generic;
+using Content.Shared.CCVar;
+using Robust.Shared.Configuration;
+using Robust.Shared.Utility;
+
+namespace Content.IntegrationTests.Pair;
+
+public sealed partial class TestPair
+{
+    private readonly Dictionary<string, object> _modifiedClientCvars = new();
+    private readonly Dictionary<string, object> _modifiedServerCvars = new();
+
+    private void OnServerCvarChanged(CVarChangeInfo args)
+    {
+        _modifiedServerCvars.TryAdd(args.Name, args.OldValue);
+    }
+
+    private void OnClientCvarChanged(CVarChangeInfo args)
+    {
+        _modifiedClientCvars.TryAdd(args.Name, args.OldValue);
+    }
+
+    internal void ClearModifiedCvars()
+    {
+        _modifiedClientCvars.Clear();
+        _modifiedServerCvars.Clear();
+    }
+
+    /// <summary>
+    /// Reverts any cvars that were modified during a test back to their original values.
+    /// </summary>
+    public async Task RevertModifiedCvars()
+    {
+        await Server.WaitPost(() =>
+        {
+            foreach (var (name, value) in _modifiedServerCvars)
+            {
+                if (Server.CfgMan.GetCVar(name).Equals(value))
+                    continue;
+                Server.Log.Info($"Resetting cvar {name} to {value}");
+                Server.CfgMan.SetCVar(name, value);
+            }
+
+            // I just love order dependent cvars
+            if (_modifiedServerCvars.TryGetValue(CCVars.PanicBunkerEnabled.Name, out var panik))
+                Server.CfgMan.SetCVar(CCVars.PanicBunkerEnabled.Name, panik);
+
+        });
+
+        await Client.WaitPost(() =>
+        {
+            foreach (var (name, value) in _modifiedClientCvars)
+            {
+                if (Client.CfgMan.GetCVar(name).Equals(value))
+                    continue;
+
+                var flags = Client.CfgMan.GetCVarFlags(name);
+                if (flags.HasFlag(CVar.REPLICATED) && flags.HasFlag(CVar.SERVER))
+                    continue;
+
+                Client.Log.Info($"Resetting cvar {name} to {value}");
+                Client.CfgMan.SetCVar(name, value);
+            }
+        });
+
+        ClearModifiedCvars();
+    }
+}
diff --git a/Content.IntegrationTests/Pair/TestPair.Recycle.cs b/Content.IntegrationTests/Pair/TestPair.Recycle.cs
index fc100c7604f..c5fc3e22ad6 100644
--- a/Content.IntegrationTests/Pair/TestPair.Recycle.cs
+++ b/Content.IntegrationTests/Pair/TestPair.Recycle.cs
@@ -46,6 +46,8 @@ private async Task OnCleanDispose()
             TestMap = null;
         }
 
+        await RevertModifiedCvars();
+
         var usageTime = Watch.Elapsed;
         Watch.Restart();
         await _testOut.WriteLineAsync($"{nameof(CleanReturnAsync)}: Test borrowed pair {Id} for {usageTime.TotalMilliseconds} ms");
diff --git a/Content.IntegrationTests/Pair/TestPair.cs b/Content.IntegrationTests/Pair/TestPair.cs
index 916a94c9c4c..7ee5dbd55c7 100644
--- a/Content.IntegrationTests/Pair/TestPair.cs
+++ b/Content.IntegrationTests/Pair/TestPair.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using Content.Server.GameTicking;
 using Content.Shared.Players;
+using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
@@ -58,6 +59,9 @@ public async Task Initialize(PoolSettings settings, TextWriter testOut, List<str
         (Server, ServerLogHandler) = await PoolManager.GenerateServer(settings, testOut);
         ActivateContext(testOut);
 
+        Client.CfgMan.OnCVarValueChanged += OnClientCvarChanged;
+        Server.CfgMan.OnCVarValueChanged += OnServerCvarChanged;
+
         if (!settings.NoLoadTestPrototypes)
             await LoadPrototypes(testPrototypes!);
 
diff --git a/Content.IntegrationTests/PoolManager.cs b/Content.IntegrationTests/PoolManager.cs
index 3f489de6497..13a1f194bae 100644
--- a/Content.IntegrationTests/PoolManager.cs
+++ b/Content.IntegrationTests/PoolManager.cs
@@ -273,6 +273,8 @@ await testOut.WriteLineAsync(
             $"{nameof(GetServerClientPair)}: Retrieving pair {pair.Id} from pool took {poolRetrieveTime.TotalMilliseconds} ms");
         await testOut.WriteLineAsync(
             $"{nameof(GetServerClientPair)}: Returning pair {pair.Id}");
+
+        pair.ClearModifiedCvars();
         pair.Settings = poolSettings;
         pair.TestHistory.Add(currentTestName);
         pair.Watch.Restart();
diff --git a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
index 822f7967cfd..71f3a0988a8 100644
--- a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
+++ b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
@@ -53,7 +53,6 @@ public async Task TryStopNukeOpsFromConstantlyFailing()
         var invSys = server.System<InventorySystem>();
         var factionSys = server.System<NpcFactionSystem>();
 
-        Assert.That(server.CfgMan.GetCVar(CCVars.GridFill), Is.False);
         server.CfgMan.SetCVar(CCVars.GridFill, true);
 
         // Initially in the lobby
diff --git a/Content.Server/Administration/Systems/AdminSystem.cs b/Content.Server/Administration/Systems/AdminSystem.cs
index 76043dab50d..8d6e2fa3749 100644
--- a/Content.Server/Administration/Systems/AdminSystem.cs
+++ b/Content.Server/Administration/Systems/AdminSystem.cs
@@ -334,6 +334,19 @@ private void UpdatePanicBunker()
                 : _adminManager.ActiveAdmins;
             var hasAdmins = admins.Any();
 
+            // TODO Fix order dependent Cvars
+            // Please for the sake of my sanity don't make cvars & order dependent.
+            // Just make a bool field on the system instead of having some cvars automatically modify other cvars.
+            //
+            // I.e., this:
+            //   /sudo cvar game.panic_bunker.enabled true
+            //   /sudo cvar game.panic_bunker.disable_with_admins true
+            // and this:
+            //   /sudo cvar game.panic_bunker.disable_with_admins true
+            //   /sudo cvar game.panic_bunker.enabled true
+            //
+            // should have the same effect, but currently setting the disable_with_admins can modify enabled.
+
             if (hasAdmins && PanicBunker.DisableWithAdmins)
             {
                 _config.SetCVar(CCVars.PanicBunkerEnabled, false);

From 9b6527b457e86e9c40f697a5a2f56bd26f8fdaeb Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Fri, 9 Aug 2024 17:25:43 +1200
Subject: [PATCH 275/366] Add random seed options to tests (#30735)

* Add random seed options to tests

* Ensure profile randomization
---
 Content.IntegrationTests/Pair/TestPair.cs | 68 ++++++++++++++++++-----
 Content.IntegrationTests/PoolManager.cs   |  8 ++-
 Content.IntegrationTests/PoolSettings.cs  | 46 ++++++++++-----
 3 files changed, 91 insertions(+), 31 deletions(-)

diff --git a/Content.IntegrationTests/Pair/TestPair.cs b/Content.IntegrationTests/Pair/TestPair.cs
index 7ee5dbd55c7..42add948063 100644
--- a/Content.IntegrationTests/Pair/TestPair.cs
+++ b/Content.IntegrationTests/Pair/TestPair.cs
@@ -9,6 +9,7 @@
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
+using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.UnitTesting;
 
@@ -26,6 +27,13 @@ public sealed partial class TestPair
     public readonly List<string> TestHistory = new();
     public PoolSettings Settings = default!;
     public TestMapData? TestMap;
+    
+    private int _nextServerSeed;
+    private int _nextClientSeed;
+
+    public int ServerSeed;
+    public int ClientSeed;
+
     public RobustIntegrationTest.ServerIntegrationInstance Server { get; private set; } = default!;
     public RobustIntegrationTest.ClientIntegrationInstance Client { get;  private set; } = default!;
 
@@ -71,22 +79,27 @@ public async Task Initialize(PoolSettings settings, TextWriter testOut, List<str
             await Server.WaitPost(() => gameTicker.RestartRound());
         }
 
-        if (settings.ShouldBeConnected)
+        // Always initially connect clients to generate an initial random set of preferences/profiles.
+        // This is to try and prevent issues where if the first test that connects the client is consistently some test
+        // that uses a fixed seed, it would effectively prevent it from beingrandomized.
+
+        Client.SetConnectTarget(Server);
+        await Client.WaitIdleAsync();
+        var netMgr = Client.ResolveDependency<IClientNetManager>();
+        await Client.WaitPost(() => netMgr.ClientConnect(null!, 0, null!));
+        await ReallyBeIdle(10);
+        await Client.WaitRunTicks(1);
+
+        if (!settings.ShouldBeConnected)
         {
-            Client.SetConnectTarget(Server);
-            await Client.WaitIdleAsync();
-            var netMgr = Client.ResolveDependency<IClientNetManager>();
-
-            await Client.WaitPost(() =>
-            {
-                if (!netMgr.IsConnected)
-                {
-                    netMgr.ClientConnect(null!, 0, null!);
-                }
-            });
+            await Client.WaitPost(() => netMgr.ClientDisconnect("Initial disconnect"));
             await ReallyBeIdle(10);
-            await Client.WaitRunTicks(1);
         }
+
+        var cRand = Client.ResolveDependency<IRobustRandom>();
+        var sRand = Server.ResolveDependency<IRobustRandom>();
+        _nextClientSeed = cRand.Next();
+        _nextServerSeed = sRand.Next();
     }
 
     public void Kill()
@@ -126,4 +139,33 @@ public enum PairState : byte
         CleanDisposed = 2,
         Dead = 3,
     }
+
+    public void SetupSeed()
+    {
+        var sRand = Server.ResolveDependency<IRobustRandom>();
+        if (Settings.ServerSeed is { } severSeed)
+        {
+            ServerSeed = severSeed;
+            sRand.SetSeed(ServerSeed);
+        }
+        else
+        {
+            ServerSeed = _nextServerSeed;
+            sRand.SetSeed(ServerSeed);
+            _nextServerSeed = sRand.Next();
+        }
+
+        var cRand = Client.ResolveDependency<IRobustRandom>();
+        if (Settings.ClientSeed is { } clientSeed)
+        {
+            ClientSeed = clientSeed;
+            cRand.SetSeed(ClientSeed);
+        }
+        else
+        {
+            ClientSeed = _nextClientSeed;
+            cRand.SetSeed(ClientSeed);
+            _nextClientSeed = cRand.Next();
+        }
+    }
 }
diff --git a/Content.IntegrationTests/PoolManager.cs b/Content.IntegrationTests/PoolManager.cs
index 13a1f194bae..75de2963135 100644
--- a/Content.IntegrationTests/PoolManager.cs
+++ b/Content.IntegrationTests/PoolManager.cs
@@ -255,7 +255,7 @@ await testOut.WriteLineAsync(
         }
         finally
         {
-            if (pair != null && pair.TestHistory.Count > 1)
+            if (pair != null && pair.TestHistory.Count > 0)
             {
                 await testOut.WriteLineAsync($"{nameof(GetServerClientPair)}: Pair {pair.Id} Test History Start");
                 for (var i = 0; i < pair.TestHistory.Count; i++)
@@ -271,12 +271,14 @@ await testOut.WriteLineAsync(
         var poolRetrieveTime = poolRetrieveTimeWatch.Elapsed;
         await testOut.WriteLineAsync(
             $"{nameof(GetServerClientPair)}: Retrieving pair {pair.Id} from pool took {poolRetrieveTime.TotalMilliseconds} ms");
-        await testOut.WriteLineAsync(
-            $"{nameof(GetServerClientPair)}: Returning pair {pair.Id}");
 
         pair.ClearModifiedCvars();
         pair.Settings = poolSettings;
         pair.TestHistory.Add(currentTestName);
+        pair.SetupSeed();
+        await testOut.WriteLineAsync(
+            $"{nameof(GetServerClientPair)}: Returning pair {pair.Id} with client/server seeds: {pair.ClientSeed}/{pair.ServerSeed}");
+
         pair.Watch.Restart();
         return pair;
     }
diff --git a/Content.IntegrationTests/PoolSettings.cs b/Content.IntegrationTests/PoolSettings.cs
index a78173808f8..9da514e66b8 100644
--- a/Content.IntegrationTests/PoolSettings.cs
+++ b/Content.IntegrationTests/PoolSettings.cs
@@ -1,5 +1,7 @@
 #nullable enable
 
+using Robust.Shared.Random;
+
 namespace Content.IntegrationTests;
 
 /// <summary>
@@ -9,16 +11,6 @@ namespace Content.IntegrationTests;
 /// </summary>
 public sealed class PoolSettings
 {
-    /// <summary>
-    /// If the returned pair must not be reused
-    /// </summary>
-    public bool MustNotBeReused => Destructive || NoLoadContent || NoLoadTestPrototypes;
-
-    /// <summary>
-    /// If the given pair must be brand new
-    /// </summary>
-    public bool MustBeNew => Fresh || NoLoadContent || NoLoadTestPrototypes;
-
     /// <summary>
     /// Set to true if the test will ruin the server/client pair.
     /// </summary>
@@ -34,8 +26,6 @@ public sealed class PoolSettings
     /// </summary>
     public bool DummyTicker { get; init; } = true;
 
-    public bool UseDummyTicker => !InLobby && DummyTicker;
-
     /// <summary>
     /// If true, this enables the creation of admin logs during the test.
     /// </summary>
@@ -48,8 +38,6 @@ public sealed class PoolSettings
     /// </summary>
     public bool Connected { get; init; }
 
-    public bool ShouldBeConnected => InLobby || Connected;
-
     /// <summary>
     /// Set to true if the given server/client pair should be in the lobby.
     /// If the pair is not in the lobby at the end of the test, this test must be marked as dirty.
@@ -92,6 +80,34 @@ public sealed class PoolSettings
     /// </summary>
     public string? TestName { get; set; }
 
+    /// <summary>
+    /// If set, this will be used to call <see cref="IRobustRandom.SetSeed"/>
+    /// </summary>
+    public int? ServerSeed { get; set; }
+
+    /// <summary>
+    /// If set, this will be used to call <see cref="IRobustRandom.SetSeed"/>
+    /// </summary>
+    public int? ClientSeed { get; set; }
+
+    #region Inferred Properties
+
+    /// <summary>
+    /// If the returned pair must not be reused
+    /// </summary>
+    public bool MustNotBeReused => Destructive || NoLoadContent || NoLoadTestPrototypes;
+
+    /// <summary>
+    /// If the given pair must be brand new
+    /// </summary>
+    public bool MustBeNew => Fresh || NoLoadContent || NoLoadTestPrototypes;
+
+    public bool UseDummyTicker => !InLobby && DummyTicker;
+
+    public bool ShouldBeConnected => InLobby || Connected;
+
+    #endregion
+
     /// <summary>
     /// Tries to guess if we can skip recycling the server/client pair.
     /// </summary>
@@ -114,4 +130,4 @@ public bool CanFastRecycle(PoolSettings nextSettings)
                && Map == nextSettings.Map
                && InLobby == nextSettings.InLobby;
     }
-}
\ No newline at end of file
+}

From 5f6701b58edf9337809d55c1f2403ecf34fa21ef Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Sun, 1 Sep 2024 03:28:30 +0200
Subject: [PATCH 276/366] Test parallelization stuff. (#31650)

This is the content analogue of https://github.com/space-wizards/RobustToolbox/pull/5412

Made Content.Tests run tests parallelized, which doesn't really seem to matter much.

I tried to make Content.IntegrationTest more aggressively parallelized but ran into https://github.com/dotnet/runtime/issues/107197 so we need to shelve that. Added a comment explaining as such.
---
 Content.IntegrationTests/AssemblyInfo.cs                | 8 ++++++++
 Content.IntegrationTests/PoolManager.cs                 | 2 --
 Content.IntegrationTests/PoolManagerTestEventHandler.cs | 5 +----
 Content.Tests/AssemblyInfo.cs                           | 3 +++
 4 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 Content.IntegrationTests/AssemblyInfo.cs
 create mode 100644 Content.Tests/AssemblyInfo.cs

diff --git a/Content.IntegrationTests/AssemblyInfo.cs b/Content.IntegrationTests/AssemblyInfo.cs
new file mode 100644
index 00000000000..76fc42f3a91
--- /dev/null
+++ b/Content.IntegrationTests/AssemblyInfo.cs
@@ -0,0 +1,8 @@
+[assembly: Parallelizable(ParallelScope.Children)]
+
+// I don't know why this parallelism limit was originally put here.
+// I *do* know that I tried removing it, and ran into the following .NET runtime problem:
+// https://github.com/dotnet/runtime/issues/107197
+// So we can't really parallelize integration tests harder either until the runtime fixes that,
+// *or* we fix serv3 to not spam expression trees.
+[assembly: LevelOfParallelism(3)]
diff --git a/Content.IntegrationTests/PoolManager.cs b/Content.IntegrationTests/PoolManager.cs
index 75de2963135..636a0f93a26 100644
--- a/Content.IntegrationTests/PoolManager.cs
+++ b/Content.IntegrationTests/PoolManager.cs
@@ -23,8 +23,6 @@
 using Robust.Shared.Timing;
 using Robust.UnitTesting;
 
-[assembly: LevelOfParallelism(3)]
-
 namespace Content.IntegrationTests;
 
 /// <summary>
diff --git a/Content.IntegrationTests/PoolManagerTestEventHandler.cs b/Content.IntegrationTests/PoolManagerTestEventHandler.cs
index d37dffff50a..cd35c7c7bdd 100644
--- a/Content.IntegrationTests/PoolManagerTestEventHandler.cs
+++ b/Content.IntegrationTests/PoolManagerTestEventHandler.cs
@@ -1,7 +1,4 @@
-
-[assembly: Parallelizable(ParallelScope.Children)]
-
-namespace Content.IntegrationTests;
+namespace Content.IntegrationTests;
 
 [SetUpFixture]
 public sealed class PoolManagerTestEventHandler
diff --git a/Content.Tests/AssemblyInfo.cs b/Content.Tests/AssemblyInfo.cs
new file mode 100644
index 00000000000..8e01f41b183
--- /dev/null
+++ b/Content.Tests/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using NUnit.Framework;
+
+[assembly: Parallelizable(ParallelScope.Fixtures)]

From df49cff52c5928b4cfb9c71b94ec33eec3c5fe4c Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 23 Dec 2024 05:29:43 -0400
Subject: [PATCH 277/366] Check

---
 Content.IntegrationTests/Pair/TestPair.Recycle.cs | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/Content.IntegrationTests/Pair/TestPair.Recycle.cs b/Content.IntegrationTests/Pair/TestPair.Recycle.cs
index c5fc3e22ad6..92d59e51852 100644
--- a/Content.IntegrationTests/Pair/TestPair.Recycle.cs
+++ b/Content.IntegrationTests/Pair/TestPair.Recycle.cs
@@ -200,16 +200,7 @@ public void ValidateSettings(PoolSettings settings)
         Assert.That(sPlayer.Sessions.Count(), Is.EqualTo(1));
         var session = sPlayer.Sessions.Single();
         Assert.That(cPlayer.LocalSession?.UserId, Is.EqualTo(session.UserId));
-
-        if (!ticker.PlayerGameStatuses.ContainsKey(session.UserId))
-        {
-            var debugMsg = "Contains:";
-
-            foreach (var (id, playerStatus) in ticker.PlayerGameStatuses)
-                debugMsg += $"\n{id}";
-
-            Assert.Fail(debugMsg);
-        }
+        Assert.That(sPlayer.Sessions.Count, Is.EqualTo(ticker.PlayerGameStatuses.Count));
 
         if (ticker.DummyTicker)
             return;

From 4b1e01e978e14fe0d1f9eca7194c3cdbd58f6d9f Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 23 Dec 2024 05:38:28 -0400
Subject: [PATCH 278/366] v238.0...1?

---
 RobustToolbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RobustToolbox b/RobustToolbox
index 5e97db435c0..a2aec44ebbf 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 5e97db435c05b4c188184ef90e5d77b0500403d0
+Subproject commit a2aec44ebbfb75118e24e36488546bbbd80a8608

From b3f57972e043d1354f6b489641504d704fab1afb Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 23 Dec 2024 05:49:48 -0400
Subject: [PATCH 279/366] hm

---
 Content.Server/GameTicking/GameTicker.Lobby.cs     | 8 +++++++-
 Content.Server/GameTicking/GameTicker.RoundFlow.cs | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Content.Server/GameTicking/GameTicker.Lobby.cs b/Content.Server/GameTicking/GameTicker.Lobby.cs
index 82ef8c6012b..42690c20b73 100644
--- a/Content.Server/GameTicking/GameTicker.Lobby.cs
+++ b/Content.Server/GameTicking/GameTicker.Lobby.cs
@@ -179,5 +179,11 @@ public void ToggleReady(ICommonSession player, bool ready)
             // update server info to reflect new ready count
             UpdateInfoText();
         }
+
+        public bool UserHasJoinedGame(ICommonSession session)
+            => UserHasJoinedGame(session.UserId);
+
+        public bool UserHasJoinedGame(NetUserId userId)
+            => PlayerGameStatuses.TryGetValue(userId, out var status) && status == PlayerGameStatus.JoinedGame;
     }
-}
+}
\ No newline at end of file
diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index b6bc79e371e..05fce8cd048 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -578,6 +578,7 @@ private void ResettingCleanup()
 
             DisallowLateJoin = false;
             _playerGameStatuses.Clear();
+            _sawmill.Error($"Resetting cleanup with {_playerManager.Sessions.Length} players");
             foreach (var session in _playerManager.Sessions)
             {
                 _playerGameStatuses[session.UserId] = LobbyEnabled ? PlayerGameStatus.NotReadyToPlay : PlayerGameStatus.ReadyToPlay;

From 2337463adde0a0e388606b2d039d61d486a70266 Mon Sep 17 00:00:00 2001
From: "Mr. 27" <45323883+Dutch-VanDerLinde@users.noreply.github.com>
Date: Thu, 20 Jun 2024 07:12:58 -0400
Subject: [PATCH 280/366] Fix ERT becoming sleeper agents and add sleeper agent
 preferences (#27817)

* b

* Update antags.ftl

* m

* ok

* Update events.yml

* antag

* a

* Create InitialInfectedExemptComponent.cs

* Delete InitialInfectedExemptComponent.cs

* yes

* Delete InitialInfectedExemptComponent.cs

* Create AntagImmuneComponent.cs
---
 .../Antag/Components/AntagImmuneComponent.cs  |  7 +++
 .../Zombies/InitialInfectedExemptComponent.cs |  7 ---
 .../Locale/en-US/prototypes/roles/antags.ftl  |  3 ++
 .../Entities/Mobs/Player/humanoid.yml         | 44 +++++++------------
 Resources/Prototypes/GameRules/events.yml     | 12 +++--
 Resources/Prototypes/GameRules/roundstart.yml |  5 ++-
 Resources/Prototypes/Roles/Antags/traitor.yml | 44 +++++++++++++++++--
 7 files changed, 80 insertions(+), 42 deletions(-)
 create mode 100644 Content.Server/Antag/Components/AntagImmuneComponent.cs
 delete mode 100644 Content.Server/Zombies/InitialInfectedExemptComponent.cs

diff --git a/Content.Server/Antag/Components/AntagImmuneComponent.cs b/Content.Server/Antag/Components/AntagImmuneComponent.cs
new file mode 100644
index 00000000000..3ae8e049f60
--- /dev/null
+++ b/Content.Server/Antag/Components/AntagImmuneComponent.cs
@@ -0,0 +1,7 @@
+namespace Content.Server.Antag.Components;
+
+[RegisterComponent]
+public partial class AntagImmuneComponent : Component
+{
+
+}
diff --git a/Content.Server/Zombies/InitialInfectedExemptComponent.cs b/Content.Server/Zombies/InitialInfectedExemptComponent.cs
deleted file mode 100644
index f2dfda3f872..00000000000
--- a/Content.Server/Zombies/InitialInfectedExemptComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Server.Zombies;
-
-[RegisterComponent]
-public sealed partial class InitialInfectedExemptComponent : Component
-{
-
-}
diff --git a/Resources/Locale/en-US/prototypes/roles/antags.ftl b/Resources/Locale/en-US/prototypes/roles/antags.ftl
index 5c514dba8ec..1e057738e37 100644
--- a/Resources/Locale/en-US/prototypes/roles/antags.ftl
+++ b/Resources/Locale/en-US/prototypes/roles/antags.ftl
@@ -1,6 +1,9 @@
 roles-antag-syndicate-agent-name = Syndicate agent
 roles-antag-syndicate-agent-objective = Complete your objectives without being caught.
 
+roles-antag-syndicate-agent-sleeper-name = Syndicate sleeper agent
+roles-antag-syndicate-agent-sleeper-objective = A form of syndicate agent that can activate at any point in the middle of the shift.
+
 roles-antag-initial-infected-name = Initial Infected
 roles-antag-initial-infected-objective = Once you turn, infect as many other crew members as possible.
 
diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
index a4bfe2289bd..f7c785e6417 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -1,4 +1,18 @@
-# Random humanoids
+## Random humanoids
+
+- type: randomHumanoidSettings
+  id: EventHumanoid
+  components:
+    - type: RandomHumanoidAppearance
+      randomizeName: false
+    - type: GhostTakeoverAvailable
+
+- type: randomHumanoidSettings
+  id: EventHumanoidMindShielded
+  parent: EventHumanoid
+  components:
+    - type: MindShield
+    - type: AntagImmune
 
 ## Death Squad
 
@@ -16,33 +30,31 @@
         - NamesLastMilitary
     - type: RandomHumanoidSpawner
       settings: DeathSquad
-    - type: InitialInfectedExempt
 
 - type: randomHumanoidSettings
+  parent: EventHumanoidMindShielded
   id: DeathSquad
   randomizeName: false
   speciesBlacklist:
     - Shadowkin
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-Death-Squad-name
       description: ghost-role-information-Death-Squad-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ DeathSquadGear ]
     - type: RandomMetadata
       nameSegments:
         - NamesFirstMilitaryLeader
         - NamesLastMilitary
-    - type: InitialInfectedExempt
 
 
 ## ERT Leader
 
 - type: entity
+  parent: EventHumanoidMindShielded
   id: RandomHumanoidSpawnerERTLeader
   name: ERT leader
   suffix: ERTRole, Basic
@@ -56,7 +68,6 @@
       - NamesLastMilitary
     - type: RandomHumanoidSpawner
       settings: ERTLeader
-    - type: InitialInfectedExempt
 
 - type: randomHumanoidSettings
   id: ERTLeader
@@ -64,7 +75,6 @@
   speciesBlacklist:
     - Shadowkin
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-leader-name
       description: ghost-role-information-ert-leader-description
@@ -77,7 +87,6 @@
       nameSegments:
       - NamesFirstMilitaryLeader
       - NamesLastMilitary
-    - type: InitialInfectedExempt
 
 - type: entity
   id: RandomHumanoidSpawnerERTLeaderEVA
@@ -90,7 +99,6 @@
       state: ertleadereva
     - type: RandomHumanoidSpawner
       settings: ERTLeaderEVA
-    - type: InitialInfectedExempt
 
 - type: randomHumanoidSettings
   id: ERTLeaderEVA
@@ -105,7 +113,6 @@
     - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTLeaderGearEVA ]
-    - type: InitialInfectedExempt
 
 - type: entity
   id: RandomHumanoidSpawnerERTLeaderEVALecter
@@ -114,7 +121,6 @@
   components:
     - type: RandomHumanoidSpawner
       settings: ERTLeaderEVALecter
-    - type: InitialInfectedExempt
 
 - type: randomHumanoidSettings
   id: ERTLeaderEVALecter
@@ -129,7 +135,6 @@
     - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTLeaderGearEVALecter ]
-    - type: InitialInfectedExempt
 
 ## ERT Chaplain
 
@@ -166,7 +171,6 @@
       - NamesLastMilitary
     - type: Loadout
       prototypes: [ ERTChaplainGear ]
-    - type: InitialInfectedExempt
 
 - type: entity
   id: RandomHumanoidSpawnerERTChaplainEVA
@@ -193,7 +197,6 @@
     - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTChaplainGearEVA ]
-    - type: InitialInfectedExempt
 
 ## ERT Janitor
 
@@ -230,7 +233,6 @@
       - NamesLastMilitary
     - type: Loadout
       prototypes: [ ERTJanitorGear ]
-    - type: InitialInfectedExempt
 
 - type: entity
   id: RandomHumanoidSpawnerERTJanitorEVA
@@ -257,7 +259,6 @@
     - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTJanitorGearEVA ]
-    - type: InitialInfectedExempt
 
 ## ERT Engineer
 
@@ -294,7 +295,6 @@
       - NamesLastMilitary
     - type: Loadout
       prototypes: [ ERTEngineerGear ]
-    - type: InitialInfectedExempt
 
 - type: entity
   id: RandomHumanoidSpawnerERTEngineerEVA
@@ -321,7 +321,6 @@
     - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTEngineerGearEVA ]
-    - type: InitialInfectedExempt
 
 ## ERT Security
 
@@ -358,7 +357,6 @@
       - NamesLastMilitary
     - type: Loadout
       prototypes: [ ERTSecurityGear ]
-    - type: InitialInfectedExempt
 
 - type: entity
   id: RandomHumanoidSpawnerERTSecurityEVA
@@ -385,7 +383,6 @@
     - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTSecurityGearEVA ]
-    - type: InitialInfectedExempt
 
 - type: entity
   id: RandomHumanoidSpawnerERTSecurityEVALecter
@@ -408,7 +405,6 @@
     - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTSecurityGearEVALecter ]
-    - type: InitialInfectedExempt
 
 ## ERT Medic
 
@@ -445,7 +441,6 @@
       - NamesLastMilitary
     - type: Loadout
       prototypes: [ ERTMedicalGear ]
-    - type: InitialInfectedExempt
 
 - type: entity
   id: RandomHumanoidSpawnerERTMedicalEVA
@@ -472,7 +467,6 @@
     - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTMedicalGearEVA ]
-    - type: InitialInfectedExempt
 
 ## CBURN
 
@@ -486,7 +480,6 @@
       state: cburn
     - type: RandomHumanoidSpawner
       settings: CBURNAgent
-    - type: InitialInfectedExempt
 
 - type: randomHumanoidSettings
   id: CBURNAgent
@@ -506,7 +499,6 @@
       nameSegments:
       - NamesFirstMilitary
       - NamesLastMilitary
-    - type: InitialInfectedExempt
 ## Central Command
 
 - type: entity
@@ -518,7 +510,6 @@
       state: centcom
     - type: RandomHumanoidSpawner
       settings: CentcomOfficial
-    - type: InitialInfectedExempt
 
 - type: randomHumanoidSettings
   id: CentcomOfficial
@@ -534,7 +525,6 @@
     - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ CentcomGear ]
-    - type: InitialInfectedExempt
 
 ## Syndicate
 
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 5e543221625..7dad051b981 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -458,7 +458,7 @@
       blacklist:
         components:
         - ZombieImmune
-        - InitialInfectedExempt
+        - AntagImmune
       briefing:
         text: zombie-patientzero-role-greeting
         color: Plum
@@ -510,7 +510,7 @@
 - type: entity
   categories: [ HideSpawnMenu ]
   parent: BaseTraitorRule
-  id: SleeperAgentsRule
+  id: SleeperAgents
   components:
   - type: StationEvent
     earliestStart: 25
@@ -521,13 +521,17 @@
   - type: AlertLevelInterceptionRule
   - type: AntagSelection
     definitions:
-    - prefRoles: [ Traitor ]
+    - prefRoles: [ TraitorSleeper ]
+      fallbackRoles: [ Traitor ]
       min: 1
       max: 2
       playerRatio: 10
+      blacklist:
+        components:
+        - AntagImmune
       mindComponents:
       - type: TraitorRole
-        prototype: Traitor
+        prototype: TraitorSleeper
 
 - type: entity
   id: MassHallucinations
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index f47c2651c91..70ccd06f394 100644
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -171,6 +171,9 @@
     - prefRoles: [ Traitor ]
       max: 8
       playerRatio: 10
+      blacklist:
+        components:
+        - AntagImmune
       lateJoinAdditional: true
       mindComponents:
       - type: TraitorRole
@@ -243,7 +246,7 @@
       blacklist:
         components:
         - ZombieImmune
-        - InitialInfectedExempt
+        - AntagImmune
       briefing:
         text: zombie-patientzero-role-greeting
         color: Plum
diff --git a/Resources/Prototypes/Roles/Antags/traitor.yml b/Resources/Prototypes/Roles/Antags/traitor.yml
index 05b0553c78f..205f04b05ea 100644
--- a/Resources/Prototypes/Roles/Antags/traitor.yml
+++ b/Resources/Prototypes/Roles/Antags/traitor.yml
@@ -4,6 +4,44 @@
   antagonist: true
   setPreference: true
   objective: roles-antag-syndicate-agent-objective
-  requirements:
-  - !type:CharacterOverallTimeRequirement # DeltaV - Playtime requirement
-    min: 86400 # DeltaV - 24 hours
\ No newline at end of file
+  guides: [ Traitors ]
+
+- type: antag
+  id: TraitorSleeper
+  name: roles-antag-syndicate-agent-sleeper-name
+  antagonist: true
+  setPreference: true
+  objective: roles-antag-syndicate-agent-sleeper-objective
+
+# Syndicate Operative Outfit - Monkey
+- type: startingGear
+  id: SyndicateOperativeGearMonkey
+  equipment:
+    head: ClothingHeadHatOutlawHat
+    jumpsuit: ClothingUniformJumpsuitOperative
+    mask: CigaretteSyndicate
+
+# Syndicate Operative Outfit - Barratry
+- type: startingGear
+  id: SyndicateOperativeGearExtremelyBasic
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitOperative
+    back: ClothingBackpackSyndicate
+    shoes: ClothingShoesBootsCombatFilled
+    gloves: ClothingHandsGlovesColorBlack
+  storage:
+    back:
+    - BoxSurvivalSyndicate
+    - WeaponPistolViper
+    - PinpointerSyndicateNuclear
+    - DeathAcidifierImplanter
+
+#Syndicate Operative Outfit - Basic
+- type: startingGear
+  id: SyndicateOperativeGearBasic
+  parent: SyndicateOperativeGearExtremelyBasic
+  equipment:
+    ears: ClothingHeadsetAltSyndicate
+    gloves: ClothingHandsGlovesCombat
+    pocket1: BaseUplinkRadio40TC
+    id: SyndiPDA

From 7ce56b2da2adc4d5abe5873389a2ce43e23d4d43 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Tue, 24 Dec 2024 16:52:17 -0400
Subject: [PATCH 281/366] fix lint?

---
 .../Roles/Jobs/Fun/misc_startinggear.yml      | 45 -------------------
 1 file changed, 45 deletions(-)

diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
index 7dd3e6823ae..e1b85a55eb9 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
@@ -58,51 +58,6 @@
     belt: ClothingBeltMilitaryWebbingMedFilled
   innerClothingSkirt: ClothingUniformJumpskirtColorBlack
 
-# Syndicate Operative Outfit - Monkey
-- type: startingGear
-  id: SyndicateOperativeGearMonkey
-  equipment:
-    head: ClothingHeadHatOutlawHat
-    jumpsuit: ClothingUniformJumpsuitOperative
-    mask: CigaretteSyndicate
-  innerClothingSkirt: ClothingUniformJumpsuitOperative
-
-# Syndicate Operative Outfit - Barratry
-- type: startingGear
-  id: SyndicateOperativeGearExtremelyBasic
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    back: ClothingBackpackDuffelSyndicateOperative
-    shoes: ClothingShoesBootsCombatFilled
-    gloves: ClothingHandsGlovesColorBlack
-  innerClothingSkirt: ClothingUniformJumpsuitOperative
-  satchel: ClothingBackpackDuffelSyndicateOperative
-  duffelbag: ClothingBackpackDuffelSyndicateOperative
-
-# Syndicate Operative Outfit - Civilian
-- type: startingGear
-  id: SyndicateOperativeGearCivilian
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitSyndieFormal
-    back: ClothingBackpackDuffelSyndicate
-    shoes: ClothingShoesBootsCombat
-    gloves: ClothingHandsGlovesColorBlack
-
-#Syndicate Operative Outfit - Basic
-- type: startingGear
-  id: SyndicateOperativeGearBasic
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    back: ClothingBackpackDuffelSyndicateOperative
-    ears: ClothingHeadsetAltSyndicate
-    gloves: ClothingHandsGlovesCombat
-    shoes: ClothingShoesBootsCombatFilled
-    pocket1: BaseUplinkRadio40TC
-    id: SyndiPDA
-  innerClothingSkirt: ClothingUniformJumpsuitOperative
-  satchel: ClothingBackpackDuffelSyndicateOperative
-  duffelbag: ClothingBackpackDuffelSyndicateOperative
-
 #Syndicate Operative Outfit - Full Kit
 - type: startingGear
   id: SyndicateOperativeGearFull

From 0181930547b8183a52c2a6683324d74468c2a6d4 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Tue, 24 Dec 2024 17:03:54 -0400
Subject: [PATCH 282/366] oops

---
 Resources/Prototypes/Entities/Mobs/Player/humanoid.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
index f7c785e6417..acbe91e60e4 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -54,7 +54,6 @@
 ## ERT Leader
 
 - type: entity
-  parent: EventHumanoidMindShielded
   id: RandomHumanoidSpawnerERTLeader
   name: ERT leader
   suffix: ERTRole, Basic

From 82c3f2ee90c239b477d68b6882faf8e529fd0813 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Wed, 25 Dec 2024 04:59:17 -0400
Subject: [PATCH 283/366] Revert "Avoid using EntityUid as a networked
 dictionary's key until hotfix."

This reverts commit ace74124e3b477e43e9328dec8eceb10418a752a.
---
 .../Damage/Components/StaminaComponent.cs          |  2 +-
 Content.Shared/Damage/Systems/StaminaSystem.cs     | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Content.Shared/Damage/Components/StaminaComponent.cs b/Content.Shared/Damage/Components/StaminaComponent.cs
index b138043a929..46eaa9f1f05 100644
--- a/Content.Shared/Damage/Components/StaminaComponent.cs
+++ b/Content.Shared/Damage/Components/StaminaComponent.cs
@@ -46,7 +46,7 @@ public sealed partial class StaminaComponent : Component
     /// DrainRate how much it changes per tick, and ModifiesSpeed if it should slow down the user.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public Dictionary<NetEntity, (float DrainRate, bool ModifiesSpeed)> ActiveDrains = new();
+    public Dictionary<EntityUid, (float DrainRate, bool ModifiesSpeed)> ActiveDrains = new();
 
     /// <summary>
     /// How long will this mob be stunned for?
diff --git a/Content.Shared/Damage/Systems/StaminaSystem.cs b/Content.Shared/Damage/Systems/StaminaSystem.cs
index 5bacfe48deb..4f0b0061916 100644
--- a/Content.Shared/Damage/Systems/StaminaSystem.cs
+++ b/Content.Shared/Damage/Systems/StaminaSystem.cs
@@ -334,7 +334,7 @@ public void ToggleStaminaDrain(EntityUid target, float drainRate, bool enabled,
             return;
 
         // If theres no source, we assume its the target that caused the drain.
-        var actualSource = GetNetEntity(source) ?? GetNetEntity(target);
+        var actualSource = source ?? target;
 
         if (enabled)
         {
@@ -368,11 +368,11 @@ public override void Update(float frameTime)
             if (comp.ActiveDrains.Count > 0)
                 foreach (var (source, (drainRate, modifiesSpeed)) in comp.ActiveDrains)
                     TakeStaminaDamage(uid,
-                        drainRate * frameTime,
-                        comp,
-                        source: GetEntity(source),
-                        visual: false,
-                        allowsSlowdown: modifiesSpeed);
+                    drainRate * frameTime,
+                    comp,
+                    source: source,
+                    visual: false,
+                    allowsSlowdown: modifiesSpeed);
             // Shouldn't need to consider paused time as we're only iterating non-paused stamina components.
             var nextUpdate = comp.NextUpdate;
 
@@ -433,4 +433,4 @@ private void ExitStamCrit(EntityUid uid, StaminaComponent? component = null)
 ///     Raised before stamina damage is dealt to allow other systems to cancel it.
 /// </summary>
 [ByRefEvent]
-public record struct BeforeStaminaDamageEvent(float Value, bool Cancelled = false);
+public record struct BeforeStaminaDamageEvent(float Value, bool Cancelled = false);
\ No newline at end of file

From f2cbb274f738113fcbbbf64c32498273257b9f20 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Wed, 25 Dec 2024 06:17:26 -0400
Subject: [PATCH 284/366] Yeeeeeeeeeeeah.

---
 .../20241222203147_UpstreamMerge.Designer.cs  |  8 ++--
 .../Postgres/20241222203147_UpstreamMerge.cs  | 40 -------------------
 .../PostgresServerDbContextModelSnapshot.cs   |  8 ++--
 .../20241222203134_UpstreamMerge.Designer.cs  |  8 ++--
 .../Sqlite/20241222203134_UpstreamMerge.cs    | 40 -------------------
 .../SqliteServerDbContextModelSnapshot.cs     |  8 ++--
 Content.Server.Database/SnakeCaseNaming.cs    | 40 +++++++++++--------
 .../GameTicking/GameTicker.RoundFlow.cs       |  5 ---
 8 files changed, 40 insertions(+), 117 deletions(-)

diff --git a/Content.Server.Database/Migrations/Postgres/20241222203147_UpstreamMerge.Designer.cs b/Content.Server.Database/Migrations/Postgres/20241222203147_UpstreamMerge.Designer.cs
index 691fed8d9ca..3e7b22c9b4c 100644
--- a/Content.Server.Database/Migrations/Postgres/20241222203147_UpstreamMerge.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20241222203147_UpstreamMerge.Designer.cs
@@ -1630,7 +1630,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                                 .ValueGeneratedOnAdd()
                                 .HasColumnType("integer")
                                 .HasDefaultValue(0)
-                                .HasColumnName("hwid__type");
+                                .HasColumnName("hwid_type");
 
                             b1.HasKey("ConnectionLogId");
 
@@ -1687,7 +1687,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                                 .ValueGeneratedOnAdd()
                                 .HasColumnType("integer")
                                 .HasDefaultValue(0)
-                                .HasColumnName("last_seen_hwid__type");
+                                .HasColumnName("last_seen_hwid_type");
 
                             b1.HasKey("PlayerId");
 
@@ -1774,7 +1774,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                                 .ValueGeneratedOnAdd()
                                 .HasColumnType("integer")
                                 .HasDefaultValue(0)
-                                .HasColumnName("hwid__type");
+                                .HasColumnName("hwid_type");
 
                             b1.HasKey("ServerBanId");
 
@@ -1851,7 +1851,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                                 .ValueGeneratedOnAdd()
                                 .HasColumnType("integer")
                                 .HasDefaultValue(0)
-                                .HasColumnName("hwid__type");
+                                .HasColumnName("hwid_type");
 
                             b1.HasKey("ServerRoleBanId");
 
diff --git a/Content.Server.Database/Migrations/Postgres/20241222203147_UpstreamMerge.cs b/Content.Server.Database/Migrations/Postgres/20241222203147_UpstreamMerge.cs
index 7dcba9dda9d..029a62460ba 100644
--- a/Content.Server.Database/Migrations/Postgres/20241222203147_UpstreamMerge.cs
+++ b/Content.Server.Database/Migrations/Postgres/20241222203147_UpstreamMerge.cs
@@ -12,26 +12,6 @@ protected override void Up(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.Sql("DROP TABLE IF EXISTS ProileLoadouts;");
 
-            migrationBuilder.RenameColumn(
-                name: "hwid_type",
-                table: "server_role_ban",
-                newName: "hwid__type");
-
-            migrationBuilder.RenameColumn(
-                name: "hwid_type",
-                table: "server_ban",
-                newName: "hwid__type");
-
-            migrationBuilder.RenameColumn(
-                name: "last_seen_hwid_type",
-                table: "player",
-                newName: "last_seen_hwid__type");
-
-            migrationBuilder.RenameColumn(
-                name: "hwid_type",
-                table: "connection_log",
-                newName: "hwid__type");
-
             migrationBuilder.AddForeignKey(
                 name: "FK_loadout_profile_profile_id",
                 table: "loadout",
@@ -48,26 +28,6 @@ protected override void Down(MigrationBuilder migrationBuilder)
                 name: "FK_loadout_profile_profile_id",
                 table: "loadout");
 
-            migrationBuilder.RenameColumn(
-                name: "hwid__type",
-                table: "server_role_ban",
-                newName: "hwid_type");
-
-            migrationBuilder.RenameColumn(
-                name: "hwid__type",
-                table: "server_ban",
-                newName: "hwid_type");
-
-            migrationBuilder.RenameColumn(
-                name: "last_seen_hwid__type",
-                table: "player",
-                newName: "last_seen_hwid_type");
-
-            migrationBuilder.RenameColumn(
-                name: "hwid__type",
-                table: "connection_log",
-                newName: "hwid_type");
-
             migrationBuilder.CreateTable(
                 name: "ProfileLoadout",
                 columns: table => new
diff --git a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
index 09767111da3..c39fb6872be 100644
--- a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
@@ -1627,7 +1627,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                                 .ValueGeneratedOnAdd()
                                 .HasColumnType("integer")
                                 .HasDefaultValue(0)
-                                .HasColumnName("hwid__type");
+                                .HasColumnName("hwid_type");
 
                             b1.HasKey("ConnectionLogId");
 
@@ -1684,7 +1684,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                                 .ValueGeneratedOnAdd()
                                 .HasColumnType("integer")
                                 .HasDefaultValue(0)
-                                .HasColumnName("last_seen_hwid__type");
+                                .HasColumnName("last_seen_hwid_type");
 
                             b1.HasKey("PlayerId");
 
@@ -1771,7 +1771,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                                 .ValueGeneratedOnAdd()
                                 .HasColumnType("integer")
                                 .HasDefaultValue(0)
-                                .HasColumnName("hwid__type");
+                                .HasColumnName("hwid_type");
 
                             b1.HasKey("ServerBanId");
 
@@ -1848,7 +1848,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                                 .ValueGeneratedOnAdd()
                                 .HasColumnType("integer")
                                 .HasDefaultValue(0)
-                                .HasColumnName("hwid__type");
+                                .HasColumnName("hwid_type");
 
                             b1.HasKey("ServerRoleBanId");
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20241222203134_UpstreamMerge.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20241222203134_UpstreamMerge.Designer.cs
index 30ea446c29e..8b6c0048392 100644
--- a/Content.Server.Database/Migrations/Sqlite/20241222203134_UpstreamMerge.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20241222203134_UpstreamMerge.Designer.cs
@@ -1557,7 +1557,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                                 .ValueGeneratedOnAdd()
                                 .HasColumnType("INTEGER")
                                 .HasDefaultValue(0)
-                                .HasColumnName("hwid__type");
+                                .HasColumnName("hwid_type");
 
                             b1.HasKey("ConnectionLogId");
 
@@ -1614,7 +1614,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                                 .ValueGeneratedOnAdd()
                                 .HasColumnType("INTEGER")
                                 .HasDefaultValue(0)
-                                .HasColumnName("last_seen_hwid__type");
+                                .HasColumnName("last_seen_hwid_type");
 
                             b1.HasKey("PlayerId");
 
@@ -1701,7 +1701,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                                 .ValueGeneratedOnAdd()
                                 .HasColumnType("INTEGER")
                                 .HasDefaultValue(0)
-                                .HasColumnName("hwid__type");
+                                .HasColumnName("hwid_type");
 
                             b1.HasKey("ServerBanId");
 
@@ -1778,7 +1778,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                                 .ValueGeneratedOnAdd()
                                 .HasColumnType("INTEGER")
                                 .HasDefaultValue(0)
-                                .HasColumnName("hwid__type");
+                                .HasColumnName("hwid_type");
 
                             b1.HasKey("ServerRoleBanId");
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20241222203134_UpstreamMerge.cs b/Content.Server.Database/Migrations/Sqlite/20241222203134_UpstreamMerge.cs
index f46ab47b408..8b5d3573763 100644
--- a/Content.Server.Database/Migrations/Sqlite/20241222203134_UpstreamMerge.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20241222203134_UpstreamMerge.cs
@@ -12,26 +12,6 @@ protected override void Up(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.Sql("DROP TABLE IF EXISTS ProileLoadouts;");
 
-            migrationBuilder.RenameColumn(
-                name: "hwid_type",
-                table: "server_role_ban",
-                newName: "hwid__type");
-
-            migrationBuilder.RenameColumn(
-                name: "hwid_type",
-                table: "server_ban",
-                newName: "hwid__type");
-
-            migrationBuilder.RenameColumn(
-                name: "last_seen_hwid_type",
-                table: "player",
-                newName: "last_seen_hwid__type");
-
-            migrationBuilder.RenameColumn(
-                name: "hwid_type",
-                table: "connection_log",
-                newName: "hwid__type");
-
             migrationBuilder.AddForeignKey(
                 name: "FK_loadout_profile_profile_id",
                 table: "loadout",
@@ -48,26 +28,6 @@ protected override void Down(MigrationBuilder migrationBuilder)
                 name: "FK_loadout_profile_profile_id",
                 table: "loadout");
 
-            migrationBuilder.RenameColumn(
-                name: "hwid__type",
-                table: "server_role_ban",
-                newName: "hwid_type");
-
-            migrationBuilder.RenameColumn(
-                name: "hwid__type",
-                table: "server_ban",
-                newName: "hwid_type");
-
-            migrationBuilder.RenameColumn(
-                name: "last_seen_hwid__type",
-                table: "player",
-                newName: "last_seen_hwid_type");
-
-            migrationBuilder.RenameColumn(
-                name: "hwid__type",
-                table: "connection_log",
-                newName: "hwid_type");
-
             migrationBuilder.CreateTable(
                 name: "ProfileLoadout",
                 columns: table => new
diff --git a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
index 514c0007eed..3b2b680ddf5 100644
--- a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
@@ -1554,7 +1554,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                                 .ValueGeneratedOnAdd()
                                 .HasColumnType("INTEGER")
                                 .HasDefaultValue(0)
-                                .HasColumnName("hwid__type");
+                                .HasColumnName("hwid_type");
 
                             b1.HasKey("ConnectionLogId");
 
@@ -1611,7 +1611,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                                 .ValueGeneratedOnAdd()
                                 .HasColumnType("INTEGER")
                                 .HasDefaultValue(0)
-                                .HasColumnName("last_seen_hwid__type");
+                                .HasColumnName("last_seen_hwid_type");
 
                             b1.HasKey("PlayerId");
 
@@ -1698,7 +1698,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                                 .ValueGeneratedOnAdd()
                                 .HasColumnType("INTEGER")
                                 .HasDefaultValue(0)
-                                .HasColumnName("hwid__type");
+                                .HasColumnName("hwid_type");
 
                             b1.HasKey("ServerBanId");
 
@@ -1775,7 +1775,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                                 .ValueGeneratedOnAdd()
                                 .HasColumnType("INTEGER")
                                 .HasDefaultValue(0)
-                                .HasColumnName("hwid__type");
+                                .HasColumnName("hwid_type");
 
                             b1.HasKey("ServerRoleBanId");
 
diff --git a/Content.Server.Database/SnakeCaseNaming.cs b/Content.Server.Database/SnakeCaseNaming.cs
index 27ce392cd50..3a67ffb9cd1 100644
--- a/Content.Server.Database/SnakeCaseNaming.cs
+++ b/Content.Server.Database/SnakeCaseNaming.cs
@@ -82,7 +82,7 @@ public ConventionSet ModifyConventions(ConventionSet conventionSet)
         }
     }
 
-    public class SnakeCaseConvention :
+    public partial class SnakeCaseConvention :
         IEntityTypeAddedConvention,
         IEntityTypeAnnotationChangedConvention,
         IPropertyAddedConvention,
@@ -99,22 +99,27 @@ public SnakeCaseConvention() {}
 
         public static string RewriteName(string name)
         {
-            var regex = new Regex("[A-Z]+",  RegexOptions.Compiled);
-            return regex.Replace(
-                name,
-                (Match match) => {
-                    if (match.Index == 0 && (match.Value == "FK" || match.Value == "PK" ||  match.Value == "IX")) {
-                        return match.Value;
+            return UpperCaseLocator()
+                .Replace(
+                    name,
+                    (Match match) => {
+                        if (match.Index == 0 && (match.Value == "FK" || match.Value == "PK" ||  match.Value == "IX")) {
+                            return match.Value;
+                        }
+                        if (match.Value == "HWI")
+                            return (match.Index == 0 ? "" : "_") + "hwi";
+                        if (match.Index == 0)
+                            return match.Value.ToLower();
+                        if (match.Length > 1)
+                            return $"_{match.Value[..^1].ToLower()}_{match.Value[^1..^0].ToLower()}";
+
+                        // Do not add a _ if there is already one before this. This happens with owned entities.
+                        if (name[match.Index - 1] == '_')
+                            return match.Value.ToLower();
+
+                        return "_" + match.Value.ToLower();
                     }
-                    if (match.Value == "HWI")
-                        return (match.Index == 0 ? "" : "_") + "hwi";
-                    if (match.Index == 0)
-                        return match.Value.ToLower();
-                    if (match.Length > 1)
-                        return $"_{match.Value[..^1].ToLower()}_{match.Value[^1..^0].ToLower()}";
-                    return "_" + match.Value.ToLower();
-                }
-            );
+                );
         }
 
         public virtual void ProcessEntityTypeAdded(
@@ -332,5 +337,8 @@ private static void RewriteColumnName(IConventionPropertyBuilder propertyBuilder
                 }
             }
         }
+
+        [GeneratedRegex("[A-Z]+", RegexOptions.Compiled)]
+        private static partial Regex UpperCaseLocator();
     }
 }
diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index 05fce8cd048..8308a1c1ec4 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -580,18 +580,13 @@ private void ResettingCleanup()
             _playerGameStatuses.Clear();
             _sawmill.Error($"Resetting cleanup with {_playerManager.Sessions.Length} players");
             foreach (var session in _playerManager.Sessions)
-            {
                 _playerGameStatuses[session.UserId] = LobbyEnabled ? PlayerGameStatus.NotReadyToPlay : PlayerGameStatus.ReadyToPlay;
-            }
         }
 
         public bool DelayStart(TimeSpan time)
         {
             if (_runLevel != GameRunLevel.PreRoundLobby)
-            {
                 return false;
-            }
-
             _roundStartTime += time;
 
             RaiseNetworkEvent(new TickerLobbyCountdownEvent(_roundStartTime, Paused));

From 899c7916380dda17cff254b520af59b8ac911ec7 Mon Sep 17 00:00:00 2001
From: TGRCDev <tgrc@tgrc.dev>
Date: Sun, 18 Aug 2024 04:53:09 -0700
Subject: [PATCH 285/366] Fixed IP bans preventing non-banned players from
 connecting to SQLite-backed servers (#31154)

Fixed IP bans causing server errors with SQLite DB
---
 Content.Server/IP/IPAddressExt.cs                | 8 +++++++-
 Content.Tests/Server/Utility/IPAddressExtTest.cs | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Content.Server/IP/IPAddressExt.cs b/Content.Server/IP/IPAddressExt.cs
index 6bfa4ef5486..a61477e01bc 100644
--- a/Content.Server/IP/IPAddressExt.cs
+++ b/Content.Server/IP/IPAddressExt.cs
@@ -61,6 +61,12 @@ public static bool IsInSubnet(this System.Net.IPAddress address, (System.Net.IPA
 
         public static bool IsInSubnet(this System.Net.IPAddress address, System.Net.IPAddress maskAddress, int maskLength)
         {
+            if (maskAddress.AddressFamily != address.AddressFamily)
+            {
+                // We got something like an IPV4-Address for an IPv6-Mask. This is not valid.
+                return false;
+            }
+
             if (maskAddress.AddressFamily == AddressFamily.InterNetwork)
             {
                 // Convert the mask address to an unsigned integer.
@@ -89,7 +95,7 @@ public static bool IsInSubnet(this System.Net.IPAddress address, System.Net.IPAd
 
                 if (maskAddressBits.Length != ipAddressBits.Length)
                 {
-                    throw new ArgumentException("Length of IP Address and Subnet Mask do not match.");
+                    return false;
                 }
 
                 // Compare the prefix bits.
diff --git a/Content.Tests/Server/Utility/IPAddressExtTest.cs b/Content.Tests/Server/Utility/IPAddressExtTest.cs
index a57430267b8..dba8a0e6aae 100644
--- a/Content.Tests/Server/Utility/IPAddressExtTest.cs
+++ b/Content.Tests/Server/Utility/IPAddressExtTest.cs
@@ -26,6 +26,7 @@ public void IpV4SubnetMaskMatchesValidIpAddress(string netMask, string ipAddress
         [TestCase("10.128.240.50/30", "10.128.240.52")]
         [TestCase("10.128.240.50/30", "10.128.239.50")]
         [TestCase("10.128.240.50/30", "10.127.240.51")]
+        [TestCase("10.128.240.50/30", "2001:0DB8:ABCD:0012:0000:0000:0000:0000")]
         public void IpV4SubnetMaskDoesNotMatchInvalidIpAddress(string netMask, string ipAddress)
         {
             var ipAddressObj = IPAddress.Parse(ipAddress);
@@ -51,6 +52,7 @@ public void IpV6SubnetMaskMatchesValidIpAddress(string netMask, string ipAddress
         [TestCase("2001:db8:abcd:0012::0/64", "2001:0DB8:ABCD:0013:0001:0000:0000:0000")]
         [TestCase("2001:db8:abcd:0012::0/64", "2001:0DB8:ABCD:0011:FFFF:FFFF:FFFF:FFF0")]
         [TestCase("2001:db8:abcd:0012::0/128", "2001:0DB8:ABCD:0012:0000:0000:0000:0001")]
+        [TestCase("2001:db8:abcd:0012::0/128", "10.128.239.50")]
         // ReSharper restore StringLiteralTypo
         public void IpV6SubnetMaskDoesNotMatchInvalidIpAddress(string netMask, string ipAddress)
         {

From 197b065f07b1baa353d3741cf6a52a1f83653257 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Wed, 25 Dec 2024 15:07:57 -0400
Subject: [PATCH 286/366] Add CCVar

---
 Content.Shared/CCVar/CCVars.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 0723517c2f4..0c0af484701 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -1043,6 +1043,15 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<bool> AdminUseCustomNamesAdminRank =
             CVarDef.Create("admin.use_custom_names_admin_rank", true, CVar.SERVERONLY);
 
+        /// <summary>
+        ///     Determines whether admins count towards the total playercount when determining whether the server is over <see cref="SoftMaxPlayers"/>
+        ///     Ideally this should be used in conjuction with <see cref="AdminBypassPlayers"/>.
+        ///     This also applies to playercount limits in whitelist conditions
+        ///     If false, then admins will not be considered when checking whether the playercount is already above the soft player cap
+        /// </summary>
+        public static readonly CVarDef<bool> AdminsCountForMaxPlayers =
+            CVarDef.Create("admin.admins_count_for_max_players", false, CVar.SERVERONLY);
+
         /*
          * AHELP
          */

From 670feb452ccdd23da5fa4768fe7bb1d1637f9e8d Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Wed, 25 Dec 2024 15:30:53 -0400
Subject: [PATCH 287/366] I fixed it!

---
 Content.Server/Database/UserDbDataManager.cs          | 11 +++++++----
 .../Preferences/Managers/ServerPreferencesManager.cs  |  3 ++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Content.Server/Database/UserDbDataManager.cs b/Content.Server/Database/UserDbDataManager.cs
index 50759008c3c..af246831cbf 100644
--- a/Content.Server/Database/UserDbDataManager.cs
+++ b/Content.Server/Database/UserDbDataManager.cs
@@ -67,13 +67,16 @@ private async Task Load(ICommonSession session, CancellationToken cancel)
         // As such, this task must NOT throw a non-cancellation error!
         try
         {
-            await Task.WhenAll(
-                _prefs.LoadData(session, cancel),
-                _playTimeTracking.LoadData(session, cancel));
+            var tasks = new List<Task>();
+            foreach (var action in _onLoadPlayer)
+                tasks.Add(action(session, cancel));
 
+            await Task.WhenAll(tasks);
             cancel.ThrowIfCancellationRequested();
-            _prefs.SanitizeData(session);
 
+            foreach (var action in _onFinishLoad)
+                action(session);
+            _prefs.SanitizeData(session);
             _sawmill.Verbose($"Load complete for user {session}");
         }
         catch (OperationCanceledException)
diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
index e12359fb729..929586d735e 100644
--- a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
+++ b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
@@ -54,7 +54,7 @@ private async void HandleSelectCharacterMessage(MsgSelectCharacter message)
 
             if (!_cachedPlayerPrefs.TryGetValue(userId, out var prefsData) || !prefsData.PrefsLoaded)
             {
-                Logger.WarningS("prefs", $"User {userId} tried to modify preferences before they loaded.");
+                _sawmill.Error($"User {userId} tried to modify preferences before they loaded.");
                 return;
             }
 
@@ -231,6 +231,7 @@ public void SanitizeData(ICommonSession session)
             var data = _cachedPlayerPrefs[session.UserId];
             DebugTools.Assert(data.Prefs != null);
             data.Prefs = SanitizePreferences(session, data.Prefs, _dependencies);
+            _sawmill.Debug("here");
         }
 
         public void OnClientDisconnected(ICommonSession session)

From 06bf52af5554973ee0e385360966eb12f2511466 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Wed, 25 Dec 2024 15:54:30 -0400
Subject: [PATCH 288/366] Partial port

---
 Content.Shared/Roles/StartingGearPrototype.cs        | 12 ++++++++++--
 Resources/Prototypes/Roles/Antags/traitor.yml        |  1 -
 .../Prototypes/Roles/Jobs/Fun/misc_startinggear.yml  | 11 +++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/Content.Shared/Roles/StartingGearPrototype.cs b/Content.Shared/Roles/StartingGearPrototype.cs
index 0ff65617bc9..05397c8c693 100644
--- a/Content.Shared/Roles/StartingGearPrototype.cs
+++ b/Content.Shared/Roles/StartingGearPrototype.cs
@@ -1,11 +1,11 @@
-using Content.Shared.DeltaV.Harpy;
 using Content.Shared.Preferences;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
 
 namespace Content.Shared.Roles;
 
 [Prototype("startingGear")]
-public sealed partial class StartingGearPrototype : IPrototype
+public sealed partial class StartingGearPrototype : IPrototype, IInheritingPrototype
 {
     [DataField]
     public Dictionary<string, EntProtoId> Equipment = new();
@@ -35,6 +35,14 @@ public sealed partial class StartingGearPrototype : IPrototype
     [IdDataField]
     public string ID { get; private set; } = string.Empty;
 
+    /// <inheritdoc/>
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<StartingGearPrototype>))]
+    public string[]? Parents { get; private set; }`
+
+    /// <inheritdoc/>
+    [AbstractDataField]
+    public bool Abstract { get; }
+
     public string GetGear(string slot, HumanoidCharacterProfile? profile)
     {
         if (profile != null)
diff --git a/Resources/Prototypes/Roles/Antags/traitor.yml b/Resources/Prototypes/Roles/Antags/traitor.yml
index 205f04b05ea..504b6384835 100644
--- a/Resources/Prototypes/Roles/Antags/traitor.yml
+++ b/Resources/Prototypes/Roles/Antags/traitor.yml
@@ -4,7 +4,6 @@
   antagonist: true
   setPreference: true
   objective: roles-antag-syndicate-agent-objective
-  guides: [ Traitors ]
 
 - type: antag
   id: TraitorSleeper
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
index e1b85a55eb9..b2cf3b87930 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
@@ -17,6 +17,17 @@
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled
 
+# Syndicate Operative Outfit - Civilian
+- type: startingGear
+  id: SyndicateOperativeGearCivilian
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitSyndieFormal
+    back: ClothingBackpackDuffelSyndicate
+    shoes: ClothingShoesBootsCombat
+    gloves: ClothingHandsGlovesColorBlack
+    id: SyndiPDA
+    ears: ClothingHeadsetAltSyndicate
+
 #Space Ninja Outfit
 - type: startingGear
   id: SpaceNinjaGear

From 77f4c99e105ec2460a0fd054f969bd56d8cd7ee6 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Wed, 25 Dec 2024 15:58:44 -0400
Subject: [PATCH 289/366] im so silly!

---
 Content.Shared/Roles/StartingGearPrototype.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/Roles/StartingGearPrototype.cs b/Content.Shared/Roles/StartingGearPrototype.cs
index 05397c8c693..883fe283a6b 100644
--- a/Content.Shared/Roles/StartingGearPrototype.cs
+++ b/Content.Shared/Roles/StartingGearPrototype.cs
@@ -37,7 +37,7 @@ public sealed partial class StartingGearPrototype : IPrototype, IInheritingProto
 
     /// <inheritdoc/>
     [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<StartingGearPrototype>))]
-    public string[]? Parents { get; private set; }`
+    public string[]? Parents { get; private set; }
 
     /// <inheritdoc/>
     [AbstractDataField]

From acc59cb282db4c77de261d584dd47e329c701156 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Wed, 25 Dec 2024 16:08:39 -0400
Subject: [PATCH 290/366] woah

---
 Content.IntegrationTests/Pair/TestPair.Recycle.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Content.IntegrationTests/Pair/TestPair.Recycle.cs b/Content.IntegrationTests/Pair/TestPair.Recycle.cs
index 92d59e51852..b67b106de76 100644
--- a/Content.IntegrationTests/Pair/TestPair.Recycle.cs
+++ b/Content.IntegrationTests/Pair/TestPair.Recycle.cs
@@ -200,7 +200,6 @@ public void ValidateSettings(PoolSettings settings)
         Assert.That(sPlayer.Sessions.Count(), Is.EqualTo(1));
         var session = sPlayer.Sessions.Single();
         Assert.That(cPlayer.LocalSession?.UserId, Is.EqualTo(session.UserId));
-        Assert.That(sPlayer.Sessions.Count, Is.EqualTo(ticker.PlayerGameStatuses.Count));
 
         if (ticker.DummyTicker)
             return;

From b42ad7977f4bf49fd4d7494e448704c5e9c993a5 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Wed, 25 Dec 2024 16:12:11 -0400
Subject: [PATCH 291/366] No error

---
 Content.Server/GameTicking/GameTicker.RoundFlow.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index 8308a1c1ec4..8b4798e7966 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -578,7 +578,7 @@ private void ResettingCleanup()
 
             DisallowLateJoin = false;
             _playerGameStatuses.Clear();
-            _sawmill.Error($"Resetting cleanup with {_playerManager.Sessions.Length} players");
+            
             foreach (var session in _playerManager.Sessions)
                 _playerGameStatuses[session.UserId] = LobbyEnabled ? PlayerGameStatus.NotReadyToPlay : PlayerGameStatus.ReadyToPlay;
         }

From 504973934cf33f5af14fbe4e07da31768e491c85 Mon Sep 17 00:00:00 2001
From: Milon <milonpl.git@proton.me>
Date: Wed, 6 Nov 2024 18:30:54 +0100
Subject: [PATCH 292/366] pda messaging real (#2362)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* the shiny new toy that breaks everything else

* privacy 😌

* janky shit

* real??

* :trollface:

* ALL HAIL DUCT TAPE SOLUTION

* FUCK

* commented every shit
---
 .../Cartridges/PriceHistoryTable.xaml         |  25 ++
 .../Cartridges/PriceHistoryTable.xaml.cs      |  75 ++++
 .../Cartridges/StockTradingUi.cs              |  45 ++
 .../Cartridges/StockTradingUiFragment.xaml    |  44 ++
 .../Cartridges/StockTradingUiFragment.xaml.cs | 269 ++++++++++++
 .../Components/StationStockMarketComponent.cs |  71 ++++
 Content.Server/Cargo/StocksCommands.cs        | 135 ++++++
 .../Cargo/Systems/StockMarketSystem.cs        | 385 ++++++++++++++++++
 .../StockTradingCartridgeComponent.cs         |  11 +
 .../Cartridges/StockTradingCartridgeSystem.cs | 101 +++++
 .../Cartridges/StockTradingUiMessageEvent.cs  |  19 +
 .../Cartridges/StockTradingUiState.cs         |  66 +++
 .../en-US/deltav/cargo/stocks-comapnies.ftl   |   6 +
 .../en-US/deltav/cargo/stocks-commands.ftl    |  13 +
 .../deltav/cartridge-loader/cartridges.ftl    |  39 +-
 .../Entities/Objects/Devices/cartridges.yml   |  24 ++
 .../DeltaV/Entities/Stations/base.yml         |  21 +
 .../Entities/Objects/Devices/pda.yml          |  17 +-
 .../Entities/Stations/nanotrasen.yml          |   1 +
 .../DeltaV/Misc/program_icons.rsi/meta.json   |  14 +
 .../Misc/program_icons.rsi/stock_trading.png  | Bin 0 -> 1012 bytes
 .../Devices/cartridge.rsi/cart-stonk.png      | Bin 0 -> 367 bytes
 .../Objects/Devices/cartridge.rsi/meta.json   |   3 +
 23 files changed, 1377 insertions(+), 7 deletions(-)
 create mode 100644 Content.Client/DeltaV/CartridgeLoader/Cartridges/PriceHistoryTable.xaml
 create mode 100644 Content.Client/DeltaV/CartridgeLoader/Cartridges/PriceHistoryTable.xaml.cs
 create mode 100644 Content.Client/DeltaV/CartridgeLoader/Cartridges/StockTradingUi.cs
 create mode 100644 Content.Client/DeltaV/CartridgeLoader/Cartridges/StockTradingUiFragment.xaml
 create mode 100644 Content.Client/DeltaV/CartridgeLoader/Cartridges/StockTradingUiFragment.xaml.cs
 create mode 100644 Content.Server/Cargo/Components/StationStockMarketComponent.cs
 create mode 100644 Content.Server/Cargo/StocksCommands.cs
 create mode 100644 Content.Server/Cargo/Systems/StockMarketSystem.cs
 create mode 100644 Content.Server/DeltaV/CartridgeLoader/Cartridges/StockTradingCartridgeComponent.cs
 create mode 100644 Content.Server/DeltaV/CartridgeLoader/Cartridges/StockTradingCartridgeSystem.cs
 create mode 100644 Content.Shared/DeltaV/CartridgeLoader/Cartridges/StockTradingUiMessageEvent.cs
 create mode 100644 Content.Shared/DeltaV/CartridgeLoader/Cartridges/StockTradingUiState.cs
 create mode 100644 Resources/Locale/en-US/deltav/cargo/stocks-comapnies.ftl
 create mode 100644 Resources/Locale/en-US/deltav/cargo/stocks-commands.ftl
 create mode 100644 Resources/Prototypes/DeltaV/Entities/Stations/base.yml
 create mode 100644 Resources/Textures/DeltaV/Misc/program_icons.rsi/meta.json
 create mode 100644 Resources/Textures/DeltaV/Misc/program_icons.rsi/stock_trading.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Devices/cartridge.rsi/cart-stonk.png

diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/PriceHistoryTable.xaml b/Content.Client/DeltaV/CartridgeLoader/Cartridges/PriceHistoryTable.xaml
new file mode 100644
index 00000000000..058bde07e9c
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/PriceHistoryTable.xaml
@@ -0,0 +1,25 @@
+<cartridges:PriceHistoryTable
+    xmlns="https://spacestation14.io"
+    xmlns:cartridges="clr-namespace:Content.Client.DeltaV.CartridgeLoader.Cartridges"
+    Orientation="Vertical"
+    HorizontalExpand="True"
+    Margin="0,5,0,0">
+
+    <!-- Header -->
+    <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+        <Label Text="{Loc stock-trading-price-history}"
+               HorizontalExpand="True"
+               StyleClasses="LabelSubText" />
+    </BoxContainer>
+
+    <!-- Price history panel -->
+    <PanelContainer Name="HistoryPanel"
+                    HorizontalExpand="True"
+                    Margin="0,2,0,0">
+        <BoxContainer Orientation="Horizontal"
+                      HorizontalExpand="True"
+                      HorizontalAlignment="Center">
+            <GridContainer Name="PriceGrid" Columns="5" />
+        </BoxContainer>
+    </PanelContainer>
+</cartridges:PriceHistoryTable>
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/PriceHistoryTable.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/PriceHistoryTable.xaml.cs
new file mode 100644
index 00000000000..f5798f44c42
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/PriceHistoryTable.xaml.cs
@@ -0,0 +1,75 @@
+using System.Linq;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+
+[GenerateTypedNameReferences]
+public sealed partial class PriceHistoryTable : BoxContainer
+{
+    public PriceHistoryTable()
+    {
+        RobustXamlLoader.Load(this);
+
+        // Create the stylebox here so we can use the colors from StockTradingUi
+        var styleBox = new StyleBoxFlat
+        {
+            BackgroundColor = StockTradingUiFragment.PriceBackgroundColor,
+            ContentMarginLeftOverride = 6,
+            ContentMarginRightOverride = 6,
+            ContentMarginTopOverride = 4,
+            ContentMarginBottomOverride = 4,
+            BorderColor = StockTradingUiFragment.BorderColor,
+            BorderThickness = new Thickness(1),
+        };
+
+        HistoryPanel.PanelOverride = styleBox;
+    }
+
+    public void Update(List<float> priceHistory)
+    {
+        PriceGrid.RemoveAllChildren();
+
+        // Take last 5 prices
+        var lastFivePrices = priceHistory.TakeLast(5).ToList();
+
+        for (var i = 0; i < lastFivePrices.Count; i++)
+        {
+            var price = lastFivePrices[i];
+            var previousPrice = i > 0 ? lastFivePrices[i - 1] : price;
+            var priceChange = ((price - previousPrice) / previousPrice) * 100;
+
+            var entryContainer = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical,
+                MinWidth = 80,
+                HorizontalAlignment = HAlignment.Center,
+            };
+
+            var priceLabel = new Label
+            {
+                Text = $"${price:F2}",
+                HorizontalAlignment = HAlignment.Center,
+            };
+
+            var changeLabel = new Label
+            {
+                Text = $"{(priceChange >= 0 ? "+" : "")}{priceChange:F2}%",
+                HorizontalAlignment = HAlignment.Center,
+                StyleClasses = { "LabelSubText" },
+                Modulate = priceChange switch
+                {
+                    > 0 => StockTradingUiFragment.PositiveColor,
+                    < 0 => StockTradingUiFragment.NegativeColor,
+                    _ => StockTradingUiFragment.NeutralColor,
+                }
+            };
+
+            entryContainer.AddChild(priceLabel);
+            entryContainer.AddChild(changeLabel);
+            PriceGrid.AddChild(entryContainer);
+        }
+    }
+}
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/StockTradingUi.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/StockTradingUi.cs
new file mode 100644
index 00000000000..45704ee2349
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/StockTradingUi.cs
@@ -0,0 +1,45 @@
+using Robust.Client.UserInterface;
+using Content.Client.UserInterface.Fragments;
+using Content.Shared.CartridgeLoader;
+using Content.Shared.CartridgeLoader.Cartridges;
+
+namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+
+public sealed partial class StockTradingUi : UIFragment
+{
+    private StockTradingUiFragment? _fragment;
+
+    public override Control GetUIFragmentRoot()
+    {
+        return _fragment!;
+    }
+
+    public override void Setup(BoundUserInterface userInterface, EntityUid? fragmentOwner)
+    {
+        _fragment = new StockTradingUiFragment();
+
+        _fragment.OnBuyButtonPressed += (company, amount) =>
+        {
+            SendStockTradingUiMessage(StockTradingUiAction.Buy, company, amount, userInterface);
+        };
+        _fragment.OnSellButtonPressed += (company, amount) =>
+        {
+            SendStockTradingUiMessage(StockTradingUiAction.Sell, company, amount, userInterface);
+        };
+    }
+
+    public override void UpdateState(BoundUserInterfaceState state)
+    {
+        if (state is StockTradingUiState cast)
+        {
+            _fragment?.UpdateState(cast);
+        }
+    }
+
+    private static void SendStockTradingUiMessage(StockTradingUiAction action, int company, float amount, BoundUserInterface userInterface)
+    {
+        var newsMessage = new StockTradingUiMessageEvent(action, company, amount);
+        var message = new CartridgeUiMessage(newsMessage);
+        userInterface.SendMessage(message);
+    }
+}
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/StockTradingUiFragment.xaml b/Content.Client/DeltaV/CartridgeLoader/Cartridges/StockTradingUiFragment.xaml
new file mode 100644
index 00000000000..00b45584cc4
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/StockTradingUiFragment.xaml
@@ -0,0 +1,44 @@
+<cartridges:StockTradingUiFragment
+    xmlns="https://spacestation14.io"
+    xmlns:cartridges="clr-namespace:Content.Client.DeltaV.CartridgeLoader.Cartridges"
+    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    Margin="5"
+    VerticalExpand="True">
+
+    <!-- A parent container to hold the balance label and main content -->
+    <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
+        <!-- Header section with balance -->
+        <PanelContainer StyleClasses="AngleRect">
+            <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+                <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="0,0,5,0">
+                    <Label Text="{Loc stock-trading-title}"
+                           HorizontalExpand="True"
+                           HorizontalAlignment="Left" />
+                </BoxContainer>
+                <Label Name="Balance"
+                       Text="{Loc stock-trading-balance}"
+                       HorizontalAlignment="Right" />
+            </BoxContainer>
+        </PanelContainer>
+
+        <!-- Horizontal line under header -->
+        <customControls:HSeparator Margin="5 3 5 5"/>
+
+        <!-- Main content -->
+        <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
+            <Label Name="NoEntries"
+                   Text="{Loc stock-trading-no-entries}"
+                   HorizontalExpand="True"
+                   HorizontalAlignment="Center"
+                   Visible="False" />
+            <ScrollContainer HorizontalExpand="True"
+                             VerticalExpand="True"
+                             Margin="0,5,0,0">
+                <BoxContainer Name="Entries"
+                              Orientation="Vertical"
+                              VerticalAlignment="Top"
+                              HorizontalExpand="True" />
+            </ScrollContainer>
+        </BoxContainer>
+    </BoxContainer>
+</cartridges:StockTradingUiFragment>
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/StockTradingUiFragment.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/StockTradingUiFragment.xaml.cs
new file mode 100644
index 00000000000..b44e8f44c70
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/StockTradingUiFragment.xaml.cs
@@ -0,0 +1,269 @@
+using System.Linq;
+using Content.Client.Administration.UI.CustomControls;
+using Content.Shared.CartridgeLoader.Cartridges;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+
+[GenerateTypedNameReferences]
+public sealed partial class StockTradingUiFragment : BoxContainer
+{
+    private readonly Dictionary<int, CompanyEntry> _companyEntries = new();
+
+    // Event handlers for the parent UI
+    public event Action<int, float>? OnBuyButtonPressed;
+    public event Action<int, float>? OnSellButtonPressed;
+
+    // Define colors
+    public static readonly Color PositiveColor = Color.FromHex("#00ff00"); // Green
+    public static readonly Color NegativeColor = Color.FromHex("#ff0000"); // Red
+    public static readonly Color NeutralColor = Color.FromHex("#ffffff"); // White
+    public static readonly Color BackgroundColor = Color.FromHex("#25252a"); // Dark grey
+    public static readonly Color PriceBackgroundColor = Color.FromHex("#1a1a1a"); // Darker grey
+    public static readonly Color BorderColor = Color.FromHex("#404040"); // Light grey
+
+    public StockTradingUiFragment()
+    {
+        RobustXamlLoader.Load(this);
+    }
+
+    public void UpdateState(StockTradingUiState state)
+    {
+        NoEntries.Visible = state.Entries.Count == 0;
+        Balance.Text = Loc.GetString("stock-trading-balance", ("balance", state.Balance));
+
+        // Clear all existing entries
+        foreach (var entry in _companyEntries.Values)
+        {
+            entry.Container.RemoveAllChildren();
+        }
+        _companyEntries.Clear();
+        Entries.RemoveAllChildren();
+
+        // Add new entries
+        for (var i = 0; i < state.Entries.Count; i++)
+        {
+            var company = state.Entries[i];
+            var entry = new CompanyEntry(i, company.LocalizedDisplayName, OnBuyButtonPressed, OnSellButtonPressed);
+            _companyEntries[i] = entry;
+            Entries.AddChild(entry.Container);
+
+            var ownedStocks = state.OwnedStocks.GetValueOrDefault(i, 0);
+            entry.Update(company, ownedStocks);
+        }
+    }
+
+    private sealed class CompanyEntry
+    {
+        public readonly BoxContainer Container;
+        private readonly Label _nameLabel;
+        private readonly Label _priceLabel;
+        private readonly Label _changeLabel;
+        private readonly Button _sellButton;
+        private readonly Button _buyButton;
+        private readonly Label _sharesLabel;
+        private readonly LineEdit _amountEdit;
+        private readonly PriceHistoryTable _priceHistory;
+
+        public CompanyEntry(int companyIndex,
+            string displayName,
+            Action<int, float>? onBuyPressed,
+            Action<int, float>? onSellPressed)
+        {
+            Container = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical,
+                HorizontalExpand = true,
+                Margin = new Thickness(0, 0, 0, 2),
+            };
+
+            // Company info panel
+            var companyPanel = new PanelContainer();
+
+            var mainContent = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical,
+                HorizontalExpand = true,
+                Margin = new Thickness(8),
+            };
+
+            // Top row with company name and price info
+            var topRow = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal,
+                HorizontalExpand = true,
+            };
+
+            _nameLabel = new Label
+            {
+                HorizontalExpand = true,
+                Text = displayName,
+            };
+
+            // Create a panel for price and change
+            var pricePanel = new PanelContainer
+            {
+                HorizontalAlignment = HAlignment.Right,
+            };
+
+            // Style the price panel
+            var priceStyleBox = new StyleBoxFlat
+            {
+                BackgroundColor = BackgroundColor,
+                ContentMarginLeftOverride = 8,
+                ContentMarginRightOverride = 8,
+                ContentMarginTopOverride = 4,
+                ContentMarginBottomOverride = 4,
+                BorderColor = BorderColor,
+                BorderThickness = new Thickness(1),
+            };
+
+            pricePanel.PanelOverride = priceStyleBox;
+
+            // Container for price and change labels
+            var priceContainer = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal,
+            };
+
+            _priceLabel = new Label();
+
+            _changeLabel = new Label
+            {
+                HorizontalAlignment = HAlignment.Right,
+                Modulate = NeutralColor,
+                Margin = new Thickness(15, 0, 0, 0),
+            };
+
+            priceContainer.AddChild(_priceLabel);
+            priceContainer.AddChild(_changeLabel);
+            pricePanel.AddChild(priceContainer);
+
+            topRow.AddChild(_nameLabel);
+            topRow.AddChild(pricePanel);
+
+            // Add the top row
+            mainContent.AddChild(topRow);
+
+            // Add the price history table between top and bottom rows
+            _priceHistory = new PriceHistoryTable();
+            mainContent.AddChild(_priceHistory);
+
+            // Trading controls (bottom row)
+            var bottomRow = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal,
+                HorizontalExpand = true,
+                Margin = new Thickness(0, 5, 0, 0),
+            };
+
+            _sharesLabel = new Label
+            {
+                Text = Loc.GetString("stock-trading-owned-shares"),
+                MinWidth = 100,
+            };
+
+            _amountEdit = new LineEdit
+            {
+                PlaceHolder = Loc.GetString("stock-trading-amount-placeholder"),
+                HorizontalExpand = true,
+                MinWidth = 80,
+            };
+
+            var buttonContainer = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal,
+                HorizontalAlignment = HAlignment.Right,
+                MinWidth = 140,
+            };
+
+            _buyButton = new Button
+            {
+                Text = Loc.GetString("stock-trading-buy-button"),
+                MinWidth = 65,
+                Margin = new Thickness(3, 0, 3, 0),
+            };
+
+            _sellButton = new Button
+            {
+                Text = Loc.GetString("stock-trading-sell-button"),
+                MinWidth = 65,
+            };
+
+            buttonContainer.AddChild(_buyButton);
+            buttonContainer.AddChild(_sellButton);
+
+            bottomRow.AddChild(_sharesLabel);
+            bottomRow.AddChild(_amountEdit);
+            bottomRow.AddChild(buttonContainer);
+
+            // Add the bottom row last
+            mainContent.AddChild(bottomRow);
+
+            companyPanel.AddChild(mainContent);
+            Container.AddChild(companyPanel);
+
+            // Add horizontal separator after the panel
+            var separator = new HSeparator
+            {
+                Margin = new Thickness(5, 3, 5, 5),
+            };
+            Container.AddChild(separator);
+
+            // Button click events
+            _buyButton.OnPressed += _ =>
+            {
+                if (float.TryParse(_amountEdit.Text, out var amount) && amount > 0)
+                    onBuyPressed?.Invoke(companyIndex, amount);
+            };
+
+            _sellButton.OnPressed += _ =>
+            {
+                if (float.TryParse(_amountEdit.Text, out var amount) && amount > 0)
+                    onSellPressed?.Invoke(companyIndex, amount);
+            };
+
+            // There has to be a better way of doing this
+            _amountEdit.OnTextChanged += args =>
+            {
+                var newText = string.Concat(args.Text.Where(char.IsDigit));
+                if (newText != args.Text)
+                    _amountEdit.Text = newText;
+            };
+        }
+
+        public void Update(StockCompanyStruct company, int ownedStocks)
+        {
+            _nameLabel.Text = company.LocalizedDisplayName;
+            _priceLabel.Text = $"${company.CurrentPrice:F2}";
+            _sharesLabel.Text = Loc.GetString("stock-trading-owned-shares", ("shares", ownedStocks));
+
+            var priceChange = 0f;
+            if (company.PriceHistory is { Count: > 0 })
+            {
+                var previousPrice = company.PriceHistory[^1];
+                priceChange = (company.CurrentPrice - previousPrice) / previousPrice * 100;
+            }
+
+            _changeLabel.Text = $"{(priceChange >= 0 ? "+" : "")}{priceChange:F2}%";
+
+            // Update color based on price change
+            _changeLabel.Modulate = priceChange switch
+            {
+                > 0 => PositiveColor,
+                < 0 => NegativeColor,
+                _ => NeutralColor,
+            };
+
+            // Update the price history table if not null
+            if (company.PriceHistory != null)
+                _priceHistory.Update(company.PriceHistory);
+
+            // Disable sell button if no shares owned
+            _sellButton.Disabled = ownedStocks <= 0;
+        }
+    }
+}
diff --git a/Content.Server/Cargo/Components/StationStockMarketComponent.cs b/Content.Server/Cargo/Components/StationStockMarketComponent.cs
new file mode 100644
index 00000000000..4ea9bd43133
--- /dev/null
+++ b/Content.Server/Cargo/Components/StationStockMarketComponent.cs
@@ -0,0 +1,71 @@
+using System.Numerics;
+using Content.Server.DeltaV.Cargo.Systems;
+using Content.Server.DeltaV.CartridgeLoader.Cartridges;
+using Content.Shared.CartridgeLoader.Cartridges;
+using Robust.Shared.Audio;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+using Robust.Shared.Timing;
+
+namespace Content.Server.DeltaV.Cargo.Components;
+
+[RegisterComponent, AutoGenerateComponentPause]
+[Access(typeof(StockMarketSystem), typeof(StockTradingCartridgeSystem))]
+public sealed partial class StationStockMarketComponent : Component
+{
+    /// <summary>
+    /// The list of companies you can invest in
+    /// </summary>
+    [DataField]
+    public List<StockCompanyStruct> Companies = [];
+
+    /// <summary>
+    /// The list of shares owned by the station
+    /// </summary>
+    [DataField]
+    public Dictionary<int, int> StockOwnership = new();
+
+    /// <summary>
+    /// The interval at which the stock market updates
+    /// </summary>
+    [DataField]
+    public TimeSpan UpdateInterval = TimeSpan.FromSeconds(600); // 10 minutes
+
+    /// <summary>
+    /// The <see cref="IGameTiming.CurTime"/> timespan of next update.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
+    public TimeSpan NextUpdate = TimeSpan.Zero;
+
+    /// <summary>
+    /// The sound to play after selling or buying stocks
+    /// </summary>
+    [DataField]
+    public SoundSpecifier ConfirmSound = new SoundPathSpecifier("/Audio/Effects/Cargo/ping.ogg");
+
+    /// <summary>
+    /// The sound to play if the don't have access to buy or sell stocks
+    /// </summary>
+    [DataField]
+    public SoundSpecifier DenySound = new SoundPathSpecifier("/Audio/Effects/Cargo/buzz_sigh.ogg");
+
+    // These work well as presets but can be changed in the yaml
+    [DataField]
+    public List<MarketChange> MarketChanges =
+    [
+        new() { Chance = 0.86f, Range = new Vector2(-0.05f, 0.05f) }, // Minor
+        new() { Chance = 0.10f, Range = new Vector2(-0.3f, 0.2f) }, // Moderate
+        new() { Chance = 0.03f, Range = new Vector2(-0.5f, 1.5f) }, // Major
+        new() { Chance = 0.01f, Range = new Vector2(-0.9f, 4.0f) }, // Catastrophic
+    ];
+}
+
+[DataDefinition]
+public sealed partial class MarketChange
+{
+    [DataField(required: true)]
+    public float Chance;
+
+    [DataField(required: true)]
+    public Vector2 Range;
+}
diff --git a/Content.Server/Cargo/StocksCommands.cs b/Content.Server/Cargo/StocksCommands.cs
new file mode 100644
index 00000000000..dfe1776f666
--- /dev/null
+++ b/Content.Server/Cargo/StocksCommands.cs
@@ -0,0 +1,135 @@
+using Content.Server.Administration;
+using Content.Server.DeltaV.Cargo.Components;
+using Content.Server.DeltaV.Cargo.Systems;
+using Content.Shared.Administration;
+using Content.Shared.CartridgeLoader.Cartridges;
+using Robust.Shared.Console;
+
+namespace Content.Server.DeltaV.Cargo;
+
+[AdminCommand(AdminFlags.Fun)]
+public sealed class ChangeStocksPriceCommand : IConsoleCommand
+{
+    public string Command => "changestocksprice";
+    public string Description => Loc.GetString("cmd-changestocksprice-desc");
+    public string Help => Loc.GetString("cmd-changestocksprice-help", ("command", Command));
+
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
+
+    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (args.Length < 2)
+        {
+            shell.WriteLine(Loc.GetString("shell-wrong-arguments-number"));
+            return;
+        }
+
+        if (!int.TryParse(args[0], out var companyIndex))
+        {
+            shell.WriteError(Loc.GetString("shell-argument-must-be-number"));
+            return;
+        }
+
+        if (!float.TryParse(args[1], out var newPrice))
+        {
+            shell.WriteError(Loc.GetString("shell-argument-must-be-number"));
+            return;
+        }
+
+        EntityUid? targetStation = null;
+        if (args.Length > 2)
+        {
+            if (!EntityUid.TryParse(args[2], out var station))
+            {
+                shell.WriteError(Loc.GetString("shell-entity-uid-must-be-number"));
+                return;
+            }
+            targetStation = station;
+        }
+
+        var stockMarket = _entitySystemManager.GetEntitySystem<StockMarketSystem>();
+        var query = _entityManager.EntityQueryEnumerator<StationStockMarketComponent>();
+
+        while (query.MoveNext(out var uid, out var comp))
+        {
+            // Skip if we're looking for a specific station and this isn't it
+            if (targetStation != null && uid != targetStation)
+                continue;
+
+            if (stockMarket.TryChangeStocksPrice(uid, comp, newPrice, companyIndex))
+            {
+                shell.WriteLine(Loc.GetString("shell-command-success"));
+                return;
+            }
+
+            shell.WriteLine(Loc.GetString("cmd-changestocksprice-invalid-company"));
+            return;
+        }
+
+        shell.WriteLine(targetStation != null
+            ? Loc.GetString("cmd-changestocksprice-invalid-station")
+            : Loc.GetString("cmd-changestocksprice-no-stations"));
+    }
+}
+
+[AdminCommand(AdminFlags.Fun)]
+public sealed class AddStocksCompanyCommand : IConsoleCommand
+{
+    public string Command => "addstockscompany";
+    public string Description => Loc.GetString("cmd-addstockscompany-desc");
+    public string Help => Loc.GetString("cmd-addstockscompany-help", ("command", Command));
+
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
+
+    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (args.Length < 2)
+        {
+            shell.WriteLine(Loc.GetString("shell-wrong-arguments-number"));
+            return;
+        }
+
+        if (!float.TryParse(args[1], out var basePrice))
+        {
+            shell.WriteError(Loc.GetString("shell-argument-must-be-number"));
+            return;
+        }
+
+        EntityUid? targetStation = null;
+        if (args.Length > 2)
+        {
+            if (!EntityUid.TryParse(args[2], out var station))
+            {
+                shell.WriteError(Loc.GetString("shell-entity-uid-must-be-number"));
+                return;
+            }
+            targetStation = station;
+        }
+
+        var displayName = args[0];
+        var stockMarket = _entitySystemManager.GetEntitySystem<StockMarketSystem>();
+        var query = _entityManager.EntityQueryEnumerator<StationStockMarketComponent>();
+
+        while (query.MoveNext(out var uid, out var comp))
+        {
+            // Skip if we're looking for a specific station and this isn't it
+            if (targetStation != null && uid != targetStation)
+                continue;
+
+            if (stockMarket.TryAddCompany(uid, comp, basePrice, displayName))
+            {
+                shell.WriteLine(Loc.GetString("shell-command-success"));
+                return;
+            }
+
+            shell.WriteLine(Loc.GetString("cmd-addstockscompany-failure"));
+            return;
+        }
+
+        shell.WriteLine(targetStation != null
+            ? Loc.GetString("cmd-addstockscompany-invalid-station")
+            : Loc.GetString("cmd-addstockscompany-no-stations"));
+    }
+}
diff --git a/Content.Server/Cargo/Systems/StockMarketSystem.cs b/Content.Server/Cargo/Systems/StockMarketSystem.cs
new file mode 100644
index 00000000000..5ff5cd4ff7f
--- /dev/null
+++ b/Content.Server/Cargo/Systems/StockMarketSystem.cs
@@ -0,0 +1,385 @@
+using Content.Server.Access.Systems;
+using Content.Server.Administration.Logs;
+using Content.Server.Cargo.Components;
+using Content.Server.Cargo.Systems;
+using Content.Server.DeltaV.Cargo.Components;
+using Content.Server.DeltaV.CartridgeLoader.Cartridges;
+using Content.Shared.Access.Components;
+using Content.Shared.Access.Systems;
+using Content.Shared.CartridgeLoader;
+using Content.Shared.CartridgeLoader.Cartridges;
+using Content.Shared.Database;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Player;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Server.DeltaV.Cargo.Systems;
+
+/// <summary>
+/// This handles the stock market updates
+/// </summary>
+public sealed class StockMarketSystem : EntitySystem
+{
+    [Dependency] private readonly AccessReaderSystem _accessSystem = default!;
+    [Dependency] private readonly CargoSystem _cargo = default!;
+    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly ILogManager _log = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly IdCardSystem _idCardSystem = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
+    private ISawmill _sawmill = default!;
+    private const float MaxPrice = 262144; // 1/64 of max safe integer
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _sawmill = _log.GetSawmill("admin.stock_market");
+
+        SubscribeLocalEvent<StockTradingCartridgeComponent, CartridgeMessageEvent>(OnStockTradingMessage);
+    }
+
+    public override void Update(float frameTime)
+    {
+        var curTime = _timing.CurTime;
+        var query = EntityQueryEnumerator<StationStockMarketComponent>();
+
+        while (query.MoveNext(out var uid, out var component))
+        {
+            if (curTime < component.NextUpdate)
+                continue;
+
+            component.NextUpdate = curTime + component.UpdateInterval;
+            UpdateStockPrices(uid, component);
+        }
+    }
+
+    private void OnStockTradingMessage(Entity<StockTradingCartridgeComponent> ent, ref CartridgeMessageEvent args)
+    {
+        if (args is not StockTradingUiMessageEvent message)
+            return;
+
+        var companyIndex = message.CompanyIndex;
+        var amount = (int)message.Amount;
+        var station = ent.Comp.Station;
+        var loader = GetEntity(args.LoaderUid);
+        var xform = Transform(loader);
+
+        // Ensure station and stock market components are valid
+        if (station == null || !TryComp<StationStockMarketComponent>(station, out var stockMarket))
+            return;
+
+        // Validate company index
+        if (companyIndex < 0 || companyIndex >= stockMarket.Companies.Count)
+            return;
+
+        if (!TryComp<AccessReaderComponent>(ent.Owner, out var access))
+            return;
+
+        // Attempt to retrieve ID card from loader
+        IdCardComponent? idCard = null;
+        if (_idCardSystem.TryGetIdCard(loader, out var pdaId))
+            idCard = pdaId;
+
+        // Play deny sound and exit if access is not allowed
+        if (idCard == null || !_accessSystem.IsAllowed(pdaId.Owner, ent.Owner, access))
+        {
+            _audio.PlayEntity(
+                stockMarket.DenySound,
+                Filter.Empty().AddInRange(_transform.GetMapCoordinates(loader, xform), 0.05f),
+                loader,
+                true,
+                AudioParams.Default.WithMaxDistance(0.05f)
+            );
+            return;
+        }
+
+        try
+        {
+            var company = stockMarket.Companies[companyIndex];
+
+            // Attempt to buy or sell stocks based on the action
+            bool success;
+            switch (message.Action)
+            {
+                case StockTradingUiAction.Buy:
+                    _adminLogger.Add(LogType.Action,
+                        LogImpact.Medium,
+                        $"{ToPrettyString(loader)} attempting to buy {amount} stocks of {company.LocalizedDisplayName}");
+                    success = TryBuyStocks(station.Value, stockMarket, companyIndex, amount);
+                    break;
+
+                case StockTradingUiAction.Sell:
+                    _adminLogger.Add(LogType.Action,
+                        LogImpact.Medium,
+                        $"{ToPrettyString(loader)} attempting to sell {amount} stocks of {company.LocalizedDisplayName}");
+                    success = TrySellStocks(station.Value, stockMarket, companyIndex, amount);
+                    break;
+
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+
+            // Play confirmation sound if the transaction was successful
+            if (success)
+            {
+                _audio.PlayEntity(
+                    stockMarket.ConfirmSound,
+                    Filter.Empty().AddInRange(_transform.GetMapCoordinates(loader, xform), 0.05f),
+                    loader,
+                    true,
+                    AudioParams.Default.WithMaxDistance(0.05f)
+                );
+            }
+        }
+        finally
+        {
+            // Raise the event to update the UI regardless of outcome
+            var ev = new StockMarketUpdatedEvent(station.Value);
+            RaiseLocalEvent(ev);
+        }
+    }
+
+    private bool TryBuyStocks(
+        EntityUid station,
+        StationStockMarketComponent stockMarket,
+        int companyIndex,
+        int amount)
+    {
+        if (amount <= 0 || companyIndex < 0 || companyIndex >= stockMarket.Companies.Count)
+            return false;
+
+        // Check if the station has a bank account
+        if (!TryComp<StationBankAccountComponent>(station, out var bank))
+            return false;
+
+        var company = stockMarket.Companies[companyIndex];
+        var totalValue = (int)Math.Round(company.CurrentPrice * amount);
+
+        // See if we can afford it
+        if (bank.Balance < totalValue)
+            return false;
+
+        if (!stockMarket.StockOwnership.TryGetValue(companyIndex, out var currentOwned))
+            currentOwned = 0;
+
+        // Update the bank account
+        _cargo.UpdateBankAccount(station, bank, -totalValue);
+        stockMarket.StockOwnership[companyIndex] = currentOwned + amount;
+
+        // Log the transaction
+        _adminLogger.Add(LogType.Action,
+            LogImpact.Medium,
+            $"[StockMarket] Bought {amount} stocks of {company.LocalizedDisplayName} at {company.CurrentPrice:F2} credits each (Total: {totalValue})");
+
+        return true;
+    }
+
+    private bool TrySellStocks(
+        EntityUid station,
+        StationStockMarketComponent stockMarket,
+        int companyIndex,
+        int amount)
+    {
+        if (amount <= 0 || companyIndex < 0 || companyIndex >= stockMarket.Companies.Count)
+            return false;
+
+        // Check if the station has a bank account
+        if (!TryComp<StationBankAccountComponent>(station, out var bank))
+            return false;
+
+        if (!stockMarket.StockOwnership.TryGetValue(companyIndex, out var currentOwned) || currentOwned < amount)
+            return false;
+
+        var company = stockMarket.Companies[companyIndex];
+        var totalValue = (int)Math.Round(company.CurrentPrice * amount);
+
+        // Update stock ownership
+        var newAmount = currentOwned - amount;
+        if (newAmount > 0)
+            stockMarket.StockOwnership[companyIndex] = newAmount;
+        else
+            stockMarket.StockOwnership.Remove(companyIndex);
+
+        // Update the bank account
+        _cargo.UpdateBankAccount(station, bank, totalValue);
+
+        // Log the transaction
+        _adminLogger.Add(LogType.Action,
+            LogImpact.Medium,
+            $"[StockMarket] Sold {amount} stocks of {company.LocalizedDisplayName} at {company.CurrentPrice:F2} credits each (Total: {totalValue})");
+
+        return true;
+    }
+
+    private void UpdateStockPrices(EntityUid station, StationStockMarketComponent stockMarket)
+    {
+        for (var i = 0; i < stockMarket.Companies.Count; i++)
+        {
+            var company = stockMarket.Companies[i];
+            var changeType = DetermineMarketChange(stockMarket.MarketChanges);
+            var multiplier = CalculatePriceMultiplier(changeType);
+
+            UpdatePriceHistory(company);
+
+            // Update price with multiplier
+            var oldPrice = company.CurrentPrice;
+            company.CurrentPrice *= (1 + multiplier);
+
+            // Ensure price doesn't go below minimum threshold
+            company.CurrentPrice = MathF.Max(company.CurrentPrice, company.BasePrice * 0.1f);
+
+            // Ensure price doesn't go above maximum threshold
+            company.CurrentPrice = MathF.Min(company.CurrentPrice, MaxPrice);
+
+            stockMarket.Companies[i] = company;
+
+            // Calculate the percentage change
+            var percentChange = (company.CurrentPrice - oldPrice) / oldPrice * 100;
+
+            // Raise the event
+            var ev = new StockMarketUpdatedEvent(station);
+            RaiseLocalEvent(ev);
+
+            // Log it
+            _adminLogger.Add(LogType.Action,
+                LogImpact.Medium,
+                $"[StockMarket] Company '{company.LocalizedDisplayName}' price updated by {percentChange:+0.00;-0.00}% from {oldPrice:0.00} to {company.CurrentPrice:0.00}");
+        }
+    }
+
+    /// <summary>
+    /// Attempts to change the price for a specific company
+    /// </summary>
+    /// <returns>True if the operation was successful, false otherwise</returns>
+    public bool TryChangeStocksPrice(EntityUid station,
+        StationStockMarketComponent stockMarket,
+        float newPrice,
+        int companyIndex)
+    {
+        // Check if it exceeds the max price
+        if (newPrice > MaxPrice)
+        {
+            _sawmill.Error($"New price cannot be greater than {MaxPrice}.");
+            return false;
+        }
+
+        if (companyIndex < 0 || companyIndex >= stockMarket.Companies.Count)
+            return false;
+
+        var company = stockMarket.Companies[companyIndex];
+        UpdatePriceHistory(company);
+
+        company.CurrentPrice = MathF.Max(newPrice, company.BasePrice * 0.1f);
+        stockMarket.Companies[companyIndex] = company;
+
+        var ev = new StockMarketUpdatedEvent(station);
+        RaiseLocalEvent(ev);
+        return true;
+    }
+
+    /// <summary>
+    /// Attempts to add a new company to the station
+    /// </summary>
+    /// <returns>False if the company already exists, true otherwise</returns>
+    public bool TryAddCompany(EntityUid station,
+        StationStockMarketComponent stockMarket,
+        float basePrice,
+        string displayName)
+    {
+        // Create a new company struct with the specified parameters
+        var company = new StockCompanyStruct
+        {
+            LocalizedDisplayName = displayName, // Assume there's no Loc for it
+            BasePrice = basePrice,
+            CurrentPrice = basePrice,
+            PriceHistory = [],
+        };
+
+        stockMarket.Companies.Add(company);
+        UpdatePriceHistory(company);
+
+        var ev = new StockMarketUpdatedEvent(station);
+        RaiseLocalEvent(ev);
+
+        return true;
+    }
+
+    /// <summary>
+    /// Attempts to add a new company to the station using the StockCompanyStruct
+    /// </summary>
+    /// <returns>False if the company already exists, true otherwise</returns>
+    public bool TryAddCompany(EntityUid station,
+        StationStockMarketComponent stockMarket,
+        StockCompanyStruct company)
+    {
+        // Add the new company to the dictionary
+        stockMarket.Companies.Add(company);
+
+        // Make sure it has a price history
+        UpdatePriceHistory(company);
+
+        var ev = new StockMarketUpdatedEvent(station);
+        RaiseLocalEvent(ev);
+
+        return true;
+    }
+
+    private static void UpdatePriceHistory(StockCompanyStruct company)
+    {
+        // Create if null
+        company.PriceHistory ??= [];
+
+        // Make sure it has at least 5 entries
+        while (company.PriceHistory.Count < 5)
+        {
+            company.PriceHistory.Add(company.BasePrice);
+        }
+
+        // Store previous price in history
+        company.PriceHistory.Add(company.CurrentPrice);
+
+        if (company.PriceHistory.Count > 5) // Keep last 5 prices
+            company.PriceHistory.RemoveAt(1); // Always keep the base price
+    }
+
+    private MarketChange DetermineMarketChange(List<MarketChange> marketChanges)
+    {
+        var roll = _random.NextFloat();
+        var cumulative = 0f;
+
+        foreach (var change in marketChanges)
+        {
+            cumulative += change.Chance;
+            if (roll <= cumulative)
+                return change;
+        }
+
+        return marketChanges[0]; // Default to first (usually minor) change if we somehow exceed 100%
+    }
+
+    private float CalculatePriceMultiplier(MarketChange change)
+    {
+        // Using Box-Muller transform for normal distribution
+        var u1 = _random.NextFloat();
+        var u2 = _random.NextFloat();
+        var randStdNormal = Math.Sqrt(-2.0 * Math.Log(u1)) * Math.Sin(2.0 * Math.PI * u2);
+
+        // Scale and shift the result to our desired range
+        var range = change.Range.Y - change.Range.X;
+        var mean = (change.Range.Y + change.Range.X) / 2;
+        var stdDev = range / 6.0f; // 99.7% of values within range
+
+        var result = (float)(mean + (stdDev * randStdNormal));
+        return Math.Clamp(result, change.Range.X, change.Range.Y);
+    }
+}
+public sealed class StockMarketUpdatedEvent(EntityUid station) : EntityEventArgs
+{
+    public EntityUid Station = station;
+}
diff --git a/Content.Server/DeltaV/CartridgeLoader/Cartridges/StockTradingCartridgeComponent.cs b/Content.Server/DeltaV/CartridgeLoader/Cartridges/StockTradingCartridgeComponent.cs
new file mode 100644
index 00000000000..7ab11f64d4a
--- /dev/null
+++ b/Content.Server/DeltaV/CartridgeLoader/Cartridges/StockTradingCartridgeComponent.cs
@@ -0,0 +1,11 @@
+namespace Content.Server.DeltaV.CartridgeLoader.Cartridges;
+
+[RegisterComponent, Access(typeof(StockTradingCartridgeSystem))]
+public sealed partial class StockTradingCartridgeComponent : Component
+{
+    /// <summary>
+    /// Station entity to keep track of
+    /// </summary>
+    [DataField]
+    public EntityUid? Station;
+}
diff --git a/Content.Server/DeltaV/CartridgeLoader/Cartridges/StockTradingCartridgeSystem.cs b/Content.Server/DeltaV/CartridgeLoader/Cartridges/StockTradingCartridgeSystem.cs
new file mode 100644
index 00000000000..cd68c5adb43
--- /dev/null
+++ b/Content.Server/DeltaV/CartridgeLoader/Cartridges/StockTradingCartridgeSystem.cs
@@ -0,0 +1,101 @@
+using System.Linq;
+using Content.Server.Cargo.Components;
+using Content.Server.DeltaV.Cargo.Components;
+using Content.Server.DeltaV.Cargo.Systems;
+using Content.Server.Station.Systems;
+using Content.Server.CartridgeLoader;
+using Content.Shared.Cargo.Components;
+using Content.Shared.CartridgeLoader;
+using Content.Shared.CartridgeLoader.Cartridges;
+
+namespace Content.Server.DeltaV.CartridgeLoader.Cartridges;
+
+public sealed class StockTradingCartridgeSystem : EntitySystem
+{
+    [Dependency] private readonly CartridgeLoaderSystem _cartridgeLoader = default!;
+    [Dependency] private readonly StationSystem _station = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<StockTradingCartridgeComponent, CartridgeUiReadyEvent>(OnUiReady);
+        SubscribeLocalEvent<StockMarketUpdatedEvent>(OnStockMarketUpdated);
+        SubscribeLocalEvent<StationStockMarketComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<StockTradingCartridgeComponent, BankBalanceUpdatedEvent>(OnBalanceUpdated);
+    }
+
+    private void OnBalanceUpdated(Entity<StockTradingCartridgeComponent> ent, ref BankBalanceUpdatedEvent args)
+    {
+            UpdateAllCartridges(args.Station);
+    }
+
+    private void OnUiReady(Entity<StockTradingCartridgeComponent> ent, ref CartridgeUiReadyEvent args)
+    {
+        UpdateUI(ent, args.Loader);
+    }
+
+    private void OnStockMarketUpdated(StockMarketUpdatedEvent args)
+    {
+        UpdateAllCartridges(args.Station);
+    }
+
+    private void OnMapInit(Entity<StationStockMarketComponent> ent, ref MapInitEvent args)
+    {
+        // Initialize price history for each company
+        for (var i = 0; i < ent.Comp.Companies.Count; i++)
+        {
+            var company = ent.Comp.Companies[i];
+
+            // Create initial price history using base price
+            company.PriceHistory = new List<float>();
+            for (var j = 0; j < 5; j++)
+            {
+                company.PriceHistory.Add(company.BasePrice);
+            }
+
+            ent.Comp.Companies[i] = company;
+        }
+
+        if (_station.GetOwningStation(ent.Owner) is { } station)
+            UpdateAllCartridges(station);
+    }
+
+    private void UpdateAllCartridges(EntityUid station)
+    {
+        var query = EntityQueryEnumerator<StockTradingCartridgeComponent, CartridgeComponent>();
+        while (query.MoveNext(out var uid, out var comp, out var cartridge))
+        {
+            if (cartridge.LoaderUid is not { } loader || comp.Station != station)
+                continue;
+            UpdateUI((uid, comp), loader);
+        }
+    }
+
+    private void UpdateUI(Entity<StockTradingCartridgeComponent> ent, EntityUid loader)
+    {
+        if (_station.GetOwningStation(loader) is { } station)
+            ent.Comp.Station = station;
+
+        if (!TryComp<StationStockMarketComponent>(ent.Comp.Station, out var stockMarket) ||
+            !TryComp<StationBankAccountComponent>(ent.Comp.Station, out var bankAccount))
+            return;
+
+        // Convert company data to UI state format
+        var entries = stockMarket.Companies.Select(company => new StockCompanyStruct(
+            displayName: company.LocalizedDisplayName,
+                currentPrice: company.CurrentPrice,
+                basePrice: company.BasePrice,
+                priceHistory: company.PriceHistory))
+            .ToList();
+
+        // Send the UI state with balance and owned stocks
+        var state = new StockTradingUiState(
+            entries: entries,
+            ownedStocks: stockMarket.StockOwnership,
+            balance: bankAccount.Balance
+        );
+
+        _cartridgeLoader.UpdateCartridgeUiState(loader, state);
+    }
+}
diff --git a/Content.Shared/DeltaV/CartridgeLoader/Cartridges/StockTradingUiMessageEvent.cs b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/StockTradingUiMessageEvent.cs
new file mode 100644
index 00000000000..a80f8c6b8a8
--- /dev/null
+++ b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/StockTradingUiMessageEvent.cs
@@ -0,0 +1,19 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.CartridgeLoader.Cartridges;
+
+[Serializable, NetSerializable]
+public sealed class StockTradingUiMessageEvent(StockTradingUiAction action, int companyIndex, float amount)
+    : CartridgeMessageEvent
+{
+    public readonly StockTradingUiAction Action = action;
+    public readonly int CompanyIndex = companyIndex;
+    public readonly float Amount = amount;
+}
+
+[Serializable, NetSerializable]
+public enum StockTradingUiAction
+{
+    Buy,
+    Sell,
+}
diff --git a/Content.Shared/DeltaV/CartridgeLoader/Cartridges/StockTradingUiState.cs b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/StockTradingUiState.cs
new file mode 100644
index 00000000000..aea4ba5aa1d
--- /dev/null
+++ b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/StockTradingUiState.cs
@@ -0,0 +1,66 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.CartridgeLoader.Cartridges;
+
+[Serializable, NetSerializable]
+public sealed class StockTradingUiState(
+    List<StockCompanyStruct> entries,
+    Dictionary<int, int> ownedStocks,
+    float balance)
+    : BoundUserInterfaceState
+{
+    public readonly List<StockCompanyStruct> Entries = entries;
+    public readonly Dictionary<int, int> OwnedStocks = ownedStocks;
+    public readonly float Balance = balance;
+}
+
+// No structure, zero fucks given
+[DataDefinition, Serializable]
+public partial struct StockCompanyStruct
+{
+    /// <summary>
+    /// The displayed name of the company shown in the UI.
+    /// </summary>
+    [DataField(required: true)]
+    public LocId? DisplayName;
+
+    // Used for runtime-added companies that don't have a localization entry
+    private string? _displayName;
+
+    /// <summary>
+    /// Gets or sets the display name, using either the localized or direct string value
+    /// </summary>
+    [Access(Other = AccessPermissions.ReadWriteExecute)]
+    public string LocalizedDisplayName
+    {
+        get => _displayName ?? Loc.GetString(DisplayName ?? string.Empty);
+        set => _displayName = value;
+    }
+
+    /// <summary>
+    /// The current price of the company's stock
+    /// </summary>
+    [DataField(required: true)]
+    public float CurrentPrice;
+
+    /// <summary>
+    /// The base price of the company's stock
+    /// </summary>
+    [DataField(required: true)]
+    public float BasePrice;
+
+    /// <summary>
+    /// The price history of the company's stock
+    /// </summary>
+    [DataField]
+    public List<float>? PriceHistory;
+
+    public StockCompanyStruct(string displayName, float currentPrice, float basePrice, List<float>? priceHistory)
+    {
+        DisplayName = displayName;
+        _displayName = null;
+        CurrentPrice = currentPrice;
+        BasePrice = basePrice;
+        PriceHistory = priceHistory ?? [];
+    }
+}
diff --git a/Resources/Locale/en-US/deltav/cargo/stocks-comapnies.ftl b/Resources/Locale/en-US/deltav/cargo/stocks-comapnies.ftl
new file mode 100644
index 00000000000..69ef7330a56
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/cargo/stocks-comapnies.ftl
@@ -0,0 +1,6 @@
+# Company names used for stocks trading
+stock-trading-company-nanotrasen = Nanotrasen [NT]
+stock-trading-company-gorlex = Gorlex [GRX]
+stock-trading-company-interdyne = Interdyne Pharmaceuticals [INTP]
+stock-trading-company-fishinc = Fish Inc. [FIN]
+stock-trading-company-donk = Donk Co. [DONK]
diff --git a/Resources/Locale/en-US/deltav/cargo/stocks-commands.ftl b/Resources/Locale/en-US/deltav/cargo/stocks-commands.ftl
new file mode 100644
index 00000000000..8e0fe014999
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/cargo/stocks-commands.ftl
@@ -0,0 +1,13 @@
+# changestockprice command
+cmd-changestocksprice-desc = Changes a company's stock price to the specified number.
+cmd-changestocksprice-help = changestockprice <Company index> <New price> [Station UID]
+cmd-changestocksprice-invalid-company = Failed to execute command! Invalid company index or the new price exceeds the allowed limit.
+cmd-changestocksprice-invalid-station = No stock market found for specified station
+cmd-changestocksprice-no-stations = No stations with stock markets found
+
+# addstockscompany command
+cmd-addstockscompany-desc = Adds a new company to the stocks market.
+cmd-addstockscompany-help = addstockscompany <Display name> <Base price> [Station UID]
+cmd-addstockscompany-failure = Failed to add company to the stock market.
+cmd-addstockscompany-invalid-station = No stock market found for specified station
+cmd-addstockscompany-no-stations = No stations with stock markets found
diff --git a/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl b/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl
index ede1a36b8ee..ec6fe1e11ae 100644
--- a/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl
+++ b/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl
@@ -1,3 +1,6 @@
+## CrimeAssist
+
+# General
 crime-assist-program-name = Crime Assist
 crime-assist-yes-button = Yes
 crime-assist-no-button = No
@@ -6,6 +9,14 @@ crime-assist-crimetype-misdemeanour = Misdemeanour
 crime-assist-crimetype-felony = Felony
 crime-assist-crimetype-capital = Capital
 crime-assist-crime-innocent = No crime was committed
+crime-assist-mainmenu = Welcome to Crime Assist!
+crime-assist-sophont-explanation = A sophont is described as any entity with the capacity to display the following attributes:
+                                   • [bold]Sapience[/bold]: the entity possesses basic logic and problem-solving skills, or at a minimum some level of significant intelligence.
+                                   • [bold]Sentience[/bold]: the entity has the capacity to process an emotion or lack thereof, or at a minimum the ability to recognise its own pain.
+                                   • [bold]Self-awareness[/bold]: the entity is capable of altering its behaviour in a reasonable fashion as a result of stimuli, or at a minimum is capable of recognising its own sapience and sentience.
+                                   Any sophont is considered a legal person, regardless of origin or prior cognitive status. Much like any other intelligent organic, a sophont may press charges against crew and be tried for crimes.
+
+# Crimes
 crime-assist-crime-animalcruelty = Code 101: Animal Cruelty
 crime-assist-crime-theft = Code 102: Theft
 crime-assist-crime-trespass = Code 110: Trespass
@@ -32,7 +43,8 @@ crime-assist-crime-decorporealisation = Code 305: Decorporealisation
 crime-assist-crime-kidnapping = Code 309: Kidnapping
 crime-assist-crime-sedition = Code 311: Sedition
 crime-assist-crime-sexualharassment = Code 314: Sexual Harassment
-crime-assist-mainmenu = Welcome to Crime Assist!
+
+# Questions
 crime-assist-question-isitterrorism = Did the suspect hold hostages, cause many deaths or major destruction to force compliance from the crew?
 crime-assist-question-wassomeoneattacked = Was an entity attacked?
 crime-assist-question-wasitsophont = Was the victim in question a sophont?
@@ -59,6 +71,8 @@ crime-assist-question-happenincourt = Was the suspect a nuisance in court?
 crime-assist-question-duringactiveinvestigation = Was the suspect a nuisance during an active investigation, and hindered the investigation as a result?
 crime-assist-question-tocommandstaff = Did the suspect overthrow or compromise a lawfully established Chain of Command, or attempt to do so?
 crime-assist-question-wasitcommanditself = Was a command staff or department head abusing authority over another sophont?
+
+# Crime details
 crime-assist-crimedetail-innocent = Crime could not be determined. Use your best judgement to resolve the situation.
 crime-assist-crimedetail-animalcruelty = To inflict unnecessary suffering on a sapient being with malicious intent.
 crime-assist-crimedetail-theft = To unlawfully take property or items without consent.
@@ -86,6 +100,8 @@ crime-assist-crimedetail-decorporealisation = To unlawfully, maliciously, and pe
 crime-assist-crimedetail-kidnapping = To unlawfully confine or restrict the free movement of a sophont against their will.
 crime-assist-crimedetail-sedition = To act to overthrow a lawfully established Chain of Command or governing body without lawful or legitimate cause.
 crime-assist-crimedetail-sexualharassment = To sexually harass, attempt to coerce into sexual relations, or effect unwanted sexual contact with an unwilling sophont.
+
+# Punishments
 crime-assist-crimepunishment-innocent = No punishment may be necessary
 crime-assist-crimepunishment-animalcruelty = Punishment: 3 minutes
 crime-assist-crimepunishment-theft = Punishment: 2 minutes
@@ -113,12 +129,10 @@ crime-assist-crimepunishment-decorporealisation = Punishment: Capital
 crime-assist-crimepunishment-kidnapping = Punishment: Capital
 crime-assist-crimepunishment-sedition = Punishment: Capital
 crime-assist-crimepunishment-sexualharassment = Punishment: Capital
-crime-assist-sophont-explanation = A sophont is described as any entity with the capacity to display the following attributes:
-                                   • [bold]Sapience[/bold]: the entity possesses basic logic and problem-solving skills, or at a minimum some level of significant intelligence.
-                                   • [bold]Sentience[/bold]: the entity has the capacity to process an emotion or lack thereof, or at a minimum the ability to recognise its own pain.
-                                   • [bold]Self-awareness[/bold]: the entity is capable of altering its behaviour in a reasonable fashion as a result of stimuli, or at a minimum is capable of recognising its own sapience and sentience.
-                                   Any sophont is considered a legal person, regardless of origin or prior cognitive status. Much like any other intelligent organic, a sophont may press charges against crew and be tried for crimes.
 
+## MailMetrics
+
+# General
 mail-metrics-program-name = MailMetrics
 mail-metrics-header = Income from Mail Deliveries
 mail-metrics-opened = Earnings (Opened)
@@ -131,3 +145,16 @@ mail-metrics-money-header = Spesos
 mail-metrics-total = Total
 mail-metrics-progress = {$opened} out of {$total} packages opened!
 mail-metrics-progress-percent = Success rate: {$successRate}%
+
+## StockTrading
+
+# General
+stock-trading-program-name = StockTrading
+stock-trading-title = Intergalactic Stock Market
+stock-trading-balance = Balance: {$balance} credits
+stock-trading-no-entries = No entries
+stock-trading-owned-shares = Owned: {$shares}
+stock-trading-buy-button = Buy
+stock-trading-sell-button = Sell
+stock-trading-amount-placeholder = Amount
+stock-trading-price-history = Price History
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/cartridges.yml
index 81e11d9d084..94b9210e60c 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/cartridges.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/cartridges.yml
@@ -59,3 +59,27 @@
     icon:
       sprite: Objects/Specific/Mail/mail.rsi
       state: icon
+
+- type: entity
+  parent: BaseItem
+  id: StockTradingCartridge
+  name: StockTrading cartridge
+  description: A cartridge that tracks the intergalactic stock market.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Devices/cartridge.rsi
+    state: cart-stonk
+  - type: Icon
+    sprite: DeltaV/Objects/Devices/cartridge.rsi
+    state: cart-mail
+  - type: UIFragment
+    ui: !type:StockTradingUi
+  - type: StockTradingCartridge
+  - type: Cartridge
+    programName: stock-trading-program-name
+    icon:
+      sprite: DeltaV/Misc/program_icons.rsi
+      state: stock_trading
+  - type: BankClient
+  - type: AccessReader # This is so that we can restrict who can buy stocks
+    access: [["Orders"]]
diff --git a/Resources/Prototypes/DeltaV/Entities/Stations/base.yml b/Resources/Prototypes/DeltaV/Entities/Stations/base.yml
new file mode 100644
index 00000000000..fe31706b262
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Stations/base.yml
@@ -0,0 +1,21 @@
+- type: entity
+  id: BaseStationStockMarket
+  abstract: true
+  components:
+  - type: StationStockMarket
+    companies:
+    - displayName: stock-trading-company-nanotrasen
+      basePrice: 100
+      currentPrice: 100
+    - displayName: stock-trading-company-gorlex
+      basePrice: 75
+      currentPrice: 75
+    - displayName: stock-trading-company-interdyne
+      basePrice: 300
+      currentPrice: 300
+    - displayName: stock-trading-company-fishinc
+      basePrice: 25
+      currentPrice: 25
+    - displayName: stock-trading-company-donk
+      basePrice: 90
+      currentPrice: 90
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 2166f554470..f4abe6ba213 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -375,6 +375,7 @@
       - NotekeeperCartridge
       - NewsReaderCartridge
       - MailMetricsCartridge
+      - StockTradingCartridge # DeltaV - StockTrading
 
 - type: entity
   name: LO special PDA unit # DeltaV - Logistics Department replacing Cargo
@@ -395,7 +396,8 @@
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
-      - MailMetricsCartridge
+      - MailMetricsCartridge # DeltaV - MailMetrics courier tracker
+      - StockTradingCartridge # DeltaV - StockTrading
 
 - type: entity
   parent: BasePDA
@@ -410,6 +412,12 @@
     borderColor: "#e39751"
   - type: Icon
     state: pda-cargo
+  - type: CartridgeLoader # DeltaV
+    preinstalled:
+    - CrewManifestCartridge
+    - NotekeeperCartridge
+    - NewsReaderCartridge
+    - StockTradingCartridge # DeltaV - StockTrading
 
 - type: entity
   parent: BasePDA
@@ -954,6 +962,7 @@
       - NotekeeperCartridge
       - NewsReaderCartridge
       - LogProbeCartridge
+      - StockTradingCartridge # DeltaV - StockTrading
 
 - type: entity
   parent: CentcomPDA
@@ -1171,6 +1180,12 @@
     borderColor: "#3f3f74"
   - type: Icon
     state: pda-reporter
+  - type: CartridgeLoader # DeltaV
+    preinstalled:
+    - CrewManifestCartridge
+    - NotekeeperCartridge
+    - NewsReaderCartridge
+    - StockTradingCartridge # DeltaV - StockTrading
 
 - type: entity
   parent: BasePDA
diff --git a/Resources/Prototypes/Entities/Stations/nanotrasen.yml b/Resources/Prototypes/Entities/Stations/nanotrasen.yml
index 9f4adce96ae..d9a41967e42 100644
--- a/Resources/Prototypes/Entities/Stations/nanotrasen.yml
+++ b/Resources/Prototypes/Entities/Stations/nanotrasen.yml
@@ -27,6 +27,7 @@
     - BaseStationNanotrasen
     - BaseRandomStation
     - BaseStationMail # Nyano component, required for station mail to function
+    - BaseStationStockMarket # DeltaV
   categories: [ HideSpawnMenu ]
   components:
     - type: Transform
diff --git a/Resources/Textures/DeltaV/Misc/program_icons.rsi/meta.json b/Resources/Textures/DeltaV/Misc/program_icons.rsi/meta.json
new file mode 100644
index 00000000000..1a7d2a16194
--- /dev/null
+++ b/Resources/Textures/DeltaV/Misc/program_icons.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "stock_trading made by Malice",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "stock_trading"
+      }
+    ]
+}
diff --git a/Resources/Textures/DeltaV/Misc/program_icons.rsi/stock_trading.png b/Resources/Textures/DeltaV/Misc/program_icons.rsi/stock_trading.png
new file mode 100644
index 0000000000000000000000000000000000000000..251b46a3f83cbe27088978ca4e58413d8ed9fe19
GIT binary patch
literal 1012
zcmV<Q0}K3#P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm001@A
z001@A0bXV02mk;Bj7da6R9FeMSHEi%K@@&-8{t43!PpoB3IQ#G;bLba*a$XilhV#g
zY_+vh5d0G)rHxwJ2sV~E#1sbXl2c19RD^gtzVFSv-M2Hlo4W%C_U7&T^}TuT&CH&o
zSw=DPv#6=g&u3#LWj=AAT!Ud=It8LrTq=nQM{bR0cH)MP{GVX%hLqBiCoe>H=4?=*
zlOrL1eF_1!1=1Y=z}*FYhD8b_UXuVOkGCsu?;U-egrrF@97tCXgBWXbLdpjlyk-W+
z02rP=nq|6j1&8{V1Aab^>G;Kv4e;#9Ga%sWR_90>t5<LUg2s%Ye0hnPu%%cMf&NI^
z*O0s3T8p|Zf!Z%H*Cjaj$kXL}aFJ(a4##%&Fw;zki|=uFm|ax|z&%a0gia4|v((+{
z1S|QqX-@+Zg~2-Q-vAy_2mleCUJWZBT@{`G_4DJf={bO+_Ja*aqbpH*jA-Xgplz*t
zXl=ws%A+^U2xKb{w#eTK=f%NqWFYMKW>^cp0RUhM2scW%1qQjJblceyjNd_L=3x&b
zYoy>S5ATq_xm}6e%MmrVVI^9O004#tqF$75!Bxf?kRvyAzn=4(*I6FBW&A!n^ToKQ
zAG(fi8-RPY#eVnv(HTHVv>`QYo*T|yhm{*~M&|nAQsZri+b-GrQhVMBgog*@Mn}6i
z2xBmbPM5yZV8vhI>_Mdd!Yn~VmT6485^FFoUu`*nsjq5=9?(9JSx*g~`HV<Gq>k!|
z=Spt<7<s6B{GJg1Q{SBd81B5S%>C-!iUy&n><of+s(_3>Z0*R;0V|EPbp)1zTh&y@
z%DQZ*+>LiZs%_p=$8P_*k=A5eP%7<{X%EQFB=t8v&<-B@L7dxKGo6+LI$7Oo|BPAp
zKnOrX<~iMJnRBx<j9H^ReJck9KQ7*e_y(*$!?Km@-UX5cwp$glc?Q>?rsMn^=miIW
z1+~G<18#If2EgE3(cf<Vp^&uW#L~K1y6e8^;s;x#y(Is+!0G{8p99Rm2ZD~Q<|=5L
zH4~fHno{N0Tt4*n1_};#odHz}-v`nl%IchRfLzs<EY{sB)frGOQd90Cuxw|jN;O;O
z6_W|e4?%hyI(Fr%o(BMl1n~j2pNe9#->aSgzq+b%Z}0<f=^4CZ{4MF!vTp;2G%o?T
zI`FYF$DdO%tDDW!@_An1VM*Vf7V0vc`vXvI^u;10c6y)bKOB0B{&6QW*Z=?k4rN$L
iW=%~1DgXcg2mk;800000(o>TF0000<MNUMnLSTX^b<p?#

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Devices/cartridge.rsi/cart-stonk.png b/Resources/Textures/DeltaV/Objects/Devices/cartridge.rsi/cart-stonk.png
new file mode 100644
index 0000000000000000000000000000000000000000..ddfed6e915ca1e95bc76a7a85de878f1358a2ab9
GIT binary patch
literal 367
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCik_0(?STIXOAi)zzh>q!<_+7))m{Fa|R+rOk9uV_*niFzK9WFU!E-$zV2T
zrh~>z2gUW17#K_^+}OgPtgLKcU?3<c2sEZckj)oJiIoKT1^>qe7#J@dcmh<xS>O>_
z%)r2R7=#&*=dVZs3RZc#IEGmGzrApit3g4;HSls@YUXyw|Np~{r?Bl(+PmG6C3ca9
z(^B~*b_^di^zSufJX!lJ>U^<4(AEo5$6ri&;=s?$lPvQhQlLMo-P2krmg!tl*%qCU
z9Z3vlEW{gMT~gK+{C~n-Ct~}ZQ%v>m+#lXw@ayW*x(TZq1j-CLJQeGAJyQm{f-g0~
dGtJkRK?}&{0Adih6g(M3dAj<!taD0e0sy|LerEsx

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Devices/cartridge.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Devices/cartridge.rsi/meta.json
index 4a4ba3352f8..e7d607aa4a8 100644
--- a/Resources/Textures/DeltaV/Objects/Devices/cartridge.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Objects/Devices/cartridge.rsi/meta.json
@@ -12,6 +12,9 @@
         },
         {
             "name": "cart-mail"
+        },
+        {
+            "name": "cart-stonk"
         }
     ]
 }

From ec8f9f526691ab58bd402f9aba058eeed708c5bf Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Sat, 13 Jul 2024 06:11:14 +0000
Subject: [PATCH 293/366] make cargo balance ui updating its own component
 (#28295)

* add BankClientComponent and event

* query BankClient instead of hardcoded CargoOrderConsole for updating

* add BankClient to all ordering consoles

* :trollface:

* add Balance field to BankClient

* forgor

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

* m

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
---
 .../Cargo/Systems/CargoSystem.Orders.cs       | 10 +++++++
 Content.Server/Cargo/Systems/CargoSystem.cs   | 14 +++++-----
 .../Cargo/Components/BankClientComponent.cs   | 26 +++++++++++++++++++
 .../Entities/Mobs/Player/admin_ghost.yml      |  1 +
 .../Entities/Objects/Misc/paper.yml           |  1 +
 .../Machines/Computers/computers.yml          |  1 +
 6 files changed, 46 insertions(+), 7 deletions(-)
 create mode 100644 Content.Shared/Cargo/Components/BankClientComponent.cs

diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
index ac7aadfef15..35bd53da273 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
@@ -38,6 +38,7 @@ private void InitializeConsole()
             SubscribeLocalEvent<CargoOrderConsoleComponent, BoundUIOpenedEvent>(OnOrderUIOpened);
             SubscribeLocalEvent<CargoOrderConsoleComponent, ComponentInit>(OnInit);
             SubscribeLocalEvent<CargoOrderConsoleComponent, InteractUsingEvent>(OnInteractUsing);
+            SubscribeLocalEvent<CargoOrderConsoleComponent, BankBalanceUpdatedEvent>(OnOrderBalanceUpdated);
             Reset();
         }
 
@@ -317,6 +318,15 @@ private void OnOrderUIOpened(EntityUid uid, CargoOrderConsoleComponent component
 
         #endregion
 
+
+        private void OnOrderBalanceUpdated(Entity<CargoOrderConsoleComponent> ent, ref BankBalanceUpdatedEvent args)
+        {
+            if (!_uiSystem.IsUiOpen(ent.Owner, CargoConsoleUiKey.Orders))
+                return;
+
+            UpdateOrderState(ent, args.Station);
+        }
+
         private void UpdateOrderState(EntityUid consoleUid, EntityUid? station)
         {
             if (station == null ||
diff --git a/Content.Server/Cargo/Systems/CargoSystem.cs b/Content.Server/Cargo/Systems/CargoSystem.cs
index 16597fa1bcd..32fae1bf108 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.cs
@@ -90,18 +90,18 @@ public override void Update(float frameTime)
     public void UpdateBankAccount(EntityUid uid, StationBankAccountComponent component, int balanceAdded)
     {
         component.Balance += balanceAdded;
-        var query = EntityQueryEnumerator<CargoOrderConsoleComponent>();
+        var query = EntityQueryEnumerator<BankClientComponent, TransformComponent>();
 
-        while (query.MoveNext(out var oUid, out var _))
+        var ev = new BankBalanceUpdatedEvent(uid, component.Balance);
+        while (query.MoveNext(out var client, out var comp, out var xform))
         {
-            if (!_uiSystem.IsUiOpen(oUid, CargoConsoleUiKey.Orders))
-                continue;
-
-            var station = _station.GetOwningStation(oUid);
+            var station = _station.GetOwningStation(client, xform);
             if (station != uid)
                 continue;
 
-            UpdateOrderState(oUid, station);
+            comp.Balance = component.Balance;
+            Dirty(client, comp);
+            RaiseLocalEvent(client, ref ev);
         }
     }
 }
diff --git a/Content.Shared/Cargo/Components/BankClientComponent.cs b/Content.Shared/Cargo/Components/BankClientComponent.cs
new file mode 100644
index 00000000000..4fd70855034
--- /dev/null
+++ b/Content.Shared/Cargo/Components/BankClientComponent.cs
@@ -0,0 +1,26 @@
+using Content.Shared.Cargo;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Cargo.Components;
+
+/// <summary>
+/// Makes an entity a client of the station's bank account.
+/// When its balance changes it will have <see cref="BankBalanceUpdatedEvent"/> raised on it.
+/// Other systems can then use this for logic or to update ui states.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedCargoSystem))]
+[AutoGenerateComponentState]
+public sealed partial class BankClientComponent : Component
+{
+    /// <summary>
+    /// The balance updated for the last station this entity was a part of.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int Balance;
+}
+
+/// <summary>
+/// Raised on an entity with <see cref="BankClientComponent"/> when the bank's balance is updated.
+/// </summary>
+[ByRefEvent]
+public record struct BankBalanceUpdatedEvent(EntityUid Station, int Balance);
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index df8ebc8a297..c91b209e8c3 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -78,6 +78,7 @@
   - type: RadarConsole
     followEntity: true
   - type: CargoOrderConsole
+  - type: BankClient
   - type: CrewMonitoringConsole
   - type: GeneralStationRecordConsole
     canDeleteEntries: true
diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index 199b41a3bc4..8823ae39f5d 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -735,6 +735,7 @@
           tags:
           - Write
   - type: CargoOrderConsole
+  - type: BankClient
   - type: ActivatableUI
     verbText: qm-clipboard-computer-verb-text
     key: enum.CargoConsoleUiKey.Orders
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index df1a56866ba..4e499cc381b 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -759,6 +759,7 @@
     - map: ["computerLayerKeys"]
       state: tech_key
   - type: CargoOrderConsole
+  - type: BankClient
   - type: ActiveRadio
     channels:
     - Supply

From 67e917d7a0d04e13c94a4c40331bd43fa313bc98 Mon Sep 17 00:00:00 2001
From: Milon <milonpl.git@proton.me>
Date: Tue, 10 Dec 2024 21:33:58 +0100
Subject: [PATCH 294/366] stocks trading (#2103)

* sort of works

* fix

* oh right

* admin abuse

* buy/sell events

* price history, better error handling

* joke

* buying and selling

* access handling

* IT'S FINALLY REAL

* fixes

* AAAAAAAAAAAAAAAAA

* i keep fucking forgetting things

* FUCKING

* move company structs out of the comp

* ok im going to sleep

* Revert "oh right"

This reverts commit 8681e5a07b4d059fa7db718dd3ec6f25f0ad05d9.

* Revert "fix"

This reverts commit 3992ec99fd96dc7b2df0767e1b83d5418d86a248.

* address reviews
---
 .../UI/AgentIDCardBoundUserInterface.cs       |   8 +
 .../Access/UI/AgentIDCardWindow.xaml          |   4 +
 .../Access/UI/AgentIDCardWindow.xaml.cs       |  35 ++
 .../CartridgeLoader/Cartridges/LogProbeUi.cs  |   2 +-
 .../Cartridges/LogProbeUiFragment.xaml        |  28 +-
 .../Cartridges/LogProbeUiFragment.xaml.cs     | 109 +++-
 .../Cartridges/NanoChatEntry.xaml             |  48 ++
 .../Cartridges/NanoChatEntry.xaml.cs          |  39 ++
 .../Cartridges/NanoChatLogEntry.xaml          |  21 +
 .../Cartridges/NanoChatLogEntry.xaml.cs       |  17 +
 .../Cartridges/NanoChatMessageBubble.xaml     |  55 ++
 .../Cartridges/NanoChatMessageBubble.xaml.cs  |  62 +++
 .../CartridgeLoader/Cartridges/NanoChatUi.cs  |  43 ++
 .../Cartridges/NanoChatUiFragment.xaml        | 167 ++++++
 .../Cartridges/NanoChatUiFragment.xaml.cs     | 254 +++++++++
 .../Cartridges/NewChatPopup.xaml              |  52 ++
 .../Cartridges/NewChatPopup.xaml.cs           |  87 +++
 .../DeltaV/NanoChat/NanoChatSystem.cs         |   5 +
 .../Access/Systems/AgentIDCardSystem.cs       |  53 +-
 .../Cartridges/LogProbeCartridgeComponent.cs  |   7 +
 .../Cartridges/LogProbeCartridgeSystem.cs     |  16 +-
 .../LogProbeCartridgeSystem.NanoChat.cs       |  82 +++
 .../Cartridges/NanoChatCartridgeComponent.cs  |  26 +
 .../Cartridges/NanoChatCartridgeSystem.cs     | 514 ++++++++++++++++++
 .../DeltaV/NanoChat/NanoChatSystem.cs         | 130 +++++
 .../Access/SharedAgentIDCardSystem.cs         |  16 +-
 .../Cartridges/LogProbeUiState.cs             |  11 +-
 .../Cartridges/NanoChatUiMessageEvent.cs      | 166 ++++++
 .../Cartridges/NanoChatUiState.cs             |  30 +
 .../DeltaV/NanoChat/NanoChatCardComponent.cs  |  52 ++
 .../DeltaV/NanoChat/SharedNanoChatSystem.cs   | 273 ++++++++++
 .../components/agent-id-card-component.ftl    |   1 +
 .../deltav/cartridge-loader/cartridges.ftl    |  42 ++
 .../components/nanochat-card-component.ftl    |   7 +
 .../Entities/Objects/Devices/cartridges.yml   |  21 +
 .../DeltaV/Entities/Objects/Devices/pda.yml   |   1 +
 .../DeltaV/name_identifier_groups.yml         |   4 +
 .../Entities/Objects/Devices/pda.yml          |  90 ++-
 .../Objects/Misc/identification_cards.yml     |   1 +
 .../Entities/Objects/Devices/pda.yml          |   2 +
 .../Interface/VerbIcons/ATTRIBUTION.txt       |   2 +
 .../DeltaV/Interface/VerbIcons/bell.svg       |   5 +
 .../DeltaV/Interface/VerbIcons/bell.svg.png   | Bin 0 -> 720 bytes
 .../DeltaV/Interface/VerbIcons/bell_muted.png | Bin 0 -> 355 bytes
 .../DeltaV/Misc/program_icons.rsi/meta.json   |  15 +-
 .../Misc/program_icons.rsi/nanochat.png       | Bin 0 -> 725 bytes
 .../Devices/cartridge.rsi/cart-chat.png       | Bin 0 -> 419 bytes
 .../Objects/Devices/cartridge.rsi/meta.json   |   5 +-
 48 files changed, 2573 insertions(+), 35 deletions(-)
 create mode 100644 Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml
 create mode 100644 Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml.cs
 create mode 100644 Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatLogEntry.xaml
 create mode 100644 Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatLogEntry.xaml.cs
 create mode 100644 Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatMessageBubble.xaml
 create mode 100644 Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatMessageBubble.xaml.cs
 create mode 100644 Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUi.cs
 create mode 100644 Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml
 create mode 100644 Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs
 create mode 100644 Content.Client/DeltaV/CartridgeLoader/Cartridges/NewChatPopup.xaml
 create mode 100644 Content.Client/DeltaV/CartridgeLoader/Cartridges/NewChatPopup.xaml.cs
 create mode 100644 Content.Client/DeltaV/NanoChat/NanoChatSystem.cs
 create mode 100644 Content.Server/DeltaV/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.NanoChat.cs
 create mode 100644 Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeComponent.cs
 create mode 100644 Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
 create mode 100644 Content.Server/DeltaV/NanoChat/NanoChatSystem.cs
 create mode 100644 Content.Shared/DeltaV/CartridgeLoader/Cartridges/NanoChatUiMessageEvent.cs
 create mode 100644 Content.Shared/DeltaV/CartridgeLoader/Cartridges/NanoChatUiState.cs
 create mode 100644 Content.Shared/DeltaV/NanoChat/NanoChatCardComponent.cs
 create mode 100644 Content.Shared/DeltaV/NanoChat/SharedNanoChatSystem.cs
 create mode 100644 Resources/Locale/en-US/deltav/access/components/agent-id-card-component.ftl
 create mode 100644 Resources/Locale/en-US/deltav/nanochat/components/nanochat-card-component.ftl
 create mode 100644 Resources/Prototypes/DeltaV/name_identifier_groups.yml
 create mode 100644 Resources/Textures/DeltaV/Interface/VerbIcons/ATTRIBUTION.txt
 create mode 100644 Resources/Textures/DeltaV/Interface/VerbIcons/bell.svg
 create mode 100644 Resources/Textures/DeltaV/Interface/VerbIcons/bell.svg.png
 create mode 100644 Resources/Textures/DeltaV/Interface/VerbIcons/bell_muted.png
 create mode 100644 Resources/Textures/DeltaV/Misc/program_icons.rsi/nanochat.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Devices/cartridge.rsi/cart-chat.png

diff --git a/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs b/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs
index ce675ad2c6b..09724f14a2c 100644
--- a/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs
+++ b/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs
@@ -27,6 +27,13 @@ protected override void Open()
             _window.OnNameChanged += OnNameChanged;
             _window.OnJobChanged += OnJobChanged;
             _window.OnJobIconChanged += OnJobIconChanged;
+            _window.OnNumberChanged += OnNumberChanged; // DeltaV
+        }
+
+        // DeltaV - Add number change handler
+        private void OnNumberChanged(uint newNumber)
+        {
+            SendMessage(new AgentIDCardNumberChangedMessage(newNumber));
         }
 
         private void OnNameChanged(string newName)
@@ -57,6 +64,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
             _window.SetCurrentName(cast.CurrentName);
             _window.SetCurrentJob(cast.CurrentJob);
             _window.SetAllowedIcons(cast.CurrentJobIconId);
+            _window.SetCurrentNumber(cast.CurrentNumber); // DeltaV
         }
     }
 }
diff --git a/Content.Client/Access/UI/AgentIDCardWindow.xaml b/Content.Client/Access/UI/AgentIDCardWindow.xaml
index 7d091e4e165..a2ddd1c417d 100644
--- a/Content.Client/Access/UI/AgentIDCardWindow.xaml
+++ b/Content.Client/Access/UI/AgentIDCardWindow.xaml
@@ -6,6 +6,10 @@
         <LineEdit Name="NameLineEdit" />
         <Label Name="CurrentJob" Text="{Loc 'agent-id-card-current-job'}" />
         <LineEdit Name="JobLineEdit" />
+        <!-- DeltaV - Add NanoChat number field -->
+        <Label Name="CurrentNumber" Text="{Loc 'agent-id-card-current-number'}" />
+        <LineEdit Name="NumberLineEdit" PlaceHolder="#0000" />
+        <!-- DeltaV end -->
         <Label Text="{Loc 'agent-id-card-job-icon-label'}"/>
         <GridContainer Name="IconGrid" Columns="10">
             <!-- Job icon buttons are generated in the code -->
diff --git a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
index 320bb88a67e..a342013d314 100644
--- a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
+++ b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
@@ -21,9 +21,13 @@ public sealed partial class AgentIDCardWindow : DefaultWindow
 
         private const int JobIconColumnCount = 10;
 
+        private const int MaxNumberLength = 4; // DeltaV - Same as NewChatPopup
+
         public event Action<string>? OnNameChanged;
         public event Action<string>? OnJobChanged;
 
+        public event Action<uint>? OnNumberChanged; // DeltaV - Add event for number changes
+
         public event Action<ProtoId<JobIconPrototype>>? OnJobIconChanged;
 
         public AgentIDCardWindow()
@@ -37,6 +41,37 @@ public AgentIDCardWindow()
 
             JobLineEdit.OnTextEntered += e => OnJobChanged?.Invoke(e.Text);
             JobLineEdit.OnFocusExit += e => OnJobChanged?.Invoke(e.Text);
+
+            // DeltaV - Add handlers for number changes
+            NumberLineEdit.OnTextEntered += OnNumberEntered;
+            NumberLineEdit.OnFocusExit += OnNumberEntered;
+
+            // DeltaV - Filter to only allow digits
+            NumberLineEdit.OnTextChanged += args =>
+            {
+                if (args.Text.Length > MaxNumberLength)
+                {
+                    NumberLineEdit.Text = args.Text[..MaxNumberLength];
+                }
+
+                // Filter to digits only
+                var newText = string.Concat(args.Text.Where(char.IsDigit));
+                if (newText != args.Text)
+                    NumberLineEdit.Text = newText;
+            };
+        }
+
+        // DeltaV - Add number validation and event
+        private void OnNumberEntered(LineEdit.LineEditEventArgs args)
+        {
+            if (uint.TryParse(args.Text, out var number) && number > 0)
+                OnNumberChanged?.Invoke(number);
+        }
+
+        // DeltaV - Add setter for current number
+        public void SetCurrentNumber(uint? number)
+        {
+            NumberLineEdit.Text = number?.ToString("D4") ?? "";
         }
 
         public void SetAllowedIcons(string currentJobIconId)
diff --git a/Content.Client/CartridgeLoader/Cartridges/LogProbeUi.cs b/Content.Client/CartridgeLoader/Cartridges/LogProbeUi.cs
index d28d3228c94..aaf3900beee 100644
--- a/Content.Client/CartridgeLoader/Cartridges/LogProbeUi.cs
+++ b/Content.Client/CartridgeLoader/Cartridges/LogProbeUi.cs
@@ -23,6 +23,6 @@ public override void UpdateState(BoundUserInterfaceState state)
         if (state is not LogProbeUiState logProbeUiState)
             return;
 
-        _fragment?.UpdateState(logProbeUiState.PulledLogs);
+        _fragment?.UpdateState(logProbeUiState); // DeltaV - just take the state
     }
 }
diff --git a/Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml b/Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml
index d12fb55cdce..a0769590e91 100644
--- a/Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml
+++ b/Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml
@@ -9,10 +9,30 @@
                               BorderColor="#5a5a5a"
                               BorderThickness="0 0 0 1"/>
         </PanelContainer.PanelOverride>
-        <BoxContainer Orientation="Horizontal" Margin="4 8">
-            <Label Align="Right" SetWidth="26" ClipText="True" Text="{Loc 'log-probe-label-number'}"/>
-            <Label Align="Center" SetWidth="100" ClipText="True" Text="{Loc 'log-probe-label-time'}"/>
-            <Label Align="Left" SetWidth="390" ClipText="True" Text="{Loc 'log-probe-label-accessor'}"/>
+        <BoxContainer Orientation="Vertical" Margin="4 8">
+            <!-- DeltaV begin - Add title label -->
+            <Label Name="TitleLabel"
+                   Text="{Loc 'log-probe-header-access'}"
+                   StyleClasses="LabelHeading"
+                   HorizontalAlignment="Center"
+                   Margin="0 0 0 8"/>
+            <!-- DeltaV end -->
+
+            <!-- DeltaV begin - Add card number display -->
+            <Label Name="CardNumberLabel"
+                   StyleClasses="LabelSubText"
+                   HorizontalAlignment="Center"
+                   Margin="0 0 0 8"
+                   Visible="False"/>
+            <!-- DeltaV end -->
+
+            <!-- DeltaV begin - Adjust column headers -->
+            <BoxContainer Orientation="Horizontal">
+                <Label Align="Right" SetWidth="26" ClipText="True" Text="{Loc 'log-probe-label-number'}"/>
+                <Label Align="Center" SetWidth="100" ClipText="True" Text="{Loc 'log-probe-label-time'}"/>
+                <Label Name="ContentLabel" Align="Left" SetWidth="390" ClipText="True" Text="{Loc 'log-probe-label-accessor'}"/>
+            </BoxContainer>
+            <!-- DeltaV end -->
         </BoxContainer>
     </PanelContainer>
     <ScrollContainer VerticalExpand="True" HScrollEnabled="True">
diff --git a/Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml.cs b/Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml.cs
index b22e0bc1964..5fa93bb40db 100644
--- a/Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml.cs
+++ b/Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml.cs
@@ -1,4 +1,7 @@
-using Content.Shared.CartridgeLoader.Cartridges;
+using System.Linq; // DeltaV
+using Content.Client.DeltaV.CartridgeLoader.Cartridges; // DeltaV
+using Content.Shared.CartridgeLoader.Cartridges;
+using Content.Shared.DeltaV.CartridgeLoader.Cartridges; // DeltaV
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
@@ -13,10 +16,112 @@ public LogProbeUiFragment()
         RobustXamlLoader.Load(this);
     }
 
-    public void UpdateState(List<PulledAccessLog> logs)
+    // DeltaV begin - Update to handle both types of data
+    public void UpdateState(LogProbeUiState state)
     {
         ProbedDeviceContainer.RemoveAllChildren();
 
+        if (state.NanoChatData != null)
+        {
+            SetupNanoChatView(state.NanoChatData.Value);
+            DisplayNanoChatData(state.NanoChatData.Value);
+        }
+        else
+        {
+            SetupAccessLogView();
+            if (state.PulledLogs.Count > 0)
+                DisplayAccessLogs(state.PulledLogs);
+        }
+    }
+
+    private void SetupNanoChatView(NanoChatData data)
+    {
+        TitleLabel.Text = Loc.GetString("log-probe-header-nanochat");
+        ContentLabel.Text = Loc.GetString("log-probe-label-message");
+
+        // Show card info if available
+        var cardInfo = new List<string>();
+        if (data.CardNumber != null)
+            cardInfo.Add(Loc.GetString("log-probe-card-number", ("number", $"#{data.CardNumber:D4}")));
+
+        // Add recipient count
+        cardInfo.Add(Loc.GetString("log-probe-recipients", ("count", data.Recipients.Count)));
+
+        CardNumberLabel.Text = string.Join(" | ", cardInfo);
+        CardNumberLabel.Visible = true;
+    }
+
+    private void SetupAccessLogView()
+    {
+        TitleLabel.Text = Loc.GetString("log-probe-header-access");
+        ContentLabel.Text = Loc.GetString("log-probe-label-accessor");
+        CardNumberLabel.Visible = false;
+    }
+
+    private void DisplayNanoChatData(NanoChatData data)
+    {
+        // First add a recipient list entry
+        var recipientsList = Loc.GetString("log-probe-recipient-list") + "\n" + string.Join("\n",
+            data.Recipients.Values
+                .OrderBy(r => r.Name)
+                .Select(r => $"    {r.Name}" +
+                             (string.IsNullOrEmpty(r.JobTitle) ? "" : $" ({r.JobTitle})") +
+                             $" | #{r.Number:D4}"));
+
+        var recipientsEntry = new LogProbeUiEntry(0, "---", recipientsList);
+        ProbedDeviceContainer.AddChild(recipientsEntry);
+
+        var count = 1;
+        foreach (var (partnerId, messages) in data.Messages)
+        {
+            // Show only successfully delivered incoming messages
+            var incomingMessages = messages
+                .Where(msg => msg.SenderId == partnerId && !msg.DeliveryFailed)
+                .OrderByDescending(msg => msg.Timestamp);
+
+            foreach (var msg in incomingMessages)
+            {
+                var messageText = Loc.GetString("log-probe-message-format",
+                    ("sender", $"#{msg.SenderId:D4}"),
+                    ("recipient", $"#{data.CardNumber:D4}"),
+                    ("content", msg.Content));
+
+                var entry = new NanoChatLogEntry(
+                    count,
+                    TimeSpan.FromSeconds(Math.Truncate(msg.Timestamp.TotalSeconds)).ToString(),
+                    messageText);
+
+                ProbedDeviceContainer.AddChild(entry);
+                count++;
+            }
+
+            // Show only successfully delivered outgoing messages
+            var outgoingMessages = messages
+                .Where(msg => msg.SenderId == data.CardNumber && !msg.DeliveryFailed)
+                .OrderByDescending(msg => msg.Timestamp);
+
+            foreach (var msg in outgoingMessages)
+            {
+                var messageText = Loc.GetString("log-probe-message-format",
+                    ("sender", $"#{msg.SenderId:D4}"),
+                    ("recipient", $"#{partnerId:D4}"),
+                    ("content", msg.Content));
+
+                var entry = new NanoChatLogEntry(
+                    count,
+                    TimeSpan.FromSeconds(Math.Truncate(msg.Timestamp.TotalSeconds)).ToString(),
+                    messageText);
+
+                ProbedDeviceContainer.AddChild(entry);
+                count++;
+            }
+        }
+    }
+    // DeltaV end
+
+    // DeltaV - Handle this in a separate method
+    private void DisplayAccessLogs(List<PulledAccessLog> logs)
+    {
         //Reverse the list so the oldest entries appear at the bottom
         logs.Reverse();
 
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml
new file mode 100644
index 00000000000..0b136133624
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml
@@ -0,0 +1,48 @@
+<BoxContainer
+    xmlns="https://spacestation14.io"
+    xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+    HorizontalExpand="True">
+    <Button Name="ChatButton"
+            StyleClasses="ButtonSquare"
+            HorizontalExpand="True"
+            MaxSize="137 64"
+            Margin="0 1">
+        <BoxContainer Orientation="Horizontal"
+                      HorizontalExpand="True"
+                      VerticalExpand="True"
+                      MinWidth="132"
+                      Margin="6 4"
+                      VerticalAlignment="Center">
+            <!-- Unread indicator dot -->
+            <PanelContainer Name="UnreadIndicator"
+                            MinSize="8 8"
+                            MaxSize="8 8"
+                            VerticalAlignment="Center"
+                            Margin="0 0 6 0">
+                <PanelContainer.PanelOverride>
+                    <graphics:StyleBoxFlat
+                        BackgroundColor="#17c622"
+                        BorderColor="#0f7a15" />
+                </PanelContainer.PanelOverride>
+            </PanelContainer>
+
+            <!-- Text container -->
+            <BoxContainer Orientation="Vertical"
+                          HorizontalExpand="True"
+                          VerticalExpand="True"
+                          VerticalAlignment="Center">
+                <RichTextLabel Name="NameLabel"
+                               StyleClasses="LabelHeading"
+                               HorizontalExpand="True"
+                               HorizontalAlignment="Center"
+                               VerticalAlignment="Center"
+                               Margin="0 -2 0 0" />
+                <Label Name="JobLabel"
+                       StyleClasses="LabelSubText"
+                       HorizontalExpand="True"
+                       ClipText="False"
+                       HorizontalAlignment="Center" />
+            </BoxContainer>
+        </BoxContainer>
+    </Button>
+</BoxContainer>
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml.cs
new file mode 100644
index 00000000000..ff4ea9ba9c1
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml.cs
@@ -0,0 +1,39 @@
+using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+
+[GenerateTypedNameReferences]
+public sealed partial class NanoChatEntry : BoxContainer
+{
+    public event Action<uint>? OnPressed;
+    private uint _number;
+    private Action<EventArgs>? _pressHandler;
+
+    public NanoChatEntry()
+    {
+        RobustXamlLoader.Load(this);
+    }
+
+    public void SetRecipient(NanoChatRecipient recipient, uint number, bool isSelected)
+    {
+        // Remove old handler if it exists
+        if (_pressHandler != null)
+            ChatButton.OnPressed -= _pressHandler;
+
+        _number = number;
+
+        // Create and store new handler
+        _pressHandler = _ => OnPressed?.Invoke(_number);
+        ChatButton.OnPressed += _pressHandler;
+
+        NameLabel.Text = recipient.Name;
+        JobLabel.Text = recipient.JobTitle ?? "";
+        JobLabel.Visible = !string.IsNullOrEmpty(recipient.JobTitle);
+        UnreadIndicator.Visible = recipient.HasUnread;
+
+        ChatButton.ModulateSelfOverride = isSelected ? NanoChatMessageBubble.OwnMessageColor : null;
+    }
+}
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatLogEntry.xaml b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatLogEntry.xaml
new file mode 100644
index 00000000000..c87478d6301
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatLogEntry.xaml
@@ -0,0 +1,21 @@
+<BoxContainer xmlns="https://spacestation14.io"
+              xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+              Margin="4"
+              Orientation="Vertical">
+    <BoxContainer Orientation="Horizontal">
+        <Label Name="NumberLabel"
+               Align="Right"
+               SetWidth="26"
+               ClipText="True" />
+        <Label Name="TimeLabel"
+               Align="Center"
+               SetWidth="100"
+               ClipText="True" />
+        <Label Name="MessageLabel"
+               Align="Left"
+               MinWidth="390"
+               HorizontalExpand="True"
+               ClipText="False" />
+    </BoxContainer>
+    <customControls:HSeparator Margin="0 5 0 5" />
+</BoxContainer>
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatLogEntry.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatLogEntry.xaml.cs
new file mode 100644
index 00000000000..b94ea1a18aa
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatLogEntry.xaml.cs
@@ -0,0 +1,17 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+
+[GenerateTypedNameReferences]
+public sealed partial class NanoChatLogEntry : BoxContainer
+{
+    public NanoChatLogEntry(int number, string time, string message)
+    {
+        RobustXamlLoader.Load(this);
+        NumberLabel.Text = number.ToString();
+        TimeLabel.Text = time;
+        MessageLabel.Text = message;
+    }
+}
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatMessageBubble.xaml b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatMessageBubble.xaml
new file mode 100644
index 00000000000..84daa2f1c59
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatMessageBubble.xaml
@@ -0,0 +1,55 @@
+<cartridges:NanoChatMessageBubble
+    xmlns="https://spacestation14.io"
+    xmlns:cartridges="clr-namespace:Content.Client.DeltaV.CartridgeLoader.Cartridges"
+    xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+    HorizontalExpand="True">
+
+    <BoxContainer Name="MessageContainer"
+                  Orientation="Horizontal"
+                  HorizontalExpand="True">
+        <!-- Left spacer for other's messages -->
+        <Control Name="LeftSpacer"
+                 MinSize="12 0" />
+
+        <!-- Message panel -->
+        <BoxContainer Name="MessageBox"
+                      Orientation="Vertical"
+                      MaxWidth="320"
+                      HorizontalExpand="True">
+            <PanelContainer Name="MessagePanel"
+                            MaxWidth="320"
+                            HorizontalExpand="True">
+                <PanelContainer.PanelOverride>
+                    <graphics:StyleBoxFlat
+                        ContentMarginLeftOverride="10"
+                        ContentMarginRightOverride="10"
+                        ContentMarginTopOverride="6"
+                        ContentMarginBottomOverride="6"
+                        BorderThickness="1">
+                        <!-- Colors set in code based on message sender -->
+                    </graphics:StyleBoxFlat>
+                </PanelContainer.PanelOverride>
+
+                <RichTextLabel Name="MessageText"
+                               HorizontalExpand="True" />
+            </PanelContainer>
+
+            <!-- Delivery failed text -->
+            <Label Name="DeliveryFailedLabel"
+                   Text="{Loc nano-chat-delivery-failed}"
+                   StyleClasses="LabelSmall"
+                   HorizontalExpand="True"
+                   HorizontalAlignment="Right"
+                   Margin="10 2 10 0"
+                   Visible="False" />
+        </BoxContainer>
+
+        <!-- Right spacer for own messages -->
+        <Control Name="RightSpacer"
+                 MinSize="12 0" />
+
+        <!-- Flexible space for alignment -->
+        <Control Name="FlexSpace"
+                 HorizontalExpand="True" />
+    </BoxContainer>
+</cartridges:NanoChatMessageBubble>
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatMessageBubble.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatMessageBubble.xaml.cs
new file mode 100644
index 00000000000..42725bb09c5
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatMessageBubble.xaml.cs
@@ -0,0 +1,62 @@
+using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+
+[GenerateTypedNameReferences]
+public sealed partial class NanoChatMessageBubble : BoxContainer
+{
+    public static readonly Color OwnMessageColor = Color.FromHex("#173717d9"); // Dark green
+    public static readonly Color OtherMessageColor = Color.FromHex("#252525d9"); // Dark gray
+    public static readonly Color BorderColor = Color.FromHex("#40404066"); // Subtle border
+    public static readonly Color TextColor = Color.FromHex("#dcdcdc"); // Slightly softened white
+    public static readonly Color ErrorColor = Color.FromHex("#cc3333"); // Red
+
+    public NanoChatMessageBubble()
+    {
+        RobustXamlLoader.Load(this);
+    }
+
+    public void SetMessage(NanoChatMessage message, bool isOwnMessage)
+    {
+        if (MessagePanel.PanelOverride is not StyleBoxFlat)
+            return;
+
+        // Configure message appearance
+        var style = (StyleBoxFlat)MessagePanel.PanelOverride;
+        style.BackgroundColor = isOwnMessage ? OwnMessageColor : OtherMessageColor;
+        style.BorderColor = BorderColor;
+
+        // Set message content
+        MessageText.Text = message.Content;
+        MessageText.Modulate = TextColor;
+
+        // Show delivery failed text if needed (only for own messages)
+        DeliveryFailedLabel.Visible = isOwnMessage && message.DeliveryFailed;
+        if (DeliveryFailedLabel.Visible)
+            DeliveryFailedLabel.Modulate = ErrorColor;
+
+        // For own messages: FlexSpace -> MessagePanel -> RightSpacer
+        // For other messages: LeftSpacer -> MessagePanel -> FlexSpace
+        MessageContainer.RemoveAllChildren();
+
+        // fuuuuuck
+        MessageBox.Parent?.RemoveChild(MessageBox);
+
+        if (isOwnMessage)
+        {
+            MessageContainer.AddChild(FlexSpace);
+            MessageContainer.AddChild(MessageBox);
+            MessageContainer.AddChild(RightSpacer);
+        }
+        else
+        {
+            MessageContainer.AddChild(LeftSpacer);
+            MessageContainer.AddChild(MessageBox);
+            MessageContainer.AddChild(FlexSpace);
+        }
+    }
+}
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUi.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUi.cs
new file mode 100644
index 00000000000..fb65b03e887
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUi.cs
@@ -0,0 +1,43 @@
+using Content.Client.UserInterface.Fragments;
+using Content.Shared.CartridgeLoader;
+using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+
+public sealed partial class NanoChatUi : UIFragment
+{
+    private NanoChatUiFragment? _fragment;
+
+    public override Control GetUIFragmentRoot()
+    {
+        return _fragment!;
+    }
+
+    public override void Setup(BoundUserInterface userInterface, EntityUid? fragmentOwner)
+    {
+        _fragment = new NanoChatUiFragment();
+
+        _fragment.OnMessageSent += (type, number, content, job) =>
+        {
+            SendNanoChatUiMessage(type, number, content, job, userInterface);
+        };
+    }
+
+    public override void UpdateState(BoundUserInterfaceState state)
+    {
+        if (state is NanoChatUiState cast)
+            _fragment?.UpdateState(cast);
+    }
+
+    private static void SendNanoChatUiMessage(NanoChatUiMessageType type,
+        uint? number,
+        string? content,
+        string? job,
+        BoundUserInterface userInterface)
+    {
+        var nanoChatMessage = new NanoChatUiMessageEvent(type, number, content, job);
+        var message = new CartridgeUiMessage(nanoChatMessage);
+        userInterface.SendMessage(message);
+    }
+}
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml
new file mode 100644
index 00000000000..2a39094b85d
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml
@@ -0,0 +1,167 @@
+<cartridges:NanoChatUiFragment
+    xmlns="https://spacestation14.io"
+    xmlns:cartridges="clr-namespace:Content.Client.DeltaV.CartridgeLoader.Cartridges"
+    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    Orientation="Vertical"
+    HorizontalExpand="True"
+    VerticalExpand="True"
+    Margin="5">
+
+    <!-- Main container that fills the entire PDA screen -->
+    <BoxContainer Orientation="Vertical"
+                  HorizontalExpand="True"
+                  VerticalExpand="True">
+        <!-- Header with app title and new chat button -->
+        <controls:StripeBack MinSize="48 48"
+                             VerticalExpand="False">
+            <BoxContainer Orientation="Horizontal"
+                          HorizontalExpand="True"
+                          Margin="0">
+                <TextureRect Name="AppIcon"
+                             TexturePath="/Textures/Interface/Nano/ntlogo.svg.png"
+                             Stretch="KeepAspectCentered"
+                             VerticalAlignment="Center"
+                             MinSize="32 32"
+                             Margin="8 0 0 0" />
+                <Label Text="{Loc nano-chat-title}"
+                       StyleClasses="LabelHeading"
+                       HorizontalExpand="True"
+                       Margin="8 0"
+                       VerticalAlignment="Center" />
+                <Label Name="OwnNumberLabel"
+                       Text="#0000"
+                       StyleClasses="LabelSubText"
+                       VerticalAlignment="Center"
+                       Margin="0 0 8 0" />
+                <Button Name="DeleteChatButton"
+                        MaxSize="32 32"
+                        Visible="False"
+                        StyleClasses="OpenBoth"
+                        Margin="0 0 4 0"
+                        ToolTip="{Loc nano-chat-delete}">
+                    <TextureRect StyleClasses="ButtonSquare"
+                                 TexturePath="/Textures/Interface/VerbIcons/delete_transparent.svg.192dpi.png"
+                                 Stretch="KeepAspectCentered"
+                                 MinSize="18 18" />
+                </Button>
+                <Button Name="MuteButton"
+                        MaxSize="32 32"
+                        StyleClasses="OpenBoth"
+                        Margin="0 0 4 0"
+                        ToolTip="{Loc nano-chat-toggle-mute}">
+                    <Control HorizontalExpand="True" VerticalExpand="True">
+                        <TextureRect Name="BellIcon"
+                                     StyleClasses="ButtonSquare"
+                                     TexturePath="/Textures/DeltaV/Interface/VerbIcons/bell.svg.png"
+                                     Stretch="KeepAspectCentered"
+                                     MinSize="18 18" />
+                        <TextureRect Name="BellMutedIcon"
+                                     StyleClasses="ButtonSquare"
+                                     TexturePath="/Textures/DeltaV/Interface/VerbIcons/bell_muted.png"
+                                     Stretch="KeepAspectCentered"
+                                     Visible="False"
+                                     MinSize="18 18" />
+                    </Control>
+                </Button>
+                <Button Name="NewChatButton"
+                        Text="+"
+                        MinSize="32 32"
+                        MaxSize="32 32"
+                        Margin="0 0 4 0"
+                        StyleClasses="OpenBoth"
+                        ToolTip="{Loc nano-chat-new-chat}" />
+            </BoxContainer>
+        </controls:StripeBack>
+
+        <!-- Main content split -->
+        <BoxContainer Orientation="Horizontal"
+                      VerticalExpand="True"
+                      HorizontalExpand="True"
+                      Margin="0 5 0 0">
+            <!-- Left panel: Chat list -->
+            <PanelContainer StyleClasses="AngleRect"
+                            VerticalExpand="True"
+                            MaxWidth="150">
+                <ScrollContainer VerticalExpand="True"
+                                 MinWidth="145"
+                                 HorizontalExpand="True"
+                                 HScrollEnabled="False">
+                    <BoxContainer Name="ChatList"
+                                  Orientation="Vertical"
+                                  VerticalExpand="True"
+                                  HorizontalExpand="True"
+                                  Margin="4">
+                        <!-- Chat entries will be added here dynamically -->
+                        <Label Name="NoChatsLabel"
+                               Text="{Loc nano-chat-no-chats}"
+                               HorizontalAlignment="Center"
+                               VerticalAlignment="Center"
+                               StyleClasses="LabelSubText" />
+                    </BoxContainer>
+                </ScrollContainer>
+            </PanelContainer>
+
+            <customControls:VSeparator Margin="3 0" />
+
+            <!-- Right panel: Current chat -->
+            <PanelContainer StyleClasses="AngleRect"
+                            VerticalExpand="True"
+                            HorizontalExpand="True">
+                <BoxContainer Orientation="Vertical"
+                              VerticalExpand="True"
+                              HorizontalExpand="True">
+                    <!-- Messages area with centered "select chat" label -->
+                    <BoxContainer Name="MessageArea"
+                                  Orientation="Vertical"
+                                  VerticalExpand="True"
+                                  HorizontalExpand="True"
+                                  Margin="0 0 0 4">
+                        <Label Name="CurrentChatName"
+                               Text="{Loc nano-chat-select-chat}"
+                               HorizontalAlignment="Center"
+                               VerticalAlignment="Center"
+                               VerticalExpand="True" />
+                        <ScrollContainer Name="MessagesScroll"
+                                         VerticalExpand="True"
+                                         HorizontalExpand="True"
+                                         Visible="False">
+                            <BoxContainer Name="MessageList"
+                                          Orientation="Vertical"
+                                          VerticalExpand="True"
+                                          HorizontalExpand="True" />
+                        </ScrollContainer>
+                    </BoxContainer>
+
+                    <!-- Message input -->
+                    <BoxContainer Name="MessageInputContainer"
+                                  Orientation="Horizontal"
+                                  HorizontalExpand="True"
+                                  Margin="0 4 0 0"
+                                  Visible="False">
+                        <!-- Character count -->
+                        <Label Name="CharacterCount"
+                               HorizontalAlignment="Right"
+                               StyleClasses="LabelSubText"
+                               Margin="0 0 4 2"
+                               Visible="False" />
+                        <!-- Input row -->
+                        <LineEdit Name="MessageInput"
+                                  PlaceHolder="{Loc nano-chat-message-placeholder}"
+                                  HorizontalExpand="True"
+                                  StyleClasses="OpenRight" />
+                        <Button Name="SendButton"
+                                MinSize="32 32"
+                                Disabled="True"
+                                StyleClasses="OpenLeft"
+                                Margin="4 0 0 0">
+                            <TextureRect StyleClasses="ButtonSquare"
+                                         TexturePath="/Textures/Interface/Nano/triangle_right.png"
+                                         Stretch="KeepAspectCentered" />
+                        </Button>
+                    </BoxContainer>
+                </BoxContainer>
+            </PanelContainer>
+        </BoxContainer>
+    </BoxContainer>
+</cartridges:NanoChatUiFragment>
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs
new file mode 100644
index 00000000000..159d6b1a93a
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs
@@ -0,0 +1,254 @@
+using System.Linq;
+using System.Numerics;
+using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Client.UserInterface;
+using Robust.Shared.Timing;
+
+namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+
+[GenerateTypedNameReferences]
+public sealed partial class NanoChatUiFragment : BoxContainer
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    private const int MaxMessageLength = 256;
+
+    private readonly NewChatPopup _newChatPopup;
+    private uint? _currentChat;
+    private uint? _pendingChat;
+    private uint _ownNumber;
+    private bool _notificationsMuted;
+    private Dictionary<uint, NanoChatRecipient> _recipients = new();
+    private Dictionary<uint, List<NanoChatMessage>> _messages = new();
+
+    public event Action<NanoChatUiMessageType, uint?, string?, string?>? OnMessageSent;
+
+    public NanoChatUiFragment()
+    {
+        IoCManager.InjectDependencies(this);
+        RobustXamlLoader.Load(this);
+
+        _newChatPopup = new NewChatPopup();
+        SetupEventHandlers();
+    }
+
+    private void SetupEventHandlers()
+    {
+        _newChatPopup.OnChatCreated += (number, name, job) =>
+        {
+            OnMessageSent?.Invoke(NanoChatUiMessageType.NewChat, number, name, job);
+        };
+
+        NewChatButton.OnPressed += _ =>
+        {
+            _newChatPopup.ClearInputs();
+            _newChatPopup.OpenCentered();
+        };
+
+        MuteButton.OnPressed += _ =>
+        {
+            _notificationsMuted = !_notificationsMuted;
+            UpdateMuteButton();
+            OnMessageSent?.Invoke(NanoChatUiMessageType.ToggleMute, null, null, null);
+        };
+
+        MessageInput.OnTextChanged += args =>
+        {
+            var length = args.Text.Length;
+            var isValid = !string.IsNullOrWhiteSpace(args.Text) &&
+                          length <= MaxMessageLength &&
+                          (_currentChat != null || _pendingChat != null);
+
+            SendButton.Disabled = !isValid;
+
+            // Show character count when over limit
+            CharacterCount.Visible = length > MaxMessageLength;
+            if (length > MaxMessageLength)
+            {
+                CharacterCount.Text = Loc.GetString("nano-chat-message-too-long",
+                    ("current", length),
+                    ("max", MaxMessageLength));
+                CharacterCount.StyleClasses.Add("LabelDanger");
+            }
+        };
+
+        SendButton.OnPressed += _ => SendMessage();
+        DeleteChatButton.OnPressed += _ => DeleteCurrentChat();
+    }
+
+    private void SendMessage()
+    {
+        var activeChat = _pendingChat ?? _currentChat;
+        if (activeChat == null || string.IsNullOrWhiteSpace(MessageInput.Text))
+            return;
+
+        var messageContent = MessageInput.Text;
+
+        // Add predicted message
+        var predictedMessage = new NanoChatMessage(
+            _timing.CurTime,
+            messageContent,
+            _ownNumber
+        );
+
+        if (!_messages.TryGetValue(activeChat.Value, out var value))
+        {
+            value = new List<NanoChatMessage>();
+            _messages[activeChat.Value] = value;
+        }
+
+        value.Add(predictedMessage);
+
+        // Update UI with predicted message
+        UpdateMessages(_messages);
+
+        // Send message event
+        OnMessageSent?.Invoke(NanoChatUiMessageType.SendMessage, activeChat, messageContent, null);
+
+        // Clear input
+        MessageInput.Text = string.Empty;
+        SendButton.Disabled = true;
+    }
+
+    private void SelectChat(uint number)
+    {
+        // Don't reselect the same chat
+        if (_currentChat == number && _pendingChat == null)
+            return;
+
+        _pendingChat = number;
+
+        // Predict marking messages as read
+        if (_recipients.TryGetValue(number, out var recipient))
+        {
+            recipient.HasUnread = false;
+            _recipients[number] = recipient;
+            UpdateChatList(_recipients);
+        }
+
+        OnMessageSent?.Invoke(NanoChatUiMessageType.SelectChat, number, null, null);
+        UpdateCurrentChat();
+    }
+
+    private void DeleteCurrentChat()
+    {
+        var activeChat = _pendingChat ?? _currentChat;
+        if (activeChat == null)
+            return;
+
+        OnMessageSent?.Invoke(NanoChatUiMessageType.DeleteChat, activeChat, null, null);
+    }
+
+    private void UpdateChatList(Dictionary<uint, NanoChatRecipient> recipients)
+    {
+        ChatList.RemoveAllChildren();
+        _recipients = recipients;
+
+        NoChatsLabel.Visible = recipients.Count == 0;
+        if (NoChatsLabel.Parent != ChatList)
+        {
+            NoChatsLabel.Parent?.RemoveChild(NoChatsLabel);
+            ChatList.AddChild(NoChatsLabel);
+        }
+
+        foreach (var (number, recipient) in recipients.OrderBy(r => r.Value.Name))
+        {
+            var entry = new NanoChatEntry();
+            // For pending chat selection, always show it as selected even if unconfirmed
+            var isSelected = (_pendingChat == number) || (_pendingChat == null && _currentChat == number);
+            entry.SetRecipient(recipient, number, isSelected);
+            entry.OnPressed += SelectChat;
+            ChatList.AddChild(entry);
+        }
+    }
+
+    private void UpdateCurrentChat()
+    {
+        var activeChat = _pendingChat ?? _currentChat;
+        var hasActiveChat = activeChat != null;
+
+        // Update UI state
+        MessagesScroll.Visible = hasActiveChat;
+        CurrentChatName.Visible = !hasActiveChat;
+        MessageInputContainer.Visible = hasActiveChat;
+        DeleteChatButton.Visible = hasActiveChat;
+        DeleteChatButton.Disabled = !hasActiveChat;
+
+        if (activeChat != null && _recipients.TryGetValue(activeChat.Value, out var recipient))
+        {
+            CurrentChatName.Text = recipient.Name + (string.IsNullOrEmpty(recipient.JobTitle) ? "" : $" ({recipient.JobTitle})");
+        }
+        else
+        {
+            CurrentChatName.Text = Loc.GetString("nano-chat-select-chat");
+        }
+    }
+
+    private void UpdateMessages(Dictionary<uint, List<NanoChatMessage>> messages)
+    {
+        _messages = messages;
+        MessageList.RemoveAllChildren();
+
+        var activeChat = _pendingChat ?? _currentChat;
+        if (activeChat == null || !messages.TryGetValue(activeChat.Value, out var chatMessages))
+            return;
+
+        foreach (var message in chatMessages)
+        {
+            var messageBubble = new NanoChatMessageBubble();
+            messageBubble.SetMessage(message, message.SenderId == _ownNumber);
+            MessageList.AddChild(messageBubble);
+
+            // Add spacing between messages
+            MessageList.AddChild(new Control { MinSize = new Vector2(0, 4) });
+        }
+
+        MessageList.InvalidateMeasure();
+        MessagesScroll.InvalidateMeasure();
+
+        // Scroll to bottom after messages are added
+        if (MessageList.Parent is ScrollContainer scroll)
+            scroll.SetScrollValue(new Vector2(0, float.MaxValue));
+    }
+
+    private void UpdateMuteButton()
+    {
+        if (BellMutedIcon != null)
+            BellMutedIcon.Visible = _notificationsMuted;
+    }
+
+    public void UpdateState(NanoChatUiState state)
+    {
+        _ownNumber = state.OwnNumber;
+        _notificationsMuted = state.NotificationsMuted;
+        OwnNumberLabel.Text = $"#{state.OwnNumber:D4}";
+        UpdateMuteButton();
+
+        // Update new chat button state based on recipient limit
+        var atLimit = state.Recipients.Count >= state.MaxRecipients;
+        NewChatButton.Disabled = atLimit;
+        NewChatButton.ToolTip = atLimit
+            ? Loc.GetString("nano-chat-max-recipients")
+            : Loc.GetString("nano-chat-new-chat");
+
+        // First handle pending chat resolution if we have one
+        if (_pendingChat != null)
+        {
+            if (_pendingChat == state.CurrentChat)
+                _currentChat = _pendingChat; // Server confirmed our selection
+
+            _pendingChat = null; // Clear pending either way
+        }
+
+        // No pending chat or it was just cleared, update current directly
+        if (_pendingChat == null)
+            _currentChat = state.CurrentChat;
+
+        UpdateCurrentChat();
+        UpdateChatList(state.Recipients);
+        UpdateMessages(state.Messages);
+    }
+}
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NewChatPopup.xaml b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NewChatPopup.xaml
new file mode 100644
index 00000000000..20095c4fce9
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NewChatPopup.xaml
@@ -0,0 +1,52 @@
+<DefaultWindow xmlns="https://spacestation14.io"
+               Title="{Loc nano-chat-new-title}"
+               MinSize="300 200">
+    <PanelContainer StyleClasses="AngleRect">
+        <BoxContainer Orientation="Vertical" Margin="4">
+            <!-- Number input -->
+            <BoxContainer Orientation="Vertical" Margin="0 4">
+                <Label Text="{Loc nano-chat-number-label}"
+                       StyleClasses="LabelHeading" />
+                <PanelContainer StyleClasses="ButtonSquare">
+                    <LineEdit Name="NumberInput"
+                              PlaceHolder="{Loc nano-chat-number-placeholder}" />
+                </PanelContainer>
+            </BoxContainer>
+
+            <!-- Name input -->
+            <BoxContainer Orientation="Vertical" Margin="0 4">
+                <Label Text="{Loc nano-chat-name-label}"
+                       StyleClasses="LabelHeading" />
+                <PanelContainer StyleClasses="ButtonSquare">
+                    <LineEdit Name="NameInput"
+                              PlaceHolder="{Loc nano-chat-name-placeholder}" />
+                </PanelContainer>
+            </BoxContainer>
+
+            <!-- Job input (optional) -->
+            <BoxContainer Orientation="Vertical" Margin="0 4">
+                <Label Text="{Loc nano-chat-job-label}"
+                       StyleClasses="LabelHeading" />
+                <PanelContainer StyleClasses="ButtonSquare">
+                    <LineEdit Name="JobInput"
+                              PlaceHolder="{Loc nano-chat-job-placeholder}" />
+                </PanelContainer>
+            </BoxContainer>
+
+            <!-- Action buttons -->
+            <BoxContainer Orientation="Horizontal"
+                          HorizontalAlignment="Right"
+                          Margin="0 8 0 0">
+                <Button Name="CancelButton"
+                        Text="{Loc nano-chat-cancel}"
+                        StyleClasses="OpenRight"
+                        MinSize="80 0" />
+                <Button Name="CreateButton"
+                        Text="{Loc nano-chat-create}"
+                        StyleClasses="OpenLeft"
+                        MinSize="80 0"
+                        Disabled="True" />
+            </BoxContainer>
+        </BoxContainer>
+    </PanelContainer>
+</DefaultWindow>
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NewChatPopup.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NewChatPopup.xaml.cs
new file mode 100644
index 00000000000..8e47e1ee5d4
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NewChatPopup.xaml.cs
@@ -0,0 +1,87 @@
+using System.Linq;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+
+[GenerateTypedNameReferences]
+public sealed partial class NewChatPopup : DefaultWindow
+{
+    private const int MaxInputLength = 16;
+    private const int MaxNumberLength = 4; // i hardcoded it to be 4 so suffer
+
+    public event Action<uint, string, string?>? OnChatCreated;
+
+    public NewChatPopup()
+    {
+        RobustXamlLoader.Load(this);
+
+        // margins trolling
+        ContentsContainer.Margin = new Thickness(3);
+
+        // Button handlers
+        CancelButton.OnPressed += _ => Close();
+        CreateButton.OnPressed += _ => CreateChat();
+
+        // Input validation
+        NumberInput.OnTextChanged += _ => ValidateInputs();
+        NameInput.OnTextChanged += _ => ValidateInputs();
+
+        // Input validation
+        NumberInput.OnTextChanged += args =>
+        {
+            if (args.Text.Length > MaxNumberLength)
+                NumberInput.Text = args.Text[..MaxNumberLength];
+
+            // Filter to digits only
+            var newText = string.Concat(NumberInput.Text.Where(char.IsDigit));
+            if (newText != NumberInput.Text)
+                NumberInput.Text = newText;
+
+            ValidateInputs();
+        };
+
+        NameInput.OnTextChanged += args =>
+        {
+            if (args.Text.Length > MaxInputLength)
+                NameInput.Text = args.Text[..MaxInputLength];
+            ValidateInputs();
+        };
+
+        JobInput.OnTextChanged += args =>
+        {
+            if (args.Text.Length > MaxInputLength)
+                JobInput.Text = args.Text[..MaxInputLength];
+        };
+    }
+
+    private void ValidateInputs()
+    {
+        var isValid = !string.IsNullOrWhiteSpace(NumberInput.Text) &&
+                      !string.IsNullOrWhiteSpace(NameInput.Text) &&
+                      uint.TryParse(NumberInput.Text, out _);
+
+        CreateButton.Disabled = !isValid;
+    }
+
+    private void CreateChat()
+    {
+        if (!uint.TryParse(NumberInput.Text, out var number))
+            return;
+
+        var name = NameInput.Text.Trim();
+        var job = string.IsNullOrWhiteSpace(JobInput.Text) ? null : JobInput.Text.Trim();
+
+        OnChatCreated?.Invoke(number, name, job);
+        Close();
+    }
+
+    public void ClearInputs()
+    {
+        NumberInput.Text = string.Empty;
+        NameInput.Text = string.Empty;
+        JobInput.Text = string.Empty;
+        ValidateInputs();
+    }
+}
diff --git a/Content.Client/DeltaV/NanoChat/NanoChatSystem.cs b/Content.Client/DeltaV/NanoChat/NanoChatSystem.cs
new file mode 100644
index 00000000000..242deb05b72
--- /dev/null
+++ b/Content.Client/DeltaV/NanoChat/NanoChatSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.DeltaV.NanoChat;
+
+namespace Content.Client.DeltaV.NanoChat;
+
+public sealed class NanoChatSystem : SharedNanoChatSystem;
diff --git a/Content.Server/Access/Systems/AgentIDCardSystem.cs b/Content.Server/Access/Systems/AgentIDCardSystem.cs
index 8f1d0d4f820..e10f31decf6 100644
--- a/Content.Server/Access/Systems/AgentIDCardSystem.cs
+++ b/Content.Server/Access/Systems/AgentIDCardSystem.cs
@@ -9,6 +9,7 @@
 using Robust.Shared.Prototypes;
 using Content.Shared.Roles;
 using System.Diagnostics.CodeAnalysis;
+using Content.Shared.DeltaV.NanoChat; // DeltaV
 
 namespace Content.Server.Access.Systems
 {
@@ -18,6 +19,7 @@ public sealed class AgentIDCardSystem : SharedAgentIdCardSystem
         [Dependency] private readonly IdCardSystem _cardSystem = default!;
         [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly SharedNanoChatSystem _nanoChat = default!; // DeltaV
 
         public override void Initialize()
         {
@@ -28,6 +30,17 @@ public override void Initialize()
             SubscribeLocalEvent<AgentIDCardComponent, AgentIDCardNameChangedMessage>(OnNameChanged);
             SubscribeLocalEvent<AgentIDCardComponent, AgentIDCardJobChangedMessage>(OnJobChanged);
             SubscribeLocalEvent<AgentIDCardComponent, AgentIDCardJobIconChangedMessage>(OnJobIconChanged);
+            SubscribeLocalEvent<AgentIDCardComponent, AgentIDCardNumberChangedMessage>(OnNumberChanged); // DeltaV
+        }
+
+        // DeltaV - Add number change handler
+        private void OnNumberChanged(Entity<AgentIDCardComponent> ent, ref AgentIDCardNumberChangedMessage args)
+        {
+            if (!TryComp<NanoChatCardComponent>(ent, out var comp))
+                return;
+
+            _nanoChat.SetNumber((ent, comp), args.Number);
+            Dirty(ent, comp);
         }
 
         private void OnAfterInteract(EntityUid uid, AgentIDCardComponent component, AfterInteractEvent args)
@@ -42,6 +55,34 @@ private void OnAfterInteract(EntityUid uid, AgentIDCardComponent component, Afte
             access.Tags.UnionWith(targetAccess.Tags);
             var addedLength = access.Tags.Count - beforeLength;
 
+            // DeltaV - Copy NanoChat data if available
+            if (TryComp<NanoChatCardComponent>(args.Target, out var targetNanoChat) &&
+                TryComp<NanoChatCardComponent>(uid, out var agentNanoChat))
+            {
+                // First clear existing data
+                _nanoChat.Clear((uid, agentNanoChat));
+
+                // Copy the number
+                if (_nanoChat.GetNumber((args.Target.Value, targetNanoChat)) is { } number)
+                    _nanoChat.SetNumber((uid, agentNanoChat), number);
+
+                // Copy all recipients and their messages
+                foreach (var (recipientNumber, recipient) in _nanoChat.GetRecipients((args.Target.Value, targetNanoChat)))
+                {
+                    _nanoChat.SetRecipient((uid, agentNanoChat), recipientNumber, recipient);
+
+                    if (_nanoChat.GetMessagesForRecipient((args.Target.Value, targetNanoChat), recipientNumber) is not
+                        { } messages)
+                        continue;
+
+                    foreach (var message in messages)
+                    {
+                        _nanoChat.AddMessage((uid, agentNanoChat), recipientNumber, message);
+                    }
+                }
+            }
+            // End DeltaV
+
             if (addedLength == 0)
             {
                 _popupSystem.PopupEntity(Loc.GetString("agent-id-no-new", ("card", args.Target)), args.Target.Value, args.User);
@@ -67,7 +108,17 @@ private void AfterUIOpen(EntityUid uid, AgentIDCardComponent component, AfterAct
             if (!TryComp<IdCardComponent>(uid, out var idCard))
                 return;
 
-            var state = new AgentIDCardBoundUserInterfaceState(idCard.FullName ?? "", idCard.JobTitle ?? "", idCard.JobIcon);
+            // DeltaV - Get current number if it exists
+            uint? currentNumber = null;
+            if (TryComp<NanoChatCardComponent>(uid, out var comp))
+                currentNumber = comp.Number;
+
+            var state = new AgentIDCardBoundUserInterfaceState(
+                idCard.FullName ?? "",
+                idCard.LocalizedJobTitle ?? "",
+                idCard.JobIcon,
+                currentNumber); // DeltaV - Pass current number
+
             _uiSystem.SetUiState(uid, AgentIDCardUiKey.Key, state);
         }
 
diff --git a/Content.Server/CartridgeLoader/Cartridges/LogProbeCartridgeComponent.cs b/Content.Server/CartridgeLoader/Cartridges/LogProbeCartridgeComponent.cs
index cfa92dd67f7..048fa777fc9 100644
--- a/Content.Server/CartridgeLoader/Cartridges/LogProbeCartridgeComponent.cs
+++ b/Content.Server/CartridgeLoader/Cartridges/LogProbeCartridgeComponent.cs
@@ -1,4 +1,5 @@
 using Content.Shared.CartridgeLoader.Cartridges;
+using Content.Shared.DeltaV.CartridgeLoader.Cartridges; // DeltaV
 using Robust.Shared.Audio;
 
 namespace Content.Server.CartridgeLoader.Cartridges;
@@ -18,4 +19,10 @@ public sealed partial class LogProbeCartridgeComponent : Component
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public SoundSpecifier SoundScan = new SoundPathSpecifier("/Audio/Machines/scan_finish.ogg");
+
+    /// <summary>
+    /// DeltaV: The last scanned NanoChat data, if any
+    /// </summary>
+    [DataField]
+    public NanoChatData? ScannedNanoChatData;
 }
diff --git a/Content.Server/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.cs
index f5ccea95900..725901620d0 100644
--- a/Content.Server/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.cs
+++ b/Content.Server/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.cs
@@ -2,13 +2,14 @@
 using Content.Shared.Audio;
 using Content.Shared.CartridgeLoader;
 using Content.Shared.CartridgeLoader.Cartridges;
+using Content.Shared.DeltaV.NanoChat; // DeltaV
 using Content.Shared.Popups;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Random;
 
 namespace Content.Server.CartridgeLoader.Cartridges;
 
-public sealed class LogProbeCartridgeSystem : EntitySystem
+public sealed partial class LogProbeCartridgeSystem : EntitySystem // DeltaV - Made partial
 {
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly CartridgeLoaderSystem? _cartridgeLoaderSystem = default!;
@@ -18,6 +19,7 @@ public sealed class LogProbeCartridgeSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
+        InitializeNanoChat(); // DeltaV
         SubscribeLocalEvent<LogProbeCartridgeComponent, CartridgeUiReadyEvent>(OnUiReady);
         SubscribeLocalEvent<LogProbeCartridgeComponent, CartridgeAfterInteractEvent>(AfterInteract);
     }
@@ -33,6 +35,15 @@ private void AfterInteract(Entity<LogProbeCartridgeComponent> ent, ref Cartridge
         if (args.InteractEvent.Handled || !args.InteractEvent.CanReach || args.InteractEvent.Target is not { } target)
             return;
 
+        // DeltaV begin - Add NanoChat card scanning
+        if (TryComp<NanoChatCardComponent>(target, out var nanoChatCard))
+        {
+            ScanNanoChatCard(ent, args, target, nanoChatCard);
+            args.InteractEvent.Handled = true;
+            return;
+        }
+        // DeltaV end
+
         if (!TryComp(target, out AccessReaderComponent? accessReaderComponent))
             return;
 
@@ -41,6 +52,7 @@ private void AfterInteract(Entity<LogProbeCartridgeComponent> ent, ref Cartridge
         _popupSystem.PopupCursor(Loc.GetString("log-probe-scan", ("device", target)), args.InteractEvent.User);
 
         ent.Comp.PulledAccessLogs.Clear();
+        ent.Comp.ScannedNanoChatData = null; // DeltaV - Clear any previous NanoChat data
 
         foreach (var accessRecord in accessReaderComponent.AccessLog)
         {
@@ -65,7 +77,7 @@ private void OnUiReady(Entity<LogProbeCartridgeComponent> ent, ref CartridgeUiRe
 
     private void UpdateUiState(Entity<LogProbeCartridgeComponent> ent, EntityUid loaderUid)
     {
-        var state = new LogProbeUiState(ent.Comp.PulledAccessLogs);
+        var state = new LogProbeUiState(ent.Comp.PulledAccessLogs, ent.Comp.ScannedNanoChatData); // DeltaV - NanoChat support
         _cartridgeLoaderSystem?.UpdateCartridgeUiState(loaderUid, state);
     }
 }
diff --git a/Content.Server/DeltaV/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.NanoChat.cs b/Content.Server/DeltaV/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.NanoChat.cs
new file mode 100644
index 00000000000..89a2bd21eb3
--- /dev/null
+++ b/Content.Server/DeltaV/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.NanoChat.cs
@@ -0,0 +1,82 @@
+using Content.Shared.Audio;
+using Content.Shared.CartridgeLoader;
+using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
+using Content.Shared.DeltaV.NanoChat;
+
+namespace Content.Server.CartridgeLoader.Cartridges;
+
+public sealed partial class LogProbeCartridgeSystem
+{
+    private void InitializeNanoChat()
+    {
+        SubscribeLocalEvent<NanoChatRecipientUpdatedEvent>(OnRecipientUpdated);
+        SubscribeLocalEvent<NanoChatMessageReceivedEvent>(OnMessageReceived);
+    }
+
+    private void OnRecipientUpdated(ref NanoChatRecipientUpdatedEvent args)
+    {
+        var query = EntityQueryEnumerator<LogProbeCartridgeComponent, CartridgeComponent>();
+        while (query.MoveNext(out var uid, out var probe, out var cartridge))
+        {
+            if (probe.ScannedNanoChatData == null || GetEntity(probe.ScannedNanoChatData.Value.Card) != args.CardUid)
+                continue;
+
+            if (!TryComp<NanoChatCardComponent>(args.CardUid, out var card))
+                continue;
+
+            probe.ScannedNanoChatData = new NanoChatData(
+                new Dictionary<uint, NanoChatRecipient>(card.Recipients),
+                probe.ScannedNanoChatData.Value.Messages,
+                card.Number,
+                GetNetEntity(args.CardUid));
+
+            if (cartridge.LoaderUid != null)
+                UpdateUiState((uid, probe), cartridge.LoaderUid.Value);
+        }
+    }
+
+    private void OnMessageReceived(ref NanoChatMessageReceivedEvent args)
+    {
+        var query = EntityQueryEnumerator<LogProbeCartridgeComponent, CartridgeComponent>();
+        while (query.MoveNext(out var uid, out var probe, out var cartridge))
+        {
+            if (probe.ScannedNanoChatData == null || GetEntity(probe.ScannedNanoChatData.Value.Card) != args.CardUid)
+                continue;
+
+            if (!TryComp<NanoChatCardComponent>(args.CardUid, out var card))
+                continue;
+
+            probe.ScannedNanoChatData = new NanoChatData(
+                probe.ScannedNanoChatData.Value.Recipients,
+                new Dictionary<uint, List<NanoChatMessage>>(card.Messages),
+                card.Number,
+                GetNetEntity(args.CardUid));
+
+            if (cartridge.LoaderUid != null)
+                UpdateUiState((uid, probe), cartridge.LoaderUid.Value);
+        }
+    }
+
+    private void ScanNanoChatCard(Entity<LogProbeCartridgeComponent> ent,
+        CartridgeAfterInteractEvent args,
+        EntityUid target,
+        NanoChatCardComponent card)
+    {
+        _audioSystem.PlayEntity(ent.Comp.SoundScan,
+            args.InteractEvent.User,
+            target,
+            AudioHelpers.WithVariation(0.25f, _random));
+        _popupSystem.PopupCursor(Loc.GetString("log-probe-scan-nanochat", ("card", target)), args.InteractEvent.User);
+
+        ent.Comp.PulledAccessLogs.Clear();
+
+        ent.Comp.ScannedNanoChatData = new NanoChatData(
+            new Dictionary<uint, NanoChatRecipient>(card.Recipients),
+            new Dictionary<uint, List<NanoChatMessage>>(card.Messages),
+            card.Number,
+            GetNetEntity(target)
+        );
+
+        UpdateUiState(ent, args.Loader);
+    }
+}
diff --git a/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeComponent.cs b/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeComponent.cs
new file mode 100644
index 00000000000..2b95462a663
--- /dev/null
+++ b/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeComponent.cs
@@ -0,0 +1,26 @@
+using Content.Shared.Radio;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.DeltaV.CartridgeLoader.Cartridges;
+
+[RegisterComponent, Access(typeof(NanoChatCartridgeSystem))]
+public sealed partial class NanoChatCartridgeComponent : Component
+{
+    /// <summary>
+    ///     Station entity to keep track of.
+    /// </summary>
+    [DataField]
+    public EntityUid? Station;
+
+    /// <summary>
+    ///     The NanoChat card to keep track of.
+    /// </summary>
+    [DataField]
+    public EntityUid? Card;
+
+    /// <summary>
+    ///     The <see cref="RadioChannelPrototype" /> required to send or receive messages.
+    /// </summary>
+    [DataField]
+    public ProtoId<RadioChannelPrototype> RadioChannel = "Common";
+}
diff --git a/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs b/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
new file mode 100644
index 00000000000..ea3c58226ad
--- /dev/null
+++ b/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
@@ -0,0 +1,514 @@
+using System.Linq;
+using Content.Server.Administration.Logs;
+using Content.Server.CartridgeLoader;
+using Content.Server.Power.Components;
+using Content.Server.Radio;
+using Content.Server.Radio.Components;
+using Content.Server.Station.Systems;
+using Content.Shared.Access.Components;
+using Content.Shared.CartridgeLoader;
+using Content.Shared.Database;
+using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
+using Content.Shared.DeltaV.NanoChat;
+using Content.Shared.PDA;
+using Content.Shared.Radio.Components;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Server.DeltaV.CartridgeLoader.Cartridges;
+
+public sealed class NanoChatCartridgeSystem : EntitySystem
+{
+    [Dependency] private readonly CartridgeLoaderSystem _cartridge = default!;
+    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly SharedNanoChatSystem _nanoChat = default!;
+    [Dependency] private readonly StationSystem _station = default!;
+
+    // Messages in notifications get cut off after this point
+    // no point in storing it on the comp
+    private const int NotificationMaxLength = 64;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<NanoChatCartridgeComponent, CartridgeUiReadyEvent>(OnUiReady);
+        SubscribeLocalEvent<NanoChatCartridgeComponent, CartridgeMessageEvent>(OnMessage);
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        // Update card references for any cartridges that need it
+        var query = EntityQueryEnumerator<NanoChatCartridgeComponent, CartridgeComponent>();
+        while (query.MoveNext(out var uid, out var nanoChat, out var cartridge))
+        {
+            if (cartridge.LoaderUid == null)
+                continue;
+
+            // Check if we need to update our card reference
+            if (!TryComp<PdaComponent>(cartridge.LoaderUid, out var pda))
+                continue;
+
+            var newCard = pda.ContainedId;
+            var currentCard = nanoChat.Card;
+
+            // If the cards match, nothing to do
+            if (newCard == currentCard)
+                continue;
+
+            // Update card reference
+            nanoChat.Card = newCard;
+
+            // Update UI state since card reference changed
+            UpdateUI((uid, nanoChat), cartridge.LoaderUid.Value);
+        }
+    }
+
+    /// <summary>
+    ///     Handles incoming UI messages from the NanoChat cartridge.
+    /// </summary>
+    private void OnMessage(Entity<NanoChatCartridgeComponent> ent, ref CartridgeMessageEvent args)
+    {
+        if (args is not NanoChatUiMessageEvent msg)
+            return;
+
+        if (!GetCardEntity(GetEntity(args.LoaderUid), out var card))
+            return;
+
+        switch (msg.Type)
+        {
+            case NanoChatUiMessageType.NewChat:
+                HandleNewChat(card, msg);
+                break;
+            case NanoChatUiMessageType.SelectChat:
+                HandleSelectChat(card, msg);
+                break;
+            case NanoChatUiMessageType.CloseChat:
+                HandleCloseChat(card);
+                break;
+            case NanoChatUiMessageType.ToggleMute:
+                HandleToggleMute(card);
+                break;
+            case NanoChatUiMessageType.DeleteChat:
+                HandleDeleteChat(card, msg);
+                break;
+            case NanoChatUiMessageType.SendMessage:
+                HandleSendMessage(ent, card, msg);
+                break;
+        }
+
+        UpdateUI(ent, GetEntity(args.LoaderUid));
+    }
+
+    /// <summary>
+    ///     Gets the ID card entity associated with a PDA.
+    /// </summary>
+    /// <param name="loaderUid">The PDA entity ID</param>
+    /// <param name="card">Output parameter containing the found card entity and component</param>
+    /// <returns>True if a valid NanoChat card was found</returns>
+    private bool GetCardEntity(
+        EntityUid loaderUid,
+        out Entity<NanoChatCardComponent> card)
+    {
+        card = default;
+
+        // Get the PDA and check if it has an ID card
+        if (!TryComp<PdaComponent>(loaderUid, out var pda) ||
+            pda.ContainedId == null ||
+            !TryComp<NanoChatCardComponent>(pda.ContainedId, out var idCard))
+            return false;
+
+        card = (pda.ContainedId.Value, idCard);
+        return true;
+    }
+
+    /// <summary>
+    ///     Handles creation of a new chat conversation.
+    /// </summary>
+    private void HandleNewChat(Entity<NanoChatCardComponent> card, NanoChatUiMessageEvent msg)
+    {
+        if (msg.RecipientNumber == null || msg.Content == null || msg.RecipientNumber == card.Comp.Number)
+            return;
+
+        // Add new recipient
+        var recipient = new NanoChatRecipient(msg.RecipientNumber.Value,
+            msg.Content,
+            msg.RecipientJob);
+
+        // Initialize or update recipient
+        _nanoChat.SetRecipient((card, card.Comp), msg.RecipientNumber.Value, recipient);
+
+        _adminLogger.Add(LogType.Action,
+            LogImpact.Low,
+            $"{ToPrettyString(msg.Actor):user} created new NanoChat conversation with #{msg.RecipientNumber:D4} ({msg.Content})");
+
+        var recipientEv = new NanoChatRecipientUpdatedEvent(card);
+        RaiseLocalEvent(ref recipientEv);
+        UpdateUIForCard(card);
+    }
+
+    /// <summary>
+    ///     Handles selecting a chat conversation.
+    /// </summary>
+    private void HandleSelectChat(Entity<NanoChatCardComponent> card, NanoChatUiMessageEvent msg)
+    {
+        if (msg.RecipientNumber == null)
+            return;
+
+        _nanoChat.SetCurrentChat((card, card.Comp), msg.RecipientNumber);
+
+        // Clear unread flag when selecting chat
+        if (_nanoChat.GetRecipient((card, card.Comp), msg.RecipientNumber.Value) is { } recipient)
+        {
+            _nanoChat.SetRecipient((card, card.Comp),
+                msg.RecipientNumber.Value,
+                recipient with { HasUnread = false });
+        }
+    }
+
+    /// <summary>
+    ///     Handles closing the current chat conversation.
+    /// </summary>
+    private void HandleCloseChat(Entity<NanoChatCardComponent> card)
+    {
+        _nanoChat.SetCurrentChat((card, card.Comp), null);
+    }
+
+    /// <summary>
+    ///     Handles deletion of a chat conversation.
+    /// </summary>
+    private void HandleDeleteChat(Entity<NanoChatCardComponent> card, NanoChatUiMessageEvent msg)
+    {
+        if (msg.RecipientNumber == null || card.Comp.Number == null)
+            return;
+
+        // Delete chat but keep the messages
+        var deleted = _nanoChat.TryDeleteChat((card, card.Comp), msg.RecipientNumber.Value, true);
+
+        if (!deleted)
+            return;
+
+        _adminLogger.Add(LogType.Action,
+            LogImpact.Low,
+            $"{ToPrettyString(msg.Actor):user} deleted NanoChat conversation with #{msg.RecipientNumber:D4}");
+
+        UpdateUIForCard(card);
+    }
+
+    /// <summary>
+    ///     Handles toggling notification mute state.
+    /// </summary>
+    private void HandleToggleMute(Entity<NanoChatCardComponent> card)
+    {
+        _nanoChat.SetNotificationsMuted((card, card.Comp), !_nanoChat.GetNotificationsMuted((card, card.Comp)));
+        UpdateUIForCard(card);
+    }
+
+    /// <summary>
+    ///     Handles sending a new message in a chat conversation.
+    /// </summary>
+    private void HandleSendMessage(Entity<NanoChatCartridgeComponent> cartridge,
+        Entity<NanoChatCardComponent> card,
+        NanoChatUiMessageEvent msg)
+    {
+        if (msg.RecipientNumber == null || msg.Content == null || card.Comp.Number == null)
+            return;
+
+        if (!EnsureRecipientExists(card, msg.RecipientNumber.Value))
+            return;
+
+        // Create and store message for sender
+        var message = new NanoChatMessage(
+            _timing.CurTime,
+            msg.Content,
+            (uint)card.Comp.Number
+        );
+
+        // Attempt delivery
+        var (deliveryFailed, recipients) = AttemptMessageDelivery(cartridge, msg.RecipientNumber.Value);
+
+        // Update delivery status
+        message = message with { DeliveryFailed = deliveryFailed };
+
+        // Store message in sender's outbox under recipient's number
+        _nanoChat.AddMessage((card, card.Comp), msg.RecipientNumber.Value, message);
+
+        // Log message attempt
+        var recipientsText = recipients.Count > 0
+            ? string.Join(", ", recipients.Select(r => ToPrettyString(r)))
+            : $"#{msg.RecipientNumber:D4}";
+
+        _adminLogger.Add(LogType.Chat,
+            LogImpact.Low,
+            $"{ToPrettyString(card):user} sent NanoChat message to {recipientsText}: {msg.Content}{(deliveryFailed ? " [DELIVERY FAILED]" : "")}");
+
+        var msgEv = new NanoChatMessageReceivedEvent(card);
+        RaiseLocalEvent(ref msgEv);
+
+        if (deliveryFailed)
+            return;
+
+        foreach (var recipient in recipients)
+        {
+            DeliverMessageToRecipient(card, recipient, message);
+        }
+    }
+
+    /// <summary>
+    ///     Ensures a recipient exists in the sender's contacts.
+    /// </summary>
+    /// <param name="card">The card to check contacts for</param>
+    /// <param name="recipientNumber">The recipient's number to check</param>
+    /// <returns>True if the recipient exists or was created successfully</returns>
+    private bool EnsureRecipientExists(Entity<NanoChatCardComponent> card, uint recipientNumber)
+    {
+        return _nanoChat.EnsureRecipientExists((card, card.Comp), recipientNumber, GetCardInfo(recipientNumber));
+    }
+
+    /// <summary>
+    ///     Attempts to deliver a message to recipients.
+    /// </summary>
+    /// <param name="sender">The sending cartridge entity</param>
+    /// <param name="recipientNumber">The recipient's number</param>
+    /// <returns>Tuple containing delivery status and recipients if found.</returns>
+    private (bool failed, List<Entity<NanoChatCardComponent>> recipient) AttemptMessageDelivery(
+        Entity<NanoChatCartridgeComponent> sender,
+        uint recipientNumber)
+    {
+        // First verify we can send from this device
+        var channel = _prototype.Index(sender.Comp.RadioChannel);
+        var sendAttemptEvent = new RadioSendAttemptEvent(channel, sender);
+        RaiseLocalEvent(ref sendAttemptEvent);
+        if (sendAttemptEvent.Cancelled)
+            return (true, new List<Entity<NanoChatCardComponent>>());
+
+        var foundRecipients = new List<Entity<NanoChatCardComponent>>();
+
+        // Find all cards with matching number
+        var cardQuery = EntityQueryEnumerator<NanoChatCardComponent>();
+        while (cardQuery.MoveNext(out var cardUid, out var card))
+        {
+            if (card.Number != recipientNumber)
+                continue;
+
+            foundRecipients.Add((cardUid, card));
+        }
+
+        if (foundRecipients.Count == 0)
+            return (true, foundRecipients);
+
+        // Now check if any of these cards can receive
+        var deliverableRecipients = new List<Entity<NanoChatCardComponent>>();
+        foreach (var recipient in foundRecipients)
+        {
+            // Find any cartridges that have this card
+            var cartridgeQuery = EntityQueryEnumerator<NanoChatCartridgeComponent, ActiveRadioComponent>();
+            while (cartridgeQuery.MoveNext(out var receiverUid, out var receiverCart, out _))
+            {
+                if (receiverCart.Card != recipient.Owner)
+                    continue;
+
+                // Check if devices are on same station/map
+                var recipientStation = _station.GetOwningStation(receiverUid);
+                var senderStation = _station.GetOwningStation(sender);
+
+                // Both entities must be on a station
+                if (recipientStation == null || senderStation == null)
+                    continue;
+
+                // Must be on same map/station unless long range allowed
+                if (!channel.LongRange && recipientStation != senderStation)
+                    continue;
+
+                // Needs telecomms
+                if (!HasActiveServer(senderStation.Value) || !HasActiveServer(recipientStation.Value))
+                    continue;
+
+                // Check if recipient can receive
+                var receiveAttemptEv = new RadioReceiveAttemptEvent(channel, sender, receiverUid);
+                RaiseLocalEvent(ref receiveAttemptEv);
+                if (receiveAttemptEv.Cancelled)
+                    continue;
+
+                // Found valid cartridge that can receive
+                deliverableRecipients.Add(recipient);
+                break; // Only need one valid cartridge per card
+            }
+        }
+
+        return (deliverableRecipients.Count == 0, deliverableRecipients);
+    }
+
+    /// <summary>
+    ///     Checks if there are any active telecomms servers on the given station
+    /// </summary>
+    private bool HasActiveServer(EntityUid station)
+    {
+        // I have no idea why this isn't public in the RadioSystem
+        var query =
+            EntityQueryEnumerator<TelecomServerComponent, EncryptionKeyHolderComponent, ApcPowerReceiverComponent>();
+
+        while (query.MoveNext(out var uid, out _, out _, out var power))
+        {
+            if (_station.GetOwningStation(uid) == station && power.Powered)
+                return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    ///     Delivers a message to the recipient and handles associated notifications.
+    /// </summary>
+    /// <param name="sender">The sender's card entity</param>
+    /// <param name="recipient">The recipient's card entity</param>
+    /// <param name="message">The <see cref="NanoChatMessage" /> to deliver</param>
+    private void DeliverMessageToRecipient(Entity<NanoChatCardComponent> sender,
+        Entity<NanoChatCardComponent> recipient,
+        NanoChatMessage message)
+    {
+        var senderNumber = sender.Comp.Number;
+        if (senderNumber == null)
+            return;
+
+        // Always try to get and add sender info to recipient's contacts
+        if (!EnsureRecipientExists(recipient, senderNumber.Value))
+            return;
+
+        _nanoChat.AddMessage((recipient, recipient.Comp), senderNumber.Value, message with { DeliveryFailed = false });
+
+
+        if (_nanoChat.GetCurrentChat((recipient, recipient.Comp)) != senderNumber)
+            HandleUnreadNotification(recipient, message);
+
+        var msgEv = new NanoChatMessageReceivedEvent(recipient);
+        RaiseLocalEvent(ref msgEv);
+        UpdateUIForCard(recipient);
+    }
+
+    /// <summary>
+    ///     Handles unread message notifications and updates unread status.
+    /// </summary>
+    private void HandleUnreadNotification(Entity<NanoChatCardComponent> recipient, NanoChatMessage message)
+    {
+        // Get sender name from contacts or fall back to number
+        var recipients = _nanoChat.GetRecipients((recipient, recipient.Comp));
+        var senderName = recipients.TryGetValue(message.SenderId, out var existingRecipient)
+            ? existingRecipient.Name
+            : $"#{message.SenderId:D4}";
+
+        if (!recipient.Comp.Recipients[message.SenderId].HasUnread && !recipient.Comp.NotificationsMuted)
+        {
+            var pdaQuery = EntityQueryEnumerator<PdaComponent>();
+            while (pdaQuery.MoveNext(out var pdaUid, out var pdaComp))
+            {
+                if (pdaComp.ContainedId != recipient)
+                    continue;
+
+                _cartridge.SendNotification(pdaUid,
+                    Loc.GetString("nano-chat-new-message-title", ("sender", senderName)),
+                    Loc.GetString("nano-chat-new-message-body", ("message", TruncateMessage(message.Content))));
+                break;
+            }
+        }
+
+        // Update unread status
+        _nanoChat.SetRecipient((recipient, recipient.Comp),
+            message.SenderId,
+            existingRecipient with { HasUnread = true });
+    }
+
+    /// <summary>
+    ///     Updates the UI for any PDAs containing the specified card.
+    /// </summary>
+    private void UpdateUIForCard(EntityUid cardUid)
+    {
+        // Find any PDA containing this card and update its UI
+        var query = EntityQueryEnumerator<NanoChatCartridgeComponent, CartridgeComponent>();
+        while (query.MoveNext(out var uid, out var comp, out var cartridge))
+        {
+            if (comp.Card != cardUid || cartridge.LoaderUid == null)
+                continue;
+
+            UpdateUI((uid, comp), cartridge.LoaderUid.Value);
+        }
+    }
+
+    /// <summary>
+    ///     Gets the <see cref="NanoChatRecipient" /> for a given NanoChat number.
+    /// </summary>
+    private NanoChatRecipient? GetCardInfo(uint number)
+    {
+        // Find card with this number to get its info
+        var query = EntityQueryEnumerator<NanoChatCardComponent>();
+        while (query.MoveNext(out var uid, out var card))
+        {
+            if (card.Number != number)
+                continue;
+
+            // Try to get job title from ID card if possible
+            string? jobTitle = null;
+            var name = "Unknown";
+            if (TryComp<IdCardComponent>(uid, out var idCard))
+            {
+                jobTitle = idCard.LocalizedJobTitle;
+                name = idCard.FullName ?? name;
+            }
+
+            return new NanoChatRecipient(number, name, jobTitle);
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    ///     Truncates a message to the notification maximum length.
+    /// </summary>
+    private static string TruncateMessage(string message)
+    {
+        return message.Length <= NotificationMaxLength
+            ? message
+            : message[..(NotificationMaxLength - 4)] + " [...]";
+    }
+
+    private void OnUiReady(Entity<NanoChatCartridgeComponent> ent, ref CartridgeUiReadyEvent args)
+    {
+        _cartridge.RegisterBackgroundProgram(args.Loader, ent);
+        UpdateUI(ent, args.Loader);
+    }
+
+    private void UpdateUI(Entity<NanoChatCartridgeComponent> ent, EntityUid loader)
+    {
+        if (_station.GetOwningStation(loader) is { } station)
+            ent.Comp.Station = station;
+
+        var recipients = new Dictionary<uint, NanoChatRecipient>();
+        var messages = new Dictionary<uint, List<NanoChatMessage>>();
+        uint? currentChat = null;
+        uint ownNumber = 0;
+        var maxRecipients = 50;
+        var notificationsMuted = false;
+
+        if (ent.Comp.Card != null && TryComp<NanoChatCardComponent>(ent.Comp.Card, out var card))
+        {
+            recipients = card.Recipients;
+            messages = card.Messages;
+            currentChat = card.CurrentChat;
+            ownNumber = card.Number ?? 0;
+            maxRecipients = card.MaxRecipients;
+            notificationsMuted = card.NotificationsMuted;
+        }
+
+        var state = new NanoChatUiState(recipients,
+            messages,
+            currentChat,
+            ownNumber,
+            maxRecipients,
+            notificationsMuted);
+        _cartridge.UpdateCartridgeUiState(loader, state);
+    }
+}
diff --git a/Content.Server/DeltaV/NanoChat/NanoChatSystem.cs b/Content.Server/DeltaV/NanoChat/NanoChatSystem.cs
new file mode 100644
index 00000000000..fb0ca32aa66
--- /dev/null
+++ b/Content.Server/DeltaV/NanoChat/NanoChatSystem.cs
@@ -0,0 +1,130 @@
+using System.Linq;
+using Content.Server.Access.Systems;
+using Content.Server.Administration.Logs;
+using Content.Server.Kitchen.Components;
+using Content.Server.NameIdentifier;
+using Content.Shared.Database;
+using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
+using Content.Shared.DeltaV.NanoChat;
+using Content.Shared.NameIdentifier;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.DeltaV.NanoChat;
+
+/// <summary>
+///     Handles NanoChat features that are specific to the server but not related to the cartridge itself.
+/// </summary>
+public sealed class NanoChatSystem : SharedNanoChatSystem
+{
+    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly NameIdentifierSystem _name = default!;
+
+    private readonly ProtoId<NameIdentifierGroupPrototype> _nameIdentifierGroup = "NanoChat";
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<NanoChatCardComponent, MapInitEvent>(OnCardInit);
+        SubscribeLocalEvent<NanoChatCardComponent, BeingMicrowavedEvent>(OnMicrowaved, after: [typeof(IdCardSystem)]);
+    }
+
+    private void OnMicrowaved(Entity<NanoChatCardComponent> ent, ref BeingMicrowavedEvent args)
+    {
+        // Skip if the entity was deleted (e.g., by ID card system burning it)
+        if (Deleted(ent))
+            return;
+
+        if (!TryComp<MicrowaveComponent>(args.Microwave, out var micro) || micro.Broken)
+            return;
+
+        var randomPick = _random.NextFloat();
+
+        // Super lucky - erase all messages (10% chance)
+        if (randomPick <= 0.10f)
+        {
+            ent.Comp.Messages.Clear();
+            // TODO: these shouldn't be shown at the same time as the popups from IdCardSystem
+            // _popup.PopupEntity(Loc.GetString("nanochat-card-microwave-erased", ("card", ent)),
+            //     ent,
+            //     PopupType.Medium);
+
+            _adminLogger.Add(LogType.Action,
+                LogImpact.Medium,
+                $"{ToPrettyString(args.Microwave)} erased all messages on {ToPrettyString(ent)}");
+        }
+        else
+        {
+            // Scramble random messages for random recipients
+            ScrambleMessages(ent);
+            // _popup.PopupEntity(Loc.GetString("nanochat-card-microwave-scrambled", ("card", ent)),
+            //     ent,
+            //     PopupType.Medium);
+
+            _adminLogger.Add(LogType.Action,
+                LogImpact.Medium,
+                $"{ToPrettyString(args.Microwave)} scrambled messages on {ToPrettyString(ent)}");
+        }
+
+        Dirty(ent);
+    }
+
+    private void ScrambleMessages(NanoChatCardComponent component)
+    {
+        foreach (var (recipientNumber, messages) in component.Messages)
+        {
+            for (var i = 0; i < messages.Count; i++)
+            {
+                // 50% chance to scramble each message
+                if (!_random.Prob(0.5f))
+                    continue;
+
+                var message = messages[i];
+                message.Content = ScrambleText(message.Content);
+                messages[i] = message;
+            }
+
+            // 25% chance to reassign the conversation to a random recipient
+            if (_random.Prob(0.25f) && component.Recipients.Count > 0)
+            {
+                var newRecipient = _random.Pick(component.Recipients.Keys.ToList());
+                if (newRecipient == recipientNumber)
+                    continue;
+
+                if (!component.Messages.ContainsKey(newRecipient))
+                    component.Messages[newRecipient] = new List<NanoChatMessage>();
+
+                component.Messages[newRecipient].AddRange(messages);
+                component.Messages[recipientNumber].Clear();
+            }
+        }
+    }
+
+    private string ScrambleText(string text)
+    {
+        var chars = text.ToCharArray();
+        var n = chars.Length;
+
+        // Fisher-Yates shuffle of characters
+        while (n > 1)
+        {
+            n--;
+            var k = _random.Next(n + 1);
+            (chars[k], chars[n]) = (chars[n], chars[k]);
+        }
+
+        return new string(chars);
+    }
+
+    private void OnCardInit(Entity<NanoChatCardComponent> ent, ref MapInitEvent args)
+    {
+        if (ent.Comp.Number != null)
+            return;
+
+        // Assign a random number
+        _name.GenerateUniqueName(ent, _nameIdentifierGroup, out var number);
+        ent.Comp.Number = (uint)number;
+        Dirty(ent);
+    }
+}
diff --git a/Content.Shared/Access/SharedAgentIDCardSystem.cs b/Content.Shared/Access/SharedAgentIDCardSystem.cs
index aefd413de8b..b035bdff342 100644
--- a/Content.Shared/Access/SharedAgentIDCardSystem.cs
+++ b/Content.Shared/Access/SharedAgentIDCardSystem.cs
@@ -28,12 +28,26 @@ public sealed class AgentIDCardBoundUserInterfaceState : BoundUserInterfaceState
         public string CurrentName { get; }
         public string CurrentJob { get; }
         public string CurrentJobIconId { get; }
+        public uint? CurrentNumber { get; } // DeltaV
 
-        public AgentIDCardBoundUserInterfaceState(string currentName, string currentJob, string currentJobIconId)
+        public AgentIDCardBoundUserInterfaceState(string currentName, string currentJob, string currentJobIconId, uint? currentNumber = null) // DeltaV - Added currentNumber
         {
             CurrentName = currentName;
             CurrentJob = currentJob;
             CurrentJobIconId = currentJobIconId;
+            CurrentNumber = currentNumber; // DeltaV
+        }
+    }
+
+    // DeltaV - Add number change message
+    [Serializable, NetSerializable]
+    public sealed class AgentIDCardNumberChangedMessage : BoundUserInterfaceMessage
+    {
+        public uint Number { get; }
+
+        public AgentIDCardNumberChangedMessage(uint number)
+        {
+            Number = number;
         }
     }
 
diff --git a/Content.Shared/CartridgeLoader/Cartridges/LogProbeUiState.cs b/Content.Shared/CartridgeLoader/Cartridges/LogProbeUiState.cs
index 9dc507b7e51..86bbb655474 100644
--- a/Content.Shared/CartridgeLoader/Cartridges/LogProbeUiState.cs
+++ b/Content.Shared/CartridgeLoader/Cartridges/LogProbeUiState.cs
@@ -1,4 +1,5 @@
-using Robust.Shared.Serialization;
+using Content.Shared.DeltaV.CartridgeLoader.Cartridges; // DeltaV
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.CartridgeLoader.Cartridges;
 
@@ -10,9 +11,15 @@ public sealed class LogProbeUiState : BoundUserInterfaceState
     /// </summary>
     public List<PulledAccessLog> PulledLogs;
 
-    public LogProbeUiState(List<PulledAccessLog> pulledLogs)
+    /// <summary>
+    /// DeltaV: The NanoChat data if a card was scanned, null otherwise
+    /// </summary>
+    public NanoChatData? NanoChatData { get; }
+
+    public LogProbeUiState(List<PulledAccessLog> pulledLogs, NanoChatData? nanoChatData = null) // DeltaV - NanoChat support
     {
         PulledLogs = pulledLogs;
+        NanoChatData = nanoChatData; // DeltaV
     }
 }
 
diff --git a/Content.Shared/DeltaV/CartridgeLoader/Cartridges/NanoChatUiMessageEvent.cs b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/NanoChatUiMessageEvent.cs
new file mode 100644
index 00000000000..8cb2efa900f
--- /dev/null
+++ b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/NanoChatUiMessageEvent.cs
@@ -0,0 +1,166 @@
+using Content.Shared.CartridgeLoader;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.DeltaV.CartridgeLoader.Cartridges;
+
+[Serializable, NetSerializable]
+public sealed class NanoChatUiMessageEvent : CartridgeMessageEvent
+{
+    /// <summary>
+    ///     The type of UI message being sent.
+    /// </summary>
+    public readonly NanoChatUiMessageType Type;
+
+    /// <summary>
+    ///     The recipient's NanoChat number, if applicable.
+    /// </summary>
+    public readonly uint? RecipientNumber;
+
+    /// <summary>
+    ///     The content of the message or name for new chats.
+    /// </summary>
+    public readonly string? Content;
+
+    /// <summary>
+    ///     The recipient's job title when creating a new chat.
+    /// </summary>
+    public readonly string? RecipientJob;
+
+    /// <summary>
+    ///     Creates a new NanoChat UI message event.
+    /// </summary>
+    /// <param name="type">The type of message being sent</param>
+    /// <param name="recipientNumber">Optional recipient number for the message</param>
+    /// <param name="content">Optional content of the message</param>
+    /// <param name="recipientJob">Optional job title for new chat creation</param>
+    public NanoChatUiMessageEvent(NanoChatUiMessageType type,
+        uint? recipientNumber = null,
+        string? content = null,
+        string? recipientJob = null)
+    {
+        Type = type;
+        RecipientNumber = recipientNumber;
+        Content = content;
+        RecipientJob = recipientJob;
+    }
+}
+
+[Serializable, NetSerializable]
+public enum NanoChatUiMessageType : byte
+{
+    NewChat,
+    SelectChat,
+    CloseChat,
+    SendMessage,
+    DeleteChat,
+    ToggleMute,
+}
+
+// putting this here because i can
+[Serializable, NetSerializable, DataRecord]
+public struct NanoChatRecipient
+{
+    /// <summary>
+    ///     The recipient's unique NanoChat number.
+    /// </summary>
+    public uint Number;
+
+    /// <summary>
+    ///     The recipient's display name, typically from their ID card.
+    /// </summary>
+    public string Name;
+
+    /// <summary>
+    ///     The recipient's job title, if available.
+    /// </summary>
+    public string? JobTitle;
+
+    /// <summary>
+    ///     Whether this recipient has unread messages.
+    /// </summary>
+    public bool HasUnread;
+
+    /// <summary>
+    ///     Creates a new NanoChat recipient.
+    /// </summary>
+    /// <param name="number">The recipient's NanoChat number</param>
+    /// <param name="name">The recipient's display name</param>
+    /// <param name="jobTitle">Optional job title for the recipient</param>
+    /// <param name="hasUnread">Whether there are unread messages from this recipient</param>
+    public NanoChatRecipient(uint number, string name, string? jobTitle = null, bool hasUnread = false)
+    {
+        Number = number;
+        Name = name;
+        JobTitle = jobTitle;
+        HasUnread = hasUnread;
+    }
+}
+
+[Serializable, NetSerializable, DataRecord]
+public struct NanoChatMessage
+{
+    /// <summary>
+    ///     When the message was sent.
+    /// </summary>
+    public TimeSpan Timestamp;
+
+    /// <summary>
+    ///     The content of the message.
+    /// </summary>
+    public string Content;
+
+    /// <summary>
+    ///     The NanoChat number of the sender.
+    /// </summary>
+    public uint SenderId;
+
+    /// <summary>
+    ///     Whether the message failed to deliver to the recipient.
+    ///     This can happen if the recipient is out of range or if there's no active telecomms server.
+    /// </summary>
+    public bool DeliveryFailed;
+
+    /// <summary>
+    ///     Creates a new NanoChat message.
+    /// </summary>
+    /// <param name="timestamp">When the message was sent</param>
+    /// <param name="content">The content of the message</param>
+    /// <param name="senderId">The sender's NanoChat number</param>
+    /// <param name="deliveryFailed">Whether delivery to the recipient failed</param>
+    public NanoChatMessage(TimeSpan timestamp, string content, uint senderId, bool deliveryFailed = false)
+    {
+        Timestamp = timestamp;
+        Content = content;
+        SenderId = senderId;
+        DeliveryFailed = deliveryFailed;
+    }
+}
+
+/// <summary>
+///     NanoChat log data struct
+/// </summary>
+/// <remarks>Used by the LogProbe</remarks>
+[Serializable, NetSerializable, DataRecord]
+public readonly struct NanoChatData(
+    Dictionary<uint, NanoChatRecipient> recipients,
+    Dictionary<uint, List<NanoChatMessage>> messages,
+    uint? cardNumber,
+    NetEntity card)
+{
+    public Dictionary<uint, NanoChatRecipient> Recipients { get; } = recipients;
+    public Dictionary<uint, List<NanoChatMessage>> Messages { get; } = messages;
+    public uint? CardNumber { get; } = cardNumber;
+    public NetEntity Card { get; } = card;
+}
+
+/// <summary>
+///     Raised on the NanoChat card whenever a recipient gets added
+/// </summary>
+[ByRefEvent]
+public readonly record struct NanoChatRecipientUpdatedEvent(EntityUid CardUid);
+
+/// <summary>
+///     Raised on the NanoChat card whenever it receives or tries sending a messsage
+/// </summary>
+[ByRefEvent]
+public readonly record struct NanoChatMessageReceivedEvent(EntityUid CardUid);
diff --git a/Content.Shared/DeltaV/CartridgeLoader/Cartridges/NanoChatUiState.cs b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/NanoChatUiState.cs
new file mode 100644
index 00000000000..dde6751abc7
--- /dev/null
+++ b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/NanoChatUiState.cs
@@ -0,0 +1,30 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.DeltaV.CartridgeLoader.Cartridges;
+
+[Serializable, NetSerializable]
+public sealed class NanoChatUiState : BoundUserInterfaceState
+{
+    public readonly Dictionary<uint, NanoChatRecipient> Recipients = new();
+    public readonly Dictionary<uint, List<NanoChatMessage>> Messages = new();
+    public readonly uint? CurrentChat;
+    public readonly uint OwnNumber;
+    public readonly int MaxRecipients;
+    public readonly bool NotificationsMuted;
+
+    public NanoChatUiState(
+        Dictionary<uint, NanoChatRecipient> recipients,
+        Dictionary<uint, List<NanoChatMessage>> messages,
+        uint? currentChat,
+        uint ownNumber,
+        int maxRecipients,
+        bool notificationsMuted)
+    {
+        Recipients = recipients;
+        Messages = messages;
+        CurrentChat = currentChat;
+        OwnNumber = ownNumber;
+        MaxRecipients = maxRecipients;
+        NotificationsMuted = notificationsMuted;
+    }
+}
diff --git a/Content.Shared/DeltaV/NanoChat/NanoChatCardComponent.cs b/Content.Shared/DeltaV/NanoChat/NanoChatCardComponent.cs
new file mode 100644
index 00000000000..7e40be79832
--- /dev/null
+++ b/Content.Shared/DeltaV/NanoChat/NanoChatCardComponent.cs
@@ -0,0 +1,52 @@
+using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.DeltaV.NanoChat;
+
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedNanoChatSystem))]
+[AutoGenerateComponentPause, AutoGenerateComponentState]
+public sealed partial class NanoChatCardComponent : Component
+{
+    /// <summary>
+    ///     The number assigned to this card.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public uint? Number;
+
+    /// <summary>
+    ///     All chat recipients stored on this card.
+    /// </summary>
+    [DataField]
+    public Dictionary<uint, NanoChatRecipient> Recipients = new();
+
+    /// <summary>
+    ///     All messages stored on this card, keyed by recipient number.
+    /// </summary>
+    [DataField]
+    public Dictionary<uint, List<NanoChatMessage>> Messages = new();
+
+    /// <summary>
+    ///     The currently selected chat recipient number.
+    /// </summary>
+    [DataField]
+    public uint? CurrentChat;
+
+    /// <summary>
+    ///     The maximum amount of recipients this card supports.
+    /// </summary>
+    [DataField]
+    public int MaxRecipients = 50;
+
+    /// <summary>
+    ///     Last time a message was sent, for rate limiting.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
+    public TimeSpan LastMessageTime; // TODO: actually use this, compare against actor and not the card
+
+    /// <summary>
+    ///     Whether to send notifications.
+    /// </summary>
+    [DataField]
+    public bool NotificationsMuted;
+}
diff --git a/Content.Shared/DeltaV/NanoChat/SharedNanoChatSystem.cs b/Content.Shared/DeltaV/NanoChat/SharedNanoChatSystem.cs
new file mode 100644
index 00000000000..0a53122f87e
--- /dev/null
+++ b/Content.Shared/DeltaV/NanoChat/SharedNanoChatSystem.cs
@@ -0,0 +1,273 @@
+using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
+using Content.Shared.Examine;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.DeltaV.NanoChat;
+
+/// <summary>
+///     Base system for NanoChat functionality shared between client and server.
+/// </summary>
+public abstract class SharedNanoChatSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<NanoChatCardComponent, ExaminedEvent>(OnExamined);
+    }
+
+    private void OnExamined(Entity<NanoChatCardComponent> ent, ref ExaminedEvent args)
+    {
+        if (!args.IsInDetailsRange)
+            return;
+
+        if (ent.Comp.Number == null)
+        {
+            args.PushMarkup(Loc.GetString("nanochat-card-examine-no-number"));
+            return;
+        }
+
+        args.PushMarkup(Loc.GetString("nanochat-card-examine-number", ("number", $"{ent.Comp.Number:D4}")));
+    }
+
+    #region Public API Methods
+
+    /// <summary>
+    ///     Gets the NanoChat number for a card.
+    /// </summary>
+    public uint? GetNumber(Entity<NanoChatCardComponent?> card)
+    {
+        if (!Resolve(card, ref card.Comp))
+            return null;
+
+        return card.Comp.Number;
+    }
+
+    /// <summary>
+    ///     Sets the NanoChat number for a card.
+    /// </summary>
+    public void SetNumber(Entity<NanoChatCardComponent?> card, uint number)
+    {
+        if (!Resolve(card, ref card.Comp))
+            return;
+
+        card.Comp.Number = number;
+        Dirty(card);
+    }
+
+    /// <summary>
+    ///     Gets the recipients dictionary from a card.
+    /// </summary>
+    public IReadOnlyDictionary<uint, NanoChatRecipient> GetRecipients(Entity<NanoChatCardComponent?> card)
+    {
+        if (!Resolve(card, ref card.Comp))
+            return new Dictionary<uint, NanoChatRecipient>();
+
+        return card.Comp.Recipients;
+    }
+
+    /// <summary>
+    ///     Gets the messages dictionary from a card.
+    /// </summary>
+    public IReadOnlyDictionary<uint, List<NanoChatMessage>> GetMessages(Entity<NanoChatCardComponent?> card)
+    {
+        if (!Resolve(card, ref card.Comp))
+            return new Dictionary<uint, List<NanoChatMessage>>();
+
+        return card.Comp.Messages;
+    }
+
+    /// <summary>
+    ///     Sets a specific recipient in the card.
+    /// </summary>
+    public void SetRecipient(Entity<NanoChatCardComponent?> card, uint number, NanoChatRecipient recipient)
+    {
+        if (!Resolve(card, ref card.Comp))
+            return;
+
+        card.Comp.Recipients[number] = recipient;
+        Dirty(card);
+    }
+
+    /// <summary>
+    ///     Gets a specific recipient from the card.
+    /// </summary>
+    public NanoChatRecipient? GetRecipient(Entity<NanoChatCardComponent?> card, uint number)
+    {
+        if (!Resolve(card, ref card.Comp) || !card.Comp.Recipients.TryGetValue(number, out var recipient))
+            return null;
+
+        return recipient;
+    }
+
+    /// <summary>
+    ///     Gets all messages for a specific recipient.
+    /// </summary>
+    public List<NanoChatMessage>? GetMessagesForRecipient(Entity<NanoChatCardComponent?> card, uint recipientNumber)
+    {
+        if (!Resolve(card, ref card.Comp) || !card.Comp.Messages.TryGetValue(recipientNumber, out var messages))
+            return null;
+
+        return new List<NanoChatMessage>(messages);
+    }
+
+    /// <summary>
+    ///     Adds a message to a recipient's conversation.
+    /// </summary>
+    public void AddMessage(Entity<NanoChatCardComponent?> card, uint recipientNumber, NanoChatMessage message)
+    {
+        if (!Resolve(card, ref card.Comp))
+            return;
+
+        if (!card.Comp.Messages.TryGetValue(recipientNumber, out var messages))
+        {
+            messages = new List<NanoChatMessage>();
+            card.Comp.Messages[recipientNumber] = messages;
+        }
+
+        messages.Add(message);
+        card.Comp.LastMessageTime = _timing.CurTime;
+        Dirty(card);
+    }
+
+    /// <summary>
+    ///     Gets the currently selected chat recipient.
+    /// </summary>
+    public uint? GetCurrentChat(Entity<NanoChatCardComponent?> card)
+    {
+        if (!Resolve(card, ref card.Comp))
+            return null;
+
+        return card.Comp.CurrentChat;
+    }
+
+    /// <summary>
+    ///     Sets the currently selected chat recipient.
+    /// </summary>
+    public void SetCurrentChat(Entity<NanoChatCardComponent?> card, uint? recipient)
+    {
+        if (!Resolve(card, ref card.Comp))
+            return;
+
+        card.Comp.CurrentChat = recipient;
+        Dirty(card);
+    }
+
+    /// <summary>
+    ///     Gets whether notifications are muted.
+    /// </summary>
+    public bool GetNotificationsMuted(Entity<NanoChatCardComponent?> card)
+    {
+        if (!Resolve(card, ref card.Comp))
+            return false;
+
+        return card.Comp.NotificationsMuted;
+    }
+
+    /// <summary>
+    ///     Sets whether notifications are muted.
+    /// </summary>
+    public void SetNotificationsMuted(Entity<NanoChatCardComponent?> card, bool muted)
+    {
+        if (!Resolve(card, ref card.Comp))
+            return;
+
+        card.Comp.NotificationsMuted = muted;
+        Dirty(card);
+    }
+
+    /// <summary>
+    ///     Gets the time of the last message.
+    /// </summary>
+    public TimeSpan? GetLastMessageTime(Entity<NanoChatCardComponent?> card)
+    {
+        if (!Resolve(card, ref card.Comp))
+            return null;
+
+        return card.Comp.LastMessageTime;
+    }
+
+    /// <summary>
+    ///     Gets if there are unread messages from a recipient.
+    /// </summary>
+    public bool HasUnreadMessages(Entity<NanoChatCardComponent?> card, uint recipientNumber)
+    {
+        if (!Resolve(card, ref card.Comp) || !card.Comp.Recipients.TryGetValue(recipientNumber, out var recipient))
+            return false;
+
+        return recipient.HasUnread;
+    }
+
+    /// <summary>
+    ///     Clears all messages and recipients from the card.
+    /// </summary>
+    public void Clear(Entity<NanoChatCardComponent?> card)
+    {
+        if (!Resolve(card, ref card.Comp))
+            return;
+
+        card.Comp.Messages.Clear();
+        card.Comp.Recipients.Clear();
+        card.Comp.CurrentChat = null;
+        Dirty(card);
+    }
+
+    /// <summary>
+    ///     Deletes a chat conversation with a recipient from the card.
+    ///     Optionally keeps message history while removing from active chats.
+    /// </summary>
+    /// <returns>True if the chat was deleted successfully</returns>
+    public bool TryDeleteChat(Entity<NanoChatCardComponent?> card, uint recipientNumber, bool keepMessages = false)
+    {
+        if (!Resolve(card, ref card.Comp))
+            return false;
+
+        // Remove from recipients list
+        var removed = card.Comp.Recipients.Remove(recipientNumber);
+
+        // Clear messages if requested
+        if (!keepMessages)
+            card.Comp.Messages.Remove(recipientNumber);
+
+        // Clear current chat if we just deleted it
+        if (card.Comp.CurrentChat == recipientNumber)
+            card.Comp.CurrentChat = null;
+
+        if (removed)
+            Dirty(card);
+
+        return removed;
+    }
+
+    /// <summary>
+    ///     Ensures a recipient exists in the card's contacts and message lists.
+    ///     If the recipient doesn't exist, they will be added with the provided info.
+    /// </summary>
+    /// <returns>True if the recipient was added or already existed</returns>
+    public bool EnsureRecipientExists(Entity<NanoChatCardComponent?> card,
+        uint recipientNumber,
+        NanoChatRecipient? recipientInfo = null)
+    {
+        if (!Resolve(card, ref card.Comp))
+            return false;
+
+        if (!card.Comp.Recipients.ContainsKey(recipientNumber))
+        {
+            // Only add if we have recipient info
+            if (recipientInfo == null)
+                return false;
+
+            card.Comp.Recipients[recipientNumber] = recipientInfo.Value;
+        }
+
+        // Ensure message list exists for this recipient
+        if (!card.Comp.Messages.ContainsKey(recipientNumber))
+            card.Comp.Messages[recipientNumber] = new List<NanoChatMessage>();
+
+        Dirty(card);
+        return true;
+    }
+
+    #endregion
+}
diff --git a/Resources/Locale/en-US/deltav/access/components/agent-id-card-component.ftl b/Resources/Locale/en-US/deltav/access/components/agent-id-card-component.ftl
new file mode 100644
index 00000000000..00b6312fbde
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/access/components/agent-id-card-component.ftl
@@ -0,0 +1 @@
+agent-id-card-current-number = NanoChat Number
diff --git a/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl b/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl
index ec6fe1e11ae..dbf38ac3e9e 100644
--- a/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl
+++ b/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl
@@ -158,3 +158,45 @@ stock-trading-buy-button = Buy
 stock-trading-sell-button = Sell
 stock-trading-amount-placeholder = Amount
 stock-trading-price-history = Price History
+
+
+## NanoChat
+
+# General
+nano-chat-program-name = NanoChat
+nano-chat-title = NanoChat
+nano-chat-new-chat = New Chat
+nano-chat-contacts = CONTACTS
+nano-chat-no-chats = No active chats
+nano-chat-select-chat = Select a chat to begin
+nano-chat-message-placeholder = Type a message...
+nano-chat-send = Send
+nano-chat-delete = Delete
+nano-chat-loading = Loading...
+nano-chat-message-too-long = Message too long ({$current}/{$max} characters)
+nano-chat-max-recipients = Maximum number of chats reached
+nano-chat-new-message-title = Message from {$sender}
+nano-chat-new-message-body = {$message}
+nano-chat-toggle-mute = Mute notifications
+nano-chat-delivery-failed = Failed to deliver
+
+# Create chat popup
+nano-chat-new-title = Add a new chat
+nano-chat-number-label = Number
+nano-chat-name-label = Name
+nano-chat-job-label = Job title
+nano-chat-number-placeholder = Enter a number
+nano-chat-name-placeholder = Enter a name
+nano-chat-job-placeholder = Enter a job title (optional)
+nano-chat-cancel = Cancel
+nano-chat-create = Create
+
+# LogProbe additions
+log-probe-scan-nanochat = Scanned {$card}'s NanoChat logs
+log-probe-header-access = Access Log Scanner
+log-probe-header-nanochat = NanoChat Log Scanner
+log-probe-label-message = Message
+log-probe-card-number = Card: {$number}
+log-probe-recipients = {$count} Recipients
+log-probe-recipient-list = Known Recipients:
+log-probe-message-format = {$sender} → {$recipient}: {$content}
diff --git a/Resources/Locale/en-US/deltav/nanochat/components/nanochat-card-component.ftl b/Resources/Locale/en-US/deltav/nanochat/components/nanochat-card-component.ftl
new file mode 100644
index 00000000000..d04c3066d5d
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/nanochat/components/nanochat-card-component.ftl
@@ -0,0 +1,7 @@
+# Examine
+nanochat-card-examine-no-number = The NanoChat card has not been assigned a number yet.
+nanochat-card-examine-number = The NanoChat card displays #{$number}.
+
+# Microwave interactions
+nanochat-card-microwave-erased = The {$card} emits a soft beep as all its message history vanishes into the ether!
+nanochat-card-microwave-scrambled = The {$card} crackles as its messages become scrambled!
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/cartridges.yml
index 94b9210e60c..9c7e221b86d 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/cartridges.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/cartridges.yml
@@ -83,3 +83,24 @@
   - type: BankClient
   - type: AccessReader # This is so that we can restrict who can buy stocks
     access: [["Orders"]]
+
+- type: entity
+  parent: BaseItem
+  id: NanoChatCartridge
+  name: NanoChat cartridge
+  description: Lets you message other people!
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Devices/cartridge.rsi
+    state: cart-chat
+  - type: UIFragment
+    ui: !type:NanoChatUi
+  - type: NanoChatCartridge
+  - type: Cartridge
+    programName: nano-chat-program-name
+    icon:
+      sprite: DeltaV/Misc/program_icons.rsi
+      state: nanochat
+  - type: ActiveRadio
+    channels:
+    - Common
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
index b640206c912..df4e52792b5 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
@@ -23,6 +23,7 @@
       - NewsReaderCartridge
       - CrimeAssistCartridge
       - SecWatchCartridge
+      - NanoChatCartridge
   - type: Pda
     id: BrigmedicIDCard
     state: pda-corpsman
diff --git a/Resources/Prototypes/DeltaV/name_identifier_groups.yml b/Resources/Prototypes/DeltaV/name_identifier_groups.yml
new file mode 100644
index 00000000000..aeb5cf152ad
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/name_identifier_groups.yml
@@ -0,0 +1,4 @@
+# used by the nanochatcard numbers
+- type: nameIdentifierGroup
+  id: NanoChat
+  maxValue: 9999
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index f4abe6ba213..b936ef82c0a 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -76,6 +76,7 @@
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
+      - NanoChatCartridge # DeltaV
     cartridgeSlot:
       priority: -1
       name: device-pda-slot-component-slot-name-cartridge
@@ -198,6 +199,7 @@
       - NewsReaderCartridge
       - CrimeAssistCartridge
       - SecWatchCartridge
+      - NanoChatCartridge
 
 - type: entity
   parent: BasePDA
@@ -375,6 +377,7 @@
       - NotekeeperCartridge
       - NewsReaderCartridge
       - MailMetricsCartridge
+      - NanoChatCartridge
       - StockTradingCartridge # DeltaV - StockTrading
 
 - type: entity
@@ -398,6 +401,7 @@
       - NewsReaderCartridge
       - MailMetricsCartridge # DeltaV - MailMetrics courier tracker
       - StockTradingCartridge # DeltaV - StockTrading
+      - NanoChatCartridge # DeltaV
 
 - type: entity
   parent: BasePDA
@@ -418,6 +422,7 @@
     - NotekeeperCartridge
     - NewsReaderCartridge
     - StockTradingCartridge # DeltaV - StockTrading
+    - NanoChatCartridge # DeltaV
 
 - type: entity
   parent: BasePDA
@@ -433,6 +438,14 @@
     accentVColor: "#8900c9"
   - type: Icon
     state: pda-miner
+  - type: CartridgeLoader
+    uiKey: enum.PdaUiKey.Key
+    preinstalled:
+      - CrewManifestCartridge
+      - NotekeeperCartridge
+      - NewsReaderCartridge
+      - AstroNavCartridge
+      - NanoChatCartridge # DeltaV
 
 - type: entity
   parent: BasePDA
@@ -473,6 +486,7 @@
       - NotekeeperCartridge
       - NewsReaderCartridge
       - GlimmerMonitorCartridge
+      - NanoChatCartridge
 
 - type: entity
   parent: BasePDA
@@ -500,6 +514,7 @@
       - NewsReaderCartridge
       - CrimeAssistCartridge
       - SecWatchCartridge
+      - NanoChatCartridge
 
 - type: entity
   parent: BasePDA
@@ -780,6 +795,7 @@
       - NotekeeperCartridge
       - NewsReaderCartridge
       - GlimmerMonitorCartridge
+      - NanoChatCartridge # DeltaV
 
 - type: entity
   parent: BasePDA
@@ -802,6 +818,7 @@
       - NotekeeperCartridge
       - NewsReaderCartridge
       - GlimmerMonitorCartridge
+      - NanoChatCartridge
 
 - type: entity
   parent: BasePDA
@@ -823,6 +840,7 @@
       - NotekeeperCartridge
       - NewsReaderCartridge
       - GlimmerMonitorCartridge
+      - NanoChatCartridge # DeltaV
 
 - type: entity
   parent: SciencePDA
@@ -855,11 +873,13 @@
     state: pda-hos
   - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
     preinstalled:
-      - CrewManifestCartridge
-      - NotekeeperCartridge
-      - NewsReaderCartridge
-      - CrimeAssistCartridge
-      - SecWatchCartridge
+    - CrewManifestCartridge
+    - NotekeeperCartridge
+    - NewsReaderCartridge
+    - CrimeAssistCartridge # DeltaV
+    - SecWatchCartridge # DeltaV: SecWatch replaces WantedList
+    - LogProbeCartridge
+    - NanoChatCartridge # DeltaV
 
 - type: entity
   parent: BasePDA
@@ -882,6 +902,7 @@
       - NewsReaderCartridge
       - CrimeAssistCartridge
       - SecWatchCartridge
+      - NanoChatCartridge
 
 - type: entity
   parent: BasePDA
@@ -904,6 +925,7 @@
       - NewsReaderCartridge
       - CrimeAssistCartridge
       - SecWatchCartridge
+      - NanoChatCartridge
 
 - type: entity
   parent: BasePDA
@@ -925,6 +947,7 @@
       - NewsReaderCartridge
       - CrimeAssistCartridge
       - SecWatchCartridge
+      - NanoChatCartridge
 
 - type: entity
   parent: BasePDA
@@ -944,6 +967,17 @@
     borderColor: "#00842e"
   - type: Icon
     state: pda-centcom
+  - type: CartridgeLoader
+    uiKey: enum.PdaUiKey.Key
+    preinstalled:
+      - CrewManifestCartridge
+      - NotekeeperCartridge
+      - NewsReaderCartridge
+      - MedTekCartridge
+      - SecWatchCartridge # DeltaV: SecWatch replaces WantedList
+      - LogProbeCartridge
+      - AstroNavCartridge
+      - NanoChatCartridge # DeltaV
 
 - type: entity
   parent: CentcomPDA
@@ -957,11 +991,18 @@
     scanDelay: 0
   - type: CartridgeLoader
     uiKey: enum.PdaUiKey.Key
+    notificationsEnabled: false
+    diskSpace: 10 # DeltaV
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - LogProbeCartridge
+      - SecWatchCartridge # DeltaV: SecWatch replaces WantedList
+      - MedTekCartridge
+      - AstroNavCartridge
+      - StockTradingCartridge # Delta-V
+      - NanoChatCartridge # DeltaV
       - StockTradingCartridge # DeltaV - StockTrading
 
 - type: entity
@@ -1045,6 +1086,7 @@
     uiKey: enum.PdaUiKey.Key
     preinstalled:
       - NotekeeperCartridge
+      - NanoChatCartridge # DeltaV
     cartridgeSlot:
       priority: -1
       name: Cartridge
@@ -1072,6 +1114,17 @@
     accentVColor: "#447987"
   - type: Icon
     state: pda-ert
+  - type: CartridgeLoader
+    uiKey: enum.PdaUiKey.Key
+    preinstalled:
+      - CrewManifestCartridge
+      - NotekeeperCartridge
+      - NewsReaderCartridge
+      - MedTekCartridge
+      - SecWatchCartridge # DeltaV: SecWatch replaces WantedList
+      - LogProbeCartridge
+      - AstroNavCartridge
+      - NanoChatCartridge # DeltaV
 
 - type: entity
   parent: ERTLeaderPDA
@@ -1186,6 +1239,7 @@
     - NotekeeperCartridge
     - NewsReaderCartridge
     - StockTradingCartridge # DeltaV - StockTrading
+    - NanoChatCartridge # DeltaV
 
 - type: entity
   parent: BasePDA
@@ -1231,11 +1285,13 @@
     state: pda-detective
   - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
     preinstalled:
-      - CrewManifestCartridge
-      - NotekeeperCartridge
-      - NewsReaderCartridge
-      - CrimeAssistCartridge
-      - SecWatchCartridge
+    - CrewManifestCartridge
+    - NotekeeperCartridge
+    - NewsReaderCartridge
+    - CrimeAssistCartridge # DeltaV
+    - SecWatchCartridge # DeltaV: SecWatch replaces WantedList
+    - LogProbeCartridge
+    - NanoChatCartridge # DeltaV
 
 - type: entity
   parent: BaseMedicalPDA
@@ -1260,11 +1316,13 @@
     state: pda-brigmedic
   - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
     preinstalled:
-      - CrewManifestCartridge
-      - NotekeeperCartridge
-      - NewsReaderCartridge
-      - CrimeAssistCartridge
-      - SecWatchCartridge
+    - CrewManifestCartridge
+    - NotekeeperCartridge
+    - NewsReaderCartridge
+    - CrimeAssistCartridge # DeltaV
+    - SecWatchCartridge # DeltaV: SecWatch replaces WantedList
+    - MedTekCartridge
+    - NanoChatCartridge # DeltaV
 
 - type: entity
   parent: ClownPDA
@@ -1363,6 +1421,7 @@
       - NewsReaderCartridge
       - CrimeAssistCartridge
       - SecWatchCartridge
+      - NanoChatCartridge
 
 - type: entity
   parent: SyndiPDA
@@ -1399,6 +1458,7 @@
     uiKey: enum.PdaUiKey.Key
     preinstalled:
       - NotekeeperCartridge
+      - NanoChatCartridge # DeltaV
     cartridgeSlot:
       priority: -1
       name: Cartridge
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index b6ddf00d215..948fe421029 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -24,6 +24,7 @@
     - WhitelistChameleon
   - type: StealTarget
     stealGroup: IDCard
+  - type: NanoChatCard # DeltaV
 
 #IDs with layers
 
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml
index c85255f814e..d4a315d431e 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml
@@ -39,6 +39,7 @@
       - NewsReaderCartridge
       - CrimeAssistCartridge
       - SecWatchCartridge
+      - NanoChatCartridge
 
 - type: entity
   parent: BasePDA
@@ -119,3 +120,4 @@
      - NotekeeperCartridge
      - NewsReaderCartridge
      - GlimmerMonitorCartridge
+     - NanoChatCartridge
diff --git a/Resources/Textures/DeltaV/Interface/VerbIcons/ATTRIBUTION.txt b/Resources/Textures/DeltaV/Interface/VerbIcons/ATTRIBUTION.txt
new file mode 100644
index 00000000000..c4cc0324d56
--- /dev/null
+++ b/Resources/Textures/DeltaV/Interface/VerbIcons/ATTRIBUTION.txt
@@ -0,0 +1,2 @@
+bell.svg taken from https://coreui.io/icons/
+Licensed under CC BY 4.0
diff --git a/Resources/Textures/DeltaV/Interface/VerbIcons/bell.svg b/Resources/Textures/DeltaV/Interface/VerbIcons/bell.svg
new file mode 100644
index 00000000000..4274db2113f
--- /dev/null
+++ b/Resources/Textures/DeltaV/Interface/VerbIcons/bell.svg
@@ -0,0 +1,5 @@
+<!-- Generated by IcoMoon.io -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+<title>bell</title>
+<path d="M21.106 16.339l-2.047-3.779v-3.935c0-3.929-3.196-7.125-7.125-7.125s-7.125 3.196-7.125 7.125v3.935l-2.047 3.779c-0.085 0.155-0.136 0.339-0.136 0.536 0 0.621 0.504 1.125 1.125 1.125h4.075c-0.011 0.124-0.017 0.249-0.017 0.375 0 2.278 1.847 4.125 4.125 4.125s4.125-1.847 4.125-4.125v0c0-0.126-0.006-0.251-0.017-0.375h4.075c0 0 0 0 0 0 0.621 0 1.125-0.504 1.125-1.125 0-0.196-0.050-0.381-0.139-0.542l0.003 0.006zM14.559 18.375c0 0.001 0 0.001 0 0.002 0 1.45-1.175 2.625-2.625 2.625s-2.625-1.175-2.625-2.625c0-0.133 0.010-0.264 0.029-0.392l-0.002 0.014h5.196c0.017 0.113 0.027 0.243 0.027 0.375v0zM4.381 16.5l1.928-3.56v-4.315c0-3.107 2.518-5.625 5.625-5.625s5.625 2.518 5.625 5.625v0 4.315l1.928 3.56z"></path>
+</svg>
diff --git a/Resources/Textures/DeltaV/Interface/VerbIcons/bell.svg.png b/Resources/Textures/DeltaV/Interface/VerbIcons/bell.svg.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fada9e5afde46b39b4073a0eb87fa10a212324c
GIT binary patch
literal 720
zcmV;>0x$iEP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0%b`=K~#8N?b|_4
z!!Qs9(1v4_dzCF)F2V|N3=UK&`&1Q3tyH9P0r0dRlZ3GoJ7Xtl=51Uu!5&ZSkV080
zrBp88{cLdhZNQ{rB`-#SRvcxImlE!aqWHjTQQ`$K^In_g{rZ(GQv~sR@6d|CRrgMw
zCgEbj57)DJ!mH{+tfC#s1utP=e<+p+krm)d_Ha17P_jnw{>AsP6ZI7*)Zj{*T-ZJD
zN<M~b!V+UhtbnAGC)D3=w=40bC9x6)CCVirJ^8v6<B9$hFuZs1p}5I%MF|mIy%blY
zulCqO#uZxuxhBuyE=FHb1u)}{`i5o9VqZ|j>&(ylCxo)W&=wBofiW!{&I&_YWm!HW
zlpe;ka5yVkbr{}4C`i;^Y7aKno|MQ#`Z-{Bv;b%qOACN@v9tha7fTC(cCoYoXctQh
zfVQ{x8;~h6snM_Kg9H_T8(^$=f)2rdlMGz}N&e^=i!1*5e161BS?20*X!+M6G%BRh
zfRHTo-GI>OkdAdaoxTu~K^>xR3!zEa@AnnbvJjGiJ}vPI3qWcO2n~b28W5TklUAC0
z6#A;0?5DVpUjssM&_@G8lVs9cU$gv!kdyZzrcVcR;Coop_X22dmhbA5&gb|!Z-cJM
zlg<-jw2Rg!5sp+pK6(#8J2~d!&-YW~v~=rmI0(Mg+HSY62#Lya4<MoYx7|mI{ZEo?
z0WR69s^0Lj6Ia05p-HqIkH=4hop5RcLi2<CIsa~OIL^W;NhH}<bwekRYVZF_UH}qX
zgw&HKS)KzTCPM#Uk>%oKN1x}T6~VzNN-34eYV`w!V;E*x+{JJJ0000<MNUMnLSTYG
CI6>$D

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Interface/VerbIcons/bell_muted.png b/Resources/Textures/DeltaV/Interface/VerbIcons/bell_muted.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d0ba804285d5fef5ad17207cc298fe222c9bd4d
GIT binary patch
literal 355
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1quc!5^M3jv*CsZ*Lmr9SRU(4J>mx{Lg%Xnst%i
zM{f4N0vYq4cTH4H7B_C4_~GrI!_SXgx2o;6JsGck$nDRWHyqLrWs8+_QvN5Uwe-Hw
ze&(w1^{>iLc~=L)02UEOR|`4*_Qd267B|;~E5?l>f*zt^;^B__<%`y9Fm*L3Enrs$
zksJ^XE{e_V$CvxhCa!<heP9*Gnyv$@%mdc^DoqGw33Ej!z9zPm-d?k@%KFf*)O$1b
ziYCU|6~Bpdi<o{^?sRU;*RQ6>zJ<4x-pbo9|L_Q-Q2qkv*}yPh@O1TaS?83{1OU}*
Bg^K_H

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Misc/program_icons.rsi/meta.json b/Resources/Textures/DeltaV/Misc/program_icons.rsi/meta.json
index 1a7d2a16194..96c74d48aa2 100644
--- a/Resources/Textures/DeltaV/Misc/program_icons.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Misc/program_icons.rsi/meta.json
@@ -1,14 +1,17 @@
 {
     "version": 1,
     "license": "CC0-1.0",
-    "copyright": "stock_trading made by Malice",
+    "copyright": "stock_trading made by Malice, nanochat made by kushbreth (discord)",
     "size": {
-      "x": 32,
-      "y": 32
+        "x": 32,
+        "y": 32
     },
     "states": [
-      {
-        "name": "stock_trading"
-      }
+        {
+            "name": "stock_trading"
+        },
+        {
+            "name": "nanochat"
+        }
     ]
 }
diff --git a/Resources/Textures/DeltaV/Misc/program_icons.rsi/nanochat.png b/Resources/Textures/DeltaV/Misc/program_icons.rsi/nanochat.png
new file mode 100644
index 0000000000000000000000000000000000000000..2126d34cfa157afe67c005348652597f62a59526
GIT binary patch
literal 725
zcmV;`0xJE9P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XT
z000XT0n*)m`~Uy|8+1ijbW?9;ba!ELWdK8EY;$>YAX9X8WNB|8RBvx=!KdMT0006;
zNkl<ZScSEhzfK!L5XQfig|<O7_W+T66?GaUTHIN3gK%XUWGaxLN)xKkQ01ghB}$Vt
z1koVT@gDA6<N;_bnv-QM)okYGX8)XVzV3GKZhkxa-Q28k&LO38P$qA(g+={Rt8??`
zxd}aIVgMAler>+^`==`S%<0WV6KvZ?L4p9W;4(;RJ_exzgo4XJQZX>QZD9+G+1)G-
z!1tQ~R?Ai6o}Zt;;pF<f6+|2FZS_0=iD#h!P!3AR%@hLQ0ZAH=1|YNG0W_z_0OV>z
zS<x~8{L4ZRz!nyZzl$J1uAXim)bU9*#q4fojB^g<pmg_NegOcEu8si!bUnHpW3^nh
zUNk&AYy{A*pKc%gxCZudZ(j$ng~jiSA5j1vBn7}h_}J0aF--rU@A!(f3_O1Q6AiL%
z22=oo=n9|#$(74@1Od1>fRqH#=3*I`RMR%Vq?-Eu?*gD@gRfkQw%YU$`i`4!lOEvL
z^j@j|Zo<*!7(lxaQN{HD+W$ONigQGjaOcC0+Anwjplw8=r#g^IGl?5d^T4E<dKj}i
z-gWg$o%I#u0??c`F1--+0FAxZguShvf1a;A3xGV3`x&MH<mzo<^*SK?fprU!1|ZEI
ztOEqqr4;7?NVWckQk(Pu2cXW#1Mn>H-~d#BoPK}<Xa<}=&yCs<(LSXLkue6TgN@db
z@xHLtlmg*DV^<B&4!d>590G`+3%V-%T)-hVl?gK6T1PYBeVL%thYqM&htt@}H)nqB
z)3F5U5>(r7O>f|kTdmaYCmR3&01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXX
Hu0mjf{AWJA

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Devices/cartridge.rsi/cart-chat.png b/Resources/Textures/DeltaV/Objects/Devices/cartridge.rsi/cart-chat.png
new file mode 100644
index 0000000000000000000000000000000000000000..80a921c94de591d266043d1f631e1f9c91b505f1
GIT binary patch
literal 419
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W
zHKHUqKdq!Zu_%?nIW?!avREOwq%<WnUm+wvKj+}`hcyfgj3S;cjv*1PZ?A0hI_w~G
z{A0e?Qzmy$3l`Pt=ldG?g?6P1{9^O-o4d=JLw1+v2g{nqb9bAYT3U)G9KK}Xx+OIF
zwv6kJ`z43v>*Rm@w_Lw2+fVX5qs#$DnFsL<Q-atvKihooW7AmrN~7yS)c=(+UY^rZ
ztp%$Yn-mgm)*p`H*mYWz|N8g)=lGT@hwasSbo4^>oWN<R)eYBI^A#<edG{PcM}E>J
z&s|^rj&bhNx2%ua&aJ_gePr`bCI%1nmtqHExDHhww_Bi@uMoy~maBpPNZO=Ari66X
zvx0WV%6XPAmVdrh_Mu{??1SHSL8s!MZ@m^0dR5PX!%?Em`n0`r*P;Uw#Wo8Z-(1}@
zF>GJb?Lr3j0tR*q%LlR+85|d+#4G;;gOM*a!ZXd+mq822<^W<4xD-4YM0vXUxvX<a
GXaWEQyq}%`

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Devices/cartridge.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Devices/cartridge.rsi/meta.json
index e7d607aa4a8..ba96751650a 100644
--- a/Resources/Textures/DeltaV/Objects/Devices/cartridge.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Objects/Devices/cartridge.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Timfa, plus edits by portfiend",
+    "copyright": "cart-chat made by kushbreth (discord), cart-cri, cart-mail, cart-stonk made by Monotheonist (github), edited from cart-log, cart-nav & cart-med cartridges; cart-log made by Skarletto (github), cart-nav, cart-med made by ArchRBX (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -13,6 +13,9 @@
         {
             "name": "cart-mail"
         },
+        {
+            "name": "cart-chat"
+        },
         {
             "name": "cart-stonk"
         }

From 0c70547ed634a6b0dd716da1e77ea4ef077a2a1e Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Wed, 25 Dec 2024 17:07:40 -0400
Subject: [PATCH 295/366] yeag

---
 Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml   | 3 +++
 .../Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml    | 1 +
 2 files changed, 4 insertions(+)

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
index df4e52792b5..bcc6c0fe2cf 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
@@ -76,6 +76,7 @@
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
+      - NanoChatCartridge
 
 - type: entity
   parent: BasePDA
@@ -115,6 +116,7 @@
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
+      - NanoChatCartridge # DeltaV
 
 - type: entity
   parent: BasePDA
@@ -154,6 +156,7 @@
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
+      - NanoChatCartridge
 
 - type: entity
   parent: SyndiPDA
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml
index d4a315d431e..f2a16126b96 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml
@@ -74,6 +74,7 @@
     - NotekeeperCartridge
     - NewsReaderCartridge
     - MailMetricsCartridge
+    - NanoChatCartridge
 
 - type: entity
   parent: BasePDA

From 3383b844ce266b63bdd5ef134a99147968ea3dde Mon Sep 17 00:00:00 2001
From: Fildrance <fildrance@gmail.com>
Date: Tue, 3 Sep 2024 16:01:38 +0300
Subject: [PATCH 296/366] feat: now when research is unlocked in console,
 approver of reasearch is radio-ed too (#31170)

* feat: now when research is unlocked in console, approver of reasearch is radio-ed too

* refactor: now most of events that require actor name to be radio-ed or logged use TryGetIdentityShortInfoEvent which is subscibed by id-card system and borg system (to work for both carbon and synthetic life-forms)

* refactor: moved TryGetIdentityShortInfoEvent on id card system to shared, fixed cargo cent-com-originated orders

* remove unused check

* refactor: decoupled systems from IdCardSystem (those that are not dependent on it anymore)

* refactor: removed unuseed usings

* feat: emagged cargo/research consoles wont radio messages on buy/research confirm anymore

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
---
 Content.Server/Access/Systems/IdCardSystem.cs |  1 +
 .../Cargo/Systems/CargoSystem.Orders.cs       | 25 +++++++++------
 Content.Server/Cargo/Systems/CargoSystem.cs   |  2 --
 .../CommunicationsConsoleSystem.cs            | 13 +++-----
 .../Systems/CriminalRecordsConsoleSystem.cs   | 10 ++++--
 .../MassMedia/Systems/NewsSystem.cs           | 11 +++++--
 .../Systems/ResearchSystem.Console.cs         | 21 +++++++++---
 .../Access/Systems/AccessReaderSystem.cs      | 11 ++++---
 .../Access/Systems/SharedIdCardSystem.cs      | 27 ++++++++++++++++
 Content.Shared/Cargo/CargoOrderData.cs        |  5 +++
 .../TryGetIdentityShortInfoEvent.cs           | 32 +++++++++++++++++++
 .../Silicons/Borgs/SharedBorgSystem.cs        | 20 +++++++++++-
 .../components/research-console-component.ftl |  2 +-
 13 files changed, 144 insertions(+), 36 deletions(-)
 create mode 100644 Content.Shared/IdentityManagement/TryGetIdentityShortInfoEvent.cs

diff --git a/Content.Server/Access/Systems/IdCardSystem.cs b/Content.Server/Access/Systems/IdCardSystem.cs
index b49bc55d1be..aeb4cc163fb 100644
--- a/Content.Server/Access/Systems/IdCardSystem.cs
+++ b/Content.Server/Access/Systems/IdCardSystem.cs
@@ -24,6 +24,7 @@ public sealed class IdCardSystem : SharedIdCardSystem
     public override void Initialize()
     {
         base.Initialize();
+
         SubscribeLocalEvent<IdCardComponent, BeingMicrowavedEvent>(OnMicrowaved);
     }
 
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
index 35bd53da273..db732d0046c 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
@@ -9,6 +9,8 @@
 using Content.Shared.Cargo.Events;
 using Content.Shared.Cargo.Prototypes;
 using Content.Shared.Database;
+using Content.Shared.Emag.Components;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
@@ -194,15 +196,20 @@ private void OnApproveOrderMessage(EntityUid uid, CargoOrderConsoleComponent com
             order.SetApproverData(idCard.Comp?.FullName, idCard.Comp?.JobTitle);
             _audio.PlayPvs(component.ConfirmSound, uid);
 
-            var approverName = idCard.Comp?.FullName ?? Loc.GetString("access-reader-unknown-id");
-            var approverJob = idCard.Comp?.JobTitle ?? Loc.GetString("access-reader-unknown-id");
-            var message = Loc.GetString("cargo-console-unlock-approved-order-broadcast",
-                ("productName", Loc.GetString(order.ProductName)),
-                ("orderAmount", order.OrderQuantity),
-                ("approverName", approverName),
-                ("approverJob", approverJob),
-                ("cost", cost));
-            _radio.SendRadioMessage(uid, message, component.AnnouncementChannel, uid, escapeMarkup: false);
+            if (!HasComp<EmaggedComponent>(uid))
+            {
+                var tryGetIdentityShortInfoEvent = new TryGetIdentityShortInfoEvent(uid, player);
+                RaiseLocalEvent(tryGetIdentityShortInfoEvent);
+                order.SetApproverData(tryGetIdentityShortInfoEvent.Title);
+
+                var message = Loc.GetString("cargo-console-unlock-approved-order-broadcast",
+                    ("productName", Loc.GetString(order.ProductName)),
+                    ("orderAmount", order.OrderQuantity),
+                    ("approver", order.Approver ?? string.Empty),
+                    ("cost", cost));
+                _radio.SendRadioMessage(uid, message, component.AnnouncementChannel, uid, escapeMarkup: false);
+            }
+
             ConsolePopup(args.Actor, Loc.GetString("cargo-console-trade-station", ("destination", MetaData(ev.FulfillmentEntity.Value).EntityName)));
 
             // Log order approval
diff --git a/Content.Server/Cargo/Systems/CargoSystem.cs b/Content.Server/Cargo/Systems/CargoSystem.cs
index 32fae1bf108..eb6329dc691 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.cs
@@ -1,4 +1,3 @@
-using Content.Server.Access.Systems;
 using Content.Server.Cargo.Components;
 using Content.Server.DeviceLinking.Systems;
 using Content.Server.Paper;
@@ -33,7 +32,6 @@ public sealed partial class CargoSystem : SharedCargoSystem
     [Dependency] private readonly AccessReaderSystem _accessReaderSystem = default!;
     [Dependency] private readonly DeviceLinkSystem _linker = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
-    [Dependency] private readonly IdCardSystem _idCardSystem = default!;
     [Dependency] private readonly ItemSlotsSystem _slots = default!;
     [Dependency] private readonly PaperSystem _paperSystem = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
diff --git a/Content.Server/Communications/CommunicationsConsoleSystem.cs b/Content.Server/Communications/CommunicationsConsoleSystem.cs
index 0cdcb3a47f8..c3e5b912549 100644
--- a/Content.Server/Communications/CommunicationsConsoleSystem.cs
+++ b/Content.Server/Communications/CommunicationsConsoleSystem.cs
@@ -1,15 +1,11 @@
-using System.Globalization;
-using Content.Server.Access.Systems;
 using Content.Server.Administration.Logs;
 using Content.Server.AlertLevel;
 using Content.Server.Chat.Systems;
-using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.Interaction;
 using Content.Server.Popups;
 using Content.Server.RoundEnd;
-using Content.Server.Screens;
 using Content.Server.Screens.Components;
 using Content.Server.Shuttles.Systems;
 using Content.Server.Station.Systems;
@@ -21,6 +17,7 @@
 using Content.Shared.Database;
 using Content.Shared.DeviceNetwork;
 using Content.Shared.Emag.Components;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Popups;
 using Robust.Server.GameObjects;
 using Robust.Shared.Configuration;
@@ -38,7 +35,6 @@ public sealed class CommunicationsConsoleSystem : EntitySystem
         [Dependency] private readonly ChatSystem _chatSystem = default!;
         [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!;
         [Dependency] private readonly EmergencyShuttleSystem _emergency = default!;
-        [Dependency] private readonly IdCardSystem _idCardSystem = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
         [Dependency] private readonly RoundEndSystem _roundEndSystem = default!;
         [Dependency] private readonly StationSystem _stationSystem = default!;
@@ -257,10 +253,9 @@ private void OnAnnounceMessage(EntityUid uid, CommunicationsConsoleComponent com
                     return;
                 }
 
-                if (_idCardSystem.TryFindIdCard(mob, out var id))
-                {
-                    author = $"{id.Comp.FullName} ({CultureInfo.CurrentCulture.TextInfo.ToTitleCase(id.Comp.JobTitle ?? string.Empty)})".Trim();
-                }
+                var tryGetIdentityShortInfoEvent = new TryGetIdentityShortInfoEvent(uid, mob);
+                RaiseLocalEvent(tryGetIdentityShortInfoEvent);
+                author = tryGetIdentityShortInfoEvent.Title;
             }
 
             comp.AnnouncementCooldownRemaining = comp.Delay;
diff --git a/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs b/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs
index 4389c68c049..e8d6f2210fd 100644
--- a/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs
+++ b/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs
@@ -10,7 +10,6 @@
 using Content.Shared.Security;
 using Content.Shared.StationRecords;
 using Robust.Server.GameObjects;
-using Robust.Shared.Player;
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Security.Components;
@@ -108,8 +107,13 @@ private void OnChangeStatus(Entity<CriminalRecordsConsoleComponent> ent, ref Cri
 
         var name = RecordName(key.Value);
         var officer = Loc.GetString("criminal-records-console-unknown-officer");
-        if (_idCard.TryFindIdCard(mob.Value, out var id) && id.Comp.FullName is { } fullName)
-            officer = fullName;
+
+        var tryGetIdentityShortInfoEvent = new TryGetIdentityShortInfoEvent(null, mob.Value);
+        RaiseLocalEvent(tryGetIdentityShortInfoEvent);
+        if (tryGetIdentityShortInfoEvent.Title != null)
+        {
+            officer = tryGetIdentityShortInfoEvent.Title;
+        }
 
         (string, object)[] args;
         if (reason != null)
diff --git a/Content.Server/MassMedia/Systems/NewsSystem.cs b/Content.Server/MassMedia/Systems/NewsSystem.cs
index 3246de5316c..5536bbcd299 100644
--- a/Content.Server/MassMedia/Systems/NewsSystem.cs
+++ b/Content.Server/MassMedia/Systems/NewsSystem.cs
@@ -1,4 +1,6 @@
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using Content.Server.Access.Systems;
 using Content.Server.Administration.Logs;
 using Content.Server.CartridgeLoader;
 using Content.Server.CartridgeLoader.Cartridges;
@@ -20,6 +22,8 @@
 using Content.Shared.Popups;
 using Content.Shared.StationRecords;
 using Robust.Shared.Audio.Systems;
+using Content.Shared.IdentityManagement;
+using Robust.Shared.Timing;
 
 namespace Content.Server.MassMedia.Systems;
 
@@ -35,6 +39,7 @@ public sealed class NewsSystem : SharedNewsSystem
     [Dependency] private readonly GameTicker _ticker = default!;
     [Dependency] private readonly AccessReaderSystem _accessReader = default!;
     [Dependency] private readonly IdCardSystem _idCardSystem = default!;
+    [Dependency] private readonly IChatManager _chatManager = default!;
 
     public override void Initialize()
     {
@@ -135,9 +140,9 @@ private void OnWriteUiPublishMessage(Entity<NewsWriterComponent> ent, ref NewsWr
         if (!TryGetArticles(ent, out var articles))
             return;
 
-        string? authorName = null;
-        if (_idCardSystem.TryFindIdCard(msg.Actor, out var idCard))
-            authorName = idCard.Comp.FullName;
+        var tryGetIdentityShortInfoEvent = new TryGetIdentityShortInfoEvent(ent, msg.Actor);
+        RaiseLocalEvent(tryGetIdentityShortInfoEvent);
+        string? authorName = tryGetIdentityShortInfoEvent.Title;
 
         var title = msg.Title.Trim();
         var content = msg.Content.Trim();
diff --git a/Content.Server/Research/Systems/ResearchSystem.Console.cs b/Content.Server/Research/Systems/ResearchSystem.Console.cs
index 5358ddefcdf..127b80a631e 100644
--- a/Content.Server/Research/Systems/ResearchSystem.Console.cs
+++ b/Content.Server/Research/Systems/ResearchSystem.Console.cs
@@ -2,6 +2,8 @@
 using Content.Server.Research.Components;
 using Content.Shared.UserInterface;
 using Content.Shared.Access.Components;
+using Content.Shared.Emag.Components;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Research.Components;
 using Content.Shared.Research.Prototypes;
 
@@ -37,10 +39,20 @@ private void OnConsoleUnlock(EntityUid uid, ResearchConsoleComponent component,
         if (!UnlockTechnology(uid, args.Id, act))
             return;
 
-        var message = Loc.GetString("research-console-unlock-technology-radio-broadcast",
-            ("technology", Loc.GetString(technologyPrototype.Name)),
-            ("amount", technologyPrototype.Cost));
-        _radio.SendRadioMessage(uid, message, component.AnnouncementChannel, uid, escapeMarkup: false);
+        if (!HasComp<EmaggedComponent>(uid))
+        {
+            var getIdentityEvent = new TryGetIdentityShortInfoEvent(uid, act);
+            RaiseLocalEvent(getIdentityEvent);
+
+            var message = Loc.GetString(
+                "research-console-unlock-technology-radio-broadcast",
+                ("technology", Loc.GetString(technologyPrototype.Name)),
+                ("amount", technologyPrototype.Cost),
+                ("approver", getIdentityEvent.Title ?? string.Empty)
+            );
+            _radio.SendRadioMessage(uid, message, component.AnnouncementChannel, uid, escapeMarkup: false);
+        }
+       
         SyncClientWithServer(uid);
         UpdateConsoleInterface(uid, component);
     }
@@ -87,4 +99,5 @@ private void OnConsoleDatabaseModified(EntityUid uid, ResearchConsoleComponent c
     {
         UpdateConsoleInterface(uid, component);
     }
+
 }
diff --git a/Content.Shared/Access/Systems/AccessReaderSystem.cs b/Content.Shared/Access/Systems/AccessReaderSystem.cs
index 3670e24bd32..dd0bf7bde2e 100644
--- a/Content.Shared/Access/Systems/AccessReaderSystem.cs
+++ b/Content.Shared/Access/Systems/AccessReaderSystem.cs
@@ -11,6 +11,7 @@
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Content.Shared.GameTicking;
+using Content.Shared.IdentityManagement;
 using Robust.Shared.Collections;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
@@ -24,7 +25,6 @@ public sealed class AccessReaderSystem : EntitySystem
     [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly SharedGameTicker _gameTicker = default!;
     [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
-    [Dependency] private readonly SharedIdCardSystem _idCardSystem = default!;
     [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
     [Dependency] private readonly SharedStationRecordsSystem _recordsSystem = default!;
 
@@ -395,9 +395,12 @@ private void LogAccess(Entity<AccessReaderComponent> ent, EntityUid accessor)
         string? name = null;
         // TODO pass the ID card on IsAllowed() instead of using this expensive method
         // Set name if the accessor has a card and that card has a name and allows itself to be recorded
-        if (_idCardSystem.TryFindIdCard(accessor, out var idCard)
-            && idCard.Comp is { BypassLogging: false, FullName: not null })
-            name = idCard.Comp.FullName;
+        var getIdentityShortInfoEvent = new TryGetIdentityShortInfoEvent(ent, accessor, true);
+        RaiseLocalEvent(getIdentityShortInfoEvent);
+        if (getIdentityShortInfoEvent.Title != null)
+        {
+            name = getIdentityShortInfoEvent.Title;
+        }
 
         name ??= Loc.GetString("access-reader-unknown-id");
 
diff --git a/Content.Shared/Access/Systems/SharedIdCardSystem.cs b/Content.Shared/Access/Systems/SharedIdCardSystem.cs
index 762c146f36f..bdd4873a6d0 100644
--- a/Content.Shared/Access/Systems/SharedIdCardSystem.cs
+++ b/Content.Shared/Access/Systems/SharedIdCardSystem.cs
@@ -1,7 +1,9 @@
+using System.Globalization;
 using Content.Shared.Access.Components;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 using Content.Shared.Hands.Components;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Inventory;
 using Content.Shared.PDA;
 using Content.Shared.Roles;
@@ -20,7 +22,9 @@ public abstract class SharedIdCardSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
+
         SubscribeLocalEvent<IdCardComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<TryGetIdentityShortInfoEvent>(OnTryGetIdentityShortInfo);
     }
 
     private void OnMapInit(EntityUid uid, IdCardComponent id, MapInitEvent args)
@@ -28,6 +32,23 @@ private void OnMapInit(EntityUid uid, IdCardComponent id, MapInitEvent args)
         UpdateEntityName(uid, id);
     }
 
+    private void OnTryGetIdentityShortInfo(TryGetIdentityShortInfoEvent ev)
+    {
+        if (ev.Handled)
+        {
+            return;
+        }
+
+        string? title = null;
+        if (TryFindIdCard(ev.ForActor, out var idCard) && !(ev.RequestForAccessLogging && idCard.Comp.BypassLogging))
+        {
+            title = ExtractFullTitle(idCard);
+        }
+
+        ev.Title = title;
+        ev.Handled = true;
+    }
+
     /// <summary>
     ///     Attempt to find an ID card on an entity. This will look in the entity itself, in the entity's hands, and
     ///     in the entity's inventory.
@@ -214,4 +235,10 @@ private void UpdateEntityName(EntityUid uid, IdCardComponent? id = null)
                 ("jobSuffix", jobSuffix));
         _metaSystem.SetEntityName(uid, val);
     }
+
+    private static string ExtractFullTitle(IdCardComponent idCardComponent)
+    {
+        return $"{idCardComponent.FullName} ({CultureInfo.CurrentCulture.TextInfo.ToTitleCase(idCardComponent.JobTitle ?? string.Empty)})"
+            .Trim();
+    }
 }
diff --git a/Content.Shared/Cargo/CargoOrderData.cs b/Content.Shared/Cargo/CargoOrderData.cs
index ce05d922362..7b3490630e6 100644
--- a/Content.Shared/Cargo/CargoOrderData.cs
+++ b/Content.Shared/Cargo/CargoOrderData.cs
@@ -63,6 +63,11 @@ public CargoOrderData(int orderId, string productId, string productName, int pri
             Reason = reason;
         }
 
+        public void SetApproverData(string? approver)
+        {
+            Approver = approver;
+        }
+
         public void SetApproverData(string? fullName, string? jobTitle)
         {
             var sb = new StringBuilder();
diff --git a/Content.Shared/IdentityManagement/TryGetIdentityShortInfoEvent.cs b/Content.Shared/IdentityManagement/TryGetIdentityShortInfoEvent.cs
new file mode 100644
index 00000000000..1303896e7b8
--- /dev/null
+++ b/Content.Shared/IdentityManagement/TryGetIdentityShortInfoEvent.cs
@@ -0,0 +1,32 @@
+namespace Content.Shared.IdentityManagement;
+
+/// <summary>
+/// Event of attempt to collect actor full title - full name + job from id card for employee or entity name for borgs.
+/// </summary>
+public sealed class TryGetIdentityShortInfoEvent(EntityUid? whileInteractingWith, EntityUid forActor, bool forLogging = false) : HandledEntityEventArgs
+{
+    /// <summary>
+    /// Full name of <see cref="ForActor"/>, with JobTitle.
+    /// Can be null if no system could find actor name / job.
+    /// </summary>
+    public string? Title;
+
+    /// <summary>
+    /// Entity for interacting with which title should be collected.
+    /// Could be used to black-out name of people when announcing actions
+    /// on e-magged devices.
+    /// </summary>
+    public readonly EntityUid? WhileInteractingWith = whileInteractingWith;
+
+    /// <summary>
+    /// Actor for whom title should be collected.
+    /// </summary>
+    public readonly EntityUid ForActor = forActor;
+
+    /// <summary>
+    /// Marker that title info was requested for access logging.
+    /// Is required as event handlers can determine, if they don't need
+    /// to place title info due to access logging restrictions.
+    /// </summary>
+    public readonly bool RequestForAccessLogging = forLogging;
+}
diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
index 896d97bf52c..8c82ffcefa6 100644
--- a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
+++ b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
@@ -1,5 +1,5 @@
-using Content.Shared.Access.Components;
 using Content.Shared.Containers.ItemSlots;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Item.ItemToggle;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
@@ -32,10 +32,28 @@ public override void Initialize()
         SubscribeLocalEvent<BorgChassisComponent, EntInsertedIntoContainerMessage>(OnInserted);
         SubscribeLocalEvent<BorgChassisComponent, EntRemovedFromContainerMessage>(OnRemoved);
         SubscribeLocalEvent<BorgChassisComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovementSpeedModifiers);
+        SubscribeLocalEvent<BorgChassisComponent, ActivatableUIOpenAttemptEvent>(OnUIOpenAttempt);
+        SubscribeLocalEvent<TryGetIdentityShortInfoEvent>(OnTryGetIdentityShortInfo);
 
         InitializeRelay();
     }
 
+    private void OnTryGetIdentityShortInfo(TryGetIdentityShortInfoEvent args)
+    {
+        if (args.Handled)
+        {
+            return;
+        }
+
+        if (!HasComp<BorgChassisComponent>(args.ForActor))
+        {
+            return;
+        }
+
+        args.Title = Name(args.ForActor).Trim();
+        args.Handled = true;
+    }
+
     private void OnItemSlotInsertAttempt(EntityUid uid, BorgChassisComponent component, ref ItemSlotInsertAttemptEvent args)
     {
         if (args.Cancelled)
diff --git a/Resources/Locale/en-US/research/components/research-console-component.ftl b/Resources/Locale/en-US/research/components/research-console-component.ftl
index 33070480e54..5a1e074f4d4 100644
--- a/Resources/Locale/en-US/research/components/research-console-component.ftl
+++ b/Resources/Locale/en-US/research/components/research-console-component.ftl
@@ -18,4 +18,4 @@ research-console-prereqs-list-start = Requires:
 research-console-prereqs-list-entry = - [color=orchid]{$text}[/color]
 
 research-console-no-access-popup = No access!
-research-console-unlock-technology-radio-broadcast = Unlocked [bold]{$technology}[/bold] for [bold]{$amount}[/bold] research.
+research-console-unlock-technology-radio-broadcast = Unlocked [bold]{$technology}[/bold] for [bold]{$amount}[/bold] research by [bold]{$approver}[/bold].

From 3876fce9b689a09906c17fb4f295fa5d92852838 Mon Sep 17 00:00:00 2001
From: chavonadelal <156101927+chavonadelal@users.noreply.github.com>
Date: Wed, 9 Oct 2024 18:05:36 +0300
Subject: [PATCH 297/366] Job title localization (#32338)

* Job title localization

* Correcting fields
---
 Content.Server/Access/Systems/IdCardConsoleSystem.cs     | 2 +-
 Content.Server/IdentityManagement/IdentitySystem.cs      | 2 +-
 Content.Server/Medical/SuitSensors/SuitSensorSystem.cs   | 4 ++--
 Content.Server/PDA/PdaSystem.cs                          | 2 +-
 Content.Shared/Access/Components/IdCardComponent.cs      | 7 ++++++-
 Content.Shared/Access/Systems/IdExaminableSystem.cs      | 2 +-
 Content.Shared/Access/Systems/SharedIdCardSystem.cs      | 9 +++++----
 Resources/Locale/en-US/job/job-names.ftl                 | 5 +++++
 .../Entities/Objects/Misc/identification_cards.yml       | 2 +-
 9 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/Content.Server/Access/Systems/IdCardConsoleSystem.cs b/Content.Server/Access/Systems/IdCardConsoleSystem.cs
index 95ffe81bcef..7a0422de9eb 100644
--- a/Content.Server/Access/Systems/IdCardConsoleSystem.cs
+++ b/Content.Server/Access/Systems/IdCardConsoleSystem.cs
@@ -96,7 +96,7 @@ private void UpdateUserInterface(EntityUid uid, IdCardConsoleComponent component
                 PrivilegedIdIsAuthorized(uid, component),
                 true,
                 targetIdComponent.FullName,
-                targetIdComponent.JobTitle,
+                targetIdComponent.LocalizedJobTitle,
                 targetAccessComponent.Tags.ToList(),
                 possibleAccess,
                 jobProto,
diff --git a/Content.Server/IdentityManagement/IdentitySystem.cs b/Content.Server/IdentityManagement/IdentitySystem.cs
index 4766b89172f..1a2cdcce511 100644
--- a/Content.Server/IdentityManagement/IdentitySystem.cs
+++ b/Content.Server/IdentityManagement/IdentitySystem.cs
@@ -165,7 +165,7 @@ private IdentityRepresentation GetIdentityRepresentation(EntityUid target,
         if (_idCard.TryFindIdCard(target, out var id))
         {
             presumedName = string.IsNullOrWhiteSpace(id.Comp.FullName) ? null : id.Comp.FullName;
-            presumedJob = id.Comp.JobTitle?.ToLowerInvariant();
+            presumedJob = id.Comp.LocalizedJobTitle?.ToLowerInvariant();
         }
 
         // If it didn't find a job, that's fine.
diff --git a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
index 2bb6b490d22..aee62a58e58 100644
--- a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
+++ b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
@@ -326,8 +326,8 @@ public void SetSensor(EntityUid uid, SuitSensorMode mode, EntityUid? userUid = n
         {
             if (card.Comp.FullName != null)
                 userName = card.Comp.FullName;
-            if (card.Comp.JobTitle != null)
-                userJob = card.Comp.JobTitle;
+            if (card.Comp.LocalizedJobTitle != null)
+                userJob = card.Comp.LocalizedJobTitle;
             userJobIcon = card.Comp.JobIcon;
 
             foreach (var department in card.Comp.JobDepartments)
diff --git a/Content.Server/PDA/PdaSystem.cs b/Content.Server/PDA/PdaSystem.cs
index 691d024ecd7..9401d68de3e 100644
--- a/Content.Server/PDA/PdaSystem.cs
+++ b/Content.Server/PDA/PdaSystem.cs
@@ -177,7 +177,7 @@ public void UpdatePdaUi(EntityUid uid, PdaComponent? pda = null)
                 {
                     ActualOwnerName = pda.OwnerName,
                     IdOwner = id?.FullName,
-                    JobTitle = id?.JobTitle,
+                    JobTitle = id?.LocalizedJobTitle,
                     StationAlertLevel = pda.StationAlertLevel,
                     StationAlertColor = pda.StationAlertColor
                 },
diff --git a/Content.Shared/Access/Components/IdCardComponent.cs b/Content.Shared/Access/Components/IdCardComponent.cs
index 9879a02dbcd..22d97169af3 100644
--- a/Content.Shared/Access/Components/IdCardComponent.cs
+++ b/Content.Shared/Access/Components/IdCardComponent.cs
@@ -19,7 +19,12 @@ public sealed partial class IdCardComponent : Component
     [DataField]
     [AutoNetworkedField]
     [Access(typeof(SharedIdCardSystem), typeof(SharedPdaSystem), typeof(SharedAgentIdCardSystem), Other = AccessPermissions.ReadWrite)]
-    public string? JobTitle;
+    public LocId? JobTitle;
+
+    private string? _jobTitle;
+
+    [Access(typeof(SharedIdCardSystem), typeof(SharedPdaSystem), typeof(SharedAgentIdCardSystem), Other = AccessPermissions.ReadWriteExecute)]
+    public string? LocalizedJobTitle { set => _jobTitle = value; get => _jobTitle ?? Loc.GetString(JobTitle ?? string.Empty); }
 
     /// <summary>
     /// The state of the job icon rsi.
diff --git a/Content.Shared/Access/Systems/IdExaminableSystem.cs b/Content.Shared/Access/Systems/IdExaminableSystem.cs
index 333272e27ac..7ca96befa85 100644
--- a/Content.Shared/Access/Systems/IdExaminableSystem.cs
+++ b/Content.Shared/Access/Systems/IdExaminableSystem.cs
@@ -66,7 +66,7 @@ public string GetMessage(EntityUid uid)
 
     private string GetNameAndJob(IdCardComponent id)
     {
-        var jobSuffix = string.IsNullOrWhiteSpace(id.JobTitle) ? string.Empty : $" ({id.JobTitle})";
+        var jobSuffix = string.IsNullOrWhiteSpace(id.LocalizedJobTitle) ? string.Empty : $" ({id.LocalizedJobTitle})";
 
         var val = string.IsNullOrWhiteSpace(id.FullName)
             ? Loc.GetString(id.NameLocId,
diff --git a/Content.Shared/Access/Systems/SharedIdCardSystem.cs b/Content.Shared/Access/Systems/SharedIdCardSystem.cs
index bdd4873a6d0..c031902b6ed 100644
--- a/Content.Shared/Access/Systems/SharedIdCardSystem.cs
+++ b/Content.Shared/Access/Systems/SharedIdCardSystem.cs
@@ -103,6 +103,7 @@ public bool TryGetIdCard(EntityUid uid, out Entity<IdCardComponent> idCard)
     /// </summary>
     /// <remarks>
     /// If provided with a player's EntityUid to the player parameter, adds the change to the admin logs.
+    /// Actually works with the LocalizedJobTitle DataField and not with JobTitle.
     /// </remarks>
     public bool TryChangeJobTitle(EntityUid uid, string? jobTitle, IdCardComponent? id = null, EntityUid? player = null)
     {
@@ -121,9 +122,9 @@ public bool TryChangeJobTitle(EntityUid uid, string? jobTitle, IdCardComponent?
             jobTitle = null;
         }
 
-        if (id.JobTitle == jobTitle)
+        if (id.LocalizedJobTitle == jobTitle)
             return true;
-        id.JobTitle = jobTitle;
+        id.LocalizedJobTitle = jobTitle;
         Dirty(uid, id);
         UpdateEntityName(uid, id);
 
@@ -225,7 +226,7 @@ private void UpdateEntityName(EntityUid uid, IdCardComponent? id = null)
         if (!Resolve(uid, ref id))
             return;
 
-        var jobSuffix = string.IsNullOrWhiteSpace(id.JobTitle) ? string.Empty : $" ({id.JobTitle})";
+        var jobSuffix = string.IsNullOrWhiteSpace(id.LocalizedJobTitle) ? string.Empty : $" ({id.LocalizedJobTitle})";
 
         var val = string.IsNullOrWhiteSpace(id.FullName)
             ? Loc.GetString(id.NameLocId,
@@ -238,7 +239,7 @@ private void UpdateEntityName(EntityUid uid, IdCardComponent? id = null)
 
     private static string ExtractFullTitle(IdCardComponent idCardComponent)
     {
-        return $"{idCardComponent.FullName} ({CultureInfo.CurrentCulture.TextInfo.ToTitleCase(idCardComponent.JobTitle ?? string.Empty)})"
+        return $"{idCardComponent.FullName} ({CultureInfo.CurrentCulture.TextInfo.ToTitleCase(idCardComponent.LocalizedJobTitle ?? string.Empty)})"
             .Trim();
     }
 }
diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl
index aea1ad3f16c..39d7ab86add 100644
--- a/Resources/Locale/en-US/job/job-names.ftl
+++ b/Resources/Locale/en-US/job/job-names.ftl
@@ -63,6 +63,11 @@ job-name-unknown = Unknown
 job-name-virologist = Virologist
 job-name-zombie = Zombie
 
+# Job titles
+job-title-visitor = Visitor
+job-title-cluwne = Cluwne
+job-title-universal = Universal
+
 # Role timers - Make these alphabetical or I cut you
 JobAtmosphericTechnician = Atmospheric Technician
 JobBartender = Bartender
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index 948fe421029..c48f9e0e34c 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -1038,7 +1038,7 @@
     - state: clown
       color: "#7C0A0A"
   - type: IdCard
-    jobTitle: Cluwne
+    jobTitle: job-title-cluwne
   - type: Unremoveable
 
 - type: entity

From 193183256734b2f386bd1b268fbc9d3ba5107aa6 Mon Sep 17 00:00:00 2001
From: SolStar <44028047+ewokswagger@users.noreply.github.com>
Date: Mon, 9 Dec 2024 12:05:19 -0500
Subject: [PATCH 298/366] Automatic ACO procedure (#2351)

* Add events for player updating jobs

* Add NoCaptainComponent

* add and remove NoCaptainComponent logic

* Gernalized to CaptainStateComponent

* Generalized CaptainStateComponent

* Add requesting aco vote

* Add auto unlock aa

* Remove hardcodecd strings

* Add localization

* // DeltaV

* pro fix

* fax cc please

* move captain detection to CaptainStateSystem

* track spareidsafe with comp instead

* little bit of movement

* fix broken formating

Signed-off-by: SolStar <44028047+ewokswagger@users.noreply.github.com>

* pls

* Remove unused method

* subscribe captainstatecomponent for job events

* Cvars, Disabled AA on peri

* temp fix for intergration test bug

* :3

* format fix

* spelling ops

* nameing ops

* done final real this time (1) (1)

* remove has an out very nice

---------

Signed-off-by: SolStar <44028047+ewokswagger@users.noreply.github.com>
---
 Content.IntegrationTests/Tests/EntityTest.cs  |   5 +
 .../DeltaV/Cabinet/SpareIDSafeComponent.cs    |   4 +
 .../Components/CaptainStateComponent.cs       |  64 +++++++
 .../DeltaV/Station/Events/PlayerJobEvents.cs  |  21 +++
 .../Station/Systems/CaptainStateSystem.cs     | 165 ++++++++++++++++++
 .../Station/Systems/StationJobsSystem.cs      |  15 +-
 Content.Shared/DeltaV/CCVars/DCCVars.cs       |  63 ++++++-
 .../Locale/en-US/deltav/job/captain-state.ftl |   6 +
 .../Objects/Specific/Command/safe.yml         |   1 +
 .../DeltaV/Entities/Stations/base.yml         |   9 +
 .../Entities/Stations/nanotrasen.yml          |   1 +
 11 files changed, 350 insertions(+), 4 deletions(-)
 create mode 100644 Content.Server/DeltaV/Cabinet/SpareIDSafeComponent.cs
 create mode 100644 Content.Server/DeltaV/Station/Components/CaptainStateComponent.cs
 create mode 100644 Content.Server/DeltaV/Station/Events/PlayerJobEvents.cs
 create mode 100644 Content.Server/DeltaV/Station/Systems/CaptainStateSystem.cs
 create mode 100644 Resources/Locale/en-US/deltav/job/captain-state.ftl

diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs
index 56645660673..0a52129b403 100644
--- a/Content.IntegrationTests/Tests/EntityTest.cs
+++ b/Content.IntegrationTests/Tests/EntityTest.cs
@@ -268,6 +268,11 @@ await server.WaitPost(() =>
                 if (protoId == "MobHumanSpaceNinja")
                     continue;
 
+                // TODO fix tests properly upstream
+                // Fails due to audio components made when making anouncements
+                if (protoId == "StandardNanotrasenStation")
+                    continue;
+
                 var count = server.EntMan.EntityCount;
                 var clientCount = client.EntMan.EntityCount;
                 EntityUid uid = default;
diff --git a/Content.Server/DeltaV/Cabinet/SpareIDSafeComponent.cs b/Content.Server/DeltaV/Cabinet/SpareIDSafeComponent.cs
new file mode 100644
index 00000000000..40f97486ce3
--- /dev/null
+++ b/Content.Server/DeltaV/Cabinet/SpareIDSafeComponent.cs
@@ -0,0 +1,4 @@
+namespace Content.Server.DeltaV.Cabinet;
+
+[RegisterComponent]
+public sealed partial class SpareIDSafeComponent : Component;
diff --git a/Content.Server/DeltaV/Station/Components/CaptainStateComponent.cs b/Content.Server/DeltaV/Station/Components/CaptainStateComponent.cs
new file mode 100644
index 00000000000..96d7c441071
--- /dev/null
+++ b/Content.Server/DeltaV/Station/Components/CaptainStateComponent.cs
@@ -0,0 +1,64 @@
+using Content.Server.DeltaV.Station.Systems;
+using Content.Server.Station.Systems;
+using Content.Shared.Access;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.DeltaV.Station.Components;
+
+/// <summary>
+/// Denotes a station has no captain and holds data for automatic ACO systems
+/// </summary>
+[RegisterComponent, Access(typeof(CaptainStateSystem), typeof(StationSystem))]
+public sealed partial class CaptainStateComponent : Component
+{
+    /// <summary>
+    /// Denotes wether the entity has a captain or not
+    /// </summary>
+    /// <remarks>
+    /// Assume no captain unless specified
+    /// </remarks>
+    [DataField]
+    public bool HasCaptain;
+
+    /// <summary>
+    /// The localization ID used for announcing the cancellation of ACO requests
+    /// </summary>
+    [DataField]
+    public LocId RevokeACOMessage = "captain-arrived-revoke-aco-announcement";
+
+    /// <summary>
+    /// The localization ID for requesting an ACO vote when AA will be unlocked
+    /// </summary>
+    [DataField]
+    public LocId ACORequestWithAAMessage = "no-captain-request-aco-vote-with-aa-announcement";
+
+    /// <summary>
+    /// The localization ID for requesting an ACO vote when AA will not be unlocked
+    /// </summary>
+    [DataField]
+    public LocId ACORequestNoAAMessage = "no-captain-request-aco-vote-announcement";
+
+    /// <summary>
+    /// Set after ACO has been requested to avoid duplicate calls
+    /// </summary>
+    [DataField]
+    public bool IsACORequestActive;
+
+    /// <summary>
+    /// Used to denote that AA has been brought into the round either from captain or safe.
+    /// </summary>
+    [DataField]
+    public bool IsAAInPlay;
+
+    /// <summary>
+    /// The localization ID for announcing that AA has been unlocked for ACO
+    /// </summary>
+    [DataField]
+    public LocId AAUnlockedMessage = "no-captain-aa-unlocked-announcement";
+
+    /// <summary>
+    /// The access level to grant to spare ID cabinets
+    /// </summary>
+    [DataField]
+    public ProtoId<AccessLevelPrototype> ACOAccess = "Command";
+}
diff --git a/Content.Server/DeltaV/Station/Events/PlayerJobEvents.cs b/Content.Server/DeltaV/Station/Events/PlayerJobEvents.cs
new file mode 100644
index 00000000000..d34e5994202
--- /dev/null
+++ b/Content.Server/DeltaV/Station/Events/PlayerJobEvents.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Roles;
+using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.DeltaV.Station.Events;
+
+/// <summary>
+/// Raised on a station when a after a players jobs are removed from the PlayerJobs
+/// </summary>
+/// <param name="NetUserId">Player whos jobs were removed</param>
+/// <param name="PlayerJobs">Entry in PlayerJobs removed a list of JobPrototypes</param>
+[ByRefEvent]
+public record struct PlayerJobsRemovedEvent(NetUserId NetUserId, List<ProtoId<JobPrototype>> PlayerJobs);
+
+/// <summary>
+/// Raised on a staion when a job is added to a player
+/// </summary>
+/// <param name="NetUserId">Player who recived a job</param>
+/// <param name="JobPrototypeId">Id of the jobPrototype added</param>
+[ByRefEvent]
+public record struct PlayerJobAddedEvent(NetUserId NetUserId, string JobPrototypeId);
diff --git a/Content.Server/DeltaV/Station/Systems/CaptainStateSystem.cs b/Content.Server/DeltaV/Station/Systems/CaptainStateSystem.cs
new file mode 100644
index 00000000000..328994d1782
--- /dev/null
+++ b/Content.Server/DeltaV/Station/Systems/CaptainStateSystem.cs
@@ -0,0 +1,165 @@
+using Content.Server.Chat.Systems;
+using Content.Server.DeltaV.Cabinet;
+using Content.Server.DeltaV.Station.Components;
+using Content.Server.DeltaV.Station.Events;
+using Content.Server.GameTicking;
+using Content.Server.Station.Components;
+using Content.Shared.Access.Components;
+using Content.Shared.Access;
+using Content.Shared.DeltaV.CCVars;
+using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
+using System.Linq;
+
+namespace Content.Server.DeltaV.Station.Systems;
+
+public sealed class CaptainStateSystem : EntitySystem
+{
+    [Dependency] private readonly ChatSystem _chat = default!;
+    [Dependency] private readonly GameTicker _ticker = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+
+    private bool _aaEnabled;
+    private bool _acoOnDeparture;
+    private TimeSpan _aaDelay;
+    private TimeSpan _acoDelay;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<CaptainStateComponent, PlayerJobAddedEvent>(OnPlayerJobAdded);
+        SubscribeLocalEvent<CaptainStateComponent, PlayerJobsRemovedEvent>(OnPlayerJobsRemoved);
+        Subs.CVar(_cfg, DCCVars.AutoUnlockAllAccessEnabled, a => _aaEnabled = a, true);
+        Subs.CVar(_cfg, DCCVars.RequestAcoOnCaptainDeparture, a => _acoOnDeparture = a, true);
+        Subs.CVar(_cfg, DCCVars.AutoUnlockAllAccessDelay, a => _aaDelay = a, true);
+        Subs.CVar(_cfg, DCCVars.RequestAcoDelay, a => _acoDelay = a, true);
+        base.Initialize();
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var currentTime = _ticker.RoundDuration(); // Caching to reduce redundant calls
+        var query = EntityQueryEnumerator<CaptainStateComponent>();
+        while (query.MoveNext(out var station, out var captainState))
+        {
+            if (captainState.HasCaptain)
+                HandleHasCaptain(station, captainState);
+            else
+                HandleNoCaptain(station, captainState, currentTime);
+        }
+    }
+
+    private void OnPlayerJobAdded(Entity<CaptainStateComponent> ent, ref PlayerJobAddedEvent args)
+    {
+        if (args.JobPrototypeId == "Captain")
+        {
+            ent.Comp.IsAAInPlay = true;
+            ent.Comp.HasCaptain = true;
+        }
+    }
+
+    private void OnPlayerJobsRemoved(Entity<CaptainStateComponent> ent, ref PlayerJobsRemovedEvent args)
+    {
+        if (!TryComp<StationJobsComponent>(ent, out var stationJobs))
+            return;
+        if (!args.PlayerJobs.Contains("Captain")) // If the player that left was a captain we need to check if there are any captains left
+            return;
+        if (stationJobs.PlayerJobs.Any(playerJobs => playerJobs.Value.Contains("Captain"))) // We check the PlayerJobs if there are any cpatins left
+            return;
+        ent.Comp.HasCaptain = false;
+        if (_acoOnDeparture)
+        {
+            _chat.DispatchStationAnnouncement(
+                ent,
+                Loc.GetString(ent.Comp.ACORequestNoAAMessage, ("minutes", _aaDelay.TotalMinutes)),
+                colorOverride: Color.Gold);
+
+            ent.Comp.IsACORequestActive = true;
+        }
+    }
+
+    /// <summary>
+    /// Handles cases for when there is a captain
+    /// </summary>
+    /// <param name="station"></param>
+    /// <param name="captainState"></param>
+    private void HandleHasCaptain(Entity<CaptainStateComponent?> station, CaptainStateComponent captainState)
+    {
+        // If ACO vote has been called we need to cancel and alert to return to normal chain of command
+        if (!captainState.IsACORequestActive)
+            return;
+
+        _chat.DispatchStationAnnouncement(station,
+            Loc.GetString(captainState.RevokeACOMessage),
+            colorOverride: Color.Gold);
+
+        captainState.IsACORequestActive = false;
+    }
+
+    /// <summary>
+    /// Handles cases for when there is no captain
+    /// </summary>
+    /// <param name="station"></param>
+    /// <param name="captainState"></param>
+    private void HandleNoCaptain(Entity<CaptainStateComponent?> station, CaptainStateComponent captainState, TimeSpan currentTime)
+    {
+        if (CheckACORequest(captainState, currentTime))
+        {
+            var message =
+                CheckUnlockAA(captainState, null)
+                ? captainState.ACORequestWithAAMessage
+                : captainState.ACORequestNoAAMessage;
+
+            _chat.DispatchStationAnnouncement(
+                station,
+                Loc.GetString(message, ("minutes", _aaDelay.TotalMinutes)),
+                colorOverride: Color.Gold);
+
+            captainState.IsACORequestActive = true;
+        }
+        if (CheckUnlockAA(captainState, currentTime))
+        {
+            captainState.IsAAInPlay = true;
+            _chat.DispatchStationAnnouncement(station, Loc.GetString(captainState.AAUnlockedMessage), colorOverride: Color.Red);
+
+            // Extend access of spare id lockers to command so they can access emergency AA
+            var query = EntityQueryEnumerator<SpareIDSafeComponent>();
+            while (query.MoveNext(out var spareIDSafe, out _))
+            {
+                if (!TryComp<AccessReaderComponent>(spareIDSafe, out var accessReader))
+                    continue;
+                var accesses = accessReader.AccessLists;
+                if (accesses.Count <= 0) // Avoid restricting access for readers with no accesses
+                    continue;
+                // Awful and disgusting but the accessReader has no proper api for adding acceses to readers without awful type casting. See AccessOverriderSystem
+                accesses.Add(new HashSet<ProtoId<AccessLevelPrototype>> { captainState.ACOAccess });
+                Dirty(spareIDSafe, accessReader);
+                RaiseLocalEvent(spareIDSafe, new AccessReaderConfigurationChangedEvent());
+            }
+        }
+    }
+
+    /// <summary>
+    /// Checks the conditions for if an ACO should be requested
+    /// </summary>
+    /// <param name="captainState"></param>
+    /// <returns>True if conditions are met for an ACO to be requested, False otherwise</returns>
+    private bool CheckACORequest(CaptainStateComponent captainState, TimeSpan currentTime)
+    {
+        return !captainState.IsACORequestActive && currentTime > _acoDelay;
+    }
+
+    /// <summary>
+    /// Checks the conditions for if AA should be unlocked
+    /// If time is null its condition is ignored
+    /// </summary>
+    /// <param name="captainState"></param>
+    /// <returns>True if conditions are met for AA to be unlocked, False otherwise</returns>
+    private bool CheckUnlockAA(CaptainStateComponent captainState, TimeSpan? currentTime)
+    {
+        if (captainState.IsAAInPlay || !_aaEnabled)
+            return false;
+        return currentTime == null || currentTime > _acoDelay + _aaDelay;
+    }
+}
diff --git a/Content.Server/Station/Systems/StationJobsSystem.cs b/Content.Server/Station/Systems/StationJobsSystem.cs
index 3bfa815af1e..f708e8526d9 100644
--- a/Content.Server/Station/Systems/StationJobsSystem.cs
+++ b/Content.Server/Station/Systems/StationJobsSystem.cs
@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using Content.Server.DeltaV.Station.Events; // DeltaV
 using Content.Server.GameTicking;
 using Content.Server.Station.Components;
 using Content.Shared.CCVar;
@@ -111,7 +112,8 @@ public bool TryAssignJob(EntityUid station, string jobPrototypeId, NetUserId net
 
         if (!TryAdjustJobSlot(station, jobPrototypeId, -1, false, false, stationJobs))
             return false;
-
+        var playerJobAdded = new PlayerJobAddedEvent(netUserId, jobPrototypeId);
+        RaiseLocalEvent(station, ref playerJobAdded, false); // DeltaV added AddedPlayerJobsEvent for CaptainStateSystem
         stationJobs.PlayerJobs.TryAdd(netUserId, new());
         stationJobs.PlayerJobs[netUserId].Add(jobPrototypeId);
         return true;
@@ -212,8 +214,15 @@ public bool TryRemovePlayerJobs(EntityUid station,
     {
         if (!Resolve(station, ref jobsComponent, false))
             return false;
-
-        return jobsComponent.PlayerJobs.Remove(userId);
+        // DeltaV added RemovedPlayerJobsEvent for CaptainStateSystem
+        if (jobsComponent.PlayerJobs.Remove(userId, out var playerJobsEntry))
+        {
+            var playerJobRemovedEvent = new PlayerJobsRemovedEvent(userId, playerJobsEntry);
+            RaiseLocalEvent(station, ref playerJobRemovedEvent, false);
+            return true;
+        }
+        return false;
+        // DeltaV end added RemovedPlayerJobsEvent for CaptainStateSystem
     }
 
     /// <inheritdoc cref="TrySetJobSlot(Robust.Shared.GameObjects.EntityUid,string,int,bool,Content.Server.Station.Components.StationJobsComponent?)"/>
diff --git a/Content.Shared/DeltaV/CCVars/DCCVars.cs b/Content.Shared/DeltaV/CCVars/DCCVars.cs
index 58c4186ff61..dc4cd402b90 100644
--- a/Content.Shared/DeltaV/CCVars/DCCVars.cs
+++ b/Content.Shared/DeltaV/CCVars/DCCVars.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.DeltaV.CCVars;
 
@@ -16,6 +16,67 @@ public sealed class DCCVars
     public static readonly CVarDef<bool> RoundEndPacifist =
         CVarDef.Create("game.round_end_pacifist", false, CVar.SERVERONLY);
 
+    /*
+     * No EORG
+     */
+
+    /// <summary>
+    /// Whether the no EORG popup is enabled.
+    /// </summary>
+    public static readonly CVarDef<bool> RoundEndNoEorgPopup =
+        CVarDef.Create("game.round_end_eorg_popup_enabled", true, CVar.SERVER | CVar.REPLICATED);
+
+    /// <summary>
+    /// Skip the no EORG popup.
+    /// </summary>
+    public static readonly CVarDef<bool> SkipRoundEndNoEorgPopup =
+        CVarDef.Create("game.skip_round_end_eorg_popup", false, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    /// <summary>
+    /// How long to display the EORG popup for.
+    /// </summary>
+    public static readonly CVarDef<float> RoundEndNoEorgPopupTime =
+        CVarDef.Create("game.round_end_eorg_popup_time", 5f, CVar.SERVER | CVar.REPLICATED);
+
+    /*
+     * Auto ACO
+     */
+
+    /// <summary>
+    /// How long with no captain before requesting an ACO be elected.
+    /// </summary>
+    public static readonly CVarDef<TimeSpan> RequestAcoDelay =
+        CVarDef.Create("game.request_aco_delay", TimeSpan.FromMinutes(15), CVar.SERVERONLY | CVar.ARCHIVE);
+
+    /// <summary>
+    /// Determines whether an ACO should be requested when the captain leaves during the round,
+    /// in addition to cases where there are no captains at round start.
+    /// </summary>
+    public static readonly CVarDef<bool> RequestAcoOnCaptainDeparture =
+        CVarDef.Create("game.request_aco_on_captain_departure", true, CVar.SERVERONLY | CVar.ARCHIVE);
+
+    /// <summary>
+    /// Determines whether All Access (AA) should be automatically unlocked if no captain is present.
+    /// </summary>
+    public static readonly CVarDef<bool> AutoUnlockAllAccessEnabled =
+        CVarDef.Create("game.auto_unlock_aa_enabled", true, CVar.SERVERONLY | CVar.ARCHIVE);
+
+    /// <summary>
+    /// How long after an ACO request announcement is made before All Access (AA) should be unlocked.
+    /// </summary>
+    public static readonly CVarDef<TimeSpan> AutoUnlockAllAccessDelay =
+        CVarDef.Create("game.auto_unlock_aa_delay", TimeSpan.FromMinutes(5), CVar.SERVERONLY | CVar.ARCHIVE);
+
+    /*
+     * Misc.
+     */
+
+    /// <summary>
+    /// Disables all vision filters for species like Vulpkanin or Harpies. There are good reasons someone might want to disable these.
+    /// </summary>
+    public static readonly CVarDef<bool> NoVisionFilters =
+        CVarDef.Create("accessibility.no_vision_filters", true, CVar.CLIENTONLY | CVar.ARCHIVE);
+
     /// <summary>
     /// Whether the Shipyard is enabled.
     /// </summary>
diff --git a/Resources/Locale/en-US/deltav/job/captain-state.ftl b/Resources/Locale/en-US/deltav/job/captain-state.ftl
new file mode 100644
index 00000000000..bbae626d7e5
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/job/captain-state.ftl
@@ -0,0 +1,6 @@
+# Announcements related to captain presence and ACO state
+
+captain-arrived-revoke-aco-announcement = The Acting Commanding Officer's position is revoked due to the arrival of a NanoTrasen-appointed captain. All personnel are to return to the standard Chain of Command.
+no-captain-request-aco-vote-with-aa-announcement = Station records indicate that no captain is currently present. Command personnel are requested to nominate an Acting Commanding Officer and report the results to Central Command in accordance with Standard Operating Procedure. Emergency AA will be unlocked in {$minutes} minutes to ensure continued operational efficiency.
+no-captain-request-aco-vote-announcement = Station records indicate that no captain is currently present. Command personnel are requested to nominate an Acting Commanding Officer and report the results to Central Command in accordance with Standard Operating Procedure.
+no-captain-aa-unlocked-announcement = Command access authority has been granted to the Spare ID cabinet for use by the Acting Commanding Officer. Unauthorized possession of Emergency AA is punishable under Felony Offense [202]: Grand Theft.
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Command/safe.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Command/safe.yml
index 17321ef59e2..17880dd3e29 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Command/safe.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Command/safe.yml
@@ -21,6 +21,7 @@
             - IdCard
     - type: AccessReader
       access: [["DV-SpareSafe"]]
+    - type: SpareIDSafe
 
 - type: entity
   id: SpareIdCabinetFilled
diff --git a/Resources/Prototypes/DeltaV/Entities/Stations/base.yml b/Resources/Prototypes/DeltaV/Entities/Stations/base.yml
index fe31706b262..ffeb605adc2 100644
--- a/Resources/Prototypes/DeltaV/Entities/Stations/base.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Stations/base.yml
@@ -19,3 +19,12 @@
     - displayName: stock-trading-company-donk
       basePrice: 90
       currentPrice: 90
+    - displayName: stock-trading-company-hydroco
+      basePrice: 30
+      currentPrice: 30
+
+- type: entity
+  id: BaseStationCaptainState
+  abstract: true
+  components:
+  - type: CaptainState
diff --git a/Resources/Prototypes/Entities/Stations/nanotrasen.yml b/Resources/Prototypes/Entities/Stations/nanotrasen.yml
index d9a41967e42..616e4adec34 100644
--- a/Resources/Prototypes/Entities/Stations/nanotrasen.yml
+++ b/Resources/Prototypes/Entities/Stations/nanotrasen.yml
@@ -27,6 +27,7 @@
     - BaseStationNanotrasen
     - BaseRandomStation
     - BaseStationMail # Nyano component, required for station mail to function
+    - BaseStationCaptainState # DeltaV
     - BaseStationStockMarket # DeltaV
   categories: [ HideSpawnMenu ]
   components:

From fee041e515b2d64ec8be25b330453334dc5c1706 Mon Sep 17 00:00:00 2001
From: SolStar <44028047+ewokswagger@users.noreply.github.com>
Date: Thu, 12 Dec 2024 18:51:18 -0500
Subject: [PATCH 299/366] fix auto aco timing (#2431)

---
 Content.Server/DeltaV/Station/Systems/CaptainStateSystem.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Content.Server/DeltaV/Station/Systems/CaptainStateSystem.cs b/Content.Server/DeltaV/Station/Systems/CaptainStateSystem.cs
index 328994d1782..8a286869cf0 100644
--- a/Content.Server/DeltaV/Station/Systems/CaptainStateSystem.cs
+++ b/Content.Server/DeltaV/Station/Systems/CaptainStateSystem.cs
@@ -10,6 +10,7 @@
 using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
 using System.Linq;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace Content.Server.DeltaV.Station.Systems;
 
@@ -40,6 +41,8 @@ public override void Update(float frameTime)
         base.Update(frameTime);
 
         var currentTime = _ticker.RoundDuration(); // Caching to reduce redundant calls
+        if (currentTime < _acoDelay) // Avoid timing issues. No need to run before _acoDelay is reached anyways.
+            return;
         var query = EntityQueryEnumerator<CaptainStateComponent>();
         while (query.MoveNext(out var station, out var captainState))
         {

From 57675a06f4ebd8286066bae5fc1b073a9cd9046f Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Fri, 8 Nov 2024 09:38:41 +0000
Subject: [PATCH 300/366] pass Actor to cartridge messages (#33210)

* pass Actor to cartridge messages

* NonSerialized gaming

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 Content.Server/CartridgeLoader/CartridgeLoaderSystem.cs | 1 +
 Content.Shared/CartridgeLoader/CartridgeUiMessage.cs    | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Content.Server/CartridgeLoader/CartridgeLoaderSystem.cs b/Content.Server/CartridgeLoader/CartridgeLoaderSystem.cs
index 7896a7822e2..894961a004c 100644
--- a/Content.Server/CartridgeLoader/CartridgeLoaderSystem.cs
+++ b/Content.Server/CartridgeLoader/CartridgeLoaderSystem.cs
@@ -414,6 +414,7 @@ private void OnUiMessage(EntityUid uid, CartridgeLoaderComponent component, Cart
     {
         var cartridgeEvent = args.MessageEvent;
         cartridgeEvent.LoaderUid = GetNetEntity(uid);
+        cartridgeEvent.Actor = args.Actor;
 
         RelayEvent(component, cartridgeEvent, true);
     }
diff --git a/Content.Shared/CartridgeLoader/CartridgeUiMessage.cs b/Content.Shared/CartridgeLoader/CartridgeUiMessage.cs
index 1155030f938..31ac8bd2d06 100644
--- a/Content.Shared/CartridgeLoader/CartridgeUiMessage.cs
+++ b/Content.Shared/CartridgeLoader/CartridgeUiMessage.cs
@@ -17,4 +17,7 @@ public CartridgeUiMessage(CartridgeMessageEvent messageEvent)
 public abstract class CartridgeMessageEvent : EntityEventArgs
 {
     public NetEntity LoaderUid;
+
+    [NonSerialized]
+    public EntityUid Actor;
 }

From b4f332af56a513d73259c5acd1deb44ce31b5649 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Wed, 25 Dec 2024 20:51:04 -0400
Subject: [PATCH 301/366] Play deny sound if failed

---
 Content.Server/Cargo/Systems/StockMarketSystem.cs | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/Content.Server/Cargo/Systems/StockMarketSystem.cs b/Content.Server/Cargo/Systems/StockMarketSystem.cs
index 5ff5cd4ff7f..20c840728e0 100644
--- a/Content.Server/Cargo/Systems/StockMarketSystem.cs
+++ b/Content.Server/Cargo/Systems/StockMarketSystem.cs
@@ -126,16 +126,7 @@ private void OnStockTradingMessage(Entity<StockTradingCartridgeComponent> ent, r
             }
 
             // Play confirmation sound if the transaction was successful
-            if (success)
-            {
-                _audio.PlayEntity(
-                    stockMarket.ConfirmSound,
-                    Filter.Empty().AddInRange(_transform.GetMapCoordinates(loader, xform), 0.05f),
-                    loader,
-                    true,
-                    AudioParams.Default.WithMaxDistance(0.05f)
-                );
-            }
+            _audio.PlayEntity(success ? stockMarket.ConfirmSound : stockMarket.DenySound, loader, args.Actor);
         }
         finally
         {

From 2cf5c10ba99b858f7898b24a11c82f48aae16a45 Mon Sep 17 00:00:00 2001
From: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Date: Sat, 16 Nov 2024 16:30:47 +1200
Subject: [PATCH 302/366] Solar assembly crate buff (#33019)

* more flatpacks + glass

* solar crate price increase

* price increase

* 1250 spesos

* Update Resources/Prototypes/Catalog/Fills/Crates/engines.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 Resources/Prototypes/Catalog/Cargo/cargo_engines.yml  | 2 +-
 Resources/Prototypes/Catalog/Fills/Crates/engines.yml | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
index fed135cd6a6..38243337d34 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
@@ -66,7 +66,7 @@
     sprite: Objects/Devices/flatpack.rsi
     state: solar-assembly-part
   product: CrateEngineeringSolar
-  cost: 500
+  cost: 1250
   category: cargoproduct-category-name-engineering
   group: market
 
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
index 2ac099e7926..30eb29f68e0 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
@@ -120,12 +120,14 @@
   id: CrateEngineeringSolar
   parent: CrateEngineering
   name: solar assembly crate
-  description: Parts for constructing solar panels and trackers.
+  description: A kit with solar flatpacks and glass to construct ten solar panels.
   components:
   - type: StorageFill
     contents:
       - id: SolarAssemblyFlatpack
-        amount: 6
+        amount: 10
+      - id: SheetGlass10
+        amount: 2
 
 - type: entity
   id: CrateEngineeringShuttle

From 7179184cf9a59dea92f7d1a6216f64b577f91d4b Mon Sep 17 00:00:00 2001
From: Saphire Lattice <lattice@saphi.re>
Date: Sat, 16 Nov 2024 10:39:19 +0700
Subject: [PATCH 303/366] Fix utensils not being thrown away (#33326)

---
 Content.Server/Nutrition/EntitySystems/UtensilSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs b/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs
index 43087214a45..df528433c70 100644
--- a/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs
@@ -43,7 +43,7 @@ private void OnAfterInteract(EntityUid uid, UtensilComponent component, AfterInt
         public (bool Success, bool Handled) TryUseUtensil(EntityUid user, EntityUid target, UtensilComponent component)
         {
             if (!EntityManager.TryGetComponent(target, out FoodComponent? food))
-                return (false, true);
+                return (false, false);
 
             //Prevents food usage with a wrong utensil
             if ((food.Utensil & component.Types) == 0)

From e398c9c13efc8451603608e5a1213b97fbc09562 Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Mon, 28 Oct 2024 23:21:14 +0100
Subject: [PATCH 304/366] Add StartDelay to actions (#33026)

---
 Content.Server/Ghost/GhostSystem.cs                    | 9 +--------
 Content.Shared/Actions/BaseActionComponent.cs          | 5 +++++
 Content.Shared/Actions/SharedActionsSystem.cs          | 3 +++
 Resources/Prototypes/Actions/types.yml                 | 2 ++
 Resources/Prototypes/Entities/Mobs/Player/observer.yml | 1 +
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs
index effed5cdbe1..2be39f79837 100644
--- a/Content.Server/Ghost/GhostSystem.cs
+++ b/Content.Server/Ghost/GhostSystem.cs
@@ -197,14 +197,7 @@ private void SetCanSeeGhosts(EntityUid uid, bool canSee, EyeComponent? eyeCompon
 
         private void OnMapInit(EntityUid uid, GhostComponent component, MapInitEvent args)
         {
-            if (_actions.AddAction(uid, ref component.BooActionEntity, out var act, component.BooAction)
-                && act.UseDelay != null)
-            {
-                var start = _gameTiming.CurTime;
-                var end = start + act.UseDelay.Value;
-                _actions.SetCooldown(component.BooActionEntity.Value, start, end);
-            }
-
+            _actions.AddAction(uid, ref component.BooActionEntity, component.BooAction);
             _actions.AddAction(uid, ref component.ToggleGhostHearingActionEntity, component.ToggleGhostHearingAction);
             _actions.AddAction(uid, ref component.ToggleLightingActionEntity, component.ToggleLightingAction);
             _actions.AddAction(uid, ref component.ToggleFoVActionEntity, component.ToggleFoVAction);
diff --git a/Content.Shared/Actions/BaseActionComponent.cs b/Content.Shared/Actions/BaseActionComponent.cs
index 9156f747f5c..720900b7840 100644
--- a/Content.Shared/Actions/BaseActionComponent.cs
+++ b/Content.Shared/Actions/BaseActionComponent.cs
@@ -66,6 +66,11 @@ public abstract partial class BaseActionComponent : Component
     // TODO serialization
     public (TimeSpan Start, TimeSpan End)? Cooldown;
 
+    /// <summary>
+    ///     If true, the action will have an initial cooldown applied upon addition.
+    /// </summary>
+    [DataField] public bool StartDelay = false;
+
     /// <summary>
     ///     Time interval between action uses.
     /// </summary>
diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs
index 3dd12668030..42cd51f2c9f 100644
--- a/Content.Shared/Actions/SharedActionsSystem.cs
+++ b/Content.Shared/Actions/SharedActionsSystem.cs
@@ -781,6 +781,9 @@ public bool AddActionDirect(EntityUid performer,
         if (action.AttachedEntity != null)
             RemoveAction(action.AttachedEntity.Value, actionId, action: action);
 
+        if (action.StartDelay && action.UseDelay != null)
+            SetCooldown(actionId, action.UseDelay.Value);
+
         DebugTools.AssertOwner(performer, comp);
         comp ??= EnsureComp<ActionsComponent>(performer);
         action.AttachedEntity = performer;
diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml
index f69d6a794a3..43aaef47364 100644
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -327,6 +327,8 @@
     checkCanInteract: false
     checkConsciousness: false
     event: !type:WakeActionEvent
+    startDelay: true
+    useDelay: 2
 
 - type: entity
   id: ActionActivateHonkImplant
diff --git a/Resources/Prototypes/Entities/Mobs/Player/observer.yml b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
index 07398299f37..a150744651f 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
@@ -66,6 +66,7 @@
     icon: Interface/Actions/scream.png
     checkCanInteract: false
     event: !type:BooActionEvent
+    startDelay: true
     useDelay: 120
 
 - type: entity

From 754275e0b87edeec7e74651a27e4a537dec0bdfc Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Wed, 25 Dec 2024 21:42:24 -0400
Subject: [PATCH 305/366] OnUIOpenAttempt!

---
 Content.Shared/Silicons/Borgs/SharedBorgSystem.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
index 8c82ffcefa6..c62e63481d6 100644
--- a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
+++ b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
@@ -6,6 +6,7 @@
 using Content.Shared.Popups;
 using Content.Shared.PowerCell.Components;
 using Content.Shared.Silicons.Borgs.Components;
+using Content.Shared.UserInterface;
 using Content.Shared.Wires;
 using Robust.Shared.Containers;
 
@@ -95,6 +96,13 @@ private void OnStartup(EntityUid uid, BorgChassisComponent component, ComponentS
         component.ModuleContainer = Container.EnsureContainer<Container>(uid, component.ModuleContainerId, containerManager);
     }
 
+    private void OnUIOpenAttempt(EntityUid uid, BorgChassisComponent component, ActivatableUIOpenAttemptEvent args)
+    {
+        // borgs can't view their own ui
+        if (args.User == uid)
+            args.Cancel();
+    }
+
     protected virtual void OnInserted(EntityUid uid, BorgChassisComponent component, EntInsertedIntoContainerMessage args)
     {
 

From 470d7cef32a8324f124619fc0fc8e052968adbb9 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Wed, 25 Dec 2024 21:49:18 -0400
Subject: [PATCH 306/366] fix all rider errors

---
 Content.Server/Cargo/Systems/CargoSystem.cs    | 1 +
 Content.Server/MassMedia/Systems/NewsSystem.cs | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Content.Server/Cargo/Systems/CargoSystem.cs b/Content.Server/Cargo/Systems/CargoSystem.cs
index eb6329dc691..6e0c274570b 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.cs
@@ -51,6 +51,7 @@ public sealed partial class CargoSystem : SharedCargoSystem
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IComponentFactory _factory = default!;
     [Dependency] private readonly MapLoaderSystem _mapLoader = default!;
+    [Dependency] private readonly SharedIdCardSystem _idCardSystem = default!;
 
     private EntityQuery<TransformComponent> _xformQuery;
     private EntityQuery<CargoSellBlacklistComponent> _blacklistQuery;
diff --git a/Content.Server/MassMedia/Systems/NewsSystem.cs b/Content.Server/MassMedia/Systems/NewsSystem.cs
index 5536bbcd299..ea922b66f5a 100644
--- a/Content.Server/MassMedia/Systems/NewsSystem.cs
+++ b/Content.Server/MassMedia/Systems/NewsSystem.cs
@@ -7,6 +7,7 @@
 using Content.Server.GameTicking;
 using System.Diagnostics.CodeAnalysis;
 using Content.Server.Access.Systems;
+using Content.Server.Chat.Managers;
 using Content.Server.Popups;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;

From a54aa8349cefc4f9c6535f3076e78e416e98d210 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Wed, 25 Dec 2024 21:56:19 -0400
Subject: [PATCH 307/366] small

---
 Content.Server/Silicons/Borgs/BorgSystem.cs | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/Content.Server/Silicons/Borgs/BorgSystem.cs b/Content.Server/Silicons/Borgs/BorgSystem.cs
index 4e1c4c33818..3ffd1baf5de 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.cs
@@ -74,7 +74,6 @@ public override void Initialize()
         SubscribeLocalEvent<BorgChassisComponent, MobStateChangedEvent>(OnMobStateChanged);
         SubscribeLocalEvent<BorgChassisComponent, PowerCellChangedEvent>(OnPowerCellChanged);
         SubscribeLocalEvent<BorgChassisComponent, PowerCellSlotEmptyEvent>(OnPowerCellSlotEmpty);
-        SubscribeLocalEvent<BorgChassisComponent, ActivatableUIOpenAttemptEvent>(OnUIOpenAttempt);
         SubscribeLocalEvent<BorgChassisComponent, GetCharactedDeadIcEvent>(OnGetDeadIC);
         SubscribeLocalEvent<BorgChassisComponent, ItemToggledEvent>(OnToggled);
 
@@ -203,14 +202,6 @@ private void OnPowerCellSlotEmpty(EntityUid uid, BorgChassisComponent component,
         Toggle.TryDeactivate(uid);
         UpdateUI(uid, component);
     }
-
-    private void OnUIOpenAttempt(EntityUid uid, BorgChassisComponent component, ActivatableUIOpenAttemptEvent args)
-    {
-        // borgs can't view their own ui
-        if (args.User == uid)
-            args.Cancel();
-    }
-
     private void OnGetDeadIC(EntityUid uid, BorgChassisComponent component, ref GetCharactedDeadIcEvent args)
     {
         args.Dead = true;

From 3a453873d6d0198ffa72f94d153e85707e6db35a Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Wed, 25 Dec 2024 22:08:19 -0400
Subject: [PATCH 308/366] fix locale

---
 .../en-US/deltav/cargo/stocks-comapnies.ftl   |   1 +
 .../Objects/Misc/identification_cards.yml     | 108 ++++++------------
 2 files changed, 38 insertions(+), 71 deletions(-)

diff --git a/Resources/Locale/en-US/deltav/cargo/stocks-comapnies.ftl b/Resources/Locale/en-US/deltav/cargo/stocks-comapnies.ftl
index 69ef7330a56..996a538a7fc 100644
--- a/Resources/Locale/en-US/deltav/cargo/stocks-comapnies.ftl
+++ b/Resources/Locale/en-US/deltav/cargo/stocks-comapnies.ftl
@@ -4,3 +4,4 @@ stock-trading-company-gorlex = Gorlex [GRX]
 stock-trading-company-interdyne = Interdyne Pharmaceuticals [INTP]
 stock-trading-company-fishinc = Fish Inc. [FIN]
 stock-trading-company-donk = Donk Co. [DONK]
+stock-trading-company-hydroco = HydroCo [HYD]
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index c48f9e0e34c..0b57683e2c5 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -642,121 +642,87 @@
   - type: Sprite
     layers:
     - state: centcom
-    - state: departmenthead
-      color: "#1B67A5"
-    - state: subdepartment
-      color: "#1B67A5"
-    - state: cc
+    - state: idcentcom
   - type: Item
     heldPrefix: blue
-  - type: IdCard
-    jobTitle: Central Commander
-    jobIcon: JobIconNanotrasen
-  - type: Access
-    groups:
-    - AllAccess
-    tags:
-    - CentralCommand
+  - type: PresetIdCard
+    job: CentralCommandOfficial
 
 - type: entity
-  parent: CentcomIDCard
+  parent: IDCardStandard
   id: ERTLeaderIDCard
   name: ERT leader ID card
   components:
   - type: Sprite
     layers:
-    - state: centcom
-    - state: departmenthead
-      color: "#1B67A5"
-    - state: subdepartment
-      color: "#1B67A5"
-    - state: captain
-  - type: IdCard
-    jobTitle: ERT Company Commander
+    - state: gold
+    - state: ert_commander
+  - type: PresetIdCard
+    job: ERTLeader
   - type: Item
     heldPrefix: gold
 
 - type: entity
-  parent: ERTLeaderIDCard
+  parent: IDCardStandard
   id: ERTChaplainIDCard
   name: ERT chaplain ID card
   components:
   - type: Sprite
     layers:
-    - state: centcom
-    - state: departmenthead
-      color: "#1B67A5"
-    - state: subdepartment
-      color: "#C96DBF"
-    - state: chaplain
-  - type: IdCard
-    jobTitle: ERT Soul Officer
+    - state: gold
+    - state: ert_chaplain # we have the sprite for the id but dont have chaplain ERT equipment for now.
+  - type: PresetIdCard
+    job: ERTChaplain
   - type: Item
     heldPrefix: blue
 
 - type: entity
-  parent: ERTChaplainIDCard
+  parent: IDCardStandard
   id: ERTEngineerIDCard
   name: ERT engineer ID card
   components:
   - type: Sprite
     layers:
-    - state: centcom
-    - state: departmenthead
-      color: "#1B67A5"
-    - state: subdepartment
-      color: "#F39F27"
-    - state: stationengineer
-  - type: IdCard
-    jobTitle: ERT Field Engineer
+    - state: gold
+    - state: ert_engineer
+  - type: PresetIdCard
+    job: ERTEngineer
 
 - type: entity
-  parent: ERTChaplainIDCard
+  parent: IDCardStandard
   id: ERTJanitorIDCard
   name: ERT janitor ID card
   components:
   - type: Sprite
     layers:
-    - state: centcom
-    - state: departmenthead
-      color: "#1B67A5"
-    - state: subdepartment
-      color: "#58C800"
-    - state: janitor
-  - type: IdCard
-    jobTitle: ERT Custodian
+    - state: gold
+    - state: ert_janitor
+  - type: PresetIdCard
+    job: ERTJanitor
 
 - type: entity
-  parent: ERTChaplainIDCard
+  parent: IDCardStandard
   id: ERTMedicIDCard
   name: ERT medic ID card
   components:
   - type: Sprite
     layers:
-    - state: centcom
-    - state: departmenthead
-      color: "#1B67A5"
-    - state: subdepartment
-      color: "#5B97BC"
-    - state: medicaldoctor
-  - type: IdCard
-    jobTitle: ERT Medical Doctor
+    - state: gold
+    - state: ert_medic
+  - type: PresetIdCard
+    job: ERTMedical
 
 - type: entity
-  parent: ERTChaplainIDCard
+  parent: IDCardStandard
   id: ERTSecurityIDCard
   name: ERT security ID card
   components:
   - type: Sprite
     layers:
-    - state: centcom
-    - state: departmenthead
-      color: "#1B67A5"
-    - state: subdepartment
-      color: "#CB0000"
-    - state: securityofficer
-  - type: IdCard
-    jobTitle: ERT Field Officer
+    - state: gold
+    - state: ert_security
+  - type: PresetIdCard
+    job: ERTSecurity
 
 - type: entity
   parent: IDCardStandard
@@ -774,8 +740,8 @@
     - state: cc
   - type: Item
     heldPrefix: blue
-  - type: IdCard
-    jobTitle: Central Commander
+  - type: PresetIdCard
+    job: CentralCommandOfficial
   - type: Access
     tags:
     - Maintenance
@@ -1019,8 +985,8 @@
     - state: cc
   - type: Item
     heldPrefix: blue
-  - type: IdCard
-    jobTitle: Centcom Quarantine Officer
+  - type: PresetIdCard
+    jobTitle: CBURN
 
 - type: entity
   parent: IDCardStandard

From ad52051d241ca1cb68c065eecd32a481af5979d2 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Wed, 25 Dec 2024 22:09:30 -0400
Subject: [PATCH 309/366] oops

---
 .../Prototypes/Entities/Objects/Misc/identification_cards.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index 0b57683e2c5..6d6d8d9cba2 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -777,8 +777,8 @@
     - state: death
   - type: Item
     heldPrefix: blue
-  - type: IdCard
-    jobTitle: Centcom Agent
+  - type: PresetIdCard
+    jobTitle: DeathSquad
 
 - type: entity
   name: passenger ID card

From 16a58d7f92d3798b589f67487ae4fa5710e76f4a Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Wed, 25 Dec 2024 22:18:56 -0400
Subject: [PATCH 310/366] yeag

---
 .../Objects/Misc/identification_cards.yml     | 25 +++++++------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index 6d6d8d9cba2..d9947458e5f 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -641,8 +641,7 @@
   components:
   - type: Sprite
     layers:
-    - state: centcom
-    - state: idcentcom
+    - state: pda-centcom
   - type: Item
     heldPrefix: blue
   - type: PresetIdCard
@@ -655,8 +654,7 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
-    - state: ert_commander
+    - state: pda-ert
   - type: PresetIdCard
     job: ERTLeader
   - type: Item
@@ -669,8 +667,7 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
-    - state: ert_chaplain # we have the sprite for the id but dont have chaplain ERT equipment for now.
+    - state: pda-ert
   - type: PresetIdCard
     job: ERTChaplain
   - type: Item
@@ -683,8 +680,7 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
-    - state: ert_engineer
+    - state: pda-ert
   - type: PresetIdCard
     job: ERTEngineer
 
@@ -695,8 +691,7 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
-    - state: ert_janitor
+    - state: pda-ert
   - type: PresetIdCard
     job: ERTJanitor
 
@@ -707,8 +702,7 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
-    - state: ert_medic
+    - state: pda-ert
   - type: PresetIdCard
     job: ERTMedical
 
@@ -719,8 +713,7 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
-    - state: ert_security
+    - state: pda-ert
   - type: PresetIdCard
     job: ERTSecurity
 
@@ -732,7 +725,7 @@
   components:
   - type: Sprite
     layers:
-    - state: centcom
+    - state: pda-ert
     - state: departmenthead
       color: "#1B67A5"
     - state: subdepartment
@@ -774,7 +767,7 @@
       color: "#CB0000"
     - state: subdepartment
       color: "#CB0000"
-    - state: death
+    - state: pda-centcom
   - type: Item
     heldPrefix: blue
   - type: PresetIdCard

From 4579c05c271ea6facc3fe2baf6b48a8b38bce166 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 26 Dec 2024 13:24:21 -0400
Subject: [PATCH 311/366] Revert "yeag"

This reverts commit 16a58d7f92d3798b589f67487ae4fa5710e76f4a.
---
 .../Objects/Misc/identification_cards.yml     | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index d9947458e5f..6d6d8d9cba2 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -641,7 +641,8 @@
   components:
   - type: Sprite
     layers:
-    - state: pda-centcom
+    - state: centcom
+    - state: idcentcom
   - type: Item
     heldPrefix: blue
   - type: PresetIdCard
@@ -654,7 +655,8 @@
   components:
   - type: Sprite
     layers:
-    - state: pda-ert
+    - state: gold
+    - state: ert_commander
   - type: PresetIdCard
     job: ERTLeader
   - type: Item
@@ -667,7 +669,8 @@
   components:
   - type: Sprite
     layers:
-    - state: pda-ert
+    - state: gold
+    - state: ert_chaplain # we have the sprite for the id but dont have chaplain ERT equipment for now.
   - type: PresetIdCard
     job: ERTChaplain
   - type: Item
@@ -680,7 +683,8 @@
   components:
   - type: Sprite
     layers:
-    - state: pda-ert
+    - state: gold
+    - state: ert_engineer
   - type: PresetIdCard
     job: ERTEngineer
 
@@ -691,7 +695,8 @@
   components:
   - type: Sprite
     layers:
-    - state: pda-ert
+    - state: gold
+    - state: ert_janitor
   - type: PresetIdCard
     job: ERTJanitor
 
@@ -702,7 +707,8 @@
   components:
   - type: Sprite
     layers:
-    - state: pda-ert
+    - state: gold
+    - state: ert_medic
   - type: PresetIdCard
     job: ERTMedical
 
@@ -713,7 +719,8 @@
   components:
   - type: Sprite
     layers:
-    - state: pda-ert
+    - state: gold
+    - state: ert_security
   - type: PresetIdCard
     job: ERTSecurity
 
@@ -725,7 +732,7 @@
   components:
   - type: Sprite
     layers:
-    - state: pda-ert
+    - state: centcom
     - state: departmenthead
       color: "#1B67A5"
     - state: subdepartment
@@ -767,7 +774,7 @@
       color: "#CB0000"
     - state: subdepartment
       color: "#CB0000"
-    - state: pda-centcom
+    - state: death
   - type: Item
     heldPrefix: blue
   - type: PresetIdCard

From 2a54f4ff9651633ec6e61c1a4d862452da8a207a Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 26 Dec 2024 17:41:51 -0400
Subject: [PATCH 312/366] fix?

---
 .../Objects/Misc/identification_cards.yml     | 48 ++++++++++++++-----
 1 file changed, 36 insertions(+), 12 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index 6d6d8d9cba2..f12ca15e5dc 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -655,8 +655,12 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
-    - state: ert_commander
+    - state: centcom
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#1B67A5"
+    - state: captain
   - type: PresetIdCard
     job: ERTLeader
   - type: Item
@@ -669,8 +673,12 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
-    - state: ert_chaplain # we have the sprite for the id but dont have chaplain ERT equipment for now.
+    - state: centcom
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#1B67A5"
+    - state: chaplain
   - type: PresetIdCard
     job: ERTChaplain
   - type: Item
@@ -683,8 +691,12 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
-    - state: ert_engineer
+    - state: centcom
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#F39F27"
+    - state: stationengineer
   - type: PresetIdCard
     job: ERTEngineer
 
@@ -695,8 +707,12 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
-    - state: ert_janitor
+    - state: centcom
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#58C800"
+    - state: janitor
   - type: PresetIdCard
     job: ERTJanitor
 
@@ -707,8 +723,12 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
-    - state: ert_medic
+    - state: centcom
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#5B97BC"
+    - state: medicaldoctor
   - type: PresetIdCard
     job: ERTMedical
 
@@ -719,8 +739,12 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
-    - state: ert_security
+    - state: centcom
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#1B67A5"
+    - state: cc
   - type: PresetIdCard
     job: ERTSecurity
 

From 702cf74173e67c44d7659f58bb0c781ba7e5f0af Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 26 Dec 2024 17:55:53 -0400
Subject: [PATCH 313/366] waow

---
 .../Prototypes/Entities/Objects/Misc/identification_cards.yml    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index f12ca15e5dc..02873e64d7d 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -642,7 +642,6 @@
   - type: Sprite
     layers:
     - state: centcom
-    - state: idcentcom
   - type: Item
     heldPrefix: blue
   - type: PresetIdCard

From 4adc9b27a60efc6e20114cf1f0d962e4fc5af46d Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 26 Dec 2024 18:01:05 -0400
Subject: [PATCH 314/366] silly

---
 .../Prototypes/Entities/Objects/Misc/identification_cards.yml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index 02873e64d7d..2ce04b96fbc 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -801,7 +801,7 @@
   - type: Item
     heldPrefix: blue
   - type: PresetIdCard
-    jobTitle: DeathSquad
+    job: DeathSquad
 
 - type: entity
   name: passenger ID card

From 69510ab1ed6778a2fe755d353eb2034bb6df9670 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 26 Dec 2024 18:14:50 -0400
Subject: [PATCH 315/366] Waow

---
 .../Roles/Jobs/Command/deathsquad.yml         | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 Resources/Prototypes/Roles/Jobs/Command/deathsquad.yml

diff --git a/Resources/Prototypes/Roles/Jobs/Command/deathsquad.yml b/Resources/Prototypes/Roles/Jobs/Command/deathsquad.yml
new file mode 100644
index 00000000000..2e1d5973c54
--- /dev/null
+++ b/Resources/Prototypes/Roles/Jobs/Command/deathsquad.yml
@@ -0,0 +1,30 @@
+- type: job
+  id: DeathSquad
+  name: job-name-deathsquad
+  description: job-description-deathsquad
+  playTimeTracker: JobDeathSquad
+  setPreference: false
+  startingGear: DeathSquadGear
+  icon: "JobIconNanotrasen"
+  supervisors: job-supervisors-centcom
+  canBeAntag: false
+  accessGroups:
+  - AllAccess
+  access:
+  - CentralCommand
+
+- type: startingGear
+  id: DeathSquadGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitDeathSquad
+    back: ClothingBackpackDeathSquadFilled
+    mask: ClothingMaskGasDeathSquad
+    eyes: ClothingEyesHudSecurity
+    ears: ClothingHeadsetAltCentCom
+    gloves: ClothingHandsGlovesCombat
+    outerClothing: ClothingOuterHardsuitDeathsquad
+    shoes: ClothingShoesBootsMagAdv
+    id: DeathsquadPDA
+    pocket1: EnergySword
+    pocket2: EnergyShield
+    belt: ClothingBeltMilitaryWebbingMedFilled
\ No newline at end of file

From 166dc6205627ec6bfdfe1d115d7fadc9c8ae4279 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 26 Dec 2024 18:35:20 -0400
Subject: [PATCH 316/366] oops

---
 .../Roles/Jobs/Command/deathsquad.yml          | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/Resources/Prototypes/Roles/Jobs/Command/deathsquad.yml b/Resources/Prototypes/Roles/Jobs/Command/deathsquad.yml
index 2e1d5973c54..f400806ad4e 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/deathsquad.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/deathsquad.yml
@@ -11,20 +11,4 @@
   accessGroups:
   - AllAccess
   access:
-  - CentralCommand
-
-- type: startingGear
-  id: DeathSquadGear
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitDeathSquad
-    back: ClothingBackpackDeathSquadFilled
-    mask: ClothingMaskGasDeathSquad
-    eyes: ClothingEyesHudSecurity
-    ears: ClothingHeadsetAltCentCom
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitDeathsquad
-    shoes: ClothingShoesBootsMagAdv
-    id: DeathsquadPDA
-    pocket1: EnergySword
-    pocket2: EnergyShield
-    belt: ClothingBeltMilitaryWebbingMedFilled
\ No newline at end of file
+  - CentralCommand
\ No newline at end of file

From 6ec6789f7ce67707704afcc9ea42c665c2950550 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 26 Dec 2024 19:10:12 -0400
Subject: [PATCH 317/366] siiigh

---
 .../Prototypes/Entities/Objects/Misc/identification_cards.yml  | 2 +-
 Resources/Prototypes/Roles/play_time_trackers.yml              | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index 2ce04b96fbc..3b58f027505 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -1009,7 +1009,7 @@
   - type: Item
     heldPrefix: blue
   - type: PresetIdCard
-    jobTitle: CBURN
+    job: CBURN
 
 - type: entity
   parent: IDCardStandard
diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml
index a0abb1a1070..443b2c7ec3e 100644
--- a/Resources/Prototypes/Roles/play_time_trackers.yml
+++ b/Resources/Prototypes/Roles/play_time_trackers.yml
@@ -168,3 +168,6 @@
 
 - type: playTimeTracker
   id: JobZookeeper
+
+- type: playTimeTracker
+  id: JobDeathSquad
\ No newline at end of file

From b3a5d1c85fc2e109ad542aa39522e76aabc52f99 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 26 Dec 2024 19:19:31 -0400
Subject: [PATCH 318/366] yeag

---
 Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml | 14 ++++++++++++++
 .../Jobs/{Command => CentComm}/deathsquad.yml      |  0
 Resources/Prototypes/Roles/play_time_trackers.yml  |  5 ++++-
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml
 rename Resources/Prototypes/Roles/Jobs/{Command => CentComm}/deathsquad.yml (100%)

diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml b/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml
new file mode 100644
index 00000000000..5f5e3138d15
--- /dev/null
+++ b/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml
@@ -0,0 +1,14 @@
+- type: job
+  id: CBURN
+  name: job-name-cburn
+  description: job-description-cburn
+  playTimeTracker: JobCBURN
+  setPreference: false
+  startingGear: CBURNGear
+  icon: "JobIconNanotrasen"
+  supervisors: job-supervisors-centcom
+  canBeAntag: false
+  accessGroups:
+  - AllAccess
+  access:
+  - CentralCommand
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Command/deathsquad.yml b/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml
similarity index 100%
rename from Resources/Prototypes/Roles/Jobs/Command/deathsquad.yml
rename to Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml
diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml
index 443b2c7ec3e..fd99b2c2288 100644
--- a/Resources/Prototypes/Roles/play_time_trackers.yml
+++ b/Resources/Prototypes/Roles/play_time_trackers.yml
@@ -170,4 +170,7 @@
   id: JobZookeeper
 
 - type: playTimeTracker
-  id: JobDeathSquad
\ No newline at end of file
+  id: JobDeathSquad
+
+- type: playTimeTracker
+  id: JobCBURN
\ No newline at end of file

From f684930aa7d310667d92b1525a89abad106dbd9b Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 26 Dec 2024 19:28:43 -0400
Subject: [PATCH 319/366] yeag

---
 Resources/Prototypes/Entities/Objects/Devices/pda.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index b936ef82c0a..30f8d688f31 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -1003,7 +1003,6 @@
       - AstroNavCartridge
       - StockTradingCartridge # Delta-V
       - NanoChatCartridge # DeltaV
-      - StockTradingCartridge # DeltaV - StockTrading
 
 - type: entity
   parent: CentcomPDA

From 91ca7e3fb95622a9672e0a97ef81b2dd052d8798 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 26 Dec 2024 19:30:02 -0400
Subject: [PATCH 320/366] Update message for failing to spawn.

---
 Content.IntegrationTests/Tests/CargoTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.IntegrationTests/Tests/CargoTest.cs b/Content.IntegrationTests/Tests/CargoTest.cs
index 5b6ebef8bd0..e2b82ff966f 100644
--- a/Content.IntegrationTests/Tests/CargoTest.cs
+++ b/Content.IntegrationTests/Tests/CargoTest.cs
@@ -132,7 +132,7 @@ await server.WaitAssertion(() =>
                 }
                 catch (Exception e)
                 {
-                    Assert.Fail(proto);
+                    Assert.Fail($"Prototype {proto} failed to spawn! Is your configuration invalid?");
                     return;
                 }
 

From 50bb5b7dadeb9d3b0162a864aa3c3cde79eda865 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 26 Dec 2024 19:47:18 -0400
Subject: [PATCH 321/366] remove bad cartridges

---
 Resources/Prototypes/Entities/Objects/Devices/pda.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 30f8d688f31..a477e1dd646 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -444,7 +444,6 @@
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
-      - AstroNavCartridge
       - NanoChatCartridge # DeltaV
 
 - type: entity
@@ -973,10 +972,8 @@
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
-      - MedTekCartridge
       - SecWatchCartridge # DeltaV: SecWatch replaces WantedList
       - LogProbeCartridge
-      - AstroNavCartridge
       - NanoChatCartridge # DeltaV
 
 - type: entity
@@ -999,8 +996,6 @@
       - NewsReaderCartridge
       - LogProbeCartridge
       - SecWatchCartridge # DeltaV: SecWatch replaces WantedList
-      - MedTekCartridge
-      - AstroNavCartridge
       - StockTradingCartridge # Delta-V
       - NanoChatCartridge # DeltaV
 
@@ -1119,10 +1114,8 @@
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
-      - MedTekCartridge
       - SecWatchCartridge # DeltaV: SecWatch replaces WantedList
       - LogProbeCartridge
-      - AstroNavCartridge
       - NanoChatCartridge # DeltaV
 
 - type: entity
@@ -1320,7 +1313,6 @@
     - NewsReaderCartridge
     - CrimeAssistCartridge # DeltaV
     - SecWatchCartridge # DeltaV: SecWatch replaces WantedList
-    - MedTekCartridge
     - NanoChatCartridge # DeltaV
 
 - type: entity

From 6629ec7d574cdef0f570d91c8919e0968cfd0314 Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Fri, 27 Dec 2024 03:06:17 +0000
Subject: [PATCH 322/366] salvage points shop (#2510)

* add conscription bag

* add gar mesons

* remove salvage vendor restock

* add code for shop vendors

* make salvage vendor a shop vendor

* ui fixes

* :trollface:

* update locker and vendor inventory

* add mining hardsuit for 3k

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 .../VendingMachines/ShopVendorSystem.cs       | 123 ++++++++++++
 .../UI/ShopVendorBoundUserInterface.cs        |  25 +++
 .../VendingMachines/UI/ShopVendorItem.xaml    |  13 ++
 .../VendingMachines/UI/ShopVendorItem.xaml.cs |  21 ++
 .../VendingMachines/UI/ShopVendorWindow.xaml  |  24 +++
 .../UI/ShopVendorWindow.xaml.cs               | 147 ++++++++++++++
 .../VendingMachines/ShopVendorSystem.cs       |  47 +++++
 .../VendingMachines/PointsVendorComponent.cs  |   9 +
 .../VendingMachines/SharedShopVendorSystem.cs | 181 ++++++++++++++++++
 .../VendingMachines/ShopInventoryPrototype.cs |  23 +++
 .../VendingMachines/ShopVendorComponent.cs    |  96 ++++++++++
 .../DeltaV/VendingMachines/ShopVendorUI.cs    |   9 +
 .../deltav/vending-machines/shop-vendor.ftl   |   4 +
 Resources/Migrations/eeMigration.yml          |   3 +
 .../Catalog/Cargo/cargo_vending.yml           |  18 +-
 .../Catalog/Fills/Crates/vending.yml          |  18 +-
 .../Catalog/Fills/Lockers/cargo.yml           |   4 +-
 .../VendingMachines/Inventories/salvage.yml   |   1 +
 .../Fills/Items/Backpacks/duffelbag.yml       |  18 ++
 .../Inventories/salvage_points.yml            |  53 +++++
 .../DeltaV/Entities/Clothing/Eyes/glasses.yml |   8 +
 .../Objects/Specific/Salvage/ore_bag.yml      |   2 +-
 .../Service/vending_machine_restock.yml       |   1 +
 .../Structures/Machines/vending_machines.yml  |  27 ++-
 Resources/Prototypes/Wires/layouts.yml        |   8 +
 25 files changed, 856 insertions(+), 27 deletions(-)
 create mode 100644 Content.Client/DeltaV/VendingMachines/ShopVendorSystem.cs
 create mode 100644 Content.Client/DeltaV/VendingMachines/UI/ShopVendorBoundUserInterface.cs
 create mode 100644 Content.Client/DeltaV/VendingMachines/UI/ShopVendorItem.xaml
 create mode 100644 Content.Client/DeltaV/VendingMachines/UI/ShopVendorItem.xaml.cs
 create mode 100644 Content.Client/DeltaV/VendingMachines/UI/ShopVendorWindow.xaml
 create mode 100644 Content.Client/DeltaV/VendingMachines/UI/ShopVendorWindow.xaml.cs
 create mode 100644 Content.Server/DeltaV/VendingMachines/ShopVendorSystem.cs
 create mode 100644 Content.Shared/DeltaV/VendingMachines/PointsVendorComponent.cs
 create mode 100644 Content.Shared/DeltaV/VendingMachines/SharedShopVendorSystem.cs
 create mode 100644 Content.Shared/DeltaV/VendingMachines/ShopInventoryPrototype.cs
 create mode 100644 Content.Shared/DeltaV/VendingMachines/ShopVendorComponent.cs
 create mode 100644 Content.Shared/DeltaV/VendingMachines/ShopVendorUI.cs
 create mode 100644 Resources/Locale/en-US/deltav/vending-machines/shop-vendor.ftl
 create mode 100644 Resources/Prototypes/DeltaV/Catalog/Fills/Items/Backpacks/duffelbag.yml
 create mode 100644 Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml

diff --git a/Content.Client/DeltaV/VendingMachines/ShopVendorSystem.cs b/Content.Client/DeltaV/VendingMachines/ShopVendorSystem.cs
new file mode 100644
index 00000000000..3b7f5744421
--- /dev/null
+++ b/Content.Client/DeltaV/VendingMachines/ShopVendorSystem.cs
@@ -0,0 +1,123 @@
+using Content.Shared.DeltaV.VendingMachines;
+using Content.Shared.VendingMachines;
+using Robust.Client.Animations;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.DeltaV.VendingMachines;
+
+public sealed class ShopVendorSystem : SharedShopVendorSystem
+{
+    [Dependency] private readonly AnimationPlayerSystem _animationPlayer = default!;
+    [Dependency] private readonly AppearanceSystem _appearance = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ShopVendorComponent, AppearanceChangeEvent>(OnAppearanceChange);
+        SubscribeLocalEvent<ShopVendorComponent, AnimationCompletedEvent>(OnAnimationCompleted);
+    }
+
+    // copied from vending machines because its not reusable in other systems :)
+    private void OnAnimationCompleted(Entity<ShopVendorComponent> ent, ref AnimationCompletedEvent args)
+    {
+        UpdateAppearance((ent, ent.Comp));
+    }
+
+    private void OnAppearanceChange(Entity<ShopVendorComponent> ent, ref AppearanceChangeEvent args)
+    {
+        UpdateAppearance((ent, ent.Comp, args.Sprite));
+    }
+
+    private void UpdateAppearance(Entity<ShopVendorComponent, SpriteComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp2))
+            return;
+
+        if (!_appearance.TryGetData<VendingMachineVisualState>(ent, VendingMachineVisuals.VisualState, out var state))
+            state = VendingMachineVisualState.Normal;
+
+        var sprite = ent.Comp2;
+        SetLayerState(VendingMachineVisualLayers.Base, ent.Comp1.OffState, sprite);
+        SetLayerState(VendingMachineVisualLayers.Screen, ent.Comp1.ScreenState, sprite);
+        switch (state)
+        {
+            case VendingMachineVisualState.Normal:
+                SetLayerState(VendingMachineVisualLayers.BaseUnshaded, ent.Comp1.NormalState, sprite);
+                break;
+
+            case VendingMachineVisualState.Deny:
+                if (ent.Comp1.LoopDenyAnimation)
+                    SetLayerState(VendingMachineVisualLayers.BaseUnshaded, ent.Comp1.DenyState, sprite);
+                else
+                    PlayAnimation(ent, VendingMachineVisualLayers.BaseUnshaded, ent.Comp1.DenyState, ent.Comp1.DenyDelay, sprite);
+                break;
+
+            case VendingMachineVisualState.Eject:
+                PlayAnimation(ent, VendingMachineVisualLayers.BaseUnshaded, ent.Comp1.EjectState, ent.Comp1.EjectDelay, sprite);
+                break;
+
+            case VendingMachineVisualState.Broken:
+                HideLayers(sprite);
+                SetLayerState(VendingMachineVisualLayers.Base, ent.Comp1.BrokenState, sprite);
+                break;
+
+            case VendingMachineVisualState.Off:
+                HideLayers(sprite);
+                break;
+        }
+    }
+
+    private static void SetLayerState(VendingMachineVisualLayers layer, string? state, SpriteComponent sprite)
+    {
+        if (state == null)
+            return;
+
+        sprite.LayerSetVisible(layer, true);
+        sprite.LayerSetAutoAnimated(layer, true);
+        sprite.LayerSetState(layer, state);
+    }
+
+    private void PlayAnimation(EntityUid uid, VendingMachineVisualLayers layer, string? state, TimeSpan time, SpriteComponent sprite)
+    {
+        if (state == null || _animationPlayer.HasRunningAnimation(uid, state))
+            return;
+
+        var animation = GetAnimation(layer, state, time);
+        sprite.LayerSetVisible(layer, true);
+        _animationPlayer.Play(uid, animation, state);
+    }
+
+    private static Animation GetAnimation(VendingMachineVisualLayers layer, string state, TimeSpan time)
+    {
+        return new Animation
+        {
+            Length = time,
+            AnimationTracks =
+            {
+                new AnimationTrackSpriteFlick
+                {
+                    LayerKey = layer,
+                    KeyFrames =
+                    {
+                        new AnimationTrackSpriteFlick.KeyFrame(state, 0f)
+                    }
+                }
+            }
+        };
+    }
+
+    private static void HideLayers(SpriteComponent sprite)
+    {
+        HideLayer(VendingMachineVisualLayers.BaseUnshaded, sprite);
+        HideLayer(VendingMachineVisualLayers.Screen, sprite);
+    }
+
+    private static void HideLayer(VendingMachineVisualLayers layer, SpriteComponent sprite)
+    {
+        if (!sprite.LayerMapTryGet(layer, out var actualLayer))
+            return;
+
+        sprite.LayerSetVisible(actualLayer, false);
+    }
+}
diff --git a/Content.Client/DeltaV/VendingMachines/UI/ShopVendorBoundUserInterface.cs b/Content.Client/DeltaV/VendingMachines/UI/ShopVendorBoundUserInterface.cs
new file mode 100644
index 00000000000..6122aa9ee1e
--- /dev/null
+++ b/Content.Client/DeltaV/VendingMachines/UI/ShopVendorBoundUserInterface.cs
@@ -0,0 +1,25 @@
+using Content.Shared.DeltaV.VendingMachines;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.DeltaV.VendingMachines.UI;
+
+public sealed class ShopVendorBoundUserInterface : BoundUserInterface
+{
+    [ViewVariables]
+    private ShopVendorWindow? _window;
+
+    public ShopVendorBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+    }
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _window = this.CreateWindow<ShopVendorWindow>();
+        _window.SetEntity(Owner);
+        _window.OpenCenteredLeft();
+        _window.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
+        _window.OnItemSelected += index => SendMessage(new ShopVendorPurchaseMessage(index));
+    }
+}
diff --git a/Content.Client/DeltaV/VendingMachines/UI/ShopVendorItem.xaml b/Content.Client/DeltaV/VendingMachines/UI/ShopVendorItem.xaml
new file mode 100644
index 00000000000..4708db20aa9
--- /dev/null
+++ b/Content.Client/DeltaV/VendingMachines/UI/ShopVendorItem.xaml
@@ -0,0 +1,13 @@
+<BoxContainer xmlns="https://spacestation14.io"
+            Orientation="Horizontal"
+            HorizontalExpand="True"
+            SeparationOverride="4">
+    <EntityPrototypeView
+        Name="ItemPrototype"
+        Margin="4 0 0 0"
+        HorizontalAlignment="Center"
+        VerticalAlignment="Center"
+        MinSize="32 32"/>
+    <Label Name="NameLabel" SizeFlagsStretchRatio="3" HorizontalExpand="True" ClipText="True"/>
+    <Label Name="CostLabel" SizeFlagsStretchRatio="3" HorizontalAlignment="Right" Margin="8 0"/>
+</BoxContainer>
diff --git a/Content.Client/DeltaV/VendingMachines/UI/ShopVendorItem.xaml.cs b/Content.Client/DeltaV/VendingMachines/UI/ShopVendorItem.xaml.cs
new file mode 100644
index 00000000000..4a3c9c4efe5
--- /dev/null
+++ b/Content.Client/DeltaV/VendingMachines/UI/ShopVendorItem.xaml.cs
@@ -0,0 +1,21 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.DeltaV.VendingMachines.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class ShopVendorItem : BoxContainer
+{
+    public ShopVendorItem(EntProtoId entProto, string text, uint cost)
+    {
+        RobustXamlLoader.Load(this);
+
+        ItemPrototype.SetPrototype(entProto);
+
+        NameLabel.Text = text;
+
+        CostLabel.Text = cost.ToString();
+    }
+}
diff --git a/Content.Client/DeltaV/VendingMachines/UI/ShopVendorWindow.xaml b/Content.Client/DeltaV/VendingMachines/UI/ShopVendorWindow.xaml
new file mode 100644
index 00000000000..cfc7f4a4a2c
--- /dev/null
+++ b/Content.Client/DeltaV/VendingMachines/UI/ShopVendorWindow.xaml
@@ -0,0 +1,24 @@
+<controls:FancyWindow
+        xmlns="https://spacestation14.io"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+        MinHeight="210">
+    <BoxContainer Name="MainContainer" Orientation="Vertical">
+    	<BoxContainer Orientation="Horizontal">
+    	    <LineEdit Name="SearchBar" PlaceHolder="{Loc 'vending-machine-component-search-filter'}" HorizontalExpand="True" Margin="4 4"/>
+	        <Label Name="BalanceLabel" Margin="4 4"/>
+        </BoxContainer>
+        <controls:SearchListContainer Name="VendingContents" VerticalExpand="True" Margin="4 4"/>
+         <!-- Footer -->
+        <BoxContainer Orientation="Vertical">
+            <PanelContainer StyleClasses="LowDivider" />
+            <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
+                <Label Text="{Loc 'shop-vendor-flavor-left'}" StyleClasses="WindowFooterText" />
+                <Label Text="{Loc 'shop-vendor-flavor-right'}" StyleClasses="WindowFooterText"
+                     HorizontalAlignment="Right" HorizontalExpand="True"  Margin="0 0 5 0" />
+                <TextureRect StyleClasses="NTLogoDark" Stretch="KeepAspectCentered"
+                     VerticalAlignment="Center" HorizontalAlignment="Right" SetSize="19 19"/>
+            </BoxContainer>
+        </BoxContainer>
+    </BoxContainer>
+</controls:FancyWindow>
diff --git a/Content.Client/DeltaV/VendingMachines/UI/ShopVendorWindow.xaml.cs b/Content.Client/DeltaV/VendingMachines/UI/ShopVendorWindow.xaml.cs
new file mode 100644
index 00000000000..2b9c4df87a0
--- /dev/null
+++ b/Content.Client/DeltaV/VendingMachines/UI/ShopVendorWindow.xaml.cs
@@ -0,0 +1,147 @@
+using Content.Client.UserInterface.Controls;
+using Content.Shared.DeltaV.VendingMachines;
+using Content.Shared.Stacks;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+using System.Numerics;
+
+namespace Content.Client.DeltaV.VendingMachines.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class ShopVendorWindow : FancyWindow
+{
+    [Dependency] private readonly IComponentFactory _factory = default!;
+    [Dependency] private readonly IEntityManager _entMan = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    private readonly ShopVendorSystem _vendor;
+
+    /// <summary>
+    /// Event fired with the listing index to purchase.
+    /// </summary>
+    public event Action<int>? OnItemSelected;
+
+    private EntityUid _owner;
+    private readonly StyleBoxFlat _style = new() { BackgroundColor = new Color(70, 73, 102) };
+    private readonly StyleBoxFlat _styleBroke = new() { BackgroundColor = Color.FromHex("#303133") };
+    private readonly List<ListContainerButton> _buttons = new();
+    private uint _balance = 1;
+
+    public ShopVendorWindow()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        _vendor = _entMan.System<ShopVendorSystem>();
+
+        VendingContents.SearchBar = SearchBar;
+        VendingContents.DataFilterCondition += DataFilterCondition;
+        VendingContents.GenerateItem += GenerateButton;
+        VendingContents.ItemKeyBindDown += (args, data) => OnItemSelected?.Invoke(((ShopVendorListingData) data).Index);
+    }
+
+    public void SetEntity(EntityUid owner)
+    {
+        _owner = owner;
+
+        if (!_entMan.TryGetComponent<ShopVendorComponent>(owner, out var comp))
+            return;
+
+        var pack = _proto.Index(comp.Pack);
+        Populate(pack.Listings);
+
+        UpdateBalance();
+    }
+
+    private void UpdateBalance(uint balance)
+    {
+        if (_balance == balance)
+            return;
+
+        _balance = balance;
+
+        BalanceLabel.Text = Loc.GetString("shop-vendor-balance", ("points", balance));
+
+        // disable items that are too expensive to buy
+        foreach (var button in _buttons)
+        {
+            if (button.Data is ShopVendorListingData data)
+                button.Disabled = data.Cost > balance;
+
+            button.StyleBoxOverride = button.Disabled ? _styleBroke : _style;
+        }
+    }
+
+    private void UpdateBalance()
+    {
+        if (_player.LocalEntity is {} user)
+            UpdateBalance(_vendor.GetBalance(_owner, user));
+    }
+
+    private bool DataFilterCondition(string filter, ListData data)
+    {
+        if (data is not ShopVendorListingData { Text: var text })
+            return false;
+
+        if (string.IsNullOrEmpty(filter))
+            return true;
+
+        return text.Contains(filter, StringComparison.CurrentCultureIgnoreCase);
+    }
+
+    private void GenerateButton(ListData data, ListContainerButton button)
+    {
+        if (data is not ShopVendorListingData cast)
+            return;
+
+        _buttons.Add(button);
+        button.AddChild(new ShopVendorItem(cast.ItemId, cast.Text, cast.Cost));
+
+        button.ToolTip = cast.Text;
+        button.Disabled = cast.Cost > _balance;
+        button.StyleBoxOverride = button.Disabled ? _styleBroke : _style;
+    }
+
+    public void Populate(List<ShopListing> listings)
+    {
+        var longestEntry = string.Empty;
+        var listData = new List<ShopVendorListingData>();
+        for (var i = 0; i < listings.Count; i++)
+        {
+            var listing = listings[i];
+            var proto = _proto.Index(listing.Id);
+            var text = proto.Name;
+            if (proto.TryGetComponent<StackComponent>(out var stack, _factory) && stack.Count > 1)
+            {
+                text += " ";
+                text += Loc.GetString("shop-vendor-stack-suffix", ("count", stack.Count));
+            }
+            listData.Add(new ShopVendorListingData(i, listing.Id, text, listing.Cost));
+        }
+
+        _buttons.Clear();
+        VendingContents.PopulateList(listData);
+        SetSizeAfterUpdate(longestEntry.Length, listings.Count);
+    }
+
+    private void SetSizeAfterUpdate(int longestEntryLength, int contentCount)
+    {
+        SetSize = new Vector2(Math.Clamp((longestEntryLength + 2) * 12, 250, 400),
+            Math.Clamp(contentCount * 50, 150, 350));
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+
+        UpdateBalance();
+    }
+}
+
+public record ShopVendorListingData(int Index, EntProtoId ItemId, string Text, uint Cost) : ListData;
diff --git a/Content.Server/DeltaV/VendingMachines/ShopVendorSystem.cs b/Content.Server/DeltaV/VendingMachines/ShopVendorSystem.cs
new file mode 100644
index 00000000000..d3e99bfcf83
--- /dev/null
+++ b/Content.Server/DeltaV/VendingMachines/ShopVendorSystem.cs
@@ -0,0 +1,47 @@
+using Content.Server.Advertise;
+using Content.Server.Advertise.Components;
+using Content.Shared.DeltaV.VendingMachines;
+
+namespace Content.Server.DeltaV.VendingMachines;
+
+public sealed class ShopVendorSystem : SharedShopVendorSystem
+{
+    [Dependency] private readonly SpeakOnUIClosedSystem _speakOnUIClosed = default!;
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<ShopVendorComponent, TransformComponent>();
+        var now = Timing.CurTime;
+        while (query.MoveNext(out var uid, out var comp, out var xform))
+        {
+            var ent = (uid, comp);
+            var dirty = false;
+            if (comp.Ejecting is {} ejecting && now > comp.NextEject)
+            {
+                Spawn(ejecting, xform.Coordinates);
+                comp.Ejecting = null;
+                dirty = true;
+            }
+
+            if (comp.Denying && now > comp.NextDeny)
+            {
+                comp.Denying = false;
+                dirty = true;
+            }
+
+            if (dirty)
+            {
+                Dirty(uid, comp);
+                UpdateVisuals(ent);
+            }
+        }
+    }
+
+    protected override void AfterPurchase(Entity<ShopVendorComponent> ent)
+    {
+        if (TryComp<SpeakOnUIClosedComponent>(ent, out var speak))
+            _speakOnUIClosed.TrySetFlag((ent.Owner, speak));
+    }
+}
diff --git a/Content.Shared/DeltaV/VendingMachines/PointsVendorComponent.cs b/Content.Shared/DeltaV/VendingMachines/PointsVendorComponent.cs
new file mode 100644
index 00000000000..d505215a469
--- /dev/null
+++ b/Content.Shared/DeltaV/VendingMachines/PointsVendorComponent.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.DeltaV.VendingMachines;
+
+/// <summary>
+/// Makes a <see cref="ShopVendorComponent"/> use mining points to buy items.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class PointsVendorComponent : Component;
diff --git a/Content.Shared/DeltaV/VendingMachines/SharedShopVendorSystem.cs b/Content.Shared/DeltaV/VendingMachines/SharedShopVendorSystem.cs
new file mode 100644
index 00000000000..464711c32ab
--- /dev/null
+++ b/Content.Shared/DeltaV/VendingMachines/SharedShopVendorSystem.cs
@@ -0,0 +1,181 @@
+using Content.Shared.Access.Systems;
+using Content.Shared.DeltaV.Salvage.Systems;
+using Content.Shared.Destructible;
+using Content.Shared.Popups;
+using Content.Shared.Power;
+using Content.Shared.Power.EntitySystems;
+using Content.Shared.UserInterface;
+using Content.Shared.VendingMachines;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.DeltaV.VendingMachines;
+
+public abstract class SharedShopVendorSystem : EntitySystem
+{
+    [Dependency] private readonly AccessReaderSystem _access = default!;
+    [Dependency] private readonly MiningPointsSystem _points = default!;
+    [Dependency] protected readonly IGameTiming Timing = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedPointLightSystem _light = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedPowerReceiverSystem _power = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<PointsVendorComponent, ShopVendorBalanceEvent>(OnPointsBalance);
+        SubscribeLocalEvent<PointsVendorComponent, ShopVendorPurchaseEvent>(OnPointsPurchase);
+
+        SubscribeLocalEvent<ShopVendorComponent, PowerChangedEvent>(OnPowerChanged);
+        SubscribeLocalEvent<ShopVendorComponent, BreakageEventArgs>(OnBreak);
+        SubscribeLocalEvent<ShopVendorComponent, ActivatableUIOpenAttemptEvent>(OnOpenAttempt);
+        Subs.BuiEvents<ShopVendorComponent>(VendingMachineUiKey.Key, subs =>
+        {
+            subs.Event<ShopVendorPurchaseMessage>(OnPurchase);
+        });
+    }
+
+    #region Public API
+
+    public uint GetBalance(EntityUid uid, EntityUid user)
+    {
+        var ev = new ShopVendorBalanceEvent(user);
+        RaiseLocalEvent(uid, ref ev);
+        return ev.Balance;
+    }
+
+    #endregion
+
+    #region Balance adapters
+
+    private void OnPointsBalance(Entity<PointsVendorComponent> ent, ref ShopVendorBalanceEvent args)
+    {
+        args.Balance = _points.TryFindIdCard(args.User)?.Comp?.Points ?? 0;
+    }
+
+    private void OnPointsPurchase(Entity<PointsVendorComponent> ent, ref ShopVendorPurchaseEvent args)
+    {
+        if (_points.TryFindIdCard(args.User) is {} idCard && _points.RemovePoints(idCard, args.Cost))
+            args.Paid = true;
+    }
+
+    #endregion
+
+    private void OnPowerChanged(Entity<ShopVendorComponent> ent, ref PowerChangedEvent args)
+    {
+        UpdateVisuals(ent);
+    }
+
+    private void OnBreak(Entity<ShopVendorComponent> ent, ref BreakageEventArgs args)
+    {
+        ent.Comp.Broken = true;
+        UpdateVisuals(ent);
+    }
+
+    private void OnOpenAttempt(Entity<ShopVendorComponent> ent, ref ActivatableUIOpenAttemptEvent args)
+    {
+        if (ent.Comp.Broken)
+            args.Cancel();
+    }
+
+    private void OnPurchase(Entity<ShopVendorComponent> ent, ref ShopVendorPurchaseMessage args)
+    {
+        if (ent.Comp.Ejecting != null || ent.Comp.Broken || !_power.IsPowered(ent.Owner))
+            return;
+
+        var pack = _proto.Index(ent.Comp.Pack);
+        if (args.Index < 0 || args.Index >= pack.Listings.Count)
+            return;
+
+        var user = args.Actor;
+        if (!_access.IsAllowed(user, ent))
+        {
+            Deny(ent, user);
+            return;
+        }
+
+        var listing = pack.Listings[args.Index];
+        var ev = new ShopVendorPurchaseEvent(user, listing.Cost);
+        RaiseLocalEvent(ent, ref ev);
+        if (!ev.Paid)
+        {
+            Deny(ent, user);
+            return;
+        }
+
+        ent.Comp.Ejecting = listing.Id;
+        ent.Comp.NextEject = Timing.CurTime + ent.Comp.EjectDelay;
+        Dirty(ent);
+
+        _audio.PlayPvs(ent.Comp.PurchaseSound, ent);
+        UpdateVisuals(ent);
+
+        Log.Debug($"Player {ToPrettyString(user):user} purchased {listing.Id} from {ToPrettyString(ent):vendor}");
+
+        AfterPurchase(ent);
+    }
+
+    protected virtual void AfterPurchase(Entity<ShopVendorComponent> ent)
+    {
+    }
+
+    private void Deny(Entity<ShopVendorComponent> ent, EntityUid user)
+    {
+        _popup.PopupClient(Loc.GetString("vending-machine-component-try-eject-access-denied"), ent, user);
+        if (ent.Comp.Denying)
+            return;
+
+        ent.Comp.Denying = true;
+        ent.Comp.NextDeny = Timing.CurTime + ent.Comp.DenyDelay;
+        Dirty(ent);
+
+        _audio.PlayPvs(ent.Comp.DenySound, ent);
+        UpdateVisuals(ent);
+    }
+
+    protected void UpdateVisuals(Entity<ShopVendorComponent> ent)
+    {
+        var state = VendingMachineVisualState.Normal;
+        var lit = true;
+        if (ent.Comp.Broken)
+        {
+            state = VendingMachineVisualState.Broken;
+            lit = false;
+        }
+        else if (ent.Comp.Ejecting != null)
+        {
+            state = VendingMachineVisualState.Eject;
+        }
+        else if (ent.Comp.Denying)
+        {
+            state = VendingMachineVisualState.Deny;
+        }
+        else if (!_power.IsPowered(ent.Owner))
+        {
+            state = VendingMachineVisualState.Off;
+            lit = true;
+        }
+
+        _light.SetEnabled(ent, lit);
+        _appearance.SetData(ent, VendingMachineVisuals.VisualState, state);
+    }
+}
+
+/// <summary>
+/// Raised on a shop vendor to get its current balance.
+/// A currency component sets Balance to whatever it is.
+/// </summary>
+[ByRefEvent]
+public record struct ShopVendorBalanceEvent(EntityUid User, uint Balance = 0);
+
+/// <summary>
+/// Raised on a shop vendor when trying to purchase an item.
+/// A currency component sets Paid to true if the user successfully paid for it.
+/// </summary>
+[ByRefEvent]
+public record struct ShopVendorPurchaseEvent(EntityUid User, uint Cost, bool Paid = false);
diff --git a/Content.Shared/DeltaV/VendingMachines/ShopInventoryPrototype.cs b/Content.Shared/DeltaV/VendingMachines/ShopInventoryPrototype.cs
new file mode 100644
index 00000000000..3b04c0d0490
--- /dev/null
+++ b/Content.Shared/DeltaV/VendingMachines/ShopInventoryPrototype.cs
@@ -0,0 +1,23 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.DeltaV.VendingMachines;
+
+/// <summary>
+/// Similar to <c>VendingMachineInventoryPrototype</c> but for <see cref="ShopVendorComponent"/>.
+/// </summary>
+[Prototype]
+public sealed class ShopInventoryPrototype : IPrototype
+{
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    /// <summary>
+    /// The item listings for sale.
+    /// </summary>
+    [DataField(required: true)]
+    public List<ShopListing> Listings = new();
+}
+
+[DataRecord, Serializable]
+public record struct ShopListing(EntProtoId Id, uint Cost);
diff --git a/Content.Shared/DeltaV/VendingMachines/ShopVendorComponent.cs b/Content.Shared/DeltaV/VendingMachines/ShopVendorComponent.cs
new file mode 100644
index 00000000000..1de2c5476ed
--- /dev/null
+++ b/Content.Shared/DeltaV/VendingMachines/ShopVendorComponent.cs
@@ -0,0 +1,96 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.DeltaV.VendingMachines;
+
+/// <summary>
+/// A vending machine that sells items for a currency controlled by events.
+/// Does not need restocking.
+/// Another component must handle <see cref="ShopVendorBalanceEvent"/> and <see cref="ShopVendorPurchaseEvent"/> to work.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedShopVendorSystem))]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
+public sealed partial class ShopVendorComponent : Component
+{
+    /// <summary>
+    /// The inventory prototype to sell.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<ShopInventoryPrototype> Pack;
+
+    [DataField, AutoNetworkedField]
+    public bool Broken;
+
+    [DataField, AutoNetworkedField]
+    public bool Denying;
+
+    /// <summary>
+    /// Item being ejected, or null if it isn't.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntProtoId? Ejecting;
+
+    /// <summary>
+    /// How long to wait before flashing denied again.
+    /// </summary>
+    [DataField]
+    public TimeSpan DenyDelay = TimeSpan.FromSeconds(2);
+
+    /// <summary>
+    /// How long to wait before another item can be bought
+    /// </summary>
+    [DataField]
+    public TimeSpan EjectDelay = TimeSpan.FromSeconds(1.2);
+
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    public TimeSpan NextDeny;
+
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    public TimeSpan NextEject;
+
+    [DataField]
+    public SoundSpecifier PurchaseSound = new SoundPathSpecifier("/Audio/Machines/machine_vend.ogg")
+    {
+        Params = new AudioParams
+        {
+            Volume = -4f,
+            Variation = 0.15f
+        }
+    };
+
+    [DataField]
+    public SoundSpecifier DenySound = new SoundPathSpecifier("/Audio/Machines/custom_deny.ogg")
+    {
+        Params = new AudioParams
+        {
+            Volume = -2f
+        }
+    };
+
+    #region Visuals
+
+    [DataField]
+    public bool LoopDenyAnimation = true;
+
+    [DataField]
+    public string? OffState;
+
+    [DataField]
+    public string? ScreenState;
+
+    [DataField]
+    public string? NormalState;
+
+    [DataField]
+    public string? DenyState;
+
+    [DataField]
+    public string? EjectState;
+
+    [DataField]
+    public string? BrokenState;
+
+    #endregion
+}
diff --git a/Content.Shared/DeltaV/VendingMachines/ShopVendorUI.cs b/Content.Shared/DeltaV/VendingMachines/ShopVendorUI.cs
new file mode 100644
index 00000000000..9f288d9d322
--- /dev/null
+++ b/Content.Shared/DeltaV/VendingMachines/ShopVendorUI.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.DeltaV.VendingMachines;
+
+[Serializable, NetSerializable]
+public sealed class ShopVendorPurchaseMessage(int index) : BoundUserInterfaceMessage
+{
+    public readonly int Index = index;
+}
diff --git a/Resources/Locale/en-US/deltav/vending-machines/shop-vendor.ftl b/Resources/Locale/en-US/deltav/vending-machines/shop-vendor.ftl
new file mode 100644
index 00000000000..361d1dc71cb
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/vending-machines/shop-vendor.ftl
@@ -0,0 +1,4 @@
+shop-vendor-balance = Balance: {$points}
+shop-vendor-stack-suffix = x{$count}
+shop-vendor-flavor-left = All payments are secure
+shop-vendor-flavor-right = v1.2
diff --git a/Resources/Migrations/eeMigration.yml b/Resources/Migrations/eeMigration.yml
index 6793f2f5b8c..a84314d3277 100644
--- a/Resources/Migrations/eeMigration.yml
+++ b/Resources/Migrations/eeMigration.yml
@@ -117,3 +117,6 @@ SophicScribe: SophicScribeSpawner
 
 # 2024-11-16
 GlassBoxLaser: null #Captain's Laser was moved to Loadouts.
+
+# 2024-12-22
+VendingMachineRestockSalvageEquipment: null
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
index 8e2e1b4df58..937ee63b504 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -148,15 +148,15 @@
   category: cargoproduct-category-name-service
   group: market
 
-- type: cargoProduct
-  id: CrateVendingMachineRestockSalvageEquipment
-  icon:
-    sprite: Objects/Specific/Service/vending_machine_restock.rsi
-    state: base
-  product: CrateVendingMachineRestockSalvageEquipmentFilled
-  cost: 1000
-  category: cargoproduct-category-name-engineering
-  group: market
+#- type: cargoProduct # DeltaV: Salvage vendor doesn't have stock anymore
+#  id: CrateVendingMachineRestockSalvageEquipment
+#  icon:
+#    sprite: Objects/Specific/Service/vending_machine_restock.rsi
+#    state: base
+#  product: CrateVendingMachineRestockSalvageEquipmentFilled
+#  cost: 1000
+#  category: cargoproduct-category-name-engineering
+#  group: market
 
 - type: cargoProduct
   id: CrateVendingMachineRestockSecTech
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml
index d54e103a70f..fd4e4fd2b43 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml
@@ -140,15 +140,15 @@
       - id: VendingMachineRestockRobustSoftdrinks
         amount: 2
 
-- type: entity
-  id: CrateVendingMachineRestockSalvageEquipmentFilled
-  parent: CrateGenericSteel
-  name: Salvage restock crate
-  description: Contains a restock box for the salvage vendor.
-  components:
-  - type: StorageFill
-    contents:
-      - id: VendingMachineRestockSalvageEquipment
+#- type: entity # DeltaV: Salvage vendor doesn't have stock anymore
+#  id: CrateVendingMachineRestockSalvageEquipmentFilled
+#  parent: CrateGenericSteel
+#  name: Salvage restock crate
+#  description: Contains a restock box for the salvage vendor.
+#  components:
+#  - type: StorageFill
+#    contents:
+#      - id: VendingMachineRestockSalvageEquipment
 
 - type: entity
   id: CrateVendingMachineRestockSecTechFilled
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
index 4ca95adff84..8059f892a6e 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
@@ -36,12 +36,12 @@
   components:
   - type: StorageFill
     contents:
-# Currently do not function as 'true' mesons, so they're useless for salvagers.
-#      - id: ClothingEyesGlassesMeson
+      - id: ClothingEyesGlassesGarMeson
       - id: ClothingBeltUtilityFilled
       - id: SurvivalKnife
       - id: HandheldGPSBasic
       - id: RadioHandheld
+      - id: FlashlightSeclite
       - id: SeismicCharge
         amount: 2
       - id: ClothingShoesBootsWinterMiner #Delta V: Add departmental winter boots
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml
index b5665df37ba..a1184748f1b 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml
@@ -9,6 +9,7 @@
     Floodlight: 2
     HandheldGPSBasic: 2
     RadioHandheld: 2
+    WeaponGrapplingGun: 4
     WeaponProtoKineticAccelerator: 4
     SeismicCharge: 2
     FultonBeacon: 1
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Backpacks/duffelbag.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Backpacks/duffelbag.yml
new file mode 100644
index 00000000000..eb0684b396f
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Backpacks/duffelbag.yml
@@ -0,0 +1,18 @@
+- type: entity
+  parent: ClothingBackpackDuffelSalvage
+  id: ClothingBackpackDuffelSalvageConscription
+  name: mining conscription kit
+  description: A duffel bag containing everything a crewmember needs to support a shaft miner in the field.
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingEyesGlassesMeson
+    - id: MineralScanner
+    - id: OreBag
+    - id: ClothingUniformJumpsuitSalvageSpecialist
+    - id: EncryptionKeyCargo
+    - id: ClothingMaskGasExplorer
+    - id: SalvageIDCard
+    - id: WeaponProtoKineticAccelerator
+    - id: SurvivalKnife
+    - id: FlashlightSeclite
diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml
new file mode 100644
index 00000000000..c1558ca8e50
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml
@@ -0,0 +1,53 @@
+- type: shopInventory
+  id: SalvageVendorInventory
+  listings:
+  # TODO: marker beacons 1/10/30 for 10 each
+  - id: DrinkWhiskeyBottleFull
+    cost: 100
+  - id: DrinkAbsintheBottleFull
+    cost: 100
+  - id: CigarGold
+    cost: 150
+  - id: Soap
+    cost: 200
+  - id: SeismicCharge
+    cost: 250
+  - id: WeaponGrapplingGun
+    cost: 300
+  # TODO: laser pointer 300, toy facehugger 300
+  # TODO: stabilizing serum for 400
+  - id: FultonBeacon
+    cost: 400
+  # TODO: bluespace shelter capsule for 400
+  - id: ClothingEyesGlassesGarMeson
+    cost: 500
+  - id: ClothingBeltSalvageWebbing
+    cost: 500
+  - id: MedkitBruteFilled
+    cost: 600
+  - id: MedkitBurnFilled
+    cost: 600
+  # TODO: salvage 5g, 3 implants and a locator for 600
+  # TODO: wormhole jaunter for 750
+  - id: WeaponCrusher
+    cost: 750
+  - id: WeaponProtoKineticAccelerator
+    cost: 750
+  - id: AdvancedMineralScanner
+    cost: 800
+  # TODO: resonator for 800
+  - id: Fulton
+    cost: 1000
+  # TODO: lazarus injector for 1k
+  - id: ClothingBackpackDuffelSalvageConscription
+    cost: 1500
+  - id: SpaceCash1000
+    cost: 2000
+  # TODO: super resonator for 2500
+  # TODO: jump boots for 2500
+  - id: ClothingOuterHardsuitSalvage
+    cost: 3000
+  # TODO: luxury shelter capsule for 3k
+  # TODO: luxury elite bar capsule for 10k
+  # TODO: pka mods
+  # TODO: mining drone stuff
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml
index 8642867effd..4a1d35ffea9 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml
@@ -12,3 +12,11 @@
     modifiers:
       coefficients:
         Caustic: 0.85
+
+- type: entity
+  parent: ClothingEyesGlassesGar
+  id: ClothingEyesGlassesGarMeson
+  name: gar mesons
+  description: Do the impossible, see the invisible!
+  components:
+  - type: EyeProtection
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml
index a36bfaf676b..cf5f61dddde 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml
@@ -14,7 +14,7 @@
     slots:
     - belt
   - type: Item
-    size: Ginormous
+    size: Huge # DeltaV: Was Ginormous, lets it fit in conscription bag
   - type: Storage
     maxItemSize: Normal
     grid:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
index 478aec4ce49..13c23d55463 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
@@ -365,6 +365,7 @@
     - state: refill_sec
 
 - type: entity
+  abstract: true # DeltaV: Salvage vendor doesn't have stock anymore
   parent: BaseVendingMachineRestock
   id: VendingMachineRestockSalvageEquipment
   name: Salvage Vendor restock box
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index c79cfa2641c..3b8a2cf8743 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -1524,12 +1524,12 @@
   name: Salvage Vendor
   description: A dwarf's best friend!
   components:
-  - type: VendingMachine
-    pack: SalvageEquipmentInventory
-    offState: off
-    brokenState: broken
-    normalState: normal-unshaded
-    denyState: deny-unshaded
+  #- type: VendingMachine # DeltaV: Use mining points instead of limited stock
+  #  pack: SalvageEquipmentInventory
+  #  offState: off
+  #  brokenState: broken
+  #  normalState: normal-unshaded
+  #  denyState: deny-unshaded
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/mining.rsi
     layers:
@@ -1546,6 +1546,21 @@
     color: "#9dc5c9"
     mask: /Textures/Effects/LightMasks/cone.png
     autoRot: true
+  - type: ShopVendor # DeltaV
+    pack: SalvageVendorInventory
+    offState: off
+    brokenState: broken
+    normalState: normal-unshaded
+    denyState: deny-unshaded
+  - type: PointsVendor # DeltaV
+  - type: UserInterface # DeltaV: Replace vending machine BUI with shop vendor
+    interfaces:
+      enum.VendingMachineUiKey.Key:
+        type: ShopVendorBoundUserInterface
+      enum.WiresUiKey.Key:
+        type: WiresBoundUserInterface
+  - type: Wires # DeltaV: Use shop vendor wires layout
+    layoutId: ShopVendor
   - type: AccessReader
     access: [["Salvage"]]
   - type: GuideHelp
diff --git a/Resources/Prototypes/Wires/layouts.yml b/Resources/Prototypes/Wires/layouts.yml
index cf76e0ea610..8aa10812573 100644
--- a/Resources/Prototypes/Wires/layouts.yml
+++ b/Resources/Prototypes/Wires/layouts.yml
@@ -149,3 +149,11 @@
     - !type:DelayWireAction
     - !type:ProceedWireAction
     - !type:BoomWireAction
+
+- type: wireLayout
+  id: ShopVendor
+  wires:
+  - !type:AiInteractWireAction
+  - !type:PowerWireAction
+  - !type:AccessWireAction
+  - !type:LogWireAction
\ No newline at end of file

From edf5038bf2c1a2da4601c898036a1eb223803646 Mon Sep 17 00:00:00 2001
From: ArchRBX <5040911+ArchRBX@users.noreply.github.com>
Date: Wed, 2 Oct 2024 07:17:57 +0100
Subject: [PATCH 323/366] MedTek Cartridge (#32450)

* initial commit

* adds cartridge to cmo's locker

* tidies up yml, adds default scanner sound, makes it so the silent property silences the scanner sound too

* fixes ert medic pda not having it preinstalled

* adds attribution

* removes redundant dependencies

* fix agent pda

---------

Co-authored-by: archrbx <punk.gear5260@fastmail.com>
---
 .../Cartridges/MedTekCartridgeComponent.cs    |   6 ++
 .../Cartridges/MedTekCartridgeSystem.cs       |  31 +++++++++
 .../Components/HealthAnalyzerComponent.cs     |   8 ++-
 .../Medical/HealthAnalyzerSystem.cs           |   5 +-
 .../en-US/cartridge-loader/cartridges.ftl     |   7 +-
 .../Catalog/Fills/Lockers/heads.yml           |  62 +++++++++++-------
 .../Entities/Objects/Devices/cartridges.yml   |  21 +++++-
 .../Entities/Objects/Devices/pda.yml          |  43 ++++++------
 .../Devices/cartridge.rsi/cart-med.png        | Bin 0 -> 289 bytes
 .../Objects/Devices/cartridge.rsi/meta.json   |   8 ++-
 10 files changed, 140 insertions(+), 51 deletions(-)
 create mode 100644 Content.Server/CartridgeLoader/Cartridges/MedTekCartridgeComponent.cs
 create mode 100644 Content.Server/CartridgeLoader/Cartridges/MedTekCartridgeSystem.cs
 create mode 100644 Resources/Textures/Objects/Devices/cartridge.rsi/cart-med.png

diff --git a/Content.Server/CartridgeLoader/Cartridges/MedTekCartridgeComponent.cs b/Content.Server/CartridgeLoader/Cartridges/MedTekCartridgeComponent.cs
new file mode 100644
index 00000000000..1a49b4d1f77
--- /dev/null
+++ b/Content.Server/CartridgeLoader/Cartridges/MedTekCartridgeComponent.cs
@@ -0,0 +1,6 @@
+namespace Content.Server.CartridgeLoader.Cartridges;
+
+[RegisterComponent]
+public sealed partial class MedTekCartridgeComponent : Component
+{
+}
diff --git a/Content.Server/CartridgeLoader/Cartridges/MedTekCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/MedTekCartridgeSystem.cs
new file mode 100644
index 00000000000..4d1b71dad04
--- /dev/null
+++ b/Content.Server/CartridgeLoader/Cartridges/MedTekCartridgeSystem.cs
@@ -0,0 +1,31 @@
+using Content.Server.Medical.Components;
+using Content.Shared.CartridgeLoader;
+
+namespace Content.Server.CartridgeLoader.Cartridges;
+
+public sealed class MedTekCartridgeSystem : EntitySystem
+{
+    [Dependency] private readonly CartridgeLoaderSystem _cartridgeLoaderSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<MedTekCartridgeComponent, CartridgeAddedEvent>(OnCartridgeAdded);
+        SubscribeLocalEvent<MedTekCartridgeComponent, CartridgeRemovedEvent>(OnCartridgeRemoved);
+    }
+
+    private void OnCartridgeAdded(Entity<MedTekCartridgeComponent> ent, ref CartridgeAddedEvent args)
+    {
+        var healthAnalyzer = EnsureComp<HealthAnalyzerComponent>(args.Loader);
+    }
+
+    private void OnCartridgeRemoved(Entity<MedTekCartridgeComponent> ent, ref CartridgeRemovedEvent args)
+    {
+        // only remove when the program itself is removed
+        if (!_cartridgeLoaderSystem.HasProgram<MedTekCartridgeComponent>(args.Loader))
+        {
+            RemComp<HealthAnalyzerComponent>(args.Loader);
+        }
+    }
+}
diff --git a/Content.Server/Medical/Components/HealthAnalyzerComponent.cs b/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
index 9d25db680ec..ff8e9e45baa 100644
--- a/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
+++ b/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
@@ -60,5 +60,11 @@ public sealed partial class HealthAnalyzerComponent : Component
     /// Sound played on scanning end
     /// </summary>
     [DataField]
-    public SoundSpecifier? ScanningEndSound;
+    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/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs
index 870788cd4de..f1dcb735aef 100644
--- a/Content.Server/Medical/HealthAnalyzerSystem.cs
+++ b/Content.Server/Medical/HealthAnalyzerSystem.cs
@@ -19,10 +19,10 @@
 using Content.Shared.MedicalScanner;
 using Content.Shared.Mobs.Components;
 using Content.Shared.PowerCell;
+using Content.Shared.Popups;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
-using Robust.Shared.Player;
 using Robust.Shared.Timing;
 using System.Linq;
 
@@ -121,7 +121,8 @@ private void OnDoAfter(Entity<HealthAnalyzerComponent> uid, ref HealthAnalyzerDo
         if (args.Handled || args.Cancelled || args.Target == null || !_cell.HasDrawCharge(uid, user: args.User))
             return;
 
-        _audio.PlayPvs(uid.Comp.ScanningEndSound, uid);
+        if (!uid.Comp.Silent)
+            _audio.PlayPvs(uid.Comp.ScanningEndSound, uid);
 
         OpenUserInterface(args.User, uid);
         BeginAnalyzingEntity(uid, args.Target.Value);
diff --git a/Resources/Locale/en-US/cartridge-loader/cartridges.ftl b/Resources/Locale/en-US/cartridge-loader/cartridges.ftl
index cfa1b1424d2..b6b673b12c7 100644
--- a/Resources/Locale/en-US/cartridge-loader/cartridges.ftl
+++ b/Resources/Locale/en-US/cartridge-loader/cartridges.ftl
@@ -20,7 +20,6 @@ log-probe-label-time = Time
 log-probe-label-accessor = Accessed by
 log-probe-label-number = #
 
-glimmer-monitor-program-name = Glimmer Monitor
-glimmer-monitor-current-glimmer = Current Glimmer: {$glimmer}Ψ
-glimmer-monitor-interval = Interval
-glimmer-monitor-sync = Sync
+astro-nav-program-name = AstroNav
+
+med-tek-program-name = MedTek
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 6f87f69611c..c676dbe055f 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -165,30 +165,46 @@
   suffix: Filled, Hardsuit
   parent: LockerChiefMedicalOfficer
   components:
-  - type: StorageFill
-    contents:
-      - id: MedkitFilled
-      - id: ClothingHandsGlovesNitrile
-      - id: ClothingEyesHudMedical
-      - id: ClothingHeadsetAltMedical
-      - id: ClothingBackpackDuffelSurgeryFilled
-      - id: ClothingMaskSterile
-      - id: ClothingHeadHatBeretCmo
-      - id: ClothingOuterHardsuitMedical
-      - id: Hypospray
-      - id: HandheldCrewMonitor
-      - id: DoorRemoteMedical
-      - id: RubberStampCMO
-      - id: RubberStampPsychologist # DeltaV
-      - id: MedicalTechFabCircuitboard
-      - id: MedicalBiofabMachineBoard
-      - id: BoxEncryptionKeyMedical
-      - id: BoxPDAMedical # Delta-V
-      - id: ClothingBeltMilitaryWebbingCMO # DeltaV - add webbing for CMO. ON THIS STATION, IT'S DRIP OR [die], CAPTAIN!
-      - id: CMOIDCard # Delta-V
-      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
-        prob: 0.3
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:AllSelector
+        children:
+        - !type:NestedSelector
+          tableId: LockerFillChiefEngineerNoHardsuit
+        - !type:NestedSelector
+          tableId: FillChiefEngineerHardsuit
+
+# No hardsuit table
+- type: entityTable
+  id: LockerFillChiefMedicalOfficerNoHardsuit
+  table: !type:AllSelector
+    children:
+    - id: BoxEncryptionKeyMedical
+    - id: ClothingBackpackDuffelSurgeryFilled
+    - id: ClothingCloakCmo
+    - id: ClothingEyesHudMedical
+    - id: ClothingHandsGlovesNitrile
+    - id: ClothingHeadHatBeretCmo
+    - id: ClothingHeadsetAltMedical
+    - id: ClothingMaskSterile
+    - id: DoorRemoteMedical
+    - id: HandheldCrewMonitor
+    - id: Hypospray
+    - id: MedicalTechFabCircuitboard
+    - id: MedkitFilled
+    - id: MedTekCartridge
+    - id: RubberStampCMO
+
+# Hardsuit table, used for suit storage as well
+- type: entityTable
+  id: FillChiefMedicalOfficerHardsuit
+  table: !type:AllSelector
+    children:
+    - id: ClothingMaskBreathMedical
+    - id: ClothingOuterHardsuitMedical
+    - id: OxygenTankFilled
 
+# No hardsuit locker
 - type: entity
   id: LockerChiefMedicalOfficerFilled
   suffix: Filled
diff --git a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
index 0563826a570..a4dcd5f7667 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
@@ -92,4 +92,23 @@
     - type: LogProbeCartridge
     - type: GuideHelp
       guides:
-        - Forensics
+      - Forensics
+
+- type: entity
+  parent: BaseItem
+  id: MedTekCartridge
+  name: MedTek cartridge
+  description: A program that provides medical diagnostic tools.
+  components:
+    - type: Sprite
+      sprite: Objects/Devices/cartridge.rsi
+      state: cart-med
+    - type: Icon
+      sprite: Objects/Devices/cartridge.rsi
+      state: cart-med
+    - type: Cartridge
+      programName: med-tek-program-name
+      icon:
+        sprite: Objects/Specific/Medical/healthanalyzer.rsi
+        state: icon
+    - type: MedTekCartridge
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index a477e1dd646..3cd757dcef9 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -119,13 +119,13 @@
   id: BaseMedicalPDA
   abstract: true
   components:
-  - type: ItemToggle
-    toggleLight: false
-    onUse: false
-  - type: HealthAnalyzer
-    scanDelay: 1
-    scanningEndSound:
-      path: "/Audio/Items/Medical/healthscanner.ogg"
+  - type: CartridgeLoader
+    uiKey: enum.PdaUiKey.Key
+    preinstalled:
+      - CrewManifestCartridge
+      - NotekeeperCartridge
+      - NewsReaderCartridge
+      - MedTekCartridge
 
 - type: entity
   parent: BasePDA
@@ -158,7 +158,7 @@
   parent: BaseMedicalPDA
   id: MedicalInternPDA
   name: medical intern PDA
-  description: Why isn't it white? Has a built-in health analyzer.
+  description: Why isn't it white?
   components:
   - type: Pda
     id: MedicalInternIDCard
@@ -667,7 +667,7 @@
   parent: BaseMedicalPDA
   id: CMOPDA
   name: chief medical officer PDA
-  description: Extraordinarily shiny and sterile. Has a built-in health analyzer.
+  description: Extraordinarily shiny and sterile.
   components:
   - type: Pda
     id: CMOIDCard
@@ -711,7 +711,7 @@
   parent: BaseMedicalPDA
   id: MedicalPDA
   name: medical PDA
-  description: Shiny and sterile. Has a built-in health analyzer.
+  description: Shiny and sterile.
   components:
   - type: Pda
     id: MedicalIDCard
@@ -735,7 +735,7 @@
   parent: BaseMedicalPDA
   id: ParamedicPDA
   name: paramedic PDA
-  description: Shiny and sterile. Has a built-in rapid health analyzer.
+  description: Shiny and sterile.
   components:
   - type: Pda
     id: ParamedicIDCard
@@ -1153,14 +1153,18 @@
   id: ERTMedicPDA
   name: ERT Medic PDA
   suffix: Medic
-  description: Red for firepower, it's shiny and sterile. Has a built-in rapid health analyzer.
+  description: Red for firepower, it's shiny and sterile.
   components:
   - type: Pda
     id: ERTMedicIDCard
-  - type: HealthAnalyzer
-    scanDelay: 1
-    scanningEndSound:
-      path: "/Audio/Items/Medical/healthscanner.ogg"
+  - type: CartridgeLoader
+    uiKey: enum.PdaUiKey.Key
+    preinstalled:
+      - CrewManifestCartridge
+      - NotekeeperCartridge
+      - NewsReaderCartridge
+      - MedTekCartridge
+      - WantedListCartridge
 
 - type: entity
   parent: ERTLeaderPDA
@@ -1289,7 +1293,7 @@
   parent: BaseMedicalPDA
   id: BrigmedicPDA
   name: brigmedic PDA
-  description: I wonder whose pulse is on the screen? I hope he doesnt stop... PDA has a built-in health analyzer.
+  description: I wonder whose pulse is on the screen? I hope it doesn't stop...
   components:
   - type: Pda
     id: BrigmedicIDCard
@@ -1373,7 +1377,7 @@
   parent: BaseMedicalPDA
   id: SeniorPhysicianPDA
   name: senior physician PDA
-  description: Smells faintly like iron and chemicals. Has a built-in health analyzer.
+  description: Smells faintly like iron and chemicals.
   components:
   - type: Pda
     id: SeniorPhysicianIDCard
@@ -1449,7 +1453,8 @@
     uiKey: enum.PdaUiKey.Key
     preinstalled:
       - NotekeeperCartridge
-      - NanoChatCartridge # DeltaV
+      - MedTekCartridge
+      - NanoChatCartridge
     cartridgeSlot:
       priority: -1
       name: Cartridge
diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-med.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-med.png
new file mode 100644
index 0000000000000000000000000000000000000000..69be9eb42e11831d11bae3da472d4f4e3265f36b
GIT binary patch
literal 289
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCilI0(?STIXOAi)zzh>q#PU^;^N{g=59|-O*Pti+jjLalY>u{m6Z()3<L!Q
zfyyUt$PEEfd?i7C!T*r~gX@7iCx9}X1s;*bKm~_EnDKc2iWHz=nx~6nh=u>#3%B_W
z2ne`dJZPc!^nd;K$rGl97-!CZ%ic0oAY`gpMlFNMRdaTSV|+8K_n)7-CYis5p`xse
z)q=^xv+aa;L&t<A3f=V%d!1^ZToHP*c>44OG0&Aw39pF%dyP$(^-2}fC28Hc>*SPy
Q)-y18y85}Sb4q9e08CtGF8}}l

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json b/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json
index c7eb96d964e..43926bb87cb 100644
--- a/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d , cart-log made by Skarletto (github)",
+  "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d and tgstation at tgstation at https://github.com/tgstation/tgstation/commit/0c15d9dbcf0f2beb230eba5d9d889ef2d1945bb8, cart-log made by Skarletto (github), cart-sec made by dieselmohawk (discord), cart-nav, cart-med made by ArchRBX (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -49,9 +49,15 @@
     {
       "name": "cart-lib"
     },
+    {
+      "name": "cart-log"
+    },
     {
       "name": "cart-m"
     },
+    {
+      "name": "cart-med"
+    },
     {
       "name": "cart-mi"
     },

From 03e3092e01b41f24c57ca687fdf2c08b695bbb15 Mon Sep 17 00:00:00 2001
From: ArchRBX <5040911+ArchRBX@users.noreply.github.com>
Date: Tue, 24 Sep 2024 18:02:51 +0100
Subject: [PATCH 324/366] AstroNav GPS Cartridge (#32194)

* initial commit

* adds astronav cartridge to QM locker

* changes requested in review

* fix merge conflicts

* fixes the statuscontrol disappearing if you eject the cartridge but still have it installed

* fix notificationsenabled on salv pda proto

* fixes lingering statuscontrol on eject while held

---------

Co-authored-by: archrbx <punk.gear5260@fastmail.com>
---
 .../GPS/Components/HandheldGPSComponent.cs    |   9 -----
 .../GPS/Systems/HandheldGpsSystem.cs          |   2 +-
 .../GPS/UI/HandheldGpsStatusControl.cs        |  15 +++++---
 .../Cartridges/AstroNavCartridgeComponent.cs  |   9 +++++
 .../Cartridges/AstroNavCartridgeSystem.cs     |  32 ++++++++++++++++++
 Content.Server/Entry/IgnoredComponents.cs     |   1 -
 .../GPS/Components/HandheldGPSComponent.cs    |  10 ++++++
 .../Components/SharedHandheldGPSComponent.cs  |   9 -----
 .../Catalog/Fills/Lockers/heads.yml           |   1 +
 .../Entities/Objects/Devices/cartridges.yml   |  21 +++++++++++-
 .../Entities/Objects/Devices/pda.yml          |   3 +-
 .../Devices/cartridge.rsi/cart-nav.png        | Bin 0 -> 300 bytes
 .../Objects/Devices/cartridge.rsi/meta.json   |   6 ++++
 13 files changed, 92 insertions(+), 26 deletions(-)
 delete mode 100644 Content.Client/GPS/Components/HandheldGPSComponent.cs
 create mode 100644 Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeComponent.cs
 create mode 100644 Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeSystem.cs
 create mode 100644 Content.Shared/GPS/Components/HandheldGPSComponent.cs
 delete mode 100644 Content.Shared/Tools/Components/SharedHandheldGPSComponent.cs
 create mode 100644 Resources/Textures/Objects/Devices/cartridge.rsi/cart-nav.png

diff --git a/Content.Client/GPS/Components/HandheldGPSComponent.cs b/Content.Client/GPS/Components/HandheldGPSComponent.cs
deleted file mode 100644
index 0f5271fd80c..00000000000
--- a/Content.Client/GPS/Components/HandheldGPSComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Content.Shared.GPS;
-
-namespace Content.Client.GPS.Components
-{
-    [RegisterComponent]
-    public sealed partial class HandheldGPSComponent : SharedHandheldGPSComponent
-    {
-    }
-}
diff --git a/Content.Client/GPS/Systems/HandheldGpsSystem.cs b/Content.Client/GPS/Systems/HandheldGpsSystem.cs
index cc2b888da37..3f38a3b6952 100644
--- a/Content.Client/GPS/Systems/HandheldGpsSystem.cs
+++ b/Content.Client/GPS/Systems/HandheldGpsSystem.cs
@@ -1,4 +1,4 @@
-using Content.Client.GPS.Components;
+using Content.Shared.GPS.Components;
 using Content.Client.GPS.UI;
 using Content.Client.Items;
 
diff --git a/Content.Client/GPS/UI/HandheldGpsStatusControl.cs b/Content.Client/GPS/UI/HandheldGpsStatusControl.cs
index 7dcf3f29c51..57645e386e7 100644
--- a/Content.Client/GPS/UI/HandheldGpsStatusControl.cs
+++ b/Content.Client/GPS/UI/HandheldGpsStatusControl.cs
@@ -1,4 +1,4 @@
-using Content.Client.GPS.Components;
+using Content.Shared.GPS.Components;
 using Content.Client.Message;
 using Content.Client.Stylesheets;
 using Robust.Client.GameObjects;
@@ -30,6 +30,13 @@ protected override void FrameUpdate(FrameEventArgs args)
     {
         base.FrameUpdate(args);
 
+        // don't display the label if the gps component is being removed
+        if (_parent.Comp.LifeStage > ComponentLifeStage.Running)
+        {
+            _label.Visible = false;
+            return;
+        }
+
         _updateDif += args.DeltaSeconds;
         if (_updateDif < _parent.Comp.UpdateRate)
             return;
@@ -44,9 +51,9 @@ private void UpdateGpsDetails()
         var posText = "Error";
         if (_entMan.TryGetComponent(_parent, out TransformComponent? transComp))
         {
-            var pos =  _transform.GetMapCoordinates(_parent.Owner, xform: transComp);
-            var x = (int) pos.X;
-            var y = (int) pos.Y;
+            var pos = _transform.GetMapCoordinates(_parent.Owner, xform: transComp);
+            var x = (int)pos.X;
+            var y = (int)pos.Y;
             posText = $"({x}, {y})";
         }
         _label.SetMarkup(Loc.GetString("handheld-gps-coordinates-title", ("coordinates", posText)));
diff --git a/Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeComponent.cs b/Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeComponent.cs
new file mode 100644
index 00000000000..fd616a1c803
--- /dev/null
+++ b/Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeComponent.cs
@@ -0,0 +1,9 @@
+using Content.Shared.CartridgeLoader.Cartridges;
+using Content.Shared.GPS;
+
+namespace Content.Server.CartridgeLoader.Cartridges;
+
+[RegisterComponent]
+public sealed partial class AstroNavCartridgeComponent : Component
+{
+}
diff --git a/Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeSystem.cs
new file mode 100644
index 00000000000..60d14789fa0
--- /dev/null
+++ b/Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeSystem.cs
@@ -0,0 +1,32 @@
+using Content.Shared.CartridgeLoader;
+using Content.Shared.CartridgeLoader.Cartridges;
+using Content.Shared.GPS.Components;
+
+namespace Content.Server.CartridgeLoader.Cartridges;
+
+public sealed class AstroNavCartridgeSystem : EntitySystem
+{
+    [Dependency] private readonly CartridgeLoaderSystem _cartridgeLoaderSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<AstroNavCartridgeComponent, CartridgeAddedEvent>(OnCartridgeAdded);
+        SubscribeLocalEvent<AstroNavCartridgeComponent, CartridgeRemovedEvent>(OnCartridgeRemoved);
+    }
+
+    private void OnCartridgeAdded(Entity<AstroNavCartridgeComponent> ent, ref CartridgeAddedEvent args)
+    {
+        EnsureComp<HandheldGPSComponent>(args.Loader);
+    }
+
+    private void OnCartridgeRemoved(Entity<AstroNavCartridgeComponent> ent, ref CartridgeRemovedEvent args)
+    {
+        // only remove when the program itself is removed
+        if (!_cartridgeLoaderSystem.HasProgram<AstroNavCartridgeComponent>(args.Loader))
+        {
+            RemComp<HandheldGPSComponent>(args.Loader);
+        }
+    }
+}
diff --git a/Content.Server/Entry/IgnoredComponents.cs b/Content.Server/Entry/IgnoredComponents.cs
index d9b81c8e5a5..04c45662272 100644
--- a/Content.Server/Entry/IgnoredComponents.cs
+++ b/Content.Server/Entry/IgnoredComponents.cs
@@ -12,7 +12,6 @@ public static class IgnoredComponents
             "GuideHelp",
             "Clickable",
             "Icon",
-            "HandheldGPS",
             "CableVisualizer",
             "SolutionItemStatus",
             "UIFragment",
diff --git a/Content.Shared/GPS/Components/HandheldGPSComponent.cs b/Content.Shared/GPS/Components/HandheldGPSComponent.cs
new file mode 100644
index 00000000000..a0af0909867
--- /dev/null
+++ b/Content.Shared/GPS/Components/HandheldGPSComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.GPS.Components;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class HandheldGPSComponent : Component
+{
+    [DataField]
+    public float UpdateRate = 1.5f;
+}
diff --git a/Content.Shared/Tools/Components/SharedHandheldGPSComponent.cs b/Content.Shared/Tools/Components/SharedHandheldGPSComponent.cs
deleted file mode 100644
index 3c30738857b..00000000000
--- a/Content.Shared/Tools/Components/SharedHandheldGPSComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-
-namespace Content.Shared.GPS
-{
-    public abstract partial class SharedHandheldGPSComponent : Component
-    {
-        [DataField("updateRate")]
-        public float UpdateRate = 1.5f;
-    }
-}
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index c676dbe055f..ba9386cf940 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -22,6 +22,7 @@
       - id: SpaceCashLuckyBill # DeltaV - LO steal objective, see Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml
       - id: BoxPDACargo # Delta-V
       - id: QuartermasterIDCard # Delta-V
+      - id: AstroNavCartridge
       - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
         prob: 0.3
 
diff --git a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
index a4dcd5f7667..e9108fd341b 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
@@ -111,4 +111,23 @@
       icon:
         sprite: Objects/Specific/Medical/healthanalyzer.rsi
         state: icon
-    - type: MedTekCartridge
\ No newline at end of file
+    - type: MedTekCartridge
+
+- type: entity
+  parent: BaseItem
+  id: AstroNavCartridge
+  name: AstroNav cartridge
+  description: A program for navigation that provides GPS coordinates.
+  components:
+    - type: Sprite
+      sprite: Objects/Devices/cartridge.rsi
+      state: cart-nav
+    - type: Icon
+      sprite: Objects/Devices/cartridge.rsi
+      state: cart-nav
+    - type: Cartridge
+      programName: astro-nav-program-name
+      icon:
+        sprite: Objects/Devices/gps.rsi
+        state: icon
+    - type: AstroNavCartridge
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 3cd757dcef9..7948f667602 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -444,7 +444,8 @@
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
-      - NanoChatCartridge # DeltaV
+      - AstroNavCartridge
+      - NanoChatCartridge
 
 - type: entity
   parent: BasePDA
diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-nav.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-nav.png
new file mode 100644
index 0000000000000000000000000000000000000000..427129da0ed3c3745dda6f4c80f872b860497315
GIT binary patch
literal 300
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCilI0(?STIXOAi)zzh>qzsLm9GpV@0y3)i7{<hx=P%U>Z&C&V0|Ns=K|!GM
zuz-^+K#H#<$S?RmGGK5$aOVV2hO@vUvKXk~FbFdq&tH)O6fE>~aSXBWe|zCBSAzmi
zL*Re2vv+>)&kJtX)Lrs>-)sl|?2L@d{8jP|k&_N{O1xh7rdBWB=p4I42J3s11K&F~
zvT8B-oG=zL4skrfytwB=eW3XYVIdaL9~+rpc<ZfHm>(48DEVFIlyJ`cUu)&Rm^Hj$
Ys#v327E!^u8E83!r>mdKI;Vst0BSF1{Qv*}

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json b/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json
index 43926bb87cb..54886814ea3 100644
--- a/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json
@@ -61,6 +61,9 @@
     {
       "name": "cart-mi"
     },
+    {
+      "name": "cart-nav"
+    },
     {
       "name": "cart-q"
     },
@@ -70,6 +73,9 @@
     {
       "name": "cart-s"
     },
+    {
+      "name": "cart-sec"
+    },
     {
       "name": "cart-tear"
     },

From 711367e7cb3d05d8a9af83048a248ac3d50e905c Mon Sep 17 00:00:00 2001
From: Radezolid <snappednexus@gmail.com>
Date: Wed, 25 Dec 2024 16:03:41 -0300
Subject: [PATCH 325/366] Added admin assistant

---
 .../en-US/deltav/job/job-description.ftl      |   1 +
 .../Locale/en-US/deltav/job/job-names.ftl     |   1 +
 .../en-US/deltav/job/job-supervisors.ftl      |   4 +-
 .../en-US/deltav/paper/stamp-component.ftl    |   2 +-
 .../Jobs/Command/adminAssistant.yml           |  17 ++++
 .../Entities/Clothing/Ears/headsets.yml       |  25 ++++++
 .../Entities/Clothing/Uniforms/jumpskirts.yml |  10 +++
 .../Entities/Clothing/Uniforms/jumpsuits.yml  |  10 +++
 .../DeltaV/Entities/Markers/Spawners/jobs.yml |  13 +++
 .../DeltaV/Entities/Objects/Devices/pda.yml   |  31 +++++++
 .../Entities/Objects/Misc/rubber_stamp.yml    |  13 +++
 .../Jobs/Command/administrative_assistant.yml |  25 ++++++
 .../Loadouts/Miscellaneous/wintercoats.yml    |  69 +++++++++++++++
 .../Jobs/Command/administrative_assistant.yml |  49 +++++++++++
 .../DeltaV/Roles/play_time_trackers.yml       |   3 +
 .../Prototypes/DeltaV/StatusEffects/job.yml   |   7 ++
 .../Objects/Misc/identification_cards.yml     |  14 +++
 .../Loadouts/Categories/categories.yml        |   4 +
 .../Loadouts/Jobs/Command/adminassistant.yml  |  80 ++++++++++++++++++
 .../Prototypes/Roles/Jobs/departments.yml     |  12 +++
 .../adminassistant.rsi/alt-equipped-EARS.png  | Bin 0 -> 294 bytes
 .../adminassistant.rsi/equipped-EARS.png      | Bin 0 -> 154 bytes
 .../Ears/Headsets/adminassistant.rsi/icon.png | Bin 0 -> 332 bytes
 .../Headsets/adminassistant.rsi/icon_alt.png  | Bin 0 -> 471 bytes
 .../Headsets/adminassistant.rsi/meta.json     |  25 ++++++
 .../equipped-INNERCLOTHING-monkey.png         | Bin 0 -> 20878 bytes
 .../equipped-INNERCLOTHING.png                | Bin 0 -> 1462 bytes
 .../Jumpskirt/admin_assistant.rsi/icon.png    | Bin 0 -> 486 bytes
 .../admin_assistant.rsi/inhand-left.png       | Bin 0 -> 432 bytes
 .../admin_assistant.rsi/inhand-right.png      | Bin 0 -> 438 bytes
 .../Jumpskirt/admin_assistant.rsi/meta.json   |  30 +++++++
 .../equipped-INNERCLOTHING-monkey.png         | Bin 0 -> 20878 bytes
 .../equipped-INNERCLOTHING.png                | Bin 0 -> 1461 bytes
 .../Jumpsuit/admin_assistant.rsi/icon.png     | Bin 0 -> 486 bytes
 .../admin_assistant.rsi/inhand-left.png       | Bin 0 -> 432 bytes
 .../admin_assistant.rsi/inhand-right.png      | Bin 0 -> 438 bytes
 .../Jumpsuit/admin_assistant.rsi/meta.json    |  30 +++++++
 .../Misc/job_icons.rsi/AdminAssistant.png     | Bin 0 -> 213 bytes
 .../Interface/Misc/job_icons.rsi/meta.json    |   5 +-
 .../Markers/jobs.rsi/adminassistant.png       | Bin 0 -> 1003 bytes
 .../DeltaV/Markers/jobs.rsi/meta.json         |   5 +-
 .../DeltaV/Objects/Devices/pda.rsi/meta.json  |   4 +-
 .../Devices/pda.rsi/pda-admin-assistant.png   | Bin 0 -> 518 bytes
 .../Objects/Misc/bureaucracy.rsi/meta.json    |  27 +++---
 .../paper_stamp-admin-assistant.png           | Bin 0 -> 227 bytes
 .../Misc/id_cards.rsi/idadminassistant.png    | Bin 0 -> 301 bytes
 .../Objects/Misc/id_cards.rsi/meta.json       |  14 +++
 .../DeltaV/Objects/Misc/stamps.rsi/meta.json  |   5 +-
 .../Misc/stamps.rsi/stamp-admin-assistant.png | Bin 0 -> 340 bytes
 49 files changed, 515 insertions(+), 20 deletions(-)
 create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Command/adminAssistant.yml
 create mode 100644 Resources/Prototypes/DeltaV/Loadouts/Jobs/Command/administrative_assistant.yml
 create mode 100644 Resources/Prototypes/DeltaV/Loadouts/Miscellaneous/wintercoats.yml
 create mode 100644 Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml
 create mode 100644 Resources/Prototypes/Loadouts/Jobs/Command/adminassistant.yml
 create mode 100644 Resources/Textures/DeltaV/Clothing/Ears/Headsets/adminassistant.rsi/alt-equipped-EARS.png
 create mode 100644 Resources/Textures/DeltaV/Clothing/Ears/Headsets/adminassistant.rsi/equipped-EARS.png
 create mode 100644 Resources/Textures/DeltaV/Clothing/Ears/Headsets/adminassistant.rsi/icon.png
 create mode 100644 Resources/Textures/DeltaV/Clothing/Ears/Headsets/adminassistant.rsi/icon_alt.png
 create mode 100644 Resources/Textures/DeltaV/Clothing/Ears/Headsets/adminassistant.rsi/meta.json
 create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/equipped-INNERCLOTHING-monkey.png
 create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/equipped-INNERCLOTHING.png
 create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/icon.png
 create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/inhand-left.png
 create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/inhand-right.png
 create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/meta.json
 create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/equipped-INNERCLOTHING-monkey.png
 create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/equipped-INNERCLOTHING.png
 create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/icon.png
 create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/inhand-left.png
 create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/inhand-right.png
 create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/meta.json
 create mode 100644 Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/AdminAssistant.png
 create mode 100644 Resources/Textures/DeltaV/Markers/jobs.rsi/adminassistant.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-admin-assistant.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/paper_stamp-admin-assistant.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idadminassistant.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json
 create mode 100644 Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-admin-assistant.png

diff --git a/Resources/Locale/en-US/deltav/job/job-description.ftl b/Resources/Locale/en-US/deltav/job/job-description.ftl
index 9e99f5838e9..c35f56b3274 100644
--- a/Resources/Locale/en-US/deltav/job/job-description.ftl
+++ b/Resources/Locale/en-US/deltav/job/job-description.ftl
@@ -3,3 +3,4 @@ job-description-chief-justice = Manage the justice department, act as a judge, a
 job-description-clerk = Organize trials, notarize documents, review charges, and act as a judge if needed.
 job-description-prosecutor = Take statements from security and prepare cases against those accused of commiting crimes.
 job-description-courier = Deliver mail and other packages from and to logistics. Avoid dogs.
+job-description-admin-assistant = Assist command in their day-to-day activities, grab the captain a coffee, answer faxes in the bridge.
diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl
index 175da8ba693..8f257f6a4dc 100644
--- a/Resources/Locale/en-US/deltav/job/job-names.ftl
+++ b/Resources/Locale/en-US/deltav/job/job-names.ftl
@@ -4,3 +4,4 @@ job-name-clerk = Clerk
 job-name-prosecutor = Prosecutor
 job-name-lawyer = Attorney
 job-name-courier = Courier
+job-name-admin-assistant = Administrative Assistant
\ No newline at end of file
diff --git a/Resources/Locale/en-US/deltav/job/job-supervisors.ftl b/Resources/Locale/en-US/deltav/job/job-supervisors.ftl
index f1c0ade32a5..d911839af25 100644
--- a/Resources/Locale/en-US/deltav/job/job-supervisors.ftl
+++ b/Resources/Locale/en-US/deltav/job/job-supervisors.ftl
@@ -1,2 +1,2 @@
-job-supervisors-cj = the chief justice
-
+job-supervisors-cj = the Chief Justice
+job-supervisors-command = all command staff
diff --git a/Resources/Locale/en-US/deltav/paper/stamp-component.ftl b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl
index cfa5279baa0..37a38d69ca5 100644
--- a/Resources/Locale/en-US/deltav/paper/stamp-component.ftl
+++ b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl
@@ -2,4 +2,4 @@ stamp-component-stamped-name-lawyer = Lawyer
 stamp-component-stamped-name-psychologist = Psychologist
 stamp-component-stamped-name-notary = NOTARY
 stamp-component-stamped-name-chiefjustice = Chief Justice
-
+stamp-component-stamped-name-admin-assistant = Administrative Assistant
diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/adminAssistant.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/adminAssistant.yml
new file mode 100644
index 00000000000..d87cf366553
--- /dev/null
+++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/adminAssistant.yml
@@ -0,0 +1,17 @@
+- type: characterItemGroup
+  id: LoadoutAdminAssistantUniforms
+  maxItems: 1
+  items:
+    - type: loadout
+      id: LoadoutAdminAssistantUniformJumpsuit
+    - type: loadout
+      id: LoadoutAdminAssistantUniformJumpskirt
+
+- type: characterItemGroup
+  id: LoadoutAdminAssistantGloves
+  maxItems: 1
+  items:
+    - type: loadout
+      id: LoadoutHeadOfPersonnelGlovesHoP
+    - type: loadout
+      id: LoadoutHeadOfPersonnelGlovesInspection
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml
index b32cab7b21a..f2f63ac949c 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml
@@ -115,3 +115,28 @@
   - type: Clothing
     sprite: Clothing/Ears/Headsets/security.rsi
     
+- type: entity
+  parent: ClothingHeadset
+  id: ClothingHeadsetAdminAssist
+  name: adminstrative assistant headset
+  description: A headset used by the administrative assistant.
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyCommand
+      - EncryptionKeyCommon
+  - type: Sprite
+    sprite: DeltaV/Clothing/Ears/Headsets/adminassistant.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Ears/Headsets/adminassistant.rsi
+
+- type: entity
+  parent: ClothingHeadsetAdminAssist
+  id: ClothingHeadsetAltAdminAssist
+  name: adminstrative assistant over-ear headset
+  components:
+  - type: Sprite
+    state: icon_alt
+  - type: Clothing
+    equippedPrefix: alt
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml
index 9e80bc4ff2f..79c8f1646b1 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -127,3 +127,13 @@
   - type: Clothing
     sprite: DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtAdminAssistant
+  name: administrative assistant's jumpskirt
+  description: A suit worn by the Administrative Assistant. Smells of burnt coffee.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml
index 9382502e740..f64ad3041a5 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -310,3 +310,13 @@
   - type: Clothing
     sprite: DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitAdminAssistant
+  name: administrative assistant's jumpsuit
+  description: A suit worn by the Administrative Assistant. Smells of burnt coffee.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml
index 12747abbcfb..65d3d8369c1 100644
--- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml
@@ -65,3 +65,16 @@
     - state: green
     - sprite: DeltaV/Markers/jobs.rsi
       state: courier
+
+- type: entity
+  id: SpawnPointAdminAssistant
+  parent: SpawnPointJobBase
+  name: administrative assistant
+  components:
+  - type: SpawnPoint
+    job_id: AdministrativeAssistant
+  - type: Sprite
+    layers:
+      - state: green
+      - sprite: DeltaV/Markers/jobs.rsi
+        state: adminassistant
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
index bcc6c0fe2cf..8162a2ce5a7 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
@@ -170,3 +170,34 @@
       whitelist:
         tags:
         - Write
+
+- type: entity
+  parent: BasePDA
+  id: AdminAssistantPDA
+  name: administrative assistant PDA
+  description: Theres pen scribbles all over the edges, and a few sticky notes stuck on it.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Devices/pda.rsi
+    layers:
+    - map: [ "enum.PdaVisualLayers.Base" ]
+    - state: "light_overlay"
+      map: [ "enum.PdaVisualLayers.Flashlight" ]
+      shader: "unshaded"
+      visible: false
+    - state: "id_overlay"
+      map: [ "enum.PdaVisualLayers.IdLight" ]
+      shader: "unshaded"
+      visible: false
+  - type: Pda
+    id: AdminAssistantIDCard
+    state: pda-admin-assistant
+    penSlot:
+      startingItem: LuxuryPen
+      priority: -1
+      whitelist:
+        tags:
+        - Write
+  - type: Icon
+    sprite: DeltaV/Objects/Devices/pda.rsi
+    state: pda-admin-assistant
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml
index 764d053393e..791e142d173 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml
@@ -55,3 +55,16 @@
     sprite: DeltaV/Objects/Misc/stamps.rsi
     state: stamp-cj
 
+- type: entity
+  name: administrative assistant rubber stamp
+  parent: RubberStampBase
+  id: RubberStampAdminAssistant
+  suffix: DO NOT MAP
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-admin-assistant
+    stampedColor: "#4191f2"
+    stampState: "paper_stamp-admin-assistant"
+  - type: Sprite
+    sprite: DeltaV/Objects/Misc/stamps.rsi
+    state: stamp-admin-assistant
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Command/administrative_assistant.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Command/administrative_assistant.yml
new file mode 100644
index 00000000000..ec09da21419
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Command/administrative_assistant.yml
@@ -0,0 +1,25 @@
+# Jumpsuit
+- type: loadout
+  id: AdminAssistantJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitAdminAssistant
+
+- type: loadout
+  id: AdminAssistantJumpskirt
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtAdminAssistant
+
+- type: loadout
+  id: CorporateJacket
+  equipment:
+    outerClothing: ClothingOuterCorporateJacket
+
+- type: loadout
+  id: AdminAssistantHeadset
+  equipment:
+    ear: ClothingHeadsetAdminAssistant
+
+- type: loadout
+  id: AdminAssistantAltHeadset
+  equipment:
+    ear: ClothingHeadsetAltAdminAssistant
diff --git a/Resources/Prototypes/DeltaV/Loadouts/Miscellaneous/wintercoats.yml b/Resources/Prototypes/DeltaV/Loadouts/Miscellaneous/wintercoats.yml
new file mode 100644
index 00000000000..7e30b355b30
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Loadouts/Miscellaneous/wintercoats.yml
@@ -0,0 +1,69 @@
+- type: loadout
+  id: WinterCoatBrown
+  equipment:
+    outerClothing: ClothingOuterWinterColorBrown
+
+- type: loadout
+  id: WinterCoatBlack
+  equipment:
+    outerClothing: ClothingOuterWinterColorBlack
+
+- type: loadout
+  id: WinterCoatGray
+  equipment:
+    outerClothing: ClothingOuterWinterColorGray
+
+- type: loadout
+  id: WinterCoatWhite
+  equipment:
+    outerClothing: ClothingOuterWinterColorWhite
+
+- type: loadout
+  id: WinterCoatBlue
+  equipment:
+    outerClothing: ClothingOuterWinterColorBlue
+
+- type: loadout
+  id: WinterCoatRed
+  equipment:
+    outerClothing: ClothingOuterWinterColorRed
+
+- type: loadout
+  id: WinterCoatGreen
+  equipment:
+    outerClothing: ClothingOuterWinterColorGreen
+
+- type: loadout
+  id: WinterCoatOrange
+  equipment:
+    outerClothing: ClothingOuterWinterColorOrange
+
+- type: loadout
+  id: WinterCoatYellow
+  equipment:
+    outerClothing: ClothingOuterWinterColorYellow
+
+- type: loadout
+  id: WinterCoatLightBrown
+  equipment:
+    outerClothing: ClothingOuterWinterColorLightBrown
+
+- type: loadout
+  id: WinterCoatPurple
+  equipment:
+    outerClothing: ClothingOuterWinterColorPurple
+
+- type: loadout
+  id: WinterCoat
+  equipment:
+    outerClothing: ClothingOuterWinterCoat
+
+- type: loadout
+  id: WinterCoatLong
+  equipment:
+    outerClothing: ClothingOuterWinterCoatLong
+
+- type: loadout
+  id: WinterCoatPlaid
+  equipment:
+    outerClothing: ClothingOuterWinterCoatPlaid
diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml
new file mode 100644
index 00000000000..51ed7b94e9f
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml
@@ -0,0 +1,49 @@
+- type: job
+  id: AdministrativeAssistant
+  name: job-name-admin-assistant
+  description: job-description-admin-assistant
+  playTimeTracker: JobAdminAssistant
+  requirements:
+    - !type:DepartmentTimeRequirement
+      department: Engineering
+      time: 10800 # 3 hours
+    - !type:DepartmentTimeRequirement
+      department: Logistics
+      time: 10800 # 3 hours
+    - !type:DepartmentTimeRequirement
+      department: Medical
+      time: 10800 # 3 hours
+    - !type:DepartmentTimeRequirement
+      department: Civilian
+      time: 10800 # 3 hours
+    - !type:DepartmentTimeRequirement
+      department: Security
+      time: 10800 # 3 hours
+    - !type:DepartmentTimeRequirement
+      department: Justice
+      time: 10800 # 3 hours
+    - !type:DepartmentTimeRequirement
+      department: Epistemics
+      time: 10800 # 3 hours
+  startingGear: AdminAssistantGear
+  icon: "JobIconAdminAssitant"
+  supervisors: job-supervisors-command
+  canBeAntag: false
+  access:
+    - Command
+    - Maintenance
+  special:
+    - !type:AddImplantSpecial
+      implants: [MindShieldImplant]
+    - !type:AddComponentSpecial
+      components:
+      - type: CommandStaff
+
+- type: startingGear
+  id: AdminAssistantGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitAdminAssistant
+    id: AdminAssistantPDA
+    ears: ClothingHeadsetAdminAssist
+    shoes: ClothingShoesLeather
+  innerClothingSkirt: ClothingUniformJumpskirtAdminAssistant
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml
index 4ab6f3eed45..782163f83cd 100644
--- a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml
+++ b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml
@@ -6,3 +6,6 @@
 
 - type: playTimeTracker
   id: JobCourier
+
+- type: playTimeTracker
+  id: JobAdminAssistant
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/StatusEffects/job.yml b/Resources/Prototypes/DeltaV/StatusEffects/job.yml
index 415188d75ca..c99d98ce517 100644
--- a/Resources/Prototypes/DeltaV/StatusEffects/job.yml
+++ b/Resources/Prototypes/DeltaV/StatusEffects/job.yml
@@ -25,3 +25,10 @@
   icon:
     sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: Prosecutor #need prosecutor
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconAdminAssitant
+  icon:
+    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
+    state: AdminAssistant
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index 3b58f027505..182570310a2 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -1094,3 +1094,17 @@
   - type: PresetIdCard
     job: SeniorOfficer
 
+- type: entity
+  parent: IDCardStandard
+  id: AdminAssistantIDCard
+  name: administrative assistant ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: silver
+    - sprite: DeltaV/Objects/Misc/id_cards.rsi
+      state: idadminassistant
+  - type: Item
+    heldPrefix: silver
+  - type: PresetIdCard
+    job: AdministrativeAssistant
\ No newline at end of file
diff --git a/Resources/Prototypes/Loadouts/Categories/categories.yml b/Resources/Prototypes/Loadouts/Categories/categories.yml
index 48de355a517..716b2ebeb62 100644
--- a/Resources/Prototypes/Loadouts/Categories/categories.yml
+++ b/Resources/Prototypes/Loadouts/Categories/categories.yml
@@ -51,6 +51,7 @@
     - JobsCommandAUncategorized
     - JobsCommandCaptain
     - JobsCommandHeadOfPersonnel
+    - JobsCommandAdminAssistant
 
 - type: loadoutCategory
   id: JobsCommandAUncategorized
@@ -61,6 +62,9 @@
 - type: loadoutCategory
   id: JobsCommandHeadOfPersonnel
 
+- type: loadoutCategory
+  id: JobsCommandAdminAssistant
+
 # Engineering
 - type: loadoutCategory
   id: JobsEngineering
diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/adminassistant.yml b/Resources/Prototypes/Loadouts/Jobs/Command/adminassistant.yml
new file mode 100644
index 00000000000..9e2c638b017
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/Jobs/Command/adminassistant.yml
@@ -0,0 +1,80 @@
+# Uncategorized
+# Backpacks
+
+# Belt
+
+# Ears
+
+# Equipment
+
+# Eyes
+
+# Gloves
+- type: loadout
+  id: LoadoutAdministrativeAssistantGlovesHoP
+  category: JobsCommandAdminAssistant
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutAdminAssistantGloves
+    - !type:CharacterJobRequirement
+      jobs:
+        - AdministrativeAssistant
+  items:
+    - ClothingHandsGlovesHop
+
+- type: loadout
+  id: LoadoutAdministrativeAssistantGlovesInspection
+  category: JobsCommandAdminAssistant
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutAdminAssistantGloves
+    - !type:CharacterJobRequirement
+      jobs:
+        - AdministrativeAssistant
+  items:
+    - ClothingHandsGlovesInspection
+
+# Head
+
+# Id
+
+# Neck
+
+# Mask
+
+# Outer
+
+# Shoes
+
+# Uniforms
+- type: loadout
+  id: LoadoutAdminAssistantUniformJumpsuit
+  category: JobsCommandAdminAssistant
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutAdminAssistantUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - AdministrativeAssistant
+  items:
+    - ClothingUniformJumpsuitAdminAssistant
+
+- type: loadout
+  id: LoadoutAdminAssistantUniformJumpskirt
+  category: JobsCommandAdminAssistant
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutAdminAssistantUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - AdministrativeAssistant
+  items:
+    - ClothingUniformJumpskirtAdminAssistant
diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
index 55aeafde6d8..72f7bf73312 100644
--- a/Resources/Prototypes/Roles/Jobs/departments.yml
+++ b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -48,6 +48,18 @@
   - HeadOfSecurity
   - ResearchDirector
   - Quartermaster
+  - ChiefJustice # DeltaV - chief justice is in command staff
+  - CentralCommandOfficial
+  - CBURN
+  - ERTLeader
+  - ERTChaplain
+  - ERTJanitor
+  - ERTMedical
+  - ERTSecurity
+  - ERTEngineer
+  - DeathSquad
+  - StationAi # DeltaV - added for playtime trackers
+  - AdministrativeAssistant # Delta V - Administrative Assistant, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Command/admin_assistant.yml
   primary: false
   weight: 100
 
diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/adminassistant.rsi/alt-equipped-EARS.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/adminassistant.rsi/alt-equipped-EARS.png
new file mode 100644
index 0000000000000000000000000000000000000000..61bdec487276617e1a2c1bafaa874f58d4cfbc0a
GIT binary patch
literal 294
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!3<7*YTw`NnBO)RK0|S$il6-xA
zb8>R3s;Wv$OQ-DL=IZL|;NW0kVd3fN859IE!mDb-hFPT!K$bvBkYDhB6u|I5j@ADe
zP;RQHi(^Pc>)UI0xf&FB*aH4*T?u>tf179d+Lv7UOZGL2pM9I6xZ<YO;T|@L*R!6U
z`(z$BzgBYLMfqiwAJ2-;39VjQ%l~iQlz)zE7y`AX6=`<=we*Z+JW*6Xvw|h$wzlCN
zHzuGh3=H>~t`v8Q7bIL|h&#Y|iJ`7CfnlQ3gm0WtDRou**>{C0#K;}H?EzBxA^ib^
Wf55$;_qg3Ag7}`UelF{r5}E)>EOpBO

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/adminassistant.rsi/equipped-EARS.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/adminassistant.rsi/equipped-EARS.png
new file mode 100644
index 0000000000000000000000000000000000000000..0000ae7a0d17107c1f5c646f342f899f903cc4d9
GIT binary patch
literal 154
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=iJmTwAr*7p-rC69V8G*g@XT?e
zcaaBPZ&<i8L$J41`L6GWM`rc93_q5vdiB1|{B7;=%3eE%?D(|4x<8Az8Y{WUCsxS=
xjRArU3tvVzmR;V?w6^Rf*OpJ>{2;*tb$MQPitiTXwJis6Jzf1=);T3K0RR?9IT`=}

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/adminassistant.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/adminassistant.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..286be81e6e058e8a2c283bbd7fcf928a5a7d3bc1
GIT binary patch
literal 332
zcmV-S0ki&zP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003KNkl<ZScUDB
zziz@X5Ql$s>)^D5CEt_{1cIseBoS}WsVlEg^%)RT-vTL55T<m31vU>Tkyt_`GrCg|
z3`Ds3v*2$#$*23yzBAzQcpjae%V8q2fe<*BC9*7Y%B?LxM0Pa&!t;v+0Q`J^G$Qfj
zQXBxX_!Fn%fVcMrh{$##@JF$lBTZ8jt2s`^p>Az=0b>k$aSUTjBgLHrUiZt&xOIUr
z3@hW-1pt7VF`Ui7%m9Eui0%Zm){s(ynIWZw)*8pMtSxZ&9uN9`JDyC=@n*focDK9A
zS4y4NGSBlyKB_B-$VO3QZ|%QQ%3ey`gVPKILLf<!%C~Q&^Gj}Z=-PRs5_O9I`?^{m
eIFHBU>55-`RaolkZsh*}0000<MNUMnLSTZ|9g|o9

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/adminassistant.rsi/icon_alt.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/adminassistant.rsi/icon_alt.png
new file mode 100644
index 0000000000000000000000000000000000000000..200d2b62e460b97085c4da201d7f614f45219d9a
GIT binary patch
literal 471
zcmV;|0Vw{7P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004=Nkl<ZScUDC
zziNX}6vjVG!K9$+P|(TE(9(-Tx2z6v4t;}8S@Q~|&k#E0EefGSR;OfW?Gg(Chhl<@
z3Z|KEr+YDN#D5`O{1&--&iQ_xbFTu88a4W731t(yx=sP0C5rsso8y$OQwhKzgr?Wu
zyB%7h$gfpE3MX`Roiekf>k3&w?AcKPm{FF2K?qHEqYOlDVBa)pvfW}61bcG__Gix^
z0F(ka%L{m&&4i0~`;WOSN$8s<AHgOF5XCW~IOZF*h$`=1gAgi95&+<HwZhH)6WX0C
z0Kj50ge*ygI+5FfEV1@8a{%zCkJyF*?jD{I#c`oJl>wM}uh#<rg!UNo`5d7=<`Al?
z=8mEkfGkPSG!2(uFG!LE!gPuxNlMkI1;C_fTIJl@0G{X7%0Eg6JkNt=S-2jJU|H7b
z0G6&R*tX3fAj$v$<NO_q$q>Hp=N`k{07X&wPF}Cq2jjcCPHzd}>kr2%{ZGh+NP`@b
zs;YD_7|<d|FRj9qilWetEFXL`_UR3yD6>no0e+jMb<}n@YSie|`T;_iwCclVNWuUB
N002ovPDHLkV1lQ5(u4p2

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/adminassistant.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/adminassistant.rsi/meta.json
new file mode 100644
index 00000000000..d91acee23ca
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/adminassistant.rsi/meta.json
@@ -0,0 +1,25 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "made by Radezolid, alt headset is a modified version of the alt service headset (Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428. Modified by TJohnson.)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_alt"
+        },
+        {
+            "name": "equipped-EARS",
+            "directions": 4
+        },
+        {
+            "name": "alt-equipped-EARS",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 0000000000000000000000000000000000000000..59791ed5fad789d6fbf80d06a23fb7b2c056e6b5
GIT binary patch
literal 20878
zcmeI43s_WD9>6cAu0ooXwn%0pX^W4`+~?efFrt7#I*JAxxMkcY%sR}BGlL9RE@`Ef
zK&y#bnq`@3S(Ik2A!2@Mt!|mFnfB6Ld}UIpxr&cH^Ek|aL*3A}ZNJO+F@HGs|NozJ
ze*bg+=W)MpW@nALqg!-bG=d=AGBeV~1DWFc?a~>1uCh-40*J28j664j#N6onjY6JW
z9E%{MyIHeyJ-L?AyyPfK6l8~}BzlXSKpR1lhIyTWG)eIoM5VxLPmXVVdt<!8DksO^
zO<ORFGgT?HW|X;<yUNC7OJ$QJPL3aDj!yFOz(JAX5e(iUo88TOljHq<dGNQd*cfl{
zt9T|Q#}D^aXvno>8B!fC#Xu*TPzf_J28K(-X@;SgAqE1&X(L7&Nem@Op2B#FFa&?%
z&C%emB$ur6<I_e4s{{Wf#}|4$PTpuNDJe-TArl?00wd0GoDn081c3q#)Lm-#2wv3g
zzAfMc`bksVlFRD!SRHnQ&#xdliap8k@xF?he}ergayD0FcL&)4ibk*CG~$VvF_Mui
zHQP9gT{eHyWXY)5lp@9MaRWO%qMftQ;c>VN9c@(E{J71EK};-`=DH)cx2Py$)oxGv
z6o4RzG@_+DyVR)|$183}u}f0Yr+}{97OD4c&v+#i9SyF4dPGMatJ;Pi-;*{WC|+wD
zX1*r@Gyj+hggOa8<5OLV;BmOJ9S)m0FkG`>EDWis{^4mzxZ7%%9VPC8NygSDp@9?f
zrlbiT#Y|veEaDi75!pD+lQfSrgE5@PurMb9%~n1v4%w=fLLVfGQ7FM>6TlSA4<g)0
zm}YAqU?R$bN6_RYTsO>*Eb*$tRU~-K)*_)mF*@x9NyboNm}c|v<Wn6shYK`IF_THg
zNW~GY(i~E;Z+;B7ONtu=!yOhR5GsEL7$Fq2EQJqjR&yZ#$PURW^Px&HNfH!-04c}B
zf=J+sjEWfekW31Ob0o!LoRnnrWdYzK)UM#z2$n~7%_%aeiVA~@3MU3!vkH!*A|s2q
zK#-hDi|uqR;S^1?CJ7`;k`A~Q2or@0ge)thi6a$KX{T$MlmwBKC6pCZDd?J#1eB#o
zf*^1S1D$EFYk^Q@j^R)aSJ)tH5&R1nlOjRTCXT_|=~}@Rg*6HORtH@RSE<#COv!}6
zsy-lB+qFUxxJZFkt8{Si2?9f)0<BO2E3+z&v+V?;5;#G!00?CQ!^A(X1xy8<P%(uj
zNr_-Y`6pe2JeDYf=^~1lD9I|03aY}PGEJ!{$B7uqnM6#YSW01WI<m7sY0GIDKIeaI
zQu}hH#lmOW-5vqV`OGx4uRT`K9vqBO86!xPq(uScFp5Aq0_+V;5-rKHAW4`E+H;wC
zX!-_S!`gxC$Ws{1C4r-50aZ+b9H7WbG>u9Wr?6l!n+O6-hCoGO&MvEHtjh{EPl7E>
z$JZAhTSk&tNup&`WmFoKNs2~A3ILW^kbQ8HQaDC{RYY)eSydTUUveyMnXCNC@h)X@
z%hFJC^lx*Vg3GP=7V+eGxQaLLivsyBnDzXd0bY=N8zi&jTN)KGmRgjCn$>KX6i~2U
z9!_ltE;Dbtj*>#f{$opPz?EOCZ6|Jr>M0Ri%J2fP=xAB>172I2wRRtQmRyxUxP>WK
z76ww{Op3sAC_#g{&6p?*WhI$LO(2)hlu5)HnSo&ri(>08`Z^N^80>Js?gaPkaC}>L
zY65ieYv2#HO)3=Z1&VAo!sft&*4_DEju^|Z7)h!GDiR!pG8hGxX&Gz?SOt?9QdA{Q
zRbl_y5iv3w!+2lNa6M?A=6vU{Pf=VyC*y&<Du6Su0(Pvb%TZ)#-Y6S94ujxy+N_e`
zOQpssb~$*0Y~G*3=!N<CFAh*yaan&(QVDCN1Th(YV|~8jG^#LQzbKI^3Jwo6N~;t&
z08luCf=#Z8<!BC5F>s=2$7&Wxqxz)u?<j&xOmGu&#X%!MWM~;|y-8dqQ9=T1pFnX8
zs)BPCrV5N8h*W!n=0BO^3{Qh(%EFU**b3QtLWdTqmU{^e7Y|ytAR+f~$@?|ez~(#w
z=>{X(Hk7a=<4-L=kwJY)wmIX%O2T}!uILwB@2_4u{q6Mmif1N82{evz;DUw~B~+!s
z%oHUF9BEAyBXTq)fGZXl)}On_(PySVm%@*$oKv-((%ZKXM!fC(Kgg+p?9=k34p0A=
zpX}i^MqryZ(zm(v-AID$_7ewr5NU9$&WFtxc(tN+A#7#dB8vvS%fSoVHg8w7T{Q-p
z8s;ogU5+cgU<uR`!A+<(7>BeF?y&omB;QL19^BA?+XDY~-VE+CFDnc4=6{y!yJ@i%
z`)^Vh0s}ur-1iwY4S(F)H1Eev!ymUc4O!;ctsXNGtgTgXn3eC%NZ{K3F7P%`F`H<b
z1UGE0i(6Y{S-pxaH_ZyJ?cKh+A`{p{`E6Q1h-jGCmSNa~pkZLzguS=(2PRMo-U@;j
zlE&sYl3_7}iSHMXp&tDL&Y?@a5=cUm)NyIT1eJ7Lkc1|w<I;o)D(Sc&2~ASRr3n*M
z(s4l&nxu|P6DFvn<ANkKNgbCaOi)S31xaX<IxbC^ppuRYlF%e|T$(UJB^?(ep-Jkv
zG+}~DIxa{;lhko(!UUCcT#$q&spHaw2`cHhAPG%U$E67qRMK%l5}KrrOA{ujq~n4l
zG)WzoCQMLC#|24fk~%I;n4pr53zE<zbzGV-K_wj*B%w*_xHMscN;)n`LX*^SX~G1R
zbX<^xCaL4ngb6C?xF88lQpcqU6I9Z1K@ytekK&3BeaDw#2Vd+}0=~g($G5eM!MA@I
zq>S+v1SuPUAmuX<<m@FNk0MAhh9JlC5rkieAisCaz3<(T2-2}BGi`Xbci-`+#%A1B
z(sS#^jp;)N^{$DTFrO{#enai71%21<S9ZVtG(U6so{?D#4c#8?F}}vSci&B!$KpFb
zIclt!SMA-m{B+HR?CYjlYiBQb=+xsCeIFW~we_vKiNvn+_=)ZOynDYpvw!RM+Oq>1
zH+<N5;iBdCIkTJ#8v34i%Zc<sepep_MExz*x0CZ@C8Ru~e}@Iz(x*<Hiqwm*#Ud%=
zdd9`Yjd(UIKPD!olDm0!8nS=={HKI3k9VkAwDP@Ja{AJR3sXu;m<j*7wcmz>_>(og
zPbJOq@D<;DQ-tKNS+l0H)39N~u0t|b?Ao%SuFj04P;s>3lW0R+#XAkIkG5|g-7s_5
zrOv0eUe{~AH_1M<W3o4|x+1^0%kDk1(>fpvyZ^l!f9Bja$}-~x>yZm<3K#F0ysvt{
zlJ`pC(X#K?H8oyq=v#I3>ZM~=^y|{0<M8^82hYrLCl45P`n?9%-s-5?Y16l_D_q%k
zZ}c-+39*L<4<5Yb>`CLakzaLv>7%btJD%*+u=>@_RU@D4b>R}f;qzUFlT8;I?iii?
z)Xekrv-dQfX<D>o#+M&_Fed#{wX$gbxzf@{5M)&U8$e$^K7Qjze|l_L!j{*bnAowr
zy1M$s^ApDPe9k^-{?4yAu1R=QynpPV`6C9+UsZG8y{C9p-1*p1YgS3ZO^^Mxe`evN
zN#u#8ix(T_y$|SiM$Vn9A2YC1)y0d`=JxMuv0O3=iHV7izc2TgofeDaF6wL<x9aK2
z+KI+{i#=t#U-<NlH;G=puWs+PH60Nob8dFuny8ey&yP$oWX_#azU_gR*EPnLA2@K}
zr4FlCym?D`-`cGQADp;K$Q@W6^+YeS?9-?t%X@n7ZK}L>`tGkzmqj5>O-+r;A4--y
zux7^oiglYC2Rny;!{iP4V&A@K%PwbWsg=c8w#)Dy&a$#&2|Zuk6EnO=){vVf9cLIO
zbr-emhqE_6`{^O)Yq@KmfAftPr2gnpYsHE0zyJQu4WGLvPZsVhNViil_rJIE@x1b?
zDF0~tY>IU~TFIZjJ*Ke(9De2LT^}C7T>R)@>h;^+-jtQ_&}U!o>A!X@m?}eu=COS`
z_nj6~`|l6FD@LU4HNCpeob2^xAkQpWa$w#oiR)@>ZAJgcZ&+EgEMegfXJ5RhXL>)T
z!}F^KWp?4B%V!z-b<D|mzXBQf==cNM)_!=$xv_5bvE_+7zWBnvc)`SZo6eo%pFUxp
zo-k~rdcNY|z^8iu<(hHR=B#+Ts-~`P;(<|bRIMwh2WES1)w5<z-((mtFLOrS%~7t~
z_Io?Ob$$8GQJd|=qUZCmjI=bMa%b;9^VbY%?Bx1epY`k4Bgo;yhab84{;@$5%pIcg
z@9JJzwQ<WIj~?%XOk4R~zXjX4jlCb;dN8(k@8Ra9ukJWgS^Lh4O<#_>d)!t8jKHlg
zEv<WbN5jcdo6VMAQnF_<GJ5FH%}0(T96EHU(CuFH)uElA^{Kn`_WmQWHK!KE%$qll
zKKJgs=|Ak*wxD8f_o|ADabw4heRxbx&daM;M{T~3i_R}9>b5LlM9+8QmTtK<spkBt
zk9Q8)F*q~BR<wKc>#J6c$jO<t>^<|v!^|B~;1AE#-E%+Lw`^jjt9#18hDm*P%y9hk
zm}O?x=LnKp{HE>5#FU(zKDXXFH12#3`sI%0-`3Y7m6esp9+<^-N;z}#;)SM^C1-l@
zJpak2O%E<#jvc%dckol8d-*l{5f<@_6EB`;kknlHbGpZM^&n*;ndxKFUKx=;{XYb(
BxkLZ}

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff304f00fd325f955637f40e7d26e0b18fdce658
GIT binary patch
literal 1462
zcmV;n1xfmeP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkTXh}ptRCt{2TF*-(R~-LjY02Uki3bzCX}e7hTM>HLssVqLC4vZx
zwr3A6L`aSvgw4Tt@X$m40A+<-0y&i2a<GT4P)2BOLieEEVCcmp2Q5w}#1#7N!M@o^
zGReFbXPhnO14CxsynH{O_sM(Td71ZIM1;qTCr%4+8hrzt7T`4c1~@IiY4i<nT7c8&
z8{o76r}0_0n=Y5D={lKA(%|4A0AO=-Q@gppzfS;AtyZzMwblG33z1AFO{cA`{AM%V
zt_HM{udS^C0LI3~@MGp@k|YVLsv;7Jpja$woOYO?=Qn{EKM{32^yEhPV)1*!a-LsG
z1fBRVE-p;@yS0yq%ne}V7Z(@A&g=C$)$4VdTv^x788H)Ol?f~+JGvR5ugCb!4B$$F
z#bOcJY*ssWyWMcR-B49kJ7+^6o6YKngJsBOvyf%EYaLmZHJ!ZZngiIl>l9RyB*XG-
zHjDqp>%H<pD}T9MMmn8FC=|l@__$WDSS&)8Wt7Y1HhutI`AvHObKR&Rs;c7l_O_{v
z)ie9Gcwxk^Z+z>uD1TQ23WWkfp%4m%g5iBhlHhi`g}=uOqc{^26NYv5<wE>sNl*`c
zLL&P36lhI6b|INek}S(j$&MYeEF1EhB|(=_LtCMn5Yh1PF#LW$d_Er*78Y=Pe2hw^
zf^xZx>+5U4WX#<M!^6V_0Diw;8}F^x*Voq{#qzX`*MLAEKpu|=KA#WOY88WngKeLc
zN(G9d;QajDaua&t=V_bJe}RF4fqUJ*FYMswGJv^XtJP4gR<-h4t)`t<t5wu$HF!K8
z1Ofp|bAg@wLPG!mJRT2#JGX1Kn)V3*ilP93Z9_nm-_jfa056_Dd-vDhPZm1W^M3x%
zasK^>Mbm&iLX@AUZQTC`^(5>(|Ng_`i|5bYiN?4Otmc38FGTtVI4!_wa2voo*6hj&
zcJXr=AR5$a6YS)F^h2QQJb*p_d7h`AB3v$)srE<T1NsIyEx>8?4RBh3)94%Ev;e2k
zH^6BDPNOFS;_*1eVzEzVdKinvC?1dZq(^uv9FNDTTq?o+^eF(q=ksA_XUFyBcRx_!
zm!E7~6VQWk?e6YUrBVR^+}7*xkB(w*Z%@;}GZp4q8DiJbXp~-WY&0!NN25_nBod@3
z3Qex8li5nleUHhNby5_C5{U#wqtPZUuQxVWnWo>8<#7hD*NeA@hX8=n(^JG^F+?H}
zgu`KMZ*N0YRgrK#K~+_3Z*L<U4kHqYAQp?^^z;+}@b>T!Uawaup72Z2QmKT|(NSbF
z84L{#VQOmXPMD(L*FV#u;e;Vc5>{Wm!pzJJ0AOfn2$@U<Q&UqYl}f_#gp;6tO-{dO
z=VdtjU_IbvIBcjvuZ<VNJ>cNr0JF2RxVgCja5ofKFX*&k!b<2lSl7R~xj{Oe#>vTv
z@DS+fF&GMk005~}3XMiXD}SgSz|d$kkV>VRGzmlGDUe7c+Om8;pQp>qOCq8NdkPQ{
zU0z;NKA&&n(`z(q9}#sQ0xSrd54?HvrmfD>(vr4cV0B@kslL@9BCLKhj`{g{ZBN40
z)m2lSMx!D0Dvx^z1Ofp%Iy!1ApPrt^$jAsJNkT4{;|<p{a=9ENNy5m;2&Si}+wLD7
z9SN-t3-1qDUS8IM&&|zI>-}IbXxkJy7z|SD9ss?D<>lqJ`)1%;9S#PAq+gZ>pzX+D
zJ2n6`EmK>)M9%gIh-f%FJ2Tbrzu6xEi0={LY8$Tsts;zISHoMutHCk@zWw^E)*_>&
zC)+kgbU;@Pzy1CPSCIY-5vK(>jlKa+3ve33{|38&B_+F)p{08d9(@n^7rZE9p@b+(
QzW@LL07*qoM6N<$g4#c<i2wiq

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f085ca55dbd896e93d5def896101bf5734f87c62
GIT binary patch
literal 486
zcmV<C0U7>@P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkPm`OxIR9J=WmNARMFcioCISw+kATI6VAQs}}chH;NyxGyAZhnsI
zSO<su1b&4RzlMS|gG*gRXds>5Ew)%ZxkT@9=^p|~UYhsIOI~@5i119kJk@&*Py^He
zH2{EDlSPa%06-K)<hm{ZU^1Do!oFB62mrDy!)!KVKkac-MD%L|fG`XxNfJtugtXSw
z8H}hm98+g7A|fhnVHlFho<%c?K%sWKUG{gYC4#qi>{iPw+n-0^d@72fh=_=^)}*zj
z-f&#@FYPu_uzrM6N^s7>IfqiJ>`N){3cy2I;5g1Bp93(=g86*T08kJFm3gHU@;nFU
zyqud(r-<X&I1`K`aE7SJah!^C09MYe04`PBw^FJyzDLFYLWoN3CZ)vJ=f{=vZntYy
z<1v$(kTC`!1Z}rlG@DKMz7Nmy(C_!LUaxUD9FV3dj>jW}5ZG)s#@Ap4&}y}CI-PE=
zYcv|z@Ap;!R)0bO@I0@4`B|31b=`8D=eg~6<`Dp{-+}M@NYk{k*5>ra0RO3{*8?>`
c4NwDo1MX!yx5$cKQ2+n{07*qoM6N<$f@_G?UjP6A

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..15c30a0491469a4dc719bc4bd8471213c33ecce5
GIT binary patch
literal 432
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`0}1^9%xW@Tl~oH?_wu<-x?{|62nxPSltj~_plELn2&=utH_wcg%dCMG5+
zDJgSv^V-^4V`F0{CnuoR`R^om11X`BAirRsMpVG?X#aj8pe$#BM`SSr1K(i~W;~w1
zA_XY;)YHW=B*Oje)YE*;20Sbak8Rl#_36L;?HLl96TdfH^`2<s#CdZ;=ZVzaUz8O&
z8U>mJIO;WD{7SaD=ie9F@3%Sfx_wI4KD~47MhuL+bA*DG6*}A0f_<(C_8##Gshw-w
zdCbb1u}S@6_ooQ%oH8aMOa1ww?-%$u3O>KQ<E}&G!L-YB>Ze!EE74ux!`PI1_ulPY
zCQK7F9X{MFuasguA@U(Q*fE@Sis*&CJ2)IUS_E1gcFa9sw%wm$)@{uVXWt4Pcy{fl
z(1x9*``9uv=QC{C;?EFuOLK$nTag>n%I-DhW-dQaRPE>$zr%v1DL}sM0?@+@p00i_
I>zopr0Q`uwBLDyZ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..53512e6969e83d3e779142d0c1aac269221eb24c
GIT binary patch
literal 438
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`0}1^9%xW@Tl~oH?_wu<-x?|M&0TKXBl{j~_plELn2&=utH_wcg%dCMG5+
zDJgSv^V-^4V`F0{Cnum*m58V#KuV}2$S)YE5fv~z+P_~2D9c&k5n0T@z;_sg8IR|$
zNC67I_H=O!iEw{A^(J4l0T0VUvn?^YKmX6qozrZgAiBGD;Usqrwk?u^aoY;*lbD1B
z)C?F4B^@Q!p1HOqk@tJ$v2yc?3p4Xgip)3}<{svAVS1r4XLF(nLj#8`2anzDV2kw0
z5BNSX?Dt|RHCy|I_g>|`{}awK?-f=3{r#pz`^EWOg))aOr<dJSnepuD&NGue0)Xnb
zt}E#TDwj>|IMOcsD(9bgd@|HxUB?~bVPDv~v$b{|VD0MCo3druBFPwq^%-p3Afd~%
zy6z<u`nrnma0tA}suvJa(l~#|x>&_i@nuimv!2__nCZ)s&TzP$5$J6OPgg&ebxsLQ
E0M|vYr2qf`

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/meta.json
new file mode 100644
index 00000000000..29605f8216a
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, tie changed by noctyrnal (github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 0000000000000000000000000000000000000000..59791ed5fad789d6fbf80d06a23fb7b2c056e6b5
GIT binary patch
literal 20878
zcmeI43s_WD9>6cAu0ooXwn%0pX^W4`+~?efFrt7#I*JAxxMkcY%sR}BGlL9RE@`Ef
zK&y#bnq`@3S(Ik2A!2@Mt!|mFnfB6Ld}UIpxr&cH^Ek|aL*3A}ZNJO+F@HGs|NozJ
ze*bg+=W)MpW@nALqg!-bG=d=AGBeV~1DWFc?a~>1uCh-40*J28j664j#N6onjY6JW
z9E%{MyIHeyJ-L?AyyPfK6l8~}BzlXSKpR1lhIyTWG)eIoM5VxLPmXVVdt<!8DksO^
zO<ORFGgT?HW|X;<yUNC7OJ$QJPL3aDj!yFOz(JAX5e(iUo88TOljHq<dGNQd*cfl{
zt9T|Q#}D^aXvno>8B!fC#Xu*TPzf_J28K(-X@;SgAqE1&X(L7&Nem@Op2B#FFa&?%
z&C%emB$ur6<I_e4s{{Wf#}|4$PTpuNDJe-TArl?00wd0GoDn081c3q#)Lm-#2wv3g
zzAfMc`bksVlFRD!SRHnQ&#xdliap8k@xF?he}ergayD0FcL&)4ibk*CG~$VvF_Mui
zHQP9gT{eHyWXY)5lp@9MaRWO%qMftQ;c>VN9c@(E{J71EK};-`=DH)cx2Py$)oxGv
z6o4RzG@_+DyVR)|$183}u}f0Yr+}{97OD4c&v+#i9SyF4dPGMatJ;Pi-;*{WC|+wD
zX1*r@Gyj+hggOa8<5OLV;BmOJ9S)m0FkG`>EDWis{^4mzxZ7%%9VPC8NygSDp@9?f
zrlbiT#Y|veEaDi75!pD+lQfSrgE5@PurMb9%~n1v4%w=fLLVfGQ7FM>6TlSA4<g)0
zm}YAqU?R$bN6_RYTsO>*Eb*$tRU~-K)*_)mF*@x9NyboNm}c|v<Wn6shYK`IF_THg
zNW~GY(i~E;Z+;B7ONtu=!yOhR5GsEL7$Fq2EQJqjR&yZ#$PURW^Px&HNfH!-04c}B
zf=J+sjEWfekW31Ob0o!LoRnnrWdYzK)UM#z2$n~7%_%aeiVA~@3MU3!vkH!*A|s2q
zK#-hDi|uqR;S^1?CJ7`;k`A~Q2or@0ge)thi6a$KX{T$MlmwBKC6pCZDd?J#1eB#o
zf*^1S1D$EFYk^Q@j^R)aSJ)tH5&R1nlOjRTCXT_|=~}@Rg*6HORtH@RSE<#COv!}6
zsy-lB+qFUxxJZFkt8{Si2?9f)0<BO2E3+z&v+V?;5;#G!00?CQ!^A(X1xy8<P%(uj
zNr_-Y`6pe2JeDYf=^~1lD9I|03aY}PGEJ!{$B7uqnM6#YSW01WI<m7sY0GIDKIeaI
zQu}hH#lmOW-5vqV`OGx4uRT`K9vqBO86!xPq(uScFp5Aq0_+V;5-rKHAW4`E+H;wC
zX!-_S!`gxC$Ws{1C4r-50aZ+b9H7WbG>u9Wr?6l!n+O6-hCoGO&MvEHtjh{EPl7E>
z$JZAhTSk&tNup&`WmFoKNs2~A3ILW^kbQ8HQaDC{RYY)eSydTUUveyMnXCNC@h)X@
z%hFJC^lx*Vg3GP=7V+eGxQaLLivsyBnDzXd0bY=N8zi&jTN)KGmRgjCn$>KX6i~2U
z9!_ltE;Dbtj*>#f{$opPz?EOCZ6|Jr>M0Ri%J2fP=xAB>172I2wRRtQmRyxUxP>WK
z76ww{Op3sAC_#g{&6p?*WhI$LO(2)hlu5)HnSo&ri(>08`Z^N^80>Js?gaPkaC}>L
zY65ieYv2#HO)3=Z1&VAo!sft&*4_DEju^|Z7)h!GDiR!pG8hGxX&Gz?SOt?9QdA{Q
zRbl_y5iv3w!+2lNa6M?A=6vU{Pf=VyC*y&<Du6Su0(Pvb%TZ)#-Y6S94ujxy+N_e`
zOQpssb~$*0Y~G*3=!N<CFAh*yaan&(QVDCN1Th(YV|~8jG^#LQzbKI^3Jwo6N~;t&
z08luCf=#Z8<!BC5F>s=2$7&Wxqxz)u?<j&xOmGu&#X%!MWM~;|y-8dqQ9=T1pFnX8
zs)BPCrV5N8h*W!n=0BO^3{Qh(%EFU**b3QtLWdTqmU{^e7Y|ytAR+f~$@?|ez~(#w
z=>{X(Hk7a=<4-L=kwJY)wmIX%O2T}!uILwB@2_4u{q6Mmif1N82{evz;DUw~B~+!s
z%oHUF9BEAyBXTq)fGZXl)}On_(PySVm%@*$oKv-((%ZKXM!fC(Kgg+p?9=k34p0A=
zpX}i^MqryZ(zm(v-AID$_7ewr5NU9$&WFtxc(tN+A#7#dB8vvS%fSoVHg8w7T{Q-p
z8s;ogU5+cgU<uR`!A+<(7>BeF?y&omB;QL19^BA?+XDY~-VE+CFDnc4=6{y!yJ@i%
z`)^Vh0s}ur-1iwY4S(F)H1Eev!ymUc4O!;ctsXNGtgTgXn3eC%NZ{K3F7P%`F`H<b
z1UGE0i(6Y{S-pxaH_ZyJ?cKh+A`{p{`E6Q1h-jGCmSNa~pkZLzguS=(2PRMo-U@;j
zlE&sYl3_7}iSHMXp&tDL&Y?@a5=cUm)NyIT1eJ7Lkc1|w<I;o)D(Sc&2~ASRr3n*M
z(s4l&nxu|P6DFvn<ANkKNgbCaOi)S31xaX<IxbC^ppuRYlF%e|T$(UJB^?(ep-Jkv
zG+}~DIxa{;lhko(!UUCcT#$q&spHaw2`cHhAPG%U$E67qRMK%l5}KrrOA{ujq~n4l
zG)WzoCQMLC#|24fk~%I;n4pr53zE<zbzGV-K_wj*B%w*_xHMscN;)n`LX*^SX~G1R
zbX<^xCaL4ngb6C?xF88lQpcqU6I9Z1K@ytekK&3BeaDw#2Vd+}0=~g($G5eM!MA@I
zq>S+v1SuPUAmuX<<m@FNk0MAhh9JlC5rkieAisCaz3<(T2-2}BGi`Xbci-`+#%A1B
z(sS#^jp;)N^{$DTFrO{#enai71%21<S9ZVtG(U6so{?D#4c#8?F}}vSci&B!$KpFb
zIclt!SMA-m{B+HR?CYjlYiBQb=+xsCeIFW~we_vKiNvn+_=)ZOynDYpvw!RM+Oq>1
zH+<N5;iBdCIkTJ#8v34i%Zc<sepep_MExz*x0CZ@C8Ru~e}@Iz(x*<Hiqwm*#Ud%=
zdd9`Yjd(UIKPD!olDm0!8nS=={HKI3k9VkAwDP@Ja{AJR3sXu;m<j*7wcmz>_>(og
zPbJOq@D<;DQ-tKNS+l0H)39N~u0t|b?Ao%SuFj04P;s>3lW0R+#XAkIkG5|g-7s_5
zrOv0eUe{~AH_1M<W3o4|x+1^0%kDk1(>fpvyZ^l!f9Bja$}-~x>yZm<3K#F0ysvt{
zlJ`pC(X#K?H8oyq=v#I3>ZM~=^y|{0<M8^82hYrLCl45P`n?9%-s-5?Y16l_D_q%k
zZ}c-+39*L<4<5Yb>`CLakzaLv>7%btJD%*+u=>@_RU@D4b>R}f;qzUFlT8;I?iii?
z)Xekrv-dQfX<D>o#+M&_Fed#{wX$gbxzf@{5M)&U8$e$^K7Qjze|l_L!j{*bnAowr
zy1M$s^ApDPe9k^-{?4yAu1R=QynpPV`6C9+UsZG8y{C9p-1*p1YgS3ZO^^Mxe`evN
zN#u#8ix(T_y$|SiM$Vn9A2YC1)y0d`=JxMuv0O3=iHV7izc2TgofeDaF6wL<x9aK2
z+KI+{i#=t#U-<NlH;G=puWs+PH60Nob8dFuny8ey&yP$oWX_#azU_gR*EPnLA2@K}
zr4FlCym?D`-`cGQADp;K$Q@W6^+YeS?9-?t%X@n7ZK}L>`tGkzmqj5>O-+r;A4--y
zux7^oiglYC2Rny;!{iP4V&A@K%PwbWsg=c8w#)Dy&a$#&2|Zuk6EnO=){vVf9cLIO
zbr-emhqE_6`{^O)Yq@KmfAftPr2gnpYsHE0zyJQu4WGLvPZsVhNViil_rJIE@x1b?
zDF0~tY>IU~TFIZjJ*Ke(9De2LT^}C7T>R)@>h;^+-jtQ_&}U!o>A!X@m?}eu=COS`
z_nj6~`|l6FD@LU4HNCpeob2^xAkQpWa$w#oiR)@>ZAJgcZ&+EgEMegfXJ5RhXL>)T
z!}F^KWp?4B%V!z-b<D|mzXBQf==cNM)_!=$xv_5bvE_+7zWBnvc)`SZo6eo%pFUxp
zo-k~rdcNY|z^8iu<(hHR=B#+Ts-~`P;(<|bRIMwh2WES1)w5<z-((mtFLOrS%~7t~
z_Io?Ob$$8GQJd|=qUZCmjI=bMa%b;9^VbY%?Bx1epY`k4Bgo;yhab84{;@$5%pIcg
z@9JJzwQ<WIj~?%XOk4R~zXjX4jlCb;dN8(k@8Ra9ukJWgS^Lh4O<#_>d)!t8jKHlg
zEv<WbN5jcdo6VMAQnF_<GJ5FH%}0(T96EHU(CuFH)uElA^{Kn`_WmQWHK!KE%$qll
zKKJgs=|Ak*wxD8f_o|ADabw4heRxbx&daM;M{T~3i_R}9>b5LlM9+8QmTtK<spkBt
zk9Q8)F*q~BR<wKc>#J6c$jO<t>^<|v!^|B~;1AE#-E%+Lw`^jjt9#18hDm*P%y9hk
zm}O?x=LnKp{HE>5#FU(zKDXXFH12#3`sI%0-`3Y7m6esp9+<^-N;z}#;)SM^C1-l@
zJpak2O%E<#jvc%dckol8d-*l{5f<@_6EB`;kknlHbGpZM^&n*;ndxKFUKx=;{XYb(
BxkLZ}

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b3a50b9744a4e3fca5f2e7b8f4bbd9e26fe1ff1
GIT binary patch
literal 1461
zcmZ{kdpy$%6u^IDk>PqRkGw}(nr+BC`^dEzOA%&EhP;+A$|Jc<qPUfCQOjebBA1A<
zMcI^l`?TD7gu-N8w^%f<Xj<L%|Gj^l@AvaL=lpZd=W|ZMF<(zr$ZiM#0IE1I4}Y26
ze#A}%86QxRre#v1dJ)e8fU?$)00Hz$T>#h-gY!5PkY2e&;`^B4bbm3_Jawgktt%+a
zKs&*!t7vc)C#7eLf?Roxi93p>iVLN!tzYDSOIp!<5w)s_K$szxOdYtn5WQ!i_?|7Z
z&U;5*bzR2y`wrhbj_Y#Gl`?9N3mP{UHwfgwv@$o3bUyX16(_+_;mv=NHF**Wt`(-i
ziWxaMAb=y0WJqV1mysZjRO)K);Gq9K5~f*jN!Y=>^)B|_<QOe_b$&hy;JkUG`^`&w
zB&*lBu+BvLSJMjKs8cig5HAtHWWh2v21`WY$w}C*p3=Sjx#L?XBvR$eB(vzsRn@S+
zb#!!||K)R6v&?%Bok(h~v5l~JiO>qJ`WPES`;7S`G1AQwhpyn6R{4(epM;`%LQzm`
zV@*5qhVOl*fP0{Rg!1Ci)Mq1NxyacCJ88g?2;#~l(k#L1Ip=G}Qs({4!B=EB^akES
zqrd}=!G!jrDtL#=qo9yH?JOYvi>euo-7>C@^<z9Z{j**-{{tlj;+hpdcRPD+wad=r
z_JC|&85cu0x258YCsW@=(2NZ{9{*vw$?E;AgZD*Jtd`~w4?b9#{<}M@*o0WFUt;JI
zNgSJ()eQOa^kUw;m`~0om53*V63N7C3HZt0lfCeca~B|Bxt$8Rx_WxtzCO91)YOtv
zQu5quInRmqS}I^UFu)CKtrpX>$z<}`0We$TCY=t8|A!FBG*vu^!OX6&zqXO@6QW&R
zUF|-MEPfJ+;)D)1v?gU%2+HYrU?AE$qhQc-eRK1Ue<J`?*VG78$LTYv-G0qMY>{X&
z{#amOK+~u*W$jq3T_(mj1gUe-NKM8}40$|dW8L{o6suRE=+E3__7sPVtPrlGKYs8@
zkgY~lX*~g;g16F03E<^|!MV9pK13#I)XG60v8`XWLQ8|K^SH4_VqOZUU8oz@1$6&E
z2M20qR~!rKwnola@4^<(uA~z(Snm|(RvdS&o=@N21_5SfW;e`nH$y^9fxgW|a`(`X
zwS^7=pgqmrw)86TAP@)uzzlGwo`br$xP*}N*g^Roe)asgI8~qFI(UgWE&!oTiKdiA
zmj?};ZbHh`7>tmm%?l%P%Vlj=#gvz;j?ctm^wW=@<bmr&MQv?uIl+kh*aL;l%~tS2
zIjkT4Ou~LBmOD14T{i@eXw$W~x2I-issLM$dW(d@@D>THcjx@t`K#Bj!^*tFsZ{m$
z_IA7Qe%LoDioyoTZlX6^a*54$0yr}>CjO1k=$M#d{(H7)&iCTPo_$NzRYgM$^Vbwl
zYly9PkB%}%$M&(z!V(kJj4_!UfxwVPB82&I?2izYmWB<KrQO{w=A}3TL&K!BoR)m9
zm$@9^=;%mGZC-AM(S!>NN{Wh#s&p3D79!ivz-FY4-s7Ggb6DN2yMYpGJTYHp7)+L`
z$6Jild6t-q4(E(>B-1AjyE#Zt>KxQihvbnA)WCAkpDt6fvZ_0~x~z(5OH1+enwtAm
zM|_SO1A7z>oh<}fZkaSyT6y~(J*p)xxtWld==UvtV)$(s99mafYYL!-sL9DNfGL#+
zsHv$zIthykN{mjNyZR-`<DSkHQpEn+827vWAPwQyua$9@ud3ubz^Mm}8eD~wlamUn
z0~5}9YtB<~I|MB+=^$Iy1sg^Pa!x3$jnNRy{*YFN4dda%hkKK42b=O+R2u>;S!_0l
ymcJlAk&`q%HMQR1$yh>f8O>akOI2>w|1QtK^t;u+v)`8eVE~8q^=NSqyZA37hN_1E

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f085ca55dbd896e93d5def896101bf5734f87c62
GIT binary patch
literal 486
zcmV<C0U7>@P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkPm`OxIR9J=WmNARMFcioCISw+kATI6VAQs}}chH;NyxGyAZhnsI
zSO<su1b&4RzlMS|gG*gRXds>5Ew)%ZxkT@9=^p|~UYhsIOI~@5i119kJk@&*Py^He
zH2{EDlSPa%06-K)<hm{ZU^1Do!oFB62mrDy!)!KVKkac-MD%L|fG`XxNfJtugtXSw
z8H}hm98+g7A|fhnVHlFho<%c?K%sWKUG{gYC4#qi>{iPw+n-0^d@72fh=_=^)}*zj
z-f&#@FYPu_uzrM6N^s7>IfqiJ>`N){3cy2I;5g1Bp93(=g86*T08kJFm3gHU@;nFU
zyqud(r-<X&I1`K`aE7SJah!^C09MYe04`PBw^FJyzDLFYLWoN3CZ)vJ=f{=vZntYy
z<1v$(kTC`!1Z}rlG@DKMz7Nmy(C_!LUaxUD9FV3dj>jW}5ZG)s#@Ap4&}y}CI-PE=
zYcv|z@Ap;!R)0bO@I0@4`B|31b=`8D=eg~6<`Dp{-+}M@NYk{k*5>ra0RO3{*8?>`
c4NwDo1MX!yx5$cKQ2+n{07*qoM6N<$f@_G?UjP6A

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..15c30a0491469a4dc719bc4bd8471213c33ecce5
GIT binary patch
literal 432
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`0}1^9%xW@Tl~oH?_wu<-x?{|62nxPSltj~_plELn2&=utH_wcg%dCMG5+
zDJgSv^V-^4V`F0{CnuoR`R^om11X`BAirRsMpVG?X#aj8pe$#BM`SSr1K(i~W;~w1
zA_XY;)YHW=B*Oje)YE*;20Sbak8Rl#_36L;?HLl96TdfH^`2<s#CdZ;=ZVzaUz8O&
z8U>mJIO;WD{7SaD=ie9F@3%Sfx_wI4KD~47MhuL+bA*DG6*}A0f_<(C_8##Gshw-w
zdCbb1u}S@6_ooQ%oH8aMOa1ww?-%$u3O>KQ<E}&G!L-YB>Ze!EE74ux!`PI1_ulPY
zCQK7F9X{MFuasguA@U(Q*fE@Sis*&CJ2)IUS_E1gcFa9sw%wm$)@{uVXWt4Pcy{fl
z(1x9*``9uv=QC{C;?EFuOLK$nTag>n%I-DhW-dQaRPE>$zr%v1DL}sM0?@+@p00i_
I>zopr0Q`uwBLDyZ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..53512e6969e83d3e779142d0c1aac269221eb24c
GIT binary patch
literal 438
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`0}1^9%xW@Tl~oH?_wu<-x?|M&0TKXBl{j~_plELn2&=utH_wcg%dCMG5+
zDJgSv^V-^4V`F0{Cnum*m58V#KuV}2$S)YE5fv~z+P_~2D9c&k5n0T@z;_sg8IR|$
zNC67I_H=O!iEw{A^(J4l0T0VUvn?^YKmX6qozrZgAiBGD;Usqrwk?u^aoY;*lbD1B
z)C?F4B^@Q!p1HOqk@tJ$v2yc?3p4Xgip)3}<{svAVS1r4XLF(nLj#8`2anzDV2kw0
z5BNSX?Dt|RHCy|I_g>|`{}awK?-f=3{r#pz`^EWOg))aOr<dJSnepuD&NGue0)Xnb
zt}E#TDwj>|IMOcsD(9bgd@|HxUB?~bVPDv~v$b{|VD0MCo3druBFPwq^%-p3Afd~%
zy6z<u`nrnma0tA}suvJa(l~#|x>&_i@nuimv!2__nCZ)s&TzP$5$J6OPgg&ebxsLQ
E0M|vYr2qf`

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/meta.json
new file mode 100644
index 00000000000..29605f8216a
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, tie changed by noctyrnal (github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/AdminAssistant.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/AdminAssistant.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f45dff992aba445b65ad06a96b59ca5d2ef5dcc
GIT binary patch
literal 213
zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqoCO|{#S9F3${@^GvDCf{DA?}l
z;us<^HTlo~|MrU`0zU805C3jZkh$AH;c|SQTuRcDu+6{qAIvz{z%%bmM^XY12ykbm
zB|N%Rc2Mi&fddCVynQ9dwhX8#Vd|8V5yuWJecNR4@MMn$+svNS0?#>W2UH{_BqVlh
ziIs=|5(X+0?jHE@|9`!kT<P!n7jaK6l_geeT{lgV;Z~LXmw(MIM}baa@O1TaS?83{
F1OVIkR^I>s

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json
index 09d18e3ab7c..53dfda149f8 100644
--- a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord)",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord), SecurityBorg recoloured from MedicalBorg by DangerRevolution(github), CargoAssistant recoloured from MedicalIntern by Radezolid, AdminAssistant made by noctyrnal (github)",
     "size": {
         "x": 8,
         "y": 8
@@ -39,6 +39,9 @@
         },
         {
             "name": "Lawyer"
+        },
+        {
+            "name": "AdminAssistant"
         }
     ]
 }
diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/adminassistant.png b/Resources/Textures/DeltaV/Markers/jobs.rsi/adminassistant.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf335a8a10dd46055b705fe54f48c574b17516f9
GIT binary patch
literal 1003
zcmV<H0~Gv;P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkQ@kvBMR9J=WmrrQZa1_VC(Y9$#*<cD9hodb6%fQnvgE4T2F%-vS
zdhyS8C?W_R#9jo2d66L)1TUfocUwJ3cCO&)!9g#(dFT$YfuS=!tZXFa_cL35UY6L9
zu1Pv!9(?d4Ki>Pjyib1b{azA|F@~d*V@DeOUjT@8<HT_sW@l%aWm%w<VtIL)>zaTu
z7I_p31-7SD-7z&a)pa3pQH!wg@jW{=nDyzeK6r-7hxc%Q{BpG2i1OrGx#T`I0MB(#
zsj`WQiO4$<xd<(j0079Bisx#X1eRrCWMm`~L{};3?H6GYiaknkoaYfw^0;{C5dffC
ztwu^gWPnx(09^+T1;BCMdrFeT(&;n+;O20~)i157003RrQ7jfCfrRb@k|eR2nHd0p
zD2f=mbPIwYz%UFbD<7b$s<V_ug6LHBt-;$#Zv0wXy(CHD^BM%;1h3cY%$XBH7$JmR
zxH9L?oxt^aJrYEyW2mYsWLb9SJkNvYc^HP_&Ycv<vfP@EK<QWmPTm);|LJ@SOGS4s
zh;wcIWLd_3y#&@n;0~;=t^xr1&YkxR05A*#lv2-nC!pgOBpm@1MZxIk=z(@Y5Ww^N
zfqsgj91dW9dJF@$2I)<?t=%vT0Py5oE0@^w!ZZeK4fE4uhXZgVp5*cP$t$1!)4LbG
zf;(}t5Ah_ApUv$sw+?PZmPrs#C9(Z&(`Q>;TtuZ(L8H-trfFz4o48#rp|@W|Jn2tO
zI|*#XTDimk;N|P59^2N&IzF32o*FPs6SZ26b9_!u-U#f7q22{|hryi6Zv|M{9z-IM
za3LIkprEZ1`dzTKvF>+{#bDbuD5Y&r!(Rh<y9N#b^7%YVrBa}j!nSSHYBesO&mZc?
z;>bVC{{uw+F)>Zkr?YLltv-x|{v^w0a_&N1-$5*vz~+zdoOtFe+ui+zbh^h~TUWn^
zK8m4sAe+gto}ONhPS<w;08a2$dp46}VIe{R5JEr*>Dt~&egn7DC-_bi72E&-002ov
zPDHLkV1lB>`HuKT4Ole<%t&wOna&<YEX`prAVOmwBP3IB+|pbeA^*?+jQ)?W*$1l|
zrY0vDP-K8^ZwV-sN<x3GDS)b*!QYd^;ef`52I&7h%p|E)lp%Y&a31*4-_IB;Dxj#S
z2rL~PL|H`jV{xP-ALUSf&Hv4nK9hqD!QH(Wc0?5_EiI)i7E4s#sVpTaM%ptg{|)~N
ZFaTuFr?gCTZkYf8002ovPDHLkV1gOm#UTIy

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json b/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json
index a7534b9ee5b..c6f636f987a 100644
--- a/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "made by Floofers",
+  "copyright": "all unless stated made by Floofers, adminassistant made by noctyrnal (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -45,6 +45,9 @@
     },
     {
       "name": "mobster"
+    },
+    {
+        "name": "adminassistant"
     }
   ]
 }
diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json
index 176af077199..e44e6b00307 100644
--- a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d | pda-corpsman from yogstation at  https://github.com/yogstation13/Yogstation/commit/a75671b22476ed8e117229f38501b9b63f8d6bc1 | pda-martialartist by Floofers | pda-chiefjustice and pda-clerk by leonardo_dabepis (Discord) | pda-prosecutor by Timemaster99 (Discord)",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d | pda-corpsman from yogstation at  https://github.com/yogstation13/Yogstation/commit/a75671b22476ed8e117229f38501b9b63f8d6bc1 | pda-martialartist by Floofers | pda-chiefjustice and pda-clerk by leonardo_dabepis (Discord) | pda-prosecutor by Timemaster99 (Discord) | admin assistant by Radezolid",
   "size": {
     "x": 32,
     "y": 32
@@ -42,4 +42,4 @@
       "name": "pda-prosecutor"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-admin-assistant.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-admin-assistant.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd0e59677210b63b7ccce94cdb2e1b5e98e12c7f
GIT binary patch
literal 518
zcmV+h0{Q)kP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80005aNkl<ZScUD^
zJx{_w7{KvA#+XQ`rY;y_h^7u0!ekuO#LZDgCI?49195cm8)#e{9E>BnF&g8<C^9H9
z#GnjFw17m1I$#N4dwploXSt{C_3qd9?sA3y`0Ei8U5vyOP0uH1W`zxHFI@w0dbi%o
zkFON~n$-u>e#Wgjk1lTtJJw@$r2#;$lj_Sis1@==Vv1&lFqK7OiWXhoq<(b<Kq8T#
z-EO0*Dgcc}x0850j;gBW$C)hU%OlgbFlOuVfKsVMI2=ZjBmiVt2B1=@AW4$xu~irX
zG)>ctzPVe3X#5xgip8So4NehOVF*Yjlfv2I1mOx`C+s2u1NepT1h9h$9AJeQ2|$Dx
z8Ne;VSAY@1Gr;bvbc?VAIGNK%2+shg3(GLVGeDMQPYBO|pb@slK#&Ma!0^2G8(|4B
zT3q}@*ct;tB0TL0{Xm#*%RgRUm|92?&t!Y&+CQaaP#!Fv0I+|*!(LzBdM@+v`r;g*
zN9(x^K>Fg4IbaHS2cCf3)^4xfO{2SyY<0>5d8b|#wl4(K3VEjIlK`BrrGHoGYy2zP
zEj#t<K>qf4>kiPYK7=AMMbjIw`ZcRfbj#28dN0@S75$oh1H69p^rHWg0000007*qo
IM6N<$f?E6KyZ`_I

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json
index 5e2c34d5304..6a76e9403d4 100644
--- a/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json
@@ -1,14 +1,17 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432 | modified by Floofers. Stamp icon taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93, modified by leonardo_dabepis (Discord)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "folder-hop-ian"
-    }
-  ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432 | modified by Floofers. Stamp icon taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93, modified by leonardo_dabepis (Discord), paper_stamp-admin-assistant by noctyrnal (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "folder-hop-ian"
+        },
+        {
+            "name": "paper_stamp-admin-assistant"
+        }
+    ]
 }
diff --git a/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/paper_stamp-admin-assistant.png b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/paper_stamp-admin-assistant.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd882ce160223f233bb86c8586502196c09bfb35
GIT binary patch
literal 227
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNC^*&A
z#W5tJ_3gEdf-MRHtO5IYBN`Oj+{_wEC5r#XFq$RvFKH7?V7;HgdxkH+pyc1VHx5Vk
z{bXdA^zPiMyt#S}3``sf4GiH741Ia+{JHTw2~V9<?v|WupYe5FJkt+>oo9r%neNPC
zIl1PW;wJh1TNZBnSH)LU@50dcW4r0j)OiUFN}LgMll7+^*#Bzhcd%&(vKg!yn~ymh
TeOxsG=s*TfS3j3^P6<r_%o|ZK

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idadminassistant.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idadminassistant.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b51c9fac27bbb72b7dd833e130f0526b111a294
GIT binary patch
literal 301
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND0tt~
z#W5tJHTlo~|MrI+n3geat-Zpym`|egzzSvw35ke~z#}J4oH(#H?fd*jAc*vu{qX(f
z)jS{&pD&wqWO@ILplKTH1*>oV6)*5{=U8$3z*~hU9IGrEBE6(r|EIW#FoVGU$AWBa
z(d`-==kG9K;4Vrzeer1KD~6nDr&Dwm-zZun%h1g<W2u3ZZC1v!hW+Q)9jfhrQ=H|(
zsB9S7I_>6!4E71k9fs8zQ(D|UhW<bMC)va3$CYEMAV;t?_r1_C=vuF|@@rLIqI6+e
n|F$l7S%X&%f$TjM><kPNhCzqcRBmwxdX>S`)z4*}Q$iB}kyLTO

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json
new file mode 100644
index 00000000000..14db9866c0a
--- /dev/null
+++ b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e, idadminassistant by noctyrnal (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "idadminassistant"
+        }
+    ]
+}
diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json
index d17e01e8bd9..da46cba07a2 100644
--- a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Stamp sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93, modified by Guess-My-Name. CJ stamp modified by Timemaster99 (Discord)",
+    "copyright": "Stamp sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93, modified by Guess-My-Name. CJ stamp modified by Timemaster99 (Discord), stamp-admin-assistant by noctyrnal (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -18,6 +18,9 @@
         },
         {
             "name": "stamp-cj"
+        },
+        {
+            "name": "stamp-admin-assistant"
         }
     ]
 }
diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-admin-assistant.png b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-admin-assistant.png
new file mode 100644
index 0000000000000000000000000000000000000000..1dc32cfafea1c60f77ad4660e37df04cbaf2b097
GIT binary patch
literal 340
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DX&fq{|D
z)5S3)qV?@H!>q#wBF8@d*S@=_MCgdO)o-Dhm!vDS756$<bv@&GIl<4;$ye{e$;k_&
z_uP13xoiqw{B{RTNfoa<O>!9%94_&D`cLvqI<rHn^czP<0}$<J*unR<qWb%alu3pq
zrtR0&xy3v_>0SQmb^2}K?N81?63AA3?7?-rDP<DlhWg)s!uUHC4qUi8<tSgnrW=MO
zU!O9hEn5~bUrlz`tYs0&X^!uAT~{<Qep=~w|GUhCEnJ&#@;sMGQ}c{t|5U$hVKJXO
z^LySq3_DIUu3Dw!ds+T%?(H_tnj*949F{q{H<KRM%FlSe{L8~si`x%>+I`$7xR-Ii
j?BaAs78eH=mjmKGeIFP~TE%jK!NlO{>gTe~DWM4f2zZVN

literal 0
HcmV?d00001


From 54583f5119068c243cc1dfa12d6c08559cd38df7 Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Fri, 13 Dec 2024 09:09:48 +0000
Subject: [PATCH 326/366] add mining points (#2419)

* add mining points

* add claim points button to oreproc

* funny

* its over

* :trollface:

* xml fail

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>

---------

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 .../Lathe/UI/LatheBoundUserInterface.cs       |   3 +
 Content.Client/Lathe/UI/LatheMenu.xaml        |   6 +
 Content.Client/Lathe/UI/LatheMenu.xaml.cs     |  53 ++++++++
 .../Components/MiningPointsComponent.cs       |  26 ++++
 .../Components/MiningPointsLatheComponent.cs  |   9 ++
 .../DeltaV/Salvage/MiningPointsUI.cs          |   9 ++
 .../Salvage/Systems/MiningPointsSystem.cs     | 121 ++++++++++++++++++
 .../Prototypes/LatheRecipePrototype.cs        |   7 +
 .../en-US/deltav/lathe/ui/lathe-menu.ftl      |   2 +
 .../Objects/Misc/identification_cards.yml     |   1 +
 .../Entities/Structures/Machines/lathe.yml    |   5 +
 Resources/Prototypes/Recipes/Lathes/sheet.yml |  66 ++++++++++
 12 files changed, 308 insertions(+)
 create mode 100644 Content.Shared/DeltaV/Salvage/Components/MiningPointsComponent.cs
 create mode 100644 Content.Shared/DeltaV/Salvage/Components/MiningPointsLatheComponent.cs
 create mode 100644 Content.Shared/DeltaV/Salvage/MiningPointsUI.cs
 create mode 100644 Content.Shared/DeltaV/Salvage/Systems/MiningPointsSystem.cs
 create mode 100644 Resources/Locale/en-US/deltav/lathe/ui/lathe-menu.ftl

diff --git a/Content.Client/Lathe/UI/LatheBoundUserInterface.cs b/Content.Client/Lathe/UI/LatheBoundUserInterface.cs
index a599f79152e..66f09aa41da 100644
--- a/Content.Client/Lathe/UI/LatheBoundUserInterface.cs
+++ b/Content.Client/Lathe/UI/LatheBoundUserInterface.cs
@@ -1,3 +1,4 @@
+using Content.Shared.DeltaV.Salvage; // DeltaV
 using Content.Shared.Lathe;
 using Content.Shared.Research.Components;
 using JetBrains.Annotations;
@@ -31,6 +32,8 @@ protected override void Open()
             {
                 SendMessage(new LatheQueueRecipeMessage(recipe, amount));
             };
+
+            _menu.OnClaimMiningPoints += () => SendMessage(new LatheClaimMiningPointsMessage()); // DeltaV
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml b/Content.Client/Lathe/UI/LatheMenu.xaml
index 5b21f0bae66..d84449ce43e 100644
--- a/Content.Client/Lathe/UI/LatheMenu.xaml
+++ b/Content.Client/Lathe/UI/LatheMenu.xaml
@@ -132,6 +132,12 @@
                 HorizontalExpand="True">
                 <ui:MaterialStorageControl Name="MaterialsList" SizeFlagsStretchRatio="8"/>
             </BoxContainer>
+            <!-- Begin DeltaV Additions: Mining points -->
+            <BoxContainer Orientation="Horizontal" Name="MiningPointsContainer" Visible="False">
+                <Label Name="MiningPointsLabel" HorizontalExpand="True"/>
+                <Button Name="MiningPointsClaimButton" Text="{Loc 'lathe-menu-mining-points-claim-button'}"/>
+            </BoxContainer>
+            <!-- End DeltaV Additions: Mining points -->
         </BoxContainer>
         </BoxContainer>
 
diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml.cs b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
index 4d21b81b2e3..a572fd507e0 100644
--- a/Content.Client/Lathe/UI/LatheMenu.xaml.cs
+++ b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
@@ -1,16 +1,20 @@
 using System.Linq;
 using System.Text;
 using Content.Client.Materials;
+using Content.Shared.DeltaV.Salvage.Components; // DeltaV
+using Content.Shared.DeltaV.Salvage.Systems; // DeltaV
 using Content.Shared.Lathe;
 using Content.Shared.Lathe.Prototypes;
 using Content.Shared.Research.Prototypes;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
+using Robust.Client.Player; // DeltaV
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Timing; // DeltaV
 
 namespace Content.Client.Lathe.UI;
 
@@ -18,14 +22,17 @@ namespace Content.Client.Lathe.UI;
 public sealed partial class LatheMenu : DefaultWindow
 {
     [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly IPlayerManager _player = default!; // DeltaV
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
     private readonly SpriteSystem _spriteSystem;
     private readonly LatheSystem _lathe;
     private readonly MaterialStorageSystem _materialStorage;
+    private readonly MiningPointsSystem _miningPoints; // DeltaV
 
     public event Action<BaseButton.ButtonEventArgs>? OnServerListButtonPressed;
     public event Action<string, int>? RecipeQueueAction;
+    public event Action? OnClaimMiningPoints; // DeltaV
 
     public List<ProtoId<LatheRecipePrototype>> Recipes = new();
 
@@ -35,6 +42,8 @@ public sealed partial class LatheMenu : DefaultWindow
 
     public EntityUid Entity;
 
+    private uint? _lastMiningPoints; // DeltaV: used to avoid Loc.GetString every frame
+
     public LatheMenu()
     {
         RobustXamlLoader.Load(this);
@@ -43,6 +52,7 @@ public LatheMenu()
         _spriteSystem = _entityManager.System<SpriteSystem>();
         _lathe = _entityManager.System<LatheSystem>();
         _materialStorage = _entityManager.System<MaterialStorageSystem>();
+        _miningPoints = _entityManager.System<MiningPointsSystem>(); // DeltaV
 
         SearchBar.OnTextChanged += _ =>
         {
@@ -70,9 +80,52 @@ public void SetEntity(EntityUid uid)
             }
         }
 
+        // Begin DeltaV Additions: Mining points UI
+        MiningPointsContainer.Visible = _entityManager.TryGetComponent<MiningPointsComponent>(Entity, out var points);
+        MiningPointsClaimButton.OnPressed += _ => OnClaimMiningPoints?.Invoke();
+        if (points != null)
+            UpdateMiningPoints(points.Points);
+        // End DeltaV Additions
+
         MaterialsList.SetOwner(Entity);
     }
 
+    /// <summary>
+    /// DeltaV: Updates the UI elements for mining points.
+    /// </summary>
+    private void UpdateMiningPoints(uint points)
+    {
+        MiningPointsClaimButton.Disabled = points == 0 ||
+            _player.LocalSession?.AttachedEntity is not {} player ||
+            _miningPoints.TryFindIdCard(player) == null;
+        if (points == _lastMiningPoints)
+            return;
+
+        _lastMiningPoints = points;
+        MiningPointsLabel.Text = Loc.GetString("lathe-menu-mining-points", ("points", points));
+    }
+
+    protected override void Opened()
+    {
+        base.Opened();
+
+        if (_entityManager.TryGetComponent<LatheComponent>(Entity, out var latheComp))
+        {
+            AmountLineEdit.SetText(latheComp.DefaultProductionAmount.ToString());
+        }
+    }
+
+    /// <summary>
+    /// DeltaV: Update mining points UI whenever it changes.
+    /// </summary>
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+
+        if (_entityManager.TryGetComponent<MiningPointsComponent>(Entity, out var points))
+            UpdateMiningPoints(points.Points);
+    }
+
     /// <summary>
     /// Populates the list of all the recipes
     /// </summary>
diff --git a/Content.Shared/DeltaV/Salvage/Components/MiningPointsComponent.cs b/Content.Shared/DeltaV/Salvage/Components/MiningPointsComponent.cs
new file mode 100644
index 00000000000..33ea80280f8
--- /dev/null
+++ b/Content.Shared/DeltaV/Salvage/Components/MiningPointsComponent.cs
@@ -0,0 +1,26 @@
+using Content.Shared.DeltaV.Salvage.Systems;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.DeltaV.Salvage.Components;
+
+/// <summary>
+/// Stores mining points for a holder, such as an ID card or ore processor.
+/// Mining points are gained by smelting ore and redeeming them to your ID card.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(MiningPointsSystem))]
+[AutoGenerateComponentState]
+public sealed partial class MiningPointsComponent : Component
+{
+    /// <summary>
+    /// The number of points stored.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public uint Points;
+
+    /// <summary>
+    /// Sound played when successfully transferring points to another holder.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier? TransferSound;
+}
diff --git a/Content.Shared/DeltaV/Salvage/Components/MiningPointsLatheComponent.cs b/Content.Shared/DeltaV/Salvage/Components/MiningPointsLatheComponent.cs
new file mode 100644
index 00000000000..fb7616e5149
--- /dev/null
+++ b/Content.Shared/DeltaV/Salvage/Components/MiningPointsLatheComponent.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.DeltaV.Salvage.Components;
+
+/// <summary>
+/// Adds points to <see cref="MiningPointsComponent"/> when making a recipe that has miningPoints set.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class MiningPointsLatheComponent : Component;
diff --git a/Content.Shared/DeltaV/Salvage/MiningPointsUI.cs b/Content.Shared/DeltaV/Salvage/MiningPointsUI.cs
new file mode 100644
index 00000000000..c101fa0c712
--- /dev/null
+++ b/Content.Shared/DeltaV/Salvage/MiningPointsUI.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.DeltaV.Salvage;
+
+/// <summary>
+/// Message for a lathe to transfer its mining points to the user's id card.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class LatheClaimMiningPointsMessage : BoundUserInterfaceMessage;
diff --git a/Content.Shared/DeltaV/Salvage/Systems/MiningPointsSystem.cs b/Content.Shared/DeltaV/Salvage/Systems/MiningPointsSystem.cs
new file mode 100644
index 00000000000..33dca3ee019
--- /dev/null
+++ b/Content.Shared/DeltaV/Salvage/Systems/MiningPointsSystem.cs
@@ -0,0 +1,121 @@
+using Content.Shared.Access.Systems;
+using Content.Shared.DeltaV.Salvage.Components;
+using Content.Shared.Lathe;
+using Robust.Shared.Audio.Systems;
+
+namespace Content.Shared.DeltaV.Salvage.Systems;
+
+public sealed class MiningPointsSystem : EntitySystem
+{
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedIdCardSystem _idCard = default!;
+
+    private EntityQuery<MiningPointsComponent> _query;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _query = GetEntityQuery<MiningPointsComponent>();
+
+        SubscribeLocalEvent<MiningPointsLatheComponent, LatheStartPrintingEvent>(OnStartPrinting);
+        Subs.BuiEvents<MiningPointsLatheComponent>(LatheUiKey.Key, subs =>
+        {
+            subs.Event<LatheClaimMiningPointsMessage>(OnClaimMiningPoints);
+        });
+    }
+
+    #region Event Handlers
+
+    private void OnStartPrinting(Entity<MiningPointsLatheComponent> ent, ref LatheStartPrintingEvent args)
+    {
+        var points = args.Recipe.MiningPoints;
+        if (points > 0)
+            AddPoints(ent.Owner, points);
+    }
+
+    private void OnClaimMiningPoints(Entity<MiningPointsLatheComponent> ent, ref LatheClaimMiningPointsMessage args)
+    {
+        var user = args.Actor;
+        if (TryFindIdCard(user) is {} dest)
+            TransferAll(ent.Owner, dest);
+    }
+
+    #endregion
+    #region Public API
+
+    /// <summary>
+    /// Tries to find the user's id card and gets its <see cref="MiningPointsComponent"/>.
+    /// </summary>
+    /// <remarks>
+    /// Component is nullable for easy usage with the API due to Entity&lt;T&gt; not being usable for Entity&lt;T?&gt; arguments.
+    /// </remarks>
+    public Entity<MiningPointsComponent?>? TryFindIdCard(EntityUid user)
+    {
+        if (!_idCard.TryFindIdCard(user, out var idCard))
+            return null;
+
+        if (!_query.TryComp(idCard, out var comp))
+            return null;
+
+        return (idCard, comp);
+    }
+
+    /// <summary>
+    /// Removes points from a holder, returning true if it succeeded.
+    /// </summary>
+    public bool RemovePoints(Entity<MiningPointsComponent?> ent, uint amount)
+    {
+        if (!_query.Resolve(ent, ref ent.Comp) || amount > ent.Comp.Points)
+            return false;
+
+        ent.Comp.Points -= amount;
+        Dirty(ent);
+        return true;
+    }
+
+    /// <summary>
+    /// Add points to a holder.
+    /// </summary>
+    public bool AddPoints(Entity<MiningPointsComponent?> ent, uint amount)
+    {
+        if (!_query.Resolve(ent, ref ent.Comp))
+            return false;
+
+        ent.Comp.Points += amount;
+        Dirty(ent);
+        return true;
+    }
+
+    /// <summary>
+    /// Transfer a number of points from source to destination.
+    /// Returns true if the transfer succeeded.
+    /// </summary>
+    public bool Transfer(Entity<MiningPointsComponent?> src, Entity<MiningPointsComponent?> dest, uint amount)
+    {
+        // don't make a sound or anything
+        if (amount == 0)
+            return true;
+
+        if (!_query.Resolve(src, ref src.Comp) || !_query.Resolve(dest, ref dest.Comp))
+            return false;
+
+        if (!RemovePoints(src, amount))
+            return false;
+
+        AddPoints(dest, amount);
+        _audio.PlayPvs(src.Comp.TransferSound, src);
+        return true;
+    }
+
+    /// <summary>
+    /// Transfers all points from source to destination.
+    /// Returns true if the transfer succeeded.
+    /// </summary>
+    public bool TransferAll(Entity<MiningPointsComponent?> src, Entity<MiningPointsComponent?> dest)
+    {
+        return _query.Resolve(src, ref src.Comp) && Transfer(src, dest, src.Comp.Points);
+    }
+
+    #endregion
+}
diff --git a/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs b/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs
index 40c20df3437..10a0c7209da 100644
--- a/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs
+++ b/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs
@@ -60,5 +60,12 @@ public sealed partial class LatheRecipePrototype : IPrototype
         /// </summary>
         [DataField]
         public ProtoId<LatheCategoryPrototype>? Category;
+
+        /// <summary>
+        /// DeltaV: Number of mining points this recipe adds to an oreproc when printed.
+        /// Scales with stack count.
+        /// </summary>
+        [DataField]
+        public uint MiningPoints;
     }
 }
diff --git a/Resources/Locale/en-US/deltav/lathe/ui/lathe-menu.ftl b/Resources/Locale/en-US/deltav/lathe/ui/lathe-menu.ftl
new file mode 100644
index 00000000000..9f43b363f13
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/lathe/ui/lathe-menu.ftl
@@ -0,0 +1,2 @@
+lathe-menu-mining-points = Mining Points: {$points}
+lathe-menu-mining-points-claim-button = Claim Points
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index 182570310a2..89cd8abb924 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -25,6 +25,7 @@
   - type: StealTarget
     stealGroup: IDCard
   - type: NanoChatCard # DeltaV
+  - type: MiningPoints # DeltaV
 
 #IDs with layers
 
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index f3ae42f35fd..31d5bf28fad 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -1320,6 +1320,10 @@
     - type: MaterialStorageMagnetPickup # Delta V - Summary: Adds magnet pull from Frontier
       magnetEnabled: True
       range: 0.30 # Delta V - End Magnet Pull
+    - type: MiningPoints # DeltaV - Source of mining points for miners
+      transferSound:
+        path: /Audio/Effects/Cargo/ping.ogg
+    - type: MiningPointsLathe # DeltaV
 
 - type: entity
   parent: OreProcessor
@@ -1350,6 +1354,7 @@
       - IngotGold30
       - IngotSilver30
       - MaterialBananium10
+      - MaterialDiamond
 
 - type: entity
   parent: BaseLathe
diff --git a/Resources/Prototypes/Recipes/Lathes/sheet.yml b/Resources/Prototypes/Recipes/Lathes/sheet.yml
index f6cfad8d24c..79e490d062e 100644
--- a/Resources/Prototypes/Recipes/Lathes/sheet.yml
+++ b/Resources/Prototypes/Recipes/Lathes/sheet.yml
@@ -3,6 +3,7 @@
   result: SheetSteel1
   applyMaterialDiscount: false
   completetime: 2
+  miningPoints: 1
   materials:
     RawIron: 100
 
@@ -19,6 +20,7 @@
   result: SheetGlass1
   applyMaterialDiscount: false
   completetime: 2
+  miningPoints: 1
   materials:
     RawQuartz: 100
 
@@ -34,6 +36,7 @@
   result: SheetRGlass1
   applyMaterialDiscount: false
   completetime: 2
+  miningPoints: 1
   materials:
     Glass: 100
     Steel: 50
@@ -47,6 +50,15 @@
     RawIron: 1500
     Coal: 500
 
+- type: latheRecipe
+  id: SheetPGlass1
+  result: SheetPGlass1
+  completetime: 2
+  miningPoints: 16
+  materials:
+    RawQuartz: 100
+    RawPlasma: 100
+
 - type: latheRecipe
   id: SheetPGlass30
   result: SheetPGlass
@@ -55,6 +67,17 @@
     RawQuartz: 3000
     RawPlasma: 3000
 
+- type: latheRecipe
+  id: SheetRPGlass1
+  result: SheetRPGlass1
+  completetime: 2
+  miningPoints: 16
+  materials:
+    RawQuartz: 100
+    RawPlasma: 100
+    RawIron: 50
+    Coal: 15
+
 - type: latheRecipe
   id: SheetRPGlass30
   result: SheetRPGlass
@@ -65,6 +88,14 @@
     RawIron: 1500
     Coal: 500
 
+- type: latheRecipe
+  id: SheetPlasma1
+  result: SheetPlasma1
+  completetime: 2
+  miningPoints: 15
+  materials:
+    RawPlasma: 100
+
 - type: latheRecipe
   id: SheetPlasma30
   result: SheetPlasma
@@ -72,6 +103,16 @@
   materials:
     RawPlasma: 3000
 
+- type: latheRecipe
+  id: SheetPlasteel1
+  result: SheetPlasteel1
+  completetime: 2
+  miningPoints: 17
+  materials:
+    RawPlasma: 100
+    RawIron: 200 #Twice as durable as steel, Twice the material cost
+    Coal: 30
+
 - type: latheRecipe
   id: SheetPlasteel30
   result: SheetPlasteel
@@ -88,6 +129,15 @@
   materials:
     RawUranium: 3000
 
+- type: latheRecipe
+  id: SheetUGlass1
+  result: SheetUGlass1
+  completetime: 2
+  miningPoints: 31
+  materials:
+    RawUranium: 100
+    RawQuartz: 100
+
 - type: latheRecipe
   id: SheetUGlass30
   result: SheetUGlass
@@ -96,6 +146,17 @@
     RawUranium: 3000
     RawQuartz: 3000
 
+- type: latheRecipe
+  id: SheetRUGlass1
+  result: SheetRUGlass1
+  completetime: 2
+  miningPoints: 31
+  materials:
+    RawUranium: 100
+    RawQuartz: 100
+    RawIron: 50
+    Coal: 15
+
 - type: latheRecipe
   id: SheetRUGlass30
   result: SheetRUGlass
@@ -131,6 +192,7 @@
   id: MaterialDiamond
   result: MaterialDiamond1
   completetime: 3
+  miningPoints: 50
   materials:
     RawDiamond: 1000
 
@@ -138,6 +200,7 @@
   id: SheetUranium1
   result: SheetUranium1
   completetime: 2
+  miningPoints: 30
   materials:
     RawUranium: 500
 
@@ -145,6 +208,7 @@
   id: IngotGold1
   result: IngotGold1
   completetime: 2
+  miningPoints: 18
   materials:
     RawGold: 500
 
@@ -152,6 +216,7 @@
   id: IngotSilver1
   result: IngotSilver1
   completetime: 2
+  miningPoints: 16 # DeltaV
   materials:
     RawSilver: 500
 
@@ -167,6 +232,7 @@
   id: MaterialBananium1
   result: MaterialBananium1
   completetime: 2
+  miningPoints: 60
   materials:
     RawBananium: 500
 

From 3db9e75d302c0dc0261498cce10c36e9d7d2fe51 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sat, 17 Aug 2024 01:12:55 -0400
Subject: [PATCH 327/366] Add space debris to salvage magnet (#31113)

* add space debris to salvage magnet

* multiplication

* necessary mercy for NPCs

* back and forth on mercy
---
 Content.Client/Lathe/UI/LatheMenu.xaml.cs     | 10 ++++
 Content.Server/Lathe/LatheSystem.cs           |  9 +++-
 Content.Shared/Lathe/LatheComponent.cs        |  6 +++
 Content.Shared/Stacks/SharedStackSystem.cs    |  3 ++
 .../Entities/Structures/Machines/lathe.yml    | 47 ++++++++++---------
 Resources/Prototypes/Recipes/Lathes/sheet.yml | 41 +++++++++-------
 6 files changed, 73 insertions(+), 43 deletions(-)

diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml.cs b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
index a572fd507e0..509647ff08d 100644
--- a/Content.Client/Lathe/UI/LatheMenu.xaml.cs
+++ b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
@@ -90,6 +90,16 @@ public void SetEntity(EntityUid uid)
         MaterialsList.SetOwner(Entity);
     }
 
+    protected override void Opened()
+    {
+        base.Opened();
+
+        if (_entityManager.TryGetComponent<LatheComponent>(Entity, out var latheComp))
+        {
+            AmountLineEdit.SetText(latheComp.DefaultProductionAmount.ToString());
+        }
+    }
+
     /// <summary>
     /// DeltaV: Updates the UI elements for mining points.
     /// </summary>
diff --git a/Content.Server/Lathe/LatheSystem.cs b/Content.Server/Lathe/LatheSystem.cs
index 74eed70d040..dd5910cb0d0 100644
--- a/Content.Server/Lathe/LatheSystem.cs
+++ b/Content.Server/Lathe/LatheSystem.cs
@@ -198,11 +198,11 @@ public bool TryStartProducing(EntityUid uid, LatheComponent? component = null)
             var recipe = component.Queue.First();
             component.Queue.RemoveAt(0);
 
-            var time = _reagentSpeed.ApplySpeed(uid, recipe.CompleteTime);
+            var time = _reagentSpeed.ApplySpeed(uid, recipe.CompleteTime) * component.TimeMultiplier;
 
             var lathe = EnsureComp<LatheProducingComponent>(uid);
             lathe.StartTime = _timing.CurTime;
-            lathe.ProductionLength = time * component.TimeMultiplier;
+            lathe.ProductionLength = time;
             component.CurrentRecipe = recipe;
 
             var ev = new LatheStartPrintingEvent(recipe);
@@ -211,6 +211,11 @@ public bool TryStartProducing(EntityUid uid, LatheComponent? component = null)
             _audio.PlayPvs(component.ProducingSound, uid);
             UpdateRunningAppearance(uid, true);
             UpdateUserInterfaceState(uid, component);
+
+            if (time == TimeSpan.Zero)
+            {
+                FinishProducing(uid, component, lathe);
+            }
             return true;
         }
 
diff --git a/Content.Shared/Lathe/LatheComponent.cs b/Content.Shared/Lathe/LatheComponent.cs
index 505ceb69569..ab3d59b6423 100644
--- a/Content.Shared/Lathe/LatheComponent.cs
+++ b/Content.Shared/Lathe/LatheComponent.cs
@@ -36,6 +36,12 @@ public sealed partial class LatheComponent : Component
         [DataField]
         public string? ReagentOutputSlotId;
 
+        /// <summary>
+        /// The default amount that's displayed in the UI for selecting the print amount.
+        /// </summary>
+        [DataField, AutoNetworkedField]
+        public int DefaultProductionAmount = 1;
+
         #region Visualizer info
         [DataField]
         public string? IdleState;
diff --git a/Content.Shared/Stacks/SharedStackSystem.cs b/Content.Shared/Stacks/SharedStackSystem.cs
index e12edd323c7..7fe058afbaa 100644
--- a/Content.Shared/Stacks/SharedStackSystem.cs
+++ b/Content.Shared/Stacks/SharedStackSystem.cs
@@ -223,6 +223,9 @@ public bool TryMergeToContacts(EntityUid uid, StackComponent? stack = null, Tran
             foreach (var otherStack in intersecting)
             {
                 var otherEnt = otherStack.Owner;
+                // if you merge a ton of stacks together, you will end up deleting a few by accident.
+                if (TerminatingOrDeleted(otherEnt) || EntityManager.IsQueuedForDeletion(otherEnt))
+                    continue;
 
                 if (!TryMergeStacks(uid, otherEnt, out _, stack, otherStack))
                     continue;
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 31d5bf28fad..114f0412656 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -1304,19 +1304,20 @@
     - type: Lathe
       idleState: icon
       runningState: building
+      defaultProductionAmount: 10
       staticRecipes:
         - BluespaceCrystal
         - NormalityCrystal
-        - SheetSteel30
-        - SheetGlass30
-        - SheetRGlass30
-        - SheetPlasma30
-        - SheetPGlass30
-        - SheetRPGlass30
-        - SheetUranium30
-        - IngotGold30
-        - IngotSilver30
-        - MaterialBananium10
+        - SheetSteel
+        - SheetGlass1
+        - SheetRGlass
+        - SheetPlasma1
+        - SheetPGlass1
+        - SheetRPGlass1
+        - SheetUranium1
+        - IngotGold1
+        - IngotSilver1
+        - MaterialBananium1
     - type: MaterialStorageMagnetPickup # Delta V - Summary: Adds magnet pull from Frontier
       magnetEnabled: True
       range: 0.30 # Delta V - End Magnet Pull
@@ -1341,19 +1342,19 @@
     staticRecipes:
       - BluespaceCrystal
       - NormalityCrystal
-      - SheetSteel30
-      - SheetGlass30
-      - SheetRGlass30
-      - SheetPlasma30
-      - SheetPGlass30
-      - SheetRPGlass30
-      - SheetPlasteel30
-      - SheetUranium30
-      - SheetUGlass30
-      - SheetRUGlass30
-      - IngotGold30
-      - IngotSilver30
-      - MaterialBananium10
+      - SheetSteel
+      - SheetGlass1
+      - SheetRGlass
+      - SheetPlasma1
+      - SheetPGlass1
+      - SheetRPGlass1
+      - SheetPlasteel1
+      - SheetUranium1
+      - SheetUGlass1
+      - SheetRUGlass1
+      - IngotGold1
+      - IngotSilver1
+      - MaterialBananium1
       - MaterialDiamond
 
 - type: entity
diff --git a/Resources/Prototypes/Recipes/Lathes/sheet.yml b/Resources/Prototypes/Recipes/Lathes/sheet.yml
index 79e490d062e..4af5d0c6db7 100644
--- a/Resources/Prototypes/Recipes/Lathes/sheet.yml
+++ b/Resources/Prototypes/Recipes/Lathes/sheet.yml
@@ -4,8 +4,10 @@
   applyMaterialDiscount: false
   completetime: 2
   miningPoints: 1
+  completetime: 0
   materials:
     RawIron: 100
+    Coal: 30
 
 - type: latheRecipe
   id: SheetSteel30
@@ -21,6 +23,7 @@
   applyMaterialDiscount: false
   completetime: 2
   miningPoints: 1
+  completetime: 0
   materials:
     RawQuartz: 100
 
@@ -37,9 +40,11 @@
   applyMaterialDiscount: false
   completetime: 2
   miningPoints: 1
+  completetime: 0
   materials:
     Glass: 100
     Steel: 50
+    Coal: 15
 
 - type: latheRecipe
   id: SheetRGlass30
@@ -53,7 +58,7 @@
 - type: latheRecipe
   id: SheetPGlass1
   result: SheetPGlass1
-  completetime: 2
+  completetime: 0
   miningPoints: 16
   materials:
     RawQuartz: 100
@@ -70,7 +75,7 @@
 - type: latheRecipe
   id: SheetRPGlass1
   result: SheetRPGlass1
-  completetime: 2
+  completetime: 0
   miningPoints: 16
   materials:
     RawQuartz: 100
@@ -91,7 +96,7 @@
 - type: latheRecipe
   id: SheetPlasma1
   result: SheetPlasma1
-  completetime: 2
+  completetime: 0
   miningPoints: 15
   materials:
     RawPlasma: 100
@@ -106,7 +111,7 @@
 - type: latheRecipe
   id: SheetPlasteel1
   result: SheetPlasteel1
-  completetime: 2
+  completetime: 0
   miningPoints: 17
   materials:
     RawPlasma: 100
@@ -132,7 +137,7 @@
 - type: latheRecipe
   id: SheetUGlass1
   result: SheetUGlass1
-  completetime: 2
+  completetime: 0
   miningPoints: 31
   materials:
     RawUranium: 100
@@ -149,7 +154,7 @@
 - type: latheRecipe
   id: SheetRUGlass1
   result: SheetRUGlass1
-  completetime: 2
+  completetime: 0
   miningPoints: 31
   materials:
     RawUranium: 100
@@ -191,50 +196,50 @@
 - type: latheRecipe
   id: MaterialDiamond
   result: MaterialDiamond1
-  completetime: 3
+  completetime: 0
   miningPoints: 50
   materials:
-    RawDiamond: 1000
+    RawDiamond: 100
 
 - type: latheRecipe
   id: SheetUranium1
   result: SheetUranium1
-  completetime: 2
+  completetime: 0
   miningPoints: 30
   materials:
-    RawUranium: 500
+    RawUranium: 100
 
 - type: latheRecipe
   id: IngotGold1
   result: IngotGold1
-  completetime: 2
+  completetime: 0
   miningPoints: 18
   materials:
-    RawGold: 500
+    RawGold: 100
 
 - type: latheRecipe
   id: IngotSilver1
   result: IngotSilver1
-  completetime: 2
-  miningPoints: 16 # DeltaV
+  completetime: 0
+  miningPoints: 16
   materials:
-    RawSilver: 500
+    RawSilver: 100
 
 - type: latheRecipe
   id: SheetPlastic
   result: SheetPlastic1
   applyMaterialDiscount: false
-  completetime: 2
+  completetime: 0
   materials:
     Plastic: 100
 
 - type: latheRecipe
   id: MaterialBananium1
   result: MaterialBananium1
-  completetime: 2
+  completetime: 0
   miningPoints: 60
   materials:
-    RawBananium: 500
+    RawBananium: 100
 
 - type: latheRecipe
   id: MaterialSheetMeat

From 210d2f2941536911e5fadc1d6ee8ac7bdb7c8e15 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Fri, 27 Dec 2024 20:58:08 -0400
Subject: [PATCH 328/366] as an fyi, last commit is named wrong.


From 007fa576ae1e6e78ff4c25401a013580a3c093ee Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Fri, 27 Dec 2024 21:00:34 -0400
Subject: [PATCH 329/366] fix error

---
 Content.Client/Lathe/UI/LatheMenu.xaml.cs | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml.cs b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
index 509647ff08d..96658996642 100644
--- a/Content.Client/Lathe/UI/LatheMenu.xaml.cs
+++ b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
@@ -115,16 +115,6 @@ private void UpdateMiningPoints(uint points)
         MiningPointsLabel.Text = Loc.GetString("lathe-menu-mining-points", ("points", points));
     }
 
-    protected override void Opened()
-    {
-        base.Opened();
-
-        if (_entityManager.TryGetComponent<LatheComponent>(Entity, out var latheComp))
-        {
-            AmountLineEdit.SetText(latheComp.DefaultProductionAmount.ToString());
-        }
-    }
-
     /// <summary>
     /// DeltaV: Update mining points UI whenever it changes.
     /// </summary>

From f3cfe1f9050e74a7391140a5687baedb49a0aeca Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Fri, 27 Dec 2024 22:25:03 -0400
Subject: [PATCH 330/366] i dunno

---
 .../CrewManifest/CrewManifestSystem.cs        | 21 +-----
 .../VendingMachineComponent.cs                |  2 +-
 .../en-US/cartridge-loader/cartridges.ftl     |  5 ++
 .../Catalog/Fills/Lockers/heads.yml           | 63 +++++++----------
 .../Fills/Items/Backpacks/duffelbag.yml       |  1 -
 .../Inventories/salvage_points.yml            |  2 -
 .../DeltaV/Entities/Objects/Devices/pda.yml   |  8 ++-
 .../Jobs/Command/administrative_assistant.yml | 25 -------
 .../Loadouts/Miscellaneous/wintercoats.yml    | 69 -------------------
 .../Jobs/Command/administrative_assistant.yml | 14 ++--
 .../Structures/Machines/vending_machines.yml  |  2 -
 Resources/Prototypes/Recipes/Lathes/sheet.yml |  3 -
 .../Prototypes/Roles/Jobs/departments.yml     |  1 -
 Resources/Prototypes/Wires/layouts.yml        |  6 +-
 .../Objects/Devices/cartridge.rsi/meta.json   | 20 ++----
 15 files changed, 57 insertions(+), 185 deletions(-)
 delete mode 100644 Resources/Prototypes/DeltaV/Loadouts/Jobs/Command/administrative_assistant.yml
 delete mode 100644 Resources/Prototypes/DeltaV/Loadouts/Miscellaneous/wintercoats.yml

diff --git a/Content.Client/CrewManifest/CrewManifestSystem.cs b/Content.Client/CrewManifest/CrewManifestSystem.cs
index d05acb56802..abf359aad87 100644
--- a/Content.Client/CrewManifest/CrewManifestSystem.cs
+++ b/Content.Client/CrewManifest/CrewManifestSystem.cs
@@ -40,6 +40,7 @@ private void BuildDepartmentLookup()
     {
         _jobDepartmentLookup.Clear();
         _departments.Clear();
+
         foreach (var department in _prototypeManager.EnumeratePrototypes<DepartmentPrototype>())
         {
             _departments.Add(department.ID);
@@ -52,25 +53,9 @@ private void BuildDepartmentLookup()
                     _jobDepartmentLookup.Add(department.Roles[i - 1], departments);
                 }
 
-                departments.Add(department.ID, i);
+                if (department.Roles.Count == i)
+                    departments.Add(department.ID, i);
             }
         }
     }
-
-    public int GetDepartmentOrder(string department, string jobPrototype)
-    {
-        if (!Departments.Contains(department))
-        {
-            return -1;
-        }
-
-        if (!_jobDepartmentLookup.TryGetValue(jobPrototype, out var departments))
-        {
-            return -1;
-        }
-
-        return departments.TryGetValue(department, out var order)
-            ? order
-            : -1;
-    }
 }
diff --git a/Content.Shared/VendingMachines/VendingMachineComponent.cs b/Content.Shared/VendingMachines/VendingMachineComponent.cs
index 23130bb8f39..ab9bdc14f6b 100644
--- a/Content.Shared/VendingMachines/VendingMachineComponent.cs
+++ b/Content.Shared/VendingMachines/VendingMachineComponent.cs
@@ -87,7 +87,7 @@ public sealed partial class VendingMachineComponent : Component
         /// </summary>
         [DataField("soundVend")]
         // Grabbed from: https://github.com/discordia-space/CEV-Eris/blob/f702afa271136d093ddeb415423240a2ceb212f0/sound/machines/vending_drop.ogg
-        public SoundSpecifier SoundVend = new SoundPathSpecifier("/Audio/Machines/machine_vend.ogg")
+        public SoundSpecifier SoundVend = new SoundPathSpecifier("/Audio/SimpleStation14/Machines/machine_vend.ogg")
         {
             Params = new AudioParams
             {
diff --git a/Resources/Locale/en-US/cartridge-loader/cartridges.ftl b/Resources/Locale/en-US/cartridge-loader/cartridges.ftl
index b6b673b12c7..95e3a0114fe 100644
--- a/Resources/Locale/en-US/cartridge-loader/cartridges.ftl
+++ b/Resources/Locale/en-US/cartridge-loader/cartridges.ftl
@@ -20,6 +20,11 @@ log-probe-label-time = Time
 log-probe-label-accessor = Accessed by
 log-probe-label-number = #
 
+glimmer-monitor-program-name = Glimmer Monitor
+glimmer-monitor-current-glimmer = Current Glimmer: {$glimmer}Ψ
+glimmer-monitor-interval = Interval
+glimmer-monitor-sync = Sync
+
 astro-nav-program-name = AstroNav
 
 med-tek-program-name = MedTek
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index ba9386cf940..8061828305b 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -166,46 +166,30 @@
   suffix: Filled, Hardsuit
   parent: LockerChiefMedicalOfficer
   components:
-  - type: EntityTableContainerFill
-    containers:
-      entity_storage: !type:AllSelector
-        children:
-        - !type:NestedSelector
-          tableId: LockerFillChiefEngineerNoHardsuit
-        - !type:NestedSelector
-          tableId: FillChiefEngineerHardsuit
-
-# No hardsuit table
-- type: entityTable
-  id: LockerFillChiefMedicalOfficerNoHardsuit
-  table: !type:AllSelector
-    children:
-    - id: BoxEncryptionKeyMedical
-    - id: ClothingBackpackDuffelSurgeryFilled
-    - id: ClothingCloakCmo
-    - id: ClothingEyesHudMedical
-    - id: ClothingHandsGlovesNitrile
-    - id: ClothingHeadHatBeretCmo
-    - id: ClothingHeadsetAltMedical
-    - id: ClothingMaskSterile
-    - id: DoorRemoteMedical
-    - id: HandheldCrewMonitor
-    - id: Hypospray
-    - id: MedicalTechFabCircuitboard
-    - id: MedkitFilled
-    - id: MedTekCartridge
-    - id: RubberStampCMO
-
-# Hardsuit table, used for suit storage as well
-- type: entityTable
-  id: FillChiefMedicalOfficerHardsuit
-  table: !type:AllSelector
-    children:
-    - id: ClothingMaskBreathMedical
-    - id: ClothingOuterHardsuitMedical
-    - id: OxygenTankFilled
+  - type: StorageFill
+    contents:
+      - id: MedkitFilled
+      - id: ClothingHandsGlovesNitrile
+      - id: ClothingEyesHudMedical
+      - id: ClothingHeadsetAltMedical
+      - id: ClothingBackpackDuffelSurgeryFilled
+      - id: ClothingMaskSterile
+      - id: ClothingHeadHatBeretCmo
+      - id: ClothingOuterHardsuitMedical
+      - id: Hypospray
+      - id: HandheldCrewMonitor
+      - id: DoorRemoteMedical
+      - id: RubberStampCMO
+      - id: RubberStampPsychologist # DeltaV
+      - id: MedicalTechFabCircuitboard
+      - id: MedicalBiofabMachineBoard
+      - id: BoxEncryptionKeyMedical
+      - id: BoxPDAMedical # Delta-V
+      - id: ClothingBeltMilitaryWebbingCMO # DeltaV - add webbing for CMO. ON THIS STATION, IT'S DRIP OR [die], CAPTAIN!
+      - id: CMOIDCard # Delta-V
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
-# No hardsuit locker
 - type: entity
   id: LockerChiefMedicalOfficerFilled
   suffix: Filled
@@ -228,6 +212,7 @@
       - id: BoxPDAMedical # Delta-V
       - id: ClothingBeltMilitaryWebbingCMO # DeltaV - add webbing for CMO. ON THIS STATION, IT'S DRIP OR [die], CAPTAIN!
       - id: CMOIDCard # Delta-V
+      - id: MedTekCartridge # Delta-v
       - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
         prob: 0.3
 
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Backpacks/duffelbag.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Backpacks/duffelbag.yml
index eb0684b396f..f0efd4197a3 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Backpacks/duffelbag.yml
@@ -7,7 +7,6 @@
   - type: StorageFill
     contents:
     - id: ClothingEyesGlassesMeson
-    - id: MineralScanner
     - id: OreBag
     - id: ClothingUniformJumpsuitSalvageSpecialist
     - id: EncryptionKeyCargo
diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml
index c1558ca8e50..8b75b147fab 100644
--- a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml
@@ -33,8 +33,6 @@
     cost: 750
   - id: WeaponProtoKineticAccelerator
     cost: 750
-  - id: AdvancedMineralScanner
-    cost: 800
   # TODO: resonator for 800
   - id: Fulton
     cost: 1000
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
index 8162a2ce5a7..fcb21e50de1 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
@@ -200,4 +200,10 @@
         - Write
   - type: Icon
     sprite: DeltaV/Objects/Devices/pda.rsi
-    state: pda-admin-assistant
\ No newline at end of file
+    state: pda-admin-assistant
+  - type: CartridgeLoader
+    preinstalled:
+      - CrewManifestCartridge
+      - NotekeeperCartridge
+      - NewsReaderCartridge
+      - NanoChatCartridge
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Command/administrative_assistant.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Command/administrative_assistant.yml
deleted file mode 100644
index ec09da21419..00000000000
--- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Command/administrative_assistant.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Jumpsuit
-- type: loadout
-  id: AdminAssistantJumpsuit
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitAdminAssistant
-
-- type: loadout
-  id: AdminAssistantJumpskirt
-  equipment:
-    jumpsuit: ClothingUniformJumpskirtAdminAssistant
-
-- type: loadout
-  id: CorporateJacket
-  equipment:
-    outerClothing: ClothingOuterCorporateJacket
-
-- type: loadout
-  id: AdminAssistantHeadset
-  equipment:
-    ear: ClothingHeadsetAdminAssistant
-
-- type: loadout
-  id: AdminAssistantAltHeadset
-  equipment:
-    ear: ClothingHeadsetAltAdminAssistant
diff --git a/Resources/Prototypes/DeltaV/Loadouts/Miscellaneous/wintercoats.yml b/Resources/Prototypes/DeltaV/Loadouts/Miscellaneous/wintercoats.yml
deleted file mode 100644
index 7e30b355b30..00000000000
--- a/Resources/Prototypes/DeltaV/Loadouts/Miscellaneous/wintercoats.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-- type: loadout
-  id: WinterCoatBrown
-  equipment:
-    outerClothing: ClothingOuterWinterColorBrown
-
-- type: loadout
-  id: WinterCoatBlack
-  equipment:
-    outerClothing: ClothingOuterWinterColorBlack
-
-- type: loadout
-  id: WinterCoatGray
-  equipment:
-    outerClothing: ClothingOuterWinterColorGray
-
-- type: loadout
-  id: WinterCoatWhite
-  equipment:
-    outerClothing: ClothingOuterWinterColorWhite
-
-- type: loadout
-  id: WinterCoatBlue
-  equipment:
-    outerClothing: ClothingOuterWinterColorBlue
-
-- type: loadout
-  id: WinterCoatRed
-  equipment:
-    outerClothing: ClothingOuterWinterColorRed
-
-- type: loadout
-  id: WinterCoatGreen
-  equipment:
-    outerClothing: ClothingOuterWinterColorGreen
-
-- type: loadout
-  id: WinterCoatOrange
-  equipment:
-    outerClothing: ClothingOuterWinterColorOrange
-
-- type: loadout
-  id: WinterCoatYellow
-  equipment:
-    outerClothing: ClothingOuterWinterColorYellow
-
-- type: loadout
-  id: WinterCoatLightBrown
-  equipment:
-    outerClothing: ClothingOuterWinterColorLightBrown
-
-- type: loadout
-  id: WinterCoatPurple
-  equipment:
-    outerClothing: ClothingOuterWinterColorPurple
-
-- type: loadout
-  id: WinterCoat
-  equipment:
-    outerClothing: ClothingOuterWinterCoat
-
-- type: loadout
-  id: WinterCoatLong
-  equipment:
-    outerClothing: ClothingOuterWinterCoatLong
-
-- type: loadout
-  id: WinterCoatPlaid
-  equipment:
-    outerClothing: ClothingOuterWinterCoatPlaid
diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml
index 51ed7b94e9f..1483d646605 100644
--- a/Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml
+++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml
@@ -6,25 +6,25 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Engineering
-      time: 10800 # 3 hours
+      min: 10800 # 3 hours
     - !type:DepartmentTimeRequirement
       department: Logistics
-      time: 10800 # 3 hours
+      min: 10800 # 3 hours
     - !type:DepartmentTimeRequirement
       department: Medical
-      time: 10800 # 3 hours
+      min: 10800 # 3 hours
     - !type:DepartmentTimeRequirement
       department: Civilian
-      time: 10800 # 3 hours
+      min: 10800 # 3 hours
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 10800 # 3 hours
+      min: 10800 # 3 hours
     - !type:DepartmentTimeRequirement
       department: Justice
-      time: 10800 # 3 hours
+      min: 10800 # 3 hours
     - !type:DepartmentTimeRequirement
       department: Epistemics
-      time: 10800 # 3 hours
+      min: 10800 # 3 hours
   startingGear: AdminAssistantGear
   icon: "JobIconAdminAssitant"
   supervisors: job-supervisors-command
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index 3b8a2cf8743..f9e945c8697 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -111,8 +111,6 @@
     understands:
     - TauCetiBasic
     - RobotTalk
-  - type: VendingMachine
-    soundVend: /Audio/SimpleStation14/Machines/machine_vend.ogg
 
 - type: entity
   parent: VendingMachine
diff --git a/Resources/Prototypes/Recipes/Lathes/sheet.yml b/Resources/Prototypes/Recipes/Lathes/sheet.yml
index 4af5d0c6db7..3f2c8f11c2a 100644
--- a/Resources/Prototypes/Recipes/Lathes/sheet.yml
+++ b/Resources/Prototypes/Recipes/Lathes/sheet.yml
@@ -2,7 +2,6 @@
   id: SheetSteel
   result: SheetSteel1
   applyMaterialDiscount: false
-  completetime: 2
   miningPoints: 1
   completetime: 0
   materials:
@@ -21,7 +20,6 @@
   id: SheetGlass1
   result: SheetGlass1
   applyMaterialDiscount: false
-  completetime: 2
   miningPoints: 1
   completetime: 0
   materials:
@@ -38,7 +36,6 @@
   id: SheetRGlass
   result: SheetRGlass1
   applyMaterialDiscount: false
-  completetime: 2
   miningPoints: 1
   completetime: 0
   materials:
diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
index 72f7bf73312..9dca079c504 100644
--- a/Resources/Prototypes/Roles/Jobs/departments.yml
+++ b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -58,7 +58,6 @@
   - ERTSecurity
   - ERTEngineer
   - DeathSquad
-  - StationAi # DeltaV - added for playtime trackers
   - AdministrativeAssistant # Delta V - Administrative Assistant, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Command/admin_assistant.yml
   primary: false
   weight: 100
diff --git a/Resources/Prototypes/Wires/layouts.yml b/Resources/Prototypes/Wires/layouts.yml
index 8aa10812573..9fd6bddc37f 100644
--- a/Resources/Prototypes/Wires/layouts.yml
+++ b/Resources/Prototypes/Wires/layouts.yml
@@ -150,10 +150,10 @@
     - !type:ProceedWireAction
     - !type:BoomWireAction
 
+# TODO: AI
 - type: wireLayout
   id: ShopVendor
   wires:
-  - !type:AiInteractWireAction
+# - !type:AiInteractWireAction
   - !type:PowerWireAction
-  - !type:AccessWireAction
-  - !type:LogWireAction
\ No newline at end of file
+  - !type:AccessWireAction
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json b/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json
index 54886814ea3..d5b9a8df884 100644
--- a/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json
@@ -49,21 +49,12 @@
     {
       "name": "cart-lib"
     },
-    {
-      "name": "cart-log"
-    },
     {
       "name": "cart-m"
     },
-    {
-      "name": "cart-med"
-    },
     {
       "name": "cart-mi"
     },
-    {
-      "name": "cart-nav"
-    },
     {
       "name": "cart-q"
     },
@@ -73,9 +64,6 @@
     {
       "name": "cart-s"
     },
-    {
-      "name": "cart-sec"
-    },
     {
       "name": "cart-tear"
     },
@@ -87,6 +75,12 @@
     },
     {
       "name": "cart-log"
+    },
+    {
+      "name": "cart-nav"
+    },
+    {
+      "name": "cart-med"
     }
   ]
-}
+}
\ No newline at end of file

From 0e9ed5195b6da53d55567fbb6b32f6992f1cfdf7 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Fri, 27 Dec 2024 22:26:04 -0400
Subject: [PATCH 331/366] admin assistant

---
 Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json
index e44e6b00307..02848c30cf2 100644
--- a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json
@@ -40,6 +40,9 @@
     },
     {
       "name": "pda-prosecutor"
+    },
+    {
+      "name": "pda-admin-assistant"
     }
   ]
 }
\ No newline at end of file

From 3fe34da30f2d9febecf21e79ec182121e9d79045 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 28 Dec 2024 07:16:49 -0400
Subject: [PATCH 332/366] fix test fails

---
 Resources/Prototypes/DeltaV/Catalog/Shipyard/civilian.yml | 2 +-
 Resources/Prototypes/Entities/Objects/Devices/pda.yml     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Catalog/Shipyard/civilian.yml b/Resources/Prototypes/DeltaV/Catalog/Shipyard/civilian.yml
index c3a0935e369..4e1a127bdd8 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Shipyard/civilian.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Shipyard/civilian.yml
@@ -36,7 +36,7 @@
   id: Prospector
   name: NT-7 Prospector
   description: A small mining vessel designed to assist salvage operations.
-  price: 20800
+  price: 21000
   path: /Maps/Shuttles/DeltaV/prospector.yml
   categories:
   - Civilian
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 7948f667602..a05e7238ab3 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -1165,7 +1165,8 @@
       - NotekeeperCartridge
       - NewsReaderCartridge
       - MedTekCartridge
-      - WantedListCartridge
+      - CrimeAssistCartridge
+      - SecWatchCartridge
 
 - type: entity
   parent: ERTLeaderPDA

From 8322ccf3aa2b810671c79ce5dc4d6125c265b6ba Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 28 Dec 2024 15:08:54 -0400
Subject: [PATCH 333/366] Use tag to avoid accidentally updates now that it's
 added.

---
 RobustToolbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RobustToolbox b/RobustToolbox
index a2aec44ebbf..e47ba0faea6 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit a2aec44ebbfb75118e24e36488546bbbd80a8608
+Subproject commit e47ba0faea6b1143f4810547b3d617a110bdb6a5

From ad592313a96b68a574466b945da2448101425172 Mon Sep 17 00:00:00 2001
From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Fri, 23 Aug 2024 11:14:38 +0200
Subject: [PATCH 334/366] Add codeword highlighting (#30092)

* Added codeword highlighting

* Updated to support more codeword roles, color is set serverside

* Review feedback

* Change to a Component-based system using SessionSpecific

* Tidied up CanGetState, set Access restrictions on component

* Clean-up

* Makes the injection ignore brackets, restore some codewords, remove "Taste/Touch" from adjectives
---
 Content.Client/Roles/RoleCodewordSystem.cs    |  8 +++
 .../Systems/Chat/ChatUIController.cs          | 18 +++++++
 .../GameTicking/Rules/TraitorRuleSystem.cs    | 14 +++++-
 .../Roles/RoleCodeword/RoleCodewordSystem.cs  |  8 +++
 Content.Shared/Chat/SharedChatSystem.cs       | 13 +++++
 .../RoleCodeword/RoleCodewordComponent.cs     | 37 ++++++++++++++
 .../RoleCodeword/SharedRoleCodewordSystem.cs  | 49 +++++++++++++++++++
 Resources/Prototypes/Datasets/adjectives.yml  |  1 -
 Resources/Prototypes/Datasets/verbs.yml       |  3 +-
 9 files changed, 146 insertions(+), 5 deletions(-)
 create mode 100644 Content.Client/Roles/RoleCodewordSystem.cs
 create mode 100644 Content.Server/Roles/RoleCodeword/RoleCodewordSystem.cs
 create mode 100644 Content.Shared/Roles/RoleCodeword/RoleCodewordComponent.cs
 create mode 100644 Content.Shared/Roles/RoleCodeword/SharedRoleCodewordSystem.cs

diff --git a/Content.Client/Roles/RoleCodewordSystem.cs b/Content.Client/Roles/RoleCodewordSystem.cs
new file mode 100644
index 00000000000..8cc2e93099f
--- /dev/null
+++ b/Content.Client/Roles/RoleCodewordSystem.cs
@@ -0,0 +1,8 @@
+using Content.Shared.Roles.RoleCodeword;
+
+namespace Content.Client.Roles;
+
+public sealed class RoleCodewordSystem : SharedRoleCodewordSystem
+{
+
+}
diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
index 4bfea889a10..dd8aeee9f54 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -9,6 +9,8 @@
 using Content.Client.Examine;
 using Content.Client.Gameplay;
 using Content.Client.Ghost;
+using Content.Client.Mind;
+using Content.Client.Roles;
 using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Screens;
 using Content.Client.UserInterface.Systems.Chat.Widgets;
@@ -21,6 +23,7 @@
 using Content.Shared.Examine;
 using Content.Shared.Input;
 using Content.Shared.Radio;
+using Content.Shared.Roles.RoleCodeword;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
@@ -62,6 +65,8 @@ public sealed class ChatUIController : UIController
     [UISystemDependency] private readonly ChatSystem? _chatSys = default;
     [UISystemDependency] private readonly PsionicChatUpdateSystem? _psionic = default!; //Nyano - Summary: makes the psionic chat available.
     [UISystemDependency] private readonly TransformSystem? _transform = default;
+    [UISystemDependency] private readonly MindSystem? _mindSystem = default!;
+    [UISystemDependency] private readonly RoleCodewordSystem? _roleCodewordSystem = default!;
 
     [ValidatePrototypeId<ColorPalettePrototype>]
     private const string ChatNamePalette = "ChatNames";
@@ -833,6 +838,19 @@ public void ProcessChatMessage(ChatMessage msg, bool speechBubble = true)
                 msg.WrappedMessage = SharedChatSystem.InjectTagInsideTag(msg, "Name", "color", GetNameColor(SharedChatSystem.GetStringInsideTag(msg, "Name")));
         }
 
+        // Color any codewords for minds that have roles that use them
+        if (_player.LocalUser != null && _mindSystem != null && _roleCodewordSystem != null)
+        {
+            if (_mindSystem.TryGetMind(_player.LocalUser.Value, out var mindId) && _ent.TryGetComponent(mindId, out RoleCodewordComponent? codewordComp))
+            {
+                foreach (var (_, codewordData) in codewordComp.RoleCodewords)
+                {
+                    foreach (string codeword in codewordData.Codewords)
+                        msg.WrappedMessage = SharedChatSystem.InjectTagAroundString(msg, codeword, "color", codewordData.Color.ToHex());
+                }
+            }
+        }
+
         // Log all incoming chat to repopulate when filter is un-toggled
         if (!msg.HideChat)
         {
diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
index f50868e2f5f..51545c6ce50 100644
--- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
@@ -12,8 +12,10 @@
 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;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using System.Linq;
@@ -25,6 +27,8 @@ 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!;
@@ -34,6 +38,7 @@ public sealed class TraitorRuleSystem : GameRuleSystem<TraitorRuleComponent>
     [Dependency] private readonly SharedRoleSystem _roleSystem = default!;
     [Dependency] private readonly SharedJobSystem _jobs = default!;
     [Dependency] private readonly ObjectivesSystem _objectives = default!;
+    [Dependency] private readonly SharedRoleCodewordSystem _roleCodewordSystem = default!;
 
     public override void Initialize()
     {
@@ -120,12 +125,17 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component)
             Briefing = briefing
         }, mind, true);
 
-        // Don't Change the faction, this was stupid.
+        // Send codewords to only the traitor client
+        var color = TraitorCodewordColor; // Fall back to a dark red Syndicate color if a prototype is not found
+
+        RoleCodewordComponent codewordComp = EnsureComp<RoleCodewordComponent>(mindId);
+        _roleCodewordSystem.SetRoleCodewords(codewordComp, "traitor", component.Codewords.ToList(), color);
+
+        // Don't change the faction, this was stupid.
         //_npcFaction.RemoveFaction(traitor, component.NanoTrasenFaction, false);
         //_npcFaction.AddFaction(traitor, component.SyndicateFaction);
 
         RaiseLocalEvent(traitor, new MoodEffectEvent("TraitorFocused"));
-
         return true;
     }
 
diff --git a/Content.Server/Roles/RoleCodeword/RoleCodewordSystem.cs b/Content.Server/Roles/RoleCodeword/RoleCodewordSystem.cs
new file mode 100644
index 00000000000..a93d0f773b9
--- /dev/null
+++ b/Content.Server/Roles/RoleCodeword/RoleCodewordSystem.cs
@@ -0,0 +1,8 @@
+using Content.Shared.Roles.RoleCodeword;
+
+namespace Content.Server.Roles.RoleCodeword;
+
+public sealed class RoleCodewordSystem : SharedRoleCodewordSystem
+{
+
+}
diff --git a/Content.Shared/Chat/SharedChatSystem.cs b/Content.Shared/Chat/SharedChatSystem.cs
index 8b4dfb377fd..ff2a30ccbdb 100644
--- a/Content.Shared/Chat/SharedChatSystem.cs
+++ b/Content.Shared/Chat/SharedChatSystem.cs
@@ -1,4 +1,5 @@
 using System.Collections.Frozen;
+using System.Text.RegularExpressions;
 using Content.Shared.Popups;
 using Content.Shared.Radio;
 using Content.Shared.Speech;
@@ -239,6 +240,18 @@ public static string InjectTagInsideTag(ChatMessage message, string outerTag, st
 
         return rawmsg;
     }
+
+    /// <summary>
+    /// Injects a tag around all found instances of a specific string in a ChatMessage.
+    /// Excludes strings inside other tags and brackets.
+    /// </summary>
+    public static string InjectTagAroundString(ChatMessage message, string targetString, string tag, string? tagParameter)
+    {
+        var rawmsg = message.WrappedMessage;
+        rawmsg = Regex.Replace(rawmsg, "(?i)(" + targetString + ")(?-i)(?![^[]*])", $"[{tag}={tagParameter}]$1[/{tag}]");
+        return rawmsg;
+    }
+
     public static string GetStringInsideTag(ChatMessage message, string tag)
     {
         var rawmsg = message.WrappedMessage;
diff --git a/Content.Shared/Roles/RoleCodeword/RoleCodewordComponent.cs b/Content.Shared/Roles/RoleCodeword/RoleCodewordComponent.cs
new file mode 100644
index 00000000000..a1723dbc7ec
--- /dev/null
+++ b/Content.Shared/Roles/RoleCodeword/RoleCodewordComponent.cs
@@ -0,0 +1,37 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Roles.RoleCodeword;
+
+/// <summary>
+/// Used to display and highlight codewords in chat messages on the client.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedRoleCodewordSystem), Other = AccessPermissions.Read)]
+public sealed partial class RoleCodewordComponent : Component
+{
+    /// <summary>
+    /// Contains the codewords tied to a role.
+    /// Key string should be unique for the role.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Dictionary<string, CodewordsData> RoleCodewords = new();
+
+    public override bool SessionSpecific => true;
+}
+
+[DataDefinition, Serializable, NetSerializable]
+public partial struct CodewordsData
+{
+    [DataField]
+    public Color Color;
+
+    [DataField]
+    public List<string> Codewords;
+
+    public CodewordsData(Color color, List<string> codewords)
+    {
+        Color = color;
+        Codewords = codewords;
+    }
+}
diff --git a/Content.Shared/Roles/RoleCodeword/SharedRoleCodewordSystem.cs b/Content.Shared/Roles/RoleCodeword/SharedRoleCodewordSystem.cs
new file mode 100644
index 00000000000..9f860715fbd
--- /dev/null
+++ b/Content.Shared/Roles/RoleCodeword/SharedRoleCodewordSystem.cs
@@ -0,0 +1,49 @@
+using Content.Shared.Mind;
+using Robust.Shared.GameStates;
+using Robust.Shared.Player;
+
+namespace Content.Shared.Roles.RoleCodeword;
+
+public abstract class SharedRoleCodewordSystem : EntitySystem
+{
+    [Dependency] private readonly SharedMindSystem _mindSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<RoleCodewordComponent, ComponentGetStateAttemptEvent>(OnCodewordCompGetStateAttempt);
+    }
+
+    /// <summary>
+    /// Determines if a codeword component should be sent to the client.
+    /// </summary>
+    private void OnCodewordCompGetStateAttempt(EntityUid uid, RoleCodewordComponent comp, ref ComponentGetStateAttemptEvent args)
+    {
+        args.Cancelled = !CanGetState(args.Player, comp);
+    }
+
+    /// <summary>
+    /// The criteria that determine whether a codeword component should be sent to a client.
+    /// Sends the component if its owner is the player mind.
+    /// </summary>
+    /// <param name="player"> The Player the component will be sent to.</param>
+    /// <param name="comp"> The component being checked against</param>
+    /// <returns></returns>
+    private bool CanGetState(ICommonSession? player, RoleCodewordComponent comp)
+    {
+        if (!_mindSystem.TryGetMind(player, out EntityUid mindId, out var _))
+            return false;
+
+        if (!TryComp(mindId, out RoleCodewordComponent? playerComp) && comp != playerComp)
+            return false;
+
+        return true;
+    }
+
+    public void SetRoleCodewords(RoleCodewordComponent comp, string key, List<string> codewords, Color color)
+    {
+        var data = new CodewordsData(color, codewords);
+        comp.RoleCodewords[key] = data;
+    }
+}
diff --git a/Resources/Prototypes/Datasets/adjectives.yml b/Resources/Prototypes/Datasets/adjectives.yml
index 86fb2909521..fd243a88696 100644
--- a/Resources/Prototypes/Datasets/adjectives.yml
+++ b/Resources/Prototypes/Datasets/adjectives.yml
@@ -314,7 +314,6 @@
   - slow
   - swift
   - young
-  - Taste/Touch
   - bitter
   - delicious
   - fresh
diff --git a/Resources/Prototypes/Datasets/verbs.yml b/Resources/Prototypes/Datasets/verbs.yml
index f53c18a71bf..ce245370213 100644
--- a/Resources/Prototypes/Datasets/verbs.yml
+++ b/Resources/Prototypes/Datasets/verbs.yml
@@ -1,4 +1,4 @@
-- type: dataset
+- type: dataset
   id: verbs
   values:
   - accept
@@ -616,7 +616,6 @@
   - whine
   - whip
   - whirl
-  - whisper
   - whistle
   - wink
   - wipe

From 9753d46a4e43cde9971dfce531f3182acd20c5c0 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 28 Dec 2024 15:15:09 -0400
Subject: [PATCH 335/366] Rubber should be rubber.

---
 .../Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
index 03d6e337994..fef44fe33bb 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
@@ -51,7 +51,7 @@
   components:
   - type: BallisticAmmoProvider
     capacity: 200
-    proto: CartridgeRiflePractice
+    proto: CartridgeRifleRubber
   - type: Sprite
     layers:
     - state: base-b

From 395582e805f7070dfc6da3b65a8fd61e66165511 Mon Sep 17 00:00:00 2001
From: Julian Giebel <juliangiebel@live.de>
Date: Sat, 31 Aug 2024 16:40:28 +0200
Subject: [PATCH 336/366] Station Anchor (#26098)

* Work on abstracting out chargeup functionality/ui from grav gen

* Work on station anchor

* Finish implementing station anchors

* uhh yeah

* ok.

* fix tests

* whoops

* Get the last extraneous yaml fail

* PJB review

* beast mode... ACTIVATE!

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
---
 .../Ui/AnomalyGeneratorBoundUserInterface.cs  |   2 -
 Content.Client/Gravity/GravitySystem.cs       |   5 +-
 .../UI/GravityGeneratorBoundUserInterface.cs  |  38 --
 .../Gravity/UI/GravityGeneratorWindow.xaml.cs |  75 ----
 .../PowerChargeBoundUserInterface.cs          |  38 ++
 .../Power/PowerCharge/PowerChargeComponent.cs |  10 +
 .../PowerCharge/PowerChargeWindow.xaml}       |  16 +-
 .../PowerCharge/PowerChargeWindow.xaml.cs     |  72 ++++
 .../Tests/Gravity/WeightlessStatusTests.cs    |   3 +
 .../Tests/GravityGridTest.cs                  |   3 +
 .../Gravity/GravityGeneratorComponent.cs      |  32 --
 .../Gravity/GravityGeneratorSystem.cs         | 345 +++---------------
 .../Power/Components/PowerChargeComponent.cs  |  66 ++++
 .../Power/EntitySystems/PowerChargeSystem.cs  | 283 ++++++++++++++
 .../Components/StationAnchorComponent.cs      |  11 +
 .../Shuttles/Systems/StationAnchorSystem.cs   |  86 +++++
 .../SharedGravityGeneratorComponent.cs        | 154 ++------
 Content.Shared/Power/SharedPowerCharge.cs     |  77 ++++
 .../Power/SharedPowerChargeComponent.cs       |  14 +
 .../Shuttles/Systems/SharedShuttleSystem.cs   |   3 +-
 .../components/station-anchor-component.ftl   |   2 +
 .../components/power-charging-component.ftl   |  22 ++
 .../Circuitboards/Machine/production.yml      |  16 +
 .../Structures/Machines/gravity_generator.yml |  14 +-
 .../Entities/Structures/Machines/lathe.yml    |   2 +
 .../Structures/Shuttles/station_anchor.yml    | 112 ++++++
 .../Prototypes/Recipes/Lathes/electronics.yml |  11 +-
 .../Machines/station_anchor.rsi/meta.json     |  17 +
 .../station_anchor.rsi/station_anchor.png     | Bin 0 -> 3751 bytes
 .../station_anchor_unlit.png                  | Bin 0 -> 3330 bytes
 30 files changed, 948 insertions(+), 581 deletions(-)
 delete mode 100644 Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs
 delete mode 100644 Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs
 create mode 100644 Content.Client/Power/PowerCharge/PowerChargeBoundUserInterface.cs
 create mode 100644 Content.Client/Power/PowerCharge/PowerChargeComponent.cs
 rename Content.Client/{Gravity/UI/GravityGeneratorWindow.xaml => Power/PowerCharge/PowerChargeWindow.xaml} (60%)
 create mode 100644 Content.Client/Power/PowerCharge/PowerChargeWindow.xaml.cs
 create mode 100644 Content.Server/Power/Components/PowerChargeComponent.cs
 create mode 100644 Content.Server/Power/EntitySystems/PowerChargeSystem.cs
 create mode 100644 Content.Server/Shuttles/Components/StationAnchorComponent.cs
 create mode 100644 Content.Server/Shuttles/Systems/StationAnchorSystem.cs
 create mode 100644 Content.Shared/Power/SharedPowerCharge.cs
 create mode 100644 Content.Shared/Power/SharedPowerChargeComponent.cs
 create mode 100644 Resources/Locale/en-US/components/station-anchor-component.ftl
 create mode 100644 Resources/Locale/en-US/power/components/power-charging-component.ftl
 create mode 100644 Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml
 create mode 100644 Resources/Textures/Structures/Machines/station_anchor.rsi/meta.json
 create mode 100644 Resources/Textures/Structures/Machines/station_anchor.rsi/station_anchor.png
 create mode 100644 Resources/Textures/Structures/Machines/station_anchor.rsi/station_anchor_unlit.png

diff --git a/Content.Client/Anomaly/Ui/AnomalyGeneratorBoundUserInterface.cs b/Content.Client/Anomaly/Ui/AnomalyGeneratorBoundUserInterface.cs
index 5d1985485c4..f088ac1976b 100644
--- a/Content.Client/Anomaly/Ui/AnomalyGeneratorBoundUserInterface.cs
+++ b/Content.Client/Anomaly/Ui/AnomalyGeneratorBoundUserInterface.cs
@@ -1,7 +1,5 @@
 using Content.Shared.Anomaly;
-using Content.Shared.Gravity;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
 
 namespace Content.Client.Anomaly.Ui;
diff --git a/Content.Client/Gravity/GravitySystem.cs b/Content.Client/Gravity/GravitySystem.cs
index 3e87f76ba2b..dd51436a1f5 100644
--- a/Content.Client/Gravity/GravitySystem.cs
+++ b/Content.Client/Gravity/GravitySystem.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Gravity;
+using Content.Shared.Power;
 using Robust.Client.GameObjects;
 
 namespace Content.Client.Gravity;
@@ -21,7 +22,7 @@ private void OnAppearanceChange(EntityUid uid, SharedGravityGeneratorComponent c
         if (args.Sprite == null)
             return;
 
-        if (_appearanceSystem.TryGetData<GravityGeneratorStatus>(uid, GravityGeneratorVisuals.State, out var state, args.Component))
+        if (_appearanceSystem.TryGetData<PowerChargeStatus>(uid, PowerChargeVisuals.State, out var state, args.Component))
         {
             if (comp.SpriteMap.TryGetValue(state, out var spriteState))
             {
@@ -30,7 +31,7 @@ private void OnAppearanceChange(EntityUid uid, SharedGravityGeneratorComponent c
             }
         }
 
-        if (_appearanceSystem.TryGetData<float>(uid, GravityGeneratorVisuals.Charge, out var charge, args.Component))
+        if (_appearanceSystem.TryGetData<float>(uid, PowerChargeVisuals.Charge, out var charge, args.Component))
         {
             var layer = args.Sprite.LayerMapGet(GravityGeneratorVisualLayers.Core);
             switch (charge)
diff --git a/Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs b/Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs
deleted file mode 100644
index 32b40747d55..00000000000
--- a/Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Content.Shared.Gravity;
-using JetBrains.Annotations;
-using Robust.Client.UserInterface;
-
-namespace Content.Client.Gravity.UI
-{
-    [UsedImplicitly]
-    public sealed class GravityGeneratorBoundUserInterface : BoundUserInterface
-    {
-        [ViewVariables]
-        private GravityGeneratorWindow? _window;
-
-        public GravityGeneratorBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
-        {
-        }
-
-        protected override void Open()
-        {
-            base.Open();
-
-            _window = this.CreateWindow<GravityGeneratorWindow>();
-            _window.SetEntity(Owner);
-        }
-
-        protected override void UpdateState(BoundUserInterfaceState state)
-        {
-            base.UpdateState(state);
-
-            var castState = (SharedGravityGeneratorComponent.GeneratorState) state;
-            _window?.UpdateState(castState);
-        }
-
-        public void SetPowerSwitch(bool on)
-        {
-            SendMessage(new SharedGravityGeneratorComponent.SwitchGeneratorMessage(on));
-        }
-    }
-}
diff --git a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs b/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs
deleted file mode 100644
index 6f04133b594..00000000000
--- a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using Content.Shared.Gravity;
-using Robust.Client.AutoGenerated;
-using Robust.Client.GameObjects;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-using FancyWindow = Content.Client.UserInterface.Controls.FancyWindow;
-
-namespace Content.Client.Gravity.UI
-{
-    [GenerateTypedNameReferences]
-    public sealed partial class GravityGeneratorWindow : FancyWindow
-    {
-        private readonly ButtonGroup _buttonGroup = new();
-
-        public event Action<bool>? OnPowerSwitch;
-
-        public GravityGeneratorWindow()
-        {
-            RobustXamlLoader.Load(this);
-            IoCManager.InjectDependencies(this);
-
-            OnButton.Group = _buttonGroup;
-            OffButton.Group = _buttonGroup;
-
-            OnButton.OnPressed += _ => OnPowerSwitch?.Invoke(true);
-            OffButton.OnPressed += _ => OnPowerSwitch?.Invoke(false);
-        }
-
-        public void SetEntity(EntityUid uid)
-        {
-            EntityView.SetEntity(uid);
-        }
-
-        public void UpdateState(SharedGravityGeneratorComponent.GeneratorState state)
-        {
-            if (state.On)
-                OnButton.Pressed = true;
-            else
-                OffButton.Pressed = true;
-
-            PowerLabel.Text = Loc.GetString(
-                "gravity-generator-window-power-label",
-                ("draw", state.PowerDraw),
-                ("max", state.PowerDrawMax));
-
-            PowerLabel.SetOnlyStyleClass(MathHelper.CloseTo(state.PowerDraw, state.PowerDrawMax) ? "Good" : "Caution");
-
-            ChargeBar.Value = state.Charge;
-            ChargeText.Text = (state.Charge / 255f).ToString("P0");
-            StatusLabel.Text = Loc.GetString(state.PowerStatus switch
-            {
-                GravityGeneratorPowerStatus.Off => "gravity-generator-window-status-off",
-                GravityGeneratorPowerStatus.Discharging => "gravity-generator-window-status-discharging",
-                GravityGeneratorPowerStatus.Charging => "gravity-generator-window-status-charging",
-                GravityGeneratorPowerStatus.FullyCharged => "gravity-generator-window-status-fully-charged",
-                _ => throw new ArgumentOutOfRangeException()
-            });
-
-            StatusLabel.SetOnlyStyleClass(state.PowerStatus switch
-            {
-                GravityGeneratorPowerStatus.Off => "Danger",
-                GravityGeneratorPowerStatus.Discharging => "Caution",
-                GravityGeneratorPowerStatus.Charging => "Caution",
-                GravityGeneratorPowerStatus.FullyCharged => "Good",
-                _ => throw new ArgumentOutOfRangeException()
-            });
-
-            EtaLabel.Text = state.EtaSeconds >= 0
-                ? Loc.GetString("gravity-generator-window-eta-value", ("left", TimeSpan.FromSeconds(state.EtaSeconds)))
-                : Loc.GetString("gravity-generator-window-eta-none");
-
-            EtaLabel.SetOnlyStyleClass(state.EtaSeconds >= 0 ? "Caution" : "Disabled");
-        }
-    }
-}
diff --git a/Content.Client/Power/PowerCharge/PowerChargeBoundUserInterface.cs b/Content.Client/Power/PowerCharge/PowerChargeBoundUserInterface.cs
new file mode 100644
index 00000000000..7a36b8ddf59
--- /dev/null
+++ b/Content.Client/Power/PowerCharge/PowerChargeBoundUserInterface.cs
@@ -0,0 +1,38 @@
+using Content.Shared.Power;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.Power.PowerCharge;
+
+public sealed class PowerChargeBoundUserInterface : BoundUserInterface
+{
+    [ViewVariables]
+    private PowerChargeWindow? _window;
+
+    public PowerChargeBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+    }
+
+    public void SetPowerSwitch(bool on)
+    {
+        SendMessage(new SwitchChargingMachineMessage(on));
+    }
+
+    protected override void Open()
+    {
+        base.Open();
+        if (!EntMan.TryGetComponent(Owner, out PowerChargeComponent? component))
+            return;
+
+        _window = this.CreateWindow<PowerChargeWindow>();
+        _window.UpdateWindow(this, Loc.GetString(component.WindowTitle));
+    }
+
+    protected override void UpdateState(BoundUserInterfaceState state)
+    {
+        base.UpdateState(state);
+        if (state is not PowerChargeState chargeState)
+            return;
+
+        _window?.UpdateState(chargeState);
+    }
+}
diff --git a/Content.Client/Power/PowerCharge/PowerChargeComponent.cs b/Content.Client/Power/PowerCharge/PowerChargeComponent.cs
new file mode 100644
index 00000000000..ab5baa4e2f5
--- /dev/null
+++ b/Content.Client/Power/PowerCharge/PowerChargeComponent.cs
@@ -0,0 +1,10 @@
+using Content.Shared.Power;
+
+namespace Content.Client.Power.PowerCharge;
+
+/// <inheritdoc cref="Content.Shared.Power.SharedPowerChargeComponent" />
+[RegisterComponent]
+public sealed partial class PowerChargeComponent : SharedPowerChargeComponent
+{
+
+}
diff --git a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml b/Content.Client/Power/PowerCharge/PowerChargeWindow.xaml
similarity index 60%
rename from Content.Client/Gravity/UI/GravityGeneratorWindow.xaml
rename to Content.Client/Power/PowerCharge/PowerChargeWindow.xaml
index 853f437a2bf..4e61255326e 100644
--- a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml
+++ b/Content.Client/Power/PowerCharge/PowerChargeWindow.xaml
@@ -1,27 +1,26 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
                 xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-                Title="{Loc 'gravity-generator-window-title'}"
                 MinSize="270 130"
                 SetSize="360 180">
     <BoxContainer Margin="4 0" Orientation="Horizontal">
         <BoxContainer Orientation="Vertical" HorizontalExpand="True">
             <GridContainer Margin="2 0 0 0" Columns="2">
                 <!-- Power -->
-                <Label Text="{Loc 'gravity-generator-window-power'}" HorizontalExpand="True" StyleClasses="StatusFieldTitle" />
+                <Label Text="{Loc 'power-charge-window-power'}" HorizontalExpand="True" StyleClasses="StatusFieldTitle" />
                 <BoxContainer Orientation="Horizontal" MinWidth="120">
-                    <Button Name="OnButton" Text="{Loc 'gravity-generator-window-power-on'}" StyleClasses="OpenRight" />
-                    <Button Name="OffButton" Text="{Loc 'gravity-generator-window-power-off'}" StyleClasses="OpenLeft" />
+                    <Button Name="OnButton" Text="{Loc 'power-charge-window-power-on'}" StyleClasses="OpenRight" />
+                    <Button Name="OffButton" Text="{Loc 'power-charge-window-power-off'}" StyleClasses="OpenLeft" />
                 </BoxContainer>
                 <Control /> <!-- Empty control to act as a spacer in the grid. -->
                 <Label Name="PowerLabel" Text="0 / 0 W" />
                 <!-- Status -->
-                <Label Text="{Loc 'gravity-generator-window-status'}"  StyleClasses="StatusFieldTitle" />
-                <Label Name="StatusLabel" Text="{Loc 'gravity-generator-window-status-fully-charged'}" />
+                <Label Text="{Loc 'power-charge-window-status'}"  StyleClasses="StatusFieldTitle" />
+                <Label Name="StatusLabel" Text="{Loc 'power-charge-window-status-fully-charged'}" />
                 <!-- ETA -->
-                <Label Text="{Loc 'gravity-generator-window-eta'}" StyleClasses="StatusFieldTitle" />
+                <Label Text="{Loc 'power-charge-window-eta'}" StyleClasses="StatusFieldTitle" />
                 <Label Name="EtaLabel" Text="N/A" />
                 <!-- Charge -->
-                <Label Text="{Loc 'gravity-generator-window-charge'}" StyleClasses="StatusFieldTitle" />
+                <Label Text="{Loc 'power-charge-window-charge'}" StyleClasses="StatusFieldTitle" />
                 <ProgressBar Name="ChargeBar" MaxValue="255">
                     <Label Name="ChargeText" Margin="4 0" Text="0 %" />
                 </ProgressBar>
@@ -31,5 +30,4 @@
             <SpriteView Name="EntityView" SetSize="96 96" OverrideDirection="South" />
         </PanelContainer>
     </BoxContainer>
-
 </controls:FancyWindow>
diff --git a/Content.Client/Power/PowerCharge/PowerChargeWindow.xaml.cs b/Content.Client/Power/PowerCharge/PowerChargeWindow.xaml.cs
new file mode 100644
index 00000000000..6739e24c208
--- /dev/null
+++ b/Content.Client/Power/PowerCharge/PowerChargeWindow.xaml.cs
@@ -0,0 +1,72 @@
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Power;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Power.PowerCharge;
+
+[GenerateTypedNameReferences]
+public sealed partial class PowerChargeWindow : FancyWindow
+{
+    private readonly ButtonGroup _buttonGroup = new();
+
+    public PowerChargeWindow()
+    {
+        RobustXamlLoader.Load(this);
+
+        OnButton.Group = _buttonGroup;
+        OffButton.Group = _buttonGroup;
+    }
+
+    public void UpdateWindow(PowerChargeBoundUserInterface bui, string title)
+    {
+        Title = title;
+
+        OnButton.OnPressed += _ => bui.SetPowerSwitch(true);
+        OffButton.OnPressed += _ => bui.SetPowerSwitch(false);
+
+        EntityView.SetEntity(bui.Owner);
+    }
+
+    public void UpdateState(PowerChargeState state)
+    {
+        if (state.On)
+            OnButton.Pressed = true;
+        else
+            OffButton.Pressed = true;
+
+        PowerLabel.Text = Loc.GetString(
+            "power-charge-window-power-label",
+            ("draw", state.PowerDraw),
+            ("max", state.PowerDrawMax));
+
+        PowerLabel.SetOnlyStyleClass(MathHelper.CloseTo(state.PowerDraw, state.PowerDrawMax) ? "Good" : "Caution");
+
+        ChargeBar.Value = state.Charge;
+        ChargeText.Text = (state.Charge / 255f).ToString("P0");
+        StatusLabel.Text = Loc.GetString(state.PowerStatus switch
+        {
+            PowerChargePowerStatus.Off => "power-charge-window-status-off",
+            PowerChargePowerStatus.Discharging => "power-charge-window-status-discharging",
+            PowerChargePowerStatus.Charging => "power-charge-window-status-charging",
+            PowerChargePowerStatus.FullyCharged => "power-charge-window-status-fully-charged",
+            _ => throw new ArgumentOutOfRangeException()
+        });
+
+        StatusLabel.SetOnlyStyleClass(state.PowerStatus switch
+        {
+            PowerChargePowerStatus.Off => "Danger",
+            PowerChargePowerStatus.Discharging => "Caution",
+            PowerChargePowerStatus.Charging => "Caution",
+            PowerChargePowerStatus.FullyCharged => "Good",
+            _ => throw new ArgumentOutOfRangeException()
+        });
+
+        EtaLabel.Text = state.EtaSeconds >= 0
+            ? Loc.GetString("power-charge-window-eta-value", ("left", TimeSpan.FromSeconds(state.EtaSeconds)))
+            : Loc.GetString("power-charge-window-eta-none");
+
+        EtaLabel.SetOnlyStyleClass(state.EtaSeconds >= 0 ? "Caution" : "Disabled");
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Gravity/WeightlessStatusTests.cs b/Content.IntegrationTests/Tests/Gravity/WeightlessStatusTests.cs
index 74641126aee..6aa2763888d 100644
--- a/Content.IntegrationTests/Tests/Gravity/WeightlessStatusTests.cs
+++ b/Content.IntegrationTests/Tests/Gravity/WeightlessStatusTests.cs
@@ -25,6 +25,9 @@ public sealed class WeightlessStatusTests
   id: WeightlessGravityGeneratorDummy
   components:
   - type: GravityGenerator
+  - type: PowerCharge
+    windowTitle: gravity-generator-window-title
+    idlePower: 50
     chargeRate: 1000000000 # Set this really high so it discharges in a single tick.
     activePower: 500
   - type: ApcPowerReceiver
diff --git a/Content.IntegrationTests/Tests/GravityGridTest.cs b/Content.IntegrationTests/Tests/GravityGridTest.cs
index 64f7a6d0820..b32d6c2b8d8 100644
--- a/Content.IntegrationTests/Tests/GravityGridTest.cs
+++ b/Content.IntegrationTests/Tests/GravityGridTest.cs
@@ -21,6 +21,9 @@ public sealed class GravityGridTest
   id: GridGravityGeneratorDummy
   components:
   - type: GravityGenerator
+  - type: PowerCharge
+    windowTitle: gravity-generator-window-title
+    idlePower: 50
     chargeRate: 1000000000 # Set this really high so it discharges in a single tick.
     activePower: 500
   - type: ApcPowerReceiver
diff --git a/Content.Server/Gravity/GravityGeneratorComponent.cs b/Content.Server/Gravity/GravityGeneratorComponent.cs
index f47d3979391..c715a5e5f35 100644
--- a/Content.Server/Gravity/GravityGeneratorComponent.cs
+++ b/Content.Server/Gravity/GravityGeneratorComponent.cs
@@ -8,45 +8,13 @@ namespace Content.Server.Gravity
     [Access(typeof(GravityGeneratorSystem))]
     public sealed partial class GravityGeneratorComponent : SharedGravityGeneratorComponent
     {
-        // 1% charge per second.
-        [ViewVariables(VVAccess.ReadWrite)] [DataField("chargeRate")] public float ChargeRate { get; set; } = 0.01f;
-        // The gravity generator has two power values.
-        // Idle power is assumed to be the power needed to run the control systems and interface.
-        [DataField("idlePower")] public float IdlePowerUse { get; set; }
-        // Active power is the power needed to keep the gravity field stable.
-        [DataField("activePower")] public float ActivePowerUse { get; set; }
         [DataField("lightRadiusMin")] public float LightRadiusMin { get; set; }
         [DataField("lightRadiusMax")] public float LightRadiusMax { get; set; }
 
-
-        /// <summary>
-        /// Is the power switch on?
-        /// </summary>
-        [DataField("switchedOn")]
-        public bool SwitchedOn { get; set; } = true;
-
-        /// <summary>
-        /// Is the gravity generator intact?
-        /// </summary>
-        [DataField("intact")]
-        public bool Intact { get; set; } = true;
-
-        [DataField("maxCharge")]
-        public float MaxCharge { get; set; } = 1;
-
-        // 0 -> 1
-        [ViewVariables(VVAccess.ReadWrite)] [DataField("charge")] public float Charge { get; set; } = 1;
-
-        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
-        public string MachinePartMaxChargeMultiplier = "Capacitor";
-
         /// <summary>
         /// Is the gravity generator currently "producing" gravity?
         /// </summary>
         [ViewVariables]
         public bool GravityActive { get; set; } = false;
-
-        // Do we need a UI update even if the charge doesn't change? Used by power button.
-        [ViewVariables] public bool NeedUIUpdate { get; set; }
     }
 }
diff --git a/Content.Server/Gravity/GravityGeneratorSystem.cs b/Content.Server/Gravity/GravityGeneratorSystem.cs
index dc31c004c64..5ab2dc89310 100644
--- a/Content.Server/Gravity/GravityGeneratorSystem.cs
+++ b/Content.Server/Gravity/GravityGeneratorSystem.cs
@@ -1,324 +1,63 @@
-using Content.Server.Administration.Logs;
-using Content.Server.Audio;
-using Content.Server.Construction;
 using Content.Server.Power.Components;
-using Content.Server.Emp;
-using Content.Shared.Database;
+using Content.Server.Power.EntitySystems;
 using Content.Shared.Gravity;
-using Content.Shared.Interaction;
-using Robust.Server.GameObjects;
-using Robust.Shared.Player;
 
-namespace Content.Server.Gravity
-{
-    public sealed class GravityGeneratorSystem : EntitySystem
-    {
-        [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-        [Dependency] private readonly AmbientSoundSystem _ambientSoundSystem = default!;
-        [Dependency] private readonly GravitySystem _gravitySystem = default!;
-        [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-        [Dependency] private readonly SharedPointLightSystem _lights = default!;
-        [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<GravityGeneratorComponent, ComponentInit>(OnCompInit);
-            SubscribeLocalEvent<GravityGeneratorComponent, ComponentShutdown>(OnComponentShutdown);
-            SubscribeLocalEvent<GravityGeneratorComponent, EntParentChangedMessage>(OnParentChanged); // Or just anchor changed?
-            SubscribeLocalEvent<GravityGeneratorComponent, InteractHandEvent>(OnInteractHand);
-            SubscribeLocalEvent<GravityGeneratorComponent, RefreshPartsEvent>(OnRefreshParts);
-            SubscribeLocalEvent<GravityGeneratorComponent, SharedGravityGeneratorComponent.SwitchGeneratorMessage>(
-                OnSwitchGenerator);
-
-            SubscribeLocalEvent<GravityGeneratorComponent, EmpPulseEvent>(OnEmpPulse);
-        }
-
-        private void OnParentChanged(EntityUid uid, GravityGeneratorComponent component, ref EntParentChangedMessage args)
-        {
-            if (component.GravityActive && TryComp(args.OldParent, out GravityComponent? gravity))
-            {
-                _gravitySystem.RefreshGravity(args.OldParent.Value, gravity);
-            }
-        }
-
-        private void OnComponentShutdown(EntityUid uid, GravityGeneratorComponent component, ComponentShutdown args)
-        {
-            if (component.GravityActive &&
-                TryComp<TransformComponent>(uid, out var xform) &&
-                TryComp(xform.ParentUid, out GravityComponent? gravity))
-            {
-                component.GravityActive = false;
-                _gravitySystem.RefreshGravity(xform.ParentUid, gravity);
-            }
-        }
-
-        public override void Update(float frameTime)
-        {
-            base.Update(frameTime);
-
-            var query = EntityQueryEnumerator<GravityGeneratorComponent, ApcPowerReceiverComponent>();
-            while (query.MoveNext(out var uid, out var gravGen, out var powerReceiver))
-            {
-                var ent = (uid, gravGen, powerReceiver);
-                if (!gravGen.Intact)
-                    continue;
-
-                // Calculate charge rate based on power state and such.
-                // Negative charge rate means discharging.
-                float chargeRate;
-                if (gravGen.SwitchedOn)
-                {
-                    if (powerReceiver.Powered)
-                    {
-                        chargeRate = gravGen.ChargeRate;
-                    }
-                    else
-                    {
-                        // Scale discharge rate such that if we're at 25% active power we discharge at 75% rate.
-                        var receiving = powerReceiver.PowerReceived;
-                        var mainSystemPower = Math.Max(0, receiving - gravGen.IdlePowerUse);
-                        var ratio = 1 - mainSystemPower / (gravGen.ActivePowerUse - gravGen.IdlePowerUse);
-                        chargeRate = -(ratio * gravGen.ChargeRate);
-                    }
-                }
-                else
-                {
-                    chargeRate = -gravGen.ChargeRate;
-                }
-
-                var active = gravGen.GravityActive;
-                var lastCharge = gravGen.Charge;
-                gravGen.Charge = Math.Clamp(gravGen.Charge + frameTime * chargeRate, 0, gravGen.MaxCharge);
-                if (chargeRate > 0)
-                {
-                    // Charging.
-                    if (MathHelper.CloseTo(gravGen.Charge, gravGen.MaxCharge) && !gravGen.GravityActive)
-                    {
-                        gravGen.GravityActive = true;
-                    }
-                }
-                else
-                {
-                    // Discharging
-                    if (MathHelper.CloseTo(gravGen.Charge, 0) && gravGen.GravityActive)
-                    {
-                        gravGen.GravityActive = false;
-                    }
-                }
-
-                var updateUI = gravGen.NeedUIUpdate;
-                if (!MathHelper.CloseTo(lastCharge, gravGen.Charge))
-                {
-                    UpdateState(ent);
-                    updateUI = true;
-                }
-
-                if (updateUI)
-                    UpdateUI(ent, chargeRate);
-
-                if (active != gravGen.GravityActive &&
-                    TryComp<TransformComponent>(uid, out var xform) &&
-                    TryComp<GravityComponent>(xform.ParentUid, out var gravity))
-                {
-                    // Force it on in the faster path.
-                    if (gravGen.GravityActive)
-                    {
-                        _gravitySystem.EnableGravity(xform.ParentUid, gravity);
-                    }
-                    else
-                    {
-                        _gravitySystem.RefreshGravity(xform.ParentUid, gravity);
-                    }
-                }
-            }
-        }
-
-        private void SetSwitchedOn(EntityUid uid, GravityGeneratorComponent component, bool on,
-            ApcPowerReceiverComponent? powerReceiver = null, EntityUid? user = null)
-        {
-            if (!Resolve(uid, ref powerReceiver))
-                return;
-
-            if (user != null)
-                _adminLogger.Add(LogType.Action, on ? LogImpact.Medium : LogImpact.High, $"{ToPrettyString(user)} set ${ToPrettyString(uid):target} to {(on ? "on" : "off")}");
-
-            component.SwitchedOn = on;
-            UpdatePowerState(component, powerReceiver);
-            component.NeedUIUpdate = true;
-        }
-
-        private static void UpdatePowerState(
-            GravityGeneratorComponent component,
-            ApcPowerReceiverComponent powerReceiver)
-        {
-            powerReceiver.Load = component.SwitchedOn ? component.ActivePowerUse : component.IdlePowerUse;
-        }
-
-        private void UpdateUI(Entity<GravityGeneratorComponent, ApcPowerReceiverComponent> ent, float chargeRate)
-        {
-            var (_, component, powerReceiver) = ent;
-            if (!_uiSystem.IsUiOpen(ent.Owner, SharedGravityGeneratorComponent.GravityGeneratorUiKey.Key))
-                return;
-
-            var chargeTarget = chargeRate < 0 ? 0 : component.MaxCharge;
-            short chargeEta;
-            var atTarget = false;
-            if (MathHelper.CloseTo(component.Charge, chargeTarget))
-            {
-                chargeEta = short.MinValue; // N/A
-                atTarget = true;
-            }
-            else
-            {
-                var diff = chargeTarget - component.Charge;
-                chargeEta = (short) Math.Abs(diff / chargeRate);
-            }
-
-            var status = chargeRate switch
-            {
-                > 0 when atTarget => GravityGeneratorPowerStatus.FullyCharged,
-                < 0 when atTarget => GravityGeneratorPowerStatus.Off,
-                > 0 => GravityGeneratorPowerStatus.Charging,
-                < 0 => GravityGeneratorPowerStatus.Discharging,
-                _ => throw new ArgumentOutOfRangeException()
-            };
-
-            var state = new SharedGravityGeneratorComponent.GeneratorState(
-                component.SwitchedOn,
-                (byte) (component.Charge * 255),
-                status,
-                (short) Math.Round(powerReceiver.PowerReceived),
-                (short) Math.Round(powerReceiver.Load),
-                chargeEta
-            );
-
-            _uiSystem.SetUiState(
-                ent.Owner,
-                SharedGravityGeneratorComponent.GravityGeneratorUiKey.Key,
-                state);
-
-            component.NeedUIUpdate = false;
-        }
+namespace Content.Server.Gravity;
 
-        private void OnCompInit(Entity<GravityGeneratorComponent> ent, ref ComponentInit args)
-        {
-            ApcPowerReceiverComponent? powerReceiver = null;
-            if (!Resolve(ent, ref powerReceiver, false))
-                return;
-
-            UpdatePowerState(ent, powerReceiver);
-            UpdateState((ent, ent.Comp, powerReceiver));
-        }
-
-        private void OnInteractHand(EntityUid uid, GravityGeneratorComponent component, InteractHandEvent args)
-        {
-            ApcPowerReceiverComponent? powerReceiver = default!;
-            if (!Resolve(uid, ref powerReceiver))
-                return;
-
-            // Do not allow opening UI if broken or unpowered.
-            if (!component.Intact || powerReceiver.PowerReceived < component.IdlePowerUse)
-                return;
-
-            _uiSystem.OpenUi(uid, SharedGravityGeneratorComponent.GravityGeneratorUiKey.Key, args.User);
-            component.NeedUIUpdate = true;
-        }
-
-        public void UpdateState(Entity<GravityGeneratorComponent, ApcPowerReceiverComponent> ent)
-        {
-            var (uid, grav, powerReceiver) = ent;
-            var appearance = EntityManager.GetComponentOrNull<AppearanceComponent>(uid);
-            _appearance.SetData(uid, GravityGeneratorVisuals.Charge, grav.Charge, appearance);
-
-            if (_lights.TryGetLight(uid, out var pointLight))
-            {
-                _lights.SetEnabled(uid, grav.Charge > 0, pointLight);
-                _lights.SetRadius(uid, MathHelper.Lerp(grav.LightRadiusMin, grav.LightRadiusMax, grav.Charge), pointLight);
-            }
-
-            if (!grav.Intact)
-            {
-                MakeBroken((uid, grav), appearance);
-            }
-            else if (powerReceiver.PowerReceived < grav.IdlePowerUse)
-            {
-                MakeUnpowered((uid, grav), appearance);
-            }
-            else if (!grav.SwitchedOn)
-            {
-                MakeOff((uid, grav), appearance);
-            }
-            else
-            {
-                MakeOn((uid, grav), appearance);
-            }
-        }
-
-        private void OnRefreshParts(EntityUid uid, GravityGeneratorComponent component, RefreshPartsEvent args)
-        {
-            var maxChargeMultipler = args.PartRatings[component.MachinePartMaxChargeMultiplier];
-            component.MaxCharge = maxChargeMultipler * 1;
-        }
-
-        private void MakeBroken(Entity<GravityGeneratorComponent> ent, AppearanceComponent? appearance)
-        {
-            _ambientSoundSystem.SetAmbience(ent, false);
-
-            _appearance.SetData(ent, GravityGeneratorVisuals.State, GravityGeneratorStatus.Broken);
-        }
+public sealed class GravityGeneratorSystem : EntitySystem
+{
+    [Dependency] private readonly GravitySystem _gravitySystem = default!;
+    [Dependency] private readonly SharedPointLightSystem _lights = default!;
 
-        private void MakeUnpowered(Entity<GravityGeneratorComponent> ent, AppearanceComponent? appearance)
-        {
-            _ambientSoundSystem.SetAmbience(ent, false);
+    public override void Initialize()
+    {
+        base.Initialize();
 
-            _appearance.SetData(ent, GravityGeneratorVisuals.State, GravityGeneratorStatus.Unpowered, appearance);
-        }
+        SubscribeLocalEvent<GravityGeneratorComponent, EntParentChangedMessage>(OnParentChanged);
+        SubscribeLocalEvent<GravityGeneratorComponent, ChargedMachineActivatedEvent>(OnActivated);
+        SubscribeLocalEvent<GravityGeneratorComponent, ChargedMachineDeactivatedEvent>(OnDeactivated);
+    }
 
-        private void MakeOff(Entity<GravityGeneratorComponent> ent, AppearanceComponent? appearance)
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+        var query = EntityQueryEnumerator<GravityGeneratorComponent, PowerChargeComponent>();
+        while (query.MoveNext(out var uid, out var grav, out var charge))
         {
-            _ambientSoundSystem.SetAmbience(ent, false);
+            if (!_lights.TryGetLight(uid, out var pointLight))
+                continue;
 
-            _appearance.SetData(ent, GravityGeneratorVisuals.State, GravityGeneratorStatus.Off, appearance);
+            _lights.SetEnabled(uid, charge.Charge > 0, pointLight);
+            _lights.SetRadius(uid, MathHelper.Lerp(grav.LightRadiusMin, grav.LightRadiusMax, charge.Charge),
+                pointLight);
         }
+    }
 
-        private void MakeOn(Entity<GravityGeneratorComponent> ent, AppearanceComponent? appearance)
+    private void OnActivated(Entity<GravityGeneratorComponent> ent, ref ChargedMachineActivatedEvent args)
+    {
+        ent.Comp.GravityActive = true;
+        if (TryComp<TransformComponent>(ent, out var xform) &&
+            TryComp(xform.ParentUid, out GravityComponent? gravity))
         {
-            _ambientSoundSystem.SetAmbience(ent, true);
-
-            _appearance.SetData(ent, GravityGeneratorVisuals.State, GravityGeneratorStatus.On, appearance);
+            _gravitySystem.EnableGravity(xform.ParentUid, gravity);
         }
+    }
 
-        private void OnSwitchGenerator(
-            EntityUid uid,
-            GravityGeneratorComponent component,
-            SharedGravityGeneratorComponent.SwitchGeneratorMessage args)
+    private void OnDeactivated(Entity<GravityGeneratorComponent> ent, ref ChargedMachineDeactivatedEvent args)
+    {
+        ent.Comp.GravityActive = false;
+        if (TryComp<TransformComponent>(ent, out var xform) &&
+            TryComp(xform.ParentUid, out GravityComponent? gravity))
         {
-            SetSwitchedOn(uid, component, args.On, user: args.Actor);
+            _gravitySystem.RefreshGravity(xform.ParentUid, gravity);
         }
+    }
 
-        private void OnEmpPulse(EntityUid uid, GravityGeneratorComponent component, EmpPulseEvent args)
+    private void OnParentChanged(EntityUid uid, GravityGeneratorComponent component, ref EntParentChangedMessage args)
+    {
+        if (component.GravityActive && TryComp(args.OldParent, out GravityComponent? gravity))
         {
-            /// i really don't think that the gravity generator should use normalised 0-1 charge
-            /// as opposed to watts charge that every other battery uses
-
-            ApcPowerReceiverComponent? powerReceiver = null;
-            if (!Resolve(uid, ref powerReceiver, false))
-                return;
-
-            var ent = (uid, component, powerReceiver);
-
-            // convert from normalised energy to watts and subtract
-            float maxEnergy = component.ActivePowerUse / component.ChargeRate;
-            float currentEnergy = maxEnergy * component.Charge;
-            currentEnergy = Math.Max(0, currentEnergy - args.EnergyConsumption);
-
-            // apply renormalised energy to charge variable
-            component.Charge = currentEnergy / maxEnergy;
-
-            // update power state
-            UpdateState(ent);
+            _gravitySystem.RefreshGravity(args.OldParent.Value, gravity);
         }
     }
 }
diff --git a/Content.Server/Power/Components/PowerChargeComponent.cs b/Content.Server/Power/Components/PowerChargeComponent.cs
new file mode 100644
index 00000000000..03c6e8e2bca
--- /dev/null
+++ b/Content.Server/Power/Components/PowerChargeComponent.cs
@@ -0,0 +1,66 @@
+using Content.Server.Power.EntitySystems;
+using Content.Shared.Power;
+
+namespace Content.Server.Power.Components;
+
+/// <inheritdoc cref="Content.Shared.Power.SharedPowerChargeComponent" />
+[RegisterComponent]
+[Access(typeof(PowerChargeSystem))]
+public sealed partial class PowerChargeComponent : SharedPowerChargeComponent
+{
+    /// <summary>
+    /// Change in charge per second.
+    /// </summary>
+    [DataField]
+    public float ChargeRate { get; set; } = 0.01f;
+
+    /// <summary>
+    /// Baseline power that this machine consumes.
+    /// </summary>
+    [DataField("idlePower")]
+    public float IdlePowerUse { get; set; }
+
+    /// <summary>
+    /// Power consumed when <see cref="SwitchedOn"/> is true.
+    /// </summary>
+    [DataField("activePower")]
+    public float ActivePowerUse { get; set; }
+
+    /// <summary>
+    /// Is the gravity generator intact?
+    /// </summary>
+    [DataField]
+    public bool Intact { get; set; } = true;
+
+    /// <summary>
+    /// Is the power switch on?
+    /// </summary>
+    [DataField]
+    public bool SwitchedOn { get; set; } = true;
+
+    /// <summary>
+    /// Whether or not the power is switched on and the entity has charged up.
+    /// </summary>
+    [DataField]
+    public bool Active { get; set; }
+
+    [DataField]
+    public float MaxCharge { get; set; } = 1;
+
+    /// <summary>
+    /// The UI key of the UI that's used with this machine.<br/>
+    /// This is used to allow machine power charging to be integrated into any ui
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
+    public Enum UiKey { get; set; } = PowerChargeUiKey.Key;
+
+    /// <summary>
+    /// Current charge value.
+    /// Goes from 0 to 1.
+    /// </summary>
+    [DataField]
+    public float Charge { get; set; } = 1;
+
+    [ViewVariables]
+    public bool NeedUIUpdate { get; set; }
+}
diff --git a/Content.Server/Power/EntitySystems/PowerChargeSystem.cs b/Content.Server/Power/EntitySystems/PowerChargeSystem.cs
new file mode 100644
index 00000000000..7935af155a7
--- /dev/null
+++ b/Content.Server/Power/EntitySystems/PowerChargeSystem.cs
@@ -0,0 +1,283 @@
+using Content.Server.Administration.Logs;
+using Content.Server.Audio;
+using Content.Server.Power.Components;
+using Content.Shared.Database;
+using Content.Shared.Power;
+using Content.Shared.UserInterface;
+using Robust.Server.GameObjects;
+using Robust.Shared.Player;
+
+namespace Content.Server.Power.EntitySystems;
+
+public sealed class PowerChargeSystem : EntitySystem
+{
+    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly AmbientSoundSystem _ambientSoundSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<PowerChargeComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<PowerChargeComponent, ComponentShutdown>(OnComponentShutdown);
+        SubscribeLocalEvent<PowerChargeComponent, ActivatableUIOpenAttemptEvent>(OnUIOpenAttempt);
+        SubscribeLocalEvent<PowerChargeComponent, AfterActivatableUIOpenEvent>(OnAfterUiOpened);
+        SubscribeLocalEvent<PowerChargeComponent, AnchorStateChangedEvent>(OnAnchorStateChange);
+
+        // This needs to be ui key agnostic
+        SubscribeLocalEvent<PowerChargeComponent, SwitchChargingMachineMessage>(OnSwitchGenerator);
+    }
+
+    private void OnAnchorStateChange(EntityUid uid, PowerChargeComponent component, AnchorStateChangedEvent args)
+    {
+        if (args.Anchored || !TryComp<ApcPowerReceiverComponent>(uid, out var powerReceiverComponent))
+            return;
+
+        component.Active = false;
+        component.Charge = 0;
+        UpdateState(new Entity<PowerChargeComponent, ApcPowerReceiverComponent>(uid, component, powerReceiverComponent));
+    }
+
+    private void OnAfterUiOpened(EntityUid uid, PowerChargeComponent component, AfterActivatableUIOpenEvent args)
+    {
+        if (!TryComp<ApcPowerReceiverComponent>(uid, out var apcPowerReceiver))
+            return;
+
+        UpdateUI((uid, component, apcPowerReceiver), component.ChargeRate);
+    }
+
+    private void OnSwitchGenerator(EntityUid uid, PowerChargeComponent component, SwitchChargingMachineMessage args)
+    {
+        SetSwitchedOn(uid, component, args.On, user: args.Actor);
+    }
+
+    private void OnUIOpenAttempt(EntityUid uid, PowerChargeComponent component, ActivatableUIOpenAttemptEvent args)
+    {
+        if (!component.Intact)
+            args.Cancel();
+    }
+
+    private void OnComponentShutdown(EntityUid uid, PowerChargeComponent component, ComponentShutdown args)
+    {
+        if (!component.Active)
+            return;
+
+        component.Active = false;
+
+        var eventArgs = new ChargedMachineDeactivatedEvent();
+        RaiseLocalEvent(uid, ref eventArgs);
+    }
+
+    private void OnMapInit(Entity<PowerChargeComponent> ent, ref MapInitEvent args)
+    {
+        ApcPowerReceiverComponent? powerReceiver = null;
+        if (!Resolve(ent, ref powerReceiver, false))
+            return;
+
+        UpdatePowerState(ent, powerReceiver);
+        UpdateState((ent, ent.Comp, powerReceiver));
+    }
+
+    private void SetSwitchedOn(EntityUid uid, PowerChargeComponent component, bool on,
+        ApcPowerReceiverComponent? powerReceiver = null, EntityUid? user = null)
+    {
+        if (!Resolve(uid, ref powerReceiver))
+            return;
+
+        if (user is { } )
+            _adminLogger.Add(LogType.Action, on ? LogImpact.Medium : LogImpact.High, $"{ToPrettyString(user):player} set ${ToPrettyString(uid):target} to {(on ? "on" : "off")}");
+
+        component.SwitchedOn = on;
+        UpdatePowerState(component, powerReceiver);
+        component.NeedUIUpdate = true;
+    }
+
+    private static void UpdatePowerState(PowerChargeComponent component, ApcPowerReceiverComponent powerReceiver)
+    {
+        powerReceiver.Load = component.SwitchedOn ? component.ActivePowerUse : component.IdlePowerUse;
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<PowerChargeComponent, ApcPowerReceiverComponent>();
+        while (query.MoveNext(out var uid, out var chargingMachine, out var powerReceiver))
+        {
+            var ent = (uid, gravGen: chargingMachine, powerReceiver);
+            if (!chargingMachine.Intact)
+                continue;
+
+            // Calculate charge rate based on power state and such.
+            // Negative charge rate means discharging.
+            float chargeRate;
+            if (chargingMachine.SwitchedOn)
+            {
+                if (powerReceiver.Powered)
+                {
+                    chargeRate = chargingMachine.ChargeRate;
+                }
+                else
+                {
+                    // Scale discharge rate such that if we're at 25% active power we discharge at 75% rate.
+                    var receiving = powerReceiver.PowerReceived;
+                    var mainSystemPower = Math.Max(0, receiving - chargingMachine.IdlePowerUse);
+                    var ratio = 1 - mainSystemPower / (chargingMachine.ActivePowerUse - chargingMachine.IdlePowerUse);
+                    chargeRate = -(ratio * chargingMachine.ChargeRate);
+                }
+            }
+            else
+            {
+                chargeRate = -chargingMachine.ChargeRate;
+            }
+
+            var active = chargingMachine.Active;
+            var lastCharge = chargingMachine.Charge;
+            chargingMachine.Charge = Math.Clamp(chargingMachine.Charge + frameTime * chargeRate, 0, chargingMachine.MaxCharge);
+            if (chargeRate > 0)
+            {
+                // Charging.
+                if (MathHelper.CloseTo(chargingMachine.Charge, chargingMachine.MaxCharge) && !chargingMachine.Active)
+                {
+                    chargingMachine.Active = true;
+                }
+            }
+            else
+            {
+                // Discharging
+                if (MathHelper.CloseTo(chargingMachine.Charge, 0) && chargingMachine.Active)
+                {
+                    chargingMachine.Active = false;
+                }
+            }
+
+            var updateUI = chargingMachine.NeedUIUpdate;
+            if (!MathHelper.CloseTo(lastCharge, chargingMachine.Charge))
+            {
+                UpdateState(ent);
+                updateUI = true;
+            }
+
+            if (updateUI)
+                UpdateUI(ent, chargeRate);
+
+            if (active == chargingMachine.Active)
+                continue;
+
+            if (chargingMachine.Active)
+            {
+                var eventArgs = new ChargedMachineActivatedEvent();
+                RaiseLocalEvent(uid, ref eventArgs);
+            }
+            else
+            {
+                var eventArgs = new ChargedMachineDeactivatedEvent();
+                RaiseLocalEvent(uid, ref eventArgs);
+            }
+        }
+    }
+
+    private void UpdateUI(Entity<PowerChargeComponent, ApcPowerReceiverComponent> ent, float chargeRate)
+    {
+        var (_, component, powerReceiver) = ent;
+        if (!_uiSystem.IsUiOpen(ent.Owner, component.UiKey))
+            return;
+
+        var chargeTarget = chargeRate < 0 ? 0 : component.MaxCharge;
+        short chargeEta;
+        var atTarget = false;
+        if (MathHelper.CloseTo(component.Charge, chargeTarget))
+        {
+            chargeEta = short.MinValue; // N/A
+            atTarget = true;
+        }
+        else
+        {
+            var diff = chargeTarget - component.Charge;
+            chargeEta = (short) Math.Abs(diff / chargeRate);
+        }
+
+        var status = chargeRate switch
+        {
+            > 0 when atTarget => PowerChargePowerStatus.FullyCharged,
+            < 0 when atTarget => PowerChargePowerStatus.Off,
+            > 0 => PowerChargePowerStatus.Charging,
+            < 0 => PowerChargePowerStatus.Discharging,
+            _ => throw new ArgumentOutOfRangeException()
+        };
+
+        var state = new PowerChargeState(
+            component.SwitchedOn,
+            (byte) (component.Charge * 255),
+            status,
+            (short) Math.Round(powerReceiver.PowerReceived),
+            (short) Math.Round(powerReceiver.Load),
+            chargeEta
+        );
+
+        _uiSystem.SetUiState(
+            ent.Owner,
+            component.UiKey,
+            state);
+
+        component.NeedUIUpdate = false;
+    }
+
+    private void UpdateState(Entity<PowerChargeComponent, ApcPowerReceiverComponent> ent)
+    {
+        var (uid, machine, powerReceiver) = ent;
+        var appearance = EntityManager.GetComponentOrNull<AppearanceComponent>(uid);
+        _appearance.SetData(uid, PowerChargeVisuals.Charge, machine.Charge, appearance);
+        _appearance.SetData(uid, PowerChargeVisuals.Active, machine.Active);
+
+
+        if (!machine.Intact)
+        {
+            MakeBroken((uid, machine), appearance);
+        }
+        else if (powerReceiver.PowerReceived < machine.IdlePowerUse)
+        {
+            MakeUnpowered((uid, machine), appearance);
+        }
+        else if (!machine.SwitchedOn)
+        {
+            MakeOff((uid, machine), appearance);
+        }
+        else
+        {
+            MakeOn((uid, machine), appearance);
+        }
+    }
+
+    private void MakeBroken(Entity<PowerChargeComponent> ent, AppearanceComponent? appearance)
+    {
+        _ambientSoundSystem.SetAmbience(ent, false);
+
+        _appearance.SetData(ent, PowerChargeVisuals.State, PowerChargeStatus.Broken, appearance);
+    }
+
+    private void MakeUnpowered(Entity<PowerChargeComponent> ent, AppearanceComponent? appearance)
+    {
+        _ambientSoundSystem.SetAmbience(ent, false);
+
+        _appearance.SetData(ent, PowerChargeVisuals.State, PowerChargeStatus.Unpowered, appearance);
+    }
+
+    private void MakeOff(Entity<PowerChargeComponent> ent, AppearanceComponent? appearance)
+    {
+        _ambientSoundSystem.SetAmbience(ent, false);
+
+        _appearance.SetData(ent, PowerChargeVisuals.State, PowerChargeStatus.Off, appearance);
+    }
+
+    private void MakeOn(Entity<PowerChargeComponent> ent, AppearanceComponent? appearance)
+    {
+        _ambientSoundSystem.SetAmbience(ent, true);
+
+        _appearance.SetData(ent, PowerChargeVisuals.State, PowerChargeStatus.On, appearance);
+    }
+}
+
+[ByRefEvent] public record struct ChargedMachineActivatedEvent;
+[ByRefEvent] public record struct ChargedMachineDeactivatedEvent;
diff --git a/Content.Server/Shuttles/Components/StationAnchorComponent.cs b/Content.Server/Shuttles/Components/StationAnchorComponent.cs
new file mode 100644
index 00000000000..c971ed921cb
--- /dev/null
+++ b/Content.Server/Shuttles/Components/StationAnchorComponent.cs
@@ -0,0 +1,11 @@
+using Content.Server.Shuttles.Systems;
+
+namespace Content.Server.Shuttles.Components;
+
+[RegisterComponent]
+[Access(typeof(StationAnchorSystem))]
+public sealed partial class StationAnchorComponent : Component
+{
+    [DataField("switchedOn")]
+    public bool SwitchedOn { get; set; } = true;
+}
diff --git a/Content.Server/Shuttles/Systems/StationAnchorSystem.cs b/Content.Server/Shuttles/Systems/StationAnchorSystem.cs
new file mode 100644
index 00000000000..9ac1ed4d171
--- /dev/null
+++ b/Content.Server/Shuttles/Systems/StationAnchorSystem.cs
@@ -0,0 +1,86 @@
+using Content.Server.Popups;
+using Content.Server.Power.EntitySystems;
+using Content.Server.Shuttles.Components;
+using Content.Shared.Construction.Components;
+using Content.Shared.Popups;
+
+namespace Content.Server.Shuttles.Systems;
+
+public sealed class StationAnchorSystem : EntitySystem
+{
+    [Dependency] private readonly ShuttleSystem _shuttleSystem = default!;
+    [Dependency] private readonly PopupSystem _popupSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<StationAnchorComponent, UnanchorAttemptEvent>(OnUnanchorAttempt);
+        SubscribeLocalEvent<StationAnchorComponent, AnchorStateChangedEvent>(OnAnchorStationChange);
+
+        SubscribeLocalEvent<StationAnchorComponent, ChargedMachineActivatedEvent>(OnActivated);
+        SubscribeLocalEvent<StationAnchorComponent, ChargedMachineDeactivatedEvent>(OnDeactivated);
+
+        SubscribeLocalEvent<StationAnchorComponent, MapInitEvent>(OnMapInit);
+    }
+
+    private void OnMapInit(Entity<StationAnchorComponent> ent, ref MapInitEvent args)
+    {
+        if (!ent.Comp.SwitchedOn)
+            return;
+
+        SetStatus(ent, true);
+    }
+
+    private void OnActivated(Entity<StationAnchorComponent> ent, ref ChargedMachineActivatedEvent args)
+    {
+        SetStatus(ent, true);
+    }
+
+    private void OnDeactivated(Entity<StationAnchorComponent> ent, ref ChargedMachineDeactivatedEvent args)
+    {
+        SetStatus(ent, false);
+    }
+
+    /// <summary>
+    /// Prevent unanchoring when anchor is active
+    /// </summary>
+    private void OnUnanchorAttempt(Entity<StationAnchorComponent> ent, ref UnanchorAttemptEvent args)
+    {
+        if (!ent.Comp.SwitchedOn)
+            return;
+
+        _popupSystem.PopupEntity(
+            Loc.GetString("station-anchor-unanchoring-failed"),
+            ent,
+            args.User,
+            PopupType.Medium);
+
+        args.Cancel();
+    }
+
+    private void OnAnchorStationChange(Entity<StationAnchorComponent> ent, ref AnchorStateChangedEvent args)
+    {
+        if (!args.Anchored)
+            SetStatus(ent, false);
+    }
+
+    private void SetStatus(Entity<StationAnchorComponent> ent, bool enabled, ShuttleComponent? shuttleComponent = default)
+    {
+        var transform = Transform(ent);
+        var grid = transform.GridUid;
+        if (!grid.HasValue || !transform.Anchored && enabled || !Resolve(grid.Value, ref shuttleComponent))
+            return;
+
+        if (enabled)
+        {
+            _shuttleSystem.Disable(grid.Value);
+        }
+        else
+        {
+            _shuttleSystem.Enable(grid.Value);
+        }
+
+        shuttleComponent.Enabled = !enabled;
+        ent.Comp.SwitchedOn = enabled;
+    }
+}
diff --git a/Content.Shared/Gravity/SharedGravityGeneratorComponent.cs b/Content.Shared/Gravity/SharedGravityGeneratorComponent.cs
index 1f78e333f15..75b636b2fa8 100644
--- a/Content.Shared/Gravity/SharedGravityGeneratorComponent.cs
+++ b/Content.Shared/Gravity/SharedGravityGeneratorComponent.cs
@@ -1,118 +1,44 @@
+using Content.Shared.Power;
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
 
-namespace Content.Shared.Gravity
-{
-    [NetworkedComponent()]
-    [Virtual]
-    public partial class SharedGravityGeneratorComponent : Component
-    {
-        /// <summary>
-        /// A map of the sprites used by the gravity generator given its status.
-        /// </summary>
-        [DataField("spriteMap")]
-        [Access(typeof(SharedGravitySystem))]
-        public Dictionary<GravityGeneratorStatus, string> SpriteMap = new();
-
-        /// <summary>
-        /// The sprite used by the core of the gravity generator when the gravity generator is starting up.
-        /// </summary>
-        [DataField("coreStartupState")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public string CoreStartupState = "startup";
-
-        /// <summary>
-        /// The sprite used by the core of the gravity generator when the gravity generator is idle.
-        /// </summary>
-        [DataField("coreIdleState")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public string CoreIdleState = "idle";
-
-        /// <summary>
-        /// The sprite used by the core of the gravity generator when the gravity generator is activating.
-        /// </summary>
-        [DataField("coreActivatingState")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public string CoreActivatingState = "activating";
-
-        /// <summary>
-        /// The sprite used by the core of the gravity generator when the gravity generator is active.
-        /// </summary>
-        [DataField("coreActivatedState")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public string CoreActivatedState = "activated";
-
-        /// <summary>
-        ///     Sent to the server to set whether the generator should be on or off
-        /// </summary>
-        [Serializable, NetSerializable]
-        public sealed class SwitchGeneratorMessage : BoundUserInterfaceMessage
-        {
-            public bool On;
-
-            public SwitchGeneratorMessage(bool on)
-            {
-                On = on;
-            }
-        }
+namespace Content.Shared.Gravity;
 
-        [Serializable, NetSerializable]
-        public sealed class GeneratorState : BoundUserInterfaceState
-        {
-            public bool On;
-            // 0 -> 255
-            public byte Charge;
-            public GravityGeneratorPowerStatus PowerStatus;
-            public short PowerDraw;
-            public short PowerDrawMax;
-            public short EtaSeconds;
-
-            public GeneratorState(
-                bool on,
-                byte charge,
-                GravityGeneratorPowerStatus powerStatus,
-                short powerDraw,
-                short powerDrawMax,
-                short etaSeconds)
-            {
-                On = on;
-                Charge = charge;
-                PowerStatus = powerStatus;
-                PowerDraw = powerDraw;
-                PowerDrawMax = powerDrawMax;
-                EtaSeconds = etaSeconds;
-            }
-        }
-
-        [Serializable, NetSerializable]
-        public enum GravityGeneratorUiKey
-        {
-            Key
-        }
-    }
-
-    [Serializable, NetSerializable]
-    public enum GravityGeneratorVisuals
-    {
-        State,
-        Charge
-    }
-
-    [Serializable, NetSerializable]
-    public enum GravityGeneratorStatus
-    {
-        Broken,
-        Unpowered,
-        Off,
-        On
-    }
-
-    [Serializable, NetSerializable]
-    public enum GravityGeneratorPowerStatus : byte
-    {
-        Off,
-        Discharging,
-        Charging,
-        FullyCharged
-    }
+[NetworkedComponent()]
+[Virtual]
+public partial class SharedGravityGeneratorComponent : Component
+{
+    /// <summary>
+    /// A map of the sprites used by the gravity generator given its status.
+    /// </summary>
+    [DataField("spriteMap")]
+    [Access(typeof(SharedGravitySystem))]
+    public Dictionary<PowerChargeStatus, string> SpriteMap = new();
+
+    /// <summary>
+    /// The sprite used by the core of the gravity generator when the gravity generator is starting up.
+    /// </summary>
+    [DataField("coreStartupState")]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public string CoreStartupState = "startup";
+
+    /// <summary>
+    /// The sprite used by the core of the gravity generator when the gravity generator is idle.
+    /// </summary>
+    [DataField("coreIdleState")]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public string CoreIdleState = "idle";
+
+    /// <summary>
+    /// The sprite used by the core of the gravity generator when the gravity generator is activating.
+    /// </summary>
+    [DataField("coreActivatingState")]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public string CoreActivatingState = "activating";
+
+    /// <summary>
+    /// The sprite used by the core of the gravity generator when the gravity generator is active.
+    /// </summary>
+    [DataField("coreActivatedState")]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public string CoreActivatedState = "activated";
 }
diff --git a/Content.Shared/Power/SharedPowerCharge.cs b/Content.Shared/Power/SharedPowerCharge.cs
new file mode 100644
index 00000000000..5599930f37a
--- /dev/null
+++ b/Content.Shared/Power/SharedPowerCharge.cs
@@ -0,0 +1,77 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Power;
+
+/// <summary>
+///     Sent to the server to set whether the machine should be on or off
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class SwitchChargingMachineMessage : BoundUserInterfaceMessage
+{
+    public bool On;
+
+    public SwitchChargingMachineMessage(bool on)
+    {
+        On = on;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class PowerChargeState : BoundUserInterfaceState
+{
+    public bool On;
+    // 0 -> 255
+    public byte Charge;
+    public PowerChargePowerStatus PowerStatus;
+    public short PowerDraw;
+    public short PowerDrawMax;
+    public short EtaSeconds;
+
+    public PowerChargeState(
+        bool on,
+        byte charge,
+        PowerChargePowerStatus powerStatus,
+        short powerDraw,
+        short powerDrawMax,
+        short etaSeconds)
+    {
+        On = on;
+        Charge = charge;
+        PowerStatus = powerStatus;
+        PowerDraw = powerDraw;
+        PowerDrawMax = powerDrawMax;
+        EtaSeconds = etaSeconds;
+    }
+}
+
+[Serializable, NetSerializable]
+public enum PowerChargeUiKey
+{
+    Key
+}
+
+[Serializable, NetSerializable]
+public enum PowerChargeVisuals
+{
+    State,
+    Charge,
+    Active
+}
+
+[Serializable, NetSerializable]
+public enum PowerChargeStatus
+{
+    Broken,
+    Unpowered,
+    Off,
+    On
+}
+
+[Serializable, NetSerializable]
+public enum PowerChargePowerStatus : byte
+{
+    Off,
+    Discharging,
+    Charging,
+    FullyCharged
+}
diff --git a/Content.Shared/Power/SharedPowerChargeComponent.cs b/Content.Shared/Power/SharedPowerChargeComponent.cs
new file mode 100644
index 00000000000..96f26a7903c
--- /dev/null
+++ b/Content.Shared/Power/SharedPowerChargeComponent.cs
@@ -0,0 +1,14 @@
+namespace Content.Shared.Power;
+
+/// <summary>
+/// Component for a powered machine that slowly powers on and off over a period of time.
+/// </summary>
+public abstract partial class SharedPowerChargeComponent : Component
+{
+    /// <summary>
+    /// The title used for the default charged machine window if used
+    /// </summary>
+    [DataField]
+    public LocId WindowTitle { get; set; } = string.Empty;
+
+}
diff --git a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
index a382e943ff9..f6929278ed7 100644
--- a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
+++ b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
@@ -5,6 +5,7 @@
 using Content.Shared.Whitelist;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
+using Robust.Shared.Physics;
 using Robust.Shared.Physics.Collision.Shapes;
 using Robust.Shared.Physics.Components;
 
@@ -125,7 +126,7 @@ public bool CanDraw(EntityUid gridUid, PhysicsComponent? physics = null, IFFComp
         if (!Resolve(gridUid, ref physics))
             return true;
 
-        if (physics.Mass < 10f)
+        if (physics.BodyType != BodyType.Static && physics.Mass < 10f)
         {
             return false;
         }
diff --git a/Resources/Locale/en-US/components/station-anchor-component.ftl b/Resources/Locale/en-US/components/station-anchor-component.ftl
new file mode 100644
index 00000000000..fd9d5ea4aec
--- /dev/null
+++ b/Resources/Locale/en-US/components/station-anchor-component.ftl
@@ -0,0 +1,2 @@
+station-anchor-unanchoring-failed = Can't unanchor an active station anchor
+station-anchor-window-title = Station Anchor
diff --git a/Resources/Locale/en-US/power/components/power-charging-component.ftl b/Resources/Locale/en-US/power/components/power-charging-component.ftl
new file mode 100644
index 00000000000..b4743bd1022
--- /dev/null
+++ b/Resources/Locale/en-US/power/components/power-charging-component.ftl
@@ -0,0 +1,22 @@
+## UI field names
+
+power-charge-window-status = Status:
+power-charge-window-power = Power:
+power-charge-window-eta = ETA:
+power-charge-window-charge = Charge:
+
+## UI statuses
+power-charge-window-status-fully-charged = Fully Charged
+power-charge-window-status-off = Off
+power-charge-window-status-charging = Charging
+power-charge-window-status-discharging = Discharging
+
+## UI Power Buttons
+power-charge-window-power-on = On
+power-charge-window-power-off = Off
+power-charge-window-power-label = { $draw } / { $max } W
+
+## UI ETA label
+
+power-charge-window-eta-none = N/A
+power-charge-window-eta-value = { TOSTRING($left, "m\\:ss") }
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index f3ff3210257..03e4c894ee8 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -1601,6 +1601,22 @@
     recipes:
       -  ShuttleGunKineticCircuitboard
 
+- type: entity
+  parent: BaseMachineCircuitboard
+  id: StationAnchorCircuitboard
+  name: station anchor machine board
+  description: A machine printed circuit board for a station anchor.
+  components:
+  - type: MachineBoard
+    prototype: StationAnchor
+    stackRequirements:
+      Capacitor: 4
+      MatterBin: 3
+      Steel: 10
+      Glass: 5
+      CableHV: 8
+      Uranium: 2
+
 - type: entity
   parent: BaseMachineCircuitboard
   id: ReagentGrinderIndustrialMachineCircuitboard
diff --git a/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml b/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
index 6ee454c6a98..2880f819a72 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
@@ -50,9 +50,11 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Breakage"]
-  - type: GravityGenerator
+  - type: PowerCharge
+    windowTitle: gravity-generator-window-title
     idlePower: 50
     activePower: 2500
+  - type: GravityGenerator
     lightRadiusMin: 0.75
     lightRadiusMax: 2.5
     spriteMap:
@@ -60,10 +62,13 @@
       unpowered: "off"
       off: "off"
       on: "on"
+  - type: ActivatableUI
+    key: enum.PowerChargeUiKey.Key
+  - type: ActivatableUIRequiresPower
   - type: UserInterface
     interfaces:
-        enum.GravityGeneratorUiKey.Key:
-          type: GravityGeneratorBoundUserInterface
+      enum.PowerChargeUiKey.Key:
+        type: PowerChargeBoundUserInterface
   - type: Appearance
   - type: PointLight
     radius: 2.5
@@ -124,9 +129,10 @@
     board: MiniGravityGeneratorCircuitboard
   - type: ApcPowerReceiver
     powerLoad: 500
-  - type: GravityGenerator
+  - type: PowerCharge
     idlePower: 15
     activePower: 500
+  - type: GravityGenerator
     lightRadiusMin: 0.75
     lightRadiusMax: 2.5
   - type: StaticPrice
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 114f0412656..239cc67b7df 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -468,6 +468,8 @@
     - SodaDispenserMachineCircuitboard
     - DeepFryerMachineCircuitboard #Nyano - Summary: adds deep fryer circuit board
     - SpaceHeaterMachineCircuitBoard
+    - CutterMachineCircuitboard
+    - StationAnchorCircuitboard
     dynamicRecipes:
       - ThermomachineFreezerMachineCircuitBoard
       - HellfireFreezerMachineCircuitBoard
diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml b/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml
new file mode 100644
index 00000000000..2f6e42bbf18
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml
@@ -0,0 +1,112 @@
+- type: entity
+  id: StationAnchorBase
+  abstract: true
+  name: station anchor
+  description: Prevents stations from moving
+  placement:
+    mode: AlignTileAny
+  components:
+  - type: StationAnchor
+  - type: Transform
+    anchored: true
+  - type: Physics
+    bodyType: Static
+  - type: AmbientSound
+    enabled: false
+    range: 4
+    volume: -4
+    sound:
+      path: /Audio/Effects/shuttle_thruster.ogg
+  - type: InteractionOutline
+  - type: Sprite
+    sprite: Structures/Machines/station_anchor.rsi
+    layers:
+    - state: station_anchor
+      map: ["base"]
+    - state: station_anchor_unlit
+      shader: unshaded
+      map: ["unlit"]
+  - type: GenericVisualizer
+    visuals:
+      enum.PowerChargeVisuals.Active:
+        unlit:
+          True: { visible: True }
+          False: { visible: False }
+  - type: Appearance
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.7,-0.8,0.7,0.8"
+        density: 190
+        mask:
+        - LargeMobMask
+        layer:
+        - WallLayer
+
+
+- type: entity
+  id: StationAnchorIndestructible
+  parent: StationAnchorBase
+  suffix: Indestructible, Unpowered
+
+- type: entity
+  id: StationAnchor
+  parent: [StationAnchorBase, BaseMachinePowered, ConstructibleMachine]
+  name: station anchor
+  description: Prevents stations from moving
+  placement:
+    mode: AlignTileAny
+  components:
+    - type: PowerCharge
+      windowTitle: station-anchor-window-title
+      idlePower: 50
+      activePower: 2500
+      chargeRate: 0.5
+    - type: ActivatableUI
+      key: enum.PowerChargeUiKey.Key
+    - type: ActivatableUIRequiresPower
+    - type: Anchorable
+    - type: ApcPowerReceiver
+      powerLoad: 2500
+    - type: ExtensionCableReceiver
+    - type: Damageable
+      damageContainer: Inorganic
+      damageModifierSet: Metallic
+    - type: Repairable
+      fuelCost: 10
+      doAfterDelay: 5
+    - type: Destructible
+      thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 150
+        behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Breakage" ]
+      - trigger:
+          !type:DamageTrigger
+          damage: 600
+        behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+        - !type:PlaySoundBehavior
+          sound:
+            collection: MetalBreak
+    - type: StaticPrice
+      price: 10000
+    - type: Machine
+      board: StationAnchorCircuitboard
+    - type: ContainerContainer
+      containers:
+        machine_board: !type:Container
+        machine_parts: !type:Container
+    - type: Construction
+      containers:
+      - machine_parts
+      - machine_board
+    - type: UserInterface
+      interfaces:
+        enum.PowerChargeUiKey.Key:
+          type: PowerChargeBoundUserInterface
diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml
index d0e6f370948..dbb4cd68df2 100644
--- a/Resources/Prototypes/Recipes/Lathes/electronics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml
@@ -939,7 +939,6 @@
   completetime: 6
   materials:
      Steel: 100
-
      Glass: 500
 
 - type: latheRecipe
@@ -977,6 +976,16 @@
      Glass: 500
      Gold: 100
 
+- type: latheRecipe
+  id: StationAnchorCircuitboard
+  result: StationAnchorCircuitboard
+  category: Circuitry
+  completetime: 8
+  materials:
+    Steel: 100
+    Glass: 900
+    Gold: 100
+
 - type: latheRecipe
   id: ReagentGrinderIndustrialMachineCircuitboard
   result: ReagentGrinderIndustrialMachineCircuitboard
diff --git a/Resources/Textures/Structures/Machines/station_anchor.rsi/meta.json b/Resources/Textures/Structures/Machines/station_anchor.rsi/meta.json
new file mode 100644
index 00000000000..b345534a4c6
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/station_anchor.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made and posted by ubaser on the SS14 discord.",
+    "size": {
+        "x": 64,
+        "y": 64
+    },
+    "states": [
+        {
+            "name": "station_anchor"
+        },
+        {
+            "name": "station_anchor_unlit"
+        }
+    ]
+}
diff --git a/Resources/Textures/Structures/Machines/station_anchor.rsi/station_anchor.png b/Resources/Textures/Structures/Machines/station_anchor.rsi/station_anchor.png
new file mode 100644
index 0000000000000000000000000000000000000000..694a35a0d23482afbe5ee8d01f32c304f0401013
GIT binary patch
literal 3751
zcmZ`+2{@E%8y;h)5e=gsF-AqiShE}^WZz|9vW>B18O-=+6dEIY!f%P+oUuz;DoggY
zP_|G}$Qqdz#<67g4|O`7^Plrx*ZaNi_k7QNKhJZ&%XNKmW+u8IHa<20007e0)4EI>
z)ek!h6YY85J8+UV&|xm?Y62<-1Sqr@4wS9Fhp{n0oHl2n^}{x7kxF~A2I$#g003^|
z!%mmhlL!X@=)=7&ZLzk-Mk+|OpOmXR+6^Uz_X{{esp3^=Q$G~e6^i%s^~b2-)nG>+
zDzy2b84iOUxnO<NV7A6)&`anb6!e0Ww3IXq!3KpwRfF6;R4!}je23HC)L>p%Y=8<J
zj>F-kaB@=UAWyiAva&K<S{5!VD@pT^#Dw@`UGb9s7?E!zzw>CJFvuY90IWCKA9~2^
z>V^)+s=;7~fqt}adAcKi#0dxv@;!>;j)bFpQGO_YECwzkB?JFE9M;?8j|}}W-{qhQ
z13&yigGv7_Og{jNl&2}Bji=@Fy*^r^$fLLztULTC2e_=Xw34K>tfZ_m{6~GX^i|!F
zDp+r<FX~9RAN3q5sNswKv-QybPy%1?LuFNbUHv`PV0cM)l!t4uFBXQd@;{<-hiU|2
zap)i)RrojWKeK$Z{+V1A{x^B39#*encNv92`vxECkC2g*RXx(=Pu4$H;v2&DZxKIR
z|B5j4LSxaiofYJb)c41tf&zkQyX+|9@A3ZG<F8zQ1h?|{#v*<v_>1``)K9CV@?AK~
zqZRpoIsei1JKZ;Ff7-F%j>FM1(9Q#bO%?v*Y$4e82FRNL09%Q^mWCys?n}0Q0>t=4
zcWKRWwrfGU&2`YaglQsCFm0t+a2FU3xOi)F4=C8QG2I!NFUasUfqk}x$gIoYT>jh{
zyO&T>(sTcsZx$|^Lbxj@Atx&flYQJXoSzvJ0@}SR|4`cR>GA=j=d^MwLR|w%-S#q)
zuXTZaR)#H4)Pvc=3^skbZ=b?UpepArQuAsbrJ98SU$Za0YxLZ^()e#4-120R&{wHi
z^puk-p4vtgN7=P5o96RV*79l>iXBAg>CLALbdyFToLWNdz9N|!Nx$GKly2;YlJ4hl
zIVtfg`j>ShJ@>ZP!%G4Isp9U{z|(cSwvKD8QUWz6q}3EpdXnp9a`()%m@n$!%3w@9
zgQ9hr&7oVB4F%)#y>}D?E{1Kt!V6xiGITW&F5s3a0n`z_awxNnm!MM+K_Ggp`nh0^
zYDoS}!>N2_HMMuW;GX(x>sO88qZBK^UHHs=>he@8oI?mPk*_Ex_mZy{^b7=%w6`pH
z`tlZADOc%099WbsT(IIwqji~mO;5Da!+4LkA2^!Xs81<yyUId!I`x>gaxaoeo#SI)
zyOlM{OCtDd3wt6>m!Vg=Axr^WY5QBNA7FNR3I85z<+@aO48Oa*?qiH8Nwp%FI5TjP
zgpBei43fn+vwbeD`R9T9V;B?nz@}%K@_dh589lStu%;ukgk`C9Sd<ke_8b>N$Y;j-
z%vPD$(hV>pj5cTi1D}_CNSCn5cnZE;zWMp#pou-$ipXiapb(WYbb%jtx&K&D$5NU(
z`QR-n`-Pb|hanz#t|^hn(Nf2O02#Cvbrw{`KdcL!>+&*8X2jdKT$Eo9q=<xeM&jee
zHg2Kb=e`8yAK)Z)SoJr7OkMVx4+)UBc_FPXWz;fZ{u1(v{31?VU5~`llGXb>%m7Ls
zd)t0-{nsFW#4w+Ts_K*LQ{hyFF-GyJtBlPCtg_nmkwq6-CtvI2HN*>#r07V9>BorN
z6y<o6kPg|Xv12^uJpfKWaREK)7`n4jKJnPk;ny8C!6E0ANnQ=E7*E-ol~4Egc8t01
z`HQ`!A4QtBRy>#zHMFJ+V`yA(VVSx2R1gvB)ydNNywv8wRqXv=irQ=$A_|q4gFcOv
zSLG)FJ=Z_J-Visgeh@eCXtkR=dDu;VeIY7F(Ruj9EhP{uU&zJak7-36?7UL1EW`lX
z1AV(M#dXUhtYQ{86ov&<ZfMbMR)wa^TB6QrTa>NL@F>O_B>NZ{8!L=BHsOcjv%#YK
z=69xEJKfM?1)qa5Rg`Qx)cPyj>^{Xg{rPRx2=T`5W*}Hl?gN%?f*~rGfl5~%!4zNE
zkzI2$%WbM9EIM^gl-JD9d{fSVj>ML0!6DC=#1i=y^BYU*Zx3o%{sY4Y(hiGTXFN~z
z+`CAb1+%{HBq6{4k#dIw-6X***-(|}9E8(;9S|Z#YVN-c=W_}=_dJQhZ4NXN=9K4@
zwg>d6YdlTyd_m5dEt$^c%1cU${e>de*-Hwi48I%^Wf!w}zW^#fja&UC<hQ~a{bwVB
zw?YKA%c7X7rzOsn*DNV+m9Gy6(V6I+bwpa7f+@{kwP9xq?@N4eJXAlK`0R`1&0TU8
zVA0I!4$3<te}~y?mWcrLxXs%o@+_)pJOa!koz7|CgtMDwjALjd^SpCz!n*>&RH_fU
zvNe29R_@0BZb-Z7Ly!Ld&eAHge(!Z_<IN*vVvu#mby6OpvhLGnbYDFYXyHS!i8jfP
z;1n!8M&w5%p)tQzvqR2{ab~8mn!Rrd+Zoxums<&?jK*dNukHS;9ceOo-YPzuG^GGZ
z`482cTI2D8tOlAw3Fe$N5wkuGTbIL3OG6xnP^zi>_MvCzeahNPZ!CuKbGwZVhF*|y
z6)joG%Xq~sHdQ+RK8`0}*Leg=dc*OhvuSargK8x3FQPdcA@;c2C9Q*{Eg51$w~qRt
zi?8Up^R}f8GwYv5bqwHIS68;)HR5=2OB0VmfZS|nXW2y`M=Mcv(MeYy#R@-TjLP_O
zi$yxInY+$Kvpp%Jngz?KQG^I!iGDsMc_zUc8F@Q~OZD-4KhWuh3?|yGHDwTaWy`tV
zcDJN>RL*;l-kWoCf3HzU3IccXMHog?0~QDKwq=G#Ca?H4iv??f29uQ=07JElCnmvt
z>#m$;!X1r(H6`=T<d3pXDn>>tuJ~+bHX69bL+Pvo=6lk0lm*hE6D^QlbykM%)BGdv
z%!tmV)hpwE!CPMQ65d~KlyhI`hibV^a7T7Y^xH+u)@VC(-2oTlQ{v?A-Vq+zxteTC
zK#9E$Vc*<Z6*c_QNT2a$T~?lZLQAL=77j=cc3Y|9f8*82T@js~cyr>RYb5J=3{!$K
znWt^npdLUp1G@~jO*UUo7_UWVzh%#f=bCny9xgKM2d#^rO3!^VH1;N+z%ux88^MWG
zcO1n>*9$D}ku2t8s4V^Go}JLcG;p?ybJI^Yg&_L^?Kf3(6$S|z{#m)qYb$OnA_rKe
z$VH%mZk&fGqUatsCpv1DlA;e_G`g;L!~H&6E}t&`pgD=(4Zv8qU6`69@7F%j2#~5n
z^=42E??}}+62@<LLHUh<JR-#m@d7Qv0dCSu&ZM-vT!?KM<Yl6BL2As|>Ik}-sxr|T
z2MoAg-KU0MopoXy6WpI(n?_h?X>#FPEidbM;Of*d$ML!xv-DoA-h5A=C%Gmg?b9dI
zSB?aLv|xmVjv4oSL|c*amh$QvYJ<g8+OTJYSIl&_cDui_Hzl@ZvDi$Lo|6nbE8~$<
z!jtPl%7HZ*kvc7j`=Z2-cI|4ivRAQU*SQU)fN4OdRjDIy;+u_UZbG`udpYtpTeHq_
zczWlKoflSh^v4Xj3<}7Pur|^la(MW_S8Zn1E(`Hr8$wn+rfeve1E0KnzFq}s1Ip`8
z!;)|scc>lUC)bLj$R;8>b4tsj+V)~}QAlBB!?xh*D?1_ATBhz1ETxS=d*CX>%pOyV
zDVrtV+T6$E{p?AQGs!_a6B-#Y=L_4a%UqiWv*cMSyQ&8g6BMs!pWKwg@?Ba@37zNI
z=v3-oXX=tlh;+Kk_%w0t7TOA~1fja9V~}G39V=12Wd$!Z8#V|rw2NY#=Va6T?m=Ic
zT=_Jpc?i<>Rhghd%2d~S9I=}-60PFeOul~-#&}<^C$;xQE(4<fN%khgcx%;rYfnjN
z7hOE(h1|k2gO^>b3-X^8IUv(_%Y;6xd%V#ko$~s8+?2|cL={gy_~7VL&8TjsSi4qm
zuLz`<0@52Achruo1gMps93Ick@idxaZB1XD+s~(jys|aHFI?v#@SGNqQsh$zE2D~C
zL2ljef4%+D<jkX12(quSol~t@Bfe$qf%8FnL($MM1=q~P-fBaqNlf-MnY(%>nT#o4
z;>heiXbs(RD_MKzJ)UWk3BvAD=2*$yZMi^k2|`BJOp1uEeY^I&&s6lQ1B94%#N3#S
z{2U+oOr2BMj)~B&1|xw%OS|v(z`iqZYbld^q3n!Diflu~Mr`>8(h<lmx)Nt}F@}LR
z++B07z(LBi3z{H|Q{ee3^^VlMo|spfDj2zgo1->s+>_|;JxQ7vJJ?<ko;lNIt2*<d
ic9k!4v~AgEdg_Grt0wR9^Vq|mM15@&tqM&S;{O0wQGIp*

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Machines/station_anchor.rsi/station_anchor_unlit.png b/Resources/Textures/Structures/Machines/station_anchor.rsi/station_anchor_unlit.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8f069f45dc94a2f30354e8bbd6ff81e411138fc
GIT binary patch
literal 3330
zcmZ`+2{@G78=o07vR~06ThoM5Vg^MsjV;R<3}L9b!eGX74Kv0}Cdpbuk%&oIiyOBT
zg^IFs5whi4ll4l<(#@8w|4_GE_uoCwbG~!V`@O&4`<~x>&i6dug=3ajQ6Xs|001D0
zGc~f|jrtp1fS>og<K_2?Hvs)@utx!TEwXQT3o*(GoI4&5*w32_@cKsUuub4S1?i?l
ze*j<`exm~u8!sUM0KQ-^!U^UHyan2g=A-69rnyqo*go`46o!rFO?@a#7bx3@>g$hY
z>%cZW(7gGE83BWCx-h+UU?=d$poTOC1*)ZnR71jag`iL<hCy~m+ZdUAf%8^6Fi$3v
zjz%B?0s_<mG}UMf4}>}jg+d@T5E>e)JP%d>)4og>wyLlH-p?d|^B7V5-56eUrWef@
zy20z>N@Fo~V6crqU)$$A$!=fc&{+)XW)!j;f<mSEP<)yG2z51e#E)=HFZX{k^!5KD
z2TvHp#v2|C`9m0v&U8D-Q_7gl%je7fc!|1g#`R~C5#Kl<G?2){sz?o04HV+*{&?wQ
z$Zlw+7n4fa6z=POHWf6WGQYQO_-{x+_1aJtO?C10(1Ed4$rN`N7L^Ipwe#JiB0~)r
z%m5n08-w`l{XNTP>-Xds#1HboZ0sIQw4wOZsH_eBb=5UBFq@iuXZ@!VpAjd1i1^m}
zZ^SWA8k5F5Sqv{XoG+8Ypfh-<Y%}8D@&4Q6-(3F$xAXO4>i$jeFY`C3Z>og;A{=3}
zBL6Svf4Y95`z-A@C-(Do*enC@KIjTz5MS?>uFzUb`V#MU^5KjO2yEcg&x6s&jkjeC
z<U@4k#5)~^4Q<*ZB*MlDtQWQ=UcVS-Pfpw?Y@K(nD<dvNWlf_Alx5M_H5g}5giGN-
ze<AH5?wOYW>wt~t*Z%U+tw+^d_xBiYSu1cp(<>a{G2V>I_<-UWn#%?cxi2I?ucY#;
z+4BF~_0#l|TtdEB&Tk?2O}*W@3|zzf^8><>T5UT!3*x7h2g~^L{kBodQSiY5hnYsM
ziVEk<;`E`otY*i%k~LAiD9rUz6Tvs;AXg(|9kB0_0)F6@f#!~+juxeJe$f)`N#M>)
z8j`JCMJWw>oh$Kz4t4noK<ULy2R|<Bq%<|g$`8ajj%Nbt3rj8^>VLoea^#sUa{Mw`
zN)exoRr4ZD-59!;wiqxsMw@~dnw$Cuwob?n!#^HA*vJ3cF~pc_Vh8dFdQpAcZeK#w
zugLTRTiL=F5}zFyn-JUv2kh1R*sfbRa`Vse$&zR<Eq3Ck99Tko)kK8M;cyjawF|*l
z@2576fJuF$oQQduy5{G?NsFmql&eK;qxdnaoy9TKmqt|)qh-SRzh|kwC+o~wrve^@
zM;Pud^^rfZMov)h1bM!du_eBJ&`-WFv^$7=4>h}P>68-QJ`K@)V{xkT{mnPg1N@pd
z&qIVC*S52|ty&-d=6&cF_~HAP?`9~IY+b_jcVw#pTZ*-Sy9QGM;S%f132`Fvo-pv9
zfqaiB5e2C8sAk*tbx_Hvy#9`o>D(f30lT?-0J5w0Tbtbp0g8~e%AIdCIUnkm9^R4_
z1>GqGJlN^9Qshu<Y!e!rSZ@_Ke=<~b_pDt_{U{vi-8?l>*|zIUILjUyCFy1$fiXw|
zbFMNPFk48kN&+1OwR)@UdkRG;bgplN#Q|iOC^a5}rTB2P61Z?|gQr6gUzn<I%k_M*
zU61Rt@|PqEZ@AhfhhB6s3ss;yyDLqsrMH5~7efaIss&qzSyD1*7k)_uM_TVoRthy~
zL?z7&A;asV1>r!&?lhe(yLw<GF=<8QvA>irMu=WfLNx@2UiaQsAquLcl!trZ?8tM6
zr3|s1Qx2kvZWFN%%~b>4%+`#T*kG>X+mz_Eg(n^vn$8&*TCBX@ODE00VtOC0QIZ#6
zbg+;b!CuxOtoqXJ&c->Ia-mEv9H>5-;`H&H{q*IW;GylQNbz$b;M|qSjI&nglzXC7
zN(EhFRGcfgdm_Iq6WVphQXXOg=-DnV<?F|c9l^<Up2qs&qWZScqkB)6FK=y&PB?C)
zs4m^R?{S0W%FX#Ei`?x8v{zS8h2GA2w^Xb3!Z)D#g681I;|{s?!3|1K`?faSp4$AL
z1Inr_jap4<eUiehN}W$~51=;Mk5GiWy7|ir8G4WZ-0}=kg;TLSC!{MiMgSpwK*p}N
zYkWH87w5N*Wj@`JB3!X*{^)~maYyRXh=0v97k#_BARO_&Y3_|(cdFI70IewQyCTpI
zTl<2ma;KLWd>`}P=Xf!@W6I33VlS(fcB>reJ@@GvZCsI6BL5<%e5i`-V+|q<W<Diu
zZ&g=|!ECv#HHnd#%R0Xv?8FkB$f1$oSf$b8ohb@0DR_Wh(h_53X}nu~%Byc=Yq8g~
zozWH6l^BoWy$|^b>G1UO*$gOAL*txz^w7ZKHDSF^hQrW3@L2qNm;h05#~diVj2@#{
z8DXZ+ZgSMxXWenZM|?)0>Qqu6|5S_ks42m$Tlf$OXjM`FWGGNbmn-#d-rQctg+r_O
zLqyCeu&>SpFVimv8V5fedx+G0L`_5T@$qH%PbI&xecc@E95Qn!4JaD{wOJ>M>A?iU
z$}9o>rhEv=?YK%fer{#I6IE>HbY$P*;gaZgkbO}&&QQIHc3dAzTkOdEjZk^W@VgQ@
zWv<p7OaKWBzx!T55ILAn&cxXTKC7x14uTSwXMdJ(CA`hk`?Q=wn0;zEJ}R^Yf71Wj
z{#c=qv`|_5mh106Xo6<mv&+u9xkgucT4pS3MOvNBX>o)O$o1EW22ZtP-GM`wt7R3E
zj^@0+6D;Qo=6y73ca}cCnI>2_T9{rJ3L+O2v5E?{si|qZrAV{flYBRZcEG!Q2(HVc
zS)3KlaYn6TP#2ajdXTtceV#0=Lc1hj+JY$v2+6E6JO3n51gey9IMGYH(Pk&B{8o7$
z)+0^Ufb`nL7En;3oZV)=9vRhgSH!fh2_2j{{YtB}GgT{lYJpWZY%|$}9?o?Ht{uqf
zeho2P?6;y|>A|MyqO!`XT)Nh+Xegl2V5l;}`0d=B!7|4K+vxYKFYH(NernHEdBYgA
zd_-aW<!kZnc*P1cKFy{ixnCuQa1Sz7iFLPTj?VUseuPgpm<Bp(pFitxoFEY-URj$=
zCoNij7%`XBOa?y(`pA(PipH}e4jHv(F152b&R8+H%AS`eBxJT}%<2P>Q=Pb4FkiW+
zLBRDDQnIugM>we4*|Q~uek9u*cP(`}zCxq$Qth4<CrSO#>T8Q6tL&s9NP7L&W*rw5
z!w?JXZ!Z>Wrq|u{-Y6{9{;{<8Zl`o;ivkc_@vc2*qB;GHgCsQ?B(Y2|2B73;*H(K>
z3P&EW6urYaIj7WsVL&nCtKxEaKg+>SuN>GR`Teo%aqx+}sw%%-FK%<gYQ~<@q*pWI
zj==9<a@Hq`tC&mbV;xeblKMl8Yfxnh?6=}oc4`VX&g$2@a1W~}D_yE{h@hdU{>hO=
zPM^Y<L|c4+@2c@)e8ky>rh7;7{%SCeu!v7HD4DZ*4PMtXS*KZJj$-_6g9~Rs9iAjo
zTS$H6$xBk7o<ziK5sb$rvK3h_GNkGq>yGr!$R}sPpx74dDWy)`nsCqa=OzpvN|a76
z;v~Z$`%^m!Avc0<$0v^rB~J>IE_#H5YdfzfH<VMI^U&=3GXgo83I}lj$n&gPgKPo1
zUXrK@*P>{59gaIREK$ARIHH3mnWr2itM!$cdAtBVt}8w}%%LLPivI{M|Cw|g=snm*
zNbs~GP_PXBpzijIpO!sfKp-i5k0cl7n3>?$UaArx<{4}69xo){RZ^}oN4(c7((HZ%
b$G^_E5;I$QW`Ja{@&AD{wlvB+N(%oUb$FG#

literal 0
HcmV?d00001


From c169f5a1e0a3a06b3d804c867699cb4519bf2a6e Mon Sep 17 00:00:00 2001
From: Plykiya <58439124+Plykiya@users.noreply.github.com>
Date: Thu, 3 Oct 2024 19:55:36 -0700
Subject: [PATCH 337/366] Two additional checks to prevent FTLing stations
 (#32558)

Add two additional checks to prevent FTLing
---
 .../Systems/ShuttleConsoleSystem.FTL.cs       |  3 +++
 .../Systems/ShuttleSystem.FasterThanLight.cs  | 20 ++++++++++++++-----
 Resources/Locale/en-US/shuttles/console.ftl   |  1 +
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs
index c214bb015c9..e2bb5887aa8 100644
--- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs
@@ -124,6 +124,9 @@ private void ConsoleFTL(Entity<ShuttleConsoleComponent> ent, EntityCoordinates t
         if (!TryComp(shuttleUid, out ShuttleComponent? shuttleComp))
             return;
 
+        if (shuttleComp.Enabled == false)
+            return;
+
         // Check shuttle can even FTL
         if (!_shuttle.CanFTL(shuttleUid.Value, out var reason))
         {
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
index fe8ec7baeed..ea21f58d888 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
@@ -218,18 +218,28 @@ public void RemoveFTLDestination(EntityUid uid)
     /// </summary>
     public bool CanFTL(EntityUid shuttleUid, [NotNullWhen(false)] out string? reason)
     {
+        // Currently in FTL already
         if (HasComp<FTLComponent>(shuttleUid))
         {
             reason = Loc.GetString("shuttle-console-in-ftl");
             return false;
         }
 
-        if (FTLMassLimit > 0 &&
-            TryComp(shuttleUid, out PhysicsComponent? shuttlePhysics) &&
-            shuttlePhysics.Mass > FTLMassLimit)
+        if (TryComp<PhysicsComponent>(shuttleUid, out var shuttlePhysics))
         {
-            reason = Loc.GetString("shuttle-console-mass");
-            return false;
+            // Static physics type is set when station anchor is enabled
+            if (shuttlePhysics.BodyType == BodyType.Static)
+            {
+                reason = Loc.GetString("shuttle-console-static");
+                return false;
+            }
+
+            // Too large to FTL
+            if (FTLMassLimit > 0 &&  shuttlePhysics.Mass > FTLMassLimit)
+            {
+                reason = Loc.GetString("shuttle-console-mass");
+                return false;
+            }
         }
 
         if (HasComp<PreventPilotComponent>(shuttleUid))
diff --git a/Resources/Locale/en-US/shuttles/console.ftl b/Resources/Locale/en-US/shuttles/console.ftl
index 80e61a28126..6143c995529 100644
--- a/Resources/Locale/en-US/shuttles/console.ftl
+++ b/Resources/Locale/en-US/shuttles/console.ftl
@@ -4,6 +4,7 @@ shuttle-pilot-end = Stopped piloting
 shuttle-console-in-ftl = Currently in FTL
 shuttle-console-mass = Too large to FTL
 shuttle-console-prevent = You are unable to pilot this ship
+shuttle-console-static = Grid is static
 
 # NAV
 

From 92b64de9aa75b9007be47449a64fd599b9f8dac7 Mon Sep 17 00:00:00 2001
From: MilenVolf <63782763+MilenVolf@users.noreply.github.com>
Date: Sun, 24 Nov 2024 11:11:47 +0300
Subject: [PATCH 338/366] Allow shuttles on planets to make FTL jump (#33507)

This check conflicts with an attempt to FTL from the planet before expedition ends
---
 .../Shuttles/Systems/ShuttleSystem.FasterThanLight.cs       | 6 ------
 Resources/Locale/en-US/shuttles/console.ftl                 | 1 -
 2 files changed, 7 deletions(-)

diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
index ea21f58d888..74fabc06bb3 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
@@ -227,12 +227,6 @@ public bool CanFTL(EntityUid shuttleUid, [NotNullWhen(false)] out string? reason
 
         if (TryComp<PhysicsComponent>(shuttleUid, out var shuttlePhysics))
         {
-            // Static physics type is set when station anchor is enabled
-            if (shuttlePhysics.BodyType == BodyType.Static)
-            {
-                reason = Loc.GetString("shuttle-console-static");
-                return false;
-            }
 
             // Too large to FTL
             if (FTLMassLimit > 0 &&  shuttlePhysics.Mass > FTLMassLimit)
diff --git a/Resources/Locale/en-US/shuttles/console.ftl b/Resources/Locale/en-US/shuttles/console.ftl
index 6143c995529..80e61a28126 100644
--- a/Resources/Locale/en-US/shuttles/console.ftl
+++ b/Resources/Locale/en-US/shuttles/console.ftl
@@ -4,7 +4,6 @@ shuttle-pilot-end = Stopped piloting
 shuttle-console-in-ftl = Currently in FTL
 shuttle-console-mass = Too large to FTL
 shuttle-console-prevent = You are unable to pilot this ship
-shuttle-console-static = Grid is static
 
 # NAV
 

From 7044f01199cdfde23ef95a60fc7b81f702a5355e Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Wed, 4 Sep 2024 12:23:39 +0200
Subject: [PATCH 339/366] Station Anchor (#26098)

* Work on abstracting out chargeup functionality/ui from grav gen

* Work on station anchor

* Finish implementing station anchors

* uhh yeah

* ok.

* fix tests

* whoops

* Get the last extraneous yaml fail

* PJB review

* beast mode... ACTIVATE!

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
---
 .../Entities/Structures/Shuttles/station_anchor.yml   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml b/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml
index 2f6e42bbf18..4e9a63f2af3 100644
--- a/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml
+++ b/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml
@@ -2,7 +2,8 @@
   id: StationAnchorBase
   abstract: true
   name: station anchor
-  description: Prevents stations from moving
+  description: Prevents stations from moving.
+  suffix: On
   placement:
     mode: AlignTileAny
   components:
@@ -110,3 +111,11 @@
       interfaces:
         enum.PowerChargeUiKey.Key:
           type: PowerChargeBoundUserInterface
+
+- type: entity
+  parent: StationAnchor
+  id: StationAnchorOff
+  suffix: Off
+  components:
+  - type: StationAnchor
+    switchedOn: false

From 122508e6b3ac35e2fed87debeebb3b2eaf427d68 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 28 Dec 2024 15:24:03 -0400
Subject: [PATCH 340/366] Last commit is: Add disabled station anchors version
 (#31794)


From 69f69922835059e506ad90bf10a8f347c849f928 Mon Sep 17 00:00:00 2001
From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Date: Thu, 5 Dec 2024 22:56:34 -0600
Subject: [PATCH 341/366] Adds Station Anchor Beacon (#33711)

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
---
 Resources/Locale/en-US/navmap-beacons/station-beacons.ftl | 1 +
 .../Entities/Objects/Devices/station_beacon.yml           | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/Resources/Locale/en-US/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/navmap-beacons/station-beacons.ftl
index 6434311f21f..3b0ce53e8aa 100644
--- a/Resources/Locale/en-US/navmap-beacons/station-beacons.ftl
+++ b/Resources/Locale/en-US/navmap-beacons/station-beacons.ftl
@@ -50,6 +50,7 @@ station-beacon-telecoms = Telecoms
 station-beacon-atmos = Atmos
 station-beacon-teg = TEG
 station-beacon-tech-vault = Tech Vault
+station-beacon-anchor = Anchor
 
 station-beacon-service = Service
 station-beacon-kitchen = Kitchen
diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
index 28d6ddea691..897250e94bb 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
@@ -430,6 +430,14 @@
   - type: NavMapBeacon
     defaultText: station-beacon-gravgen
 
+- type: entity
+  parent: DefaultStationBeaconEngineering
+  id: DefaultStationBeaconAnchor
+  suffix: Anchor
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-anchor
+
 - type: entity
   parent: DefaultStationBeaconEngineering
   id: DefaultStationBeaconSingularity

From 51258eea7c4a0d8d0755a9b0ad93bacf66ffb555 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 28 Dec 2024 15:34:23 -0400
Subject: [PATCH 342/366] fix yml lint

---
 .../Objects/Devices/Circuitboards/Machine/production.yml       | 3 ++-
 Resources/Prototypes/Entities/Structures/Machines/lathe.yml    | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 03e4c894ee8..ab276a9f7f7 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -1609,9 +1609,10 @@
   components:
   - type: MachineBoard
     prototype: StationAnchor
-    stackRequirements:
+    requirements:
       Capacitor: 4
       MatterBin: 3
+    materialRequirements:
       Steel: 10
       Glass: 5
       CableHV: 8
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 239cc67b7df..5b381c17b17 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -468,7 +468,6 @@
     - SodaDispenserMachineCircuitboard
     - DeepFryerMachineCircuitboard #Nyano - Summary: adds deep fryer circuit board
     - SpaceHeaterMachineCircuitBoard
-    - CutterMachineCircuitboard
     - StationAnchorCircuitboard
     dynamicRecipes:
       - ThermomachineFreezerMachineCircuitBoard

From 781874901653063b169307897f86b18cd96bb7d6 Mon Sep 17 00:00:00 2001
From: neuPanda <chriseparton@gmail.com>
Date: Wed, 7 Aug 2024 08:44:58 -0400
Subject: [PATCH 343/366] Inertia dampeners (#1620)

* Inertia dampeners Initial push
need to disable buttons
need to look into issue with max speed diagonal flying and changing directions

* adding new station component
hide the anchoring buttons on stations (exploit prevention)
apply station component to all POI's

* navscreen, StationComp->StationDampeningComp

* StationDampeningComp, "anchor" tense

* restore needed using statement

* Server-based dampening state

* fix entity in NfGetInertialDampeningMode

* past tense event, whitespace, comments

* ToggleStabilizer->SetInertiaDampening

* ShuttleSystem: check for shuttle deed

* Default dampening value: off->dampen

* Inertia dampeners Initial push
need to disable buttons
need to look into issue with max speed diagonal flying and changing directions

* adding new station component
hide the anchoring buttons on stations (exploit prevention)
apply station component to all POI's

* ShuttleSystem: initial query

* shuttle fix: ShuttleDeedComponent belongs to grid

* adding some logging

* Cleanup & bugfixes

* ShuttleConsole BUI: add Frontier comments

* console.ftl: dampening btns: "Cruise, Drive, Park"

---------

Co-authored-by: neuPanda <spainman0@yahoo.com>
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Co-authored-by: Whatstone <whatston3@gmail.com>
---
 .../BUI/ShuttleConsoleBoundUserInterface.cs   |   3 +-
 Content.Client/Shuttles/UI/NavScreen.xaml     |  45 +++++-
 Content.Client/Shuttles/UI/NavScreen.xaml.cs  |   3 +
 .../Shuttles/UI/ShuttleConsoleWindow.xaml.cs  |   2 +
 .../Shuttles/UI/ShuttleNavControl.xaml.cs     |   8 +-
 .../BUI/ShuttleConsoleBoundUserInterface.cs   |  26 ++++
 .../_NF/Shuttles/UI/NavScreen.xaml.cs         |  83 +++++++++++
 .../Shuttles/UI/ShuttleConsoleWindow.xaml.cs  |  21 +++
 .../_NF/Shuttles/UI/ShuttleNavControl.xaml.cs | 131 ++++++++++++++++++
 .../Shuttles/Systems/ShuttleConsoleSystem.cs  |  10 +-
 .../Shuttles/Systems/ShuttleSystem.cs         |   3 +
 .../_NF/Shuttles/Systems/ShuttleSystem.cs     |  86 ++++++++++++
 .../Components/StationDampeningComponent.cs   |  10 ++
 .../Shuttles/BUIStates/NavInterfaceState.cs   |  10 +-
 .../Events/SetInertiaDampeningRequest.cs      |  27 ++++
 .../Locale/en-US/_NF/shuttles/console.ftl     |   3 +
 16 files changed, 462 insertions(+), 9 deletions(-)
 create mode 100644 Content.Client/_NF/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs
 create mode 100644 Content.Client/_NF/Shuttles/UI/NavScreen.xaml.cs
 create mode 100644 Content.Client/_NF/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
 create mode 100644 Content.Client/_NF/Shuttles/UI/ShuttleNavControl.xaml.cs
 create mode 100644 Content.Server/_NF/Shuttles/Systems/ShuttleSystem.cs
 create mode 100644 Content.Server/_NF/Station/Components/StationDampeningComponent.cs
 create mode 100644 Content.Shared/_NF/Shuttles/Events/SetInertiaDampeningRequest.cs
 create mode 100644 Resources/Locale/en-US/_NF/shuttles/console.ftl

diff --git a/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs b/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs
index e677181419e..9643b5e9fe6 100644
--- a/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs
+++ b/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs
@@ -8,7 +8,7 @@
 namespace Content.Client.Shuttles.BUI;
 
 [UsedImplicitly]
-public sealed class ShuttleConsoleBoundUserInterface : BoundUserInterface
+public sealed partial class ShuttleConsoleBoundUserInterface : BoundUserInterface // Frontier: added partial
 {
     [ViewVariables]
     private ShuttleConsoleWindow? _window;
@@ -26,6 +26,7 @@ protected override void Open()
         _window.RequestBeaconFTL += OnFTLBeaconRequest;
         _window.DockRequest += OnDockRequest;
         _window.UndockRequest += OnUndockRequest;
+        NfOpen(); // Frontier
     }
 
     private void OnUndockRequest(NetEntity entity)
diff --git a/Content.Client/Shuttles/UI/NavScreen.xaml b/Content.Client/Shuttles/UI/NavScreen.xaml
index c97aeda05be..789b2a65a1d 100644
--- a/Content.Client/Shuttles/UI/NavScreen.xaml
+++ b/Content.Client/Shuttles/UI/NavScreen.xaml
@@ -65,5 +65,48 @@
                             Text="{controls:Loc 'shuttle-console-dock-toggle'}"
                             TextAlign="Center"
                             ToggleMode="True"/>
+                    <!-- Frontier - Inertia dampener controls-->
+                    <controls:BoxContainer Name="DampenerModeButtons"
+                                  Orientation="Horizontal"
+                                  HorizontalAlignment="Stretch"
+                                  Margin="5">
+                        <controls:Button Name="DampenerOff"
+                                         Text="{controls:Loc 'shuttle-console-inertia-dampener-off'}"
+                                         TextAlign="Center"
+                                         ToggleMode="True"
+                                         MinWidth="82"
+                                         MaxWidth="82"/>
+                        <controls:Button Name="DampenerOn"
+                                         Text="{controls:Loc 'shuttle-console-inertia-dampener-dampen'}"
+                                         TextAlign="Center"
+                                         ToggleMode="True"
+                                         MinWidth="82"
+                                         MaxWidth="82"/>
+                        <controls:Button Name="AnchorOn"
+                                         Text="{controls:Loc 'shuttle-console-inertia-dampener-anchor'}"
+                                         TextAlign="Center"
+                                         ToggleMode="True"
+                                         MinWidth="82"
+                                         MaxWidth="82"/>
+                    </controls:BoxContainer>
+                    <!-- End Frontier - Inertia dampener controls-->
+                    <!-- Frontier - IFF search -->
+                    <controls:BoxContainer Orientation="Vertical" HorizontalExpand="True" Name="IffSearchBox">
+                        <controls:Label Text="{controls:Loc 'shuttle-console-iff-search'}"/>
+                        <controls:LineEdit Name="IffSearchCriteria" Access="Public" HorizontalExpand="True"/>
+                    </controls:BoxContainer>
+                    <!-- End Frontier - IFF search -->
+
+                    <!-- Frontier - Maximum IFF Distance -->
+                    <controls:BoxContainer Orientation="Vertical" HorizontalExpand="True" Name="MaximumIFFDistanceBox">
+                        <controls:Label Text="{controls:Loc 'shuttle-console-maximum-iff-distance'}"/>
+                        <controls:SliderIntInput Name="MaximumIFFDistanceValue"
+                                                 Access="Public"
+                                                 MinValue="0"
+                                                 MaxValue="3000"
+                                                 Value="3000"
+                                                 HorizontalExpand="True"/>
+                    </controls:BoxContainer>
+                    <!-- End Frontier - Maximum IFF Distance -->
+                    </controls:BoxContainer>
                 </controls:BoxContainer>
-            </controls:BoxContainer>
diff --git a/Content.Client/Shuttles/UI/NavScreen.xaml.cs b/Content.Client/Shuttles/UI/NavScreen.xaml.cs
index 91d95aaa042..73af6f62185 100644
--- a/Content.Client/Shuttles/UI/NavScreen.xaml.cs
+++ b/Content.Client/Shuttles/UI/NavScreen.xaml.cs
@@ -28,6 +28,8 @@ public NavScreen()
 
         DockToggle.OnToggled += OnDockTogglePressed;
         DockToggle.Pressed = NavRadar.ShowDocks;
+
+        NfInitialize(); // Frontier Initialization for the NavScreen
     }
 
     public void SetShuttle(EntityUid? shuttle)
@@ -50,6 +52,7 @@ private void OnDockTogglePressed(BaseButton.ButtonEventArgs args)
     public void UpdateState(NavInterfaceState scc)
     {
         NavRadar.UpdateState(scc);
+        NfUpdateState(); // Frontier Update State
     }
 
     public void SetMatrix(EntityCoordinates? coordinates, Angle? angle)
diff --git a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
index a4b42fb672c..8df3eb4d93e 100644
--- a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
+++ b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
@@ -62,6 +62,8 @@ public ShuttleConsoleWindow()
         {
             UndockRequest?.Invoke(entity);
         };
+
+        NfInitialize(); // Frontier Initialization for the ShuttleConsoleWindow
     }
 
     private void ClearModes(ShuttleConsoleMode mode)
diff --git a/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs b/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs
index 0b8720add21..51fd68e679f 100644
--- a/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs
@@ -1,4 +1,5 @@
 using System.Numerics;
+using Content.Client.Station; // Frontier
 using Content.Shared.Shuttles.BUIStates;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.Systems;
@@ -7,13 +8,11 @@
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Collections;
 using Robust.Shared.Input;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
-using Robust.Shared.Utility;
 
 namespace Content.Client.Shuttles.UI;
 
@@ -21,6 +20,8 @@ namespace Content.Client.Shuttles.UI;
 public sealed partial class ShuttleNavControl : BaseShuttleControl
 {
     [Dependency] private readonly IMapManager _mapManager = default!;
+    [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
+    private readonly StationSystem _station; // Frontier
     private readonly SharedShuttleSystem _shuttles;
     private readonly SharedTransformSystem _transform;
 
@@ -48,6 +49,7 @@ public ShuttleNavControl() : base(64f, 256f, 256f)
         RobustXamlLoader.Load(this);
         _shuttles = EntManager.System<SharedShuttleSystem>();
         _transform = EntManager.System<SharedTransformSystem>();
+        _station = EntManager.System<StationSystem>(); // Frontier
     }
 
     public void SetMatrix(EntityCoordinates? coordinates, Angle? angle)
@@ -110,6 +112,8 @@ public void UpdateState(NavInterfaceState state)
         ActualRadarRange = Math.Clamp(ActualRadarRange, WorldMinRange, WorldMaxRange);
 
         _docks = state.Docks;
+
+        NfUpdateState(state); // Frontier Update State
     }
 
     protected override void Draw(DrawingHandleScreen handle)
diff --git a/Content.Client/_NF/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs b/Content.Client/_NF/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs
new file mode 100644
index 00000000000..715c67f888f
--- /dev/null
+++ b/Content.Client/_NF/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs
@@ -0,0 +1,26 @@
+// New Frontiers - This file is licensed under AGPLv3
+// Copyright (c) 2024 New Frontiers Contributors
+// See AGPLv3.txt for details.
+using Content.Client.Shuttles.UI;
+using Content.Shared._NF.Shuttles.Events;
+
+namespace Content.Client.Shuttles.BUI
+{
+    public sealed partial class ShuttleConsoleBoundUserInterface
+    {
+        private void NfOpen()
+        {
+            _window ??= new ShuttleConsoleWindow();
+            _window.OnInertiaDampeningModeChanged += OnInertiaDampeningModeChanged;
+        }
+        private void OnInertiaDampeningModeChanged(NetEntity? entityUid, InertiaDampeningMode mode)
+        {
+            SendMessage(new SetInertiaDampeningRequest
+            {
+                ShuttleEntityUid = entityUid,
+                Mode = mode,
+            });
+        }
+
+    }
+}
diff --git a/Content.Client/_NF/Shuttles/UI/NavScreen.xaml.cs b/Content.Client/_NF/Shuttles/UI/NavScreen.xaml.cs
new file mode 100644
index 00000000000..25369baddf6
--- /dev/null
+++ b/Content.Client/_NF/Shuttles/UI/NavScreen.xaml.cs
@@ -0,0 +1,83 @@
+// New Frontiers - This file is licensed under AGPLv3
+// Copyright (c) 2024 New Frontiers Contributors
+// See AGPLv3.txt for details.
+using Content.Shared._NF.Shuttles.Events;
+using Robust.Client.UserInterface.Controls;
+
+namespace Content.Client.Shuttles.UI
+{
+    public sealed partial class NavScreen
+    {
+        private readonly ButtonGroup _buttonGroup = new();
+        public event Action<NetEntity?, InertiaDampeningMode>? OnInertiaDampeningModeChanged;
+
+        private void NfInitialize()
+        {
+            // Frontier - IFF search
+            IffSearchCriteria.OnTextChanged += args => OnIffSearchChanged(args.Text);
+
+            // Frontier - Maximum IFF Distance
+            MaximumIFFDistanceValue.GetChild(0).GetChild(1).Margin = new Thickness(8, 0, 0, 0);
+            MaximumIFFDistanceValue.OnValueChanged += args => OnRangeFilterChanged(args);
+
+            DampenerOff.OnPressed += _ => SetDampenerMode(InertiaDampeningMode.Off);
+            DampenerOn.OnPressed += _ => SetDampenerMode(InertiaDampeningMode.Dampen);
+            AnchorOn.OnPressed += _ => SetDampenerMode(InertiaDampeningMode.Anchor);
+
+            DampenerOff.Group = _buttonGroup;
+            DampenerOn.Group = _buttonGroup;
+            AnchorOn.Group = _buttonGroup;
+
+            // Send off a request to get the current dampening mode.
+            _entManager.TryGetNetEntity(_shuttleEntity, out var shuttle);
+            OnInertiaDampeningModeChanged?.Invoke(shuttle, InertiaDampeningMode.Query);
+        }
+
+        private void SetDampenerMode(InertiaDampeningMode mode)
+        {
+            NavRadar.DampeningMode = mode;
+            _entManager.TryGetNetEntity(_shuttleEntity, out var shuttle);
+            OnInertiaDampeningModeChanged?.Invoke(shuttle, mode);
+        }
+
+        private void NfUpdateState()
+        {
+            if (NavRadar.DampeningMode == InertiaDampeningMode.Station)
+            {
+                DampenerModeButtons.Visible = false;
+            }
+            else
+            {
+                DampenerModeButtons.Visible = true;
+                DampenerOff.Pressed = NavRadar.DampeningMode == InertiaDampeningMode.Off;
+                DampenerOn.Pressed = NavRadar.DampeningMode == InertiaDampeningMode.Dampen;
+                AnchorOn.Pressed = NavRadar.DampeningMode == InertiaDampeningMode.Anchor;
+            }
+        }
+
+        // Frontier - Maximum IFF Distance
+        private void OnRangeFilterChanged(int value)
+        {
+            NavRadar.MaximumIFFDistance = (float) value;
+        }
+
+        private void NfAddShuttleDesignation(EntityUid? shuttle)
+        {
+            // Frontier - PR #1284 Add Shuttle Designation
+            if (_entManager.TryGetComponent<MetaDataComponent>(shuttle, out var metadata))
+            {
+                var shipNameParts = metadata.EntityName.Split(' ');
+                var designation = shipNameParts[^1];
+                if (designation.Length > 2 && designation[2] == '-')
+                {
+                    NavDisplayLabel.Text = string.Join(' ', shipNameParts[..^1]);
+                    ShuttleDesignation.Text = designation;
+                }
+                else
+                    NavDisplayLabel.Text = metadata.EntityName;
+            }
+            // End Frontier - PR #1284
+        }
+
+    }
+}
diff --git a/Content.Client/_NF/Shuttles/UI/ShuttleConsoleWindow.xaml.cs b/Content.Client/_NF/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
new file mode 100644
index 00000000000..7ba3f952b46
--- /dev/null
+++ b/Content.Client/_NF/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
@@ -0,0 +1,21 @@
+// New Frontiers - This file is licensed under AGPLv3
+// Copyright (c) 2024 New Frontiers Contributors
+// See AGPLv3.txt for details.
+using Content.Shared._NF.Shuttles.Events;
+
+namespace Content.Client.Shuttles.UI
+{
+    public sealed partial class ShuttleConsoleWindow
+    {
+        public event Action<NetEntity?, InertiaDampeningMode>? OnInertiaDampeningModeChanged;
+
+        private void NfInitialize()
+        {
+            NavContainer.OnInertiaDampeningModeChanged += (entity, mode) =>
+            {
+                OnInertiaDampeningModeChanged?.Invoke(entity, mode);
+            };
+        }
+
+    }
+}
diff --git a/Content.Client/_NF/Shuttles/UI/ShuttleNavControl.xaml.cs b/Content.Client/_NF/Shuttles/UI/ShuttleNavControl.xaml.cs
new file mode 100644
index 00000000000..3520967548e
--- /dev/null
+++ b/Content.Client/_NF/Shuttles/UI/ShuttleNavControl.xaml.cs
@@ -0,0 +1,131 @@
+// New Frontiers - This file is licensed under AGPLv3
+// Copyright (c) 2024 New Frontiers Contributors
+// See AGPLv3.txt for details.
+using Content.Shared._NF.Shuttles.Events;
+using Content.Shared.Shuttles.BUIStates;
+using Robust.Shared.Physics.Components;
+using System.Numerics;
+using Robust.Client.Graphics;
+using Robust.Shared.Collections;
+
+namespace Content.Client.Shuttles.UI
+{
+    public sealed partial class ShuttleNavControl
+    {
+        public InertiaDampeningMode DampeningMode { get; set; }
+
+        private void NfUpdateState(NavInterfaceState state)
+        {
+
+            if (!EntManager.GetCoordinates(state.Coordinates).HasValue ||
+                !EntManager.TryGetComponent(EntManager.GetCoordinates(state.Coordinates).GetValueOrDefault().EntityId,out TransformComponent? transform) ||
+                !EntManager.TryGetComponent(transform.GridUid, out PhysicsComponent? physicsComponent))
+            {
+                return;
+            }
+
+            DampeningMode = state.DampeningMode;
+        }
+
+        // New Frontiers - Maximum IFF Distance - checks distance to object, draws if closer than max range
+        // This code is licensed under AGPLv3. See AGPLv3.txt
+        private bool NfCheckShouldDrawIffRangeCondition(bool shouldDrawIff, PhysicsComponent gridBody, Matrix3x2 matty)
+        {
+            if (shouldDrawIff && MaximumIFFDistance >= 0.0f)
+            {
+                var gridCentre = Vector2.Transform(gridBody.LocalCenter, matty);
+                var distance = gridCentre.Length();
+
+                if (distance > MaximumIFFDistance)
+                {
+                    shouldDrawIff = false;
+                }
+            }
+
+            return shouldDrawIff;
+        }
+
+        private static void NfAddBlipToList(List<BlipData> blipDataList, bool isOutsideRadarCircle, Vector2 uiPosition, int uiXCentre, int uiYCentre, Color color)
+        {
+            blipDataList.Add(new BlipData
+            {
+                IsOutsideRadarCircle = isOutsideRadarCircle,
+                UiPosition = uiPosition,
+                VectorToPosition = uiPosition - new Vector2(uiXCentre, uiYCentre),
+                Color = color
+            });
+        }
+
+        /**
+         * Frontier - Adds blip style triangles that are on ships or pointing towards ships on the edges of the radar.
+         * Draws blips at the BlipData's uiPosition and uses VectorToPosition to rotate to point towards ships.
+         */
+        private void NfDrawBlips(DrawingHandleBase handle, List<BlipData> blipDataList)
+        {
+            var blipValueList = new Dictionary<Color, ValueList<Vector2>>();
+
+            foreach (var blipData in blipDataList)
+            {
+                var triangleShapeVectorPoints = new[]
+                {
+                new Vector2(0, 0),
+                new Vector2(RadarBlipSize, 0),
+                new Vector2(RadarBlipSize * 0.5f, RadarBlipSize)
+            };
+
+                if (blipData.IsOutsideRadarCircle)
+                {
+                    // Calculate the angle of rotation
+                    var angle = (float) Math.Atan2(blipData.VectorToPosition.Y, blipData.VectorToPosition.X) + -1.6f;
+
+                    // Manually create a rotation matrix
+                    var cos = (float) Math.Cos(angle);
+                    var sin = (float) Math.Sin(angle);
+                    float[,] rotationMatrix = { { cos, -sin }, { sin, cos } };
+
+                    // Rotate each vertex
+                    for (var i = 0; i < triangleShapeVectorPoints.Length; i++)
+                    {
+                        var vertex = triangleShapeVectorPoints[i];
+                        var x = vertex.X * rotationMatrix[0, 0] + vertex.Y * rotationMatrix[0, 1];
+                        var y = vertex.X * rotationMatrix[1, 0] + vertex.Y * rotationMatrix[1, 1];
+                        triangleShapeVectorPoints[i] = new Vector2(x, y);
+                    }
+                }
+
+                var triangleCenterVector =
+                    (triangleShapeVectorPoints[0] + triangleShapeVectorPoints[1] + triangleShapeVectorPoints[2]) / 3;
+
+                // Calculate the vectors from the center to each vertex
+                var vectorsFromCenter = new Vector2[3];
+                for (int i = 0; i < 3; i++)
+                {
+                    vectorsFromCenter[i] = (triangleShapeVectorPoints[i] - triangleCenterVector) * UIScale;
+                }
+
+                // Calculate the vertices of the new triangle
+                var newVerts = new Vector2[3];
+                for (var i = 0; i < 3; i++)
+                {
+                    newVerts[i] = (blipData.UiPosition * UIScale) + vectorsFromCenter[i];
+                }
+
+                if (!blipValueList.TryGetValue(blipData.Color, out var valueList))
+                {
+                    valueList = new ValueList<Vector2>();
+
+                }
+                valueList.Add(newVerts[0]);
+                valueList.Add(newVerts[1]);
+                valueList.Add(newVerts[2]);
+                blipValueList[blipData.Color] = valueList;
+            }
+
+            // One draw call for every color we have
+            foreach (var color in blipValueList)
+            {
+                handle.DrawPrimitives(DrawPrimitiveTopology.TriangleList, color.Value.Span, color.Key);
+            }
+        }
+    }
+}
diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
index e37be3d1a52..264323dabeb 100644
--- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
@@ -3,6 +3,7 @@
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Events;
 using Content.Server.Station.Systems;
+using Content.Shared._NF.Shuttles.Events; // Frontier
 using Content.Shared.ActionBlocker;
 using Content.Shared.Alert;
 using Content.Shared.Popups;
@@ -257,7 +258,7 @@ private void UpdateState(EntityUid consoleUid, ref DockingInterfaceState? dockSt
         }
         else
         {
-            navState = new NavInterfaceState(0f, null, null, new Dictionary<NetEntity, List<DockingPortState>>());
+            navState = new NavInterfaceState(0f, null, null, new Dictionary<NetEntity, List<DockingPortState>>(), InertiaDampeningMode.Dampen); // Frontier: inertia dampening);
             mapState = new ShuttleMapInterfaceState(
                 FTLState.Invalid,
                 default,
@@ -372,7 +373,7 @@ public void ClearPilots(ShuttleConsoleComponent component)
     public NavInterfaceState GetNavState(Entity<RadarConsoleComponent?, TransformComponent?> entity, Dictionary<NetEntity, List<DockingPortState>> docks)
     {
         if (!Resolve(entity, ref entity.Comp1, ref entity.Comp2))
-            return new NavInterfaceState(SharedRadarConsoleSystem.DefaultMaxRange, null, null, docks);
+            return new NavInterfaceState(SharedRadarConsoleSystem.DefaultMaxRange, null, null, docks, Shared._NF.Shuttles.Events.InertiaDampeningMode.Dampen); // Frontier: add inertia dampening
 
         return GetNavState(
             entity,
@@ -388,13 +389,14 @@ public NavInterfaceState GetNavState(
         Angle angle)
     {
         if (!Resolve(entity, ref entity.Comp1, ref entity.Comp2))
-            return new NavInterfaceState(SharedRadarConsoleSystem.DefaultMaxRange, GetNetCoordinates(coordinates), angle, docks);
+            return new NavInterfaceState(SharedRadarConsoleSystem.DefaultMaxRange, GetNetCoordinates(coordinates), angle, docks, InertiaDampeningMode.Dampen); // Frontier: add inertial dampening
 
         return new NavInterfaceState(
             entity.Comp1.MaxRange,
             GetNetCoordinates(coordinates),
             angle,
-            docks);
+            docks,
+            _shuttle.NfGetInertiaDampeningMode(entity)); // Frontier: inertia dampening
     }
 
     /// <summary>
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
index a10d0d56144..95f0bf93d43 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
@@ -69,6 +69,9 @@ public override void Initialize()
 
         SubscribeLocalEvent<GridInitializeEvent>(OnGridInit);
         SubscribeLocalEvent<FixturesComponent, GridFixtureChangeEvent>(OnGridFixtureChange);
+
+        NfInitialize(); // Frontier Initialization for the ShuttleSystem
+
     }
 
     public override void Update(float frameTime)
diff --git a/Content.Server/_NF/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/_NF/Shuttles/Systems/ShuttleSystem.cs
new file mode 100644
index 00000000000..f027d3cce44
--- /dev/null
+++ b/Content.Server/_NF/Shuttles/Systems/ShuttleSystem.cs
@@ -0,0 +1,86 @@
+// New Frontiers - This file is licensed under AGPLv3
+// Copyright (c) 2024 New Frontiers Contributors
+// See AGPLv3.txt for details.
+using Content.Server._NF.Station.Components;
+using Content.Server.Shuttles.Components;
+using Content.Shared._NF.Shuttles.Events;
+using Content.Shared.Shipyard.Components;
+using Robust.Shared.Physics.Components;
+
+namespace Content.Server.Shuttles.Systems;
+
+public sealed partial class ShuttleSystem
+{
+    private const float SpaceFrictionStrength = 0.0015f;
+    private const float AnchorDampeningStrength = 0.5f;
+    private void NfInitialize()
+    {
+        SubscribeLocalEvent<ShuttleConsoleComponent, SetInertiaDampeningRequest>(OnSetInertiaDampening);
+    }
+
+    private void OnSetInertiaDampening(EntityUid uid, ShuttleConsoleComponent component, SetInertiaDampeningRequest args)
+    {
+        // Ensure that the entity requested is a valid shuttle (stations should not be togglable)
+        if (!EntityManager.TryGetComponent(uid, out TransformComponent? transform) ||
+            !transform.GridUid.HasValue ||
+            !EntityManager.TryGetComponent(transform.GridUid, out PhysicsComponent? physicsComponent) ||
+            !EntityManager.TryGetComponent(transform.GridUid, out ShuttleComponent? shuttleComponent))
+        {
+            return;
+        }
+
+        if (args.Mode == InertiaDampeningMode.Query)
+        {
+            _console.RefreshShuttleConsoles(transform.GridUid.Value);
+            return;
+        }
+
+        if (!EntityManager.HasComponent<ShuttleDeedComponent>(transform.GridUid) ||
+            EntityManager.HasComponent<StationDampeningComponent>(_station.GetOwningStation(transform.GridUid)))
+        {
+            return;
+        }
+
+        var linearDampeningStrength = args.Mode switch
+        {
+            InertiaDampeningMode.Off => SpaceFrictionStrength,
+            InertiaDampeningMode.Dampen => shuttleComponent.LinearDamping,
+            InertiaDampeningMode.Anchor => AnchorDampeningStrength,
+            _ => shuttleComponent.LinearDamping, // other values: default to some sane behaviour (assume normal dampening)
+        };
+
+        var angularDampeningStrength = args.Mode switch
+        {
+            InertiaDampeningMode.Off => SpaceFrictionStrength,
+            InertiaDampeningMode.Dampen => shuttleComponent.AngularDamping,
+            InertiaDampeningMode.Anchor => AnchorDampeningStrength,
+            _ => shuttleComponent.AngularDamping, // other values: default to some sane behaviour (assume normal dampening)
+        };
+
+        _physics.SetLinearDamping(transform.GridUid.Value, physicsComponent, linearDampeningStrength);
+        _physics.SetAngularDamping(transform.GridUid.Value, physicsComponent, angularDampeningStrength);
+        _console.RefreshShuttleConsoles(transform.GridUid.Value);
+    }
+
+    public InertiaDampeningMode NfGetInertiaDampeningMode(EntityUid entity)
+    {
+        if (!EntityManager.TryGetComponent<TransformComponent>(entity, out var xform))
+            return InertiaDampeningMode.Dampen;
+
+        // Not a shuttle, shouldn't be togglable
+        if (!EntityManager.HasComponent<ShuttleDeedComponent>(xform.GridUid) ||
+            EntityManager.HasComponent<StationDampeningComponent>(_station.GetOwningStation(xform.GridUid)))
+            return InertiaDampeningMode.Station;
+
+        if (!EntityManager.TryGetComponent(xform.GridUid, out PhysicsComponent? physicsComponent))
+            return InertiaDampeningMode.Dampen;
+
+        if (physicsComponent.LinearDamping >= AnchorDampeningStrength)
+            return InertiaDampeningMode.Anchor;
+        else if (physicsComponent.LinearDamping <= SpaceFrictionStrength)
+            return InertiaDampeningMode.Off;
+        else
+            return InertiaDampeningMode.Dampen;
+    }
+
+}
diff --git a/Content.Server/_NF/Station/Components/StationDampeningComponent.cs b/Content.Server/_NF/Station/Components/StationDampeningComponent.cs
new file mode 100644
index 00000000000..f6e184077a9
--- /dev/null
+++ b/Content.Server/_NF/Station/Components/StationDampeningComponent.cs
@@ -0,0 +1,10 @@
+// New Frontiers - This file is licensed under AGPLv3
+// Copyright (c) 2024 New Frontiers Contributors
+// See AGPLv3.txt for details.
+
+namespace Content.Server._NF.Station.Components;
+
+[RegisterComponent]
+public sealed partial class StationDampeningComponent : Component
+{
+}
diff --git a/Content.Shared/Shuttles/BUIStates/NavInterfaceState.cs b/Content.Shared/Shuttles/BUIStates/NavInterfaceState.cs
index a6f4c01657d..70716742dd2 100644
--- a/Content.Shared/Shuttles/BUIStates/NavInterfaceState.cs
+++ b/Content.Shared/Shuttles/BUIStates/NavInterfaceState.cs
@@ -1,5 +1,6 @@
 using Robust.Shared.Map;
 using Robust.Shared.Serialization;
+using Content.Shared._NF.Shuttles.Events; // Frontier - InertiaDampeningMode access
 
 namespace Content.Shared.Shuttles.BUIStates;
 
@@ -20,16 +21,23 @@ public sealed class NavInterfaceState
 
     public Dictionary<NetEntity, List<DockingPortState>> Docks;
 
+    /// <summary>
+    /// Frontier - the state of the shuttle's inertial dampeners
+    /// </summary>
+    public InertiaDampeningMode DampeningMode;
+
     public NavInterfaceState(
         float maxRange,
         NetCoordinates? coordinates,
         Angle? angle,
-        Dictionary<NetEntity, List<DockingPortState>> docks)
+        Dictionary<NetEntity, List<DockingPortState>> docks,
+        InertiaDampeningMode dampeningMode) // Frontier: add dampeningMode
     {
         MaxRange = maxRange;
         Coordinates = coordinates;
         Angle = angle;
         Docks = docks;
+        DampeningMode = dampeningMode; // Frontier
     }
 }
 
diff --git a/Content.Shared/_NF/Shuttles/Events/SetInertiaDampeningRequest.cs b/Content.Shared/_NF/Shuttles/Events/SetInertiaDampeningRequest.cs
new file mode 100644
index 00000000000..70d7dddabb5
--- /dev/null
+++ b/Content.Shared/_NF/Shuttles/Events/SetInertiaDampeningRequest.cs
@@ -0,0 +1,27 @@
+// New Frontiers - This file is licensed under AGPLv3
+// Copyright (c) 2024 New Frontiers Contributors
+// See AGPLv3.txt for details.
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._NF.Shuttles.Events
+{
+    /// <summary>
+    /// Raised on the client when it wishes to change the inertial dampening of a ship.
+    /// </summary>
+    [Serializable, NetSerializable]
+    public sealed class SetInertiaDampeningRequest : BoundUserInterfaceMessage
+    {
+        public NetEntity? ShuttleEntityUid { get; set; }
+        public InertiaDampeningMode Mode { get; set; }
+    }
+
+    [Serializable, NetSerializable]
+    public enum InertiaDampeningMode : byte
+    {
+        Off = 0,
+        Dampen = 1,
+        Anchor = 2,
+        Station = 3, // Reserved for station status, should not be used in requests.
+        Query = 255 // Reserved for requests - does not set the mode, only returns its state.
+    }
+}
diff --git a/Resources/Locale/en-US/_NF/shuttles/console.ftl b/Resources/Locale/en-US/_NF/shuttles/console.ftl
new file mode 100644
index 00000000000..d518dc22130
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/shuttles/console.ftl
@@ -0,0 +1,3 @@
+shuttle-console-inertia-dampener-off = Cruise
+shuttle-console-inertia-dampener-dampen = Drive
+shuttle-console-inertia-dampener-anchor = Park
\ No newline at end of file

From c6bee33195e84065def6c6285adc39f37ef94d83 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 28 Dec 2024 17:03:59 -0400
Subject: [PATCH 344/366] fix build fails

---
 Content.Client/Shuttles/UI/NavScreen.xaml     |  18 ---
 .../_NF/Shuttles/UI/NavScreen.xaml.cs         |  99 +++++---------
 .../_NF/Shuttles/UI/ShuttleNavControl.xaml.cs | 129 ++----------------
 .../_NF/Shuttles/Systems/ShuttleSystem.cs     |  25 ++--
 4 files changed, 59 insertions(+), 212 deletions(-)

diff --git a/Content.Client/Shuttles/UI/NavScreen.xaml b/Content.Client/Shuttles/UI/NavScreen.xaml
index 789b2a65a1d..130d08c9cd4 100644
--- a/Content.Client/Shuttles/UI/NavScreen.xaml
+++ b/Content.Client/Shuttles/UI/NavScreen.xaml
@@ -90,23 +90,5 @@
                                          MaxWidth="82"/>
                     </controls:BoxContainer>
                     <!-- End Frontier - Inertia dampener controls-->
-                    <!-- Frontier - IFF search -->
-                    <controls:BoxContainer Orientation="Vertical" HorizontalExpand="True" Name="IffSearchBox">
-                        <controls:Label Text="{controls:Loc 'shuttle-console-iff-search'}"/>
-                        <controls:LineEdit Name="IffSearchCriteria" Access="Public" HorizontalExpand="True"/>
-                    </controls:BoxContainer>
-                    <!-- End Frontier - IFF search -->
-
-                    <!-- Frontier - Maximum IFF Distance -->
-                    <controls:BoxContainer Orientation="Vertical" HorizontalExpand="True" Name="MaximumIFFDistanceBox">
-                        <controls:Label Text="{controls:Loc 'shuttle-console-maximum-iff-distance'}"/>
-                        <controls:SliderIntInput Name="MaximumIFFDistanceValue"
-                                                 Access="Public"
-                                                 MinValue="0"
-                                                 MaxValue="3000"
-                                                 Value="3000"
-                                                 HorizontalExpand="True"/>
-                    </controls:BoxContainer>
-                    <!-- End Frontier - Maximum IFF Distance -->
                     </controls:BoxContainer>
                 </controls:BoxContainer>
diff --git a/Content.Client/_NF/Shuttles/UI/NavScreen.xaml.cs b/Content.Client/_NF/Shuttles/UI/NavScreen.xaml.cs
index 25369baddf6..2b2493490cc 100644
--- a/Content.Client/_NF/Shuttles/UI/NavScreen.xaml.cs
+++ b/Content.Client/_NF/Shuttles/UI/NavScreen.xaml.cs
@@ -4,80 +4,45 @@
 using Content.Shared._NF.Shuttles.Events;
 using Robust.Client.UserInterface.Controls;
 
-namespace Content.Client.Shuttles.UI
-{
-    public sealed partial class NavScreen
-    {
-        private readonly ButtonGroup _buttonGroup = new();
-        public event Action<NetEntity?, InertiaDampeningMode>? OnInertiaDampeningModeChanged;
-
-        private void NfInitialize()
-        {
-            // Frontier - IFF search
-            IffSearchCriteria.OnTextChanged += args => OnIffSearchChanged(args.Text);
-
-            // Frontier - Maximum IFF Distance
-            MaximumIFFDistanceValue.GetChild(0).GetChild(1).Margin = new Thickness(8, 0, 0, 0);
-            MaximumIFFDistanceValue.OnValueChanged += args => OnRangeFilterChanged(args);
+namespace Content.Client.Shuttles.UI;
 
-            DampenerOff.OnPressed += _ => SetDampenerMode(InertiaDampeningMode.Off);
-            DampenerOn.OnPressed += _ => SetDampenerMode(InertiaDampeningMode.Dampen);
-            AnchorOn.OnPressed += _ => SetDampenerMode(InertiaDampeningMode.Anchor);
-
-            DampenerOff.Group = _buttonGroup;
-            DampenerOn.Group = _buttonGroup;
-            AnchorOn.Group = _buttonGroup;
+public sealed partial class NavScreen
+{
+    private readonly ButtonGroup _buttonGroup = new();
+    public event Action<NetEntity?, InertiaDampeningMode>? OnInertiaDampeningModeChanged;
 
-            // Send off a request to get the current dampening mode.
-            _entManager.TryGetNetEntity(_shuttleEntity, out var shuttle);
-            OnInertiaDampeningModeChanged?.Invoke(shuttle, InertiaDampeningMode.Query);
-        }
+    private void NfInitialize()
+    {
+        DampenerOff.OnPressed += _ => SetDampenerMode(InertiaDampeningMode.Off);
+        DampenerOn.OnPressed += _ => SetDampenerMode(InertiaDampeningMode.Dampen);
+        AnchorOn.OnPressed += _ => SetDampenerMode(InertiaDampeningMode.Anchor);
 
-        private void SetDampenerMode(InertiaDampeningMode mode)
-        {
-            NavRadar.DampeningMode = mode;
-            _entManager.TryGetNetEntity(_shuttleEntity, out var shuttle);
-            OnInertiaDampeningModeChanged?.Invoke(shuttle, mode);
-        }
+        DampenerOff.Group = _buttonGroup;
+        DampenerOn.Group = _buttonGroup;
+        AnchorOn.Group = _buttonGroup;
 
-        private void NfUpdateState()
-        {
-            if (NavRadar.DampeningMode == InertiaDampeningMode.Station)
-            {
-                DampenerModeButtons.Visible = false;
-            }
-            else
-            {
-                DampenerModeButtons.Visible = true;
-                DampenerOff.Pressed = NavRadar.DampeningMode == InertiaDampeningMode.Off;
-                DampenerOn.Pressed = NavRadar.DampeningMode == InertiaDampeningMode.Dampen;
-                AnchorOn.Pressed = NavRadar.DampeningMode == InertiaDampeningMode.Anchor;
-            }
-        }
+        // Send off a request to get the current dampening mode.
+        _entManager.TryGetNetEntity(_shuttleEntity, out var shuttle);
+        OnInertiaDampeningModeChanged?.Invoke(shuttle, InertiaDampeningMode.Query);
+    }
 
-        // Frontier - Maximum IFF Distance
-        private void OnRangeFilterChanged(int value)
-        {
-            NavRadar.MaximumIFFDistance = (float) value;
-        }
+    private void SetDampenerMode(InertiaDampeningMode mode)
+    {
+        NavRadar.DampeningMode = mode;
+        _entManager.TryGetNetEntity(_shuttleEntity, out var shuttle);
+        OnInertiaDampeningModeChanged?.Invoke(shuttle, mode);
+    }
 
-        private void NfAddShuttleDesignation(EntityUid? shuttle)
+    private void NfUpdateState()
+    {
+        if (NavRadar.DampeningMode == InertiaDampeningMode.Station)
+            DampenerModeButtons.Visible = false;
+        else
         {
-            // Frontier - PR #1284 Add Shuttle Designation
-            if (_entManager.TryGetComponent<MetaDataComponent>(shuttle, out var metadata))
-            {
-                var shipNameParts = metadata.EntityName.Split(' ');
-                var designation = shipNameParts[^1];
-                if (designation.Length > 2 && designation[2] == '-')
-                {
-                    NavDisplayLabel.Text = string.Join(' ', shipNameParts[..^1]);
-                    ShuttleDesignation.Text = designation;
-                }
-                else
-                    NavDisplayLabel.Text = metadata.EntityName;
-            }
-            // End Frontier - PR #1284
+            DampenerModeButtons.Visible = true;
+            DampenerOff.Pressed = NavRadar.DampeningMode == InertiaDampeningMode.Off;
+            DampenerOn.Pressed = NavRadar.DampeningMode == InertiaDampeningMode.Dampen;
+            AnchorOn.Pressed = NavRadar.DampeningMode == InertiaDampeningMode.Anchor;
         }
-
     }
 }
diff --git a/Content.Client/_NF/Shuttles/UI/ShuttleNavControl.xaml.cs b/Content.Client/_NF/Shuttles/UI/ShuttleNavControl.xaml.cs
index 3520967548e..dabb1712ffc 100644
--- a/Content.Client/_NF/Shuttles/UI/ShuttleNavControl.xaml.cs
+++ b/Content.Client/_NF/Shuttles/UI/ShuttleNavControl.xaml.cs
@@ -8,124 +8,23 @@
 using Robust.Client.Graphics;
 using Robust.Shared.Collections;
 
-namespace Content.Client.Shuttles.UI
-{
-    public sealed partial class ShuttleNavControl
-    {
-        public InertiaDampeningMode DampeningMode { get; set; }
-
-        private void NfUpdateState(NavInterfaceState state)
-        {
-
-            if (!EntManager.GetCoordinates(state.Coordinates).HasValue ||
-                !EntManager.TryGetComponent(EntManager.GetCoordinates(state.Coordinates).GetValueOrDefault().EntityId,out TransformComponent? transform) ||
-                !EntManager.TryGetComponent(transform.GridUid, out PhysicsComponent? physicsComponent))
-            {
-                return;
-            }
-
-            DampeningMode = state.DampeningMode;
-        }
-
-        // New Frontiers - Maximum IFF Distance - checks distance to object, draws if closer than max range
-        // This code is licensed under AGPLv3. See AGPLv3.txt
-        private bool NfCheckShouldDrawIffRangeCondition(bool shouldDrawIff, PhysicsComponent gridBody, Matrix3x2 matty)
-        {
-            if (shouldDrawIff && MaximumIFFDistance >= 0.0f)
-            {
-                var gridCentre = Vector2.Transform(gridBody.LocalCenter, matty);
-                var distance = gridCentre.Length();
-
-                if (distance > MaximumIFFDistance)
-                {
-                    shouldDrawIff = false;
-                }
-            }
-
-            return shouldDrawIff;
-        }
-
-        private static void NfAddBlipToList(List<BlipData> blipDataList, bool isOutsideRadarCircle, Vector2 uiPosition, int uiXCentre, int uiYCentre, Color color)
-        {
-            blipDataList.Add(new BlipData
-            {
-                IsOutsideRadarCircle = isOutsideRadarCircle,
-                UiPosition = uiPosition,
-                VectorToPosition = uiPosition - new Vector2(uiXCentre, uiYCentre),
-                Color = color
-            });
-        }
-
-        /**
-         * Frontier - Adds blip style triangles that are on ships or pointing towards ships on the edges of the radar.
-         * Draws blips at the BlipData's uiPosition and uses VectorToPosition to rotate to point towards ships.
-         */
-        private void NfDrawBlips(DrawingHandleBase handle, List<BlipData> blipDataList)
-        {
-            var blipValueList = new Dictionary<Color, ValueList<Vector2>>();
+namespace Content.Client.Shuttles.UI;
 
-            foreach (var blipData in blipDataList)
-            {
-                var triangleShapeVectorPoints = new[]
-                {
-                new Vector2(0, 0),
-                new Vector2(RadarBlipSize, 0),
-                new Vector2(RadarBlipSize * 0.5f, RadarBlipSize)
-            };
-
-                if (blipData.IsOutsideRadarCircle)
-                {
-                    // Calculate the angle of rotation
-                    var angle = (float) Math.Atan2(blipData.VectorToPosition.Y, blipData.VectorToPosition.X) + -1.6f;
-
-                    // Manually create a rotation matrix
-                    var cos = (float) Math.Cos(angle);
-                    var sin = (float) Math.Sin(angle);
-                    float[,] rotationMatrix = { { cos, -sin }, { sin, cos } };
-
-                    // Rotate each vertex
-                    for (var i = 0; i < triangleShapeVectorPoints.Length; i++)
-                    {
-                        var vertex = triangleShapeVectorPoints[i];
-                        var x = vertex.X * rotationMatrix[0, 0] + vertex.Y * rotationMatrix[0, 1];
-                        var y = vertex.X * rotationMatrix[1, 0] + vertex.Y * rotationMatrix[1, 1];
-                        triangleShapeVectorPoints[i] = new Vector2(x, y);
-                    }
-                }
-
-                var triangleCenterVector =
-                    (triangleShapeVectorPoints[0] + triangleShapeVectorPoints[1] + triangleShapeVectorPoints[2]) / 3;
-
-                // Calculate the vectors from the center to each vertex
-                var vectorsFromCenter = new Vector2[3];
-                for (int i = 0; i < 3; i++)
-                {
-                    vectorsFromCenter[i] = (triangleShapeVectorPoints[i] - triangleCenterVector) * UIScale;
-                }
-
-                // Calculate the vertices of the new triangle
-                var newVerts = new Vector2[3];
-                for (var i = 0; i < 3; i++)
-                {
-                    newVerts[i] = (blipData.UiPosition * UIScale) + vectorsFromCenter[i];
-                }
+public sealed partial class ShuttleNavControl
+{
+    public InertiaDampeningMode DampeningMode { get; set; }
 
-                if (!blipValueList.TryGetValue(blipData.Color, out var valueList))
-                {
-                    valueList = new ValueList<Vector2>();
+    private void NfUpdateState(NavInterfaceState state)
+    {
 
-                }
-                valueList.Add(newVerts[0]);
-                valueList.Add(newVerts[1]);
-                valueList.Add(newVerts[2]);
-                blipValueList[blipData.Color] = valueList;
-            }
+        if (!EntManager.GetCoordinates(state.Coordinates).HasValue ||
+            !EntManager.TryGetComponent(
+                EntManager.GetCoordinates(state.Coordinates).GetValueOrDefault().EntityId,
+                out TransformComponent? transform) ||
+            !EntManager.TryGetComponent(transform.GridUid, out PhysicsComponent? _))
+            return;
 
-            // One draw call for every color we have
-            foreach (var color in blipValueList)
-            {
-                handle.DrawPrimitives(DrawPrimitiveTopology.TriangleList, color.Value.Span, color.Key);
-            }
-        }
+        DampeningMode = state.DampeningMode;
     }
 }
+
diff --git a/Content.Server/_NF/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/_NF/Shuttles/Systems/ShuttleSystem.cs
index f027d3cce44..afa65ea7e2f 100644
--- a/Content.Server/_NF/Shuttles/Systems/ShuttleSystem.cs
+++ b/Content.Server/_NF/Shuttles/Systems/ShuttleSystem.cs
@@ -3,8 +3,8 @@
 // See AGPLv3.txt for details.
 using Content.Server._NF.Station.Components;
 using Content.Server.Shuttles.Components;
+using Content.Server.Station.Components;
 using Content.Shared._NF.Shuttles.Events;
-using Content.Shared.Shipyard.Components;
 using Robust.Shared.Physics.Components;
 
 namespace Content.Server.Shuttles.Systems;
@@ -25,9 +25,7 @@ private void OnSetInertiaDampening(EntityUid uid, ShuttleConsoleComponent compon
             !transform.GridUid.HasValue ||
             !EntityManager.TryGetComponent(transform.GridUid, out PhysicsComponent? physicsComponent) ||
             !EntityManager.TryGetComponent(transform.GridUid, out ShuttleComponent? shuttleComponent))
-        {
             return;
-        }
 
         if (args.Mode == InertiaDampeningMode.Query)
         {
@@ -35,11 +33,10 @@ private void OnSetInertiaDampening(EntityUid uid, ShuttleConsoleComponent compon
             return;
         }
 
-        if (!EntityManager.HasComponent<ShuttleDeedComponent>(transform.GridUid) ||
-            EntityManager.HasComponent<StationDampeningComponent>(_station.GetOwningStation(transform.GridUid)))
-        {
+        if (!EntityManager.HasComponent<ShuttleComponent>(transform.GridUid) ||
+            EntityManager.TryGetComponent<StationDataComponent>(_station.GetOwningStation(transform.GridUid), out var stationData)
+            && stationData.StationConfig != null)
             return;
-        }
 
         var linearDampeningStrength = args.Mode switch
         {
@@ -67,9 +64,12 @@ public InertiaDampeningMode NfGetInertiaDampeningMode(EntityUid entity)
         if (!EntityManager.TryGetComponent<TransformComponent>(entity, out var xform))
             return InertiaDampeningMode.Dampen;
 
+        var owningStation = _station.GetOwningStation(xform.GridUid);
+
         // Not a shuttle, shouldn't be togglable
-        if (!EntityManager.HasComponent<ShuttleDeedComponent>(xform.GridUid) ||
-            EntityManager.HasComponent<StationDampeningComponent>(_station.GetOwningStation(xform.GridUid)))
+        if (!EntityManager.HasComponent<ShuttleComponent>(xform.GridUid) ||
+            EntityManager.TryGetComponent<StationDataComponent>(owningStation, out var stationData)
+            && stationData.StationConfig != null)
             return InertiaDampeningMode.Station;
 
         if (!EntityManager.TryGetComponent(xform.GridUid, out PhysicsComponent? physicsComponent))
@@ -77,10 +77,11 @@ public InertiaDampeningMode NfGetInertiaDampeningMode(EntityUid entity)
 
         if (physicsComponent.LinearDamping >= AnchorDampeningStrength)
             return InertiaDampeningMode.Anchor;
-        else if (physicsComponent.LinearDamping <= SpaceFrictionStrength)
+
+        if (physicsComponent.LinearDamping <= SpaceFrictionStrength)
             return InertiaDampeningMode.Off;
-        else
-            return InertiaDampeningMode.Dampen;
+
+        return InertiaDampeningMode.Dampen;
     }
 
 }

From 56e4037a201290c2d42368b6784847bbe2f4d757 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 30 Dec 2024 17:26:25 -0400
Subject: [PATCH 345/366] Rename several cyber-eyes traits

---
 Resources/Locale/en-US/traits/traits.ftl | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index 97a8150c495..390b7dab7ae 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -406,33 +406,33 @@ trait-description-DermalArmor =
     Your skin has been replaced with a flexible, yet sturdy, hard-polymer shell wrapped in a layer of synthetic flesh.
     This augmentation provides an innate 10% resistance to physical damage.
 
-trait-name-CyberEyes = Cyber-Eyes Basic System
+trait-name-CyberEyes = Upgradable Cyber-Eyes
 trait-description-CyberEyes =
     One or more of your eyes have been replaced with a highly modular mechanical ocular implant.
     Their most basic functionality is to provide amelioration for weaknesses of the wearer's natural eyes.
     The functionality of these implants can be extended by a variety of commercially available modules.
 
-trait-name-FlareShielding = Cyber-Eyes Flare Shielding
+trait-name-FlareShielding = Cyber-Eyes: Eye Damage Resistance
 trait-description-FlareShielding =
     Your cybereyes have been fitted with a photochromic lense that automatically darkens in response to intense stimuli.
-    This provides substantial protection from bright flashes of light, such as those from welding arcs.
+    This provides immunity from most bright flashes of light, such as those from welding arcs.
 
-trait-name-CyberEyesSecurity = Cyber-Eyes SecHud
+trait-name-CyberEyesSecurity = Cyber-Eyes: SecHud Module
 trait-description-CyberEyesSecurity =
     Your Cyber-Eyes have been upgraded to include a built-in Security Hud. Note that this augmentation is considered Contraband
     for anyone not under the employ of station Security personel, and may be disabled by your employer before dispatch to the station.
 
-trait-name-CyberEyesMedical = Cyber-Eyes MedHud
+trait-name-CyberEyesMedical = Cyber-Eyes: MedHud Module
 trait-description-CyberEyesMedical =
     Your Cyber-Eyes have been upgraded to include a built-in Medical Hud, allowing you to track the relative health condition of biological organisms.
 
-trait-name-CyberEyesDiagnostic = Cyber-Eyes DiagHud
+trait-name-CyberEyesDiagnostic = Cyber-Eyes: Diagnostics Module
 trait-description-CyberEyesDiagnostic =
     Your Cyber-Eyes have been upgraded to include a built-in Diagnostic Hud, allowing you to track the condition of synthetic entities.
 
-trait-name-CyberEyesOmni = Cyber-Eyes HudSuite
+trait-name-CyberEyesOmni = Cyber-Eyes: Premium Suite Module
 trait-description-CyberEyesOmni =
-    This expensive implant provides the combined benefits of a SecHud, MedHud, and a DiagHud.
+    This expensive implant provides the combined benefits of a SecHud, MedHud, and a Diagnostics Module.
     Note that this augmentation is considered Contraband for anyone not under the employ of station Security personel,
     and may be disabled by your employer before dispatch to the station.
 

From e18d2aac00446eb1bd4a9f1f8564858b879da2c3 Mon Sep 17 00:00:00 2001
From: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com>
Date: Fri, 20 Dec 2024 20:17:13 +0400
Subject: [PATCH 346/366] Fix communication console menu (#33655)

fix Communication console
---
 .../UI/CommunicationsConsoleMenu.xaml         | 63 ++++++++++++++++---
 1 file changed, 54 insertions(+), 9 deletions(-)

diff --git a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml
index ea2f77d457d..b74df979cf4 100644
--- a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml
+++ b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml
@@ -1,17 +1,62 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     Title="{Loc 'comms-console-menu-title'}"
-    MinSize="400 225">
-    <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True" Margin="5">
-        <TextEdit Name="MessageInput" HorizontalExpand="True" VerticalExpand="True" Margin="0 0 0 5" MinHeight="100" />
-        <Button Name="AnnounceButton" Text="{Loc 'comms-console-menu-announcement-button'}" StyleClasses="OpenLeft" Access="Public" />
-        <Button Name="BroadcastButton" Text="{Loc 'comms-console-menu-broadcast-button'}" StyleClasses="OpenLeft" Access="Public" />
+    MinSize="400 300">
 
-        <OptionButton Name="AlertLevelButton" StyleClasses="OpenRight" Access="Public" />
+    <!-- Main Container -->
+    <BoxContainer Orientation="Vertical"
+        HorizontalExpand="False"
+        VerticalExpand="True"
+        Margin="6 6 6 5">
 
-        <Control MinSize="10 10" />
+        <TextEdit Name="MessageInput"
+            VerticalExpand="True"
+            HorizontalExpand="True"
+            VerticalAlignment="Stretch"
+            HorizontalAlignment="Stretch"
+            MinHeight="100"/>
 
-        <RichTextLabel Name="CountdownLabel" VerticalExpand="True" />
-        <Button Name="EmergencyShuttleButton" Text="Placeholder Text" Access="Public" />
+        <!-- ButtonsPart -->
+        <BoxContainer Orientation="Vertical"
+            VerticalAlignment="Bottom"
+            SeparationOverride="4">
+
+            <!-- AnnouncePart -->
+            <BoxContainer Orientation="Vertical"
+                Margin="0 2">
+
+                <Button Name="AnnounceButton"
+                    Access="Public"
+                    Text="{Loc 'comms-console-menu-announcement-button'}"
+                    ToolTip="{Loc 'comms-console-menu-announcement-button-tooltip'}"
+                    StyleClasses="OpenLeft"
+                    Margin="0 0 1 0"
+                    Disabled="True"/>
+
+                <Button Name="BroadcastButton"
+                    Access="Public"
+                    Text="{Loc 'comms-console-menu-broadcast-button'}"
+                    ToolTip="{Loc 'comms-console-menu-broadcast-button-tooltip'}"
+                    StyleClasses="OpenBoth"/>
+
+                <OptionButton Name="AlertLevelButton"
+                    Access="Public"
+                    ToolTip="{Loc 'comms-console-menu-alert-level-button-tooltip'}"
+                    StyleClasses="OpenRight"/>
+
+            </BoxContainer>
+
+            <!-- EmergencyPart -->
+            <BoxContainer Orientation="Vertical"
+                SeparationOverride="6">
+
+                <RichTextLabel Name="CountdownLabel"/>
+
+                <Button Name="EmergencyShuttleButton"
+                    Access="Public" 
+                    Text="Placeholder Text"
+                    ToolTip="{Loc 'comms-console-menu-emergency-shuttle-button-tooltip'}"/>
+            </BoxContainer>
+        </BoxContainer>
     </BoxContainer>
 </controls:FancyWindow>

From cd08bb2978bf08865eab73e56e0b3eadd067a8cc Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 30 Dec 2024 16:07:07 -0400
Subject: [PATCH 347/366] fix some bugs:tm:

---
 .../Lobby/UI/HumanoidProfileEditor.xaml.cs    |  2 +-
 .../Mech/Ui/MechBoundUserInterface.cs         |  1 -
 .../EntitySystems/GasThermoMachineSystem.cs   |  5 +--
 Content.Server/Language/TranslatorSystem.cs   | 24 ++++++++++++++
 Content.Server/Medical/HealingSystem.cs       |  3 +-
 .../Radio/EntitySystems/RadioDeviceSystem.cs  |  2 +-
 .../Radio/EntitySystems/RadioSystem.cs        | 17 ++++++----
 .../Radio/IntrinsicRadioKeySystem.cs          |  4 +--
 .../Weapons/Melee/SharedMeleeWeaponSystem.cs  | 33 +++++++++++++++----
 .../en-US/cargo/cargo-console-component.ftl   |  2 +-
 .../Catalog/Fills/Lockers/cargo.yml           |  1 +
 .../Prototypes/Entities/Mobs/Player/ipc.yml   |  2 +-
 12 files changed, 73 insertions(+), 23 deletions(-)

diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index 3924138c4c5..07c673a9f3e 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -1393,7 +1393,7 @@ private void UpdateDimensions(SliderUpdate updateType)
 
             if (updateType == SliderUpdate.Height || updateType == SliderUpdate.Both)
                 if (ratio < 1 / sizeRatio || ratio > sizeRatio)
-                    widthValue = heightValue * (ratio < 1 / sizeRatio ? (1 / sizeRatio) : sizeRatio);
+                    widthValue = heightValue / (ratio < 1 / sizeRatio ? (1 / sizeRatio) : sizeRatio);
 
             if (updateType == SliderUpdate.Width || updateType == SliderUpdate.Both)
                 if (ratio < 1 / sizeRatio || ratio > sizeRatio)
diff --git a/Content.Client/Mech/Ui/MechBoundUserInterface.cs b/Content.Client/Mech/Ui/MechBoundUserInterface.cs
index 2130a8c6099..558678718f1 100644
--- a/Content.Client/Mech/Ui/MechBoundUserInterface.cs
+++ b/Content.Client/Mech/Ui/MechBoundUserInterface.cs
@@ -67,4 +67,3 @@ public void UpdateEquipmentControls(MechBoundUiState state)
         return component?.Ui;
     }
 }
-
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
index c753d0a2445..827ba0bda5c 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
@@ -5,14 +5,15 @@
 using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
+using Content.Server.NodeContainer;
 using Content.Server.NodeContainer.EntitySystems;
 using Content.Server.NodeContainer.Nodes;
 using Content.Server.Power.Components;
-using Content.Server.Power.EntitySystems;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Piping.Unary.Components;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
+using Content.Server.Power.EntitySystems;
 using Content.Shared.UserInterface;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
@@ -142,7 +143,7 @@ private bool IsHeater(GasThermoMachineComponent comp)
 
         private void OnToggleMessage(EntityUid uid, GasThermoMachineComponent thermoMachine, GasThermomachineToggleMessage args)
         {
-            var powerState = _power.IsPowered(uid);
+            var powerState = _power.TogglePower(uid);
             _adminLogger.Add(LogType.AtmosPowerChanged, $"{ToPrettyString(args.Actor)} turned {(powerState ? "On" : "Off")} {ToPrettyString(uid)}");
             DirtyUI(uid, thermoMachine);
         }
diff --git a/Content.Server/Language/TranslatorSystem.cs b/Content.Server/Language/TranslatorSystem.cs
index 133146ec064..22184dec3a7 100644
--- a/Content.Server/Language/TranslatorSystem.cs
+++ b/Content.Server/Language/TranslatorSystem.cs
@@ -3,12 +3,14 @@
 using Content.Server.PowerCell;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
+using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.Language;
 using Content.Shared.Language.Components;
 using Content.Shared.Language.Systems;
 using Content.Shared.PowerCell;
 using Content.Shared.Language.Components.Translators;
 using Content.Shared.Language.Events;
+using Content.Shared.PowerCell.Components;
 using Robust.Shared.Containers;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
@@ -33,6 +35,8 @@ public override void Initialize()
         SubscribeLocalEvent<HandheldTranslatorComponent, EntParentChangedMessage>(OnTranslatorParentChanged);
         SubscribeLocalEvent<HandheldTranslatorComponent, ActivateInWorldEvent>(OnTranslatorToggle);
         SubscribeLocalEvent<HandheldTranslatorComponent, PowerCellSlotEmptyEvent>(OnPowerCellSlotEmpty);
+        SubscribeLocalEvent<HandheldTranslatorComponent, PowerCellChangedEvent>(OnPowerCellChanged);
+        SubscribeLocalEvent<HandheldTranslatorComponent, ItemToggledEvent>(OnItemToggled);
     }
 
     private void OnDetermineLanguages(EntityUid uid, IntrinsicTranslatorComponent component, DetermineEntityLanguagesEvent ev)
@@ -137,6 +141,26 @@ private void OnPowerCellSlotEmpty(EntityUid translator, HandheldTranslatorCompon
             _language.UpdateEntityLanguages(holderCont.Owner);
     }
 
+    private void OnPowerCellChanged(EntityUid translator, HandheldTranslatorComponent component, PowerCellChangedEvent args)
+    {
+        component.Enabled = !args.Ejected;
+        _powerCell.SetDrawEnabled(translator, !args.Ejected);
+        OnAppearanceChange(translator, component);
+
+        if (_containers.TryGetContainingContainer((translator, null, null), out var holderCont) && HasComp<LanguageSpeakerComponent>(holderCont.Owner))
+            _language.UpdateEntityLanguages(holderCont.Owner);
+    }
+
+    private void OnItemToggled(EntityUid translator, HandheldTranslatorComponent component, ItemToggledEvent args)
+    {
+        component.Enabled = args.Activated;
+        _powerCell.SetDrawEnabled(translator, args.Activated);
+        OnAppearanceChange(translator, component);
+
+        if (_containers.TryGetContainingContainer((translator, null, null), out var holderCont) && HasComp<LanguageSpeakerComponent>(holderCont.Owner))
+            _language.UpdateEntityLanguages(holderCont.Owner);
+    }
+
     private void CopyLanguages(BaseTranslatorComponent from, DetermineEntityLanguagesEvent to, LanguageKnowledgeComponent knowledge)
     {
         var addSpoken = CheckLanguagesMatch(from.RequiredLanguages, knowledge.SpokenLanguages, from.RequiresAllLanguages);
diff --git a/Content.Server/Medical/HealingSystem.cs b/Content.Server/Medical/HealingSystem.cs
index 8191243356b..454ad358619 100644
--- a/Content.Server/Medical/HealingSystem.cs
+++ b/Content.Server/Medical/HealingSystem.cs
@@ -218,10 +218,11 @@ targetDamage.DamageContainerID is not null &&
         var doAfterEventArgs =
             new DoAfterArgs(EntityManager, user, delay, new HealingDoAfterEvent(), target, target: target, used: uid)
             {
+                //Raise the event on the target if it's not self, otherwise raise it on self.
+                BreakOnMove = true,
                 // Didn't break on damage as they may be trying to prevent it and
                 // not being able to heal your own ticking damage would be frustrating.
                 NeedHand = true,
-                BreakOnMove = true,
                 BreakOnWeightlessMove = false,
             };
 
diff --git a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
index 137dc1bc905..6fd5e46e10a 100644
--- a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
@@ -217,7 +217,7 @@ private void OnReceiveRadio(EntityUid uid, RadioSpeakerComponent component, ref
             ("originalName", nameEv.VoiceName));
 
         // log to chat so people can identity the speaker/source, but avoid clogging ghost chat if there are many radios
-        _chat.TrySendInGameICMessage(uid, args.LanguageObfuscatedChatMsg.Message, InGameICChatType.Whisper, ChatTransmitRange.GhostRangeLimit, nameOverride: name, checkRadioPrefix: false);
+        _chat.TrySendInGameICMessage(uid, args.OriginalChatMsg.Message, InGameICChatType.Whisper, ChatTransmitRange.GhostRangeLimit, nameOverride: name, checkRadioPrefix: false);
     }
 
     private void OnIntercomEncryptionChannelsChanged(Entity<IntercomComponent> ent, ref EncryptionChannelsChangedEvent args)
diff --git a/Content.Server/Radio/EntitySystems/RadioSystem.cs b/Content.Server/Radio/EntitySystems/RadioSystem.cs
index fef86ea35da..4433ac6d545 100644
--- a/Content.Server/Radio/EntitySystems/RadioSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioSystem.cs
@@ -52,21 +52,24 @@ private void OnIntrinsicSpeak(EntityUid uid, IntrinsicRadioTransmitterComponent
     {
         if (args.Channel != null && component.Channels.Contains(args.Channel.ID))
         {
-            SendRadioMessage(uid, args.Message, args.Channel, uid);
+            SendRadioMessage(uid, args.Message, args.Channel, uid, args.Language);
             args.Channel = null; // prevent duplicate messages from other listeners.
         }
     }
 
     private void OnIntrinsicReceive(EntityUid uid, IntrinsicRadioReceiverComponent component, ref RadioReceiveEvent args)
     {
-        var listener = args.RadioSource;
-        var msg = args.OriginalChatMsg;
+        if (TryComp(uid, out ActorComponent? actor))
+        {
+            // Einstein-Engines - languages mechanic
+            var listener = component.Owner;
+            var msg = args.OriginalChatMsg;
 
-        if (!_language.CanUnderstand(listener, args.Language.ID))
-            msg = args.LanguageObfuscatedChatMsg;
+            if (listener != null && !_language.CanUnderstand(listener, args.Language.ID))
+                msg = args.LanguageObfuscatedChatMsg;
 
-        if (TryComp(uid, out ActorComponent? actor))
-            _netMan.ServerSendMessage(new MsgChatMessage { Message = msg }, actor.PlayerSession.Channel);
+            _netMan.ServerSendMessage(new MsgChatMessage { Message = msg}, actor.PlayerSession.Channel);
+        }
     }
 
     /// <summary>
diff --git a/Content.Server/Radio/IntrinsicRadioKeySystem.cs b/Content.Server/Radio/IntrinsicRadioKeySystem.cs
index eeea64c2f70..01770e6e59b 100644
--- a/Content.Server/Radio/IntrinsicRadioKeySystem.cs
+++ b/Content.Server/Radio/IntrinsicRadioKeySystem.cs
@@ -24,9 +24,9 @@ private void OnReceiverChannelsChanged(EntityUid uid, ActiveRadioComponent compo
         UpdateChannels(uid, args.Component, ref component.Channels);
     }
 
-    private void UpdateChannels(EntityUid _, EncryptionKeyHolderComponent keyHolderComp, ref HashSet<string> channels)
+    private void UpdateChannels(EntityUid _, EncryptionKeyHolderComponent component, ref HashSet<string> channels)
     {
         channels.Clear();
-        channels.UnionWith(keyHolderComp.Channels);
+        channels.UnionWith(component.Channels);
     }
 }
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index 4b506cc1200..edca18e5f76 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -4,7 +4,9 @@
 using Content.Shared.ActionBlocker;
 using Content.Shared.Administration.Logs;
 using Content.Shared.CombatMode;
+using Content.Shared.Contests;
 using Content.Shared.Damage;
+using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
 using Content.Shared.FixedPoint;
@@ -47,6 +49,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
     [Dependency] private   readonly SharedPhysicsSystem     _physics         = default!;
     [Dependency] private   readonly IPrototypeManager       _protoManager    = default!;
     [Dependency] private   readonly StaminaSystem           _stamina         = default!;
+    [Dependency] private   readonly ContestsSystem          _contests        = default!;
 
     private const int AttackMask = (int) (CollisionGroup.MobMask | CollisionGroup.Opaque);
 
@@ -219,6 +222,10 @@ public DamageSpecifier GetDamage(EntityUid uid, EntityUid user, MeleeWeaponCompo
         var ev = new GetMeleeDamageEvent(uid, new(component.Damage), new(), user, component.ResistanceBypass);
         RaiseLocalEvent(uid, ref ev);
 
+        if (component.ContestArgs is not null)
+
+            ev.Damage *= _contests.ContestConstructor(user, component.ContestArgs);
+
         return DamageSpecifier.ApplyModifierSets(ev.Damage, ev.Modifiers);
     }
 
@@ -241,7 +248,7 @@ public FixedPoint2 GetHeavyDamageModifier(EntityUid uid, EntityUid user, MeleeWe
         var ev = new GetHeavyDamageModifierEvent(uid, component.ClickDamageModifier, 1, user);
         RaiseLocalEvent(uid, ref ev);
 
-        return ev.DamageModifier * ev.Multipliers;
+        return ev.DamageModifier * ev.Multipliers * component.HeavyDamageBaseModifier;
     }
 
     public bool GetResistanceBypass(EntityUid uid, EntityUid user, MeleeWeaponComponent? component = null)
@@ -395,7 +402,10 @@ private bool AttemptAttack(EntityUid user, EntityUid weaponUid, MeleeWeaponCompo
         DirtyField(weaponUid, weapon, nameof(MeleeWeaponComponent.NextAttack));
 
         // Do this AFTER attack so it doesn't spam every tick
-        var ev = new AttemptMeleeEvent();
+        var ev = new AttemptMeleeEvent
+        {
+            PlayerUid = user
+        };
         RaiseLocalEvent(weaponUid, ref ev);
 
         if (ev.Cancelled)
@@ -511,7 +521,7 @@ protected virtual void DoLightAttack(EntityUid user, LightAttackEvent ev, Entity
         RaiseLocalEvent(target.Value, attackedEvent);
 
         var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage + attackedEvent.BonusDamage, hitEvent.ModifiersList);
-        var damageResult = Damageable.TryChangeDamage(target, modifiedDamage, origin:user, ignoreResistances:resistanceBypass);
+        var damageResult = Damageable.TryChangeDamage(target, modifiedDamage, origin:user, ignoreResistances: resistanceBypass, partMultiplier: component.ClickPartDamageMultiplier);
 
         if (damageResult is {Empty: false})
         {
@@ -557,6 +567,17 @@ private bool DoHeavyAttack(EntityUid user, HeavyAttackEvent ev, EntityUid meleeU
         if (targetMap.MapId != userXform.MapID)
             return false;
 
+        if (TryComp<StaminaComponent>(user, out var stamina))
+        {
+            if (stamina.CritThreshold - stamina.StaminaDamage <= component.HeavyStaminaCost)
+            {
+                PopupSystem.PopupClient(Loc.GetString("melee-heavy-no-stamina"), meleeUid, user);
+                return false;
+            }
+
+            _stamina.TakeStaminaDamage(user, component.HeavyStaminaCost, stamina, visual: false);
+        }
+
         var userPos = TransformSystem.GetWorldPosition(userXform);
         var direction = targetMap.Position - userPos;
         var distance = Math.Min(component.Range, direction.Length());
@@ -588,9 +609,9 @@ private bool DoHeavyAttack(EntityUid user, HeavyAttackEvent ev, EntityUid meleeU
         }
 
         // Naughty input
-        if (entities.Count > MaxTargets)
+        if (entities.Count > component.MaxTargets)
         {
-            entities.RemoveRange(MaxTargets, entities.Count - MaxTargets);
+            entities.RemoveRange(component.MaxTargets, entities.Count - component.MaxTargets);
         }
 
         // Validate client
@@ -666,7 +687,7 @@ private bool DoHeavyAttack(EntityUid user, HeavyAttackEvent ev, EntityUid meleeU
             RaiseLocalEvent(entity, attackedEvent);
             var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage + attackedEvent.BonusDamage, hitEvent.ModifiersList);
 
-            var damageResult = Damageable.TryChangeDamage(entity, modifiedDamage, origin:user);
+            var damageResult = Damageable.TryChangeDamage(entity, modifiedDamage, origin: user, partMultiplier: component.HeavyPartDamageMultiplier);
 
             if (damageResult != null && damageResult.GetTotal() > FixedPoint2.Zero)
             {
diff --git a/Resources/Locale/en-US/cargo/cargo-console-component.ftl b/Resources/Locale/en-US/cargo/cargo-console-component.ftl
index 941e0fa1805..9d57f6c67b0 100644
--- a/Resources/Locale/en-US/cargo/cargo-console-component.ftl
+++ b/Resources/Locale/en-US/cargo/cargo-console-component.ftl
@@ -30,7 +30,7 @@ cargo-console-snip-snip = Order trimmed to capacity
 cargo-console-insufficient-funds = Insufficient funds (require {$cost})
 cargo-console-unfulfilled = No room to fulfill order
 cargo-console-trade-station = Sent to {$destination}
-cargo-console-unlock-approved-order-broadcast = [bold]{$productName} x{$orderAmount}[/bold], which cost [bold]{$cost}[/bold], was approved by [bold]{$approverName}, {$approverJob}[/bold]
+cargo-console-unlock-approved-order-broadcast = [bold]{$productName} x{$orderAmount}[/bold], which cost [bold]{$cost}[/bold], was approved by [bold]{$approver}[/bold]
 
 cargo-console-paper-print-name = Order #{$orderNumber}
 cargo-console-paper-print-text =
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
index 8059f892a6e..02eee486913 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
@@ -42,6 +42,7 @@
       - id: HandheldGPSBasic
       - id: RadioHandheld
       - id: FlashlightSeclite
+      - id: Pickaxe
       - id: SeismicCharge
         amount: 2
       - id: ClothingShoesBootsWinterMiner #Delta V: Add departmental winter boots
diff --git a/Resources/Prototypes/Entities/Mobs/Player/ipc.yml b/Resources/Prototypes/Entities/Mobs/Player/ipc.yml
index c3ae577120d..9ff065ef01d 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/ipc.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/ipc.yml
@@ -136,4 +136,4 @@
   - type: HumanoidAppearance
     species: IPC
   - type: Inventory
-    templateId: ipc
+    templateId: ipc
\ No newline at end of file

From b099c3725128b2425252e4fb55aaa7d2afc81371 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 30 Dec 2024 16:20:48 -0400
Subject: [PATCH 348/366] Fix communications console.

---
 .../Communications/UI/CommunicationsConsoleMenu.xaml.cs        | 2 +-
 .../en-US/communications/communications-console-component.ftl  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs
index 63868e7a93e..56604ba526d 100644
--- a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs
+++ b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs
@@ -130,7 +130,7 @@ public void UpdateCountdown()
 
             EmergencyShuttleButton.Text = Loc.GetString("comms-console-menu-recall-shuttle");
             var infoText = Loc.GetString($"comms-console-menu-time-remaining",
-            ("time", diff.TotalSeconds.ToString(CultureInfo.CurrentCulture)));
+                ("time", diff.ToString(@"hh\:mm\:ss", CultureInfo.CurrentCulture)));
             CountdownLabel.SetMessage(infoText);
         }
     }
diff --git a/Resources/Locale/en-US/communications/communications-console-component.ftl b/Resources/Locale/en-US/communications/communications-console-component.ftl
index bead43df286..bf8a6c33c9c 100644
--- a/Resources/Locale/en-US/communications/communications-console-component.ftl
+++ b/Resources/Locale/en-US/communications/communications-console-component.ftl
@@ -5,6 +5,7 @@ comms-console-menu-announcement-button = Announce
 comms-console-menu-broadcast-button = Broadcast
 comms-console-menu-call-shuttle = Call emergency shuttle
 comms-console-menu-recall-shuttle = Recall emergency shuttle
+comms-console-menu-time-remaining = Time remaining: {$time}
 
 # Popup
 comms-console-permission-denied = Permission denied
@@ -18,4 +19,4 @@ comms-console-announcement-unknown-sender = Unknown
 # Comms console variant titles
 comms-console-announcement-title-station = Communications Console
 comms-console-announcement-title-centcom = Central Command
-comms-console-announcement-title-nukie = Syndicate Nuclear Operative
+comms-console-announcement-title-nukie = Syndicate Nuclear Operative
\ No newline at end of file

From 471c3c22abfe315c911fa414bc036d8d2c6fe756 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 30 Dec 2024 17:26:25 -0400
Subject: [PATCH 349/366] Change CyberEyes name back to original

---
 Resources/Locale/en-US/traits/traits.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index 390b7dab7ae..9904ce2f901 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -406,7 +406,7 @@ trait-description-DermalArmor =
     Your skin has been replaced with a flexible, yet sturdy, hard-polymer shell wrapped in a layer of synthetic flesh.
     This augmentation provides an innate 10% resistance to physical damage.
 
-trait-name-CyberEyes = Upgradable Cyber-Eyes
+trait-name-CyberEyes = Cyber-Eyes Basic System
 trait-description-CyberEyes =
     One or more of your eyes have been replaced with a highly modular mechanical ocular implant.
     Their most basic functionality is to provide amelioration for weaknesses of the wearer's natural eyes.

From 60382e2f6272e45b329076c504fcc35176dc8135 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 30 Dec 2024 18:53:03 -0400
Subject: [PATCH 350/366] NanoChat fixes

---
 Content.Shared/DeltaV/NanoChat/SharedNanoChatSystem.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Content.Shared/DeltaV/NanoChat/SharedNanoChatSystem.cs b/Content.Shared/DeltaV/NanoChat/SharedNanoChatSystem.cs
index 0a53122f87e..6f035047997 100644
--- a/Content.Shared/DeltaV/NanoChat/SharedNanoChatSystem.cs
+++ b/Content.Shared/DeltaV/NanoChat/SharedNanoChatSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
 using Content.Shared.Examine;
+using Content.Shared.PDA;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.DeltaV.NanoChat;
@@ -10,6 +11,7 @@ namespace Content.Shared.DeltaV.NanoChat;
 public abstract class SharedNanoChatSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
 
     public override void Initialize()
     {
@@ -139,6 +141,10 @@ public void AddMessage(Entity<NanoChatCardComponent?> card, uint recipientNumber
         if (!Resolve(card, ref card.Comp))
             return null;
 
+        // If the UI is not open, no one is technically selected.
+        if (!_ui.IsUiOpen(card.Owner, PdaUiKey.Key))
+            return null;
+
         return card.Comp.CurrentChat;
     }
 

From 2d2bfecaf649df8d5743787107b428af0f1ca8d7 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 30 Dec 2024 19:33:38 -0400
Subject: [PATCH 351/366] Add all ComponentStart features to OnMapInit function

---
 Content.Server/Ghost/GhostSystem.cs | 34 +++++++++++++----------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs
index 2be39f79837..43b7b6f5f82 100644
--- a/Content.Server/Ghost/GhostSystem.cs
+++ b/Content.Server/Ghost/GhostSystem.cs
@@ -55,7 +55,6 @@ public override void Initialize()
             _ghostQuery = GetEntityQuery<GhostComponent>();
             _physicsQuery = GetEntityQuery<PhysicsComponent>();
 
-            SubscribeLocalEvent<GhostComponent, ComponentStartup>(OnGhostStartup);
             SubscribeLocalEvent<GhostComponent, MapInitEvent>(OnMapInit);
             SubscribeLocalEvent<GhostComponent, ComponentShutdown>(OnGhostShutdown);
 
@@ -147,24 +146,6 @@ private void OnRelayMoveInput(EntityUid uid, GhostOnMoveComponent component, ref
             _ticker.OnGhostAttempt(mindId, component.CanReturn, mind: mind);
         }
 
-        private void OnGhostStartup(EntityUid uid, GhostComponent component, ComponentStartup args)
-        {
-            // Allow this entity to be seen by other ghosts.
-            var visibility = EnsureComp<VisibilityComponent>(uid);
-
-            if (_ticker.RunLevel != GameRunLevel.PostRound)
-            {
-                _visibilitySystem.AddLayer((uid, visibility), (int) VisibilityFlags.Ghost, false);
-                _visibilitySystem.RemoveLayer((uid, visibility), (int) VisibilityFlags.Normal, false);
-                _visibilitySystem.RefreshVisibility(uid, visibilityComponent: visibility);
-            }
-
-            SetCanSeeGhosts(uid, true);
-
-            var time = _gameTiming.CurTime;
-            component.TimeOfDeath = time;
-        }
-
         private void OnGhostShutdown(EntityUid uid, GhostComponent component, ComponentShutdown args)
         {
             // Perf: If the entity is deleting itself, no reason to change these back.
@@ -197,6 +178,21 @@ private void SetCanSeeGhosts(EntityUid uid, bool canSee, EyeComponent? eyeCompon
 
         private void OnMapInit(EntityUid uid, GhostComponent component, MapInitEvent args)
         {
+            // Allow this entity to be seen by other ghosts.
+            var visibility = EnsureComp<VisibilityComponent>(uid);
+
+            if (_ticker.RunLevel != GameRunLevel.PostRound)
+            {
+                _visibilitySystem.AddLayer((uid, visibility), (int) VisibilityFlags.Ghost, false);
+                _visibilitySystem.RemoveLayer((uid, visibility), (int) VisibilityFlags.Normal, false);
+                _visibilitySystem.RefreshVisibility(uid, visibilityComponent: visibility);
+            }
+
+            SetCanSeeGhosts(uid, true);
+
+            var time = _gameTiming.CurTime;
+            component.TimeOfDeath = time;
+
             _actions.AddAction(uid, ref component.BooActionEntity, component.BooAction);
             _actions.AddAction(uid, ref component.ToggleGhostHearingActionEntity, component.ToggleGhostHearingAction);
             _actions.AddAction(uid, ref component.ToggleLightingActionEntity, component.ToggleLightingAction);

From 179c441ace2f114d96e2b8b832d353e61a218356 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 30 Dec 2024 19:42:26 -0400
Subject: [PATCH 352/366] Disable setting to blue with sleeper agents.

---
 Resources/Prototypes/GameRules/events.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 7dad051b981..cd6002b34f1 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -518,7 +518,7 @@
     minimumPlayers: 15
     reoccurrenceDelay: 30
     startAnnouncement: false
-  - type: AlertLevelInterceptionRule
+# - type: AlertLevelInterceptionRule - Disable setting to blue with sleeper agents
   - type: AntagSelection
     definitions:
     - prefRoles: [ TraitorSleeper ]

From d8f608275a1e2fa615b89ecaec5bb13af8b67791 Mon Sep 17 00:00:00 2001
From: Repo <47093363+Titian3@users.noreply.github.com>
Date: Wed, 31 Jul 2024 13:58:31 +1200
Subject: [PATCH 353/366] Fix aHelp menu sorting (#30518)

* Keep Pinned status through player status changes.

* Fix filtering to be admin optimal.
---
 .../UI/Bwoink/BwoinkControl.xaml.cs           | 41 +++++++++++++++++--
 .../CustomControls/PlayerListControl.xaml.cs  | 21 +++++++---
 2 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
index 6ffb7147661..87142ed9b40 100644
--- a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
+++ b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
@@ -87,6 +87,10 @@ public BwoinkControl()
                 var ach = AHelpHelper.EnsurePanel(a.SessionId);
                 var bch = AHelpHelper.EnsurePanel(b.SessionId);
 
+                // Pinned players first
+                if (a.IsPinned != b.IsPinned)
+                    return a.IsPinned ? -1 : 1;
+
                 // First, sort by unread. Any chat with unread messages appears first. We just sort based on unread
                 // status, not number of unread messages, so that more recent unread messages take priority.
                 var aUnread = ach.Unread > 0;
@@ -98,15 +102,31 @@ public BwoinkControl()
                 if (a.Connected != b.Connected)
                     return a.Connected ? -1 : 1;
 
-                // Next, group by whether or not the players have participated in this round.
-                // The ahelp window shows all players that have connected since server restart, this groups them all towards the bottom.
-                if (a.ActiveThisRound != b.ActiveThisRound)
-                    return a.ActiveThisRound ? -1 : 1;
+                // Sort connected players by New Player status, then by Antag status
+                if (a.Connected && b.Connected)
+                {
+                    var aNewPlayer = a.OverallPlaytime <= TimeSpan.FromMinutes(_cfg.GetCVar(CCVars.NewPlayerThreshold));
+                    var bNewPlayer = b.OverallPlaytime <= TimeSpan.FromMinutes(_cfg.GetCVar(CCVars.NewPlayerThreshold));
+
+                    if (aNewPlayer != bNewPlayer)
+                        return aNewPlayer ? -1 : 1;
+
+                    if (a.Antag != b.Antag)
+                        return a.Antag ? -1 : 1;
+                }
+
+                // Sort disconnected players by participation in the round
+                if (!a.Connected && !b.Connected)
+                {
+                    if (a.ActiveThisRound != b.ActiveThisRound)
+                        return a.ActiveThisRound ? -1 : 1;
+                }
 
                 // Finally, sort by the most recent message.
                 return bch.LastMessage.CompareTo(ach.LastMessage);
             };
 
+
             Bans.OnPressed += _ =>
             {
                 if (_currentPlayer is not null)
@@ -252,7 +272,20 @@ private void SwitchToChannel(NetUserId? ch)
 
         public void PopulateList()
         {
+            // Maintain existing pin statuses
+            var pinnedPlayers = ChannelSelector.PlayerInfo.Where(p => p.IsPinned).ToDictionary(p => p.SessionId);
+
             ChannelSelector.PopulateList();
+
+            // Restore pin statuses
+            foreach (var player in ChannelSelector.PlayerInfo)
+            {
+                if (pinnedPlayers.TryGetValue(player.SessionId, out var pinnedPlayer))
+                {
+                    player.IsPinned = pinnedPlayer.IsPinned;
+                }
+            }
+
             UpdateButtons();
         }
     }
diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
index b09cd727ef8..c7fbf6c2dc0 100644
--- a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
+++ b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
@@ -21,11 +21,11 @@ public sealed partial class PlayerListControl : BoxContainer
 
     private readonly IEntityManager _entManager;
     private readonly IUserInterfaceManager _uiManager;
-    
+
     private PlayerInfo? _selectedPlayer;
 
     private List<PlayerInfo> _playerList = new();
-    private readonly List<PlayerInfo> _sortedPlayerList = new();
+    private List<PlayerInfo> _sortedPlayerList = new();
 
     public Comparison<PlayerInfo>? Comparison;
     public Func<PlayerInfo, string, string>? OverrideText;
@@ -110,19 +110,30 @@ private void FilterList()
         if (Comparison != null)
             _sortedPlayerList.Sort((a, b) => Comparison(a, b));
 
-        // Ensure pinned players are always at the top
-        _sortedPlayerList.Sort((a, b) => a.IsPinned != b.IsPinned && a.IsPinned ? -1 : 1);
-
         PlayerListContainer.PopulateList(_sortedPlayerList.Select(info => new PlayerListData(info)).ToList());
         if (_selectedPlayer != null)
             PlayerListContainer.Select(new PlayerListData(_selectedPlayer));
     }
 
+
     public void PopulateList(IReadOnlyList<PlayerInfo>? players = null)
     {
+        // Maintain existing pin statuses
+        var pinnedPlayers = _playerList.Where(p => p.IsPinned).ToDictionary(p => p.SessionId);
+
         players ??= _adminSystem.PlayerList;
 
         _playerList = players.ToList();
+
+        // Restore pin statuses
+        foreach (var player in _playerList)
+        {
+            if (pinnedPlayers.TryGetValue(player.SessionId, out var pinnedPlayer))
+            {
+                player.IsPinned = pinnedPlayer.IsPinned;
+            }
+        }
+
         if (_selectedPlayer != null && !_playerList.Contains(_selectedPlayer))
             _selectedPlayer = null;
 

From 01158611802d614bd6278280ce3421c3f7d9b24b Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 30 Dec 2024 19:44:27 -0400
Subject: [PATCH 354/366] Little note

---
 Resources/Prototypes/GameRules/events.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index cd6002b34f1..98c29e843fc 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -518,7 +518,7 @@
     minimumPlayers: 15
     reoccurrenceDelay: 30
     startAnnouncement: false
-# - type: AlertLevelInterceptionRule - Disable setting to blue with sleeper agents
+# - type: AlertLevelInterceptionRule - Disable setting to blue with sleeper agents. Uncomment to enable.
   - type: AntagSelection
     definitions:
     - prefRoles: [ TraitorSleeper ]

From 78be43622bd84252e7050931361b02d40ffc02fe Mon Sep 17 00:00:00 2001
From: Repo <47093363+Titian3@users.noreply.github.com>
Date: Sat, 3 Aug 2024 06:58:00 +1200
Subject: [PATCH 355/366] Fix Bwoink Player sorting again.... (#30580)

Keep players that have had messages in the round at the top
---
 .../Administration/UI/Bwoink/BwoinkControl.xaml.cs       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
index 87142ed9b40..8becf8afe37 100644
--- a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
+++ b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
@@ -91,13 +91,18 @@ public BwoinkControl()
                 if (a.IsPinned != b.IsPinned)
                     return a.IsPinned ? -1 : 1;
 
-                // First, sort by unread. Any chat with unread messages appears first. We just sort based on unread
-                // status, not number of unread messages, so that more recent unread messages take priority.
+                // First, sort by unread. Any chat with unread messages appears first.
                 var aUnread = ach.Unread > 0;
                 var bUnread = bch.Unread > 0;
                 if (aUnread != bUnread)
                     return aUnread ? -1 : 1;
 
+                // Sort by recent messages during the current round.
+                var aRecent = a.ActiveThisRound && ach.LastMessage != DateTime.MinValue;
+                var bRecent = b.ActiveThisRound && bch.LastMessage != DateTime.MinValue;
+                if (aRecent != bRecent)
+                    return aRecent ? -1 : 1;
+
                 // Next, sort by connection status. Any disconnected players are grouped towards the end.
                 if (a.Connected != b.Connected)
                     return a.Connected ? -1 : 1;

From c2bb33336863f23406f6e1d4e72b7396661079ed Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 30 Dec 2024 21:08:52 -0400
Subject: [PATCH 356/366] Psych can scan, added NanoChat to medical.

---
 .../Chemistry/UI/ChemMasterWindow.xaml.cs     | 45 ++++++++++---------
 Content.Shared/Chemistry/SharedChemMaster.cs  |  3 ++
 .../Entities/Objects/Devices/pda.yml          |  3 +-
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
index 5755bfdc075..d312a69e7a6 100644
--- a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
+++ b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
@@ -105,22 +105,23 @@ private List<ReagentButton> CreateReagentTransferButtons(ReagentId reagent, bool
             if (!addReagentButtons)
                 return new List<ReagentButton>(); // Return an empty list if reagentTransferButton creation is disabled.
 
-            var buttonConfigs = new (string text, ChemMasterReagentAmount amount, string styleClass)[]
-            {
-                ("1", ChemMasterReagentAmount.U1, StyleBase.ButtonOpenBoth),
-                ("5", ChemMasterReagentAmount.U5, StyleBase.ButtonOpenBoth),
-                ("10", ChemMasterReagentAmount.U10, StyleBase.ButtonOpenBoth),
-                ("25", ChemMasterReagentAmount.U25, StyleBase.ButtonOpenBoth),
-                ("50", ChemMasterReagentAmount.U50, StyleBase.ButtonOpenBoth),
-                ("100", ChemMasterReagentAmount.U100, StyleBase.ButtonOpenBoth),
-                (Loc.GetString("chem-master-window-buffer-all-amount"), ChemMasterReagentAmount.All, StyleBase.ButtonOpenLeft),
-            };
-
             var buttons = new List<ReagentButton>();
+            var names = Enum.GetNames<ChemMasterReagentAmount>();
+            var values = Enum.GetValues<ChemMasterReagentAmount>();
 
-            foreach (var (text, amount, styleClass) in buttonConfigs)
+            for (int i = 0; i < names.Length; i++)
             {
-                var reagentTransferButton = MakeReagentButton(text, amount, reagent, isBuffer, styleClass);
+                var name = names[i];
+                var reagentAmount = values[i];
+
+                var reagentTransferButton = MakeReagentButton(
+                    name,
+                    reagentAmount,
+                    reagent,
+                    isBuffer,
+                    i != names.Length - 1 ? StyleBase.ButtonOpenBoth : StyleBase.ButtonOpenLeft
+                );
+
                 buttons.Add(reagentTransferButton);
             }
 
@@ -140,17 +141,17 @@ public void UpdateState(BoundUserInterfaceState state)
 
             // Ensure the Panel Info is updated, including UI elements for Buffer Volume, Output Container and so on
             UpdatePanelInfo(castState);
-    
+
             BufferCurrentVolume.Text = $" {castState.BufferCurrentVolume?.Int() ?? 0}u";
-    
+
             InputEjectButton.Disabled = castState.InputContainerInfo is null;
             OutputEjectButton.Disabled = castState.OutputContainerInfo is null;
             CreateBottleButton.Disabled = castState.OutputContainerInfo?.Reagents == null;
             CreatePillButton.Disabled = castState.OutputContainerInfo?.Entities == null;
-            
+
             UpdateDosageFields(castState);
         }
-        
+
         //assign default values for pill and bottle fields.
         private void UpdateDosageFields(ChemMasterBoundUserInterfaceState castState)
         {
@@ -162,7 +163,7 @@ private void UpdateDosageFields(ChemMasterBoundUserInterfaceState castState)
             var bufferVolume = castState.BufferCurrentVolume?.Int() ?? 0;
 
             PillDosage.Value = (int)Math.Min(bufferVolume, castState.PillDosageLimit);
-            
+
             PillTypeButtons[castState.SelectedPillType].Pressed = true;
             PillNumber.IsValid = x => x >= 0 && x <= pillNumberMax;
             PillDosage.IsValid = x => x > 0 && x <= castState.PillDosageLimit;
@@ -247,7 +248,7 @@ private void UpdatePanelInfo(ChemMasterBoundUserInterfaceState state)
                 BufferInfo.Children.Add(BuildReagentRow(reagentColor, rowCount++, name, reagentId, quantity, true, true));
             }
         }
-        
+
         private void BuildContainerUI(Control control, ContainerInfo? info, bool addReagentButtons)
         {
             control.Children.Clear();
@@ -295,7 +296,7 @@ private void BuildContainerUI(Control control, ContainerInfo? info, bool addReag
                     _prototypeManager.TryIndex(reagent.Reagent.Prototype, out ReagentPrototype? proto);
                     var name = proto?.LocalizedName ?? Loc.GetString("chem-master-window-unknown-reagent-text");
                     var reagentColor = proto?.SubstanceColor ?? default(Color);
-        
+
                     control.Children.Add(BuildReagentRow(reagentColor, rowCount++, name, reagent.Reagent, reagent.Quantity, false, addReagentButtons));
                 }
             }
@@ -315,7 +316,7 @@ private Control BuildReagentRow(Color reagentColor, int rowCount, string name, R
             }
             //this calls the separated button builder, and stores the return to render after labels
             var reagentButtonConstructors = CreateReagentTransferButtons(reagent, isBuffer, addReagentButtons);
-            
+
             // Create the row layout with the color panel
             var rowContainer = new BoxContainer
             {
@@ -358,7 +359,7 @@ private Control BuildReagentRow(Color reagentColor, int rowCount, string name, R
                 Children = { rowContainer }
             };
         }
-        
+
         public string LabelLine
         {
             get => LabelLineEdit.Text;
diff --git a/Content.Shared/Chemistry/SharedChemMaster.cs b/Content.Shared/Chemistry/SharedChemMaster.cs
index 762131d7612..8fca24fcdb0 100644
--- a/Content.Shared/Chemistry/SharedChemMaster.cs
+++ b/Content.Shared/Chemistry/SharedChemMaster.cs
@@ -94,7 +94,10 @@ public enum ChemMasterReagentAmount
         U1 = 1,
         U5 = 5,
         U10 = 10,
+        U15 = 15,
         U25 = 25,
+        U30 = 30,
+        U45 = 45,
         U50 = 50,
         U100 = 100,
         All,
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index a05e7238ab3..055e8062da9 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -126,6 +126,7 @@
       - NotekeeperCartridge
       - NewsReaderCartridge
       - MedTekCartridge
+      - NanoChatCartridge # DeltaV
 
 - type: entity
   parent: BasePDA
@@ -1192,7 +1193,7 @@
     accentVColor: "#447987"
 
 - type: entity
-  parent: BasePDA
+  parent: BaseMedicalPDA
   id: PsychologistPDA
   name: psychologist PDA
   description: Looks immaculately cleaned.

From 6716d6ab9a83692f9ab2b8cfcb8ca0e6717ceb54 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Tue, 31 Dec 2024 01:15:04 -0400
Subject: [PATCH 357/366] Editing contacts, enter to send messages.

---
 .../Cartridges/EditChatPopup.xaml             | 53 +++++++++++
 .../Cartridges/EditChatPopup.xaml.cs          | 89 +++++++++++++++++++
 .../CartridgeLoader/Cartridges/NanoChatUi.cs  |  2 +-
 .../Cartridges/NanoChatUiFragment.xaml        |  8 ++
 .../Cartridges/NanoChatUiFragment.xaml.cs     | 33 ++++++-
 Content.Client/IoC/ClientContentIoC.cs        |  4 +
 .../Cartridges/NanoChatCartridgeSystem.cs     |  5 ++
 Content.Shared/CCVar/CCVars.cs                |  2 +-
 Content.Shared/DeltaV/CCVars/DCCVars.cs       |  6 --
 .../Cartridges/NanoChatUiState.cs             |  4 +-
 .../DeltaV/NanoChat/SharedNanoChatSystem.cs   |  6 +-
 .../deltav/cartridge-loader/cartridges.ftl    |  2 +
 12 files changed, 197 insertions(+), 17 deletions(-)
 create mode 100644 Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml
 create mode 100644 Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml.cs

diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml b/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml
new file mode 100644
index 00000000000..76a8513796b
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml
@@ -0,0 +1,53 @@
+<DefaultWindow xmlns="https://spacestation14.io"
+               Title="{Loc nano-chat-new-title}"
+               MinSize="300 200">
+    <PanelContainer StyleClasses="AngleRect">
+        <BoxContainer Orientation="Vertical" Margin="4">
+            <!-- Number input -->
+            <BoxContainer Orientation="Vertical" Margin="0 4">
+                <Label Text="{Loc nano-chat-number-label}"
+                       StyleClasses="LabelHeading" />
+                <PanelContainer StyleClasses="ButtonSquare">
+                    <LineEdit Name="NumberInput"
+                              PlaceHolder="{Loc nano-chat-number-placeholder}"
+                              Editable="False"/>
+                </PanelContainer>
+            </BoxContainer>
+
+            <!-- Name input -->
+            <BoxContainer Orientation="Vertical" Margin="0 4">
+                <Label Text="{Loc nano-chat-name-label}"
+                       StyleClasses="LabelHeading" />
+                <PanelContainer StyleClasses="ButtonSquare">
+                    <LineEdit Name="NameInput"
+                              PlaceHolder="{Loc nano-chat-name-placeholder}" />
+                </PanelContainer>
+            </BoxContainer>
+
+            <!-- Job input (optional) -->
+            <BoxContainer Orientation="Vertical" Margin="0 4">
+                <Label Text="{Loc nano-chat-job-label}"
+                       StyleClasses="LabelHeading" />
+                <PanelContainer StyleClasses="ButtonSquare">
+                    <LineEdit Name="JobInput"
+                              PlaceHolder="{Loc nano-chat-job-placeholder}" />
+                </PanelContainer>
+            </BoxContainer>
+
+            <!-- Action buttons -->
+            <BoxContainer Orientation="Horizontal"
+                          HorizontalAlignment="Right"
+                          Margin="0 8 0 0">
+                <Button Name="CancelButton"
+                        Text="{Loc nano-chat-cancel}"
+                        StyleClasses="OpenRight"
+                        MinSize="80 0" />
+                <Button Name="CreateButton"
+                        Text="{Loc nano-chat-create}"
+                        StyleClasses="OpenLeft"
+                        MinSize="80 0"
+                        Disabled="True" />
+            </BoxContainer>
+        </BoxContainer>
+    </PanelContainer>
+</DefaultWindow>
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml.cs
new file mode 100644
index 00000000000..5ab492bb530
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml.cs
@@ -0,0 +1,89 @@
+using System.Linq;
+using Content.Client.DeltaV.NanoChat;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+
+[GenerateTypedNameReferences]
+public sealed partial class EditChatPopup : DefaultWindow
+{
+    private const int MaxInputLength = 16;
+    private const int MaxNumberLength = 4;
+
+    public event Action<uint, string, string?>? OnContactEdited;
+
+    public EditChatPopup()
+    {
+        RobustXamlLoader.Load(this);
+
+        // margins trolling
+        ContentsContainer.Margin = new Thickness(3);
+
+        // Button handlers
+        CancelButton.OnPressed += _ => Close();
+        CreateButton.OnPressed += _ => EditChat();
+
+        // Input validation
+        NameInput.OnTextChanged += _ => ValidateInputs();
+
+        NameInput.OnTextChanged += args =>
+        {
+            if (args.Text.Length > MaxInputLength)
+                NameInput.Text = args.Text[..MaxInputLength];
+            ValidateInputs();
+        };
+
+        JobInput.OnTextChanged += args =>
+        {
+            if (args.Text.Length > MaxInputLength)
+                JobInput.Text = args.Text[..MaxInputLength];
+        };
+
+        NumberInput.OnTextChanged += args =>
+        {
+            if (args.Text.Length > MaxNumberLength)
+                NumberInput.Text = args.Text[..MaxNumberLength];
+
+            // Filter to digits only
+            var newText = string.Concat(NumberInput.Text.Where(char.IsDigit));
+            if (newText != NumberInput.Text)
+                NumberInput.Text = newText;
+
+            ValidateInputs();
+        };
+    }
+
+    private void ValidateInputs()
+    {
+        var isValid = !string.IsNullOrWhiteSpace(NumberInput.Text) &&
+            !string.IsNullOrWhiteSpace(NameInput.Text) &&
+            uint.TryParse(NumberInput.Text, out _);
+
+        CreateButton.Disabled = !isValid;
+    }
+
+    private void EditChat()
+    {
+        if (!uint.TryParse(NumberInput.Text, out var number))
+            return;
+
+        var name = NameInput.Text.Trim();
+        var job = string.IsNullOrWhiteSpace(JobInput.Text) ? null : JobInput.Text.Trim();
+
+        OnContactEdited?.Invoke(number, name, job);
+        Close();
+    }
+
+    public void ClearInputs()
+    {
+        NameInput.Text = string.Empty;
+        JobInput.Text = string.Empty;
+        ValidateInputs();
+    }
+
+    public void SetNumberInput(string newNumber) => NumberInput.Text = newNumber;
+    public void SetNameInput(string newName) => NameInput.Text = newName;
+    public void SetJobInput(string newJob) => JobInput.Text = newJob;
+}
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUi.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUi.cs
index fb65b03e887..845ea046e2d 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUi.cs
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUi.cs
@@ -16,7 +16,7 @@ public override Control GetUIFragmentRoot()
 
     public override void Setup(BoundUserInterface userInterface, EntityUid? fragmentOwner)
     {
-        _fragment = new NanoChatUiFragment();
+        _fragment = new();
 
         _fragment.OnMessageSent += (type, number, content, job) =>
         {
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml
index 2a39094b85d..8fe07cee94c 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml
@@ -34,6 +34,14 @@
                        StyleClasses="LabelSubText"
                        VerticalAlignment="Center"
                        Margin="0 0 8 0" />
+                <Button Name="EditChatButton"
+                        Text="E"
+                        MaxSize="32 32"
+                        Visible="False"
+                        StyleClasses="OpenBoth"
+                        Margin="0 0 4 0"
+                        ToolTip="{Loc nano-chat-edit}">
+                </Button>
                 <Button Name="DeleteChatButton"
                         MaxSize="32 32"
                         Visible="False"
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs
index 159d6b1a93a..f33e3f5153c 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs
@@ -1,6 +1,8 @@
 using System.Linq;
 using System.Numerics;
+using Content.Client.DeltaV.NanoChat;
 using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
+using Content.Shared.DeltaV.NanoChat;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
@@ -13,10 +15,13 @@ namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
 public sealed partial class NanoChatUiFragment : BoxContainer
 {
     [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly NanoChatSystem _nanoChat = default!;
 
     private const int MaxMessageLength = 256;
 
     private readonly NewChatPopup _newChatPopup;
+    private readonly EditChatPopup _editChatPopup;
     private uint? _currentChat;
     private uint? _pendingChat;
     private uint _ownNumber;
@@ -31,7 +36,8 @@ public NanoChatUiFragment()
         IoCManager.InjectDependencies(this);
         RobustXamlLoader.Load(this);
 
-        _newChatPopup = new NewChatPopup();
+        _newChatPopup = new();
+        _editChatPopup = new();
         SetupEventHandlers();
     }
 
@@ -42,6 +48,12 @@ private void SetupEventHandlers()
             OnMessageSent?.Invoke(NanoChatUiMessageType.NewChat, number, name, job);
         };
 
+        _editChatPopup.OnContactEdited += (number, name, job) =>
+        {
+            DeleteCurrentChat();
+            OnMessageSent?.Invoke(NanoChatUiMessageType.NewChat, number, name, job);
+        };
+
         NewChatButton.OnPressed += _ =>
         {
             _newChatPopup.ClearInputs();
@@ -75,7 +87,9 @@ private void SetupEventHandlers()
             }
         };
 
+        MessageInput.OnTextEntered += _ => SendMessage();
         SendButton.OnPressed += _ => SendMessage();
+        EditChatButton.OnPressed += _ => BeginEditChat();
         DeleteChatButton.OnPressed += _ => DeleteCurrentChat();
     }
 
@@ -96,7 +110,7 @@ private void SendMessage()
 
         if (!_messages.TryGetValue(activeChat.Value, out var value))
         {
-            value = new List<NanoChatMessage>();
+            value = new();
             _messages[activeChat.Value] = value;
         }
 
@@ -142,6 +156,20 @@ private void DeleteCurrentChat()
         OnMessageSent?.Invoke(NanoChatUiMessageType.DeleteChat, activeChat, null, null);
     }
 
+    private void BeginEditChat()
+    {
+        if (_currentChat == null)
+            return;
+
+        var recipient = _recipients[_currentChat ?? 0];
+
+        _editChatPopup.ClearInputs();
+        _editChatPopup.SetNumberInput(recipient.Number.ToString());
+        _editChatPopup.SetNameInput(recipient.Name);
+        _editChatPopup.SetJobInput(recipient.JobTitle ?? string.Empty);
+        _editChatPopup.OpenCentered();
+    }
+
     private void UpdateChatList(Dictionary<uint, NanoChatRecipient> recipients)
     {
         ChatList.RemoveAllChildren();
@@ -175,6 +203,7 @@ private void UpdateCurrentChat()
         CurrentChatName.Visible = !hasActiveChat;
         MessageInputContainer.Visible = hasActiveChat;
         DeleteChatButton.Visible = hasActiveChat;
+        EditChatButton.Visible = hasActiveChat;
         DeleteChatButton.Disabled = !hasActiveChat;
 
         if (activeChat != null && _recipients.TryGetValue(activeChat.Value, out var recipient))
diff --git a/Content.Client/IoC/ClientContentIoC.cs b/Content.Client/IoC/ClientContentIoC.cs
index 3f74ab6646e..6d181c52b8c 100644
--- a/Content.Client/IoC/ClientContentIoC.cs
+++ b/Content.Client/IoC/ClientContentIoC.cs
@@ -2,6 +2,7 @@
 using Content.Client.Changelog;
 using Content.Client.Chat.Managers;
 using Content.Client.Clickable;
+using Content.Client.DeltaV.NanoChat;
 using Content.Client.DiscordAuth;
 using Content.Client.JoinQueue;
 using Content.Client.Eui;
@@ -23,6 +24,8 @@
 using Content.Shared.Chat;
 using Content.Shared.Players.PlayTimeTracking;
 using Content.Shared.Players.RateLimiting;
+using Robust.Client.GameObjects;
+
 
 namespace Content.Client.IoC
 {
@@ -57,6 +60,7 @@ public static void Register()
             collection.Register<DiscordAuthManager>();
             collection.Register<PlayerRateLimitManager>();
             collection.Register<SharedPlayerRateLimitManager, PlayerRateLimitManager>();
+            collection.Register<NanoChatSystem>();
         }
     }
 }
diff --git a/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs b/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
index ea3c58226ad..e4752f20f7d 100644
--- a/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
+++ b/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
@@ -12,6 +12,7 @@
 using Content.Shared.DeltaV.NanoChat;
 using Content.Shared.PDA;
 using Content.Shared.Radio.Components;
+using Robust.Server.GameObjects;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
@@ -25,6 +26,7 @@ public sealed class NanoChatCartridgeSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly SharedNanoChatSystem _nanoChat = default!;
     [Dependency] private readonly StationSystem _station = default!;
+    [Dependency] private readonly UserInterfaceSystem _ui = default!;
 
     // Messages in notifications get cut off after this point
     // no point in storing it on the comp
@@ -381,6 +383,9 @@ private void DeliverMessageToRecipient(Entity<NanoChatCardComponent> sender,
 
         _nanoChat.AddMessage((recipient, recipient.Comp), senderNumber.Value, message with { DeliveryFailed = false });
 
+        if (_nanoChat.GetCurrentChat((recipient, recipient.Comp)) == senderNumber
+            && !_ui.IsUiOpen(recipient.Owner, PdaUiKey.Key))
+            HandleUnreadNotification(recipient, message);
 
         if (_nanoChat.GetCurrentChat((recipient, recipient.Comp)) != senderNumber)
             HandleUnreadNotification(recipient, message);
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 3b93974a7bb..0ca289f4175 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -2041,7 +2041,7 @@ public static readonly CVarDef<int>
         /// Disables all vision filters for species like Vulpkanin or Harpies. There are good reasons someone might want to disable these.
         /// </summary>
         public static readonly CVarDef<bool> NoVisionFilters =
-            CVarDef.Create("accessibility.no_vision_filters", false, CVar.CLIENTONLY | CVar.ARCHIVE);
+            CVarDef.Create("accessibility.no_vision_filters", true, CVar.CLIENTONLY | CVar.ARCHIVE);
 
         /*
          * CHAT
diff --git a/Content.Shared/DeltaV/CCVars/DCCVars.cs b/Content.Shared/DeltaV/CCVars/DCCVars.cs
index dc4cd402b90..9c5b68268fa 100644
--- a/Content.Shared/DeltaV/CCVars/DCCVars.cs
+++ b/Content.Shared/DeltaV/CCVars/DCCVars.cs
@@ -71,12 +71,6 @@ public sealed class DCCVars
      * Misc.
      */
 
-    /// <summary>
-    /// Disables all vision filters for species like Vulpkanin or Harpies. There are good reasons someone might want to disable these.
-    /// </summary>
-    public static readonly CVarDef<bool> NoVisionFilters =
-        CVarDef.Create("accessibility.no_vision_filters", true, CVar.CLIENTONLY | CVar.ARCHIVE);
-
     /// <summary>
     /// Whether the Shipyard is enabled.
     /// </summary>
diff --git a/Content.Shared/DeltaV/CartridgeLoader/Cartridges/NanoChatUiState.cs b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/NanoChatUiState.cs
index dde6751abc7..47e8986e01a 100644
--- a/Content.Shared/DeltaV/CartridgeLoader/Cartridges/NanoChatUiState.cs
+++ b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/NanoChatUiState.cs
@@ -5,8 +5,8 @@ namespace Content.Shared.DeltaV.CartridgeLoader.Cartridges;
 [Serializable, NetSerializable]
 public sealed class NanoChatUiState : BoundUserInterfaceState
 {
-    public readonly Dictionary<uint, NanoChatRecipient> Recipients = new();
-    public readonly Dictionary<uint, List<NanoChatMessage>> Messages = new();
+    public readonly Dictionary<uint, NanoChatRecipient> Recipients;
+    public readonly Dictionary<uint, List<NanoChatMessage>> Messages;
     public readonly uint? CurrentChat;
     public readonly uint OwnNumber;
     public readonly int MaxRecipients;
diff --git a/Content.Shared/DeltaV/NanoChat/SharedNanoChatSystem.cs b/Content.Shared/DeltaV/NanoChat/SharedNanoChatSystem.cs
index 6f035047997..4511ecec207 100644
--- a/Content.Shared/DeltaV/NanoChat/SharedNanoChatSystem.cs
+++ b/Content.Shared/DeltaV/NanoChat/SharedNanoChatSystem.cs
@@ -3,6 +3,7 @@
 using Content.Shared.PDA;
 using Robust.Shared.Timing;
 
+
 namespace Content.Shared.DeltaV.NanoChat;
 
 /// <summary>
@@ -11,7 +12,6 @@ namespace Content.Shared.DeltaV.NanoChat;
 public abstract class SharedNanoChatSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
 
     public override void Initialize()
     {
@@ -141,10 +141,6 @@ public void AddMessage(Entity<NanoChatCardComponent?> card, uint recipientNumber
         if (!Resolve(card, ref card.Comp))
             return null;
 
-        // If the UI is not open, no one is technically selected.
-        if (!_ui.IsUiOpen(card.Owner, PdaUiKey.Key))
-            return null;
-
         return card.Comp.CurrentChat;
     }
 
diff --git a/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl b/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl
index dbf38ac3e9e..5c5a5c0a418 100644
--- a/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl
+++ b/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl
@@ -171,6 +171,7 @@ nano-chat-no-chats = No active chats
 nano-chat-select-chat = Select a chat to begin
 nano-chat-message-placeholder = Type a message...
 nano-chat-send = Send
+nano-chat-edit = Edit
 nano-chat-delete = Delete
 nano-chat-loading = Loading...
 nano-chat-message-too-long = Message too long ({$current}/{$max} characters)
@@ -182,6 +183,7 @@ nano-chat-delivery-failed = Failed to deliver
 
 # Create chat popup
 nano-chat-new-title = Add a new chat
+nano-chat-edit-title = Edit a contact
 nano-chat-number-label = Number
 nano-chat-name-label = Name
 nano-chat-job-label = Job title

From b710fda3c90b63750bedf2eaa9eb0ad96c1eadc5 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Tue, 31 Dec 2024 01:16:39 -0400
Subject: [PATCH 358/366] Enable mail teleporters by default

---
 .../Nyanotrasen/Entities/Structures/Machines/mailTeleporter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/mailTeleporter.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/mailTeleporter.yml
index 6430e94105a..bf3450f70c0 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/mailTeleporter.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/mailTeleporter.yml
@@ -46,7 +46,7 @@
         acts: ["Destruction"]
   - type: ApcPowerReceiver
     powerLoad: 1000 # TODO if we keep this make it spike power draw when teleporting
-    powerDisabled: true
+    powerDisabled: false
   - type: ExtensionCableReceiver
   - type: Appearance
   - type: GenericVisualizer

From 55f8a67da8be1a44c4bddb443a6b7bf7f2856c2d Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Tue, 31 Dec 2024 01:24:18 -0400
Subject: [PATCH 359/366] Revert "Enable mail teleporters by default"

This reverts commit b710fda3c90b63750bedf2eaa9eb0ad96c1eadc5.
---
 .../Nyanotrasen/Entities/Structures/Machines/mailTeleporter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/mailTeleporter.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/mailTeleporter.yml
index bf3450f70c0..6430e94105a 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/mailTeleporter.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/mailTeleporter.yml
@@ -46,7 +46,7 @@
         acts: ["Destruction"]
   - type: ApcPowerReceiver
     powerLoad: 1000 # TODO if we keep this make it spike power draw when teleporting
-    powerDisabled: false
+    powerDisabled: true
   - type: ExtensionCableReceiver
   - type: Appearance
   - type: GenericVisualizer

From ffa033ed9df9b1875cc587c5ccefdbd3a8fb2b8e Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Tue, 31 Dec 2024 01:32:29 -0400
Subject: [PATCH 360/366] Reapply "Enable mail teleporters by default"

This reverts commit 55f8a67da8be1a44c4bddb443a6b7bf7f2856c2d.
---
 .../Nyanotrasen/Entities/Structures/Machines/mailTeleporter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/mailTeleporter.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/mailTeleporter.yml
index 6430e94105a..bf3450f70c0 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/mailTeleporter.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/mailTeleporter.yml
@@ -46,7 +46,7 @@
         acts: ["Destruction"]
   - type: ApcPowerReceiver
     powerLoad: 1000 # TODO if we keep this make it spike power draw when teleporting
-    powerDisabled: true
+    powerDisabled: false
   - type: ExtensionCableReceiver
   - type: Appearance
   - type: GenericVisualizer

From 29b59e5ca6a53ef49dd5f4f441de8a959851e52d Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Tue, 31 Dec 2024 17:11:41 -0400
Subject: [PATCH 361/366] Fix errors

---
 Content.Server/Body/Systems/RespiratorSystem.cs  | 5 ++++-
 Content.Server/Medical/HealthAnalyzerSystem.cs   | 7 ++++---
 Content.Shared/Shadowkin/SharedEtherealSystem.cs | 3 +++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
index 7007a1879df..5ad0fb35acf 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -9,7 +9,10 @@
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
 using Content.Shared.Body.Components;
-using Content.Shared._Shitmed.Body.Organ; // Shitmed Change
+using Content.Shared._Shitmed.Body.Organ;
+using Content.Shared.Body.Prototypes;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Reagent; // Shitmed Change
 using Content.Shared.Damage;
 using Content.Shared.Database;
 using Content.Shared.EntityEffects;
diff --git a/Content.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs
index 1679b659d5d..91e8b2bf981 100644
--- a/Content.Server/Medical/HealthAnalyzerSystem.cs
+++ b/Content.Server/Medical/HealthAnalyzerSystem.cs
@@ -36,9 +36,10 @@ public sealed class HealthAnalyzerSystem : EntitySystem
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
     [Dependency] private readonly SharedBodySystem _bodySystem = default!; // Shitmed Change
-    [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
     [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
     [Dependency] private readonly TransformSystem _transformSystem = default!;
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
 
     public override void Initialize()
     {
@@ -175,7 +176,7 @@ private void BeginAnalyzingEntity(Entity<HealthAnalyzerComponent> healthAnalyzer
         //Link the health analyzer to the scanned entity
         healthAnalyzer.Comp.ScannedEntity = target;
         healthAnalyzer.Comp.CurrentBodyPart = part; // Shitmed Change
-        _cell.SetPowerCellDrawEnabled(healthAnalyzer, true);
+        _cell.SetDrawEnabled(healthAnalyzer.Owner, true);
 
         UpdateScannedUser(healthAnalyzer, target, true, part); // Shitmed Change
     }
@@ -190,7 +191,7 @@ private void StopAnalyzingEntity(Entity<HealthAnalyzerComponent> healthAnalyzer,
         //Unlink the analyzer
         healthAnalyzer.Comp.ScannedEntity = null;
         healthAnalyzer.Comp.CurrentBodyPart = null; // Shitmed Change
-        _cell.SetPowerCellDrawEnabled(target, false);
+        _cell.SetDrawEnabled(healthAnalyzer.Owner, false);
 
         UpdateScannedUser(healthAnalyzer, target, false);
     }
diff --git a/Content.Shared/Shadowkin/SharedEtherealSystem.cs b/Content.Shared/Shadowkin/SharedEtherealSystem.cs
index 4d9a5e47b0d..5ab5e3eeeaf 100644
--- a/Content.Shared/Shadowkin/SharedEtherealSystem.cs
+++ b/Content.Shared/Shadowkin/SharedEtherealSystem.cs
@@ -16,6 +16,8 @@
 using Content.Shared.Tag;
 using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Systems;
+using Content.Shared.Standing;
+
 
 namespace Content.Shared.Shadowkin;
 
@@ -27,6 +29,7 @@ public abstract class SharedEtherealSystem : EntitySystem
     [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly TagSystem _tag = default!;
     [Dependency] private readonly StaminaSystem _stamina = default!;
+    [Dependency] private readonly StandingStateSystem _standingState = default!;
 
     public override void Initialize()
     {

From 2b57a26cecfd00e05f465cb2bec1d2b0e9cb2afb Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Tue, 31 Dec 2024 17:39:24 -0400
Subject: [PATCH 362/366] Linter fixes

---
 Resources/Locale/en-US/species/shadowkin.ftl  |  2 +-
 Resources/Locale/en-US/traits/traits.ftl      |  3 -
 .../Entities/Mobs/Player/dragon.yml           |  2 -
 .../Circuitboards/Machine/production.yml      |  4 --
 .../Roles/Jobs/Epistemics/forensicmantis.yml  |  9 ---
 .../Prototypes/Recipes/Lathes/medical.yml     | 10 ++-
 .../Roles/Jobs/Science/research_director.yml  |  9 ---
 Resources/Prototypes/Traits/mental.yml        | 67 ++-----------------
 Resources/Prototypes/Traits/skills.yml        |  9 ---
 .../_Shitmed/Entities/Surgery/surgeries.yml   |  4 +-
 10 files changed, 16 insertions(+), 103 deletions(-)

diff --git a/Resources/Locale/en-US/species/shadowkin.ftl b/Resources/Locale/en-US/species/shadowkin.ftl
index b0c282df752..dc3f8371a07 100644
--- a/Resources/Locale/en-US/species/shadowkin.ftl
+++ b/Resources/Locale/en-US/species/shadowkin.ftl
@@ -13,4 +13,4 @@ examine-mindbroken-shadowkin-message = {CAPITALIZE($entity)} seems to be a black
 identity-eye-shadowkin = {$color}-eye
 
 shadowkin-blackeye = I feel my power draining away...
-shadowkin-tired = Im too tired!
+shadowkin-tired = I don't have the energy for that.
diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index 9904ce2f901..3e68fbbcabe 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -436,9 +436,6 @@ trait-description-CyberEyesOmni =
     Note that this augmentation is considered Contraband for anyone not under the employ of station Security personel,
     and may be disabled by your employer before dispatch to the station.
 
-trait-name-ShadowkinBlackeye = Blackeye
-trait-description-ShadowkinBlackeye = You lose your special Shadowkin powers, in return for some points.
-
 trait-name-DispelPower = Normality Projection
 trait-description-DispelPower =
     Your Mentalic abilities include the power to enforce normality upon Noospheric phenomena.
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index 02e414cb4a2..0f24313712a 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -147,8 +147,6 @@
   components:
   - type: Dragon
     spawnRiftAction: ActionSpawnRift
-  - type: GenericAntag
-    rule: Dragon
   - type: GuideHelp
     guides:
     - MinorAntagonists
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 574ed663d6f..ac5b3a42a5c 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -1669,7 +1669,3 @@
       materialRequirements:
         Steel: 5
         Cable: 1
-    - type: ReverseEngineering # Nyano
-      difficulty: 2
-      recipes:
-      - TraversalDistorterMachineCircuitboard
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
index 6c8e1d77151..f7a31205706 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
@@ -18,15 +18,6 @@
         - !type:CharacterTraitRequirement
           traits:
             - AnomalousPositronics
-    - !type:CharacterLogicOrRequirement
-      requirements:
-        - !type:CharacterSpeciesRequirement
-          species:
-            - Shadowkin
-        - !type:CharacterTraitRequirement
-          inverted: true
-          traits:
-            - ShadowkinBlackeye
   startingGear: ForensicMantisGear
   icon: "JobIconForensicMantis"
   supervisors: job-supervisors-rd
diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml
index f4b8b097639..ba8f596d215 100644
--- a/Resources/Prototypes/Recipes/Lathes/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/medical.yml
@@ -242,4 +242,12 @@
   completetime: 1
   materials:
     Steel: 600
-    Plastic: 300
\ No newline at end of file
+    Plastic: 300
+
+- type: latheRecipe
+  id: WhiteCane
+  result: WhiteCane
+  completetime: 2
+  materials:
+    Steel: 100
+    Plastic: 100
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
index bf8a83c7e8d..46d91ee00ee 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -19,15 +19,6 @@
         - !type:CharacterTraitRequirement
           traits:
             - AnomalousPositronics
-    - !type:CharacterLogicOrRequirement
-      requirements:
-        - !type:CharacterSpeciesRequirement
-          species:
-            - Shadowkin
-        - !type:CharacterTraitRequirement
-          inverted: true
-          traits:
-            - ShadowkinBlackeye
   weight: 10
   startingGear: ResearchDirectorGear
   icon: "JobIconResearchDirector"
diff --git a/Resources/Prototypes/Traits/mental.yml b/Resources/Prototypes/Traits/mental.yml
index 4dec0350f45..172872a6cdc 100644
--- a/Resources/Prototypes/Traits/mental.yml
+++ b/Resources/Prototypes/Traits/mental.yml
@@ -23,15 +23,6 @@
         - !type:CharacterTraitRequirement
           traits:
             - AnomalousPositronics
-    - !type:CharacterLogicOrRequirement
-      requirements:
-        - !type:CharacterSpeciesRequirement
-          species:
-            - Shadowkin
-        - !type:CharacterTraitRequirement
-          inverted: true
-          traits:
-            - ShadowkinBlackeye
     - !type:CharacterSpeciesRequirement
       inverted: true
       species:
@@ -71,15 +62,6 @@
         - !type:CharacterTraitRequirement
           traits:
             - AnomalousPositronics
-    - !type:CharacterLogicOrRequirement
-      requirements:
-        - !type:CharacterSpeciesRequirement
-          species:
-            - Shadowkin
-        - !type:CharacterTraitRequirement
-          inverted: true
-          traits:
-            - ShadowkinBlackeye
     - !type:CharacterSpeciesRequirement
       inverted: true
       species:
@@ -119,15 +101,10 @@
         - !type:CharacterTraitRequirement
           traits:
             - AnomalousPositronics
-    - !type:CharacterLogicOrRequirement
-      requirements:
-        - !type:CharacterSpeciesRequirement
-          species:
-            - Shadowkin
-        - !type:CharacterTraitRequirement
-          inverted: true
-          traits:
-            - ShadowkinBlackeye
+    - !type:CharacterSpeciesRequirement
+      inverted: true
+      species:
+        - Shadowkin
     - !type:CharacterTraitRequirement
       inverted: true
       traits:
@@ -163,15 +140,6 @@
         - !type:CharacterTraitRequirement
           traits:
             - AnomalousPositronics
-    - !type:CharacterLogicOrRequirement
-      requirements:
-        - !type:CharacterSpeciesRequirement
-          species:
-            - Shadowkin
-        - !type:CharacterTraitRequirement
-          inverted: true
-          traits:
-            - ShadowkinBlackeye
     - !type:CharacterTraitRequirement
       inverted: true
       traits:
@@ -207,15 +175,6 @@
         - !type:CharacterTraitRequirement
           traits:
             - AnomalousPositronics
-    - !type:CharacterLogicOrRequirement
-      requirements:
-        - !type:CharacterSpeciesRequirement
-          species:
-            - Shadowkin
-        - !type:CharacterTraitRequirement
-          inverted: true
-          traits:
-            - ShadowkinBlackeye
     - !type:CharacterTraitRequirement
       inverted: true
       traits:
@@ -251,15 +210,6 @@
         - !type:CharacterTraitRequirement
           traits:
             - AnomalousPositronics
-    - !type:CharacterLogicOrRequirement
-      requirements:
-        - !type:CharacterSpeciesRequirement
-          species:
-            - Shadowkin
-        - !type:CharacterTraitRequirement
-          inverted: true
-          traits:
-            - ShadowkinBlackeye
     - !type:CharacterTraitRequirement
       inverted: true
       traits:
@@ -294,15 +244,6 @@
         - !type:CharacterTraitRequirement
           traits:
             - AnomalousPositronics
-    - !type:CharacterLogicOrRequirement
-      requirements:
-        - !type:CharacterSpeciesRequirement
-          species:
-            - Shadowkin
-        - !type:CharacterTraitRequirement
-          inverted: true
-          traits:
-            - ShadowkinBlackeye
     - !type:CharacterTraitRequirement
       inverted: true
       traits:
diff --git a/Resources/Prototypes/Traits/skills.yml b/Resources/Prototypes/Traits/skills.yml
index 949b12a7aec..25603c7347d 100644
--- a/Resources/Prototypes/Traits/skills.yml
+++ b/Resources/Prototypes/Traits/skills.yml
@@ -288,15 +288,6 @@
         - !type:CharacterTraitRequirement
           traits:
             - AnomalousPositronics
-    - !type:CharacterLogicOrRequirement
-      requirements:
-        - !type:CharacterSpeciesRequirement
-          species:
-            - Shadowkin
-        - !type:CharacterTraitRequirement
-          inverted: true
-          traits:
-            - ShadowkinBlackeye
 
 - type: trait
   id: TrapAvoider
diff --git a/Resources/Prototypes/_Shitmed/Entities/Surgery/surgeries.yml b/Resources/Prototypes/_Shitmed/Entities/Surgery/surgeries.yml
index cd20e14a2fd..775716ecff4 100644
--- a/Resources/Prototypes/_Shitmed/Entities/Surgery/surgeries.yml
+++ b/Resources/Prototypes/_Shitmed/Entities/Surgery/surgeries.yml
@@ -608,7 +608,7 @@
         - type: OhioAccent
         - type: RatvarianLanguage
         - type: Clumsy
-          clumsyDamage: # Placeholder values to be able to initialize the component
+          gunShootFailDamage: # Placeholder values to be able to initialize the component
             types:
               Blunt: 0
     inverse: true
@@ -635,7 +635,7 @@
         - type: OhioAccent
         - type: RatvarianLanguage
         - type: Clumsy
-          clumsyDamage:
+          gunShootFailDamage:
             types:
               Blunt: 0
   - type: SurgeryPartCondition

From 06652427f8d87362f96c9d3748191912e0702f30 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Wed, 1 Jan 2025 14:15:25 -0400
Subject: [PATCH 363/366] BlackeyeSpawn doesn't exist, remove trait.

---
 Resources/Prototypes/Traits/species.yml | 26 ++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Resources/Prototypes/Traits/species.yml b/Resources/Prototypes/Traits/species.yml
index a3e29b37285..771a796eefa 100644
--- a/Resources/Prototypes/Traits/species.yml
+++ b/Resources/Prototypes/Traits/species.yml
@@ -67,16 +67,16 @@
         - Swashbuckler
         - Spearmaster
 
-- type: trait
-  id: ShadowkinBlackeye
-  category: Mental
-  points: 4
-  functions:
-    - !type:TraitReplaceComponent
-      components:
-        - type: Shadowkin
-          blackeyeSpawn: true
-  requirements:
-    - !type:CharacterSpeciesRequirement
-      species:
-        - Shadowkin
+# - type: trait
+#   id: ShadowkinBlackeye
+#   category: Mental
+#   points: 4
+#   functions:
+#     - !type:TraitReplaceComponent
+#       components:
+#         - type: Shadowkin
+#           blackeyeSpawn: true
+#   requirements:
+#     - !type:CharacterSpeciesRequirement
+#       species:
+#         - Shadowkin

From 103e552e2a637ef510995fa25b3a0379e22d5c7b Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Wed, 1 Jan 2025 14:44:23 -0400
Subject: [PATCH 364/366] Remove Blackeye

---
 .../Entities/Objects/Specific/Medical/surgery.yml        | 4 ++--
 .../Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml        | 9 ---------
 .../Roles/Jobs/Medical/chief_medical_officer.yml         | 9 ---------
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
index 95721afbb7d..4763687a150 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
@@ -388,7 +388,7 @@
   - type: Tool
     qualities:
       - Sawing
-    speed: 0.5
+    speedModifier: 0.5
   - type: BoneSaw # Shitmed
     speed: 0.5
 
@@ -474,7 +474,7 @@
   - type: Tool
     qualities:
       - Sawing
-    speed: 2.0
+    speedModifier: 2.0
   - type: BoneSaw # Shitmed
     speed: 2
 
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
index 638aaecd2cf..4f5551a2b3e 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
@@ -13,15 +13,6 @@
     - !type:DepartmentTimeRequirement
       department: Security
       min: 21600
-    - !type:CharacterLogicOrRequirement
-      requirements:
-        - !type:CharacterSpeciesRequirement
-          inverted: true
-          species:
-            - Shadowkin
-        - !type:CharacterTraitRequirement
-          traits:
-            - ShadowkinBlackeye
   special:
   - !type:AddComponentSpecial
     components:
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
index 39a9ec5046b..ee57445cdf3 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -18,15 +18,6 @@
       min: 43200 # DeltaV - 12 hours
     - !type:CharacterOverallTimeRequirement
       min: 72000 # DeltaV - 20 hours
-    - !type:CharacterLogicOrRequirement
-      requirements:
-        - !type:CharacterSpeciesRequirement
-          inverted: true
-          species:
-            - Shadowkin
-        - !type:CharacterTraitRequirement
-          traits:
-            - ShadowkinBlackeye
   weight: 10
   startingGear: CMOGear
   icon: "JobIconChiefMedicalOfficer"

From b2ac5fd375b16a294c8a820c3b37559665cb03b3 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Wed, 1 Jan 2025 20:23:00 -0400
Subject: [PATCH 365/366] Notifications are more reliable.

---
 .../CartridgeLoader/Cartridges/NanoChatUi.cs  |  2 +-
 .../Cartridges/NanoChatUiFragment.xaml.cs     | 26 +++++++-----
 .../Cartridges/NanoChatCartridgeSystem.cs     | 40 ++++++++++++++-----
 3 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUi.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUi.cs
index 845ea046e2d..9529ff65e18 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUi.cs
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUi.cs
@@ -18,7 +18,7 @@ public override void Setup(BoundUserInterface userInterface, EntityUid? fragment
     {
         _fragment = new();
 
-        _fragment.OnMessageSent += (type, number, content, job) =>
+        _fragment.ActionSendUiMessage += (type, number, content, job) =>
         {
             SendNanoChatUiMessage(type, number, content, job, userInterface);
         };
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs
index f33e3f5153c..3b2342e974d 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs
@@ -3,7 +3,9 @@
 using Content.Client.DeltaV.NanoChat;
 using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
 using Content.Shared.DeltaV.NanoChat;
+using Content.Shared.PDA;
 using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Client.UserInterface;
@@ -15,8 +17,6 @@ namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
 public sealed partial class NanoChatUiFragment : BoxContainer
 {
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly IEntityManager _entityManager = default!;
-    [Dependency] private readonly NanoChatSystem _nanoChat = default!;
 
     private const int MaxMessageLength = 256;
 
@@ -29,7 +29,7 @@ public sealed partial class NanoChatUiFragment : BoxContainer
     private Dictionary<uint, NanoChatRecipient> _recipients = new();
     private Dictionary<uint, List<NanoChatMessage>> _messages = new();
 
-    public event Action<NanoChatUiMessageType, uint?, string?, string?>? OnMessageSent;
+    public event Action<NanoChatUiMessageType, uint?, string?, string?>? ActionSendUiMessage;
 
     public NanoChatUiFragment()
     {
@@ -45,13 +45,13 @@ private void SetupEventHandlers()
     {
         _newChatPopup.OnChatCreated += (number, name, job) =>
         {
-            OnMessageSent?.Invoke(NanoChatUiMessageType.NewChat, number, name, job);
+            ActionSendUiMessage?.Invoke(NanoChatUiMessageType.NewChat, number, name, job);
         };
 
         _editChatPopup.OnContactEdited += (number, name, job) =>
         {
             DeleteCurrentChat();
-            OnMessageSent?.Invoke(NanoChatUiMessageType.NewChat, number, name, job);
+            ActionSendUiMessage?.Invoke(NanoChatUiMessageType.NewChat, number, name, job);
         };
 
         NewChatButton.OnPressed += _ =>
@@ -64,7 +64,7 @@ private void SetupEventHandlers()
         {
             _notificationsMuted = !_notificationsMuted;
             UpdateMuteButton();
-            OnMessageSent?.Invoke(NanoChatUiMessageType.ToggleMute, null, null, null);
+            ActionSendUiMessage?.Invoke(NanoChatUiMessageType.ToggleMute, null, null, null);
         };
 
         MessageInput.OnTextChanged += args =>
@@ -120,7 +120,7 @@ private void SendMessage()
         UpdateMessages(_messages);
 
         // Send message event
-        OnMessageSent?.Invoke(NanoChatUiMessageType.SendMessage, activeChat, messageContent, null);
+        ActionSendUiMessage?.Invoke(NanoChatUiMessageType.SendMessage, activeChat, messageContent, null);
 
         // Clear input
         MessageInput.Text = string.Empty;
@@ -143,7 +143,7 @@ private void SelectChat(uint number)
             UpdateChatList(_recipients);
         }
 
-        OnMessageSent?.Invoke(NanoChatUiMessageType.SelectChat, number, null, null);
+        ActionSendUiMessage?.Invoke(NanoChatUiMessageType.SelectChat, number, null, null);
         UpdateCurrentChat();
     }
 
@@ -153,7 +153,7 @@ private void DeleteCurrentChat()
         if (activeChat == null)
             return;
 
-        OnMessageSent?.Invoke(NanoChatUiMessageType.DeleteChat, activeChat, null, null);
+        ActionSendUiMessage?.Invoke(NanoChatUiMessageType.DeleteChat, activeChat, null, null);
     }
 
     private void BeginEditChat()
@@ -184,11 +184,13 @@ private void UpdateChatList(Dictionary<uint, NanoChatRecipient> recipients)
 
         foreach (var (number, recipient) in recipients.OrderBy(r => r.Value.Name))
         {
-            var entry = new NanoChatEntry();
             // For pending chat selection, always show it as selected even if unconfirmed
+            var entry = new NanoChatEntry();
             var isSelected = (_pendingChat == number) || (_pendingChat == null && _currentChat == number);
+
             entry.SetRecipient(recipient, number, isSelected);
             entry.OnPressed += SelectChat;
+
             ChatList.AddChild(entry);
         }
     }
@@ -214,6 +216,10 @@ private void UpdateCurrentChat()
         {
             CurrentChatName.Text = Loc.GetString("nano-chat-select-chat");
         }
+
+        // Scroll to bottom after messages are added
+        if (MessageList.Parent is ScrollContainer scroll)
+            scroll.SetScrollValue(new Vector2(0, float.MaxValue));
     }
 
     private void UpdateMessages(Dictionary<uint, List<NanoChatMessage>> messages)
diff --git a/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs b/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
index e4752f20f7d..e9e01041f15 100644
--- a/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
+++ b/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
@@ -38,6 +38,25 @@ public override void Initialize()
 
         SubscribeLocalEvent<NanoChatCartridgeComponent, CartridgeUiReadyEvent>(OnUiReady);
         SubscribeLocalEvent<NanoChatCartridgeComponent, CartridgeMessageEvent>(OnMessage);
+
+        Subs.BuiEvents<PdaComponent>(PdaUiKey.Key, subs =>
+        {
+            subs.Event<BoundUIClosedEvent>(OnPdaClosed);
+        });
+    }
+
+    // Reset current chat when PDA closes.
+    private void OnPdaClosed(EntityUid uid, PdaComponent component, BoundUIClosedEvent args)
+    {
+        var exists = GetCardEntity(uid, out var cardEntity);
+
+        if (!exists)
+            return;
+
+        _nanoChat.SetCurrentChat(
+            (cardEntity.Owner, (NanoChatCardComponent?) cardEntity.Comp),
+            null
+        );
     }
 
     public override void Update(float frameTime)
@@ -382,13 +401,7 @@ private void DeliverMessageToRecipient(Entity<NanoChatCardComponent> sender,
             return;
 
         _nanoChat.AddMessage((recipient, recipient.Comp), senderNumber.Value, message with { DeliveryFailed = false });
-
-        if (_nanoChat.GetCurrentChat((recipient, recipient.Comp)) == senderNumber
-            && !_ui.IsUiOpen(recipient.Owner, PdaUiKey.Key))
-            HandleUnreadNotification(recipient, message);
-
-        if (_nanoChat.GetCurrentChat((recipient, recipient.Comp)) != senderNumber)
-            HandleUnreadNotification(recipient, message);
+        HandleUnreadNotification(recipient, message);
 
         var msgEv = new NanoChatMessageReceivedEvent(recipient);
         RaiseLocalEvent(ref msgEv);
@@ -406,6 +419,8 @@ private void HandleUnreadNotification(Entity<NanoChatCardComponent> recipient, N
             ? existingRecipient.Name
             : $"#{message.SenderId:D4}";
 
+        var shouldUnread = true;
+
         if (!recipient.Comp.Recipients[message.SenderId].HasUnread && !recipient.Comp.NotificationsMuted)
         {
             var pdaQuery = EntityQueryEnumerator<PdaComponent>();
@@ -414,6 +429,12 @@ private void HandleUnreadNotification(Entity<NanoChatCardComponent> recipient, N
                 if (pdaComp.ContainedId != recipient)
                     continue;
 
+                if (_ui.IsUiOpen((pdaUid, null), PdaUiKey.Key) && recipient.Comp.CurrentChat == message.SenderId)
+                {
+                    shouldUnread = false;
+                    break;
+                }
+
                 _cartridge.SendNotification(pdaUid,
                     Loc.GetString("nano-chat-new-message-title", ("sender", senderName)),
                     Loc.GetString("nano-chat-new-message-body", ("message", TruncateMessage(message.Content))));
@@ -422,9 +443,10 @@ private void HandleUnreadNotification(Entity<NanoChatCardComponent> recipient, N
         }
 
         // Update unread status
-        _nanoChat.SetRecipient((recipient, recipient.Comp),
+        _nanoChat.SetRecipient(
+            (recipient, recipient.Comp),
             message.SenderId,
-            existingRecipient with { HasUnread = true });
+            existingRecipient with { HasUnread = shouldUnread });
     }
 
     /// <summary>

From c626df26a3361b337d79c4fe6db4c71587e2ff54 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Wed, 1 Jan 2025 20:47:39 -0400
Subject: [PATCH 366/366] Fix error

---
 .../Abilities/Psionics/PsionicAbilitiesSystem.cs          | 8 +-------
 Content.Server/Psionics/PsionicsSystem.cs                 | 2 ++
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Content.Server/Abilities/Psionics/PsionicAbilitiesSystem.cs b/Content.Server/Abilities/Psionics/PsionicAbilitiesSystem.cs
index adcee089cf3..e7efc80f59c 100644
--- a/Content.Server/Abilities/Psionics/PsionicAbilitiesSystem.cs
+++ b/Content.Server/Abilities/Psionics/PsionicAbilitiesSystem.cs
@@ -8,19 +8,13 @@
 using Content.Shared.Psionics;
 using Content.Shared.Random.Helpers;
 using Content.Shared.StatusEffect;
-using Robust.Server.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Player;
-using Content.Server.Chat.Managers;
-using Robust.Shared.Configuration;
 using Content.Shared.CCVar;
-using Content.Server.NPC.Systems;
-using Content.Server.NPC.HTN;
-using Content.Server.Ghost;
-using Content.Server.Mind;
+using Content.Shared.NPC.Systems;
 
 namespace Content.Server.Abilities.Psionics;
 
diff --git a/Content.Server/Psionics/PsionicsSystem.cs b/Content.Server/Psionics/PsionicsSystem.cs
index d46bb5a4cd3..a775b60bc90 100644
--- a/Content.Server/Psionics/PsionicsSystem.cs
+++ b/Content.Server/Psionics/PsionicsSystem.cs
@@ -23,6 +23,8 @@
 using Content.Shared.Interaction.Events;
 using Timer = Robust.Shared.Timing.Timer;
 using Content.Shared.Alert;
+using Content.Shared.NPC.Components;
+using Content.Shared.NPC.Systems;
 using Content.Shared.Rounding;
 
 namespace Content.Server.Psionics;